simplify and fix adm5120 image building, fix broken FEATURES handling

[openwrt.git] / package / strongswan / patches / 320-no-modprobe.patch

diff --git a/package/strongswan/patches/320-no-modprobe.patch b/package/strongswan/patches/320-no-modprobe.patch
index cbd720a..d8c3648 100644 (file)
--- a/package/strongswan/patches/320-no-modprobe.patch
+++ b/package/strongswan/patches/320-no-modprobe.patch
@@ -1,6 +1,7 @@
-diff -ruN strongswan-2.8.1-orig/programs/starter/klips.c strongswan-2.8.1/programs/starter/klips.c
---- strongswan-2.8.1-orig/programs/starter/klips.c     2006-02-15 13:33:57.000000000 -0500
-+++ strongswan-2.8.1/programs/starter/klips.c  2007-01-16 23:57:19.107972109 -0500
+Index: strongswan-2.8.2/programs/starter/klips.c
+===================================================================
+--- strongswan-2.8.2.orig/programs/starter/klips.c     2007-06-04 13:23:04.544043096 +0200
++++ strongswan-2.8.2/programs/starter/klips.c  2007-06-04 13:23:07.238633456 +0200
 @@ -44,7 +44,7 @@
            unsetenv("MODPATH");
            unsetenv("MODULECONF");
@@ -27,9 +28,10 @@ diff -ruN strongswan-2.8.1-orig/programs/starter/klips.c strongswan-2.8.1/progra
      }
  
      starter_klips_clear();
-diff -ruN strongswan-2.8.1-orig/programs/starter/netkey.c strongswan-2.8.1/programs/starter/netkey.c
---- strongswan-2.8.1-orig/programs/starter/netkey.c    2006-02-15 13:33:57.000000000 -0500
-+++ strongswan-2.8.1/programs/starter/netkey.c 2007-01-16 23:57:28.094204186 -0500
+Index: strongswan-2.8.2/programs/starter/netkey.c
+===================================================================
+--- strongswan-2.8.2.orig/programs/starter/netkey.c    2007-06-04 13:23:04.551042032 +0200
++++ strongswan-2.8.2/programs/starter/netkey.c 2007-06-04 13:23:07.238633456 +0200
 @@ -36,7 +36,7 @@
        /* af_key module makes the netkey proc interface visible */
        if (stat(PROC_MODULES, &stb) == 0)
@@ -56,9 +58,10 @@ diff -ruN strongswan-2.8.1-orig/programs/starter/netkey.c strongswan-2.8.1/progr
      }
  
      DBG(DBG_CONTROL,
-diff -ruN strongswan-2.8.1-orig/programs/_startklips/_startklips.in strongswan-2.8.1/programs/_startklips/_startklips.in
---- strongswan-2.8.1-orig/programs/_startklips/_startklips.in  2005-05-06 18:11:33.000000000 -0400
-+++ strongswan-2.8.1/programs/_startklips/_startklips.in       2007-01-17 00:04:11.189627735 -0500
+Index: strongswan-2.8.2/programs/_startklips/_startklips.in
+===================================================================
+--- strongswan-2.8.2.orig/programs/_startklips/_startklips.in  2007-06-04 13:23:04.560040664 +0200
++++ strongswan-2.8.2/programs/_startklips/_startklips.in       2007-06-04 13:23:07.238633456 +0200
 @@ -249,7 +249,7 @@
  
  if test ! -f $ipsecversion && test ! -f $netkey