rpms/xsupplicant/devel xsupplicant-1.2.6-fixincludes.patch, NONE, 1.1 xsupplicant-1.2.6-nocompilerh-systemheaders.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.7, 1.8 xsupplicant.spec, 1.18, 1.19

Tom Callaway (spot) fedora-extras-commits at redhat.com
Fri Jul 7 18:02:13 UTC 2006 

Author: spot

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

Modified Files:
	.cvsignore sources xsupplicant.spec 
Added Files:
	xsupplicant-1.2.6-fixincludes.patch 
	xsupplicant-1.2.6-nocompilerh-systemheaders.patch 
Log Message:

Bump to 1.2.6


xsupplicant-1.2.6-fixincludes.patch:

--- NEW FILE xsupplicant-1.2.6-fixincludes.patch ---
--- xsupplicant-1.2.3/src/cardif/linux/cardif_linux_wext.c.BAD	2006-02-28 19:52:32.000000000 -0600
+++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux_wext.c	2006-02-28 19:52:40.000000000 -0600
@@ -91,7 +91,7 @@
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/compiler.h>
-#include <linux/wireless.h>
+#include "v19wireless.h"
 #include <iwlib.h>
 #include <linux/if_packet.h>
 #include <linux/netlink.h>
--- xsupplicant-1.2.3/src/cardif/linux/cardif_linux.c.BAD	2006-02-28 19:52:16.000000000 -0600
+++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux.c	2006-02-28 19:52:26.000000000 -0600
@@ -102,7 +102,7 @@
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/compiler.h>
-#include <linux/wireless.h>
+#include "v19wireless.h"
 #include <iwlib.h>
 #include <linux/if_packet.h>
 #include <stdio.h>
--- xsupplicant-1.2.3/src/cardif/linux/cardif_atmel_driver.c.BAD	2006-02-28 19:51:18.000000000 -0600
+++ xsupplicant-1.2.3/src/cardif/linux/cardif_atmel_driver.c	2006-02-28 19:51:32.000000000 -0600
@@ -74,7 +74,7 @@
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/compiler.h>
-#include <linux/wireless.h>
+#include "v19wireless.h"
 #include <iwlib.h>
 #include <stdlib.h>
 #include <string.h>
--- xsupplicant-1.2.3/src/cardif/linux/cardif_linux_rtnetlink.c.BAD	2006-02-28 19:52:54.000000000 -0600
+++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux_rtnetlink.c	2006-02-28 19:53:03.000000000 -0600
@@ -119,7 +119,7 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <linux/compiler.h>
-#include <linux/wireless.h>
+#include "v19wireless.h"
 #include <iwlib.h>
 #include <sys/ioctl.h>
 #include <linux/netlink.h>

xsupplicant-1.2.6-nocompilerh-systemheaders.patch:

--- NEW FILE xsupplicant-1.2.6-nocompilerh-systemheaders.patch ---
--- xsupplicant-1.2.6/src/cardif/linux/cardif_linux_wext.c.BAD	2006-07-07 11:13:16.000000000 -0500
+++ xsupplicant-1.2.6/src/cardif/linux/cardif_linux_wext.c	2006-07-07 11:13:20.000000000 -0500
@@ -169,7 +169,6 @@
 #include <netinet/in.h>
 #include <linux/types.h>
 #include <linux/socket.h>
-#include <linux/compiler.h>
 #include <linux/wireless.h>
 #include <iwlib.h>
 #include <linux/if_packet.h>
--- xsupplicant-1.2.6/src/cardif/linux/cardif_linux.c.BAD	2006-07-07 11:12:09.000000000 -0500
+++ xsupplicant-1.2.6/src/cardif/linux/cardif_linux.c	2006-07-07 11:12:20.000000000 -0500
@@ -153,7 +153,6 @@
 #include <netinet/in.h>
 #include <linux/types.h>
 #include <linux/socket.h>
-#include <linux/compiler.h>
 #include <linux/wireless.h>
 #include <iwlib.h>
 #include <linux/if_packet.h>
--- xsupplicant-1.2.6/src/cardif/linux/cardif_atmel_driver.c.BAD	2006-07-07 11:12:56.000000000 -0500
+++ xsupplicant-1.2.6/src/cardif/linux/cardif_atmel_driver.c	2006-07-07 11:13:01.000000000 -0500
@@ -88,7 +88,6 @@
 #include <sys/ioctl.h>
 #include <linux/types.h>
 #include <linux/socket.h>
-#include <linux/compiler.h>
 #include <linux/wireless.h>
 #include <iwlib.h>
 #include <stdlib.h>
--- xsupplicant-1.2.6/src/cardif/linux/cardif_linux_rtnetlink.c.BAD	2006-07-07 11:12:39.000000000 -0500
+++ xsupplicant-1.2.6/src/cardif/linux/cardif_linux_rtnetlink.c	2006-07-07 11:12:44.000000000 -0500
@@ -167,7 +167,6 @@
 
 #include <unistd.h>
 #include <sys/socket.h>
-#include <linux/compiler.h>
 #include <linux/wireless.h>
 #include <iwlib.h>
 #include <sys/ioctl.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Apr 2006 15:19:43 -0000	1.5
+++ .cvsignore	7 Jul 2006 18:02:10 -0000	1.6
@@ -2,3 +2,4 @@
 xsupplicant-1.2.2.tar.gz
 xsupplicant-1.2.3.tar.gz
 xsupplicant-1.2.4.tar.gz
+xsupplicant-1.2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Apr 2006 15:19:43 -0000	1.7
+++ sources	7 Jul 2006 18:02:10 -0000	1.8
@@ -1 +1 @@
-45c5bc08ae38152ba892a0923e0399cb  xsupplicant-1.2.4.tar.gz
+939da90d2d19997dcd108ec9aebf4ac2  xsupplicant-1.2.6.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xsupplicant.spec	7 Apr 2006 15:19:43 -0000	1.18
+++ xsupplicant.spec	7 Jul 2006 18:02:10 -0000	1.19
@@ -1,17 +1,17 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.4
+Version:	1.2.6
 Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
 Source0:	http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz
-Source1:	v19wireless.h
+# Source1:	v19wireless.h
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.2-docsfix.patch
-Patch1:		xsupplicant-1.2.3-fixincludes.patch
+Patch2:		xsupplicant-1.2.6-nocompilerh-systemheaders.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -30,12 +30,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-# Fedora Core 4 and 5 ship with old headers, but V19 in the kernel
-# So, we need to put the right headers in place. This is the simplest
-# hack to solve this issue.
-cp %{SOURCE1} src/
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -76,6 +71,11 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Fri Jul  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.6-1
+- bump to 1.2.6
+- remove all includes for linux/compiler.h, its not needed (and not present on Fedora)
+- remove hack for wireless.h for FC6+
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.4-1
 - bump to 1.2.4

More information about the scm-commits mailing list