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 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/wlassistant-0.5.7-fd_cloexec.patch b/wlassistant-0.5.7-fd_cloexec.patch new file mode 100644 index 0000000..1706b95 --- /dev/null +++ b/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 //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.desktop b/wlassistant.desktop index da99bc0..2b1fe27 100644 --- a/wlassistant.desktop +++ b/wlassistant.desktop @@ -7,6 +7,5 @@ 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; +Categories=Application;Settings StartupNotify=true - diff --git a/wlassistant.pamd b/wlassistant.pamd index 8c0e622..c7d67e3 100644 --- a/wlassistant.pamd +++ b/wlassistant.pamd @@ -1,8 +1,4 @@ #%PAM-1.0 -auth sufficient pam_rootok.so -auth sufficient pam_timestamp.so -auth required pam_stack.so service=system-auth -session required pam_permit.so -session optional pam_xauth.so -session optional pam_timestamp.so -account required pam_permit.so +auth include config-util +account include config-util +session include config-util diff --git a/wlassistant.spec b/wlassistant.spec index ae1ac9a..140c8b8 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -1,7 +1,7 @@ Name: wlassistant Version: 0.5.7 -Release: 1%{?dist} -License: GPL +Release: 5%{?dist} +License: GPLv2+ Group: Applications/System Summary: Wireless network management tool URL: http://wlassistant.sourceforge.net @@ -14,8 +14,9 @@ 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 +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 @@ -32,6 +33,7 @@ MAIN FEATURES: %prep %setup -q %patch0 -p1 +%patch1 -p1 %build PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` @@ -85,6 +87,20 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* 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