refresh patches before applying upcoming fix

SVN-Revision: 13971

diff --git a/net/xsupplicant/patches/001-no-lfl.patch b/net/xsupplicant/patches/001-no-lfl.patch
index 9f0ed94456c0ea913fb96ed3ebda1416baf731c3..7110814e0634f4aebd83cf2b2e09ef8d2e4d4824 100644 (file)
--- a/net/xsupplicant/patches/001-no-lfl.patch
+++ b/net/xsupplicant/patches/001-no-lfl.patch
@@ -1,7 +1,6 @@
-diff -ruN xsupplicant-1.2.2-old/configure xsupplicant-1.2.2-new/configure
---- xsupplicant-1.2.2-old/configure    2005-09-14 05:34:54.000000000 +0200
-+++ xsupplicant-1.2.2-new/configure    2005-10-20 06:24:23.000000000 +0200
-@@ -3316,7 +3316,7 @@
+--- a/configure
++++ b/configure
+@@ -3259,7 +3259,7 @@ if test "$LEX" = :; then

  fi
   if test -n "$LEX"; then
         LFLAGS="$LFLAGS -i"
  fi
   if test -n "$LEX"; then
         LFLAGS="$LFLAGS -i"


@@ -9,11 +8,10 @@ diff -ruN xsupplicant-1.2.2-old/configure xsupplicant-1.2.2-new/configure
 +
   fi
  
 +
   fi
  

- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-diff -ruN xsupplicant-1.2.2-old/configure.in xsupplicant-1.2.2-new/configure.in
---- xsupplicant-1.2.2-old/configure.in 2005-09-14 05:34:54.000000000 +0200
-+++ xsupplicant-1.2.2-new/configure.in 2005-10-20 06:23:38.000000000 +0200
-@@ -17,7 +17,7 @@
+ ac_ext=c
+--- a/configure.in
++++ b/configure.in
+@@ -18,7 +18,7 @@ AC_PROG_YACC

  AM_PROG_LEX
   if test -n "$LEX"; then
         LFLAGS="$LFLAGS -i"
  AM_PROG_LEX
   if test -n "$LEX"; then
         LFLAGS="$LFLAGS -i"


@@ -21,4 +19,4 @@ diff -ruN xsupplicant-1.2.2-old/configure.in xsupplicant-1.2.2-new/configure.in
 +
   fi 
  
 +
   fi 
  

- AC_C_BIGENDIAN([big_endian=true;AC_DEFINE(BIGENDIAN)],[big_endian=false;AC_DEFINE(LILENDIAN)])
+ AC_HEADER_STDC

diff --git a/net/xsupplicant/patches/002-disable-procfs-check.patch b/net/xsupplicant/patches/002-disable-procfs-check.patch
index e4223343aa95d1e9c45942939caf2ddf5564d06e..2c7177a7b23336a77b1dd4587f59afe90bfd82b6 100644 (file)
--- a/net/xsupplicant/patches/002-disable-procfs-check.patch
+++ b/net/xsupplicant/patches/002-disable-procfs-check.patch
@@ -1,7 +1,6 @@
-diff -ur xsupplicant.old/configure xsupplicant.dev/configure
---- xsupplicant.old/configure  2006-10-05 14:09:58.019206000 +0200
-+++ xsupplicant.dev/configure  2006-10-05 14:12:12.466767016 +0200
-@@ -5449,19 +5449,6 @@
+--- a/configure
++++ b/configure
+@@ -5362,19 +5362,6 @@ _ACEOF

    FRAMER="generic"
  fi
  
    FRAMER="generic"
  fi
  

diff --git a/net/xsupplicant/patches/003-compile_fix.patch b/net/xsupplicant/patches/003-compile_fix.patch
index 33ca70dbb862400da7ca6358937fcb1b602348e3..30fe2c67e94ea11ff40e829d02317ec223a72f94 100644 (file)
--- a/net/xsupplicant/patches/003-compile_fix.patch
+++ b/net/xsupplicant/patches/003-compile_fix.patch
@@ -1,7 +1,6 @@
-diff -urN xsupplicant-1.2.8/lib/libxsupgui/Makefile.in xsupplicant-1.2.8.new/lib/libxsupgui/Makefile.in
---- xsupplicant-1.2.8/lib/libxsupgui/Makefile.in       2006-10-03 05:02:31.000000000 +0200
-+++ xsupplicant-1.2.8.new/lib/libxsupgui/Makefile.in   2006-11-27 22:52:03.000000000 +0100
-@@ -91,7 +91,7 @@
+--- a/lib/libxsupgui/Makefile.in
++++ b/lib/libxsupgui/Makefile.in
+@@ -91,7 +91,7 @@ install_sh = @install_sh@

  with_openssl_libs = @with_openssl_libs@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  
  with_openssl_libs = @with_openssl_libs@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  

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
     #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>
     #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
                   #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
                     #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
     #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])
     #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
                   #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])])
                     #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>
 @@ -204,6 +204,7 @@
  #include <linux/types.h>
  #include <linux/socket.h>