From 0736b8591f884d17aa94abf7aca33fa8ed3f8add Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Fri, 20 Feb 2015 09:46:50 -0500 Subject: [PATCH] Fixes strongswan swanctl service issue rhbz#1193106 --- strongswan-swanctl-1193106.patch | 10 ++++++++++ strongswan.spec | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 strongswan-swanctl-1193106.patch diff --git a/strongswan-swanctl-1193106.patch b/strongswan-swanctl-1193106.patch new file mode 100644 index 0000000..cecef1f --- /dev/null +++ b/strongswan-swanctl-1193106.patch @@ -0,0 +1,10 @@ +diff -urNp strongswan-5.2.2/init/systemd-swanctl/strongswan-swanctl.service.in strongswan-5.2.2-patched/init/systemd-swanctl/strongswan-swanctl.service.in +--- strongswan-5.2.2/init/systemd-swanctl/strongswan-swanctl.service.in 2014-09-26 09:04:24.000000000 -0400 ++++ strongswan-5.2.2-patched/init/systemd-swanctl/strongswan-swanctl.service.in 2015-02-20 09:42:17.822480297 -0500 +@@ -7,3 +7,6 @@ Type=notify + ExecStart=@SBINDIR@/charon-systemd + ExecStartPost=@SBINDIR@/swanctl --load-all --noprompt + ExecReload=@SBINDIR@/swanctl --reload ++ ++[Install] ++WantedBy=multi-user.target diff --git a/strongswan.spec b/strongswan.spec index 4775dc9..f1ca9fb 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -8,7 +8,7 @@ Name: strongswan Version: 5.2.2 -Release: 1%{?prerelease:.%{prerelease}}%{?dist} +Release: 2%{?prerelease:.%{prerelease}}%{?dist} Summary: An OpenSource IPsec-based VPN and TNC solution Group: System Environment/Daemons License: GPLv2+ @@ -42,6 +42,7 @@ Source1: %{name}.sysvinit # accepted. There's nothing Fedora specific in the patch. # #Patch1: strongswan-5.1.1-plugins.patch +Patch2: strongswan-swanctl-1193106.patch BuildRequires: gmp-devel autoconf automake BuildRequires: libcurl-devel BuildRequires: openldap-devel @@ -105,6 +106,7 @@ PT-TLS to support TNC over TLS. %prep %setup -q -n %{name}-%{version}%{?prerelease} #%patch1 -p1 +%patch2 -p1 echo "For migration from 4.6 to 5.0 see http://wiki.strongswan.org/projects/strongswan/wiki/CharonPlutoIKEv1" > README.Fedora @@ -385,6 +387,9 @@ fi %endif %changelog +* Fri Feb 20 2015 Avesh Agarwal - 5.2.2-2 +- Fixes strongswan swanctl service issue rhbz#1193106 + * Tue Jan 06 2015 Pavel Šimerda - 5.2.2-1 - new version 5.2.2