[wpa_supplicant] Update to v2.0

Tue May 7 20:12:30 UTC 2013

commit 22b8be3d0fd93f141134b2bc41ff73d582ba8978
Author: Dan Williams <dcbw at redhat.com>
Date:   Tue May 7 15:12:27 2013 -0500

    Update to v2.0

 .gitignore                                         |    1 +
 libnl3-includes.patch                              |    2 +-
 sources                                            |    2 +-
 ...> wpa_supplicant-2.0-generate-libeap-peer.patch |    5 +-
 wpa_supplicant-gui-qt4.patch                       |    2 +-
 ...supplicant-squelch-driver-disconnect-spam.patch |   96 --------------------
 wpa_supplicant.spec                                |   11 ++-
 7 files changed, 13 insertions(+), 106 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b2b33f8..ac78a8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ wpa_supplicant-0.6.8.tar.gz
 /wpa_supplicant-1.0-rc1.tar.gz
 /wpa_supplicant-1.0-rc2.tar.gz
 /wpa_supplicant-1.1.tar.gz
+/wpa_supplicant-2.0.tar.gz
diff --git a/libnl3-includes.patch b/libnl3-includes.patch
index 5d89039..53a3c85 100644
--- a/libnl3-includes.patch
+++ b/libnl3-includes.patch
@@ -5,7 +5,7 @@ diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-r
  ifdef CONFIG_LIBNL32
    DRV_LIBS += -lnl-3
    DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20
+-  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
 +  DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0`
  else
    ifdef CONFIG_LIBNL_TINY
diff --git a/sources b/sources
index c1d7459..02765ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b29b9af02d7e092db8c5c8508de0e45c  wpa_supplicant-1.1.tar.gz
+3be2ebfdcced52e00eda0afe2889839d  wpa_supplicant-2.0.tar.gz
diff --git a/wpa_supplicant-0.7.2-generate-libeap-peer.patch b/wpa_supplicant-2.0-generate-libeap-peer.patch
similarity index 99%
rename from wpa_supplicant-0.7.2-generate-libeap-peer.patch
rename to wpa_supplicant-2.0-generate-libeap-peer.patch
index f4c38d2..8f12bb1 100644
--- a/wpa_supplicant-0.7.2-generate-libeap-peer.patch
+++ b/wpa_supplicant-2.0-generate-libeap-peer.patch
@@ -42,7 +42,7 @@ diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
 index 3651056..58c067a 100644
 --- a/src/eap_peer/Makefile
 +++ b/src/eap_peer/Makefile
-@@ -1,11 +1,192 @@
+@@ -1,11 +1,193 @@
 -all:
 -	@echo Nothing to be made.
 +LIBEAP_NAME = libeap
@@ -89,7 +89,6 @@ index 3651056..58c067a 100644
 +OBJS_both += ../utils/base64.o
 +OBJS_both += ../utils/wpabuf.o
 +OBJS_both += ../crypto/md5.o
-+OBJS_both += ../crypto/sha1.o
 +OBJS_both += ../crypto/sha1-tlsprf.o
 +OBJS_both += ../crypto/aes-encblock.o
 +OBJS_both += ../crypto/aes-wrap.o
@@ -148,6 +147,8 @@ index 3651056..58c067a 100644
 +OBJS_both += ../crypto/crypto_openssl.o
 +LIBS += -lssl -lcrypto
 +override CFLAGS += -DINTERNAL_SHA256
++else
++OBJS_both += ../crypto/sha1.o
 +endif
 +
 +ifeq ($(CONFIG_TLS), internal)
diff --git a/wpa_supplicant-gui-qt4.patch b/wpa_supplicant-gui-qt4.patch
index e4cf637..ab7a38d 100644
--- a/wpa_supplicant-gui-qt4.patch
+++ b/wpa_supplicant-gui-qt4.patch
@@ -2,7 +2,7 @@ diff -up wpa_supplicant-0.7.3/wpa_supplicant/Makefile.qt4 wpa_supplicant-0.7.3/w
 --- wpa_supplicant-0.7.3/wpa_supplicant/Makefile.qt4	2010-09-07 10:43:39.000000000 -0500
 +++ wpa_supplicant-0.7.3/wpa_supplicant/Makefile	2010-12-08 10:07:44.152664004 -0600
 @@ -1352,10 +1352,10 @@ wpa_gui: wpa_gui/Makefile
- 	$(MAKE) -C wpa_gui
+ 	@echo "wpa_gui has been removed - see wpa_gui-qt4 for replacement"
  
  wpa_gui-qt4/Makefile:
 -	qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro 
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 9d5e32d..8a4c568 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -4,7 +4,7 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
-Version: 1.1
+Version: 2.0
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -30,8 +30,6 @@ Patch1: wpa_supplicant-flush-debug-output.patch
 Patch2: wpa_supplicant-dbus-service-file-args.patch
 # quiet an annoying and frequent syslog message
 Patch3: wpa_supplicant-quiet-scan-results-message.patch
-# recover from streams of driver disconnect messages (iwl3945)
-Patch4: wpa_supplicant-squelch-driver-disconnect-spam.patch
 # allow more private key encryption algorithms
 Patch5: wpa_supplicant-openssl-more-algs.patch
 # distro specific customization for Qt4 build tools, not suitable for upstream
@@ -42,7 +40,7 @@ Patch7: libnl3-includes.patch
 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
+Patch100: wpa_supplicant-2.0-generate-libeap-peer.patch
 
 URL: http://w1.fi/wpa_supplicant/
 
@@ -100,7 +98,6 @@ Don't use this unless you know what you're doing.
 %patch1 -p1 -b .flush-debug-output
 %patch2 -p1 -b .dbus-service-file
 %patch3 -p1 -b .quiet-scan-results-msg
-%patch4 -p1 -b .disconnect-spam
 %patch5 -p1 -b .more-openssl-algs
 %patch6 -p1 -b .qt4
 %patch7 -p1 -b .libnl3
@@ -232,6 +229,10 @@ fi
 %postun -n libeap -p /sbin/ldconfig
 
 %changelog
+* Mon May  6 2013 Dan Williams <dcbw at redhat.com> - 1:2.0-1
+- Update to 2.0
+- Be less aggressive when roaming due to signal strength changes (rh #837402)
+
 * 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
