From 3d4bc5ec64f93b2107d8da6731b1bdc4bb358cf3b06a01ce95186d4d97a94018 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 17 Apr 2013 09:44:46 +0000 Subject: [PATCH] Accepting request 164011 from home:xandry:branches:Base:System update to version 2.0; fix corrected file name hostapd.dif to hostapd.diff; in default config includes all features (IEEE 802.11w, Hotspot 2.0, IEEE 802.11ac, WPS, etc.) except VLAN_NETLINK. To build with support VLAN_NETLINK we need libnl-3_1-devel from "security:netfilter" repo. OBS-URL: https://build.opensuse.org/request/show/164011 OBS-URL: https://build.opensuse.org/package/show/Base:System/hostapd?expand=0&rev=18 --- hostapd-1.0.tar.gz | 3 - hostapd-2.0.tar.gz | 3 + hostapd.changes | 7 ++ hostapd.dif | 64 ------------------ hostapd.diff | 162 +++++++++++++++++++++++++++++++++++++++++++++ hostapd.spec | 7 +- 6 files changed, 176 insertions(+), 70 deletions(-) delete mode 100644 hostapd-1.0.tar.gz create mode 100644 hostapd-2.0.tar.gz delete mode 100644 hostapd.dif create mode 100644 hostapd.diff diff --git a/hostapd-1.0.tar.gz b/hostapd-1.0.tar.gz deleted file mode 100644 index bc699a3..0000000 --- a/hostapd-1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:002e9dcb7e46cf82b5900a2fcf92b30fc8cdfd32a72d7fd4488588f1c013dfcc -size 1327943 diff --git a/hostapd-2.0.tar.gz b/hostapd-2.0.tar.gz new file mode 100644 index 0000000..275e6ee --- /dev/null +++ b/hostapd-2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35 +size 1376203 diff --git a/hostapd.changes b/hostapd.changes index cf463e4..3ddbb92 100644 --- a/hostapd.changes +++ b/hostapd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 9 17:49:22 UTC 2013 - avm-xandry@yandex.ru + +- update to version 2.0 +- fix corrected file name hostapd.dif to hostapd.diff +- in default config includes all features (IEEE 802.11w, Hotspot 2.0, IEEE 802.11ac, WPS, etc.) + ------------------------------------------------------------------- Tue Nov 6 04:41:17 UTC 2012 - crrodriguez@opensuse.org diff --git a/hostapd.dif b/hostapd.dif deleted file mode 100644 index 7b2ba3b..0000000 --- a/hostapd.dif +++ /dev/null @@ -1,64 +0,0 @@ ---- - hostapd/defconfig | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - ---- a/hostapd/defconfig -+++ b/hostapd/defconfig -@@ -13,7 +13,7 @@ - CONFIG_DRIVER_HOSTAP=y - - # Driver interface for wired authenticator --#CONFIG_DRIVER_WIRED=y -+CONFIG_DRIVER_WIRED=y - - # Driver interface for madwifi driver - #CONFIG_DRIVER_MADWIFI=y -@@ -30,7 +30,7 @@ CONFIG_DRIVER_NL80211=y - #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 -@@ -69,7 +69,7 @@ CONFIG_EAP_GTC=y - 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 -@@ -79,10 +79,10 @@ CONFIG_EAP_TTLS=y - #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 -@@ -121,7 +121,7 @@ CONFIG_PKCS12=y - - # 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 -@@ -134,7 +134,7 @@ CONFIG_IPV6=y - #CONFIG_DRIVER_RADIUS_ACL=y - - # IEEE 802.11n (High Throughput) support --#CONFIG_IEEE80211N=y -+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 diff --git a/hostapd.diff b/hostapd.diff new file mode 100644 index 0000000..ee0898f --- /dev/null +++ b/hostapd.diff @@ -0,0 +1,162 @@ +--- hostapd/defconfig 2013-01-12 21:42:53.000000000 +0600 +--- a/hostapd/defconfig ++++ b/hostapd/defconfig +@@ -30,7 +30,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 +@@ -45,7 +45,7 @@ + # 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 +@@ -69,53 +69,53 @@ + 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 ++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 ++CONFIG_EAP_PWD=y + + # EAP-SAKE for the integrated EAP server +-#CONFIG_EAP_SAKE=y ++CONFIG_EAP_SAKE=y + + # EAP-GPSK for the integrated EAP server +-#CONFIG_EAP_GPSK=y ++CONFIG_EAP_GPSK=y + # Include support for optional SHA256 cipher suite in EAP-GPSK +-#CONFIG_EAP_GPSK_SHA256=y ++CONFIG_EAP_GPSK_SHA256=y + + # EAP-FAST for the integrated EAP server + # Note: Default OpenSSL package does not include support for all the + # 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 ++CONFIG_WPS=y + # Enable WSC 2.0 support +-#CONFIG_WPS2=y ++CONFIG_WPS2=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 ++CONFIG_WPS_NFC=y + + # EAP-IKEv2 +-#CONFIG_EAP_IKEV2=y ++CONFIG_EAP_IKEV2=y + + # Trusted Network Connect (EAP-TNC) +-#CONFIG_EAP_TNC=y ++CONFIG_EAP_TNC=y + + # PKCS#12 (PFX) support (used to read private key and certificate file from + # a file that usually has extension .p12 or .pfx) +@@ -123,27 +123,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 ++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 ++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 +@@ -165,7 +165,7 @@ + + # Enable support for fully dynamic VLANs. This enables hostapd to + # automatically create bridge and VLAN interfaces if necessary. +-#CONFIG_FULL_DYNAMIC_VLAN=y ++CONFIG_FULL_DYNAMIC_VLAN=y + + # Use netlink-based kernel API for VLAN operations instead of ioctl() + # Note: This requires libnl 3.1 or newer. +@@ -235,11 +235,11 @@ + # 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 ++CONFIG_TLSV11=y + + # TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) + # can be enabled to enable use of stronger crypto algorithms. +-#CONFIG_TLSV12=y ++CONFIG_TLSV12=y + + # If CONFIG_TLS=internal is used, additional library and include paths are + # needed for LibTomMath. Alternatively, an integrated, minimal version of +@@ -260,10 +260,10 @@ + # Interworking (IEEE 802.11u) + # This can be used to enable functionality to improve interworking with + # external networks. +-#CONFIG_INTERWORKING=y ++CONFIG_INTERWORKING=y + + # Hotspot 2.0 +-#CONFIG_HS20=y ++CONFIG_HS20=y + + # Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file +-#CONFIG_SQLITE=y ++CONFIG_SQLITE=y diff --git a/hostapd.spec b/hostapd.spec index b327d57..e04a139 100644 --- a/hostapd.spec +++ b/hostapd.spec @@ -22,12 +22,13 @@ BuildRequires: libnl-1_1-devel %else BuildRequires: libnl-devel %endif +BuildRequires: sqlite3-devel BuildRequires: openssl-devel BuildRequires: pkgconfig(systemd) Summary: Turns Your WLAN Card into a WPA capable Access Point -License: BSD-3-Clause and GPL-2.0+ +License: BSD-3-Clause Group: Hardware/Wifi -Version: 1.0 +Version: 2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://hostap.epitest.fi/ @@ -35,7 +36,7 @@ PreReq: %insserv_prereq Source: http://hostap.epitest.fi/releases/hostapd-%{version}.tar.gz Source1: hostapd.init Source2: hostapd.service -Patch: hostapd.dif +Patch: hostapd.diff Patch1: hostapd-tmp.diff %{?systemd_requires}