X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fhostapd;h=0ca035c4aade9d9ab7e54f921287347c79277d3f;hb=59ebbeccabe9b9bd8634c7609509eb664bc5fccf;hp=c0bf830ad352388c5559ab89d5bb31fd27b59438;hpb=cca449193c2206d59d733407379792cb4fc2967c;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/hostapd b/lfs/hostapd
index c0bf830ad3..0ca035c4aa 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.10
+VER        = 0.7.3
 
 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    = 2
+PAK_VER    = 21
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ed669d96346dfc7d9f9fad079731853f
+$(DL_FILE)_MD5 = 91a7c8d0f090b7104152d3455a84c112
 
 install : $(TARGET)
 
@@ -77,10 +77,22 @@ $(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)
 	@$(POSTBUILD)