From ee190f1604455b9bfafbd60d48ca7b6f5caba369 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:25 +0000 Subject: [PATCH 1/4] 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 80601308c44c44aedab6050b21cdee562be68114 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:29:45 +0000 Subject: [PATCH 2/4] Initialize branch EL-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..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From b1f9af6e657a8c5c940d3f8eb9d797e48de8fcd3 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 8 Jul 2010 19:41:27 +0000 Subject: [PATCH 3/4] sync --- sources | 2 +- xsupplicant-2.1.9-force-release.patch | 35 +++++++++++++++++++++++++++ xsupplicant-2.2.0-implicit-DSO.patch | 13 ++++++++++ xsupplicant.spec | 22 ++++++++++++++--- 4 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 xsupplicant-2.1.9-force-release.patch create mode 100644 xsupplicant-2.2.0-implicit-DSO.patch diff --git a/sources b/sources index c907f26..d49f5c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -390e45630f06ac0efa88049fa8c5f16f XSupplicant-2.1.8-src.tar.gz +970955e115efc36cf32c5b508e5f1188 XSupplicant-2.2.0-src.tar.gz diff --git a/xsupplicant-2.1.9-force-release.patch b/xsupplicant-2.1.9-force-release.patch new file mode 100644 index 0000000..c8b0f33 --- /dev/null +++ b/xsupplicant-2.1.9-force-release.patch @@ -0,0 +1,35 @@ +diff -up xsupplicant-src-2.1.9.709/xsupplicant-ui/xsupptray/XSupplicantUI-unix.pro.BAD xsupplicant-src-2.1.9.709/xsupplicant-ui/xsupptray/XSupplicantUI-unix.pro +--- xsupplicant-src-2.1.9.709/xsupplicant-ui/xsupptray/XSupplicantUI-unix.pro.BAD 2010-01-13 11:50:15.939273096 -0500 ++++ xsupplicant-src-2.1.9.709/xsupplicant-ui/xsupptray/XSupplicantUI-unix.pro 2010-01-13 11:50:53.312370639 -0500 +@@ -5,9 +5,9 @@ + + TEMPLATE = app + TARGET = XSupplicantUI +-DESTDIR = ../build-debug ++DESTDIR = ../build-release + QT += xml +-CONFIG += debug ++CONFIG += release + INCLUDEPATH += ./../../xsupplicant/src/eap_types/tnc \ + ./../../xsupplicant/lib \ + ./../../xsupplicant/lib/libsupdetect \ +@@ -18,7 +18,7 @@ INCLUDEPATH += ./../../xsupplicant/src/e + /usr/include/libxml2 \ + /usr/local/include \ + . \ +- ./debug \ ++ ./release \ + ./GeneratedFiles + LIBS += -L"./../../xsupplicant/lib/libsupdetect" \ + -L"./../../xsupplicant/lib/libxsupconfig" \ +@@ -36,8 +36,8 @@ LIBS += -L"./../../xsupplicant/lib/libsu + -lxsupconfcheck \ + -lsupdetect + DEPENDPATH += . +-MOC_DIR += debug +-OBJECTS_DIR += debug ++MOC_DIR += release ++OBJECTS_DIR += release + UI_DIR += ./GeneratedFiles + RCC_DIR += ./release + diff --git a/xsupplicant-2.2.0-implicit-DSO.patch b/xsupplicant-2.2.0-implicit-DSO.patch new file mode 100644 index 0000000..6c6328f --- /dev/null +++ b/xsupplicant-2.2.0-implicit-DSO.patch @@ -0,0 +1,13 @@ +diff -up XSupplicant-2.2.0-src/xsupplicant/configure.ac.DSO XSupplicant-2.2.0-src/xsupplicant/configure.ac +--- XSupplicant-2.2.0-src/xsupplicant/configure.ac.DSO 2009-06-18 13:20:09.000000000 -0400 ++++ XSupplicant-2.2.0-src/xsupplicant/configure.ac 2010-02-10 16:05:30.374641077 -0500 +@@ -361,6 +361,9 @@ case "$host_os" in + AC_CHECK_HEADER(sys/socket.h, [], [AC_MSG_ERROR([header file \ + is required for Xsupplicant.])]) + ++ AC_CHECK_LIB(dl, dladdr) ++ AC_CHECK_LIB(z, deflate) ++ + AS_IF([test "$enable_static_iwlib" != yes], + [AC_CHECK_HEADER([iwlib.h], + [MORELIBS="${MORELIBS} -liw"], [AC_MSG_ERROR([header file is required for XSupplicant.])])], diff --git a/xsupplicant.spec b/xsupplicant.spec index 72873f5..d2bc8a7 100644 --- a/xsupplicant.spec +++ b/xsupplicant.spec @@ -1,14 +1,16 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 2.1.8 +Version: 2.2.0 Release: 2%{?dist} License: GPLv2+ or BSD with advertising Group: System Environment/Base URL: http://www.open1x.org/ -Source0: http://download.sourceforge.net/open1x/XSupplicant-%{version}-src.tar.gz +Source0: http://downloads.sourceforge.net/open1x/XSupplicant-%{version}-src.tar.gz Source1: XSupplicantUI.desktop Patch2: xsupplicant-2.1.8-ui-Fedora.patch Patch3: XSupplicant-2.1.8-ppc-fix.patch +Patch4: xsupplicant-2.1.9-force-release.patch +Patch5: xsupplicant-2.2.0-implicit-DSO.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool, dos2unix, libxml2-devel, pcsc-lite-devel, libtnc-devel BuildRequires: openssl-devel, wireless-tools-devel @@ -44,6 +46,10 @@ QT User Interface for XSupplicant. %patch2 -p1 -b .Fedora # Fix PPC (enough to get it building, not run-tested) %patch3 -p1 -b .ppc +# Force the UI bits to be built as "release", not "debug" +%patch4 -p1 -b .release +# Fix implicit linking issues +%patch5 -p1 -b .DSO cd xsupplicant autoreconf -vfis @@ -74,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a pushd xsupplicant-ui mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/ cp -a Skins $RPM_BUILD_ROOT%{_datadir}/%{name}/ -install -p build-debug/XSupplicantUI $RPM_BUILD_ROOT%{_bindir} +install -p build-release/XSupplicantUI $RPM_BUILD_ROOT%{_bindir} popd mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -125,6 +131,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/ %changelog +* Wed Feb 10 2010 Tom "spot" Callaway - 2.2.0-2 +- fix implicit DSO linking issue with libdl + +* Fri Jan 29 2010 Tom "spot" Callaway - 2.2.0-1 +- update to 2.2.0 + +* Wed Jan 13 2010 Tom "spot" Callaway - 2.1.9-1 +- update to 2.1.9 +- force UI bits to be built with release, not debug + * Wed Sep 2 2009 Tom "spot" Callaway - 2.1.8-2 - duct tape fix for ppc/ppc64, not run-tested From a1875f40bbcfaeaf9fabbe2eebc46fff05b86998 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:14:22 +0000 Subject: [PATCH 4/4] 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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6