From 6cf4a3b3f71a43cbb39dee65c1002bb2bb1a2052 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 19:56:59 +0100 Subject: [PATCH] update to 2.2.0 [release 2.2.0-1mamba;Sun Aug 23 2015] --- xsupplicant-2.2.0-force-release.patch | 35 ++++++++ xsupplicant-2.2.0-gcc47.patch | 12 +++ xsupplicant-2.2.0-implicit-DSO.patch | 105 ++++++++++++++++++++++++ xsupplicant-2.2.0-linux_if.patch | 11 +++ xsupplicant.spec | 114 ++++++++++++++++++++++---- 5 files changed, 259 insertions(+), 18 deletions(-) create mode 100644 xsupplicant-2.2.0-force-release.patch create mode 100644 xsupplicant-2.2.0-gcc47.patch create mode 100644 xsupplicant-2.2.0-implicit-DSO.patch create mode 100644 xsupplicant-2.2.0-linux_if.patch diff --git a/xsupplicant-2.2.0-force-release.patch b/xsupplicant-2.2.0-force-release.patch new file mode 100644 index 0000000..c8b0f33 --- /dev/null +++ b/xsupplicant-2.2.0-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-gcc47.patch b/xsupplicant-2.2.0-gcc47.patch new file mode 100644 index 0000000..5749d2e --- /dev/null +++ b/xsupplicant-2.2.0-gcc47.patch @@ -0,0 +1,12 @@ +diff -up XSupplicant-2.2.0-src/xsupplicant-ui/xsupptray/main.cpp.gcc47 XSupplicant-2.2.0-src/xsupplicant-ui/xsupptray/main.cpp +--- XSupplicant-2.2.0-src/xsupplicant-ui/xsupptray/main.cpp.gcc47 2012-01-05 15:45:39.227669265 -0500 ++++ XSupplicant-2.2.0-src/xsupplicant-ui/xsupptray/main.cpp 2012-01-05 15:45:47.510593833 -0500 +@@ -30,6 +30,8 @@ + * Nortel Networks for an OEM Commercial License. + **/ + ++#include ++ + #include "stdafx.h" + + extern "C" { diff --git a/xsupplicant-2.2.0-implicit-DSO.patch b/xsupplicant-2.2.0-implicit-DSO.patch new file mode 100644 index 0000000..b6099e2 --- /dev/null +++ b/xsupplicant-2.2.0-implicit-DSO.patch @@ -0,0 +1,105 @@ + + + +xsupplicant.git - xsupplicant + + + + + + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/xsupplicant-2.2.0-implicit-DSO.patch
blob: 6c6328f5c2e376d4e4edf601c51d59eb55c6d864 (plain) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+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 \
+         <sys/socket.h> 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 <iwlib.h> is required for XSupplicant.])])],
+
+
+
generated by cgit v0.10.2 at 2015-08-23 17:53:22 (GMT)
+
+ + diff --git a/xsupplicant-2.2.0-linux_if.patch b/xsupplicant-2.2.0-linux_if.patch new file mode 100644 index 0000000..9333cfc --- /dev/null +++ b/xsupplicant-2.2.0-linux_if.patch @@ -0,0 +1,11 @@ +--- XSupplicant-2.2.0-src/xsupplicant/src/platform/linux/cardif_linux_rtnetlink.c.orig 2015-08-23 19:59:38.635741118 +0200 ++++ XSupplicant-2.2.0-src/xsupplicant/src/platform/linux/cardif_linux_rtnetlink.c 2015-08-23 19:59:44.018735343 +0200 +@@ -13,7 +13,7 @@ + #include + #include "netlink.h" + #include "rtnetlink.h" +-#include ++#include + #include + #include + #include diff --git a/xsupplicant.spec b/xsupplicant.spec index bfdbf7b..48530d0 100644 --- a/xsupplicant.spec +++ b/xsupplicant.spec @@ -1,70 +1,148 @@ Name: xsupplicant -Version: 1.2.8 -Release: 3mamba +Version: 2.2.0 +Release: 1mamba Summary: A free, open source 802.1X/WPA/WPA2/IEEE802.11i implementation Group: Network/Security Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://open1x.sourceforge.net/ -Source: http://ovh.dl.sourceforge.net/sourceforge/open1x/xsupplicant-%{version}.tar.gz +Source: http://downloads.sourceforge.net/project/open1x/Open1X/XSupplicant%20%{version}/XSupplicant-%{version}-src.tar.gz Patch0: %{name}-1.2.8-configure.patch Patch1: %{name}-1.2.8-kernel-2.6.19.patch +Patch2: xsupplicant-2.2.0-gcc47.patch +Patch3: xsupplicant-2.2.0-implicit-DSO.patch +Patch4: xsupplicant-2.2.0-linux_if.patch +Patch5: xsupplicant-2.2.0-force-release.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libgcc BuildRequires: libiw-devel +BuildRequires: liblzma-devel BuildRequires: libopenssl-devel +BuildRequires: libpcsclite-devel +BuildRequires: libqt4-devel +BuildRequires: libstdc++6-devel +BuildRequires: libtnc-devel +BuildRequires: libxml2-devel +BuildRequires: libz-devel ## AUTOBUILDREQ-END +BuildRequires: libiw-devel >= 30.pre9-1mamba +Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The Open1X project is dedicated to bringing a free, open source 802.1X/WPA/WPA2/IEEE802.11i implementation to as many target platforms as possible. -%package devel +%package -n lib%{name} +Summary: A free, open source 802.1X/WPA/WPA2/IEEE802.11i implementation +Group: System/Libraries + +%description -n lib%{name} +The Open1X project is dedicated to bringing a free, open source 802.1X/WPA/WPA2/IEEE802.11i implementation to as many target platforms as possible. + +%package -n lib%{name}-devel Summary: Devel package for %{name} Group: Development/Libraries -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} +Provides: xsupplicant-devel +Obsoletes: xsupplicant-devel -%description devel +%description -n lib%{name}-devel The Open1X project is dedicated to bringing a free, open source 802.1X/WPA/WPA2/IEEE802.11i implementation to as many target platforms as possible. This package contains static libraries and header files need for development. +%package ui +Summary: Graphical interface for xsupplicant +Group: Graphical Desktop/Applications/Networking +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description ui +The Open1X project is dedicated to bringing a free, open source 802.1X/WPA/WPA2/IEEE802.11i implementation to as many target platforms as possible. +This package provides a graphical interface for xsupplicant. + %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%setup -q -n XSupplicant-2.2.0-src +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build -%configure -%make MOREDEFS="-DNEW_IWLIB" +cd xsupplicant +./autoregen.sh +%configure --enable-tnc --enable-eap-fast --enable-eap-sim +%make + +cd ../xsupplicant-ui/xsupptray +qmake-qt4 XSupplicantUI-unix.pro +%make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall +%makeinstall -C xsupplicant + +cd xsupplicant-ui +mkdir -p %{buildroot}%{_datadir}/%{name}/ +cp -a Skins %{buildroot}%{_datadir}/%{name}/ +install -p build-release/XSupplicantUI %{buildroot}%{_bindir} %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +%post -n lib%{name} -p /sbin/ldconfig +%postun -n lib%{name} -p /sbin/ldconfig + %files %defattr(-,root,root) +%{_bindir}/connect-tool +%{_bindir}/ipcevents +%{_bindir}/ipctest %{_bindir}/config-parser -%{_bindir}/xsup_get_state -%{_bindir}/xsup_monitor %{_bindir}/xsup_ntpwdhash -%{_bindir}/xsup_set_pwd %{_sbindir}/xsupplicant -%doc AUTHORS COPYING LICENSE README TODO -%files devel +%files -n lib%{name} +%defattr(-,root,root) +%{_libdir}/libbirddog.so.* +%{_libdir}/libsoftsim2g.so.* +%{_libdir}/libsoftsim3g.so.* +%doc xsupplicant/AUTHORS xsupplicant/COPYING xsupplicant/LICENSE + +%files -n lib%{name}-devel %defattr(-,root,root) %{_libdir}/libxsupconfcheck.a %{_libdir}/libxsupconfig.a -%{_libdir}/libxsupconfwrite.a +%{_libdir}/libbirddog.a +%{_libdir}/libbirddog.la +%{_libdir}/libbirddog.so +%{_libdir}/libsoftsim2g.a +%{_libdir}/libsoftsim2g.la +%{_libdir}/libsoftsim2g.so +%{_libdir}/libsoftsim3g.a +%{_libdir}/libsoftsim3g.la +%{_libdir}/libsoftsim3g.so %{_libdir}/libxsupgui.a %{_includedir}/*.h +%doc xsupplicant/README xsupplicant/TODO + +%files ui +%defattr(-,root,root) +%{_bindir}/XSupplicantUI +%dir %{_datadir}/xsupplicant +%dir %{_datadir}/xsupplicant/Skins +%dir %{_datadir}/xsupplicant/Skins/Default +%{_datadir}/xsupplicant/Skins/Default/* +%doc xsupplicant-ui/LICENSE %changelog +* Sun Aug 23 2015 Silvan Calarco 2.2.0-1mamba +- update to 2.2.0 + +* Sun Aug 23 2015 Silvan Calarco 1.2.8-4mamba +- rebuilt by autoport with build requirements: libiw-devel>=30.pre9-1mamba + * Fri Oct 16 2009 Silvan Calarco 1.2.8-3mamba - rebuilt against libopenssl 0.9.8