dist-git conversion

#2781)

.gitignore

@@ -0,0 +1,2 @@
+wlassistant-0.5.6.tar.bz2
+wlassistant-0.5.7.tar.bz2

dead.package

@@ -1 +0,0 @@
-no one uses this anymore and its python2 only

sources

@@ -0,0 +1 @@
+4623b498ac42839d08c631c500f18f8b  wlassistant-0.5.7.tar.bz2

wlassistant-0.5.4a-desktopfix.patch

@@ -0,0 +1,15 @@
+--- 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
+ 

wlassistant-0.5.4a-rpath.patch

@@ -0,0 +1,21 @@
+--- 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
+ 

wlassistant-0.5.5-devparsercleanup.patch

@@ -0,0 +1,24 @@
+--- 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;
+ }

wlassistant-0.5.5-rpath.patch

@@ -0,0 +1,14 @@
+--- 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'] )

wlassistant-0.5.6-devparsercleanup.patch

@@ -0,0 +1,18 @@
+--- 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;
+ }

wlassistant-0.5.7-fd_cloexec.patch

@@ -0,0 +1,67 @@
+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 <unistd.h> //provides readlink
+ #include <dirent.h>
+ #include <stdio.h> //to get values from /sys
++#include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h> //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;
+ 

wlassistant.console_apps

@@ -0,0 +1,3 @@
+USER=root
+PROGRAM=/usr/bin/wlassistant
+SESSION=true

wlassistant.desktop

@@ -0,0 +1,11 @@
+[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

wlassistant.pamd

@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util

wlassistant.spec

@@ -0,0 +1,129 @@
+Name:		wlassistant
+Version:	0.5.7
+Release:	5%{?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:	kdebase-devel, desktop-file-utils, wireless-tools-devel, scons
+BuildRequires:	qt-devel, 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
+
+%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
+
+%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
+* Sat Nov 17 2007 Tom "spot" Callaway <tcallawa@redhat.com> 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 <tcallawa@redhat.com> 0.5.7-4
+- rebuild for ppc32
+- license tag fix
+
+* Mon Jul 23 2007 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.7-3
+- close file descriptors with FD_CLOEXEC, try to resolve bz 243509
+
+* Wed May 23 2007 Christopher Aillon <caillon@redhat.com> 0.5.7-2
+- Rebuild against newer libiw.so
+
+* Tue Apr 10 2007 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.7-1
+- 0.5.7
+
+* Thu Jan 18 2007 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.6-1
+- bump to 0.5.6
+
+* Mon Sep 11 2006 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.5-4
+- fix bz 205886
+
+* Mon Sep  4 2006 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.5-3
+- add BR: gettext
+
+* Mon Sep  4 2006 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.5-2
+- fix BR: wireless-tools-devel for fc6+
+
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.5-1
+- bump to 0.5.5
+
+* Sat Sep 17 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.4a-3
+- use .desktop file as SOURCE3 rather than screwing around with dos2unix
+
+* Sat Sep 17 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.4a-2
+- add BR: wireless-tools
+
+* Sun Sep  4 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.4a-1
+- initial package for Fedora Extras