From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCHv2] strongswan: Update to 5.3.3 Date: Fri, 16 Oct 2015 23:08:04 +0200 Message-ID: <1445029684-15245-1-git-send-email-stefan.schantl@ipfire.org> In-Reply-To: <1445028772.18375.94.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4656147636188893066==" List-Id: --===============4656147636188893066== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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. Fixes #10896. Signed-off-by: Stefan Schantl --- 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=3Dnotify + ExecStart=3D@SBINDIR@/charon-systemd + ExecStartPost=3D@SBINDIR@/swanctl --load-all --noprompt + ExecReload=3D@SBINDIR@/swanctl --reload ++ ++[Install] ++WantedBy=3Dmulti-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 @@ ############################################################################= ### =20 name =3D strongswan -version =3D 5.3.2 -release =3D 1 +version =3D 5.3.3 +release =3D 1.3 =20 groups =3D Networking/VPN url =3D http://www.strongswan.org/ @@ -38,11 +38,12 @@ build openssl-devel perl sqlite-devel - systemd-devel - systemd-units + systemd-devel >=3D 221-2 end =20 configure_options +=3D \ + --disable-static \ + --with-ipseclibdir=3D%{libdir}/ipsec \ --enable-curl \ --enable-ldap \ --enable-openssl \ @@ -61,6 +62,7 @@ build --enable-eap-identity \ --with-capabilities=3Dlibcap \ --enable-swanctl \ + --enable-systemd \ --enable-kernel-libipsec =20 if "%{DISTRO_ARCH}" =3D=3D "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 =20 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 =20 script preun systemctl disable --no-reload strongswan.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 =20 script postun --=20 2.4.3 --===============4656147636188893066==--