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

updated libexec patch

Browse Source
This commit is contained in:
Pavel Šimerda
2014-03-24 12:41:52 +01:00
parent bdecee05c1
commit 9b40e12f55
2 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
strongswan-5.1.2-libexec.patch
View File

@@ -1,7 +1,7 @@
Index: strongswan-5.1.2/src/checksum/Makefile.am
===================================================================
--- strongswan-5.1.2.orig/src/checksum/Makefile.am
+++ strongswan-5.1.2/src/checksum/Makefile.am
diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am
index d172b15..5dfab01 100644
--- a/src/checksum/Makefile.am
+++ b/src/checksum/Makefile.am
@@ -102,7 +102,7 @@ endif
if USE_TOOLS
exes += $(DESTDIR)$(ipsecdir)/openac
@@ -11,10 +11,49 @@ Index: strongswan-5.1.2/src/checksum/Makefile.am
endif
if USE_ATTR_SQL
Index: strongswan-5.1.2/src/pki/Makefile.am
===================================================================
--- strongswan-5.1.2.orig/src/pki/Makefile.am
+++ strongswan-5.1.2/src/pki/Makefile.am
diff --git a/src/ipsec/_ipsec.in b/src/ipsec/_ipsec.in
index 3c1f998..f39eb16 100644
--- a/src/ipsec/_ipsec.in
+++ b/src/ipsec/_ipsec.in
@@ -15,7 +15,7 @@
# for more details.
# define a minimum PATH environment in case it is not set
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:@IPSEC_SBINDIR@:@IPSEC_BINDIR@"
+PATH="@IPSEC_DIR@:/sbin:/bin:/usr/sbin:/usr/bin:@IPSEC_SBINDIR@:@IPSEC_BINDIR@"
export PATH
# set daemon name
@@ -28,7 +28,6 @@ IPSEC_VERSION="U@IPSEC_VERSION@/K`uname -r`"
# where the private directory and the config files are
IPSEC_DIR="@IPSEC_DIR@"
-IPSEC_BINDIR="@IPSEC_BINDIR@"
IPSEC_SBINDIR="@IPSEC_SBINDIR@"
IPSEC_CONFDIR="@IPSEC_CONFDIR@"
IPSEC_PIDDIR="@IPSEC_PIDDIR@"
@@ -40,7 +39,7 @@ IPSEC_CHARON_PID="${IPSEC_PIDDIR}/${DAEMON_NAME}.pid"
IPSEC_STROKE="${IPSEC_DIR}/stroke"
IPSEC_STARTER="${IPSEC_DIR}/starter"
-export IPSEC_DIR IPSEC_BINDIR IPSEC_SBINDIR IPSEC_CONFDIR IPSEC_PIDDIR IPSEC_SCRIPT IPSEC_VERSION IPSEC_NAME IPSEC_STARTER_PID IPSEC_CHARON_PID
+export IPSEC_DIR IPSEC_SBINDIR IPSEC_CONFDIR IPSEC_PIDDIR IPSEC_SCRIPT IPSEC_VERSION IPSEC_NAME IPSEC_STARTER_PID IPSEC_CHARON_PID
IPSEC_DISTRO="Institute for Internet Technologies and Applications\nUniversity of Applied Sciences Rapperswil, Switzerland"
@@ -316,7 +315,7 @@ update)
;;
pki)
shift
- exec $IPSEC_BINDIR/pki "$@"
+ exec pki "$@"
;;
version|--version)
printf "$OS_NAME $IPSEC_NAME $IPSEC_VERSION\n"
diff --git a/src/pki/Makefile.am b/src/pki/Makefile.am
index efbed9b..7835152 100644
--- a/src/pki/Makefile.am
+++ b/src/pki/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = man

7
strongswan.spec
View File

@@ -2,7 +2,7 @@
Name: strongswan
Version: 5.1.2
Release: 3%{?dist}
Release: 4%{?dist}
Summary: An OpenSource IPsec-based VPN Solution
Group: System Environment/Daemons
License: GPLv2+
@@ -29,7 +29,7 @@ Patch6: strongswan-5.1.1-selinux.patch
# http://wiki.strongswan.org/issues/536
Patch7: strongswan-5.1.2-autoconf.patch
# Fix pki utility location
# TBD
# http://wiki.strongswan.org/issues/552
Patch8: strongswan-5.1.2-libexec.patch
BuildRequires: gmp-devel autoconf automake
BuildRequires: libcurl-devel
@@ -473,6 +473,9 @@ fi
%endif
%changelog
* Mon Mar 24 2014 Pavel Šimerda <psimerda@redhat.com> - 5.1.2-4
- #1069928 - updated libexec patch.
* Tue Mar 18 2014 Pavel Šimerda <psimerda@redhat.com> - 5.1.2-3
- fixed el6 initscript
- fixed pki directory location