X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fhostapd;h=522e9b3d4caaaf9d5712c65126ec99c5d895ed1d;hp=962027d7cbce8b4ae0bf6267288a5bf509705df2;hb=1e8b1897b86599603535fb85b367b58cf2e44d70;hpb=824a0f689e6269c178e54feeaba878078bb6a49b

diff --git a/lfs/hostapd b/lfs/hostapd
index 962027d7cb..522e9b3d4c 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.10
+VER        = 0.6.9
 
 THISAPP    = hostapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 5
+PAK_VER    = 15
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ed669d96346dfc7d9f9fad079731853f
+$(DL_FILE)_MD5 = 83630d11fa66ade9091f1b304fccd74c
 
 install : $(TARGET)
 
@@ -77,14 +77,21 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && cp $(DIR_SRC)/config/hostapd/config ./.config
-	cd $(DIR_APP) && sed -e "s@/usr/local@/usr@g" -i Makefile
-	cd $(DIR_APP) && make && make install
-	cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /etc/hostapd.conf
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd-usb_hw_did_not_ack.patch
+	-cp /usr/src/linux/include/linux/genetlink.h /usr/include/linux/
+	-cp /usr/src/linux/include/linux/netfilter/nfnetlink.h /usr/include/linux/netfilter/
+	-cp /usr/src/linux/include/linux/netfilter/nfnetlink_compat.h /usr/include/linux/netfilter/
+	cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config
+	cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile
+	cd $(DIR_APP)/hostapd && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP)/hostapd && make install
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd
 	mkdir -p /var/ipfire/wlanap
 	touch /var/ipfire/wlanap/settings
 	cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /var/ipfire/wlanap/hostapd.conf
+	touch /var/ipfire/wlanap/hostapd.accept
+	touch /var/ipfire/wlanap/hostapd.deny
+	cp -vrf /var/ipfire/wlanap/hostapd.* /etc/
 	chown nobody:nobody /var/ipfire/wlanap/*
 	chmod 644 /var/ipfire/wlanap/*
 	@rm -rf $(DIR_APP)