rpms/ipsec-tools/devel ipsec-tools.spec, 1.70, 1.71 racoon.init, 1.1, 1.2

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1446

Modified Files:
	ipsec-tools.spec racoon.init 
Log Message:
* Wed Apr 14 2010 Tomas Mraz <tmraz at redhat.com> - 0.7.3-5
- fix the initscript (#500571, #521647)



Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- ipsec-tools.spec	25 Sep 2009 14:06:23 -0000	1.70
+++ ipsec-tools.spec	14 Apr 2010 10:32:06 -0000	1.71
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.7.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -29,17 +29,21 @@ Patch18: ipsec-tools-0.7.3-gssapi-mech.p
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
 BuildRequires: libselinux-devel >= 1.30.28-2, pam-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: initscripts >= 7.31.11.EL-1, pam
+Requires: pam
+Requires(post): chkconfig
+Requires(preun): chkconfig, initscripts
 BuildRequires: audit-libs-devel >= 1.3.1
 
 %global racoonconfdir %{_sysconfdir}/racoon
 
 %description
-This is the IPsec-Tools package.  You need this package in order to
-really use the IPsec functionality in the linux-2.5+ kernels.  This
-package builds:
+This package contains tools necessary for establishing
+keys for IPSEC connections including the rekeying during
+the connection lifetime.
 
-- setkey, a program to directly manipulate policies and SAs
+The main tools of this package are:
+
+- setkey, a program to directly manipulate policies and SAs in the kernel
 - racoon, an IKEv1 keying daemon
 
 %prep
@@ -115,7 +119,7 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc src/racoon/samples/racoon.conf src/racoon/samples/psk.txt
 %doc src/racoon/doc/FAQ
 %doc ChangeLog NEWS README
@@ -133,6 +137,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/racoon
 
 %changelog
+* Wed Apr 14 2010 Tomas Mraz <tmraz at redhat.com> - 0.7.3-5
+- fix the initscript (#500571, #521647)
+
 * Fri Sep 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-4
 - properly check for errors on gssapi_get_token_to_send()
 - use proper mechanism when canonicalizing gss names


Index: racoon.init
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/racoon.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- racoon.init	20 Sep 2007 16:42:06 -0000	1.1
+++ racoon.init	14 Apr 2010 10:32:07 -0000	1.2
@@ -1,10 +1,19 @@
 #!/bin/sh
 #
+# racoon IKEv1 key management daemon
+#
 # chkconfig: - 15 85
-# description: racoon is an IKE (ISAKMP/Oakley) key management daemon
+# description: racoon is an IKEv1 (ISAKMP/Oakley) key management daemon
 # processname: racoon
 # config: /etc/racoon/racoon.conf
-#
+
+### BEGIN INIT INFO
+# Provides: ipsec
+# Required-Start: $network $syslog
+# Required-Stop:
+# Short-Description: IKEv1 key management daemon
+# Description: racoon is an IKEv1 (ISAKMP/Oakley) key management daemon
+### END INIT INFO
 
 # Source function library.
 . /etc/init.d/functions
@@ -12,12 +21,14 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
+exec=/usr/sbin/racoon
 prog=racoon
+conf=/etc/racoon/racoon.conf
 lockfile=/var/lock/subsys/$prog
 
-RETVAL=0
-
 start() {
+	[ -x $exec ] || exit 5
+	[ -f $config ] || exit 6
 	echo -n $"Starting $prog: "
 	daemon $prog
 	RETVAL=$?
@@ -39,35 +50,51 @@ dostatus() {
 	status $prog
 }
 
+dostatus_q() {
+	status $prog >/dev/null 2>&1
+}
+
 restart() {
 	stop
 	start
 }
 
-condrestart() {
-	[ -e $lockfile ] && restart || :
+reload() {
+	echo -n $"Reloading $prog: "
+	killproc $prog -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
 }
 
 # See how we were called.
 case "$1" in
   start)
-	start
+	dostatus_q && exit 0
+	$1
 	;;
   stop)
-	stop
+	dostatus_q || exit 0
+	$1
+	;;
+  restart)
+	$1
 	;;
-  restart|reload)
+  reload)
+	dostatus_q || exit 7
+	;;
+  force-reload)
 	restart
 	;;
-  condrestart)
-	condrestart
+  condrestart|try-restart)
+	dostatus_q || exit 0
+	restart
 	;;
   status)
 	dostatus
 	;;
   *)
-	echo "Usage: $prog {start|stop|restart|reload|condrestart|status}"
-	exit 1
+	echo "Usage: $prog {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+	exit 2
 esac
-
-exit $RETVAL
+exit $?