From 7ed745da39c12df286751de42a734389c4a8f515 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:45:49 +0000 Subject: [PATCH 1/6] Initialize branch FC-6 for xsupplicant --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 12f2c8ecdac1efba13948be7d8f761d66d94dd5c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 21 Nov 2006 15:13:51 +0000 Subject: [PATCH 2/6] Take everything to 1.2.8 (except FC-3, which is going to need a LOT more work) --- ...cant-1.2.8-nocompilerh-systemheaders.patch | 48 +++++++++++++++++++ xsupplicant.spec | 16 +++++-- 2 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 xsupplicant-1.2.8-nocompilerh-systemheaders.patch diff --git a/xsupplicant-1.2.8-nocompilerh-systemheaders.patch b/xsupplicant-1.2.8-nocompilerh-systemheaders.patch new file mode 100644 index 0000000..bd5215e --- /dev/null +++ b/xsupplicant-1.2.8-nocompilerh-systemheaders.patch @@ -0,0 +1,48 @@ +diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c +--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c 2006-10-08 05:42:53.000000000 +0200 ++++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c 2006-11-21 10:11:17.000000000 +0100 +@@ -103,7 +103,6 @@ + #include + #include + #include +-#include + #include + #include + #include +Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_atmel_driver.c~ +diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c +--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c 2006-10-08 05:42:53.000000000 +0200 ++++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c 2006-11-21 10:11:08.000000000 +0100 +@@ -174,7 +174,6 @@ + #include + #include + #include +-#include + #include + #include + #include +Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux.c~ +diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c +--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c 2006-10-08 05:42:53.000000000 +0200 ++++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c 2006-11-21 10:11:37.000000000 +0100 +@@ -203,7 +203,6 @@ + + #include + #include +-#include + #include + #include + #include "netlink.h" +Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_rtnetlink.c~ +diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c +--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c 2006-10-08 05:42:53.000000000 +0200 ++++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c 2006-11-21 10:11:28.000000000 +0100 +@@ -203,7 +203,6 @@ + #include + #include + #include +-#include + #include + #include + #include +Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_wext.c~ diff --git a/xsupplicant.spec b/xsupplicant.spec index 1bc0826..8315c3b 100644 --- a/xsupplicant.spec +++ b/xsupplicant.spec @@ -1,7 +1,7 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2.7 -Release: 3%{?dist} +Version: 1.2.8 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ @@ -11,8 +11,7 @@ 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-devel Patch0: xsupplicant-1.2.2-docsfix.patch -Patch2: xsupplicant-1.2.7-nocompilerh-systemheaders.patch -Patch3: xsupplicant-1.2.7-ducttapefixes.patch +Patch2: xsupplicant-1.2.8-nocompilerh-systemheaders.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -32,7 +31,6 @@ Development libraries and headers for xsupplicant. %setup -q %patch0 -p1 %patch2 -p1 -%patch3 -p1 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* @@ -73,6 +71,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libxsup*.a %changelog +* Tue Nov 21 2006 Tom "spot" Callaway 1.2.8-1 +- everyone gets 1.2.8, close out bz 212700 + +* Tue Nov 21 2006 Jan ONDREJ (SAL) 1.2.8-0 +- update to 1.2.8 +- removed xsupplicant-1.2.7-ducttapefixes.patch +- updated nocompilerh patch for latest version + * Sun Sep 10 2006 Tom "spot" Callaway 1.2.7-3 - fix ducttape patch for FC-4/FC-5 From 3241e410c06d0dba6fe7972292b9c9a7dbad9857 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 21 Nov 2006 15:35:12 +0000 Subject: [PATCH 3/6] Forgot to commit new source tarball. :P --- sources | 2 +- xsupplicant.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 55df7a1..bc92e6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f66c49cd6e4f331d05bf83513ed91990 xsupplicant-1.2.7.tar.gz +75f89731b905eb8d36a52621661e1226 xsupplicant-1.2.8.tar.gz diff --git a/xsupplicant.spec b/xsupplicant.spec index 8315c3b..621b5c9 100644 --- a/xsupplicant.spec +++ b/xsupplicant.spec @@ -1,7 +1,7 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.8 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPL Group: System Environment/Base URL: http://www.open1x.org/ From 81d9ac016aeaf793bac7e689858f30df64d726c2 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 6 Aug 2007 15:39:32 +0000 Subject: [PATCH 4/6] fix devel, license fixes for all --- xsupplicant.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsupplicant.spec b/xsupplicant.spec index 621b5c9..1687918 100644 --- a/xsupplicant.spec +++ b/xsupplicant.spec @@ -2,7 +2,7 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.8 Release: 1%{?dist}.1 -License: GPL +License: GPLv2+ Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz From c60bc2f3472a70e38112798f81f11bd3240f50aa Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:27 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e73b7c9..399f449 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xsupplicant -# $Id$ +# $Id: Makefile,v 1.1 2005/08/19 18:57:36 spot Exp $ NAME := xsupplicant SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ebfad8ad84349ae86188827424fd084e7765a7fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:14:25 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 399f449..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xsupplicant -# $Id: Makefile,v 1.1 2005/08/19 18:57:36 spot Exp $ -NAME := xsupplicant -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6