diff --git a/libstrongswan-973315.patch b/libstrongswan-973315.patch new file mode 100644 index 0000000..20710b3 --- /dev/null +++ b/libstrongswan-973315.patch @@ -0,0 +1,137 @@ +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/Makefile.am strongswan-5.1.1-current/src/libstrongswan/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/Makefile.am 2013-11-01 13:12:06.038927154 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/Makefile.am 2013-12-02 15:22:56.501380158 -0500 +@@ -102,6 +102,8 @@ AM_CFLAGS = \ + AM_LDFLAGS = \ + -no-undefined + ++AM_LDFLAGS = -rdynamic ++ + if USE_LEAK_DETECTIVE + AM_CPPFLAGS += -DLEAK_DETECTIVE + libstrongswan_la_SOURCES += utils/leak_detective.c +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/cmac/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/cmac/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/cmac/Makefile.am 2013-11-01 13:12:06.045927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/cmac/Makefile.am 2013-12-02 15:22:56.502380158 -0500 +@@ -13,4 +13,5 @@ endif + libstrongswan_cmac_la_SOURCES = \ + cmac_plugin.h cmac_plugin.c cmac.h cmac.c + +-libstrongswan_cmac_la_LDFLAGS = -module -avoid-version ++libstrongswan_cmac_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_cmac_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +\ No newline at end of file +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/constraints/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/constraints/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/constraints/Makefile.am 2013-11-01 13:12:06.054927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/constraints/Makefile.am 2013-12-02 15:22:56.526380158 -0500 +@@ -14,4 +14,5 @@ libstrongswan_constraints_la_SOURCES = \ + constraints_plugin.h constraints_plugin.c \ + constraints_validator.h constraints_validator.c + +-libstrongswan_constraints_la_LDFLAGS = -module -avoid-version ++libstrongswan_constraints_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_constraints_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/hmac/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/hmac/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/hmac/Makefile.am 2013-11-01 13:12:06.051927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/hmac/Makefile.am 2013-12-02 15:22:56.526380158 -0500 +@@ -13,4 +13,5 @@ endif + libstrongswan_hmac_la_SOURCES = \ + hmac_plugin.h hmac_plugin.c hmac.h hmac.c + +-libstrongswan_hmac_la_LDFLAGS = -module -avoid-version ++libstrongswan_hmac_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_hmac_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/nonce/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/nonce/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/nonce/Makefile.am 2013-11-01 13:12:06.053927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/nonce/Makefile.am 2013-12-02 15:22:56.527380158 -0500 +@@ -14,4 +14,5 @@ libstrongswan_nonce_la_SOURCES = \ + nonce_plugin.h nonce_plugin.c \ + nonce_nonceg.c nonce_nonceg.h + +-libstrongswan_nonce_la_LDFLAGS = -module -avoid-version ++libstrongswan_nonce_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_nonce_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/openssl/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/openssl/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/openssl/Makefile.am 2013-11-01 13:12:06.050927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/openssl/Makefile.am 2013-12-02 15:22:56.527380158 -0500 +@@ -31,5 +31,6 @@ libstrongswan_openssl_la_SOURCES = \ + openssl_hmac.c openssl_hmac.h \ + openssl_gcm.c openssl_gcm.h + +-libstrongswan_openssl_la_LDFLAGS = -module -avoid-version +-libstrongswan_openssl_la_LIBADD = -lcrypto ++libstrongswan_openssl_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_openssl_la_LIBADD = -lcrypto \ ++ $(top_builddir)/src/libstrongswan/libstrongswan.la +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/pem/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/pem/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/pem/Makefile.am 2013-11-01 13:12:06.045927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/pem/Makefile.am 2013-12-02 15:22:56.527380158 -0500 +@@ -15,4 +15,5 @@ libstrongswan_pem_la_SOURCES = \ + pem_builder.c pem_builder.h \ + pem_encoder.c pem_encoder.h + +-libstrongswan_pem_la_LDFLAGS = -module -avoid-version ++libstrongswan_pem_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_pem_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/pgp/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/pgp/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/pgp/Makefile.am 2013-11-01 13:12:06.047927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/pgp/Makefile.am 2013-12-02 15:22:56.528380158 -0500 +@@ -17,4 +17,5 @@ libstrongswan_pgp_la_SOURCES = \ + pgp_encoder.h pgp_encoder.c \ + pgp_builder.h pgp_builder.c + +-libstrongswan_pgp_la_LDFLAGS = -module -avoid-version ++libstrongswan_pgp_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_pgp_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/random/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/random/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/random/Makefile.am 2013-11-01 13:12:06.043927154 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/random/Makefile.am 2013-12-02 15:22:56.528380158 -0500 +@@ -16,4 +16,5 @@ libstrongswan_random_la_SOURCES = \ + random_plugin.h random_plugin.c \ + random_rng.c random_rng.h + +-libstrongswan_random_la_LDFLAGS = -module -avoid-version ++libstrongswan_random_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_random_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/revocation/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/revocation/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/revocation/Makefile.am 2013-11-01 13:12:06.058927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/revocation/Makefile.am 2013-12-02 15:22:56.528380158 -0500 +@@ -14,4 +14,5 @@ libstrongswan_revocation_la_SOURCES = \ + revocation_plugin.h revocation_plugin.c \ + revocation_validator.h revocation_validator.c + +-libstrongswan_revocation_la_LDFLAGS = -module -avoid-version ++libstrongswan_revocation_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_revocation_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/sqlite/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/sqlite/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/sqlite/Makefile.am 2013-11-01 13:12:06.051927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/sqlite/Makefile.am 2013-12-02 15:22:56.547380158 -0500 +@@ -14,5 +14,6 @@ libstrongswan_sqlite_la_SOURCES = \ + sqlite_plugin.h sqlite_plugin.c \ + sqlite_database.h sqlite_database.c + +-libstrongswan_sqlite_la_LDFLAGS = -module -avoid-version +-libstrongswan_sqlite_la_LIBADD = -lsqlite3 ++libstrongswan_sqlite_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_sqlite_la_LIBADD = -lsqlite3 \ ++ $(top_builddir)/src/libstrongswan/libstrongswan.la +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/x509/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/x509/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/x509/Makefile.am 2013-11-01 13:12:06.056927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/x509/Makefile.am 2013-12-02 15:22:56.548380158 -0500 +@@ -19,4 +19,5 @@ libstrongswan_x509_la_SOURCES = \ + x509_ocsp_request.h x509_ocsp_request.c \ + x509_ocsp_response.h x509_ocsp_response.c + +-libstrongswan_x509_la_LDFLAGS = -module -avoid-version ++libstrongswan_x509_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_x509_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +diff -urNp strongswan-5.1.1-patched/src/libstrongswan/plugins/xcbc/Makefile.am strongswan-5.1.1-current/src/libstrongswan/plugins/xcbc/Makefile.am +--- strongswan-5.1.1-patched/src/libstrongswan/plugins/xcbc/Makefile.am 2013-11-01 13:12:06.059927153 -0400 ++++ strongswan-5.1.1-current/src/libstrongswan/plugins/xcbc/Makefile.am 2013-12-02 15:22:56.561380158 -0500 +@@ -13,4 +13,5 @@ endif + libstrongswan_xcbc_la_SOURCES = \ + xcbc_plugin.h xcbc_plugin.c xcbc.h xcbc.c + +-libstrongswan_xcbc_la_LDFLAGS = -module -avoid-version ++libstrongswan_xcbc_la_LDFLAGS = -no-undefined -module -avoid-version ++libstrongswan_xcbc_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la diff --git a/strongswan-1036844.patch b/strongswan-1036844.patch new file mode 100644 index 0000000..f221f80 --- /dev/null +++ b/strongswan-1036844.patch @@ -0,0 +1,22 @@ +diff -urNp strongswan-5.1.1-patched/configure.ac strongswan-5.1.1-current/configure.ac +--- strongswan-5.1.1-patched/configure.ac 2013-11-01 13:14:29.753922017 -0400 ++++ strongswan-5.1.1-current/configure.ac 2013-12-02 15:33:47.530389926 -0500 +@@ -20,7 +20,17 @@ + # ============================ + + AC_INIT([strongSwan],[5.1.1]) +-AM_INIT_AUTOMAKE([tar-ustar subdir-objects]) ++AM_INIT_AUTOMAKE(m4_esyscmd([ ++ echo tar-ustar ++ echo subdir-objects ++ case `automake --version | head -n 1` in ++ *" 1.9"*);; ++ *" 1.10"*);; ++ *" 1.11"*);; ++ # don't use parallel test harness in 1.12 and up ++ *) echo serial-tests;; ++ esac ++])) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) + AC_CONFIG_MACRO_DIR([m4/config]) + AC_CONFIG_HEADERS([config.h]) diff --git a/strongswan.spec b/strongswan.spec index f7e2d23..8235f5c 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -9,7 +9,7 @@ Name: strongswan Version: 5.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An OpenSource IPsec-based VPN Solution Group: System Environment/Daemons License: GPLv2+ @@ -19,6 +19,8 @@ Patch0: strongswan-init.patch Patch1: strongswan-pts-ecp-disable.patch Patch2: libstrongswan-plugin.patch Patch3: libstrongswan-settings-debug.patch +Patch4: libstrongswan-973315.patch +Patch5: strongswan-1036844.patch BuildRequires: gmp-devel autoconf automake BuildRequires: libcurl-devel @@ -79,6 +81,8 @@ implementation possessing a standard IF-IMC/IMV interface. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 echo "For migration from 4.6 to 5.0 see http://wiki.strongswan.org/projects/strongswan/wiki/CharonPlutoIKEv1" > README.Fedora @@ -332,6 +336,10 @@ fi %changelog +* Mon Dec 2 2013 Avesh Agarwal - 5.1.1-2 +- Resolves: 973315 +- Resolves: 1036844 + * Fri Nov 1 2013 Avesh Agarwal - 5.1.1-1 - Support for PT-TLS (RFC 6876) - Support for SWID IMC/IMV