Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk

5 files changed, 35 insertions, 21 deletions

diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
index bc498e163..1898de4d4 100755
--- a/package/base-files/src/etc/network/if-pre-up.d/04-wireless
+++ b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
@@ -38,10 +38,6 @@ esac
 
 case "$IF_WIRELESS_MODE" in
 	ap)
-		[ -x /usr/sbin/hostapd ] || {
-			logger -t hostap "No hostapd program found"
-			exit 1
-		}
 		logger -t hostap "Creating hostapd configuration"
 		cat /etc/hostapd.conf > /tmp/hostapd.conf
 		chmod 600 /tmp/hostapd.conf
@@ -50,6 +46,10 @@ case "$IF_WIRELESS_MODE" in
 		echo "channel=$IF_WIRELESS_CHANNEL" >> /tmp/hostapd.conf
 		echo "hw_mode=$IF_WIRELESS_HWMODE" >> /tmp/hostapd.conf
 		echo "auth_algs=$sec" >> /tmp/hostapd.conf
+		[ $wpa -eq 0 ] && {
+			logger -t hostap "using no security mechanism"
+			echo "wpa=0" >> /tmp/hostapd.conf
+		}
 		[ $wpa1 -eq 1 ] && {
 			logger -t hostap "using WPA for security"
 			echo "wpa=1" >> /tmp/hostapd.conf
@@ -72,8 +72,6 @@ case "$IF_WIRELESS_MODE" in
 			echo "rsn_pairwise=CCMP" >> /tmp/hostapd.conf
 			echo "wpa_passphrase=$IF_WIRELESS_PASSPHRASE" >> /tmp/hostapd.conf
 		}
-		logger -t hostap "Starting hostapd"
-		hostapd -B /tmp/hostapd.conf
 		;;
 	sta)
 		[ -x /usr/sbin/iw ] || {
@@ -103,5 +101,4 @@ case "$IF_WIRELESS_MODE" in
 		exit 1
 		;;
 esac
-
 exit 0
diff --git a/package/base-files/src/etc/network/if-up.d/02-wireless b/package/base-files/src/etc/network/if-up.d/02-wireless
new file mode 100755
index 000000000..cd9d2af3f
--- /dev/null
+++ b/package/base-files/src/etc/network/if-up.d/02-wireless
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+[ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0
+
+case "$IF_WIRELESS_MODE" in
+	ap)
+		[ -x /usr/sbin/hostapd ] || {
+			logger -t hostap "No hostapd program found"
+			exit 1
+		}
+		logger -t hostap "Starting hostapd"
+		hostapd -B /tmp/hostapd.conf
+		;;
+esac
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 0b8a93464..14013c34d 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		hostapd
-PKG_VERSION:=		0.6.9
+PKG_VERSION:=		0.7.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		83630d11fa66ade9091f1b304fccd74c
+PKG_MD5SUM:=		3c4f71a889803935c7eb40fac6539d7c
 PKG_DESCR:=		an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libnl libopenssl
diff --git a/package/hostapd/files/hostapd.config b/package/hostapd/files/hostapd.config
index 7f9815dff..6af8c3971 100644
--- a/package/hostapd/files/hostapd.config
+++ b/package/hostapd/files/hostapd.config
@@ -75,3 +75,17 @@ CONFIG_DRIVER_NL80211=y
 # This can be used to reduce the size of the hostapd considerably if debugging
 # code is not needed.
 #CONFIG_NO_STDOUT_DEBUG=y
+# Remove support for RADIUS accounting
+CONFIG_NO_ACCOUNTING=y
+
+# Remove support for RADIUS
+CONFIG_NO_RADIUS=y
+
+# Remove support for VLANs
+CONFIG_NO_VLAN=y
+
+# Remove support for dumping state into a file on SIGUSR1 signal
+# This can be used to reduce binary size at the cost of disabling a debugging
+# option.
+CONFIG_NO_DUMP_STATE=y
+
diff --git a/package/hostapd/patches/patch-hostapd_Makefile b/package/hostapd/patches/patch-hostapd_Makefile
deleted file mode 100644
index fdae44c6c..000000000
--- a/package/hostapd/patches/patch-hostapd_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- hostapd-0.6.9.orig/hostapd/Makefile	2009-03-23 15:06:28.000000000 +0100
-+++ hostapd-0.6.9/hostapd/Makefile	2009-04-29 23:24:00.835839521 +0200
-@@ -8,7 +8,7 @@ endif
- 
- # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
- # a file (undefine it, if you want to save in binary size)
--CFLAGS += -DHOSTAPD_DUMP_STATE
-+# CFLAGS += -DHOSTAPD_DUMP_STATE
- 
- CFLAGS += -I../src
- CFLAGS += -I../src/crypto