5 files changed, 20 insertions, 72 deletions
diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
deleted file mode 100644
index bd0ec3865..000000000
--- a/package/hostapd/Config.in
+++ /dev/null
@@ -1,41 +0,0 @@
-config ADK_COMPILE_HOSTAPD
-	tristate
-	default n
-	depends on ADK_PACKAGE_HOSTAPD || ADK_PACKAGE_HOSTAPD_UTILS
-
-config ADK_PACKAGE_HOSTAPD
-	prompt "hostapd........................... An IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator"
-	tristate
-	default n
-	select ADK_COMPILE_HOSTAPD
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBNL
-	help
-
-	  hostapd is a user space daemon for access point and
-	  authentication servers. It implements IEEE 802.11 access point
-	  management, IEEE 802.1X/WPA/WPA2/EAP Authenticators, RADIUS
-	  client, EAP server, and RADIUS authentication server.
-
-	  http://hostap.epitest.fi/hostapd/
-
-	  Includes:
-	   - hostapd
-
-config ADK_PACKAGE_HOSTAPD_UTILS
-	prompt "hostapd-utils..................... An IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator (CLI utility)"
-	tristate
-	default n
-	select ADK_COMPILE_HOSTAPD
-	depends on ADK_PACKAGE_HOSTAPD
-	help
-
-	  hostapd is a user space daemon for access point and
-	  authentication servers. It implements IEEE 802.11 access point
-	  management, IEEE 802.1X/WPA/WPA2/EAP Authenticators, RADIUS
-	  client, EAP server, and RADIUS authentication server.
-
-	  http://hostap.epitest.fi/hostapd/
-
-	  Includes:
-	   - hostapd_cli
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index cf6b8c73c..14013c34d 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -4,12 +4,13 @@
 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:=		libopenssl
+PKG_DEPENDS:=		libnl libopenssl
+PKG_BUILDDEP+=		libnl openssl
 PKG_URL:=		http://hostap.epitest.fi
 PKG_SITES:=		http://hostap.epitest.fi/releases/
 
@@ -20,7 +21,8 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 do-configure:
 	${CP} ./files/hostapd.config ${WRKBUILD}/.config
diff --git a/package/hostapd/files/hostapd.conf b/package/hostapd/files/hostapd.conf
index 8676e96a6..94bd1f2bc 100644
--- a/package/hostapd/files/hostapd.conf
+++ b/package/hostapd/files/hostapd.conf
@@ -1,6 +1,4 @@
 ##### hostapd configuration file #####
-interface=wlan0
-#bridge=br0
 driver=nl80211
 logger_syslog=-1
 logger_syslog_level=0
@@ -8,16 +6,3 @@ logger_stdout=-1
 logger_stdout_level=0
 ctrl_interface=/var/run/hostapd
 ctrl_interface_group=0
-# set ssid, channel and mode
-ssid=openadk
-hw_mode=g
-channel=1
-# enable WPA2 (WEP/WPA disabled)
-macaddr_acl=0
-auth_algs=1
-ignore_broadcast_ssid=0
-wpa=2
-wpa_passphrase=secret123
-wpa_key_mgmt=WPA-PSK
-wpa_pairwise=TKIP
-rsn_pairwise=CCMP
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