rpms-fedora-extras/strongswan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broken systemd unit file (#984300)

Browse Source
This commit is contained in:
Jamie Nguyen
2013-07-15 15:18:44 +01:00
parent 97fc73ef54
commit 368db85874
2 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
strongswan-init.patch
View File

@@ -124,32 +124,15 @@ Index: strongswan-5.0.0/configure.in
=================================================================== ===================================================================
--- strongswan-5.0.0.orig/configure.in --- strongswan-5.0.0.orig/configure.in
+++ strongswan-5.0.0/configure.in +++ strongswan-5.0.0/configure.in
@@ -1082,6 +1082,9 @@ AC_OUTPUT( @@ -1082,6 +1082,8 @@ AC_OUTPUT(
man/Makefile man/Makefile
init/Makefile init/Makefile
init/systemd/Makefile init/systemd/Makefile
+ init/systemd/strongswan.service
+ init/sysvinit/Makefile + init/sysvinit/Makefile
+ init/sysvinit/strongswan + init/sysvinit/strongswan
src/Makefile src/Makefile
src/include/Makefile src/include/Makefile
src/libstrongswan/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 Index: strongswan-5.0.0/init/sysvinit/strongswan
=================================================================== ===================================================================
--- /dev/null --- /dev/null
@@ -255,16 +238,3 @@ Index: strongswan-5.0.0/init/sysvinit/strongswan
+ exit 2 + exit 2
+esac +esac
+exit $? +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]

1
strongswan.spec
View File

@@ -297,6 +297,7 @@ fi
%changelog %changelog
* Mon Jul 15 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 5.0.4-4 * Mon Jul 15 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 5.0.4-4
- %%files tries to package some of the shared objects as directories (#984437) - %%files tries to package some of the shared objects as directories (#984437)
- fix broken systemd unit file (#984300)
* Fri Jun 28 2013 Avesh Agarwal <avagarwa@redhat.com> - 5.0.4-3 * Fri Jun 28 2013 Avesh Agarwal <avagarwa@redhat.com> - 5.0.4-3
- Patch to fix a major crash issue when Freeradius loads - Patch to fix a major crash issue when Freeradius loads