ike (2.1.5+dfsg-2) direct (non packaging) changes

Summary

 script/iked             |   23 ++++++++++++++++-------
 source/iked/iked.8      |    2 +-
 source/iked/iked.conf.5 |    2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)

    
download this patch

Patch contents

--- ike-2.1.5+dfsg.orig/source/iked/iked.conf.5
+++ ike-2.1.5+dfsg/source/iked/iked.conf.5
@@ -662,7 +662,7 @@
     nbns4 10.1.1.1;
     dns_suffix "foo.com";
     dns_list "foo.com" "bar.com";
-    banner "/usr/local/etc/iked.motd";
+    banner "/etc/iked.motd";
     pfs_group 2;
 }
 
--- ike-2.1.5+dfsg.orig/source/iked/iked.8
+++ ike-2.1.5+dfsg/source/iked/iked.8
@@ -79,7 +79,7 @@
 The command exits with 0 on success, and non-zero on errors.
 .Sh FILES
 The default configuration file is
-.Pa /usr/local/etc/iked.conf
+.Pa /etc/iked.conf
 .Sh SEE ALSO
 .Xr ikea 1 ,
 .Xr ikec 1 ,
--- ike-2.1.5+dfsg.orig/script/iked
+++ ike-2.1.5+dfsg/script/iked
@@ -1,5 +1,14 @@
 #! /bin/sh
-set -e
+### BEGIN INIT INFO
+# Provides:          ike
+# Required-Start:    $network $remote_fs $syslog
+# Required-Stop:     $network $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start the Shrew VPN daemon.
+# Description:       The Shrew VPN client requires the ike daemon
+#                    to run before being able to connect.
+### END INIT INFO
 
 # /etc/init.d/iked: start and stop the Shrew Soft IKE daemon
 
@@ -7,24 +16,24 @@
 
 . /lib/lsb/init-functions
 
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 case "$1" in
   start)
 	log_begin_msg "Starting Shrew Soft IKE daemon..."
-	start-stop-daemon --start --quiet --exec /usr/sbin/iked || log_end_msg 1
+	start-stop-daemon --start --quiet --oknodo --exec /usr/lib/ike/iked.real --startas /usr/sbin/iked || log_end_msg 1
 	log_end_msg 0
 	;;
   stop)
 	log_begin_msg "Stopping Shrew Soft IKE daemon..."
-	start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/iked || log_end_msg 1
+	start-stop-daemon --stop --quiet --oknodo --exec /usr/lib/ike/iked.real || log_end_msg 1
 	log_end_msg 0
 	;;
 
-  restart)
+  restart|reload|force-reload)
 	log_begin_msg "Restarting Shrew Soft IKE daemon..."
-	start-stop-daemon --stop --quiet --oknodo --retry 30 --exec /usr/sbin/iked || log_end_msg 1
-	start-stop-daemon --start --quiet --exec /usr/sbin/iked || log_end_msg 1
+	start-stop-daemon --stop --quiet --oknodo --retry 30 --exec /usr/lib/ike/iked.real || log_end_msg 1
+	start-stop-daemon --start --quiet --exec /usr/lib/ike/iked.real --startas /usr/sbin/iked || log_end_msg 1
 	log_end_msg 0
 	;;