- updatet to 1.95

Changed files:
    freeswan-Makefiles.patch -> 1.6
    freeswan-init.patch -> 1.4

diff --git a/freeswan-Makefiles.patch b/freeswan-Makefiles.patch
index a3310a66771c7e504c5730c7d58e7144e098a931..c5feb74712a52b2c8582e41aa75ac6780c6c1873 100644 (file)
--- a/freeswan-Makefiles.patch
+++ b/freeswan-Makefiles.patch
@@ -1,6 +1,6 @@
-diff -Naur freeswan-1.95/Makefile.inc freeswan-1.95-p/Makefile.inc
---- freeswan-1.95/Makefile.inc Fri Feb  1 04:26:40 2002
-+++ freeswan-1.95-p/Makefile.inc       Thu Feb  7 19:23:59 2002
+diff -Naur freeswan-1.95.orig/Makefile.inc freeswan-1.95/Makefile.inc
+--- freeswan-1.95.orig/Makefile.inc    Mon Feb 18 12:48:29 2002
++++ freeswan-1.95/Makefile.inc Mon Feb 18 12:50:31 2002
 @@ -45,7 +45,7 @@
  DESTDIR=
  
@@ -10,6 +10,23 @@ diff -Naur freeswan-1.95/Makefile.inc freeswan-1.95-p/Makefile.inc
  
  # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
  # settings which are assumed to include it (or at least, to include *some*
+@@ -59,14 +59,14 @@
+ 
+ # where the appropriate manpage tree is located
+ # location within INC_USRLOCAL
+-INC_MANDIR=man
++INC_MANDIR=share/man
+ # the full pathname
+ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_MANDIR)
+ # all relevant subdirectories of MANTREE
+ MANPLACES=man3 man5 man8
+ 
+ # where configuration files go
+-CONFDIR=$(DESTDIR)/etc
++CONFDIR=$(DESTDIR)/etc/ipsec
+ 
+ # An attempt is made to automatically figure out where boot/shutdown scripts 
+ # will finally go:  the first directory in INC_RCDIRS which exists gets them.
 @@ -80,10 +80,7 @@
  # will finally be (so utils/Makefile can create a symlink in BINDIR to the
  # place where the boot/shutdown script will finally be, rather than the
@@ -33,15 +50,15 @@ diff -Naur freeswan-1.95/Makefile.inc freeswan-1.95-p/Makefile.inc
  
  # extra options for use in kernel build
  KERNMAKEOPTS=
-diff -Naur freeswan-1.95/pluto/Makefile freeswan-1.95-p/pluto/Makefile
---- freeswan-1.95/pluto/Makefile       Tue Nov 27 17:33:42 2001
-+++ freeswan-1.95-p/pluto/Makefile     Thu Feb  7 19:26:29 2002
+diff -Naur freeswan-1.95.orig/pluto/Makefile freeswan-1.95/pluto/Makefile
+--- freeswan-1.95.orig/pluto/Makefile  Mon Feb 18 12:48:23 2002
++++ freeswan-1.95/pluto/Makefile       Mon Feb 18 12:55:38 2002
 @@ -71,7 +71,8 @@
  
  CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) \
        -DPLUTO -DKLIPS -DDODGE_DH_MISSING_ZERO_BUG \
 -      -DDEBUG -DGCC_LINT # -DLEAK_DETECTIVE
-+      -DDEBUG -DGCC_LINT -DSHARED_SECRETS_FILE='"/etc/freeswan/ipsec.secrets"'
++      -DDEBUG -DGCC_LINT -DSHARED_SECRETS_FILE='"/etc/ipsec/ipsec.secrets"'
 +      # -DLEAK_DETECTIVE
  
  ALLFLAGS = $(CPPFLAGS) $(CFLAGS)

diff --git a/freeswan-init.patch b/freeswan-init.patch
index a78d70fac760cb902aefe0db1185b11458d7fbf7..9d9e481f68983cb568dddba63e0655c4d37bb145 100644 (file)
--- a/freeswan-init.patch
+++ b/freeswan-init.patch
@@ -1,64 +1,115 @@
-diff -durN freeswan-1.4.orig/utils/setup freeswan-1.4/utils/setup
---- freeswan-1.4.orig/utils/setup      Mon May 22 06:37:57 2000
-+++ freeswan-1.4/utils/setup   Sat Jun 10 13:07:02 2000
-@@ -37,6 +37,8 @@
-       export PATH
- fi
+diff -Naur freeswan-1.95.orig/utils/setup freeswan-1.95/utils/setup
+--- freeswan-1.95.orig/utils/setup     Mon Feb 18 12:48:24 2002
++++ freeswan-1.95/utils/setup  Mon Feb 18 13:45:46 2002
+@@ -30,10 +30,27 @@
+ # description: IPsec provides encrypted and authenticated communications; \
+ # KLIPS is the kernel half of it, Pluto is the user-level management daemon.
  
+-me='ipsec setup'              # for messages
++# Source function library
 +. /etc/rc.d/init.d/functions
 +
