diff --git a/malloc-speed-lrt.patch b/malloc-speed-lrt.patch new file mode 100644 index 0000000..c032c15 --- /dev/null +++ b/malloc-speed-lrt.patch @@ -0,0 +1,24 @@ +diff -urNp strongswan-5.1.0-patched/scripts/Makefile.am strongswan-5.1.0-current/scripts/Makefile.am +--- strongswan-5.1.0-patched/scripts/Makefile.am 2013-08-07 16:46:57.759056262 -0400 ++++ strongswan-5.1.0-current/scripts/Makefile.am 2013-08-07 16:47:51.240021382 -0400 +@@ -36,7 +36,7 @@ dh_speed_LDADD = $(top_builddir)/src/lib + pubkey_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt + crypt_burn_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + hash_burn_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +-malloc_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la ++malloc_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt + fetch_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + dnssec_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + +diff -urNp strongswan-5.1.0-patched/scripts/Makefile.in strongswan-5.1.0-current/scripts/Makefile.in +--- strongswan-5.1.0-patched/scripts/Makefile.in 2013-08-07 16:46:57.758056263 -0400 ++++ strongswan-5.1.0-current/scripts/Makefile.in 2013-08-07 16:59:06.506583680 -0400 +@@ -414,7 +414,7 @@ dh_speed_LDADD = $(top_builddir)/src/lib + pubkey_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt + crypt_burn_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + hash_burn_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +-malloc_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la ++malloc_speed_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lrt + fetch_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + dnssec_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + all: all-am diff --git a/strongswan.spec b/strongswan.spec index 0e9aa4c..33ccdbd 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -9,7 +9,7 @@ Name: strongswan Version: 5.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An OpenSource IPsec-based VPN Solution Group: System Environment/Daemons License: GPLv2+ @@ -19,6 +19,7 @@ Patch0: strongswan-init.patch Patch1: strongswan-pts-ecp-disable.patch Patch2: libstrongswan-plugin.patch Patch3: libstrongswan-settings-debug.patch +Patch4: malloc-speed-lrt.patch BuildRequires: gmp-devel BuildRequires: libcurl-devel @@ -79,6 +80,7 @@ implementation possessing a standard IF-IMC/IMV interface. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 echo "For migration from 4.6 to 5.0 see http://wiki.strongswan.org/projects/strongswan/wiki/CharonPlutoIKEv1" > README.Fedora @@ -312,6 +314,10 @@ fi %changelog +* Wed Aug 7 2013 Avesh Agarwal - 5.1.0-2 +- Fixed linker error when compilating malloc-speed that + lrt is missing. Did not have this problem on f19 and F20. + * Wed Aug 7 2013 Avesh Agarwal - 5.1.0-1 - rhbz#981429: New upstream release - Fixes CVE-2013-5018: rhbz#991216, rhbz#991215