From 6201ac3d44f90b60b03ac06df10bdca356628dbf Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 7 Dec 2018 13:54:54 -0500 Subject: [PATCH 01/10] use ip instead of old net-tools. Not that you care. No one uses this dinosaur. --- wlassistant-0.5.7-iproute2.patch | 134 +++++++++++++++++++++++++++++++ wlassistant.spec | 10 ++- 2 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 wlassistant-0.5.7-iproute2.patch diff --git a/wlassistant-0.5.7-iproute2.patch b/wlassistant-0.5.7-iproute2.patch new file mode 100644 index 0000000..c6e66f9 --- /dev/null +++ b/wlassistant-0.5.7-iproute2.patch @@ -0,0 +1,134 @@ +diff -up wlassistant-0.5.7/src/netparams.h.iproute2 wlassistant-0.5.7/src/netparams.h +--- wlassistant-0.5.7/src/netparams.h.iproute2 2007-04-03 14:45:58.000000000 -0400 ++++ wlassistant-0.5.7/src/netparams.h 2018-12-07 13:47:03.555896593 -0500 +@@ -175,10 +175,9 @@ public: + std::cout << "DHCP Client: " << dhcpClient << std::endl; + } + +- ifconfig = getPath("ifconfig", binDirs); + iwconfig = getPath("iwconfig", binDirs); + iwlist = getPath("iwlist", binDirs); +- route = getPath("route", binDirs); ++ ipbin = getPath("ip", binDirs); + pidof = getPath("pidof", binDirs); + + if (!allFound) +@@ -191,13 +190,7 @@ public: + { + QStringList mCmd; + +- /*if (action=="ifup") +- mCmd << ifconfig << np.iface << "up"; +- +- else if (action=="ifdown") +- mCmd << ifconfig << np.iface << "down"; +- +- else*/ if (action=="radio_on") ++ if (action=="radio_on") + mCmd << iwconfig << np.iface << "txpower" << "auto"; + + else if (action=="scan") +@@ -233,19 +226,23 @@ public: + mCmd << dhcp << "-r" << np.iface; + + } else if (action=="ifconfig_manual") { +- mCmd << ifconfig << np.iface << np.ip; +- if (!np.netmask.isEmpty()) +- mCmd << "netmask" << np.netmask; ++ if (!np.netmask.isEmpty()) { ++ QString cidr = QString::number( netmaskToCidr(np.netmask) ); ++ QString fullMask = np.ip + cidr; ++ mCmd << ipbin << "address" << "add" << fullMask << "dev" << np.iface; ++ } else { ++ mCmd << ipbin << "address" << "add" << np.ip << "dev" << np.iface; ++ } + if (!np.broadcast.isEmpty()) + mCmd << "broadcast" << np.broadcast; + + } else if (action=="route_add") { + if (!np.gateway.isEmpty()) +- mCmd << route << "add" << "default" << "gw" << np.gateway; ++ mCmd << ipbin << "add" << "default" << "via" << np.gateway; + + } else if (action=="route_del") { + if (!np.gateway.isEmpty()) +- mCmd << route << "del" << "default" << "gw" << np.gateway; ++ mCmd << ipbin << "del" << "default" << "via" << np.gateway; + + } else + std::cout << "Unknown action: " << action << std::endl; +@@ -258,12 +255,11 @@ public: + return mCmd; + } + +- QString route; ++ QString ipbin; + QString dhcpClient; + QString wpa_supplicant; + QString wpa_cli; + private: +- QString ifconfig; + QString iwconfig; + QString iwlist; + QString dhcp; +@@ -284,6 +280,60 @@ private: + } + return s; + } ++ ++ static unsigned short netmaskToCidr( QString ipAddress ) ++ { ++ unsigned short netmask_cidr; ++ int ipbytes[4]; ++ QByteArray ba = ipAddress.local8Bit(); ++ const char *c_ipAddress = ba.data(); ++ ++ netmask_cidr=0; ++ sscanf(c_ipAddress, "%d.%d.%d.%d", &ipbytes[0], &ipbytes[1], &ipbytes[2], &ipbytes[3]); ++ ++ for (int i=0; i<4; i++) ++ { ++ switch(ipbytes[i]) ++ { ++ case 0x80: ++ netmask_cidr+=1; ++ break; ++ ++ case 0xC0: ++ netmask_cidr+=2; ++ break; ++ ++ case 0xE0: ++ netmask_cidr+=3; ++ break; ++ ++ case 0xF0: ++ netmask_cidr+=4; ++ break; ++ ++ case 0xF8: ++ netmask_cidr+=5; ++ break; ++ ++ case 0xFC: ++ netmask_cidr+=6; ++ break; ++ ++ case 0xFE: ++ netmask_cidr+=7; ++ break; ++ ++ case 0xFF: ++ netmask_cidr+=8; ++ break; ++ ++ default: ++ return netmask_cidr; ++ break; ++ } ++ } ++ return netmask_cidr; ++ } + }; + + #endif //WA_NETPARAMS_H diff --git a/wlassistant.spec b/wlassistant.spec index bf5e58f..c7eb708 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -1,6 +1,6 @@ Name: wlassistant Version: 0.5.7 -Release: 30%{?dist} +Release: 31%{?dist} License: GPLv2+ Group: Applications/System Summary: Wireless network management tool @@ -14,12 +14,13 @@ BuildRequires: gettext BuildRequires: gcc-c++ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -Requires: usermode, wireless-tools, net-tools, dhclient, pam +Requires: usermode, wireless-tools, iproute, 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 Patch4: wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch +Patch5: wlassistant-0.5.7-iproute2.patch %description Wireless Assistant (wlassistant) is a small application that allows you to @@ -40,6 +41,7 @@ MAIN FEATURES: %patch2 -p1 %patch3 -p1 -b .gcc44 %patch4 -p1 -b .DSO +%patch5 -p1 -b .iproute2 %build PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` @@ -88,6 +90,10 @@ fi %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Fri Dec 7 2018 Tom Callaway - 0.5.7-31 +- use ip instead of old net-tools (bz#1496166) + Pretty sure I got this right, but I am also pretty sure no one uses this dinosaur. + * Tue Jul 24 2018 Tom Callaway - 0.5.7-30 - add BuildRequires: gcc-c++ From 309dcea9b097adb079c62a4121b48557f4f50c12 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 7 Dec 2018 14:05:43 -0500 Subject: [PATCH 02/10] fixed iproute patch to properly use CIDR. Not that you would have EVER noticed. --- wlassistant-0.5.7-iproute2.patch | 2 +- wlassistant.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wlassistant-0.5.7-iproute2.patch b/wlassistant-0.5.7-iproute2.patch index c6e66f9..d41a4a1 100644 --- a/wlassistant-0.5.7-iproute2.patch +++ b/wlassistant-0.5.7-iproute2.patch @@ -37,7 +37,7 @@ diff -up wlassistant-0.5.7/src/netparams.h.iproute2 wlassistant-0.5.7/src/netpar - mCmd << "netmask" << np.netmask; + if (!np.netmask.isEmpty()) { + QString cidr = QString::number( netmaskToCidr(np.netmask) ); -+ QString fullMask = np.ip + cidr; ++ QString fullMask = np.ip + "/" + cidr; + mCmd << ipbin << "address" << "add" << fullMask << "dev" << np.iface; + } else { + mCmd << ipbin << "address" << "add" << np.ip << "dev" << np.iface; diff --git a/wlassistant.spec b/wlassistant.spec index c7eb708..6cd7f0d 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -1,6 +1,6 @@ Name: wlassistant Version: 0.5.7 -Release: 31%{?dist} +Release: 32%{?dist} License: GPLv2+ Group: Applications/System Summary: Wireless network management tool @@ -90,6 +90,9 @@ fi %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Fri Dec 7 2018 Tom Callaway - 0.5.7-32 +- fixed iproute patch to properly use CIDR. Not that you would have EVER noticed. + * Fri Dec 7 2018 Tom Callaway - 0.5.7-31 - use ip instead of old net-tools (bz#1496166) Pretty sure I got this right, but I am also pretty sure no one uses this dinosaur. From 8f886592a1bcbb16feb4ae0f24d08f49cb1497fb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 03/10] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- wlassistant.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wlassistant.spec b/wlassistant.spec index 6cd7f0d..3cf3f8a 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -2,7 +2,6 @@ Name: wlassistant Version: 0.5.7 Release: 32%{?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 From ce3ffffcaa76b701631f7b91958aa7da777a3ee3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 29 Jan 2019 06:17:40 +0100 Subject: [PATCH 04/10] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- wlassistant.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/wlassistant.spec b/wlassistant.spec index 3cf3f8a..033f767 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -70,14 +70,6 @@ desktop-file-install \ 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 - %files -f %{name}.lang %doc doc/AUTHORS doc/COPYING doc/README doc/NEWS doc/TODO ChangeLog %config(noreplace) %{_sysconfdir}/pam.d/wlassistant From 0f55e8f5bc3189c402cb196bb7b666c5d719c851 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:49:17 +0000 Subject: [PATCH 05/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wlassistant.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlassistant.spec b/wlassistant.spec index 033f767..86319ac 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -1,6 +1,6 @@ Name: wlassistant Version: 0.5.7 -Release: 32%{?dist} +Release: 33%{?dist} License: GPLv2+ Summary: Wireless network management tool URL: http://wlassistant.sourceforge.net @@ -81,6 +81,9 @@ ln -s /usr/bin/consolehelper wlassistant %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.5.7-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Dec 7 2018 Tom Callaway - 0.5.7-32 - fixed iproute patch to properly use CIDR. Not that you would have EVER noticed. From 34de998fa57620abc399d8b0e8c6df084060e92c Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Thu, 7 Mar 2019 19:59:05 +0000 Subject: [PATCH 06/10] Remove obsolete requirements for %post/%postun scriptlets --- wlassistant.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wlassistant.spec b/wlassistant.spec index 86319ac..2765912 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -1,6 +1,6 @@ Name: wlassistant Version: 0.5.7 -Release: 33%{?dist} +Release: 34%{?dist} License: GPLv2+ Summary: Wireless network management tool URL: http://wlassistant.sourceforge.net @@ -11,8 +11,6 @@ Source3: wlassistant.desktop BuildRequires: kdelibs3-devel, desktop-file-utils, wireless-tools-devel, scons BuildRequires: gettext BuildRequires: gcc-c++ -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils Requires: usermode, wireless-tools, iproute, dhclient, pam Patch0: wlassistant-0.5.5-rpath.patch Patch1: wlassistant-0.5.7-fd_cloexec.patch @@ -81,6 +79,9 @@ ln -s /usr/bin/consolehelper wlassistant %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Thu Mar 7 2019 Tim Landscheidt - 0.5.7-34 +- Remove obsolete requirements for %%post/%%postun scriptlets + * Sun Feb 03 2019 Fedora Release Engineering - 0.5.7-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3634dbf34a8bb6b50ef01522839654312ad1a50e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 5 Jun 2019 11:06:53 -0400 Subject: [PATCH 07/10] fix code to compile with current scons --- wlassistant-0.5.7-scons-fix.patch | 89 +++++++++++++++++++++++++++++++ wlassistant.spec | 7 ++- 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 wlassistant-0.5.7-scons-fix.patch diff --git a/wlassistant-0.5.7-scons-fix.patch b/wlassistant-0.5.7-scons-fix.patch new file mode 100644 index 0000000..bf015f3 --- /dev/null +++ b/wlassistant-0.5.7-scons-fix.patch @@ -0,0 +1,89 @@ +diff -up wlassistant-0.5.7/admin/generic.py.sconsfix wlassistant-0.5.7/admin/generic.py +--- wlassistant-0.5.7/admin/generic.py.sconsfix 2019-06-05 11:04:22.501917688 -0400 ++++ wlassistant-0.5.7/admin/generic.py 2019-06-05 11:04:22.510917513 -0400 +@@ -6,7 +6,7 @@ import SCons.Defaults + import SCons.Tool + import SCons.Util + from SCons.Script.SConscript import SConsEnvironment +-from SCons.Options import Options, PathOption ++from SCons.Variables import Variables, PathVariable + + def getreldir(lenv): + cwd=os.getcwd() +@@ -394,8 +394,8 @@ def generate(env): + + ## load the options + cachefile=env['CACHEDIR']+'generic.cache.py' +- opts = Options(cachefile) +- opts.AddOptions( ++ opts = Variable(cachefile) ++ opts.AddVariables( + ( 'GENCCFLAGS', 'C flags' ), + ( 'GENCXXFLAGS', 'debug level for the project : full or just anything' ), + ( 'GENLINKFLAGS', 'additional link flags' ), +diff -up wlassistant-0.5.7/admin/kde.py.sconsfix wlassistant-0.5.7/admin/kde.py +--- wlassistant-0.5.7/admin/kde.py.sconsfix 2007-04-03 14:45:58.000000000 -0400 ++++ wlassistant-0.5.7/admin/kde.py 2019-06-05 11:04:22.511917493 -0400 +@@ -279,10 +279,10 @@ def generate(env): + Builder = SCons.Builder.Builder + + # Detect the environment - replaces ./configure implicitely and store the options into a cache +- from SCons.Options import Options ++ from SCons.Variables import Variables + cachefile=env['CACHEDIR']+'kde.cache.py' +- opts = Options(cachefile) +- opts.AddOptions( ++ opts = Variables(cachefile) ++ opts.AddVariables( + ('PREFIX', 'root of the program installation'), + + ('QTDIR', ''), +diff -up wlassistant-0.5.7/bksys/generic.py.sconsfix wlassistant-0.5.7/bksys/generic.py +--- wlassistant-0.5.7/bksys/generic.py.sconsfix 2019-06-05 11:04:22.502917668 -0400 ++++ wlassistant-0.5.7/bksys/generic.py 2019-06-05 11:04:22.520917318 -0400 +@@ -6,7 +6,7 @@ import SCons.Defaults + import SCons.Tool + import SCons.Util + from SCons.Script.SConscript import SConsEnvironment +-from SCons.Options import Options, PathOption ++from SCons.Variables import Variables, PathVariable + + def getreldir(lenv): + cwd=os.getcwd() +@@ -381,8 +381,8 @@ def generate(env): + + ## load the options + cachefile=env['CACHEDIR']+'generic.cache.py' +- opts = Options(cachefile) +- opts.AddOptions( ++ opts = Variables(cachefile) ++ opts.AddVariables( + ( 'GENCCFLAGS', 'C flags' ), + ( 'BKS_DEBUG', 'debug level: full, trace, or just something' ), + ( 'GENCXXFLAGS', 'additional cxx flags for the project' ), +@@ -419,7 +419,7 @@ def generate(env): + env['GENCXXFLAGS'] = SCons.Util.CLVar( os.environ['CXXFLAGS'] ) + env.Append( GENCXXFLAGS = ['-DNDEBUG', '-DNO_DEBUG'] ) + else: +- env.Append(GENCXXFLAGS = ['-O2', '-DNDEBUG', '-DNO_DEBUG']) ++ env.Append(GENCXXFLAGS = [['-O2', '-g', '-pipe', '-Wall', '-Werror=format-security', '-Wp,-D_FORTIFY_SOURCE=2', '-Wp,-D_GLIBCXX_ASSERTIONS', '-fexceptions', '-fstack-protector-strong', '-grecord-gcc-switches', '-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1', '-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1', '-m64', '-mtune=generic', '-fasynchronous-unwind-tables', '-fstack-clash-protection', '-fcf-protection'], '-DNDEBUG', '-DNO_DEBUG']) + + if os.environ.has_key('CFLAGS'): env['GENCCFLAGS'] = SCons.Util.CLVar( os.environ['CFLAGS'] ) + +diff -up wlassistant-0.5.7/bksys/kde.py.sconsfix wlassistant-0.5.7/bksys/kde.py +--- wlassistant-0.5.7/bksys/kde.py.sconsfix 2019-06-05 11:04:49.042401797 -0400 ++++ wlassistant-0.5.7/bksys/kde.py 2019-06-05 11:05:27.202660040 -0400 +@@ -288,10 +288,10 @@ def generate(env): + Builder = SCons.Builder.Builder + + # Detect the environment - replaces ./configure implicitely and store the options into a cache +- from SCons.Options import Options ++ from SCons.Variables import Variables + cachefile=env['CACHEDIR']+'kde.cache.py' +- opts = Options(cachefile) +- opts.AddOptions( ++ opts = Variables(cachefile) ++ opts.AddVariables( + ('PREFIX', 'root of the program installation'), + + ('QTDIR', ''), diff --git a/wlassistant.spec b/wlassistant.spec index 2765912..1e0fab6 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -1,6 +1,6 @@ Name: wlassistant Version: 0.5.7 -Release: 34%{?dist} +Release: 35%{?dist} License: GPLv2+ Summary: Wireless network management tool URL: http://wlassistant.sourceforge.net @@ -18,6 +18,7 @@ Patch2: wlassistant-0.5.7-fix_scons_chmod_error.patch Patch3: wlassistant-0.5.7-inline.patch Patch4: wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch Patch5: wlassistant-0.5.7-iproute2.patch +Patch6: wlassistant-0.5.7-scons-fix.patch %description Wireless Assistant (wlassistant) is a small application that allows you to @@ -39,6 +40,7 @@ MAIN FEATURES: %patch3 -p1 -b .gcc44 %patch4 -p1 -b .DSO %patch5 -p1 -b .iproute2 +%patch6 -p1 -b .sconsfix %build PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` @@ -79,6 +81,9 @@ ln -s /usr/bin/consolehelper wlassistant %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Wed Jun 5 2019 Tom Callaway - 0.5.7-35 +- fix code to compile with current scons + * Thu Mar 7 2019 Tim Landscheidt - 0.5.7-34 - Remove obsolete requirements for %%post/%%postun scriptlets From 4c12cb1e6ebfa82ada46174c14e86e8085ad7fc9 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 5 Jun 2019 11:15:18 -0400 Subject: [PATCH 08/10] cleanup optflags goop --- wlassistant-0.5.7-scons-fix.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/wlassistant-0.5.7-scons-fix.patch b/wlassistant-0.5.7-scons-fix.patch index bf015f3..963fa5d 100644 --- a/wlassistant-0.5.7-scons-fix.patch +++ b/wlassistant-0.5.7-scons-fix.patch @@ -61,15 +61,6 @@ diff -up wlassistant-0.5.7/bksys/generic.py.sconsfix wlassistant-0.5.7/bksys/gen ( 'GENCCFLAGS', 'C flags' ), ( 'BKS_DEBUG', 'debug level: full, trace, or just something' ), ( 'GENCXXFLAGS', 'additional cxx flags for the project' ), -@@ -419,7 +419,7 @@ def generate(env): - env['GENCXXFLAGS'] = SCons.Util.CLVar( os.environ['CXXFLAGS'] ) - env.Append( GENCXXFLAGS = ['-DNDEBUG', '-DNO_DEBUG'] ) - else: -- env.Append(GENCXXFLAGS = ['-O2', '-DNDEBUG', '-DNO_DEBUG']) -+ env.Append(GENCXXFLAGS = [['-O2', '-g', '-pipe', '-Wall', '-Werror=format-security', '-Wp,-D_FORTIFY_SOURCE=2', '-Wp,-D_GLIBCXX_ASSERTIONS', '-fexceptions', '-fstack-protector-strong', '-grecord-gcc-switches', '-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1', '-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1', '-m64', '-mtune=generic', '-fasynchronous-unwind-tables', '-fstack-clash-protection', '-fcf-protection'], '-DNDEBUG', '-DNO_DEBUG']) - - if os.environ.has_key('CFLAGS'): env['GENCCFLAGS'] = SCons.Util.CLVar( os.environ['CFLAGS'] ) - diff -up wlassistant-0.5.7/bksys/kde.py.sconsfix wlassistant-0.5.7/bksys/kde.py --- wlassistant-0.5.7/bksys/kde.py.sconsfix 2019-06-05 11:04:49.042401797 -0400 +++ wlassistant-0.5.7/bksys/kde.py 2019-06-05 11:05:27.202660040 -0400 From d6a77efe6ae4a4ae75eb40ec7b73f6124eeb866e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:35:15 +0000 Subject: [PATCH 09/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wlassistant.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlassistant.spec b/wlassistant.spec index 1e0fab6..b066387 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -1,6 +1,6 @@ Name: wlassistant Version: 0.5.7 -Release: 35%{?dist} +Release: 36%{?dist} License: GPLv2+ Summary: Wireless network management tool URL: http://wlassistant.sourceforge.net @@ -81,6 +81,9 @@ ln -s /usr/bin/consolehelper wlassistant %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.5.7-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jun 5 2019 Tom Callaway - 0.5.7-35 - fix code to compile with current scons From 4d6c6f4c340dc703533350bb9547b01322d33faa Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 1 Aug 2019 13:59:27 -0400 Subject: [PATCH 10/10] no one uses this anymore and its python2 only --- .gitignore | 2 - dead.package | 1 + sources | 1 - wlassistant-0.5.4a-desktopfix.patch | 15 -- wlassistant-0.5.4a-rpath.patch | 21 -- wlassistant-0.5.5-devparsercleanup.patch | 24 -- wlassistant-0.5.5-rpath.patch | 14 -- wlassistant-0.5.6-devparsercleanup.patch | 18 -- wlassistant-0.5.7-fd_cloexec.patch | 67 ------ ...stant-0.5.7-fix-implicit-DSO-kdecore.patch | 12 - wlassistant-0.5.7-fix_scons_chmod_error.patch | 46 ---- wlassistant-0.5.7-inline.patch | 11 - wlassistant-0.5.7-iproute2.patch | 134 ----------- wlassistant-0.5.7-scons-fix.patch | 80 ------- wlassistant.console_apps | 3 - wlassistant.desktop | 11 - wlassistant.pamd | 4 - wlassistant.spec | 218 ------------------ 18 files changed, 1 insertion(+), 681 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wlassistant-0.5.4a-desktopfix.patch delete mode 100644 wlassistant-0.5.4a-rpath.patch delete mode 100644 wlassistant-0.5.5-devparsercleanup.patch delete mode 100644 wlassistant-0.5.5-rpath.patch delete mode 100644 wlassistant-0.5.6-devparsercleanup.patch delete mode 100644 wlassistant-0.5.7-fd_cloexec.patch delete mode 100644 wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch delete mode 100644 wlassistant-0.5.7-fix_scons_chmod_error.patch delete mode 100644 wlassistant-0.5.7-inline.patch delete mode 100644 wlassistant-0.5.7-iproute2.patch delete mode 100644 wlassistant-0.5.7-scons-fix.patch delete mode 100644 wlassistant.console_apps delete mode 100644 wlassistant.desktop delete mode 100644 wlassistant.pamd delete mode 100644 wlassistant.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index dd848e7..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -wlassistant-0.5.6.tar.bz2 -wlassistant-0.5.7.tar.bz2 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-implicit-DSO-kdecore.patch b/wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch deleted file mode 100644 index 53140ef..0000000 --- a/wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wlassistant-0.5.7/config.bks.BAD wlassistant-0.5.7/config.bks ---- wlassistant-0.5.7/config.bks.BAD 2010-02-19 15:10:56.627502048 -0500 -+++ wlassistant-0.5.7/config.bks 2010-02-19 15:11:00.954485007 -0500 -@@ -2,7 +2,7 @@ - - -+ libs="kdecore kdeui qt-mt iw"> - - - 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-0.5.7-iproute2.patch b/wlassistant-0.5.7-iproute2.patch deleted file mode 100644 index d41a4a1..0000000 --- a/wlassistant-0.5.7-iproute2.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -up wlassistant-0.5.7/src/netparams.h.iproute2 wlassistant-0.5.7/src/netparams.h ---- wlassistant-0.5.7/src/netparams.h.iproute2 2007-04-03 14:45:58.000000000 -0400 -+++ wlassistant-0.5.7/src/netparams.h 2018-12-07 13:47:03.555896593 -0500 -@@ -175,10 +175,9 @@ public: - std::cout << "DHCP Client: " << dhcpClient << std::endl; - } - -- ifconfig = getPath("ifconfig", binDirs); - iwconfig = getPath("iwconfig", binDirs); - iwlist = getPath("iwlist", binDirs); -- route = getPath("route", binDirs); -+ ipbin = getPath("ip", binDirs); - pidof = getPath("pidof", binDirs); - - if (!allFound) -@@ -191,13 +190,7 @@ public: - { - QStringList mCmd; - -- /*if (action=="ifup") -- mCmd << ifconfig << np.iface << "up"; -- -- else if (action=="ifdown") -- mCmd << ifconfig << np.iface << "down"; -- -- else*/ if (action=="radio_on") -+ if (action=="radio_on") - mCmd << iwconfig << np.iface << "txpower" << "auto"; - - else if (action=="scan") -@@ -233,19 +226,23 @@ public: - mCmd << dhcp << "-r" << np.iface; - - } else if (action=="ifconfig_manual") { -- mCmd << ifconfig << np.iface << np.ip; -- if (!np.netmask.isEmpty()) -- mCmd << "netmask" << np.netmask; -+ if (!np.netmask.isEmpty()) { -+ QString cidr = QString::number( netmaskToCidr(np.netmask) ); -+ QString fullMask = np.ip + "/" + cidr; -+ mCmd << ipbin << "address" << "add" << fullMask << "dev" << np.iface; -+ } else { -+ mCmd << ipbin << "address" << "add" << np.ip << "dev" << np.iface; -+ } - if (!np.broadcast.isEmpty()) - mCmd << "broadcast" << np.broadcast; - - } else if (action=="route_add") { - if (!np.gateway.isEmpty()) -- mCmd << route << "add" << "default" << "gw" << np.gateway; -+ mCmd << ipbin << "add" << "default" << "via" << np.gateway; - - } else if (action=="route_del") { - if (!np.gateway.isEmpty()) -- mCmd << route << "del" << "default" << "gw" << np.gateway; -+ mCmd << ipbin << "del" << "default" << "via" << np.gateway; - - } else - std::cout << "Unknown action: " << action << std::endl; -@@ -258,12 +255,11 @@ public: - return mCmd; - } - -- QString route; -+ QString ipbin; - QString dhcpClient; - QString wpa_supplicant; - QString wpa_cli; - private: -- QString ifconfig; - QString iwconfig; - QString iwlist; - QString dhcp; -@@ -284,6 +280,60 @@ private: - } - return s; - } -+ -+ static unsigned short netmaskToCidr( QString ipAddress ) -+ { -+ unsigned short netmask_cidr; -+ int ipbytes[4]; -+ QByteArray ba = ipAddress.local8Bit(); -+ const char *c_ipAddress = ba.data(); -+ -+ netmask_cidr=0; -+ sscanf(c_ipAddress, "%d.%d.%d.%d", &ipbytes[0], &ipbytes[1], &ipbytes[2], &ipbytes[3]); -+ -+ for (int i=0; i<4; i++) -+ { -+ switch(ipbytes[i]) -+ { -+ case 0x80: -+ netmask_cidr+=1; -+ break; -+ -+ case 0xC0: -+ netmask_cidr+=2; -+ break; -+ -+ case 0xE0: -+ netmask_cidr+=3; -+ break; -+ -+ case 0xF0: -+ netmask_cidr+=4; -+ break; -+ -+ case 0xF8: -+ netmask_cidr+=5; -+ break; -+ -+ case 0xFC: -+ netmask_cidr+=6; -+ break; -+ -+ case 0xFE: -+ netmask_cidr+=7; -+ break; -+ -+ case 0xFF: -+ netmask_cidr+=8; -+ break; -+ -+ default: -+ return netmask_cidr; -+ break; -+ } -+ } -+ return netmask_cidr; -+ } - }; - - #endif //WA_NETPARAMS_H diff --git a/wlassistant-0.5.7-scons-fix.patch b/wlassistant-0.5.7-scons-fix.patch deleted file mode 100644 index 963fa5d..0000000 --- a/wlassistant-0.5.7-scons-fix.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -up wlassistant-0.5.7/admin/generic.py.sconsfix wlassistant-0.5.7/admin/generic.py ---- wlassistant-0.5.7/admin/generic.py.sconsfix 2019-06-05 11:04:22.501917688 -0400 -+++ wlassistant-0.5.7/admin/generic.py 2019-06-05 11:04:22.510917513 -0400 -@@ -6,7 +6,7 @@ import SCons.Defaults - import SCons.Tool - import SCons.Util - from SCons.Script.SConscript import SConsEnvironment --from SCons.Options import Options, PathOption -+from SCons.Variables import Variables, PathVariable - - def getreldir(lenv): - cwd=os.getcwd() -@@ -394,8 +394,8 @@ def generate(env): - - ## load the options - cachefile=env['CACHEDIR']+'generic.cache.py' -- opts = Options(cachefile) -- opts.AddOptions( -+ opts = Variable(cachefile) -+ opts.AddVariables( - ( 'GENCCFLAGS', 'C flags' ), - ( 'GENCXXFLAGS', 'debug level for the project : full or just anything' ), - ( 'GENLINKFLAGS', 'additional link flags' ), -diff -up wlassistant-0.5.7/admin/kde.py.sconsfix wlassistant-0.5.7/admin/kde.py ---- wlassistant-0.5.7/admin/kde.py.sconsfix 2007-04-03 14:45:58.000000000 -0400 -+++ wlassistant-0.5.7/admin/kde.py 2019-06-05 11:04:22.511917493 -0400 -@@ -279,10 +279,10 @@ def generate(env): - Builder = SCons.Builder.Builder - - # Detect the environment - replaces ./configure implicitely and store the options into a cache -- from SCons.Options import Options -+ from SCons.Variables import Variables - cachefile=env['CACHEDIR']+'kde.cache.py' -- opts = Options(cachefile) -- opts.AddOptions( -+ opts = Variables(cachefile) -+ opts.AddVariables( - ('PREFIX', 'root of the program installation'), - - ('QTDIR', ''), -diff -up wlassistant-0.5.7/bksys/generic.py.sconsfix wlassistant-0.5.7/bksys/generic.py ---- wlassistant-0.5.7/bksys/generic.py.sconsfix 2019-06-05 11:04:22.502917668 -0400 -+++ wlassistant-0.5.7/bksys/generic.py 2019-06-05 11:04:22.520917318 -0400 -@@ -6,7 +6,7 @@ import SCons.Defaults - import SCons.Tool - import SCons.Util - from SCons.Script.SConscript import SConsEnvironment --from SCons.Options import Options, PathOption -+from SCons.Variables import Variables, PathVariable - - def getreldir(lenv): - cwd=os.getcwd() -@@ -381,8 +381,8 @@ def generate(env): - - ## load the options - cachefile=env['CACHEDIR']+'generic.cache.py' -- opts = Options(cachefile) -- opts.AddOptions( -+ opts = Variables(cachefile) -+ opts.AddVariables( - ( 'GENCCFLAGS', 'C flags' ), - ( 'BKS_DEBUG', 'debug level: full, trace, or just something' ), - ( 'GENCXXFLAGS', 'additional cxx flags for the project' ), -diff -up wlassistant-0.5.7/bksys/kde.py.sconsfix wlassistant-0.5.7/bksys/kde.py ---- wlassistant-0.5.7/bksys/kde.py.sconsfix 2019-06-05 11:04:49.042401797 -0400 -+++ wlassistant-0.5.7/bksys/kde.py 2019-06-05 11:05:27.202660040 -0400 -@@ -288,10 +288,10 @@ def generate(env): - Builder = SCons.Builder.Builder - - # Detect the environment - replaces ./configure implicitely and store the options into a cache -- from SCons.Options import Options -+ from SCons.Variables import Variables - cachefile=env['CACHEDIR']+'kde.cache.py' -- opts = Options(cachefile) -- opts.AddOptions( -+ opts = Variables(cachefile) -+ opts.AddVariables( - ('PREFIX', 'root of the program installation'), - - ('QTDIR', ''), 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 c0f2860..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 b066387..0000000 --- a/wlassistant.spec +++ /dev/null @@ -1,218 +0,0 @@ -Name: wlassistant -Version: 0.5.7 -Release: 36%{?dist} -License: GPLv2+ -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 -BuildRequires: kdelibs3-devel, desktop-file-utils, wireless-tools-devel, scons -BuildRequires: gettext -BuildRequires: gcc-c++ -Requires: usermode, wireless-tools, iproute, 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 -Patch4: wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch -Patch5: wlassistant-0.5.7-iproute2.patch -Patch6: wlassistant-0.5.7-scons-fix.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 -%patch4 -p1 -b .DSO -%patch5 -p1 -b .iproute2 -%patch6 -p1 -b .sconsfix - -%build -PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` -sed -i "s|'-O2'|[$PARSED_OPT_FLAGS]|" bksys/generic.py -PYTHON=/usr/bin/python2 ./configure -make %{?_smp_mflags} - -%install -make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p" -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 -p -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant -install -p -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant - -rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop - -desktop-file-install \ - --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 - -%files -f %{name}.lang -%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/%{name}.desktop -%{_datadir}/icons/hicolor/16x16/apps/wlassistant.png -%{_datadir}/icons/hicolor/32x32/apps/wlassistant.png - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 0.5.7-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jun 5 2019 Tom Callaway - 0.5.7-35 -- fix code to compile with current scons - -* Thu Mar 7 2019 Tim Landscheidt - 0.5.7-34 -- Remove obsolete requirements for %%post/%%postun scriptlets - -* Sun Feb 03 2019 Fedora Release Engineering - 0.5.7-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Dec 7 2018 Tom Callaway - 0.5.7-32 -- fixed iproute patch to properly use CIDR. Not that you would have EVER noticed. - -* Fri Dec 7 2018 Tom Callaway - 0.5.7-31 -- use ip instead of old net-tools (bz#1496166) - Pretty sure I got this right, but I am also pretty sure no one uses this dinosaur. - -* Tue Jul 24 2018 Tom Callaway - 0.5.7-30 -- add BuildRequires: gcc-c++ - -* Sat Jul 14 2018 Fedora Release Engineering - 0.5.7-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.5.7-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.5.7-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.5.7-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Feb 20 2017 Tom Callaway - 0.5.7-25 -- fix desktop file (resolves FTBFS) - -* Sat Feb 11 2017 Fedora Release Engineering - 0.5.7-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0.5.7-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.5.7-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.5.7-21 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Aug 18 2014 Fedora Release Engineering - 0.5.7-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.5.7-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.5.7-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Feb 10 2013 Parag Nemade - 0.5.7-17 -- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 -- Cleanup spec as per recently changed packaging guidelines - -* Sun Jul 22 2012 Fedora Release Engineering - 0.5.7-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 0.5.7-15 -- Rebuilt for c++ ABI breakage - -* Sat Jan 14 2012 Fedora Release Engineering - 0.5.7-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0.5.7-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Feb 19 2010 Tom "spot" Callaway - 0.5.7-12 -- fix implicit DSO linking issue with kdecore - -* Mon Jul 27 2009 Fedora Release Engineering - 0.5.7-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* 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