source: freewrt/package/openswan/patches/scripts.patch@ b917538

programs/loggerfix

@@ +1 @@
+#!/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

programs/look/look.in

@@ -84 +84 @@
 then
         pat="$pat|$defaultroutephys\$|$defaultroutevirt\$"
 else
-        for i in `echo "$IPSECinterfaces" | sed 's/=/ /'`
+        for i in `echo "$IPSECinterfaces" | tr '=' ' '`
         do
                 pat="$pat|$i\$"
         done

programs/_plutorun/_plutorun.in

@@ -147 +147 @@
                         exit 1
                 fi
         else
-                if test ! -w "`dirname $stderrlog`"
+                if test ! -w "`echo $stderrlog | sed -r 's/(^.*\/)(.*$)/\1/'`"
                 then
                         echo Cannot write to directory to create \"$stderrlog\".
                         exit 1

programs/_realsetup/_realsetup.in

@@ -232 +232 @@
 
         # misc pre-Pluto setup
 
-        perform test -d `dirname $subsyslock` "&&" touch $subsyslock
+        perform test -d `echo $subsyslock | sed -r 's/(^.*\/)(.*$)/\1/'` "&&" touch $subsyslock
 
         if test " $IPSECforwardcontrol" = " yes"
         then
@@ -344 +344 @@
                 lsmod 2>&1 | grep "^xfrm_user" > /dev/null && rmmod -s xfrm_user
         fi 
 
-        perform test -d `dirname $subsyslock` "&&" rm -f $subsyslock
+        perform test -d `echo $subsyslock | sed -r 's/(^.*\/)(.*$)/\1/'` "&&" touch $subsyslock "&&" rm -f $subsyslock
 
         perform rm -f $info $lock $plutopid
         perform echo "...Openswan IPsec stopped" "|" $LOGONLY

programs/send-pr/send-pr.in

@@ -402 +402 @@
                     else
                         if [ "$fieldname" != "Category" ]
                         then
-                            values=`${BINDIR}/query-pr --valid-values $fieldname | sed ':a;N;$!ba;s/\n/ /g' | sed 's/ *$//g;s/ / | /g;s/^/[ /;s/$/ ]/;'`
+                            values=`${BINDIR}/query-pr --valid-values $fieldname | tr '\n' ' ' | sed 's/ *$//g;s/ / | /g;s/^/[ /;s/$/ ]/;'`
                             valslen=`echo "$values" | wc -c`
                         else
                             values="choose from a category listed above"
@@ -414 +414 @@
                         else
                                 desc="<${values} (one line)>";
                         fi
-                        dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
+                        dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
                         echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
                     fi
                     echo "${fmtname}${desc}" >> $file
@@ -425 +425 @@
                         desc="  $default_val";
                     else
                         desc="  <`${BINDIR}/query-pr --field-description $fieldname` (multiple lines)>";
-                        dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
+                        dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
                         echo "s/^${dpat}//" >> $FIXFIL
                     fi
                     echo "${fmtname}" >> $file;
@@ -437 +437 @@
                         desc="${default_val}"
                     else
                         desc="<`${BINDIR}/query-pr --field-description $fieldname` (one line)>"
-                        dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
+                        dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
                         echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
                     fi
                     echo "${fmtname}${desc}" >> $file

programs/setup/setup.in

@@ -117 +117 @@
 # do it
 case "$1" in
   start|--start|stop|--stop|_autostop|_autostart)
-        if test " `id -u`" != " 0"
+        if [ "x${USER}" != "xroot" ]
         then
                 echo "permission denied (must be superuser)" |
                         logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
                 exit 1
         fi
+
+        # make sure all required directories exist
+        if [ ! -d /var/run/pluto ]
+        then
+                mkdir -p /var/run/pluto
+        fi
+        if [ ! -d /var/lock/subsys ]
+        then
+                mkdir -p /var/lock/subsys
+        fi
         tmp=/var/run/pluto/ipsec_setup.st
         outtmp=/var/run/pluto/ipsec_setup.out
         (

programs/showhostkey/showhostkey.in

@@ -63 +63 @@
         exit 1
 fi
 
-host="`hostname --fqdn`"
+host="`cat /proc/sys/kernel/hostname`"
 
 awk '   BEGIN {
                 inkey = 0

programs/_startklips/_startklips.in

@@ -242 +242 @@
         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 +262 @@
     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 +278 @@
         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
                 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
         fi
 fi
 
@@ -312 +312 @@
                 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
+                insmod -v ipsec
         fi
         if test ! -f $ipsecversion
         then