On Fri, 2015-10-16 at 23:08 +0200, Stefan Schantl wrote:
This is a minor update to the latest stable version of strongswan.
The support and usage of systemd explicitly has been enabled and the dependency to systemd has been updated because the configure script of strongswan is looking for the systemd compat libraries which are provided by systemd 221-2 and later versions.
There was also a requirenment to move some libraries to %{libdir} because of a hardcoded RPATH which is against our guidelines.
Lots of typos in the sentence above.
Fixes #10896.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
strongswan/patches/strongswan-swanctl-1193106.patch | 10 ++++++++++ strongswan/strongswan.nm | 21 +++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 strongswan/patches/strongswan-swanctl -1193106.patch
diff --git a/strongswan/patches/strongswan-swanctl-1193106.patch b/strongswan/patches/strongswan-swanctl-1193106.patch new file mode 100644 index 0000000..cecef1f --- /dev/null +++ b/strongswan/patches/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/strongswan.nm b/strongswan/strongswan.nm index b386083..686fa40 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -4,8 +4,8 @@ #################################################################### ###########
name = strongswan -version = 5.3.2 -release = 1 +version = 5.3.3 +release = 1.3
This is an invalid release number.
groups = Networking/VPN url = http://www.strongswan.org/ @@ -38,11 +38,12 @@ build openssl-devel perl sqlite-devel
systemd-develsystemd-units
systemd-devel >= 221-2end
configure_options += \
--disable-static \--with-ipseclibdir=%{libdir}/ipsec \--enable-curl \ --enable-ldap \ --enable-openssl \
@@ -61,6 +62,7 @@ build --enable-eap-identity \ --with-capabilities=libcap \ --enable-swanctl \
--enable-systemd \--enable-kernel-libipsec
if "%{DISTRO_ARCH}" == "i686"
@@ -72,6 +74,14 @@ build #test # make check #end
- install_cmds
# Drop unneeded files.rm -rvf %{BUILDROOT}%{libdir}/ipsec/lib*.so# Move libraries to libdir.mv %{BUILDROOT}%{libdir}/ipsec/lib*.so.*%{BUILDROOT}%{libdir}
- end
end
packages @@ -83,11 +93,14 @@ packages script postup systemctl daemon-reload >/dev/null 2>&1 || : systemctl reload-or-try-restart strongswan.service >/dev/null 2>&1 || :
systemctl reload-or-try-restart strongswan-swanctl.service >/dev/null 2>&1 || : end
script preun systemctl disable --no-reloadstrongswan.service >/dev/null 2>&1 || :
systemctl disable --no-reload strongswan-swanctl.service >/dev/null 2>&1 || : systemctl stop strongswan.service >/dev/null 2>&1 || :
systemctl stop strongswan-swanctl.service/dev/null 2>&1 || :
end script postun