[wpa_supplicant/f18] Update to 1.1

[Daniel Williams]

commit 7750194a9d9df10cbf6fe7c38f3edfe8bdaebae7
Author: Dan Williams <dcbw at redhat.com>
Date:   Mon Apr 1 17:35:49 2013 -0500

    Update to 1.1

 .gitignore                             |    1 +
 rh837402-less-aggressive-roaming.patch |   27 +++++++++++++++++++++++++++
 sources                                |    2 +-
 wpa_supplicant-1.0-wpagui-getopt.patch |   14 --------------
 wpa_supplicant.spec                    |   18 +++++++++++-------
 5 files changed, 40 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b78ab2f..b2b33f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ wpa_supplicant-0.6.8.tar.gz
 /wpa_supplicant-0.7.3.tar.gz
 /wpa_supplicant-1.0-rc1.tar.gz
 /wpa_supplicant-1.0-rc2.tar.gz
+/wpa_supplicant-1.1.tar.gz
diff --git a/rh837402-less-aggressive-roaming.patch b/rh837402-less-aggressive-roaming.patch
new file mode 100644
index 0000000..29f827b
--- /dev/null
+++ b/rh837402-less-aggressive-roaming.patch
@@ -0,0 +1,27 @@
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/events.c.foo wpa_supplicant-0.7.3/wpa_supplicant/events.c
+--- wpa_supplicant-0.7.3/wpa_supplicant/events.c.foo	2012-06-12 12:03:36.172962193 -0500
++++ wpa_supplicant-0.7.3/wpa_supplicant/events.c	2012-06-12 12:03:51.388771973 -0500
+@@ -871,16 +871,14 @@ static int wpa_supplicant_need_to_roam(s
+ 
+ 	min_diff = 2;
+ 	if (current_bss->level < 0) {
+-		if (current_bss->level < -85)
+-			min_diff = 1;
+-		else if (current_bss->level < -80)
+-			min_diff = 2;
+-		else if (current_bss->level < -75)
+-			min_diff = 3;
+-		else if (current_bss->level < -70)
++		if (current_bss->level < -75)
+ 			min_diff = 4;
++		else if (current_bss->level < -70)
++			min_diff = 6;
++		else if (current_bss->level < -65)
++			min_diff = 8;
+ 		else
+-			min_diff = 5;
++			min_diff = 15;
+ 	}
+ 	if (abs(current_bss->level - selected->level) < min_diff) {
+ 		wpa_dbg(wpa_s, MSG_DEBUG, "Skip roam - too small difference "
+
diff --git a/sources b/sources
index fc67280..c1d7459 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a3134a6df4229877bbd9f577b208ee9  wpa_supplicant-1.0-rc3.tar.gz
+b29b9af02d7e092db8c5c8508de0e45c  wpa_supplicant-1.1.tar.gz
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 1c11a20..76d1ac2 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -1,10 +1,10 @@
-%define rcver -rc3
+%define rcver %{nil}
 %define snapshot %{nil}
 
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
-Version: 1.0
+Version: 1.1
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -36,10 +36,10 @@ Patch4: wpa_supplicant-squelch-driver-disconnect-spam.patch
 Patch5: wpa_supplicant-openssl-more-algs.patch
 # distro specific customization for Qt4 build tools, not suitable for upstream
 Patch6: wpa_supplicant-gui-qt4.patch
-# Need <unistd.h> for getopt
-Patch7: wpa_supplicant-1.0-wpagui-getopt.patch
 # Fix libnl3 includes path
-Patch8: libnl3-includes.patch
+Patch7: libnl3-includes.patch
+# Less aggressive roaming; signal strength is wildly variable
+Patch8: rh837402-less-aggressive-roaming.patch
 # Dirty hack for WiMAX
 # http://linuxwimax.org/Download?action=AttachFile&do=get&target=wpa-1.5-README.txt
 Patch100: wpa_supplicant-0.7.2-generate-libeap-peer.patch
@@ -103,8 +103,8 @@ Don't use this unless you know what you're doing.
 %patch4 -p1 -b .disconnect-spam
 %patch5 -p1 -b .more-openssl-algs
 %patch6 -p1 -b .qt4
-%patch7 -p1 -b .getopt
-%patch8 -p1 -b .libnl3
+%patch7 -p1 -b .libnl3
+%patch8 -p1 -b .rh837402-less-aggressive-roaming
 
 %build
 pushd wpa_supplicant
@@ -232,6 +232,10 @@ fi
 %postun -n libeap -p /sbin/ldconfig
 
 %changelog
+* Mon Apr  1 2013 Dan Williams <dcbw at redhat.com> - 1:1.1-1
+- Update to 1.1
+- Be less aggressive when roaming due to signal strength changes
+
 * Thu Aug 29 2012 Dan Williams <dcbw at redhat.com> - 1:1.0-1
 - Enable lightweight AP mode support
 - Enable P2P (WiFi Direct) support