From 6f27d18516587fd0f59fc7547e3957eddd778c2f Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Jul 15 2013 22:52:13 +0000 Subject: Fix broken systemd unit file (#984300) --- diff --git a/strongswan-init.patch b/strongswan-init.patch index 6ad4d59..89317f8 100644 --- a/strongswan-init.patch +++ b/strongswan-init.patch @@ -124,32 +124,15 @@ 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( +@@ -1082,6 +1082,8 @@ 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 @@ -255,16 +238,3 @@ 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 b428f7a..073e438 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -297,6 +297,7 @@ fi %changelog * Mon Jul 15 2013 Jamie Nguyen - 5.0.4-4 - %%files tries to package some of the shared objects as directories (#984437) +- fix broken systemd unit file (#984300) * Fri Jun 28 2013 Avesh Agarwal - 5.0.4-3 - Patch to fix a major crash issue when Freeradius loads