openwrt/package/openswan/patches/scripts.patch

   1 diff -urN openswan-2.4.6/programs/loggerfix openswan-2.4.6.new/programs/loggerfix
   2 --- openswan-2.4.6/programs/loggerfix   1970-01-01 01:00:00.000000000 +0100
   3 +++ openswan-2.4.6.new/programs/loggerfix       2006-08-22 15:55:14.000000000 +0200
   4 @@ -0,0 +1,5 @@
   5 +#!/bin/sh
   6 +# use filename instead of /dev/null to log, but dont log to flash or ram
   7 +# pref. log to nfs mount
   8 +echo "$*" >> /dev/null
   9 +exit 0
  10 diff -urN openswan-2.4.6/programs/look/look.in openswan-2.4.6.new/programs/look/look.in
  11 --- openswan-2.4.6/programs/look/look.in        2005-08-18 16:10:09.000000000 +0200
  12 +++ openswan-2.4.6.new/programs/look/look.in    2006-08-22 15:43:14.000000000 +0200
  13 @@ -84,7 +84,7 @@
  14  then
  15         pat="$pat|$defaultroutephys\$|$defaultroutevirt\$"
  16  else
  17 -       for i in `echo "$IPSECinterfaces" | sed 's/=/ /'`
  18 +       for i in `echo "$IPSECinterfaces" | tr '=' ' '`
  19         do
  20                 pat="$pat|$i\$"
  21         done
  22 diff -urN openswan-2.4.6/programs/_plutorun/_plutorun.in openswan-2.4.6.new/programs/_plutorun/_plutorun.in
  23 --- openswan-2.4.6/programs/_plutorun/_plutorun.in      2006-04-21 17:41:45.000000000 +0200
  24 +++ openswan-2.4.6.new/programs/_plutorun/_plutorun.in  2006-08-22 15:47:32.000000000 +0200
  25 @@ -147,7 +147,7 @@
  26                         exit 1
  27                 fi
  28         else
  29 -               if test ! -w "`dirname $stderrlog`"
  30 +               if test ! -w "`echo $stderrlog | sed -r 's/(^.*\/)(.*$)/\1/'`"
  31                 then
  32                         echo Cannot write to directory to create \"$stderrlog\".
  33                         exit 1
  34 diff -urN openswan-2.4.6/programs/_realsetup/_realsetup.in openswan-2.4.6.new/programs/_realsetup/_realsetup.in
  35 --- openswan-2.4.6/programs/_realsetup/_realsetup.in    2006-05-05 20:49:45.000000000 +0200
  36 +++ openswan-2.4.6.new/programs/_realsetup/_realsetup.in        2006-08-22 15:48:13.000000000 +0200
  37 @@ -232,7 +232,7 @@
  38
  39         # misc pre-Pluto setup
  40
  41 -       perform test -d `dirname $subsyslock` "&&" touch $subsyslock
  42 +       perform test -d `echo $subsyslock | sed -r 's/(^.*\/)(.*$)/\1/'` "&&" touch $subsyslock "&&" rm -f $subsyslock
  43
  44         if test " $IPSECforwardcontrol" = " yes"
  45         then
  46 diff -urN openswan-2.4.6/programs/send-pr/send-pr.in openswan-2.4.6.new/programs/send-pr/send-pr.in
  47 --- openswan-2.4.6/programs/send-pr/send-pr.in  2005-04-18 01:04:46.000000000 +0200
  48 +++ openswan-2.4.6.new/programs/send-pr/send-pr.in      2006-08-22 15:51:09.000000000 +0200
  49 @@ -402,7 +402,7 @@
  50                     else
  51                         if [ "$fieldname" != "Category" ]
  52                         then
  53 -                           values=`${BINDIR}/query-pr --valid-values $fieldname | sed ':a;N;$!ba;s/\n/ /g' | sed 's/ *$//g;s/ / | /g;s/^/[ /;s/$/ ]/;'`
  54 +                           values=`${BINDIR}/query-pr --valid-values $fieldname | tr '\n' ' ' | sed 's/ *$//g;s/ / | /g;s/^/[ /;s/$/ ]/;'`
  55                             valslen=`echo "$values" | wc -c`
  56                         else
  57                             values="choose from a category listed above"
  58 @@ -414,7 +414,7 @@
  59                         else
  60                                 desc="<${values} (one line)>";
  61                         fi
  62 -                       dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
  63 +                       dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
  64                         echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
  65                     fi
  66                     echo "${fmtname}${desc}" >> $file
  67 @@ -425,7 +425,7 @@
  68                         desc="  $default_val";
  69                     else
  70                         desc="  <`${BINDIR}/query-pr --field-description $fieldname` (multiple lines)>";
  71 -                       dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
  72 +                       dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
  73                         echo "s/^${dpat}//" >> $FIXFIL
  74                     fi
  75                     echo "${fmtname}" >> $file;
  76 @@ -437,7 +437,7 @@
  77                         desc="${default_val}"
  78                     else
  79                         desc="<`${BINDIR}/query-pr --field-description $fieldname` (one line)>"
  80 -                       dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
  81 +                       dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
  82                         echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
  83                     fi
  84                     echo "${fmtname}${desc}" >> $file
  85 diff -urN openswan-2.4.6/programs/setup/setup.in openswan-2.4.6.new/programs/setup/setup.in
  86 --- openswan-2.4.6/programs/setup/setup.in      2005-07-25 21:17:03.000000000 +0200
  87 +++ openswan-2.4.6.new/programs/setup/setup.in  2006-08-22 15:52:25.000000000 +0200
  88 @@ -117,12 +117,21 @@
  89  # do it
  90  case "$1" in
  91    start|--start|stop|--stop|_autostop|_autostart)
  92 -       if test " `id -u`" != " 0"
  93 +       if [ "x${USER}" != "xroot" ]
  94         then
  95                 echo "permission denied (must be superuser)" |
  96                         logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
  97                 exit 1
  98         fi
  99 +       # make sure all required directories exist
 100 +       if [ ! -d /var/run/pluto ]
 101 +       then
 102 +               mkdir -p /var/run/pluto
 103 +       fi
 104 +       if [ ! -d /var/lock/subsys ]
 105 +       then
 106 +               mkdir -p /var/lock/subsys
 107 +       fi
 108         tmp=/var/run/pluto/ipsec_setup.st
 109         outtmp=/var/run/pluto/ipsec_setup.out
 110         (
 111 diff -urN openswan-2.4.6/programs/showhostkey/showhostkey.in openswan-2.4.6.new/programs/showhostkey/showhostkey.in
 112 --- openswan-2.4.6/programs/showhostkey/showhostkey.in  2004-11-14 14:40:41.000000000 +0100
 113 +++ openswan-2.4.6.new/programs/showhostkey/showhostkey.in      2006-08-22 15:54:21.000000000 +0200
 114 @@ -63,7 +63,7 @@
 115         exit 1
 116  fi
 117
 118 -host="`hostname --fqdn`"
 119 +host="`cat /proc/sys/kernel/hostname`"
 120
 121  awk '  BEGIN {
 122                 inkey = 0
 123 @@ -81,7 +81,7 @@
 124                 os = "[ \t]*"
 125                 x = "[^ \t]+"
 126                 oc = "(#.*)?"
 127 -               suffix = ":" os "[rR][sS][aA]" os "{" os oc "$"
 128 +               suffix = ":" os "[rR][sS][aA]" os "\0173" os oc "$"
 129                 if (id == "") {
 130                         pat = "^" suffix
 131                         printid = "default"
 132 diff -urN openswan-2.4.6/programs/_startklips/_startklips.in openswan-2.4.6.new/programs/_startklips/_startklips.in
 133 --- openswan-2.4.6/programs/_startklips/_startklips.in  2006-05-09 20:34:34.000000000 +0200
 134 +++ openswan-2.4.6.new/programs/_startklips/_startklips.in      2006-08-22 15:57:53.000000000 +0200
 135 @@ -265,12 +265,12 @@
 136  if test ! -f $ipsecversion && test ! -f $netkey && modprobe -qn ipsec
 137  then
 138      # statically compiled KLIPS/NETKEY not found; try to load the module
 139 -    modprobe ipsec
 140 +    insmod ipsec
 141  fi
 142
 143  if test ! -f $ipsecversion && test ! -f $netkey
 144  then
 145 -       modprobe -v af_key
 146 +       insmod -v af_key
 147  fi
 148
 149  if test -f $netkey
 150 @@ -278,25 +278,25 @@
 151         klips=false
 152         if test -f $modules
 153         then
 154 -               modprobe -qv ah4
 155 -               modprobe -qv esp4
 156 -               modprobe -qv ipcomp
 157 +               insmod -qv ah4
 158 +               insmod -qv esp4
 159 +               insmod -qv ipcomp
 160                 #  xfrm4_tunnel is needed by ipip and ipcomp
 161 -               modprobe -qv xfrm4_tunnel
 162 +               insmod -qv xfrm4_tunnel
 163                 # xfrm_user contains netlink support for IPsec
 164                 modprobe -qv xfrm_user
 165                 if [ -n "`cat /proc/cpuinfo |grep Nehemiah`" ]
 166                 then
 167                         echo "VIA Nehemiah detected, probing for PadLock"
 168 -                       modprobe -qv hw_random
 169 +                       insmod -qv hw_random
 170                         # padlock must load before aes module
 171 -                       modprobe -qv padlock
 172 +                       insmod -qv padlock
 173                 fi
 174                 # load the most common ciphers/algo's
 175 -               modprobe -qv sha1
 176 -               modprobe -qv md5
 177 -               modprobe -qv des
 178 -               modprobe -qv aes
 179 +               insmod -qv sha1
 180 +               insmod -qv md5
 181 +               insmod -qv des
 182 +               insmod -qv aes
 183         fi
 184  fi
 185
 186 @@ -312,10 +312,16 @@
 187                 fi
 188                  unset MODPATH MODULECONF        # no user overrides!
 189                  depmod -a >/dev/null 2>&1
 190 -               modprobe -qv hw_random
 191 +               insmod -qv hw_random
 192                 # padlock must load before aes module
 193 -               modprobe -qv padlock
 194 -                modprobe -v ipsec
 195 +               insmod -qv padlock
 196 +                if [ -f modprobe ]
 197 +               then
 198 +                       modprobe -v ipsec
 199 +               elif [ -f insmod ]
 200 +               then
 201 +                       insmod ipsec
 202 +               fi
 203          fi
 204          if test ! -f $ipsecversion
 205          then
 206 --- openswan-2.4.6/programs/starter/netkey.c    2004-12-01 08:31:26.000000000 +0100
 207 +++ openswan-2.4.6.new/programs/starter/netkey.c        2006-09-15 15:06:18.000000000 +0200
 208 @@ -75,7 +75,7 @@
 209                 if (stat(PROC_MODULES,&stb)==0) {
 210                         unsetenv("MODPATH");
 211                         unsetenv("MODULECONF");
 212 -                       system("depmod -a >/dev/null 2>&1 && modprobe xfrm4_tunnel esp4 ah4 af_key");
 213 +                       system("depmod -a >/dev/null 2>&1 && insmod xfrm4_tunnel esp4 ah4 af_key");
 214                 }
 215                 if (stat(PROC_NETKEY,&stb)==0) {
 216                         _netkey_module_loaded = 1;
 217 --- openswan-2.4.6/programs/starter/klips.c     2004-01-21 02:35:29.000000000 +0100
 218 +++ openswan-2.4.6.new/programs/starter/klips.c 2006-09-15 15:05:37.000000000 +0200
 219 @@ -83,7 +83,7 @@
 220                 if (stat(PROC_MODULES,&stb)==0) {
 221                         unsetenv("MODPATH");
 222                         unsetenv("MODULECONF");
 223 -                       system("depmod -a >/dev/null 2>&1 && modprobe ipsec");
 224 +                       system("depmod -a >/dev/null 2>&1 && insmod ipsec");
 225                 }
 226                 if (stat(PROC_IPSECVERSION,&stb)==0) {
 227                         _klips_module_loaded = 1;