- me='ipsec setup'              # for messages
++# Get network config
++. /etc/sysconfig/network
++
++# Check that networking is up.
++if is_yes "${NETWORKING}"; then
++      if [ ! -f /var/lock/subsys/network ]; then
++              # nls "ERROR: Networking is down. %s can't be run." <service>
++              msg_network_down <service>
++              exit 1
++      fi
++else
++      exit 0
++fi
+ 
  
- # make sure output of (e.g.) ifconfig is in English
-@@ -368,7 +370,7 @@
- # logging control
- logit() {
-       IPSECsyslog=${IPSECsyslog-daemon.error}
--      logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
-+      logger -p $IPSECsyslog -t ipsec_setup 2>&1
- }
- logonly() {
-       IPSECsyslog=${IPSECsyslog-daemon.error}
-@@ -391,12 +393,14 @@
-       # Start things rolling.
-       # (Warning, changes to this log message may affect barf.)
-       version="`ipsec --version | awk 'NR == 1 { print $3 }'`"
-+      msg_starting "FreeS/WAN IPSEC"; busy
-       echo "Starting FreeS/WAN IPSEC $version..." | logit
-       rm -f $info
-       if test ! -r /dev/random
-       then
-               echo "...unable to start FreeS/WAN IPSEC, no /dev/random!" |
-                                                                       logit
-+              fail
-               exit 1
-       fi
-       startklips 2>&1 | logit
-@@ -434,10 +438,12 @@
-       fore)   plutogo 2>&1 | logit    ;;
-       esac
-       echo "...FreeS/WAN IPSEC started" | logonly
-+      ok
-       ;;
  
-   stop|--stop)
-       # Shut things down.
-+      msg_stopping "FreeS/WAN IPSEC" ; busy
-       echo "Stopping FreeS/WAN IPSEC..." | logit
-       if test " $IPSECforwardcontrol" = " yes"
-       then
-@@ -485,8 +491,14 @@
++me='ipsec setup'              # for messages
++
+ if test " $IPSEC_DIR" = " "   # if we were not called by the ipsec command
+ then
+       # we must establish a suitable PATH ourselves
+@@ -54,7 +71,7 @@
+ if ! test "$found"
+ then
+       echo "cannot find ipsec command -- \`$1' aborted" |
+-              logger -s -p daemon.error -t ipsec_setup
++              logger -p daemon.error -t ipsec_setup
+       exit 1
+ fi
+ 
+@@ -65,7 +82,7 @@
+ if test " $IPSEC_confreadstatus" != " "
+ then
+       echo "$IPSEC_confreadstatus -- \`$1' aborted" |
+-              logger -s -p daemon.error -t ipsec_setup
++              logger -p daemon.error -t ipsec_setup
+       exit 1
+ fi
+ IPSECsyslog=${IPSECsyslog-daemon.error}
+@@ -78,21 +95,51 @@
+ 
+ # do it
+ case "$1" in
+-  start|--start|stop|--stop|_autostop|_autostart)
+-      if test " `id -u`" != " 0"
+-      then
+-              echo "permission denied (must be superuser)" |
+-                      logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
++  start|--start|_autostart)
++      # Check if the service is already running?
++      if [ ! -f /var/lock/subsys/ipsec ]; then
++              # show "Starting %s service" ipsec
++              msg_starting ipsec
++              if test " `id -u`" != " 0"
++              then
++                  echo "permission denied (must be superuser)" |
++                      logger -p $IPSECsyslog -t ipsec_setup 2>&1
++                  exit 1
++              fi
++              (
++                  ipsec _realsetup $1 
++                  RETVAL=$?
++              ) 2>&1 | logger -p $IPSECsyslog -t ipsec_setup 2>&1
++              RETVAL=$?
++              [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ipsec
++      else
++              # show "%s service is already running." ipsec
++              msg_already_running ipsec
+               exit 1
        fi
-       rm -f $info
-       echo "...FreeS/WAN IPSEC stopped" | logonly
-+      ok
+-      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
+-      exit $st
++      ;;
++
++  stop|--stop|_autostop)
++        # Stop daemons.
++        # show "Stopping %s service" ipsec
++      if [ -f /var/lock/subsys/ipsec ]; then
++              msg_stopping ipsec
++              if test " `id -u`" != " 0"
++              then
++                  echo "permission denied (must be superuser)" |
++                      logger -p $IPSECsyslog -t ipsec_setup 2>&1
++                  exit 1
++              fi
++              (
++                  ipsec _realsetup $1 
++                  RETVAL=$?
++              ) 2>&1 | logger -p $IPSECsyslog -t ipsec_setup 2>&1
++              rm -f /var/lock/subsys/ipsec
++      else
++              # show "%s service is not running." ipsec
++              msg_not_running ipsec
++              exit 1
++      fi      
        ;;
  
-+  status|--status)
-+      status pluto
-+      ipsec look
-+      ;;
-+      
    restart|--restart)
-       $0 stop
-       $0 start