[wpa_supplicant] Update to 1.0-rc1 + git
Daniel Williams
dcbw at fedoraproject.org
Tue Jan 10 22:19:06 UTC 2012
commit 28f5ec3c55dfb106a5a32de87e5199b13d37a95c
Author: Dan Williams <dcbw at redhat.com>
Date: Tue Jan 10 16:18:58 2012 -0600
Update to 1.0-rc1 + git
.gitignore | 1 +
...an-up-new-D-Bus-interface-getters-setters.patch | 3311 --------------------
sources | 2 +-
wpa_supplicant-bss-changed-prop-notify.patch | 44 -
wpa_supplicant-dbus-service-file-args.patch | 27 +-
wpa_supplicant-openssl-more-algs.patch | 3 +-
wpa_supplicant-quiet-scan-results-message.patch | 2 +-
...supplicant-squelch-driver-disconnect-spam.patch | 16 +-
wpa_supplicant.spec | 17 +-
9 files changed, 34 insertions(+), 3389 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a0e68c..3086de5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ wpa_supplicant-0.6.4.tar.gz
wpa_supplicant-0.6.7.tar.gz
wpa_supplicant-0.6.8.tar.gz
/wpa_supplicant-0.7.3.tar.gz
+/wpa_supplicant-1.0-rc1.tar.gz
diff --git a/sources b/sources
index fc52e12..8dadd7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f516f191384a9a546e3f5145c08addda wpa_supplicant-0.7.3.tar.gz
+5e16238b661b5230a753b355d4845477 wpa_supplicant-1.0-rc1.tar.gz
diff --git a/wpa_supplicant-dbus-service-file-args.patch b/wpa_supplicant-dbus-service-file-args.patch
index 24a6f35..d0e3c10 100644
--- a/wpa_supplicant-dbus-service-file-args.patch
+++ b/wpa_supplicant-dbus-service-file-args.patch
@@ -1,19 +1,20 @@
-diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.fedora 2008-03-02 20:58:35.000000000 -0500
-+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2008-03-02 20:58:41.000000000 -0500
-@@ -1,4 +1,4 @@
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
+--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora 2008-03-02 20:58:35.000000000 -0500
++++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2008-03-02 20:58:41.000000000 -0500
+@@ -1,5 +1,5 @@
[D-BUS Service]
Name=fi.w1.wpa_supplicant1
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=@SBINDIR@/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
User=root
-diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.fedora 2008-03-02 20:58:35.000000000 -0500
-+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2008-03-02 20:58:41.000000000 -0500
-@@ -1,4 +1,4 @@
+ SystemdService=wpa_supplicant.service
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
+--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora 2008-03-02 20:58:35.000000000 -0500
++++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2008-03-02 20:58:41.000000000 -0500
+@@ -1,5 +1,5 @@
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=@SBINDIR@/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
User=root
-
+ SystemdService=wpa_supplicant.service
diff --git a/wpa_supplicant-openssl-more-algs.patch b/wpa_supplicant-openssl-more-algs.patch
index cd05883..b44c463 100644
--- a/wpa_supplicant-openssl-more-algs.patch
+++ b/wpa_supplicant-openssl-more-algs.patch
@@ -11,5 +11,6 @@ diff -up wpa_supplicant-0.7.3/src/crypto/tls_openssl.c.more-openssl-algs wpa_sup
+ if (!conf || !conf->fips_mode)
+ OpenSSL_add_all_algorithms();
SSL_library_init();
- #ifndef OPENSSL_NO_SHA256
+ #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256)
EVP_add_digest(EVP_sha256());
+
diff --git a/wpa_supplicant-quiet-scan-results-message.patch b/wpa_supplicant-quiet-scan-results-message.patch
index 28dfd5f..5bb36a4 100644
--- a/wpa_supplicant-quiet-scan-results-message.patch
+++ b/wpa_supplicant-quiet-scan-results-message.patch
@@ -4,7 +4,7 @@ diff -up wpa_supplicant-0.6.7/wpa_supplicant/events.c.scan-results-msg wpa_suppl
@@ -911,7 +911,7 @@ static void wpa_supplicant_event_scan_re
}
- wpa_printf(MSG_DEBUG, "New scan results available");
+ wpa_dbg(wpa_s, MSG_DEBUG, "New scan results available");
- wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
+ wpa_msg_ctrl(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS);
wpas_notify_scan_results(wpa_s);
diff --git a/wpa_supplicant-squelch-driver-disconnect-spam.patch b/wpa_supplicant-squelch-driver-disconnect-spam.patch
index 6abf582..f53a418 100644
--- a/wpa_supplicant-squelch-driver-disconnect-spam.patch
+++ b/wpa_supplicant-squelch-driver-disconnect-spam.patch
@@ -15,23 +15,23 @@ diff -up wpa_supplicant-0.6.8/wpa_supplicant/events.c.disconnect-spam wpa_suppli
+ }
+
wpa_supplicant_mark_disassoc(wpa_s);
- bgscan_deinit(wpa_s);
- wpa_s->bgscan_ssid = NULL;
+
+ if (authenticating && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME))
diff -up wpa_supplicant-0.6.8/wpa_supplicant/wpa_supplicant.c.disconnect-spam wpa_supplicant-0.6.8/wpa_supplicant/wpa_supplicant.c
--- wpa_supplicant-0.6.8/wpa_supplicant/wpa_supplicant.c.disconnect-spam 2010-05-06 18:10:51.340288662 -0700
+++ wpa_supplicant-0.6.8/wpa_supplicant/wpa_supplicant.c 2010-05-06 18:12:06.090413976 -0700
@@ -382,6 +382,9 @@ static void wpa_supplicant_cleanup(struc
+
wpa_supplicant_cancel_scan(wpa_s);
wpa_supplicant_cancel_auth_timeout(wpa_s);
-
+ if (eloop_is_timeout_registered(wpa_disconnect_spam_handle, wpa_s, NULL))
+ eloop_cancel_timeout(wpa_disconnect_spam_handle, wpa_s, NULL);
+
- ieee80211_sta_deinit(wpa_s);
-
- wpas_wps_deinit(wpa_s);
+ eloop_cancel_timeout(wpa_supplicant_stop_countermeasures, wpa_s, NULL);
+ #ifdef CONFIG_DELAYED_MIC_ERROR_REPORT
+ eloop_cancel_timeout(wpa_supplicant_delayed_mic_error_report,
@@ -461,6 +464,23 @@ const char * wpa_supplicant_state_txt(in
- }
+ #endif /* CONFIG_BGSCAN */
+void wpa_disconnect_spam_handle(void *eloop_ctx, void *timeout_ctx)
@@ -91,6 +91,6 @@ diff -up wpa_supplicant-0.6.8/wpa_supplicant/wpa_supplicant_i.h.disconnect-spam
enum wpa_states state);
+void wpa_disconnect_spam_handle(void *eloop_ctx, void *timeout_ctx);
struct wpa_ssid * wpa_supplicant_get_ssid(struct wpa_supplicant *wpa_s);
+ const char * wpa_supplicant_get_eap_mode(struct wpa_supplicant *wpa_s);
void wpa_supplicant_cancel_auth_timeout(struct wpa_supplicant *wpa_s);
- void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s,
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 4758a54..3e38615 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -1,11 +1,11 @@
Summary: WPA/WPA2/IEEE 802.1X Supplicant
Name: wpa_supplicant
Epoch: 1
-Version: 0.7.3
-Release: 11%{?dist}
+Version: 1.0
+Release: 0.1%{?dist}
License: BSD
Group: System Environment/Base
-Source0: http://w1.fi/releases/%{name}-%{version}.tar.gz
+Source0: http://w1.fi/releases/%{name}-%{version}-rc1.tar.gz
Source1: build-config
Source2: %{name}.conf
Source3: %{name}.service
@@ -33,10 +33,6 @@ 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
-# Send PropertyChanged notificationes when the BSS list changes
-Patch7: wpa_supplicant-bss-changed-prop-notify.patch
-# Don't crash trying to pass NULL to dbus
-Patch8: 0001-dbus-clean-up-new-D-Bus-interface-getters-setters.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
@@ -92,7 +88,7 @@ This package contains header files for using the EAP peer library.
Don't use this unless you know what you're doing.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
%patch0 -p1 -b .assoc-timeout
%patch1 -p1 -b .flush-debug-output
%patch2 -p1 -b .dbus-service-file
@@ -100,8 +96,6 @@ 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 .bss-changed-prop-notify
-%patch8 -p1 -b .dbus-rework
%build
pushd wpa_supplicant
@@ -226,6 +220,9 @@ fi
%postun -n libeap -p /sbin/ldconfig
%changelog
+* Tue Jan 10 2012 Dan Williams <dcbw at redhat.com> - 1:1.0-0.1
+- Update to 1.0-rc1 + git
+
* Fri Sep 9 2011 Tom Callaway <spot at fedoraproject.org> - 1:0.7.3-11
- add missing systemd scriptlets
More information about the scm-commits
mailing list