?mode=patch&uid=2010070707294413523

Open Patch: 2010070707294413523 (by stf)

+ stf

Journal: stf's update journal 2010-06-19 rev. 8

Votecheck 'user-stf': OK (stf)

package/stf/wpa_supplicant/non-local-install.patch

package/stf/wpa_supplicant/hotfixes-gcc43.patch

package/stf/wpa_supplicant/wpa_supplicant.desc

package/stf/wpa_supplicant/wpa_supplicant.conf

Stefan Fiedler:
	update wpa_supplicant, fix for removed X11R6 compat symlink

[Patch History / Archive]

Stefan Fiedler:
	update wpa_supplicant, fix for removed X11R6 compat symlink

--- package/stf/wpa_supplicant/non-local-install.patch	(Revision 187)
+++ package/stf/wpa_supplicant/non-local-install.patch	(Revision 188)
@@ -1,14 +0,0 @@
-diff -dur wpa_supplicant-0.4.9/Makefile wpa_supplicant-0.4.9-p/Makefile
---- wpa_supplicant-0.4.9/Makefile	2006-05-07 06:05:36.000000000 +0200
-+++ wpa_supplicant-0.4.9-p/Makefile	2006-08-12 04:46:34.000000000 +0200
-@@ -32,8 +32,8 @@
- 	echo CONFIG_WIRELESS_EXTENSION=y >> .config
- 
- install: all
--	mkdir -p $(DESTDIR)/usr/local/sbin/
--	for i in $(ALL); do cp $$i $(DESTDIR)/usr/local/sbin/$$i; done
-+	mkdir -p $(DESTDIR)/usr/sbin/
-+	for i in $(ALL); do cp $$i $(DESTDIR)/usr/sbin/$$i; done
- 
- OBJS = config.o \
- 	eloop.o common.o md5.o \
--- package/stf/wpa_supplicant/hotfixes-gcc43.patch	(Revision 187)
+++ package/stf/wpa_supplicant/hotfixes-gcc43.patch	(Revision 188)
@@ -1,31 +0,0 @@
---- ./wpa_gui/networkconfig.ui.h.orig	2008-06-10 20:10:07.000000000 +0200
-+++ ./wpa_gui/networkconfig.ui.h	2008-06-10 20:10:13.000000000 +0200
-@@ -10,6 +10,7 @@
- ** destructor.
- *****************************************************************************/
- 
-+#include <stdlib.h>
- 
- enum {
-     AUTH_NONE = 0,
---- ./wpa_gui/userdatarequest.ui.h.orig	2008-06-10 20:09:43.000000000 +0200
-+++ ./wpa_gui/userdatarequest.ui.h	2008-06-10 20:09:50.000000000 +0200
-@@ -10,6 +10,8 @@
- ** destructor.
- *****************************************************************************/
- 
-+#include <stdlib.h>
-+
- int UserDataRequest::setParams(WpaGui *_wpagui, const char *reqMsg)
- {
-     char *tmp, *pos, *pos2;
---- ./wpa_gui/wpagui.ui.h.orig	2008-06-10 20:08:27.000000000 +0200
-+++ ./wpa_gui/wpagui.ui.h	2008-06-10 20:08:56.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <unistd.h>
- #endif
- 
-+#include <stdlib.h>
- 
- void WpaGui::init()
- {
--- package/stf/wpa_supplicant/wpa_supplicant.desc	(Revision 187)
+++ package/stf/wpa_supplicant/wpa_supplicant.desc	(Revision 188)
@@ -46,8 +46,8 @@
 
 [L] GPL
 [S] Stable
-[V] 0.6.4
+[V] 0.7.2
 [P] X --?--5---9 179.200
 
-[D] 3877286727 wpa_supplicant-0.6.4.tar.gz http://hostap.epitest.fi/releases/
+[D] 881516477 wpa_supplicant-0.7.2.tar.gz http://hostap.epitest.fi/releases/
 
--- package/stf/wpa_supplicant/wpa_supplicant.conf	(Revision 187)
+++ package/stf/wpa_supplicant/wpa_supplicant.conf	(Revision 188)
@@ -1,5 +1,5 @@
 
-srcdir="wpa_supplicant-0.6.4/wpa_supplicant"
+srcdir="wpa_supplicant-$ver/wpa_supplicant"
 
 wpa_supplicant_preconf()
 {
@@ -19,18 +19,22 @@
 	fi
 }
 
+var_append makeinstopt " " "BINDIR=$sbindir LIBDIR=$libdir"
+
 wpa_supplicant_postmake()
 {
+	var_append makeopt " " "SUBLIBS=\"-L$root/usr/X11/$multilib\"" 
 	if pkginstalled qt3* ; then
-		make wpa_gui
-		cp -a wpa_gui/wpa_gui $root/$bindir/
+		eval make wpa_gui $makeopt 
+		cp -a wpa_gui/wpa_gui $bindir/
 	fi
 	if pkginstalled qt4* ; then
-		make wpa_gui-qt4
-		cp -a wpa_gui-qt4/wpa_gui $root/$bindir/wpa_gui-qt4
+		eval make wpa_gui-qt4 $makeopt 
+		cp -a wpa_gui-qt4/wpa_gui $bindir/wpa_gui-qt4
 	fi
-	[ ! -f $root/etc/wpa_supplicant.conf ] && \
+	if [ ! -f $root/etc/wpa_supplicant.conf ] ; then
 		cp -a wpa_supplicant.conf $root/etc
+	fi
 }
 
 hook_add preconf 5 wpa_supplicant_preconf

[Download this patch]