From 3eeb63dfafd782363da9d71a2a4ccb181eea5c4b6f34bbf1384fbd60821ae6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 13 Dec 2012 18:56:00 +0000 Subject: [PATCH 1/2] Accepting request 145244 from home:gary_lin:branches:hardware - Update to 1.1 - Remove upstreamed wpa_supplicant-gcc47.patch - Enable background scan to improve roaming - Build driver with libnl3 OBS-URL: https://build.opensuse.org/request/show/145244 OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=28 --- config | 3 ++ wpa_supplicant-1.0.tar.bz2 | 3 -- wpa_supplicant-1.1.tar.bz2 | 3 ++ wpa_supplicant-gcc47.patch | 21 --------- wpa_supplicant-libnl3.patch | 12 +++++ wpa_supplicant.changes | 90 +++++++++++++++++++++++++++++++++++++ wpa_supplicant.spec | 9 ++-- 7 files changed, 114 insertions(+), 27 deletions(-) delete mode 100644 wpa_supplicant-1.0.tar.bz2 create mode 100644 wpa_supplicant-1.1.tar.bz2 delete mode 100644 wpa_supplicant-gcc47.patch create mode 100644 wpa_supplicant-libnl3.patch diff --git a/config b/config index 9e59b9e..ebe9666 100644 --- a/config +++ b/config @@ -464,3 +464,6 @@ CONFIG_DEBUG_FILE=y # external networks (GAS/ANQP to learn more about the networks and network # selection based on available credentials). #CONFIG_INTERWORKING=y + +# Enable background scan to improve roaming +CONFIG_BGSCAN_SIMPLE=y diff --git a/wpa_supplicant-1.0.tar.bz2 b/wpa_supplicant-1.0.tar.bz2 deleted file mode 100644 index 96318f9..0000000 --- a/wpa_supplicant-1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:469af636416a85f5ffa3771f3a8d1233b5f3322d796d0523dfa7ba99dcddb003 -size 1525773 diff --git a/wpa_supplicant-1.1.tar.bz2 b/wpa_supplicant-1.1.tar.bz2 new file mode 100644 index 0000000..5785394 --- /dev/null +++ b/wpa_supplicant-1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4427170270a7fa5c54f90e903e6144982e2f35a546952fc23c98641336ac65d +size 1533617 diff --git a/wpa_supplicant-gcc47.patch b/wpa_supplicant-gcc47.patch deleted file mode 100644 index 3f4e6ee..0000000 --- a/wpa_supplicant-gcc47.patch +++ /dev/null @@ -1,21 +0,0 @@ -Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_networkconfig.o -Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_peers.o -Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_scanresults.o -Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_userdatarequest.o -Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_wpagui.o -Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: wpagui.o -Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4: wpa_gui -diff -ur -p wpa_supplicant-0.7.3.orig/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/wpagui.cpp ---- wpa_supplicant-0.7.3.orig/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2010-09-07 15:43:39.000000000 +0000 -+++ wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-03-17 22:27:50.791658139 +0000 -@@ -12,10 +12,8 @@ - * See README and COPYING for more details. - */ - --#ifdef __MINGW32__ - /* Need to get getopt() */ - #include --#endif - - #ifdef CONFIG_NATIVE_WINDOWS - #include diff --git a/wpa_supplicant-libnl3.patch b/wpa_supplicant-libnl3.patch new file mode 100644 index 0000000..ac807fd --- /dev/null +++ b/wpa_supplicant-libnl3.patch @@ -0,0 +1,12 @@ +diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak +--- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600 ++++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600 +@@ -48,7 +48,7 @@ NEED_RFKILL=y + ifdef CONFIG_LIBNL32 + DRV_LIBS += -lnl-3 + DRV_LIBS += -lnl-genl-3 +- DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` + else + ifdef CONFIG_LIBNL_TINY + DRV_LIBS += -lnl-tiny diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes index f274dd8..14f7985 100644 --- a/wpa_supplicant.changes +++ b/wpa_supplicant.changes @@ -1,3 +1,93 @@ +------------------------------------------------------------------- +Tue Dec 11 10:16:40 UTC 2012 - glin@suse.com + +- Update to 1.1 + * Fix EAPOL supplicant port authorization with PMKSA caching. + * Fix EAPOL processing when STA switches between multi-BSSes. + * Fix EAP-FAST with OpenSSL 1.0.1. + * EAP-pwd: Increase maximum number of hunting-and-pecking + iterations, which results in less authentication attempts + failing. + * Set state to DISCONNECTED on AP creation errors. Previously the + supplicant would stay in SCANNING state forever. + * Fix REMOVE_NETWORK to not run operations with invalid + current_ssid. + * EAP-SIM peer: Fix AT_COUNTER_TOO_SMALL use. + * Interworking: Fix PLMN matching with multiple entries to compare + all entries, not just the first one. + * Handle long configuration file lines more gracefully. + * Fix adding extra IEs in sched scan. + * PMKSA: Set cur_pmksa pointer during initial association. + * PMKSA: Do not evict the active cache entry when adding new ones. + * Set state consistently to DISCONNECTED on auth/assoc failures. + * Fix BSSID enforcement with driver-based BSS selection. Set BSSID + and channel when the network block has an explicit bssid + parameter to select which BSS is to be used. + * wpa_gui: Fix compilation with gcc/g++ 4.7. + * EAP-AKA' + - Update to RFC 5448 in the leading characters used in the + username. This will make EAP-AKA' not interoperate between the + earlier draft version and the new version. + - Fix SIM/USIM determination to support EAP-AKA'. + * dbus: + - Add global capabilities property. + - Fix bss_expire_count getter, which was returning the wrong + value. + - P2P: Remove network_object dictionary entry from signal + GroupStarted. + - Fix D-Bus build without ctrl_iface. + * WPS: + - Fix nonce comparisons to compare all bytes, not just the first + byte. + - Fix NFC password token building with WPS 2.0 to avoid wpabuf + overflow and application abort if NFC out-of-band mechanism is + used with WPS 2.0 enabled. + - Fix cleanup of WPS operations (by clearing them) in + WPA_SCANNING and WPA_DISCONNECTED states. + - Fix issue with BSSID filter handling that could cause only a + single one of the available BSSes to be available or could + cause issues connecting. + - Fix overlapping memcpy on WPS interface addition. + * P2P: + - Remove channel 14 from supported P2P channels. + - Fix Provision Discovery retries on delay in off channel + transmission, to avoid unnecessary retries. + - Limit maximum number of stored P2P clients (the + p2p_client_list parameter) to 100. + - Improve p2p_client_list updates in configuration file, + reording entries so that the most recently added values are + maintained in the list if the list gets truncated due to + size. + - Fix Provision Discovery retries during p2p_find by making the + p2p_find case behave consistently with the limited retry + behavior used with Provision Discovery retries in the IDLE + state. + - Fix P2P Client Discoverability bit updates so that the bit is + only updated based on P2P Group Info attribute from a GO. + - Fix GO Negotiation race condition where both devices may + believe they are the GO. (Ignore unexpected GO Neg Response + if we have already sent GO Neg Response.) + - Deinitialize global P2P context on P2P management interface + removal. + - Wait 100 ms if driver fails to start listen operation. This + is a workaround for some drivers that may accept the + remain-on-channel command, but instead of indicating start + event for remain-on-channel, just indicate that the operation + has been cancelled immediately. + - Clone max_sta_num parameter for group interfaces, allowing + this parameter set in the main config file to apply to + dynamically created P2P group interfaces. + - Fix Device ID matching for Probe Request frames, which was + checking only the first octet of the P2P Device Address. + - Do not update peer Listen channel based on PD Request + Invitation Request frames (just on Probe Response frames). + - Fix p2p_listen to disallow scheduling a new after scan + operation in the case where a p2p_connect operation is + pending. +- Remove upstreamed wpa_supplicant-gcc47.patch +- Enable background scan to improve roaming +- Build driver with libnl3 + ------------------------------------------------------------------- Tue May 15 04:35:01 UTC 2012 - glin@suse.com diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index a5adb23..b50b1af 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -25,11 +25,12 @@ BuildRequires: pkg-config BuildRequires: readline-devel %if 0%{?suse_version} > 1140 BuildRequires: libnl-1_1-devel +BuildRequires: libnl3-devel %else BuildRequires: libnl-devel %endif Url: http://hostap.epitest.fi/wpa_supplicant/ -Version: 1.0 +Version: 1.1 Release: 0 Summary: WPA supplicant implementation License: BSD-3-Clause ; GPL-2.0+ @@ -48,8 +49,7 @@ Patch1: wpa_supplicant-flush-debug-output.patch # is not portable Patch2: wpa_supplicant-sigusr1-changes-debuglevel.patch Patch3: wpa_supplicant-errormsg.patch -# PATCH-FIX-UPSTREAM wpa_supplicant-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7. -Patch4: wpa_supplicant-gcc47.patch +Patch4: wpa_supplicant-libnl3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: logrotate @@ -82,6 +82,9 @@ Authors: %setup -q -n wpa_supplicant-%{version} rm -rf wpa_supplicant-%{version}/patches cp %{SOURCE1} wpa_supplicant/.config +%if 0%{?suse_version} > 1140 +echo "CONFIG_LIBNL32=y" >> wpa_supplicant/.config +%endif %patch0 -p0 %patch1 -p0 %patch2 -p0 From feef28ea43de489b5627249f38d5779447175e5f0e701e67cbdf7bc5f615c31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 17 Dec 2012 10:22:53 +0000 Subject: [PATCH 2/2] - OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=29 --- wpa_supplicant.changes | 2 +- wpa_supplicant.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes index 14f7985..30744e2 100644 --- a/wpa_supplicant.changes +++ b/wpa_supplicant.changes @@ -86,7 +86,7 @@ Tue Dec 11 10:16:40 UTC 2012 - glin@suse.com pending. - Remove upstreamed wpa_supplicant-gcc47.patch - Enable background scan to improve roaming -- Build driver with libnl3 +- Build driver with libnl3 (wpa_supplicant-libnl3.patch) ------------------------------------------------------------------- Tue May 15 04:35:01 UTC 2012 - glin@suse.com diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index b50b1af..991a320 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -33,7 +33,7 @@ Url: http://hostap.epitest.fi/wpa_supplicant/ Version: 1.1 Release: 0 Summary: WPA supplicant implementation -License: BSD-3-Clause ; GPL-2.0+ +License: BSD-3-Clause and GPL-2.0+ Group: Productivity/Networking/Other Source: http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.bz2 Source1: config