refresh patches before applying upcoming fix

[openwrt/svn-archive/archive.git] / net / xsupplicant / patches / 004-linux_2.6.19_wireless_h.patch

diff --git a/net/xsupplicant/patches/004-linux_2.6.19_wireless_h.patch b/net/xsupplicant/patches/004-linux_2.6.19_wireless_h.patch
index 2949c0cc16ee102025fb820e74f6628eb1d36121..97e610c1589613662ebe2884e95ee7bed279ad81 100644 (file)
--- a/net/xsupplicant/patches/004-linux_2.6.19_wireless_h.patch
+++ b/net/xsupplicant/patches/004-linux_2.6.19_wireless_h.patch
@@ -1,7 +1,6 @@
-diff -ruN xsupplicant-1.2.8-old/configure xsupplicant-1.2.8-new/configure
---- xsupplicant-1.2.8-old/configure    2007-01-10 02:18:33.000000000 +0100
-+++ xsupplicant-1.2.8-new/configure    2007-01-10 02:24:21.000000000 +0100
-@@ -4759,6 +4759,11 @@
+--- a/configure
++++ b/configure
+@@ -4759,6 +4759,11 @@ cat >>conftest.$ac_ext <<_ACEOF
     #ifndef __user
     #define __user
     #endif
@@ -13,7 +12,7 @@ diff -ruN xsupplicant-1.2.8-old/configure xsupplicant-1.2.8-new/configure
     #include <linux/wireless.h>
  
  #include <$ac_header>
-@@ -4823,6 +4828,11 @@
+@@ -4823,6 +4828,11 @@ cat >>conftest.$ac_ext <<_ACEOF
                   #ifndef __user
                   #define __user
                   #endif
@@ -25,10 +24,9 @@ diff -ruN xsupplicant-1.2.8-old/configure xsupplicant-1.2.8-new/configure
                     #include <linux/wireless.h>
                     #include <iwlib.h>
  int
-diff -ruN xsupplicant-1.2.8-old/configure.in xsupplicant-1.2.8-new/configure.in
---- xsupplicant-1.2.8-old/configure.in 2007-01-10 02:18:33.000000000 +0100
-+++ xsupplicant-1.2.8-new/configure.in 2007-01-10 02:22:28.000000000 +0100
-@@ -119,6 +119,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -119,6 +119,11 @@ if test $SYSTEM = "Linux"; then
     #ifndef __user
     #define __user
     #endif
@@ -40,7 +38,7 @@ diff -ruN xsupplicant-1.2.8-old/configure.in xsupplicant-1.2.8-new/configure.in
     #include <linux/wireless.h>])
  
     AC_MSG_CHECKING([iwlib version])
-@@ -127,6 +132,11 @@
+@@ -127,6 +132,11 @@ if test $SYSTEM = "Linux"; then
                   #ifndef __user
                   #define __user
                   #endif
@@ -52,9 +50,8 @@ diff -ruN xsupplicant-1.2.8-old/configure.in xsupplicant-1.2.8-new/configure.in
                     #include <linux/wireless.h>
                     #include <iwlib.h>], 
                 [iw_extract_event_stream(NULL, NULL, 0);], [AC_DEFINE(NEW_IWLIB) AC_MSG_RESULT([3 params])], [AC_MSG_RESULT([2 params])])
-diff -ruN xsupplicant-1.2.8-old/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8-new/src/cardif/linux/cardif_linux_wext.c
---- xsupplicant-1.2.8-old/src/cardif/linux/cardif_linux_wext.c 2006-10-08 05:42:53.000000000 +0200
-+++ xsupplicant-1.2.8-new/src/cardif/linux/cardif_linux_wext.c 2007-01-10 02:31:22.000000000 +0100
+--- a/src/cardif/linux/cardif_linux_wext.c
++++ b/src/cardif/linux/cardif_linux_wext.c
 @@ -204,6 +204,7 @@
  #include <linux/types.h>
  #include <linux/socket.h>