Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting2.git;a=commitdiff;h=bb98d641a09ef62856af61118bc963212f12a988
commit bb98d641a09ef62856af61118bc963212f12a988 Author: James Buren <[email protected]> Date: Tue Jun 5 03:04:25 2012 -0500 hostapd-1.0-1-x86_64 * version bump * convert to use systemd schema diff --git a/source/network-extra/hostapd/FrugalBuild b/source/network-extra/hostapd/FrugalBuild index 06079c1..a46eb82 100644 --- a/source/network-extra/hostapd/FrugalBuild +++ b/source/network-extra/hostapd/FrugalBuild @@ -2,21 +2,25 @@ # Maintainer: James Buren <[email protected]> pkgname=hostapd -pkgver=0.7.3 -pkgrel=2 +pkgver=1.0 +pkgrel=1 pkgdesc="A daemon for managing software wireless access points." url="http://hostap.epitest.fi/hostapd"; depends=('openssl>=1.0.0' 'libnl>=3.2.9') groups=('network-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" -source=(${url/hostapd/releases}/$pkgname-$pkgver.tar.gz config rc.$pkgname README.Frugalware hostap_allow-linking-with-libnl-3.2.patch) -backup=(etc/$pkgname/$pkgname.{accept,conf,deny}) -sha1sums=('7a8853fe41ee5a2b9f03f608cf7a61c7ccea4f4c' \ - '284e2146132ce79555d1317476792f800463760d' \ +source=(${url/hostapd/releases}/$pkgname-$pkgver.tar.gz config rc.$pkgname $pkgname.service README.Frugalware libnl3.patch) +backup=(etc/$pkgname/$pkgname.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} etc/$pkgname/wired.conf) +sha1sums=('4edf267bc5943a5f7d6d9c0abcce0973bfbad5fa' \ + '65569823e0f704df972f3fde31cdb917181691f9' \ 'f4f0f2967b3fc68aec7121b489e5650de4d76c62' \ - '94c24e4311a366421592031cbb2ae67c41b4a880' \ - '69fbaac28aef4fbdac333c6ba4382567202c77b2') + '3979a30543dd4be3af91d6b71624f7793f7ef576' \ + '8c2eb4b723a868fa72a33654c3fa1307918028e2' \ + '66cfae27768733bbbf282937256f654ad4e8efd5') +_F_sysvinit_units=($pkgname) +_F_systemd_units=($pkgname=) +Finclude systemd build() { Fcd $pkgname-$pkgver @@ -24,10 +28,12 @@ build() { cd $pkgname || Fdie cp $Fsrcdir/config .config || Fdie make || Fdie - sed -i -r -e "s:#(.*)=/etc/$pkgname\.(accept|deny):\1=/etc/$pkgname/$pkgname.\2:" $pkgname.conf || Fdie - Fexerel ${pkgname}{,_cli} /usr/bin + sed -i -r -e "s:#(.*)=/etc/$pkgname\.(accept|deny|eap_user|ca.pem|server.prv|server.pem|dh.pem|vlan|radius_clients|wpa_psk):\1=/etc/$pkgname/$pkgname.\2:" $pkgname.conf || Fdie + Fexerel ${pkgname}{,_cli} /usr/sbin Fmanrel ${pkgname}{.8,_cli.1} Ffilerel $pkgname.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} wired.conf /etc/$pkgname Fdocrel README-WPS Frcd2 + Ffile /lib/systemd/system/$pkgname.service + Fgenscriptlet } diff --git a/source/network-extra/hostapd/README.Frugalware b/source/network-extra/hostapd/README.Frugalware index 1f2bfca..52a1f2d 100644 --- a/source/network-extra/hostapd/README.Frugalware +++ b/source/network-extra/hostapd/README.Frugalware @@ -4,6 +4,3 @@ You must edit the following files located in /etc/hostapd to configure hostapd: hostapd.allow hostapd.conf hostapd.deny - -The daemon script usable via the service command expects you to have configured -it properly via these files before it can be used. diff --git a/source/network-extra/hostapd/config b/source/network-extra/hostapd/config index 70cf84f..5e7cc35 100644 --- a/source/network-extra/hostapd/config +++ b/source/network-extra/hostapd/config @@ -21,12 +21,6 @@ CONFIG_DRIVER_WIRED=y # Driver interface for drivers using the nl80211 kernel interface CONFIG_DRIVER_NL80211=y -# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be -# shipped with your distribution yet. If that is the case, you need to build -# newer libnl version and point the hostapd build to use it. -#LIBNL=/usr/src/libnl -#CFLAGS += -I$(LIBNL)/include -#LIBS += -L$(LIBNL)/lib # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) #CONFIG_DRIVER_BSD=y @@ -51,7 +45,7 @@ CONFIG_PEERKEY=y # This version is an experimental implementation based on IEEE 802.11w/D1.0 # draft and is subject to change since the standard has not yet been finalized. # Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y +CONFIG_IEEE80211W=y # Integrated EAP server CONFIG_EAP=y @@ -90,6 +84,9 @@ CONFIG_EAP_PAX=y # EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) CONFIG_EAP_PSK=y +# EAP-pwd for the integrated EAP server (secure authentication with a password) +CONFIG_EAP_PWD=y + # EAP-SAKE for the integrated EAP server CONFIG_EAP_SAKE=y @@ -103,10 +100,12 @@ CONFIG_EAP_GPSK_SHA256=y # functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, # the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch) # to add the needed functions. -#CONFIG_EAP_FAST=y +CONFIG_EAP_FAST=y # Wi-Fi Protected Setup (WPS) CONFIG_WPS=y +# Enable WSC 2.0 support +CONFIG_WPS2=y # Enable UPnP support for external WPS Registrars CONFIG_WPS_UPNP=y @@ -132,7 +131,7 @@ 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 +CONFIG_DRIVER_RADIUS_ACL=y # IEEE 802.11n (High Throughput) support CONFIG_IEEE80211N=y @@ -142,6 +141,10 @@ CONFIG_IEEE80211N=y # code is not needed. #CONFIG_NO_STDOUT_DEBUG=y +# Add support for writing debug log to a file: -f /tmp/hostapd.log +# Disabled by default. +#CONFIG_DEBUG_FILE=y + # Remove support for RADIUS accounting #CONFIG_NO_ACCOUNTING=y @@ -151,6 +154,10 @@ CONFIG_IEEE80211N=y # Remove support for VLANs #CONFIG_NO_VLAN=y +# Enable support for fully dynamic VLANs. This enables hostapd to +# automatically create bridge and VLAN interfaces if necessary. +CONFIG_FULL_DYNAMIC_VLAN=y + # Remove support for dumping state into a file on SIGUSR1 signal # This can be used to reduce binary size at the cost of disabling a debugging # option. @@ -174,4 +181,68 @@ CONFIG_IEEE80211N=y #LIBS_p += -lbfd -liberty -lz #LIBS_c += -lbfd -liberty -lz +# hostapd depends on strong random number generation being available from the +# operating system. os_get_random() function is used to fetch random data when +# needed, e.g., for key generation. On Linux and BSD systems, this works by +# reading /dev/urandom. It should be noted that the OS entropy pool needs to be +# properly initialized before hostapd is started. This is important especially +# on embedded devices that do not have a hardware random number generator and +# may by default start up with minimal entropy available for random number +# generation. +# +# As a safety net, hostapd is by default trying to internally collect +# additional entropy for generating random data to mix in with the data +# fetched from the OS. This by itself is not considered to be very strong, but +# it may help in cases where the system pool is not initialized properly. +# However, it is very strongly recommended that the system pool is initialized +# with enough entropy either by using hardware assisted random number +# generator or by storing state over device reboots. +# +# hostapd can be configured to maintain its own entropy store over restarts to +# enhance random number generation. This is not perfect, but it is much more +# secure than using the same sequence of random numbers after every reboot. +# This can be enabled with -e<entropy file> command line option. The specified +# file needs to be readable and writable by hostapd. +# +# If the os_get_random() is known to provide strong random data (e.g., on +# Linux/BSD, the board in question is known to have reliable source of random +# data from /dev/urandom), the internal hostapd random pool can be disabled. +# This will save some in binary size and CPU use. However, this should only be +# considered for builds that are known to be used on devices that meet the +# requirements described above. +#CONFIG_NO_RANDOM_POOL=y + +# Select TLS implementation +# openssl = OpenSSL (default) +# gnutls = GnuTLS +# internal = Internal TLSv1 implementation (experimental) +# none = Empty template +CONFIG_TLS=openssl + +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) +# can be enabled to get a stronger construction of messages when block ciphers +# are used. +CONFIG_TLSV11=y + +# If CONFIG_TLS=internal is used, additional library and include paths are +# needed for LibTomMath. Alternatively, an integrated, minimal version of +# LibTomMath can be used. See beginning of libtommath.c for details on benefits +# and drawbacks of this option. +CONFIG_INTERNAL_LIBTOMMATH=y +#ifndef CONFIG_INTERNAL_LIBTOMMATH +#LTM_PATH=/usr/src/libtommath-0.39 +#CFLAGS += -I$(LTM_PATH) +#LIBS += -L$(LTM_PATH) +#LIBS_p += -L$(LTM_PATH) +#endif +# At the cost of about 4 kB of additional binary size, the internal LibTomMath +# can be configured to include faster routines for exptmod, sqr, and div to +# speed up DH and RSA calculation considerably +CONFIG_INTERNAL_LIBTOMMATH_FAST=y + +# Interworking (IEEE 802.11u) +# This can be used to enable functionality to improve interworking with +# external networks. +CONFIG_INTERWORKING=y + CONFIG_LIBNL32=y diff --git a/source/network-extra/hostapd/hostap_allow-linking-with-libnl-3.2.patch b/source/network-extra/hostapd/hostap_allow-linking-with-libnl-3.2.patch deleted file mode 100644 index 9111f6c..0000000 --- a/source/network-extra/hostapd/hostap_allow-linking-with-libnl-3.2.patch +++ /dev/null @@ -1,41 +0,0 @@ -Subject: [RFC] hostap: Allow linking with libnl-3. -Date: Tue, 15 Nov 2011 14:30:04 -0000 -From: Ben Greear <[email protected]> - -I needed this patch to compile against the latest -libnl code. I added this to my config file: - -CONFIG_LIBNL32=y - -Signed-hostap: Ben Greear <[email protected]> -rediffed against 0.7.3 by Stefan Lippers-Hollmann <[email protected]> - ---- -:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak - src/drivers/drivers.mak | 21 ++++++++++++++------- - 2 files changed, 29 insertions(+), 14 deletions(-) - ---- a/src/drivers/drivers.mak -+++ b/src/drivers/drivers.mak -@@ -31,11 +31,18 @@ NEED_SME=y - NEED_AP_MLME=y - NEED_NETLINK=y - NEED_LINUX_IOCTL=y --DRV_LIBS += -lnl -+ifdef CONFIG_LIBNL32 -+ DRV_LIBS += -lnl-3 -+ DRV_LIBS += -lnl-genl-3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 -+ DRV_CFLAGS += -I/usr/include/libnl3/ -+else -+ DRV_LIBS += -lnl - --ifdef CONFIG_LIBNL20 --DRV_LIBS += -lnl-genl --DRV_CFLAGS += -DCONFIG_LIBNL20 -+ ifdef CONFIG_LIBNL20 -+ DRV_LIBS += -lnl-genl -+ DRV_CFLAGS += -DCONFIG_LIBNL20 -+ endif - endif - endif diff --git a/source/network-extra/hostapd/hostapd.service b/source/network-extra/hostapd/hostapd.service new file mode 100644 index 0000000..fa9e9fd --- /dev/null +++ b/source/network-extra/hostapd/hostapd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator +After=network.target + +[Service] +Type=forking +PIDFile=/var/run/hostapd.pid +ExecStart=/usr/sbin/hostapd -B -P /var/run/hostapd.pid /etc/hostapd/hostapd.conf + +[Install] +WantedBy=multi-user.target diff --git a/source/network-extra/hostapd/libnl3.patch b/source/network-extra/hostapd/libnl3.patch new file mode 100644 index 0000000..da440ae --- /dev/null +++ b/source/network-extra/hostapd/libnl3.patch @@ -0,0 +1,11 @@ +diff -ur a/src/drivers/drivers.mak b/src/drivers/drivers.mak +--- a/src/drivers/drivers.mak 2012-05-15 10:49:36.934683793 -0500 ++++ b/src/drivers/drivers.mak 2012-05-15 10:49:57.437683053 -0500 +@@ -49,6 +49,7 @@ + DRV_LIBS += -lnl-3 + DRV_LIBS += -lnl-genl-3 + DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -I/usr/include/libnl3 + else + ifdef CONFIG_LIBNL_TINY + DRV_LIBS += -lnl-tiny _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
