update tinc to version 1.0.4

[openwrt.git] / package / openswan / patches / scripts.patch

diff --git a/package/openswan/patches/scripts.patch b/package/openswan/patches/scripts.patch
index 5864ce9..f788f78 100644 (file)
--- a/package/openswan/patches/scripts.patch
+++ b/package/openswan/patches/scripts.patch
@@ -63,7 +63,7 @@ diff -uNr openswan-2.3.0.orig/programs/setup/setup.in openswan-2.3.0/programs/se
        fi
 +
 +      # make sure all required directories exist
-+      if [ ! -d /var/run ]
++      if [ ! -d /var/run/pluto ]
 +      then
 +              mkdir -p /var/run/pluto
 +      fi
@@ -74,17 +74,6 @@ diff -uNr openswan-2.3.0.orig/programs/setup/setup.in openswan-2.3.0/programs/se
        tmp=/var/run/pluto/ipsec_setup.st
        outtmp=/var/run/pluto/ipsec_setup.out
        (
---- openswan-2.3.0.orig/programs/setup/Makefile        2004-04-03 19:44:48.000000000 +0000
-+++ openswan-2.3.0/programs/setup/Makefile     2005-02-02 20:34:54.000000000 +0000
-@@ -32,7 +32,7 @@
- install:: setup
-       @rm -f $(BINDIR)/setup
-       @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
--      @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
-+      @ln -s $(FINALRCDIR)/S50ipsec $(BINDIR)/setup
-       -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
-       -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
-       -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
 diff -uNr openswan-2.3.0.orig/programs/showhostkey/showhostkey.in openswan-2.3.0/programs/showhostkey/showhostkey.in
 --- openswan-2.3.0.orig/programs/showhostkey/showhostkey.in    2004-11-14 13:40:41.000000000 +0000
 +++ openswan-2.3.0/programs/showhostkey/showhostkey.in 2005-02-02 20:34:54.000000000 +0000
@@ -93,7 +82,7 @@ diff -uNr openswan-2.3.0.orig/programs/showhostkey/showhostkey.in openswan-2.3.0
  fi
  
 -host="`hostname --fqdn`"
-+host="`nvram get wan_hostname`"
++host="`cat /proc/sys/kernel/hostname`"
  
  awk ' BEGIN {
 
@@ -168,3 +157,53 @@ diff -uNr openswan-2.3.0.orig/programs/_realsetup/_realsetup.in openswan-2.3.0/p
                then
                        echo Cannot write to directory to create \"$stderrlog\".
                        exit 1
+diff -urN openswan-2.3.1.old/programs/_startklips/_startklips.in openswan-2.3.1/programs/_startklips/_startklips.in
+--- openswan-2.3.1.old/programs/_startklips/_startklips.in     2005-04-10 23:57:51.000000000 +0200
++++ openswan-2.3.1/programs/_startklips/_startklips.in 2005-04-11 00:00:36.000000000 +0200
+@@ -262,15 +262,15 @@
+     echo "FATAL ERROR: Both KLIPS and NETKEY IPsec code is present in kernel"
+     exit
+ fi
+-if test ! -f $ipsecversion && test ! -f $netkey && modprobe -qn ipsec
++if test ! -f $ipsecversion && test ! -f $netkey && insmod ipsec
+ then
+     # statically compiled KLIPS/NETKEY not found; try to load the module
+-    modprobe ipsec
++    insmod ipsec
+ fi
+ 
+ if test ! -f $ipsecversion && test ! -f $netkey
+ then
+-      modprobe -v af_key
++      insmod -v af_key
+ fi
+ 
+ if test -f $netkey
+@@ -278,18 +278,18 @@
+       klips=false
+       if test -f $modules
+       then
+-              modprobe -qv ah4
+-              modprobe -qv esp4
+-              modprobe -qv ipcomp
++              insmod -qv ah4
++              insmod -qv esp4
++              insmod -qv ipcomp
+               #  xfrm4_tunnel is needed by ipip and ipcomp
+-              modprobe -qv xfrm4_tunnel
++              insmod -qv xfrm4_tunnel
+               # xfrm_user contains netlink support for IPsec 
+-              modprobe -qv xfrm_user
++              insmod -qv xfrm_user
+               # load the most common ciphers/algo's
+-              modprobe -qv sha1
+-              modprobe -qv md5
+-              modprobe -qv des
+-              modprobe -qv aes
++              insmod -qv sha1
++              insmod -qv md5
++              insmod -qv des
++              insmod -qv aes
+       fi
+ fi
+