diff options
| -rw-r--r-- | network/hostapd/DTIM.patch | 46 | ||||
| -rw-r--r-- | network/hostapd/hostapd-defconfig.diff | 80 | ||||
| -rw-r--r-- | network/hostapd/hostapd.SlackBuild | 26 | ||||
| -rw-r--r-- | network/hostapd/hostapd.info | 10 |
4 files changed, 99 insertions, 63 deletions
diff --git a/network/hostapd/DTIM.patch b/network/hostapd/DTIM.patch deleted file mode 100644 index e19555e1ef..0000000000 --- a/network/hostapd/DTIM.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 8fac32f5efa7a7c3fc6eee8d3723a09e7abe27fa -Author: Jouni Malinen <jouni.malinen@atheros.com> -Date: Thu Mar 12 21:57:08 2009 +0200 - - Move DTIM period configuration into Beacon set operation - - This is needed to make mac80211 work with multi-BSS configuration. The - previous design ended up setting DTIM period for secondary BSSes before - setting the Beacon and driver_nl80211.c was not really prepared for - that. Eventually, the Beacon configuration routines should be combined - into a single driver operation, but for now, just moving this call is - the simplest workaround. - (cherry picked from commit eb1f7446b5b86cceb1508f060f5e66e5dd791a4d) - -diff --git a/hostapd/beacon.c b/hostapd/beacon.c -index 1f82d9c..0a192fe 100644 ---- a/hostapd/beacon.c -+++ b/hostapd/beacon.c -@@ -434,6 +434,10 @@ void ieee802_11_set_beacon(struct hostapd_data *hapd) - os_free(tail); - os_free(head); - -+ if (hostapd_set_dtim_period(hapd, hapd->conf->dtim_period)) -+ wpa_printf(MSG_ERROR, "Could not set DTIM period for kernel " -+ "driver"); -+ - if (hostapd_set_cts_protect(hapd, cts_protection)) - wpa_printf(MSG_ERROR, "Failed to set CTS protect in kernel " - "driver"); -diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c -index 3fbd3d0..7ed1720 100644 ---- a/hostapd/hostapd.c -+++ b/hostapd/hostapd.c -@@ -1376,12 +1376,6 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first) - return -1; - } - -- if (hostapd_set_dtim_period(hapd, hapd->conf->dtim_period)) { -- wpa_printf(MSG_ERROR, "Could not set DTIM period for kernel " -- "driver"); -- return -1; -- } -- - /* Set SSID for the kernel driver (to be used in beacon and probe - * response frames) */ - if (set_ssid && hostapd_set_ssid(hapd, (u8 *) conf->ssid.ssid, diff --git a/network/hostapd/hostapd-defconfig.diff b/network/hostapd/hostapd-defconfig.diff new file mode 100644 index 0000000000..23737f713a --- /dev/null +++ b/network/hostapd/hostapd-defconfig.diff @@ -0,0 +1,80 @@ +--- defconfig 2014-06-04 15:26:14.000000000 +0200 ++++ defconfig.new 2014-06-19 18:52:42.399466282 +0200 +@@ -43,7 +43,7 @@ + #LIBS_c += -L/usr/local/lib + + # Driver interface for no driver (e.g., RADIUS server only) +-#CONFIG_DRIVER_NONE=y ++CONFIG_DRIVER_NONE=y + + # IEEE 802.11F/IAPP + CONFIG_IAPP=y +@@ -79,20 +79,20 @@ + CONFIG_EAP_TTLS=y + + # EAP-SIM for the integrated EAP server +-#CONFIG_EAP_SIM=y ++CONFIG_EAP_SIM=y + + # EAP-AKA for the integrated EAP server +-#CONFIG_EAP_AKA=y ++CONFIG_EAP_AKA=y + + # EAP-AKA' for the integrated EAP server + # This requires CONFIG_EAP_AKA to be enabled, too. + #CONFIG_EAP_AKA_PRIME=y + + # EAP-PAX for the integrated EAP server +-#CONFIG_EAP_PAX=y ++CONFIG_EAP_PAX=y + + # EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) +-#CONFIG_EAP_PSK=y ++CONFIG_EAP_PSK=y + + # EAP-pwd for the integrated EAP server (secure authentication with a password) + #CONFIG_EAP_PWD=y +@@ -112,9 +112,9 @@ + #CONFIG_EAP_FAST=y + + # Wi-Fi Protected Setup (WPS) +-#CONFIG_WPS=y ++CONFIG_WPS=y + # Enable UPnP support for external WPS Registrars +-#CONFIG_WPS_UPNP=y ++CONFIG_WPS_UPNP=y + # Enable WPS support with NFC config method + #CONFIG_WPS_NFC=y + +@@ -133,27 +133,27 @@ + + # RADIUS authentication server. This provides access to the integrated EAP + # server from external hosts using RADIUS. +-#CONFIG_RADIUS_SERVER=y ++CONFIG_RADIUS_SERVER=y + + # Build IPv6 support for RADIUS operations + CONFIG_IPV6=y + + # IEEE Std 802.11r-2008 (Fast BSS Transition) +-#CONFIG_IEEE80211R=y ++CONFIG_IEEE80211R=y + + # Use the hostapd's IEEE 802.11 authentication (ACL), but without + # the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211) + #CONFIG_DRIVER_RADIUS_ACL=y + + # IEEE 802.11n (High Throughput) support +-#CONFIG_IEEE80211N=y ++CONFIG_IEEE80211N=y + + # Wireless Network Management (IEEE Std 802.11v-2011) + # Note: This is experimental and not complete implementation. + #CONFIG_WNM=y + + # IEEE 802.11ac (Very High Throughput) support +-#CONFIG_IEEE80211AC=y ++CONFIG_IEEE80211AC=y + + # Remove debugging code that is printing out debug messages to stdout. + # This can be used to reduce the size of the hostapd considerably if debugging diff --git a/network/hostapd/hostapd.SlackBuild b/network/hostapd/hostapd.SlackBuild index 54029760fd..3b57431f40 100644 --- a/network/hostapd/hostapd.SlackBuild +++ b/network/hostapd/hostapd.SlackBuild @@ -2,7 +2,9 @@ # Slackware build script for hostapd -# Written by Murat D. Kadirov <banderols@gmail.com> +# Copyright 2008-2013 Murat D. Kadirov <banderols@gmail.com> +# Copyright 2014 LukenShiro, Italy +# All rights reserved. # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -22,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=hostapd -VERSION=${VERSION:-0.6.10} +VERSION=${VERSION:-2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,6 +55,8 @@ else LIBDIRSUFFIX="" fi +DOCFILES="../COPYING ../CONTRIBUTIONS ChangeLog README* *.txt logwatch" + set -e rm -rf $PKG @@ -63,15 +67,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION/$PRGNAM chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -cat $CWD/hostapd.defconfig > .config -# Fix bug with mac80211-based drivers in hostapd 0.6.10 -# http://lists.shmoo.com/pipermail/hostap/2010-February/021118.html -patch -p2 < $CWD/DTIM.patch +patch -p0 < $CWD/hostapd-defconfig.diff +cat defconfig > .config CFLAGS+="$SLKCFLAGS" make @@ -96,11 +98,11 @@ gzip -9c hostapd.8 > $PKG/usr/man/man8/hostapd.8.gz gzip -9c hostapd_cli.1 > $PKG/usr/man/man1/hostapd_cli.1.gz cp hostapd hostapd_cli $PKG/usr/sbin/ -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -ar ../COPYING ChangeLog README* *.txt logwatch $PKG/usr/doc/$PRGNAM-$VERSION +cp -ar $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/hostapd/hostapd.info b/network/hostapd/hostapd.info index fe4409b232..0d5f9996c5 100644 --- a/network/hostapd/hostapd.info +++ b/network/hostapd/hostapd.info @@ -1,10 +1,10 @@ PRGNAM="hostapd" -VERSION="0.6.10" +VERSION="2.2" HOMEPAGE="http://hostap.epitest.fi/hostapd/" -DOWNLOAD="http://hostap.epitest.fi/releases/hostapd-0.6.10.tar.gz" -MD5SUM="1ac442d1f984273f108b3de579c1b70d" +DOWNLOAD="http://hostap.epitest.fi/releases/hostapd-2.2.tar.gz" +MD5SUM="23c1f78a693c3288802d516adb7fd289" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Murat D. Kadirov" -EMAIL="banderols@gmail.com" +MAINTAINER="LukenShiro" +EMAIL="lukenshiro@ngi.it" |