openwrt/package/openswan/patches/scripts.patch

   1 diff -uNr openswan-2.3.0.orig/programs/loggerfix openswan-2.3.0/programs/loggerfix
   2 --- openswan-2.3.0.orig/programs/loggerfix      1970-01-01 00:00:00.000000000 +0000
   3 +++ openswan-2.3.0/programs/loggerfix   2005-02-02 20:34:54.000000000 +0000
   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 -uNr openswan-2.3.0.orig/programs/look/look.in openswan-2.3.0/programs/look/look.in
  11 --- openswan-2.3.0.orig/programs/look/look.in   2003-10-31 02:32:42.000000000 +0000
  12 +++ openswan-2.3.0/programs/look/look.in        2005-02-02 20:34:54.000000000 +0000
  13 @@ -79,7 +79,7 @@
  14  then
  15         pat="$pat|$defaultroutephys\$|$defaultroutevirt\$"
  16  else
  17 -       for i in `echo "$IPSECinterfaces" | tr '=' ' '`
  18 +       for i in `echo "$IPSECinterfaces" | sed 's/=/ /'`
  19         do
  20                 pat="$pat|$i\$"
  21         done
  22 diff -uNr openswan-2.3.0.orig/programs/manual/manual.in openswan-2.3.0/programs/manual/manual.in
  23 --- openswan-2.3.0.orig/programs/manual/manual.in       2004-11-01 22:49:01.000000000 +0000
  24 +++ openswan-2.3.0/programs/manual/manual.in    2005-02-02 20:34:54.000000000 +0000
  25 @@ -104,7 +104,7 @@
  26                                 sub(/:/, " ", $0)
  27                                 if (interf != "")
  28                                         print $3 "@" interf
  29 -                        }' | tr '\n' ' '`"
  30 +                        }' | sed ':a;N;$!ba;s/\n/ /g'`"
  31         ;;
  32  esac
  33  diff -uNr openswan-2.3.0.orig/programs/_startklips/_startklips.in openswan-2.3.0/programs/_startklips/_startklips.in
  34 --- openswan-2.3.0.orig/programs/_startklips/_startklips.in     2004-12-10 12:38:28.000000000 +0000
  35 +++ openswan-2.3.0/programs/_startklips/_startklips.in  2005-02-02 20:34:54.000000000 +0000
  36 @@ -292,7 +292,12 @@
  37                 fi
  38                  unset MODPATH MODULECONF        # no user overrides!
  39                  depmod -a >/dev/null 2>&1
  40 -                modprobe -v ipsec
  41 +                if [ -f modprobe ]
  42 +                                                                       then modprobe -v ipsec
  43 +                                                               elif [ -f insmod ]
  44 +                                                                       then insmod ipsec
  45 +                                                               fi
  46 +
  47          fi
  48          if test ! -f $ipsecversion
  49          then
  50 diff -uNr openswan-2.3.0.orig/programs/setup/setup.in openswan-2.3.0/programs/setup/setup.in
  51 --- openswan-2.3.0.orig/programs/setup/setup.in 2004-03-22 00:24:06.000000000 +0000
  52 +++ openswan-2.3.0/programs/setup/setup.in      2005-02-02 20:34:54.000000000 +0000
  53 @@ -110,12 +110,22 @@
  54  # do it
  55  case "$1" in
  56    start|--start|stop|--stop|_autostop|_autostart)
  57 -       if test " `id -u`" != " 0"
  58 +       if [ "x${USER}" != "xroot" ]
  59         then
  60                 echo "permission denied (must be superuser)" |
  61                         logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
  62                 exit 1
  63         fi
  64 +
  65 +       # make sure all required directories exist
  66 +       if [ ! -d /var/run ]
  67 +       then
  68 +               mkdir -p /var/run/pluto
  69 +       fi
  70 +       if [ ! -d /var/lock/subsys ]
  71 +       then
  72 +               mkdir -p /var/lock/subsys
  73 +       fi
  74         tmp=/var/run/pluto/ipsec_setup.st
  75         outtmp=/var/run/pluto/ipsec_setup.out
  76         (
  77 --- openswan-2.3.0.orig/programs/setup/Makefile 2004-04-03 19:44:48.000000000 +0000
  78 +++ openswan-2.3.0/programs/setup/Makefile      2005-02-02 20:34:54.000000000 +0000
  79 @@ -32,7 +32,7 @@
  80  install:: setup
  81         @rm -f $(BINDIR)/setup
  82         @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
  83 -       @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
  84 +       @ln -s $(FINALRCDIR)/S50ipsec $(BINDIR)/setup
  85         -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
  86         -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
  87         -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
  88 diff -uNr openswan-2.3.0.orig/programs/showhostkey/showhostkey.in openswan-2.3.0/programs/showhostkey/showhostkey.in
  89 --- openswan-2.3.0.orig/programs/showhostkey/showhostkey.in     2004-11-14 13:40:41.000000000 +0000
  90 +++ openswan-2.3.0/programs/showhostkey/showhostkey.in  2005-02-02 20:34:54.000000000 +0000
  91 @@ -63,7 +63,7 @@
  92         exit 1
  93  fi
  94
  95 -host="`hostname --fqdn`"
  96 +host="`nvram get wan_hostname`"
  97
  98  awk '  BEGIN {
  99
 100 diff -uNr openswan-2.3.0.orig/programs/send-pr/send-pr.in openswan-2.3.0/programs/send-pr/send-pr.in
 101 --- openswan-2.3.0.orig/programs/send-pr/send-pr.in     2003-07-14 12:26:17.000000000 +0000
 102 +++ openswan-2.3.0/programs/send-pr/send-pr.in  2005-02-02 20:34:54.000000000 +0000
 103 @@ -402,7 +402,7 @@
 104                     else
 105                         if [ "$fieldname" != "Category" ]
 106                         then
 107 -                           values=`${BINDIR}/query-pr --valid-values $fieldname | tr '\n' ' ' | sed 's/ *$//g;s/ / | /g;s/^/[ /;s/$/ ]/;'`
 108 +                           values=`${BINDIR}/query-pr --valid-values $fieldname | sed ':a;N;$!ba;s/\n/ /g' | sed 's/ *$//g;s/ / | /g;s/^/[ /;s/$/ ]/;'`
 109                             valslen=`echo "$values" | wc -c`
 110                         else
 111                             values="choose from a category listed above"
 112 @@ -414,7 +414,7 @@
 113                         else
 114                                 desc="<${values} (one line)>";
 115                         fi
 116 -                       dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
 117 +                       dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
 118                         echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
 119                     fi
 120                     echo "${fmtname}${desc}" >> $file
 121 @@ -425,7 +425,7 @@
 122                         desc="  $default_val";
 123                     else
 124                         desc="  <`${BINDIR}/query-pr --field-description $fieldname` (multiple lines)>";
 125 -                       dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
 126 +                       dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
 127                         echo "s/^${dpat}//" >> $FIXFIL
 128                     fi
 129                     echo "${fmtname}" >> $file;
 130 @@ -437,7 +437,7 @@
 131                         desc="${default_val}"
 132                     else
 133                         desc="<`${BINDIR}/query-pr --field-description $fieldname` (one line)>"
 134 -                       dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
 135 +                       dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
 136                         echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
 137                     fi
 138                     echo "${fmtname}${desc}" >> $file
 139 diff -uNr openswan-2.3.0.orig/programs/_realsetup/_realsetup.in openswan-2.3.0/programs/_realsetup/_realsetup.in
 140 --- openswan-2.3.0.orig/programs/_realsetup/_realsetup.in       2004-12-10 13:10:04.000000000 +0000
 141 +++ openswan-2.3.0/programs/_realsetup/_realsetup.in    2005-02-02 20:34:54.000000000 +0000
 142 @@ -209,7 +209,7 @@
 143
 144         # misc pre-Pluto setup
 145
 146 -       perform test -d `dirname $subsyslock` "&&" touch $subsyslock
 147 +       perform test -d `echo $subsyslock | sed -r 's/(^.*\/)(.*$)/\1/'` "&&" touch $subsyslock
 148
 149         if test " $IPSECforwardcontrol" = " yes"
 150         then
 151 @@ -313,7 +313,7 @@
 152                 lsmod 2>&1 | grep "^xfrm_user" > /dev/null && rmmod -s xfrm_user
 153         fi
 154
 155 -       perform test -d `dirname $subsyslock` "&&" rm -f $subsyslock
 156 +       perform test -d `echo $subsyslock | sed -r 's/(^.*\/)(.*$)/\1/'` "&&" touch $subsyslock "&&" rm -f $subsyslock
 157
 158         perform rm -f $info $lock $plutopid
 159         perform echo "...Openswan IPsec stopped" "|" $LOGONLY
 160 --- openswan-2.3.0.orig/programs/_plutorun/_plutorun.in 2004-11-03 20:21:08.000000000 +0000
 161 +++ openswan-2.3.0/programs/_plutorun/_plutorun.in      2005-02-02 20:34:54.000000000 +0000
 162 @@ -140,7 +140,7 @@
 163                         exit 1
 164                 fi
 165         else
 166 -               if test ! -w "`dirname $stderrlog`"
 167 +               if test ! -w "`echo $stderrlog | sed -r 's/(^.*\/)(.*$)/\1/'`"
 168                 then
 169                         echo Cannot write to directory to create \"$stderrlog\".
 170                         exit 1