rpms/xsupplicant/F-7 xsupplicant-1.2.8-iwlibfix.patch, NONE, 1.1 xsupplicant.spec, 1.26, 1.27

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/xsupplicant/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3705/F-7

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

Fix F-7 and devel to build


xsupplicant-1.2.8-iwlibfix.patch:

--- NEW FILE xsupplicant-1.2.8-iwlibfix.patch ---
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/types.h>
+   #include <net/if.h>
    #include <linux/wireless.h>
 
 #include <$ac_header>
@@ -4823,6 +4825,8 @@ cat >>conftest.$ac_ext <<_ACEOF
 		   #ifndef __user
 		   #define __user
 		   #endif
+                   #include <linux/types.h>
+                   #include <net/if.h>
                    #include <linux/wireless.h>
                    #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/types.h>
+   #include <net/if.h>
    #include <linux/wireless.h>])
 
    AC_MSG_CHECKING([iwlib version])
@@ -127,6 +129,8 @@ if test $SYSTEM = "Linux"; then
 		   #ifndef __user
 		   #define __user
 		   #endif
+                   #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/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-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 <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/F-7/xsupplicant.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xsupplicant.spec	29 Oct 2007 18:41:17 -0000	1.26
+++ xsupplicant.spec	29 Oct 2007 19:39:42 -0000	1.27
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	2%{?dist}
+Release:	4%{?dist}.3
 License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -12,6 +12,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools-devel
 Patch0:		xsupplicant-1.2.2-docsfix.patch
 Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
+Patch3:		xsupplicant-1.2.8-iwlibfix.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -31,6 +32,7 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
+%patch3 -p1 -b .iwlib
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -74,9 +76,26 @@
 %{_libdir}/libxsup*.a
 
 %changelog
-* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.8-2
+* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.8-4.3
+- fix docs patch
+
+* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.8-4.2
 - multilib fix (bz 228395)
 
+* 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
+
+* Mon Aug  6 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.8-3
+- fix xsupplicant to compile in devel (needs linux/if.h)
+- fix doc generation
+- fix license
+
+* Wed May 23 2007 Christopher Aillon <caillon at redhat.com> 1.2.8-2
+- Rebuild against newer libiw.so
+
 * Tue Nov 21 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.8-1
 - everyone gets 1.2.8, close out bz 212700