X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fhostapd;h=9e01b06cfb9c576625c887c46a3bbeba791b2358;hb=769185b58ec52fcc9eaedab5df42b1b25057d0c7;hp=a63e338aa01152b64185453dc7e01f6827715675;hpb=fcc535236fe6178d68007ece7793746320549b61;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/hostapd b/lfs/hostapd
index a63e338aa0..9e01b06cfb 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) 2007-2013  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        = 2.0
 
 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    = 26
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ed669d96346dfc7d9f9fad079731853f
+$(DL_FILE)_MD5 = ba22e639bc57aa4035d2ea8ffa9bbbee
 
 install : $(TARGET)
 
@@ -77,14 +77,17 @@ $(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 $(MAKETUNING) $(EXTRA_MAKE) && make install
-	cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /etc/hostapd.conf
+	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)