package/strongswan/patches/320-no-modprobe.patch

   1 diff -ruN strongswan-2.8.1-orig/programs/starter/klips.c strongswan-2.8.1/programs/starter/klips.c
   2 --- strongswan-2.8.1-orig/programs/starter/klips.c      2006-02-15 13:33:57.000000000 -0500
   3 +++ strongswan-2.8.1/programs/starter/klips.c   2007-01-16 23:57:19.107972109 -0500
   4 @@ -44,7 +44,7 @@
   5             unsetenv("MODPATH");
   6             unsetenv("MODULECONF");
   7             system("depmod -a >/dev/null 2>&1");
   8 -           system("modprobe -qv ipsec");
   9 +           system("insmod -qv ipsec");
  10         }
  11         if (stat(PROC_IPSECVERSION, &stb) == 0)
  12         {
  13 @@ -62,11 +62,11 @@
  14      /* make sure that all available crypto algorithms are loaded */
  15      if (stat(PROC_MODULES, &stb) == 0)
  16      {
  17 -       system("modprobe -qv ipsec_aes");
  18 -       system("modprobe -qv ipsec_serpent");
  19 -       system("modprobe -qv ipsec_twofish");
  20 -       system("modprobe -qv ipsec_blowfish");
  21 -       system("modprobe -qv ipsec_sha2");
  22 +       system("insmod -qv ipsec_aes");
  23 +       system("insmod -qv ipsec_serpent");
  24 +       system("insmod -qv ipsec_twofish");
  25 +       system("insmod -qv ipsec_blowfish");
  26 +       system("insmod -qv ipsec_sha2");
  27      }
  28
  29      starter_klips_clear();
  30 diff -ruN strongswan-2.8.1-orig/programs/starter/netkey.c strongswan-2.8.1/programs/starter/netkey.c
  31 --- strongswan-2.8.1-orig/programs/starter/netkey.c     2006-02-15 13:33:57.000000000 -0500
  32 +++ strongswan-2.8.1/programs/starter/netkey.c  2007-01-16 23:57:28.094204186 -0500
  33 @@ -36,7 +36,7 @@
  34         /* af_key module makes the netkey proc interface visible */
  35         if (stat(PROC_MODULES, &stb) == 0)
  36         {
  37 -           system("modprobe -qv af_key");
  38 +           system("insmod -qv af_key");
  39         }
  40
  41         /* now test again */
  42 @@ -52,11 +52,11 @@
  43      /* make sure that all required IPsec modules are loaded */
  44      if (stat(PROC_MODULES, &stb) == 0)
  45      {
  46 -       system("modprobe -qv ah4");
  47 -       system("modprobe -qv esp4");
  48 -       system("modprobe -qv ipcomp");
  49 -       system("modprobe -qv xfrm4_tunnel");
  50 -       system("modprobe -qv xfrm_user");
  51 +       system("insmod -qv ah4");
  52 +       system("insmod -qv esp4");
  53 +       system("insmod -qv ipcomp");
  54 +       system("insmod -qv xfrm4_tunnel");
  55 +       system("insmod -qv xfrm_user");
  56      }
  57
  58      DBG(DBG_CONTROL,
  59 diff -ruN strongswan-2.8.1-orig/programs/_startklips/_startklips.in strongswan-2.8.1/programs/_startklips/_startklips.in
  60 --- strongswan-2.8.1-orig/programs/_startklips/_startklips.in   2005-05-06 18:11:33.000000000 -0400
  61 +++ strongswan-2.8.1/programs/_startklips/_startklips.in        2007-01-17 00:04:11.189627735 -0500
  62 @@ -249,7 +249,7 @@
  63
  64  if test ! -f $ipsecversion && test ! -f $netkey
  65  then
  66 -       modprobe -v af_key
  67 +       insmod -v af_key
  68  fi
  69
  70  if test -f $netkey
  71 @@ -257,11 +257,11 @@
  72         klips=false
  73         if test -f $modules
  74         then
  75 -               modprobe -qv ah4
  76 -               modprobe -qv esp4
  77 -               modprobe -qv ipcomp
  78 -               modprobe -qv xfrm4_tunnel
  79 -               modprobe -qv xfrm_user
  80 +               insmod -qv ah4
  81 +               insmod -qv esp4
  82 +               insmod -qv ipcomp
  83 +               insmod -qv xfrm4_tunnel
  84 +               insmod -qv xfrm_user
  85         fi
  86  fi
  87
  88 @@ -272,7 +272,7 @@
  89                  setmodule
  90                  unset MODPATH MODULECONF        # no user overrides!
  91                  depmod -a >/dev/null 2>&1
  92 -                modprobe -v ipsec
  93 +                insmod -v ipsec
  94          fi
  95          if test ! -f $ipsecversion
  96          then
  97 @@ -288,7 +288,7 @@
  98         do
  99                 if test -f $moduleinstplace/alg/ipsec_$alg.o
 100                 then
 101 -                       modprobe ipsec_$alg
 102 +                       insmod ipsec_$alg
 103                 fi
 104         done
 105  fi