From d2edb12edb209cf78df2741228e36e5c58f6d195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0imerda?= Date: Thu, 5 Jul 2012 01:32:39 +0200 Subject: [PATCH] New upstream version: 5.0.0 --- .gitignore | 5 +- sources | 5 +- strongswan-init.patch | 169 ++++++++++++++++++++++++++++++++++++++---- strongswan.spec | 39 ++++++---- 4 files changed, 182 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 02813d2..d5ef3fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/strongswan-4.6.2.tar.bz2 -/strongswan-4.6.3.tar.bz2 -/strongswan-4.6.4.tar.bz2 -/strongswan-0bb3c98.tar.gz +/strongswan-5.0.0.tar.bz2 diff --git a/sources b/sources index fb726b7..c8b761e 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -ed64e6746011930a70f3a271dc0e3c9e strongswan-4.6.2.tar.bz2 -34146e514ced1738b4f2d9e7169bbb52 strongswan-4.6.3.tar.bz2 -4c0999c42faa0860ae0afc4f8efd9d04 strongswan-4.6.4.tar.bz2 -cf66335b6967712949389247c8b7d517 strongswan-0bb3c98.tar.gz +c8b861305def7c0abae04f7bbefec212 strongswan-5.0.0.tar.bz2 diff --git a/strongswan-init.patch b/strongswan-init.patch index ce6d8b1..66da275 100644 --- a/strongswan-init.patch +++ b/strongswan-init.patch @@ -1,33 +1,37 @@ -Index: strongswan-4.6.4/init/systemd/strongswan.service.in +Index: strongswan-5.0.0/init/Makefile.am =================================================================== ---- strongswan-4.6.4.orig/init/systemd/strongswan.service.in -+++ strongswan-4.6.4/init/systemd/strongswan.service.in -@@ -3,7 +3,7 @@ Description=strongSwan IPsec - After=syslog.target +--- strongswan-5.0.0.orig/init/Makefile.am ++++ strongswan-5.0.0/init/Makefile.am +@@ -1,5 +1,5 @@ - [Service] --ExecStart=@SBINDIR@/ipsec start --nofork -+ExecStart=@SBINDIR@/strongswan start --nofork - StandardOutput=syslog +-SUBDIRS = ++SUBDIRS = sysvinit - [Install] -Index: strongswan-4.6.4/init/sysvinit/strongswan + if HAVE_SYSTEMD + SUBDIRS += systemd +Index: strongswan-5.0.0/init/sysvinit/Makefile.am =================================================================== --- /dev/null -+++ strongswan-4.6.4/init/sysvinit/strongswan ++++ strongswan-5.0.0/init/sysvinit/Makefile.am +@@ -0,0 +1 @@ ++noinst_DATA = strongswan +Index: strongswan-5.0.0/init/sysvinit/strongswan.in +=================================================================== +--- /dev/null ++++ strongswan-5.0.0/init/sysvinit/strongswan.in @@ -0,0 +1,100 @@ +#!/bin/sh +# +# strongswan An implementation of key management system for IPsec +# +# chkconfig: - 48 52 -+# description: Starts or stops the Strongswan daemons. ++# description: Starts or stops the Strongswan daemon. + +### BEGIN INIT INFO +# Provides: ipsec +# Required-Start: $network $remote_fs $syslog $named +# Required-Stop: $syslog $remote_fs -+# Default-Start: ++# Default-Start: +# Default-Stop: 0 1 6 +# Short-Description: Start Strongswan daemons at boot time +### END INIT INFO @@ -35,7 +39,142 @@ Index: strongswan-4.6.4/init/sysvinit/strongswan +# Source function library. +. /etc/rc.d/init.d/functions + -+exec="/usr/sbin/strongswan" ++exec="@SBINDIR@/@IPSEC_SCRIPT@" ++prog="strongswan" ++status_prog="starter" ++config="/etc/strongswan/strongswan.conf" ++ ++lockfile=/var/lock/subsys/$prog ++ ++start() { ++ [ -x $exec ] || exit 5 ++ [ -f $config ] || exit 6 ++ echo -n $"Starting $prog: " ++ daemon $exec start ++ retval=$? ++ echo ++ [ $retval -eq 0 ] && touch $lockfile ++ return $retval ++} ++ ++stop() { ++ echo -n $"Stopping $prog: " ++ $exec stop ++ retval=$? ++ echo ++ [ $retval -eq 0 ] && rm -f $lockfile ++ return $retval ++} ++ ++restart() { ++ stop ++ start ++} ++ ++reload() { ++ restart ++} ++ ++force_reload() { ++ restart ++} ++ ++_status() { ++ # run checks to determine if the service is running or use generic status ++ status $status_prog ++} ++ ++_status_q() { ++ _status >/dev/null 2>&1 ++} ++ ++ ++case "$1" in ++ start) ++ _status_q && exit 0 ++ $1 ++ ;; ++ stop) ++ _status_q || exit 0 ++ $1 ++ ;; ++ restart) ++ $1 ++ ;; ++ reload) ++ _status_q || exit 7 ++ $1 ++ ;; ++ force-reload) ++ force_reload ++ ;; ++ status) ++ _status ++ ;; ++ condrestart|try-restart) ++ _status_q || exit 0 ++ restart ++ ;; ++ *) ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 ++esac ++exit $? +Index: strongswan-5.0.0/configure.in +=================================================================== +--- strongswan-5.0.0.orig/configure.in ++++ strongswan-5.0.0/configure.in +@@ -1082,6 +1082,9 @@ AC_OUTPUT( + man/Makefile + init/Makefile + init/systemd/Makefile ++ init/systemd/strongswan.service ++ init/sysvinit/Makefile ++ init/sysvinit/strongswan + src/Makefile + src/include/Makefile + src/libstrongswan/Makefile +Index: strongswan-5.0.0/init/systemd/Makefile.am +=================================================================== +--- strongswan-5.0.0.orig/init/systemd/Makefile.am ++++ strongswan-5.0.0/init/systemd/Makefile.am +@@ -1,11 +1 @@ +- +-EXTRA_DIST = strongswan.service.in +-CLEANFILES = strongswan.service +- + systemdsystemunit_DATA = strongswan.service +- +-strongswan.service : strongswan.service.in +- sed \ +- -e "s:@SBINDIR@:$(sbindir):" \ +- -e "s:@IPSEC_SCRIPT@:$(ipsec_script):" \ +- $(srcdir)/$@.in > $@ +Index: strongswan-5.0.0/init/sysvinit/strongswan +=================================================================== +--- /dev/null ++++ strongswan-5.0.0/init/sysvinit/strongswan +@@ -0,0 +1,100 @@ ++#!/bin/sh ++# ++# strongswan An implementation of key management system for IPsec ++# ++# chkconfig: - 48 52 ++# description: Starts or stops the Strongswan daemon. ++ ++### BEGIN INIT INFO ++# Provides: ipsec ++# Required-Start: $network $remote_fs $syslog $named ++# Required-Stop: $syslog $remote_fs ++# Default-Start: ++# Default-Stop: 0 1 6 ++# Short-Description: Start Strongswan daemons at boot time ++### END INIT INFO ++ ++# Source function library. ++. /etc/rc.d/init.d/functions ++ ++exec="@SBINDIR@/@IPSEC_SCRIPT@" +prog="strongswan" +status_prog="starter" +config="/etc/strongswan/strongswan.conf" diff --git a/strongswan.spec b/strongswan.spec index c0f80dc..41cfa69 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -1,14 +1,15 @@ -%define snapshot .git20120619 -%define commit 0bb3c98 +#%define snapshot .git20120619 +#%define commit 0bb3c98 Name: strongswan Version: 5.0.0 -Release: 0.3%{snapshot}%{?dist} +Release: 1%{snapshot}%{?dist} Summary: An OpenSource IPsec-based VPN Solution Group: System Environment/Daemons License: GPLv2+ URL: http://www.strongswan.org/ -Source0: %{name}-%{commit}.tar.gz +Source0: http://download.strongswan.org/%{name}-%{version}.tar.bz2 +Patch0: strongswan-init.patch BuildRequires: gmp-devel BuildRequires: libcurl-devel BuildRequires: openldap-devel @@ -16,13 +17,14 @@ BuildRequires: openssl-devel BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-glib-devel # when building from git -BuildRequires: gperf -BuildRequires: flex -BuildRequires: bison +#BuildRequires: gperf +#BuildRequires: flex +#BuildRequires: bison BuildRequires: automake -BuildRequires: autoconf -BuildRequires: libtool -BuildRequires: gettext-devel +#BuildRequires: autoconf +#BuildRequires: libtool +#BuildRequires: gettext-devel +# %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 BuildRequires: systemd-units Requires(post): systemd-units @@ -46,11 +48,15 @@ NetworkManager plugin integrates a subset of Strongswan capabilities to NetworkManager. %prep -%setup -q -n %{name}-%{commit} +%setup -q +# when building from git +#%setup -q -n %{name}-%{commit} +%patch0 -p1 echo "For migration from 4.6 to 5.0 see http://wiki.strongswan.org/projects/strongswan/wiki/CharonPlutoIKEv1" > README.Fedora %build -./autogen.sh +# for initscript patch to work +autoreconf %configure --disable-static \ --with-ipsec-script=%{name} \ --sysconfdir=%{_sysconfdir}/%{name} \ @@ -84,7 +90,7 @@ install -D -m 755 init/sysvinit/%{name} %{buildroot}/%{_initddir}/%{name} %files -%doc README README.Fedora COPYING NEWS CREDITS TODO +%doc README README.Fedora COPYING NEWS TODO %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/ipsec.conf %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf @@ -128,6 +134,7 @@ install -D -m 755 init/sysvinit/%{name} %{buildroot}/%{_initddir}/%{name} %{_libdir}/%{name}/plugins/lib%{name}-stroke.so %{_libdir}/%{name}/plugins/lib%{name}-updown.so %{_libdir}/%{name}/plugins/lib%{name}-x509.so +%{_libdir}/%{name}/plugins/lib%{name}-xauth-generic.so %{_libdir}/%{name}/plugins/lib%{name}-xcbc.so %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/_copyright @@ -191,6 +198,12 @@ fi %endif %changelog +* Wed Jul 04 2012 Pavel Šimerda - 5.0.0-1.git20120619 +- Update to current upstream release +- Comment out all stuff that is only needed for git builds +- Remove renaming patch from git +- Improve init patch used for EPEL + * Thu Jun 21 2012 Pavel Šimerda - 5.0.0-0.3.git20120619 - Build with openssl plugin enabled