[strongswan/el6] Fix configure substitutions in initscripts
Pavel Šimerda
pavlix at fedoraproject.org
Mon Jul 9 00:14:18 UTC 2012
commit 457dae3058579b5b9d37300a33dcb1d9ff54f9ae
Author: Pavel Šimerda <pavlix at pavlix.net>
Date: Mon Jul 9 02:00:25 2012 +0200
Fix configure substitutions in initscripts
strongswan-init.patch | 15 ++++++++++++++-
strongswan.spec | 5 ++++-
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/strongswan-init.patch b/strongswan-init.patch
index 66da275..6ad4d59 100644
--- a/strongswan-init.patch
+++ b/strongswan-init.patch
@@ -39,7 +39,7 @@ Index: strongswan-5.0.0/init/sysvinit/strongswan.in
+# Source function library.
+. /etc/rc.d/init.d/functions
+
-+exec="@SBINDIR@/@IPSEC_SCRIPT@"
++exec="@sbindir@/@ipsec_script@"
+prog="strongswan"
+status_prog="starter"
+config="/etc/strongswan/strongswan.conf"
@@ -255,3 +255,16 @@ Index: strongswan-5.0.0/init/sysvinit/strongswan
+ exit 2
+esac
+exit $?
+Index: strongswan-5.0.0/init/systemd/strongswan.service.in
+===================================================================
+--- strongswan-5.0.0.orig/init/systemd/strongswan.service.in
++++ strongswan-5.0.0/init/systemd/strongswan.service.in
+@@ -3,7 +3,7 @@ Description=strongSwan IPsec
+ After=syslog.target
+
+ [Service]
+-ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork
++ExecStart=@sbindir@/@ipsec_script@ start --nofork
+ StandardOutput=syslog
+
+ [Install]
diff --git a/strongswan.spec b/strongswan.spec
index 4569fa5..824a352 100644
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -3,7 +3,7 @@
Name: strongswan
Version: 5.0.0
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
Summary: An OpenSource IPsec-based VPN Solution
Group: System Environment/Daemons
License: GPLv2+
@@ -198,6 +198,9 @@ fi
%endif
%changelog
+* Sun Jul 08 2012 Pavel Šimerda <pavlix at pavlix.net> - 5.0.0-2.git20120619
+- Fix configure substitutions in initscripts
+
* Wed Jul 04 2012 Pavel Šimerda <psimerda at redhat.com> - 5.0.0-1.git20120619
- Update to current upstream release
- Comment out all stuff that is only needed for git builds
More information about the scm-commits
mailing list