diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index dd848e7..0000000 --- a/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -wlassistant-0.5.6.tar.bz2 -wlassistant-0.5.7.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index afa25ee..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wlassistant -# $Id$ -NAME := wlassistant -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 -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/dead.package b/dead.package new file mode 100644 index 0000000..b9a1202 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +no one uses this anymore and its python2 only diff --git a/sources b/sources deleted file mode 100644 index dc28f30..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -4623b498ac42839d08c631c500f18f8b wlassistant-0.5.7.tar.bz2 diff --git a/wlassistant-0.5.4a-desktopfix.patch b/wlassistant-0.5.4a-desktopfix.patch deleted file mode 100644 index ab0da01..0000000 --- a/wlassistant-0.5.4a-desktopfix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- wlassistant-0.5.4a/src/wlassistant.desktop.orig 2005-09-01 23:23:44.000000000 -0500 -+++ wlassistant-0.5.4a/src/wlassistant.desktop 2005-09-04 20:00:41.000000000 -0500 -@@ -3,7 +3,10 @@ - Name=Wireless Assistant - Comment[pl]=Program do obsługi sieci bezprzewodowych - Comment[es]=Aplicación para buscar redes inalámbricas --Exec=sudo wlassistant --Icon=wlassistant -+Comment=Application to look for wireless networks -+Exec=/usr/sbin/wlassistant -+Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png - Type=Application -+Categories=Application;SystemSetup;System; -+StartupNotify=true - diff --git a/wlassistant-0.5.4a-rpath.patch b/wlassistant-0.5.4a-rpath.patch deleted file mode 100644 index 1245a92..0000000 --- a/wlassistant-0.5.4a-rpath.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- wlassistant-0.5.4a/configure.BAD 2005-09-04 19:32:40.000000000 -0500 -+++ wlassistant-0.5.4a/configure 2005-09-04 19:33:10.000000000 -0500 -@@ -29220,17 +29220,8 @@ - - if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then - -- KDE_RPATH="-R \$(kde_libraries)" -- - if test -n "$qt_libraries"; then -- KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)" -- fi -- if test -n "$X_LDFLAGS"; then -- X_RPATH="-R \$(x_libraries)" -- KDE_RPATH="$KDE_RPATH $X_RPATH" -- fi -- if test -n "$KDE_EXTRA_RPATH"; then -- KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)" -+ KDE_RPATH="-R \$(qt_libraries)" - fi - fi - diff --git a/wlassistant-0.5.5-devparsercleanup.patch b/wlassistant-0.5.5-devparsercleanup.patch deleted file mode 100644 index 5baba0e..0000000 --- a/wlassistant-0.5.5-devparsercleanup.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- wlassistant-0.5.5/src/wlassistant.cpp.BAD 2006-09-11 10:27:30.000000000 -0500 -+++ wlassistant-0.5.5/src/wlassistant.cpp 2006-09-11 10:30:22.000000000 -0500 -@@ -973,13 +973,18 @@ - { - WANetParams empty; - QString o = runCommand( Commands.cmd( "iwconfig_status", empty ) ); -- QStringList ol = QStringList::split("\n\n", o); -+ QStringList ol = QStringList::split("\n\n", o); // do we really need two - int c = ol.count(); - QStringList ifList = QStringList(); - for (int i = 0; i < c; i++) { - o = ol[i]; -- if ( o.find("no wireless extensions")==-1 ) //string not found -- ifList << o.left(o.find(" ")); -+ if ( o.find("no wireless extensions")==-1 ) { -+ if ( o.find("Warning:") == -1 ) { -+ QString interface = o.left(o.find(" ")); -+ if ( interface.length() > 1 ) -+ ifList << interface; -+ } -+ } - } - return ifList; - } diff --git a/wlassistant-0.5.5-rpath.patch b/wlassistant-0.5.5-rpath.patch deleted file mode 100644 index 197c74f..0000000 --- a/wlassistant-0.5.5-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- wlassistant-0.5.5/bksys/kde.py.BAD 2006-02-28 19:00:25.000000000 -0600 -+++ wlassistant-0.5.5/bksys/kde.py 2006-02-28 19:01:14.000000000 -0600 -@@ -25,10 +25,7 @@ - lenv.Append( CPPFLAGS = '-DQT_NO_TRANSLATION' ) - if 'rpath' in _flags: - ## Use this to set rpath - this may cause trouble if folders are moved (chrpath) -- kdelibpaths=[] -- if lenv['KDELIBPATH'] == lenv['KDELIB']: kdelibpaths = [lenv['KDELIB']] -- else: kdelibpaths = [lenv['KDELIBPATH'], lenv['KDELIB']] -- lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']]+kdelibpaths ) -+ lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']] ) - if 'thread' in _flags: - ## Uncomment the following if you need threading support - lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] ) diff --git a/wlassistant-0.5.6-devparsercleanup.patch b/wlassistant-0.5.6-devparsercleanup.patch deleted file mode 100644 index fb625f3..0000000 --- a/wlassistant-0.5.6-devparsercleanup.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- wlassistant-0.5.6/src/wlassistant.cpp.BAD 2007-01-18 13:07:25.000000000 -0600 -+++ wlassistant-0.5.6/src/wlassistant.cpp 2007-01-18 13:09:54.000000000 -0600 -@@ -1074,8 +1074,13 @@ - QStringList ifList = QStringList(); - for (int i = 0; i < c; i++) { - o = ol[i]; -- if ( o.find("no wireless extensions")==-1 ) //string not found -- ifList << o.left(o.find(" ")); -+ if ( o.find("no wireless extensions")==-1 ) { -+ if ( o.find("Warning:") == -1 ) { -+ QString interface = o.left(o.find(" ")); -+ if ( interface.length() > 1 ) -+ ifList << interface; -+ } -+ } - } - return ifList; - } diff --git a/wlassistant-0.5.7-fd_cloexec.patch b/wlassistant-0.5.7-fd_cloexec.patch deleted file mode 100644 index 1706b95..0000000 --- a/wlassistant-0.5.7-fd_cloexec.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -up wlassistant-0.5.7/src/watools.cpp.BAD wlassistant-0.5.7/src/watools.cpp ---- wlassistant-0.5.7/src/watools.cpp.BAD 2007-07-23 10:13:15.000000000 -0500 -+++ wlassistant-0.5.7/src/watools.cpp 2007-07-23 10:16:48.000000000 -0500 -@@ -23,6 +23,7 @@ - #include //provides readlink - #include - #include //to get values from /sys -+#include - #include - #include - #include //inet_ntoa -@@ -178,6 +179,13 @@ int WATools::availableNetworks( const ch - _ifname = ifname; - if (iw_socket<0) - iw_socket = iw_sockets_open(); //get kernel socket -+ int flags; -+ flags = fcntl(iw_socket, F_GETFD); -+ if (flags == -1) -+ return 0; -+ flags |= FD_CLOEXEC; -+ if (fcntl(iw_socket, F_SETFD, flags) == -1) -+ return 0; - if (iw_socket<0) - return 0; - -@@ -264,6 +272,13 @@ int WATools::doRequest( int request, str - _ifname = ifname; - if (iw_socket<0) - iw_socket = iw_sockets_open(); //get kernel socket -+ int flags; -+ flags = fcntl(iw_socket, F_GETFD); -+ if (flags == -1) -+ return 0; -+ flags |= FD_CLOEXEC; -+ if (fcntl(iw_socket, F_SETFD, flags) == -1) -+ return 0; - if (iw_socket<0) - return 0; - -@@ -278,6 +293,13 @@ int WATools::doWirelessRequest( int requ - _ifname = ifname; - if (iw_socket<0) - iw_socket = iw_sockets_open(); //get kernel socket -+ int flags; -+ flags = fcntl(iw_socket, F_GETFD); -+ if (flags == -1) -+ return 0; -+ flags |= FD_CLOEXEC; -+ if (fcntl(iw_socket, F_SETFD, flags) == -1) -+ return 0; - if (iw_socket<0) - return 0; - -@@ -292,6 +314,13 @@ int WATools::doWirelessStatisticsRequest - _ifname = ifname; - if (iw_socket<0) - iw_socket = iw_sockets_open();//get kernel socket -+ int flags; -+ flags = fcntl(iw_socket, F_GETFD); -+ if (flags == -1) -+ return 0; -+ flags |= FD_CLOEXEC; -+ if (fcntl(iw_socket, F_SETFD, flags) == -1) -+ return 0; - if (iw_socket<0) - return 0; - diff --git a/wlassistant-0.5.7-fix_scons_chmod_error.patch b/wlassistant-0.5.7-fix_scons_chmod_error.patch deleted file mode 100644 index 911f231..0000000 --- a/wlassistant-0.5.7-fix_scons_chmod_error.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up wlassistant-0.5.7/admin/generic.py.BAD wlassistant-0.5.7/admin/generic.py ---- wlassistant-0.5.7/admin/generic.py.BAD 2008-06-05 17:37:13.000000000 -0400 -+++ wlassistant-0.5.7/admin/generic.py 2008-06-05 17:39:48.000000000 -0400 -@@ -269,7 +269,8 @@ class genobj: - ret=self.env.Program(self.p_localtarget, self.p_localsource) - if not self.env.has_key('NOAUTOINSTALL'): - ins=self.env.bksys_install(self.instdir, ret) -- if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms)) -+ if ins and self.perms: -+ for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms)) - elif self.type=='staticlib': - ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource) - -@@ -476,7 +477,8 @@ def generate(env): - if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files)) - elif subdir: install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files)) - else: install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files)) -- if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms)) -+ if perms and install_list: -+ for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(lenv.Chmod(str(i), perms)) - env.Alias('install', install_list) - return install_list - -diff -up wlassistant-0.5.7/bksys/generic.py.BAD wlassistant-0.5.7/bksys/generic.py ---- wlassistant-0.5.7/bksys/generic.py.BAD 2008-06-05 17:40:14.000000000 -0400 -+++ wlassistant-0.5.7/bksys/generic.py 2008-06-05 17:41:02.000000000 -0400 -@@ -244,7 +244,8 @@ class genobj: - ret=self.env.Program(self.p_localtarget, self.p_localsource) - if not self.env.has_key('NOAUTOINSTALL'): - ins=self.env.bksys_install(self.instdir, ret) -- if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms)) -+ if ins and self.perms: -+ for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms)) - elif self.type=='staticlib': - ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource) - -@@ -462,7 +463,8 @@ def generate(env): - if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files)) - elif subdir: install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files)) - else: install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files)) -- if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms)) -+ if perms and install_list: -+ for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(str(i), perms)) - env.Alias('install', install_list) - return install_list - diff --git a/wlassistant-0.5.7-inline.patch b/wlassistant-0.5.7-inline.patch deleted file mode 100644 index b886e28..0000000 --- a/wlassistant-0.5.7-inline.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up wlassistant-0.5.7/src/watools.h.BAD wlassistant-0.5.7/src/watools.h ---- wlassistant-0.5.7/src/watools.h.BAD 2009-03-13 14:02:55.000000000 -0400 -+++ wlassistant-0.5.7/src/watools.h 2009-03-13 14:03:01.000000000 -0400 -@@ -25,6 +25,7 @@ - #define WA_TX_THRESHOLD 14 - - #include -+#undef inline - #include - class QStringList; - diff --git a/wlassistant.console_apps b/wlassistant.console_apps deleted file mode 100644 index 85bb30d..0000000 --- a/wlassistant.console_apps +++ /dev/null @@ -1,3 +0,0 @@ -USER=root -PROGRAM=/usr/bin/wlassistant -SESSION=true diff --git a/wlassistant.desktop b/wlassistant.desktop deleted file mode 100644 index 2b1fe27..0000000 --- a/wlassistant.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Wireless Assistant -Comment[pl]=Program do obsługi sieci bezprzewodowych -Comment[es]=Aplicación para buscar redes inalámbricas -Comment=Application to look for wireless networks -Exec=/usr/sbin/wlassistant -Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png -Type=Application -Categories=Application;Settings -StartupNotify=true diff --git a/wlassistant.pamd b/wlassistant.pamd deleted file mode 100644 index c7d67e3..0000000 --- a/wlassistant.pamd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth include config-util -account include config-util -session include config-util diff --git a/wlassistant.spec b/wlassistant.spec deleted file mode 100644 index 9f37bf3..0000000 --- a/wlassistant.spec +++ /dev/null @@ -1,148 +0,0 @@ -Name: wlassistant -Version: 0.5.7 -Release: 10%{?dist} -License: GPLv2+ -Group: Applications/System -Summary: Wireless network management tool -URL: http://wlassistant.sourceforge.net -Source0: http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2 -Source1: wlassistant.console_apps -Source2: wlassistant.pamd -Source3: wlassistant.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs3-devel, desktop-file-utils, wireless-tools-devel, scons -BuildRequires: gettext -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -Requires: usermode, wireless-tools, net-tools, dhclient, pam -Patch0: wlassistant-0.5.5-rpath.patch -Patch1: wlassistant-0.5.7-fd_cloexec.patch -Patch2: wlassistant-0.5.7-fix_scons_chmod_error.patch -Patch3: wlassistant-0.5.7-inline.patch - -%description -Wireless Assistant (wlassistant) is a small application that allows you to -connect to wireless networks. - -MAIN FEATURES: -- WPA-PSK Encryption Support (WPA/WPA2) -- WEP Encryption Support -- Not Broadcasted ("hidden") ESSIDs Support -- Per Network (AP) Configuration Profiles -- Automatic (DHCP, both dhcpcd and dhclient) and manual configuration options. -- Connection status monitoring - -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -b .gcc44 - -%build -PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` -sed -i "s|'-O2'|[$PARSED_OPT_FLAGS]|" bksys/generic.py -./configure -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant -install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant - -rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop - -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - %{SOURCE3} - -%find_lang %{name} - -# We're going to use consolehelper, since this is a GUI app. -cd $RPM_BUILD_ROOT%{_sbindir}/ -ln -s /usr/bin/consolehelper wlassistant - -%post -update-desktop-database %{_datadir}/applications &> /dev/null - -%postun -if [ "$1" = "0" ]; then - update-desktop-database %{_datadir}/applications &> /dev/null -fi - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc doc/AUTHORS doc/COPYING doc/README doc/NEWS doc/TODO ChangeLog -%config(noreplace) %{_sysconfdir}/pam.d/wlassistant -%config(noreplace) %{_sysconfdir}/security/console.apps/wlassistant -%{_bindir}/wlassistant -%{_sbindir}/wlassistant -%{_datadir}/applications/*.desktop -%{_datadir}/icons/hicolor/16x16/apps/wlassistant.png -%{_datadir}/icons/hicolor/32x32/apps/wlassistant.png - -%changelog -* Fri Mar 13 2009 Tom "spot" Callaway - 0.5.7-10 -- prevent iwlib from monkeying around with inline define - -* Wed Feb 25 2009 Fedora Release Engineering - 0.5.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jun 5 2008 Tom "spot" Callaway 0.5.7-8 -- fix scons chmod error (resolve FTBFS) - -* Tue Mar 11 2008 Tom "spot" Callaway 0.5.7-7 -- fix BuildRequires for kdelibs3-devel - -* Tue Feb 19 2008 Fedora Release Engineering - 0.5.7-6 -- Autorebuild for GCC 4.3 - -* Sat Nov 17 2007 Tom "spot" Callaway 0.5.7-5 -- fix pam file to use console-apps pam tree, instead of its own - resolves 243240, 306041 - -* Mon Aug 27 2007 Tom "spot" Callaway 0.5.7-4 -- rebuild for ppc32 -- license tag fix - -* Mon Jul 23 2007 Tom "spot" Callaway 0.5.7-3 -- close file descriptors with FD_CLOEXEC, try to resolve bz 243509 - -* Wed May 23 2007 Christopher Aillon 0.5.7-2 -- Rebuild against newer libiw.so - -* Tue Apr 10 2007 Tom "spot" Callaway 0.5.7-1 -- 0.5.7 - -* Thu Jan 18 2007 Tom "spot" Callaway 0.5.6-1 -- bump to 0.5.6 - -* Mon Sep 11 2006 Tom "spot" Callaway 0.5.5-4 -- fix bz 205886 - -* Mon Sep 4 2006 Tom "spot" Callaway 0.5.5-3 -- add BR: gettext - -* Mon Sep 4 2006 Tom "spot" Callaway 0.5.5-2 -- fix BR: wireless-tools-devel for fc6+ - -* Tue Feb 28 2006 Tom "spot" Callaway 0.5.5-1 -- bump to 0.5.5 - -* Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-3 -- use .desktop file as SOURCE3 rather than screwing around with dos2unix - -* Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-2 -- add BR: wireless-tools - -* Sun Sep 4 2005 Tom "spot" Callaway 0.5.4a-1 -- initial package for Fedora Extras