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

Tom Callaway (spot) fedora-extras-commits at redhat.com
Mon Oct 29 20:31:43 UTC 2007 

Author: spot

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

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

fix iwlib detection, use for F-7


xsupplicant-1.2.8-iwlibfix.patch:

Index: xsupplicant-1.2.8-iwlibfix.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/F-7/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	29 Oct 2007 19:39:42 -0000	1.1
+++ xsupplicant-1.2.8-iwlibfix.patch	29 Oct 2007 20:31:38 -0000	1.2
@@ -1,7 +1,53 @@
+diff -up xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c.iwlib xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c.iwlib	2007-10-29 16:14:43.000000000 -0400
++++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2007-10-29 16:15:37.000000000 -0400
+@@ -199,7 +199,7 @@
+ #ifdef LINUX_FRAMER
+ 
+ // Use kernel headers
+-#define HEADERS_KERNEL
++//#define HEADERS_KERNEL
+ 
+ #include <unistd.h>
+ #include <sys/socket.h>
+@@ -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>
+diff -up xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c.iwlib xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c.iwlib	2007-10-29 16:14:43.000000000 -0400
++++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2007-10-29 16:15:50.000000000 -0400
+@@ -188,7 +188,7 @@
+ #ifdef LINUX_FRAMER
+ 
+ // Use kernel headers.
+-#define HEADERS_KERNEL
++//#define HEADERS_KERNEL
+ 
+ #ifndef __user
+ #define __user
+@@ -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/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
+--- xsupplicant-1.2.8/configure.iwlib	2007-10-29 16:14:44.000000000 -0400
++++ xsupplicant-1.2.8/configure	2007-10-29 16:14:44.000000000 -0400
+@@ -4754,11 +4754,12 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-   #define HEADERS_KERNEL
+    #include <sys/socket.h>
     #ifndef __user
     #define __user
     #endif
@@ -10,7 +56,12 @@
     #include <linux/wireless.h>
  
  #include <$ac_header>
-@@ -4823,6 +4825,8 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4818,11 +4819,12 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#define HEADERS_KERNEL
+ 	           #include <sys/socket.h>
  		   #ifndef __user
  		   #define __user
  		   #endif
@@ -20,9 +71,14 @@
                     #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
+--- xsupplicant-1.2.8/configure.in.iwlib	2007-10-29 16:14:44.000000000 -0400
++++ xsupplicant-1.2.8/configure.in	2007-10-29 16:14:44.000000000 -0400
+@@ -114,19 +114,21 @@ if test $SYSTEM = "Linux"; then
+    AC_CHECK_HEADERS(sys/socket.h, [], [AC_MSG_ERROR([header file <sys/socket.h> is required for Xsupplicant.])],)
+    
+    AC_CHECK_HEADERS(iwlib.h, [], [AC_MSG_ERROR([header file <iwlib.h> is required for Xsupplicant])],[
+-   #define HEADERS_KERNEL
+    #include <sys/socket.h>
     #ifndef __user
     #define __user
     #endif
@@ -31,7 +87,9 @@
     #include <linux/wireless.h>])
  
     AC_MSG_CHECKING([iwlib version])
-@@ -127,6 +129,8 @@ if test $SYSTEM = "Linux"; then
+-   AC_TRY_COMPILE([#define HEADERS_KERNEL
+-	           #include <sys/socket.h>
++   AC_TRY_COMPILE([#include <sys/socket.h>
  		   #ifndef __user
  		   #define __user
  		   #endif
@@ -40,26 +98,3 @@
                     #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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xsupplicant.spec	29 Oct 2007 19:39:42 -0000	1.27
+++ xsupplicant.spec	29 Oct 2007 20:31:38 -0000	1.28
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	4%{?dist}.3
+Release:	4%{?dist}.4
 License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -76,6 +76,9 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.8-4.4
+- F-7 fix for iwlib detection, use
+
 * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.8-4.3
 - fix docs patch

More information about the fedora-extras-commits mailing list