Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / lfs / hostapd

diff --git a/lfs/hostapd b/lfs/hostapd
index f09e62a12cf1927c09bd1cef0e273e5f70558a1a..cd0f1a3487b42bcfdf36fa09f89b554480fe7119 100644 (file)
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.10
+VER        = 0.5.11
 
 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    = 4
+PAK_VER    = 8
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ed669d96346dfc7d9f9fad079731853f
+$(DL_FILE)_MD5 = d99d3566d5f15dfd24df37fcb2ee80ee
 
 install : $(TARGET)
 
@@ -79,12 +79,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @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) && make $(MAKETUNING) $(EXTRA_MAKE) && 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)