X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f52d66ff00b24111f87c274d3d7085ef2e1d27b1..00e5005064eda277a53357efedd85bc7d57675ed:/package/openswan/patches/110-scripts.patch

diff --git a/package/openswan/patches/110-scripts.patch b/package/openswan/patches/110-scripts.patch
index ed8eba92c..28269f327 100644
--- a/package/openswan/patches/110-scripts.patch
+++ b/package/openswan/patches/110-scripts.patch
@@ -1,15 +1,17 @@
-diff -urN openswan.old/programs/loggerfix openswan.dev/programs/loggerfix
---- openswan.old/programs/loggerfix	1970-01-01 01:00:00.000000000 +0100
-+++ openswan.dev/programs/loggerfix	2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/loggerfix
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ openswan-2.4.8/programs/loggerfix	2007-06-04 13:22:50.209222320 +0200
 @@ -0,0 +1,5 @@
 +#!/bin/sh
 +# use filename instead of /dev/null to log, but dont log to flash or ram
 +# pref. log to nfs mount
 +echo "$*" >> /dev/null
 +exit 0
-diff -urN openswan.old/programs/look/look.in openswan.dev/programs/look/look.in
---- openswan.old/programs/look/look.in	2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/look/look.in	2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/look/look.in
+===================================================================
+--- openswan-2.4.8.orig/programs/look/look.in	2007-06-04 13:22:49.874273240 +0200
++++ openswan-2.4.8/programs/look/look.in	2007-06-04 13:22:50.209222320 +0200
 @@ -84,7 +84,7 @@
  then
  	pat="$pat|$defaultroutephys\$|$defaultroutevirt\$"
@@ -19,9 +21,10 @@ diff -urN openswan.old/programs/look/look.in openswan.dev/programs/look/look.in
  	do
  		pat="$pat|$i\$"
  	done
-diff -urN openswan.old/programs/_plutorun/_plutorun.in openswan.dev/programs/_plutorun/_plutorun.in
---- openswan.old/programs/_plutorun/_plutorun.in	2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/_plutorun/_plutorun.in	2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/_plutorun/_plutorun.in
+===================================================================
+--- openswan-2.4.8.orig/programs/_plutorun/_plutorun.in	2007-06-04 13:22:49.880272328 +0200
++++ openswan-2.4.8/programs/_plutorun/_plutorun.in	2007-06-04 13:22:50.209222320 +0200
 @@ -147,7 +147,7 @@
  			exit 1
  		fi
@@ -31,9 +34,10 @@ diff -urN openswan.old/programs/_plutorun/_plutorun.in openswan.dev/programs/_pl
  		then
  			echo Cannot write to directory to create \"$stderrlog\".
  			exit 1
-diff -urN openswan.old/programs/_realsetup/_realsetup.in openswan.dev/programs/_realsetup/_realsetup.in
---- openswan.old/programs/_realsetup/_realsetup.in	2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/_realsetup/_realsetup.in	2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/_realsetup/_realsetup.in
+===================================================================
+--- openswan-2.4.8.orig/programs/_realsetup/_realsetup.in	2007-06-04 13:22:49.888271112 +0200
++++ openswan-2.4.8/programs/_realsetup/_realsetup.in	2007-06-04 13:22:50.210222168 +0200
 @@ -232,7 +232,7 @@
  
  	# misc pre-Pluto setup
@@ -43,9 +47,10 @@ diff -urN openswan.old/programs/_realsetup/_realsetup.in openswan.dev/programs/_
  
  	if test " $IPSECforwardcontrol" = " yes"
  	then
-diff -urN openswan.old/programs/send-pr/send-pr.in openswan.dev/programs/send-pr/send-pr.in
---- openswan.old/programs/send-pr/send-pr.in	2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/send-pr/send-pr.in	2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/send-pr/send-pr.in
+===================================================================
+--- openswan-2.4.8.orig/programs/send-pr/send-pr.in	2007-06-04 13:22:49.894270200 +0200
++++ openswan-2.4.8/programs/send-pr/send-pr.in	2007-06-04 13:22:50.210222168 +0200
 @@ -402,7 +402,7 @@
  		    else
  			if [ "$fieldname" != "Category" ]
@@ -82,9 +87,10 @@ diff -urN openswan.old/programs/send-pr/send-pr.in openswan.dev/programs/send-pr
  			echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
  		    fi
  		    echo "${fmtname}${desc}" >> $file
-diff -urN openswan.old/programs/setup/setup.in openswan.dev/programs/setup/setup.in
---- openswan.old/programs/setup/setup.in	2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/setup/setup.in	2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/setup/setup.in
+===================================================================
+--- openswan-2.4.8.orig/programs/setup/setup.in	2007-06-04 13:22:49.902268984 +0200
++++ openswan-2.4.8/programs/setup/setup.in	2007-06-04 13:22:50.210222168 +0200
 @@ -117,12 +117,21 @@
  # do it
  case "$1" in
