packages: hostapd/hostapd-build-time-config.patch, hostapd/hostapd.spec, ho...

qboosh qboosh at pld-linux.org
Wed May 23 08:19:47 CEST 2012


Author: qboosh                       Date: Wed May 23 06:19:47 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.0
- updated build-time-config patch
- removed obsolete nl patch

---- Files affected:
packages/hostapd:
   hostapd-build-time-config.patch (1.2 -> 1.3) , hostapd.spec (1.35 -> 1.36) , hostapd-nl.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/hostapd/hostapd-build-time-config.patch
diff -u packages/hostapd/hostapd-build-time-config.patch:1.2 packages/hostapd/hostapd-build-time-config.patch:1.3
--- packages/hostapd/hostapd-build-time-config.patch:1.2	Thu Sep 11 22:00:35 2008
+++ packages/hostapd/hostapd-build-time-config.patch	Wed May 23 08:19:41 2012
@@ -1,6 +1,6 @@
---- /dev/null	2008-09-08 08:48:42.268002321 +0200
-+++ hostapd-0.6.4/hostapd/.config	2008-09-11 20:22:39.000000000 +0200
-@@ -0,0 +1,126 @@
+--- hostapd-1.0/hostapd/.config.orig	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-1.0/hostapd/.config	2012-05-23 07:33:55.817640916 +0200
+@@ -0,0 +1,248 @@
 +# Example hostapd build time configuration
 +#
 +# This file lists the configuration options that are used when building the
@@ -20,23 +20,20 @@
 +
 +# Driver interface for madwifi driver
 +CONFIG_DRIVER_MADWIFI=y
-+CFLAGS += -I/usr/include/madwifi # change to reflect local setup; directory for madwifi src
-+
-+# Driver interface for Prism54 driver
-+CONFIG_DRIVER_PRISM54=y
++CFLAGS += -I/usr/include/madwifi # change to the madwifi source directory
 +
 +# Driver interface for drivers using the nl80211 kernel interface
 +CONFIG_DRIVER_NL80211=y
-+# driver_nl80211.c requires a rather new libnl, probably not
-+# shipped with your distribution yet
-+LIBNL=/usr
-+CFLAGS += -I$(LIBNL)/include
-+LIBS += -L$(LIBNL)/lib
 +
 +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 +#CONFIG_DRIVER_BSD=y
 +#CFLAGS += -I/usr/local/include
 +#LIBS += -L/usr/local/lib
++#LIBS_p += -L/usr/local/lib
++#LIBS_c += -L/usr/local/lib
++
++# Driver interface for no driver (e.g., RADIUS server only)
++#CONFIG_DRIVER_NONE=y
 +
 +# IEEE 802.11F/IAPP
 +CONFIG_IAPP=y
@@ -80,12 +77,19 @@
 +# EAP-AKA for the integrated EAP server
 +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
 +
 +# 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
 +
@@ -101,6 +105,13 @@
 +# to add the needed functions.
 +#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
++
 +# EAP-IKEv2
 +CONFIG_EAP_IKEV2=y
 +
@@ -118,12 +129,123 @@
 +# Build IPv6 support for RADIUS operations
 +CONFIG_IPV6=y
 +
-+# IEEE 802.11r/D4.1 (Fast BSS Transition)
-+# This enables an experimental implementation of a draft version of
-+# IEEE 802.11r. This draft is still subject to change, so it should be noted
-+# that this version may not comply with the final standard.
++# IEEE Std 802.11r-2008 (Fast BSS Transition)
 +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
++
++# 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
++# 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
++
++# Remove support for RADIUS
++#CONFIG_NO_RADIUS=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.
++#CONFIG_NO_DUMP_STATE=y
++
++# Enable tracing code for developer debugging
++# This tracks use of memory allocations and other registrations and reports
++# incorrect use with a backtrace of call (or allocation) location.
++#CONFIG_WPA_TRACE=y
++# For BSD, comment out these.
++#LIBS += -lexecinfo
++#LIBS_p += -lexecinfo
++#LIBS_c += -lexecinfo
++
++# Use libbfd to get more details for developer debugging
++# This enables use of libbfd to get more detailed symbols for the backtraces
++# generated by CONFIG_WPA_TRACE=y.
++#CONFIG_WPA_TRACE_BFD=y
++# For BSD, comment out these.
++#LIBS += -lbfd -liberty -lz
++#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

================================================================
Index: packages/hostapd/hostapd.spec
diff -u packages/hostapd/hostapd.spec:1.35 packages/hostapd/hostapd.spec:1.36
--- packages/hostapd/hostapd.spec:1.35	Thu Dec 22 11:29:16 2011
+++ packages/hostapd/hostapd.spec	Wed May 23 08:19:41 2012
@@ -5,18 +5,17 @@
 Summary(es.UTF-8):	HostAP - actúa como un punto de acceso
 Summary(pl.UTF-8):	HostAP - praca jako access point
 Name:		hostapd
-Version:	0.7.3
-Release:	4
-License:	GPL v2
+Version:	1.0
+Release:	1
+License:	GPL v2 or BSD
 Group:		Daemons
 Source0:	http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	91a7c8d0f090b7104152d3455a84c112
+# Source0-md5:	236247a7bbd4f60d5fa3e99849d1ffc9
 Source1:	%{name}.init
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-build-time-config.patch
-Patch2:		%{name}-nl.patch
 URL:		http://hostap.epitest.fi/
-BuildRequires:	libnl-devel >= 1:3.0
+BuildRequires:	libnl-devel >= 1:3.2
 BuildRequires:	madwifi-ng-devel
 BuildRequires:	openssl-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -62,19 +61,16 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} '/CFLAGS =/{s/-g//; s/-O2/$(OPTCFLAGS)/}' -i hostapd/Makefile
-%{__sed} '/NOBJS =/s at ../src/crypto/rc4.o at ../src/utils/wpabuf.o ../src/utils/wpa_debug.o@' -i hostapd/Makefile
 
 %build
 %{__make} -C hostapd \
-	CONFIG_LIBNL20=1 \
 	all nt_password_hash hlr_auc_gw \
 	V=1 \
 	CC="%{__cc}" \
 	OPTCFLAGS="%{rpmcflags} %{rpmcppflags} `pkg-config --cflags libnl-3.0`" \
-	LDFLAGS="%{rpmcflags} %{rpmldflags} `pkg-config --libs libnl-3.0 libnl-genl-3.0`"
+	LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -108,10 +104,15 @@
 
 %files
 %defattr(644,root,root,755)
-%doc hostapd/ChangeLog hostapd/README
+%doc hostapd/{ChangeLog,README,README-WPS}
 %dir %{_sysconfdir}/hostap
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hostap/*
-%attr(755,root,root) /sbin/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hostap/hostapd.accept
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hostap/hostapd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hostap/hostapd.deny
+%attr(755,root,root) /sbin/hlr_auc_gw
+%attr(755,root,root) /sbin/hostapd
+%attr(755,root,root) /sbin/hostapd_cli
+%attr(755,root,root) /sbin/nt_password_hash
 %attr(754,root,root) /etc/rc.d/init.d/hostapd
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -120,6 +121,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2012/05/23 06:19:41  qboosh
+- updated to 1.0
+- updated build-time-config patch
+- removed obsolete nl patch
+
 Revision 1.35  2011/12/22 10:29:16  hawk
 - really fix building with libnl 3.x
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/hostapd/hostapd-build-time-config.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/hostapd/hostapd.spec?r1=1.35&r2=1.36



More information about the pld-cvs-commit mailing list