[gentoo-commits] gentoo-x86 commit in net-misc/strongswan/files: ipsec digest-strongswan-4.1.9 ipsec-install-4.1.9.patch digest-strongswan-2.8.3

[Lars Weiler (pylon)]

pylon       07/12/16 14:32:51

  Modified:             ipsec
  Added:                digest-strongswan-4.1.9 ipsec-install-4.1.9.patch
  Removed:              digest-strongswan-2.8.3
  Log:
  Version bump; new init-script; cleanup; quotes.
  (Portage version: 2.1.4_rc10)

Revision  Changes    Path
1.2                  net-misc/strongswan/files/ipsec

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/strongswan/files/ipsec?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/strongswan/files/ipsec?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/strongswan/files/ipsec?r1=1.1&r2=1.2

Index: ipsec
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/strongswan/files/ipsec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipsec	19 May 2004 14:26:23 -0000	1.1
+++ ipsec	16 Dec 2007 14:32:50 -0000	1.2
@@ -1,56 +1,33 @@
 #!/sbin/runscript
-
-# IPsec startup and shutdown script
-# Copyright (C) 1998, 1999, 2001  Henry Spencer.
-# Gentoo mods (C) 2003 Anthony de Boer
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	need net logger
-}
-
-ipsecdoit() {
-# Pick up IPsec configuration (until we have done this, successfully, we
-# do not know where errors should go, hence the explicit "daemon.error"s.)
-# Note the "--export", which exports the variables created.
-	eval `ipsec _confread --varprefix IPSEC --export --type config setup`
-	if test " $IPSEC_confreadstatus" != " "
-	then
-		echo "$IPSEC_confreadstatus -- \`$1' aborted" |
-			logger -s -p daemon.error -t ipsec_setup
-		exit 1
-	fi
-	IPSECsyslog=${IPSECsyslog-daemon.error}
-	export IPSECsyslog
-	umask 022
-	tmp=/var/run/ipsec_setup.st
-	(
-		ipsec _realsetup $1
-		echo "$?" >$tmp
-	) 2>&1 | logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
-	st=`cat $tmp`
-	rm -f $tmp
-	return $st
+	need logger net
 }
 
 start() {
-	ebegin "Starting IPSEC ..."
-	ipsecdoit start
+	ebegin "Starting ${IPSECD}"
+	ipsec start
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping IPSEC ..."
-	ipsecdoit stop
+	ebegin "Stopping ${IPSECD}"
+	ipsec stop
+	eend $?
+}
+
+restart() {
+	ebegin "Restarting ${IPSECD}"
+	svc_stop
+	sleep 2
+	svc_start
 	eend $?
 }
 
+status() {
+	ebegin "${IPSECD} Status (verbose):"
+	ipsec statusall
+	eend $?
+}



1.1                  net-misc/strongswan/files/digest-strongswan-4.1.9

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/strongswan/files/digest-strongswan-4.1.9?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/strongswan/files/digest-strongswan-4.1.9?rev=1.1&content-type=text/plain

Index: digest-strongswan-4.1.9
===================================================================
MD5 5b78f00cba3c0d6edd97ee25108c4b6b strongswan-4.1.9.tar.bz2 2176339
RMD160 a140bd2295284910dc8e54bba1227f0bd384813f strongswan-4.1.9.tar.bz2 2176339
SHA256 37ea5119dc54cb150d444302f82f84854a15d35e45a817e3a29be86b7d750587 strongswan-4.1.9.tar.bz2 2176339



1.1                  net-misc/strongswan/files/ipsec-install-4.1.9.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/strongswan/files/ipsec-install-4.1.9.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/strongswan/files/ipsec-install-4.1.9.patch?rev=1.1&content-type=text/plain

Index: ipsec-install-4.1.9.patch
===================================================================
diff -uprN strongswan-4.1.9.orig/src/starter/Makefile.am strongswan-4.1.9/src/starter/Makefile.am
--- strongswan-4.1.9.orig/src/starter/Makefile.am	2007-11-06 12:37:59.000000000 +0100
+++ strongswan-4.1.9/src/starter/Makefile.am	2007-12-14 21:29:01.000000000 +0100
@@ -31,4 +31,4 @@ defs.o:		$(PLUTODIR)/defs.c $(PLUTODIR)/
 		$(COMPILE) -c -o $@ $<
 
 install-exec-local :
-		test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" || $(INSTALL) ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf
+		test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" || $(INSTALL) -D ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf



-- 
gentoo-commits@g.o mailing list