@@ -108,9 +114,10 @@ diff -urN openswan.old/programs/setup/setup.in openswan.dev/programs/setup/setup
  	tmp=/var/run/pluto/ipsec_setup.st
  	outtmp=/var/run/pluto/ipsec_setup.out
  	(
-diff -urN openswan.old/programs/showhostkey/showhostkey.in openswan.dev/programs/showhostkey/showhostkey.in
---- openswan.old/programs/showhostkey/showhostkey.in	2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/showhostkey/showhostkey.in	2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/showhostkey/showhostkey.in
+===================================================================
+--- openswan-2.4.8.orig/programs/showhostkey/showhostkey.in	2007-06-04 13:22:49.908268072 +0200
++++ openswan-2.4.8/programs/showhostkey/showhostkey.in	2007-06-04 13:22:50.214221560 +0200
 @@ -63,7 +63,7 @@
  	exit 1
  fi
@@ -125,13 +132,14 @@ diff -urN openswan.old/programs/showhostkey/showhostkey.in openswan.dev/programs
  		x = "[^ \t]+"
  		oc = "(#.*)?"
 -		suffix = ":" os "[rR][sS][aA]" os "{" os oc "$"
-+		suffix = ":" os "[rR][sS][aA]" os "\0173" os oc "$"
++		suffix = ":" os "[rR][sS][aA]" os "[{]" os oc "$"
  		if (id == "") {
  			pat = "^" suffix
  			printid = "default"
-diff -urN openswan.old/programs/starter/klips.c openswan.dev/programs/starter/klips.c
---- openswan.old/programs/starter/klips.c	2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/starter/klips.c	2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/starter/klips.c
+===================================================================
+--- openswan-2.4.8.orig/programs/starter/klips.c	2007-06-04 13:22:49.914267160 +0200
++++ openswan-2.4.8/programs/starter/klips.c	2007-06-04 13:22:50.214221560 +0200
 @@ -83,7 +83,7 @@
  		if (stat(PROC_MODULES,&stb)==0) {
  			unsetenv("MODPATH");
@@ -141,9 +149,10 @@ diff -urN openswan.old/programs/starter/klips.c openswan.dev/programs/starter/kl
  		}
  		if (stat(PROC_IPSECVERSION,&stb)==0) {
  			_klips_module_loaded = 1;
-diff -urN openswan.old/programs/starter/netkey.c openswan.dev/programs/starter/netkey.c
---- openswan.old/programs/starter/netkey.c	2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/starter/netkey.c	2006-10-08 20:41:08.000000000 +0200
+Index: openswan-2.4.8/programs/starter/netkey.c
+===================================================================
+--- openswan-2.4.8.orig/programs/starter/netkey.c	2007-06-04 13:22:49.920266248 +0200
++++ openswan-2.4.8/programs/starter/netkey.c	2007-06-04 13:22:50.214221560 +0200
 @@ -75,7 +75,7 @@
  		if (stat(PROC_MODULES,&stb)==0) {
  			unsetenv("MODPATH");
@@ -153,91 +162,78 @@ diff -urN openswan.old/programs/starter/netkey.c openswan.dev/programs/starter/n
  		}
  		if (stat(PROC_NETKEY,&stb)==0) {
  			_netkey_module_loaded = 1;
-diff -urN openswan.old/programs/_startklips/_startklips.in openswan.dev/programs/_startklips/_startklips.in
---- openswan.old/programs/_startklips/_startklips.in	2006-10-08 20:43:21.000000000 +0200
-+++ openswan.dev/programs/_startklips/_startklips.in	2006-10-08 20:41:46.000000000 +0200
-@@ -242,7 +242,7 @@
-         fi
-         if test -f $moduleinstplace/$wantgoo
-         then
--                echo "modprobe failed, but found matching template module $wantgoo."
-+                echo "insmod failed, but found matching template module $wantgoo."
-                 echo "Copying $moduleinstplace/$wantgoo to $module."
-                 rm -f $module
-                 mkdir -p $moduleplace
-@@ -262,15 +262,15 @@
+Index: openswan-2.4.8/programs/_startklips/_startklips.in
+===================================================================
+--- openswan-2.4.8.orig/programs/_startklips/_startklips.in	2007-06-04 13:22:49.928265032 +0200
++++ openswan-2.4.8/programs/_startklips/_startklips.in	2007-06-04 13:22:50.215221408 +0200
+@@ -272,16 +272,16 @@
      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 -q ipsec
++if test ! -f $ipsecversion && test ! -f $netkey
  then
-     # statically compiled KLIPS/NETKEY not found; try to load the module
--    modprobe ipsec
-+    insmod ipsec
+ 	# statically compiled KLIPS/NETKEY not found; but there seems to be an ipsec module
+-	modprobe ipsec 2> /dev/null
++	insmod -q ipsec 2> /dev/null
  fi
  
- if test ! -f $ipsecversion && test ! -f $netkey
+-if test ! -f $ipsecversion && test ! -f $netkey && modprobe -qn af_key
++if test ! -f $ipsecversion && test ! -f $netkey
  then
--	modprobe -v af_key
-+	insmod -v af_key
+ 	# netkey should work then
+-	modprobe af_key 2> /dev/null
++	insmod -q af_key 2> /dev/null
  fi
+ if test ! -f $ipsecversion && test ! -f $netkey 
+ then
+@@ -294,27 +294,27 @@
+ # modules shared between klips and netkey
+ if test -f $modules
+ then
+-	# we modprobe hw_random so ipsec verify can complain about not using it
+-	modprobe -q hw_random 2> /dev/null
++	# we insmod hw_random so ipsec verify can complain about not using it
++	insmod -q hw_random 2> /dev/null
+ 	# padlock must load before aes module
+-	modprobe -q padlock 2> /dev/null
++	insmod -q padlock 2> /dev/null
+ 	# load the most common ciphers/algo's
+-	modprobe -q sha256 2> /dev/null
+-	modprobe -q sha1 2> /dev/null
+-	modprobe -q md5 2> /dev/null
+-	modprobe -q des 2> /dev/null
+-	modprobe -q aes 2> /dev/null
++	insmod -q sha256 2> /dev/null
++	insmod -q sha1 2> /dev/null
++	insmod -q md5 2> /dev/null
++	insmod -q des 2> /dev/null
++	insmod -q aes 2> /dev/null
  
- if test -f $netkey
-@@ -278,25 +278,25 @@
- 	klips=false
- 	if test -f $modules
+ 	if test -f $netkey
  	then
--		modprobe -qv ah4
--		modprobe -qv esp4
--		modprobe -qv ipcomp
-+		insmod -qv ah4
-+		insmod -qv esp4
-+		insmod -qv ipcomp
+ 		klips=false
+-		modprobe -q ah4 2> /dev/null
+-		modprobe -q esp4 2> /dev/null
+-		modprobe -q ipcomp 2> /dev/null
++		insmod -q ah4 2> /dev/null
++		insmod -q esp4 2> /dev/null
++		insmod -q ipcomp 2> /dev/null
  		#  xfrm4_tunnel is needed by ipip and ipcomp
--		modprobe -qv xfrm4_tunnel
-+		insmod -qv xfrm4_tunnel
+-		modprobe -q xfrm4_tunnel 2> /dev/null
++		insmod -q xfrm4_tunnel 2> /dev/null
  		# xfrm_user contains netlink support for IPsec 
--		modprobe -qv xfrm_user
-+		insmod -qv xfrm_user
- 		if [ -n "`cat /proc/cpuinfo |grep Nehemiah`" ]
- 		then
- 			echo "VIA Nehemiah detected, probing for PadLock"
--			modprobe -qv hw_random
-+			insmod -qv hw_random
- 			# padlock must load before aes module
--			modprobe -qv padlock
-+			insmod -qv padlock
- 		fi
- 		# 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
+-		modprobe -q xfrm_user 2> /dev/null
++		insmod -q xfrm_user 2> /dev/null
  	fi
- fi
  
-@@ -312,10 +312,16 @@
+ 	if test ! -f $ipsecversion && $klips
+@@ -327,7 +327,7 @@
  		fi
-                 unset MODPATH MODULECONF        # no user overrides!
-                 depmod -a >/dev/null 2>&1
--		modprobe -qv hw_random
-+		insmod -qv hw_random
- 		# padlock must load before aes module
--		modprobe -qv padlock
--                modprobe -v ipsec
-+		insmod -qv padlock
-+                if [ -f insmod ]
-+		then
-+			insmod -v ipsec
-+		elif [ -f insmod ]
-+		then
-+			insmod ipsec
-+		fi
-         fi
-         if test ! -f $ipsecversion
-         then
+                	unset MODPATH MODULECONF        # no user overrides!
+                	depmod -a >/dev/null 2>&1
+-               	modprobe -v ipsec
++               	insmod -v ipsec
+         	if test ! -f $ipsecversion
+         	then
+                 	echo "kernel appears to lack IPsec support (neither CONFIG_KLIPS or CONFIG_NET_KEY are set)"