Accepting request 231150 from Base:System

update version 2.1 (forwarded request 230370 from MargueriteSu)

OBS-URL: https://build.opensuse.org/request/show/231150
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hostapd?expand=0&rev=25

hostapd-2.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35
-size 1376203

hostapd-2.1-be-host_to_le.patch

@@ -1,9 +1,9 @@
-Index: hostapd-2.0/src/utils/common.h
+Index: hostapd-2.1/src/utils/common.h
 ===================================================================
---- hostapd-2.0.orig/src/utils/common.h
+--- hostapd-2.1.orig/src/utils/common.h
-+++ hostapd-2.0/src/utils/common.h
++++ hostapd-2.1/src/utils/common.h
-@@ -207,6 +207,7 @@ static inline unsigned int wpa_swap_32(u
+@@ -208,6 +208,7 @@ static inline unsigned int wpa_swap_32(u
- #define le_to_host32(n) bswap_32(n)
+ #define host_to_le32(n) bswap_32(n)
  #define be_to_host32(n) (n)
  #define host_to_be32(n) (n)
 +#define host_to_le32(n) bswap_32(n)

hostapd-2.1-defconfig.patch

@@ -1,7 +1,8 @@
---- hostapd/defconfig	2013-01-12 21:42:53.000000000 +0600
+Index: hostapd-2.1/hostapd/defconfig
---- a/hostapd/defconfig
+===================================================================
-+++ b/hostapd/defconfig
+--- hostapd-2.1.orig/hostapd/defconfig
-@@ -30,7 +30,7 @@
++++ hostapd-2.1/hostapd/defconfig
+@@ -43,7 +43,7 @@ CONFIG_DRIVER_NL80211=y
  #LIBS_c += -L/usr/local/lib
  
  # Driver interface for no driver (e.g., RADIUS server only)
@@ -10,7 +11,7 @@
  
  # IEEE 802.11F/IAPP
  CONFIG_IAPP=y
-@@ -45,7 +45,7 @@
+@@ -58,7 +58,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.
@@ -19,7 +20,7 @@
  
  # Integrated EAP server
  CONFIG_EAP=y
-@@ -69,53 +69,53 @@
+@@ -82,52 +82,52 @@ CONFIG_EAP_GTC=y
  CONFIG_EAP_TTLS=y
  
  # EAP-SIM for the integrated EAP server
@@ -59,10 +60,9 @@
 +CONFIG_EAP_GPSK_SHA256=y
  
  # EAP-FAST for the integrated EAP server
- # Note: Default OpenSSL package does not include support for all the
+ # Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed
- # functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
+ # for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g.,
- # the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch)
+ # with openssl-0.9.8x-tls-extensions.patch, to add the needed functions.
- # to add the needed functions.
 -#CONFIG_EAP_FAST=y
 +CONFIG_EAP_FAST=y
  
@@ -87,9 +87,9 @@
 -#CONFIG_EAP_TNC=y
 +CONFIG_EAP_TNC=y
  
- # PKCS#12 (PFX) support (used to read private key and certificate file from
+ # EAP-EKE for the integrated EAP server
- # a file that usually has extension .p12 or .pfx)
+ #CONFIG_EAP_EKE=y
-@@ -123,27 +123,27 @@
+@@ -138,27 +138,27 @@ CONFIG_PKCS12=y
  
  # RADIUS authentication server. This provides access to the integrated EAP
  # server from external hosts using RADIUS.
@@ -123,7 +123,7 @@
  
  # 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 @@
+@@ -186,7 +186,7 @@ CONFIG_IPV6=y
  
  # Enable support for fully dynamic VLANs. This enables hostapd to
  # automatically create bridge and VLAN interfaces if necessary.
@@ -132,7 +132,7 @@
  
  # Use netlink-based kernel API for VLAN operations instead of ioctl()
  # Note: This requires libnl 3.1 or newer.
-@@ -235,11 +235,11 @@
+@@ -256,11 +256,11 @@ CONFIG_IPV6=y
  # 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.
@@ -146,7 +146,7 @@
  
  # 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 @@
+@@ -281,13 +281,13 @@ CONFIG_IPV6=y
  # Interworking (IEEE 802.11u)
  # This can be used to enable functionality to improve interworking with
  # external networks.
@@ -160,3 +160,6 @@
  # Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
 -#CONFIG_SQLITE=y
 +CONFIG_SQLITE=y
+ 
+ # Testing options
+ # This can be used to enable some testing options (see also the example

hostapd-2.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c7110f55b6092e5277e26edc961eda2def12b94218129d116f5681e34bb2f88
+size 1490215

hostapd-tmp.diff

@@ -1,13 +0,0 @@
-Index: hostapd-0.7.3/hostapd/hostapd.conf
-===================================================================
---- hostapd-0.7.3.orig/hostapd/hostapd.conf
-+++ hostapd-0.7.3/hostapd/hostapd.conf
-@@ -52,7 +52,7 @@ logger_stdout=-1
- logger_stdout_level=2
- 
- # Dump file for state information (on SIGUSR1)
--dump_file=/tmp/hostapd.dump
-+dump_file=/run/hostapd.dump
- 
- # Interface for separate control program. If this is specified, hostapd
- # will create this directory and a UNIX domain socket for listening to requests

hostapd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr 16 15:50:48 UTC 2014 - i@marguerite.su
+
+- update version 2.1
+  * see http://hostap.epitest.fi/cgit/hostap/log/ for details.
+- change hostapd.diff to hostapd-2.1-defconfig.patch
+- remove patch: hostapd-tmp.diff, no longer needed.
+
 -------------------------------------------------------------------
 Wed Oct  2 15:33:43 UTC 2013 - dvaleev@suse.com
 

hostapd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hostapd
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,15 +24,14 @@ BuildRequires:  pkgconfig(systemd)
 Summary:        Turns Your WLAN Card into a WPA capable Access Point
 License:        GPL-2.0 or BSD-3-Clause
 Group:          Hardware/Wifi
-Version:        2.0
+Version:        2.1
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://hostap.epitest.fi/
 Source:         http://hostap.epitest.fi/releases/hostapd-%{version}.tar.gz
 Source1:        hostapd.service
-Patch0:         hostapd.diff
+Patch0:         hostapd-2.1-defconfig.patch
-Patch1:         hostapd-tmp.diff
+Patch1:         hostapd-2.1-be-host_to_le.patch
-Patch2:         hostapd-be-host_to_le.patch
 %{?systemd_requires}
 
 %description
@@ -48,7 +47,6 @@ authentication via any ethernet driver.
 %setup -q -n hostapd-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 cd hostapd
 cp defconfig .config