diff --git a/.abf.yml b/.abf.yml index 165b221..9f4b6cc 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ +--- sources: - "strongswan-4.5.2.tar.bz2": 11e8378681c9b6510a530015bddf55c1156f27ee + strongswan-5.0.1.tar.bz2: e338399e4237caee148da2197515233fcfd44822 diff --git a/strongswan-4.5.2-link.patch b/strongswan-4.5.2-link.patch deleted file mode 100644 index 99478c3..0000000 --- a/strongswan-4.5.2-link.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- src/libhydra/Makefile.am.link 2011-05-25 14:34:21.000000000 +0200 -+++ src/libhydra/Makefile.am 2011-05-25 14:35:11.000000000 +0200 -@@ -11,7 +11,7 @@ - kernel/kernel_net.h \ - kernel/kernel_listener.h - --libhydra_la_LIBADD = -+libhydra_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la - - INCLUDES = -I$(top_srcdir)/src/libstrongswan - AM_CFLAGS = \ ---- src/libhydra/Makefile.in.link 2011-05-25 14:34:28.000000000 +0200 -+++ src/libhydra/Makefile.in 2011-05-25 14:35:59.000000000 +0200 -@@ -339,7 +339,7 @@ - - libhydra_la_LIBADD = $(am__append_2) $(am__append_4) $(am__append_6) \ - $(am__append_8) $(am__append_10) $(am__append_12) \ -- $(am__append_14) -+ $(am__append_14) $(top_builddir)/src/libstrongswan/libstrongswan.la - INCLUDES = -I$(top_srcdir)/src/libstrongswan - AM_CFLAGS = \ - -DIPSEC_DIR=\"${ipsecdir}\" \ ---- src/libcharon/Makefile.am.link 2011-05-25 14:46:59.000000000 +0200 -+++ src/libcharon/Makefile.am 2011-05-25 14:48:10.000000000 +0200 -@@ -110,7 +110,7 @@ - -DIPSEC_PIDDIR=\"${piddir}\" \ - -DPLUGINS=\""${libcharon_plugins}\"" - --libcharon_la_LIBADD = -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB) -+libcharon_la_LIBADD = -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB) $(top_builddir)/src/libhydra/libhydra.la $(top_builddir)/src/libstrongswan/libstrongswan.la - - EXTRA_DIST = Android.mk - ---- src/libcharon/Makefile.in.link 2011-05-25 14:47:07.000000000 +0200 -+++ src/libcharon/Makefile.in 2011-05-25 14:48:27.000000000 +0200 -@@ -737,7 +737,7 @@ - $(am__append_72) $(am__append_74) $(am__append_76) \ - $(am__append_78) $(am__append_80) $(am__append_82) \ - $(am__append_84) $(am__append_86) $(am__append_88) \ -- $(am__append_90) $(am__append_92) $(am__append_94) -+ $(am__append_90) $(am__append_92) $(am__append_94) $(top_builddir)/src/libhydra/libhydra.la $(top_builddir)/src/libstrongswan/libstrongswan.la - EXTRA_DIST = Android.mk - @MONOLITHIC_FALSE@SUBDIRS = . $(am__append_3) $(am__append_5) \ - @MONOLITHIC_FALSE@ $(am__append_7) $(am__append_9) \ diff --git a/strongswan-5.0.1-rosa-link.patch b/strongswan-5.0.1-rosa-link.patch new file mode 100644 index 0000000..d623a63 --- /dev/null +++ b/strongswan-5.0.1-rosa-link.patch @@ -0,0 +1,26 @@ +Index: strongswan-5.0.1/src/libcharon/Makefile.am +=================================================================== +--- strongswan-5.0.1.orig/src/libcharon/Makefile.am ++++ strongswan-5.0.1/src/libcharon/Makefile.am +@@ -137,7 +137,7 @@ AM_CFLAGS = \ + -DIPSEC_DIR=\"${ipsecdir}\" \ + -DIPSEC_PIDDIR=\"${piddir}\" + +-libcharon_la_LIBADD = -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB) ++libcharon_la_LIBADD = -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB) $(top_builddir)/src/libhydra/libhydra.la $(top_builddir)/src/libstrongswan/libstrongswan.la + + EXTRA_DIST = Android.mk + +Index: strongswan-5.0.1/src/libhydra/Makefile.am +=================================================================== +--- strongswan-5.0.1.orig/src/libhydra/Makefile.am ++++ strongswan-5.0.1/src/libhydra/Makefile.am +@@ -11,7 +11,7 @@ kernel/kernel_ipsec.c kernel/kernel_ipse + kernel/kernel_net.c kernel/kernel_net.h \ + kernel/kernel_listener.h + +-libhydra_la_LIBADD = ++libhydra_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + + INCLUDES = -I$(top_srcdir)/src/libstrongswan + AM_CFLAGS = \ diff --git a/strongswan.spec b/strongswan.spec index 6f9c8e8..1962a4e 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -2,25 +2,24 @@ Summary: StrongSWAN IPSEC implementation Name: strongswan -Version: 4.5.2 -Release: %mkrel 1 -License: GPL +Version: 5.0.1 +Release: 1 +License: GPLv2+ URL: http://www.strongswan.org/ Source0: http://download.strongswan.org/%{name}-%{version}.tar.bz2 Source1: strongswan.init Patch0: strongswan-4.5.2-format_not_a_string_literal_and_no_format_arguments.diff -Patch1: strongswan-4.5.2-link.patch +Patch1: strongswan-5.0.1-rosa-link.patch Group: System/Servers -BuildRequires: libgmp-devel +BuildRequires: gmp-devel BuildRequires: libldap-devel -BuildRequires: libcurl-devel +BuildRequires: curl-devel BuildRequires: opensc-devel BuildRequires: libxml2-devel BuildRequires: libfcgi-devel Requires: %{_lib}opensc3 Requires(post): rpm-helper Requires(preun): rpm-helper -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description FreeS/WAN is a free implementation of IPSEC & IKE for Linux. IPSEC is @@ -35,24 +34,25 @@ This package contains the daemons and userland tools for setting up FreeS/WAN on a freeswan enabled kernel. %prep -%setup -q -n %{name}-%{version} -%patch0 -p0 -b .str -%patch1 -p0 -b .link +%setup -q +#patch0 -p0 -b .str +%patch1 -p1 -b .link %build +autoreconf %serverbuild %configure2_5x \ --enable-smartcard \ --enable-cisco-quirks \ --enable-ldap \ - --with-default-pkcs11=%{_libdir}/opensc-pkcs11.so + --with-default-pkcs11=%{_libdir}/opensc-pkcs11.so \ + --disable-static \ + --with-systemdsystemunitdir=%{_systemunitdir} %make %install -rm -rf %{buildroot} - install -d %{buildroot}%{_sysconfdir}/ipsec.d/{cacerts,crls,private,certs,acerts,aacerts,ocspcerts} install -d %{buildroot}%{_initrddir} install -d %{buildroot}/var/run/pluto @@ -65,8 +65,7 @@ install -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/ipsec #mv %{buildroot}%{_sysconfdir}/ipsec.conf %{buildroot}%{_sysconfdir}/%{source_name}/ -rm -f %{buildroot}%{_libdir}/lib*.{so,a,la} -find %{buildroot}%{_libdir}/ipsec -name "*.a" -o -name "*.la" | xargs -r rm -f +#rm -f %{buildroot}%{_libdir}/lib*.{so,a,la} #%pre #%_pre_useradd strongswan @@ -81,13 +80,9 @@ find %{buildroot}%{_libdir}/ipsec -name "*.a" -o -name "*.la" | xargs -r rm -f #%postun #%_postun_userdel strongswan -# -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,755) -%doc TODO NEWS README COPYING CREDITS +%doc AUTHORS TODO NEWS README LICENSE %attr(700,root,root) %dir %{_sysconfdir}/ipsec.d/ %attr(700,root,root) %dir %{_sysconfdir}/ipsec.d/acerts %attr(700,root,root) %dir %{_sysconfdir}/ipsec.d/aacerts @@ -99,10 +94,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/ipsec.conf %{_initrddir}/ipsec %config(noreplace) %{_sysconfdir}/strongswan.conf -/lib/systemd/system/strongswan.service +%{_systemunitdir}/strongswan.service %{_libdir}/ipsec %{_mandir}/man*/* -%{_libdir}/lib*.so.* %{_sbindir}/ipsec