rpms/xsupplicant/FC-4 xsupplicant-1.2.7-ducttapefixes.patch, NONE, 1.1 xsupplicant-1.2.7-nocompilerh-systemheaders.patch, NONE, 1.1 sources, 1.8, 1.9 xsupplicant.spec, 1.18, 1.19

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26304/FC-4

Modified Files:
	sources xsupplicant.spec 
Added Files:
	xsupplicant-1.2.7-ducttapefixes.patch 
	xsupplicant-1.2.7-nocompilerh-systemheaders.patch 
Log Message:

OK, we're going to 1.2.7. They picked up on the "local copy of wireless.h" trick,
so we don't have to hack it in anymore. Also, fix the BR in the devel branch for
wireless-tools-devel. And, as usual, with this package, apply duct tape to keep 
it from falling apart.


xsupplicant-1.2.7-ducttapefixes.patch:

--- NEW FILE xsupplicant-1.2.7-ducttapefixes.patch ---
--- xsupplicant-1.2.7/src/cardif/cardif.h.BAD	2006-09-04 00:39:00.000000000 -0500
+++ xsupplicant-1.2.7/src/cardif/cardif.h	2006-09-04 00:39:36.000000000 -0500
@@ -58,7 +58,7 @@
 #define DOES_TKIP                     0x00000010
 #define DOES_CCMP                     0x00000020
 
-#ifndef IF_OPER_DORMANT
+#ifndef _LINUX_IF_H
 /* RFC 2863 operational status */
 enum {
   IF_OPER_UNKNOWN,
--- xsupplicant-1.2.7/src/cardif/linux/wireless_copy.h.BAD	2006-09-04 00:42:58.000000000 -0500
+++ xsupplicant-1.2.7/src/cardif/linux/wireless_copy.h	2006-09-04 00:43:08.000000000 -0500
@@ -642,7 +642,7 @@
  */
 struct	iw_point
 {
-  void __user	*pointer;	/* Pointer to the data  (in user space) */
+  void		*pointer;	/* Pointer to the data  (in user space) */
   __u16		length;		/* number of fields or size in bytes */
   __u16		flags;		/* Optional params */
 };

xsupplicant-1.2.7-nocompilerh-systemheaders.patch:

--- NEW FILE xsupplicant-1.2.7-nocompilerh-systemheaders.patch ---
--- xsupplicant-1.2.7/src/cardif/linux/cardif_linux.c.orig	2006-08-27 23:31:54.000000000 -0500
+++ xsupplicant-1.2.7/src/cardif/linux/cardif_linux.c	2006-09-04 00:35:33.000000000 -0500
@@ -171,7 +171,6 @@
 #include <netinet/in.h>
 #include <linux/types.h>
 #include <linux/socket.h>
-#include <linux/compiler.h>
 #include <iwlib.h>
 #include <linux/if_packet.h>
 #include <stdio.h>
--- xsupplicant-1.2.7/src/cardif/linux/cardif_atmel_driver.c.orig	2006-08-28 10:59:31.000000000 -0500
+++ xsupplicant-1.2.7/src/cardif/linux/cardif_atmel_driver.c	2006-09-04 00:35:57.000000000 -0500
@@ -100,7 +100,6 @@
 #include <sys/ioctl.h>
 #include <linux/types.h>
 #include <linux/socket.h>
-#include <linux/compiler.h>
 #include <iwlib.h>
 #include <stdlib.h>
 #include <string.h>
--- xsupplicant-1.2.7/src/cardif/linux/cardif_linux_wext.c.orig	2006-08-27 23:31:54.000000000 -0500
+++ xsupplicant-1.2.7/src/cardif/linux/cardif_linux_wext.c	2006-09-04 00:35:11.000000000 -0500
@@ -184,7 +184,6 @@
 #include <netinet/in.h>
 #include <linux/types.h>
 #include <linux/socket.h>
-#include <linux/compiler.h>
 #include "wireless_copy.h"
 #include <iwlib.h>
 #include <linux/if_packet.h>
--- xsupplicant-1.2.7/src/cardif/linux/cardif_linux_rtnetlink.c.orig	2006-08-28 10:59:31.000000000 -0500
+++ xsupplicant-1.2.7/src/cardif/linux/cardif_linux_rtnetlink.c	2006-09-04 00:36:15.000000000 -0500
@@ -191,7 +191,6 @@
 
 #include <unistd.h>
 #include <sys/socket.h>
-#include <linux/compiler.h>
 #include <iwlib.h>
 #include <sys/ioctl.h>
 #include "netlink.h"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Jul 2006 18:01:59 -0000	1.8
+++ sources	4 Sep 2006 06:13:03 -0000	1.9
@@ -1 +1 @@
-939da90d2d19997dcd108ec9aebf4ac2  xsupplicant-1.2.6.tar.gz
+f66c49cd6e4f331d05bf83513ed91990  xsupplicant-1.2.7.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xsupplicant.spec	7 Jul 2006 18:01:59 -0000	1.18
+++ xsupplicant.spec	4 Sep 2006 06:13:03 -0000	1.19
@@ -1,18 +1,18 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.6
+Version:	1.2.7
 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.1-docsfix.patch
-Patch1:		xsupplicant-1.2.6-fixincludes.patch
-Patch2:		xsupplicant-1.2.6-nocompilerh.patch
+Patch2:		xsupplicant-1.2.7-nocompilerh-systemheaders.patch
+Patch3:		xsupplicant-1.2.7-ducttapefixes.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -31,13 +31,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -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/
+%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -78,6 +73,9 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Mon Sep  4 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.7-1
+- bump to 1.2.7
+
 * 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)