rpms/xsupplicant/devel xsupplicant-1.2.8-iwlibfix.patch, 1.1, 1.2 xsupplicant.spec, 1.27, 1.28

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11607

Modified Files:
	xsupplicant-1.2.8-iwlibfix.patch xsupplicant.spec 
Log Message:

fix iwlibpatch 


xsupplicant-1.2.8-iwlibfix.patch:

Index: xsupplicant-1.2.8-iwlibfix.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant-1.2.8-iwlibfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.8-iwlibfix.patch	6 Aug 2007 15:39:34 -0000	1.1
+++ xsupplicant-1.2.8-iwlibfix.patch	28 Aug 2007 21:51:25 -0000	1.2
@@ -1,49 +1,65 @@
-diff -up xsupplicant-1.2.8/configure.in.BAD xsupplicant-1.2.8/configure.in
---- xsupplicant-1.2.8/configure.in.BAD	2007-08-06 11:05:57.000000000 -0400
-+++ xsupplicant-1.2.8/configure.in	2007-08-06 11:06:24.000000000 -0400
-@@ -119,6 +119,7 @@ if test $SYSTEM = "Linux"; then
+diff -up xsupplicant-1.2.8/configure.iwlib xsupplicant-1.2.8/configure
+--- xsupplicant-1.2.8/configure.iwlib	2007-08-28 17:37:39.000000000 -0400
++++ xsupplicant-1.2.8/configure	2007-08-28 17:40:04.000000000 -0400
+@@ -4759,6 +4759,8 @@ cat >>conftest.$ac_ext <<_ACEOF
     #ifndef __user
     #define __user
     #endif
-+   #include <linux/if.h>
-    #include <linux/wireless.h>])
++   #include <linux/types.h>
++   #include <net/if.h>
+    #include <linux/wireless.h>
  
-    AC_MSG_CHECKING([iwlib version])
-@@ -127,6 +128,7 @@ if test $SYSTEM = "Linux"; then
+ #include <$ac_header>
+@@ -4823,6 +4825,8 @@ cat >>conftest.$ac_ext <<_ACEOF
  		   #ifndef __user
  		   #define __user
  		   #endif
-+                   #include <linux/if.h>
++                   #include <linux/types.h>
++                   #include <net/if.h>
                     #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 -up xsupplicant-1.2.8/configure.BAD xsupplicant-1.2.8/configure
---- xsupplicant-1.2.8/configure.BAD	2007-08-06 11:07:06.000000000 -0400
-+++ xsupplicant-1.2.8/configure	2007-08-06 11:06:54.000000000 -0400
-@@ -4759,6 +4759,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+                    #include <iwlib.h>
+ int
+diff -up xsupplicant-1.2.8/configure.in.iwlib xsupplicant-1.2.8/configure.in
+--- xsupplicant-1.2.8/configure.in.iwlib	2007-08-28 17:37:39.000000000 -0400
++++ xsupplicant-1.2.8/configure.in	2007-08-28 17:39:41.000000000 -0400
+@@ -119,6 +119,8 @@ if test $SYSTEM = "Linux"; then
     #ifndef __user
     #define __user
     #endif
-+   #include <linux/if.h>
-    #include <linux/wireless.h>
++   #include <linux/types.h>
++   #include <net/if.h>
+    #include <linux/wireless.h>])
  
- #include <$ac_header>
-@@ -4823,6 +4824,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+    AC_MSG_CHECKING([iwlib version])
+@@ -127,6 +129,8 @@ if test $SYSTEM = "Linux"; then
  		   #ifndef __user
  		   #define __user
  		   #endif
-+                   #include <linux/if.h>
++                   #include <linux/types.h>
++                   #include <net/if.h>
                     #include <linux/wireless.h>
-                    #include <iwlib.h>
- int
+                    #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 -up xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c.BAD xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c
---- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c.BAD	2007-08-06 11:19:02.000000000 -0400
-+++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2007-08-06 11:19:10.000000000 -0400
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c.BAD	2007-08-28 17:46:03.000000000 -0400
++++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2007-08-28 17:46:10.000000000 -0400
 @@ -203,6 +203,7 @@
  #include <netinet/in.h>
  #include <linux/types.h>
  #include <linux/socket.h>
-+#include <linux/if.h>
++#include <net/if.h>
  #include <linux/wireless.h>
  #include <iwlib.h>
  #include <linux/if_packet.h>
+diff -up xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c.BAD xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c.BAD	2007-08-28 17:47:21.000000000 -0400
++++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2007-08-28 17:47:31.000000000 -0400
+@@ -207,7 +207,7 @@
+ #include <sys/ioctl.h>
+ #include "netlink.h"
+ #include "rtnetlink.h"
+-#include <linux/if.h>
++#include <net/if.h>
+ #include <linux/if_packet.h>
+ #include <math.h>
+ #include <linux/wireless.h>


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xsupplicant.spec	28 Aug 2007 18:28:23 -0000	1.27
+++ xsupplicant.spec	28 Aug 2007 21:51:25 -0000	1.28
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	4%{?dist}
+Release:	4%{?dist}.1
 License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -32,7 +32,7 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
+%patch3 -p1 -b .iwlib
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -73,6 +73,9 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Tue Aug 28 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.8-4.1
+- fix iwlibpatch in devel
+
 * Tue Aug 28 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.8-4
 - rebuild for BuildID