[meego-commits] 6122: Changes to Trunk:Testing/wpa_supplicant
Martin Xu
martin.xu at intel.com
Fri Jul 30 03:57:14 UTC 2010
Hi,
I have made the following changes to wpa_supplicant in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Martin Xu
[This message was auto-generated]
---
Request #6122:
submit: home:martin:branches:Trunk:Testing/wpa_supplicant(r20)(cleanup) -> Trunk:Testing/wpa_supplicant
Message:
None
State: new 2010-07-29T15:50:09 martin
Comment: None
changes files:
--------------
--- wpa_supplicant.changes
+++ wpa_supplicant.changes
@@ -0,0 +1,13 @@
+* Wed Jul 21 2010 Martin Xu <martin.xu at intel.com> - 0.7.2
+- add patch 0001-Skip-D-Bus-signals-if-the-dbus_path-is-not-yet-set.patch
+- to fix wpa_s start up fail issue
+- add patch bcm-custom_event-0.7.2.patch
+- it is Broadcome driver specific patch
+
+* Mon Jul 19 2010 Martin Xu <martin.xu at intel.com> - 0.7.2
+- use spectacle
+
+* Mon Jul 19 2010 Martin Xu <martin.xu at intel.com> - 0.7.2
+- upgrade to 0.7.2
+- enable CONFIG_DRIVER_NL80211=y
+
old:
----
wpa_supplicant-0.7.1.tar.gz
new:
----
0001-Skip-D-Bus-signals-if-the-dbus_path-is-not-yet-set.patch
bcm-custom_event-0.7.2.patch
wpa_supplicant-0.7.2.tar.gz
wpa_supplicant.yaml
spec files:
-----------
--- wpa_supplicant.spec
+++ wpa_supplicant.spec
@@ -1,17 +1,27 @@
-Summary: WPA/WPA2/IEEE 802.1X Supplicant
+#
+# Do not Edit! Generated by:
+# spectacle version 0.18
+#
+# >> macros
+# << macros
+
Name: wpa_supplicant
-Version: 0.7.1
+Summary: WPA/WPA2/IEEE 802.1X Supplicant
+Version: 0.7.2
Release: 1
-License: BSD
Group: System/Base
+License: BSD
+URL: http://w1.fi/wpa_supplicant/
Source0: http://w1.fi/releases/%{name}-%{version}.tar.gz
Source1: %{name}.config
+Source100: wpa_supplicant.yaml
+Patch0: 0001-Skip-D-Bus-signals-if-the-dbus_path-is-not-yet-set.patch
+Patch1: bcm-custom_event-0.7.2.patch
+BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(libnl-1)
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: readline
-URL: http://w1.fi/wpa_supplicant/
-
-BuildRequires: openssl-devel
-BuildRequires: readline-devel
-BuildRequires: dbus-devel
%description
wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support
@@ -20,19 +30,40 @@
with a WPA Authenticator and it controls the roaming and IEEE 802.11
authentication/association of the wlan driver.
+
+
+
%prep
-%setup -q
+%setup -q -n %{name}-%{version}
+
+# 0001-Skip-D-Bus-signals-if-the-dbus_path-is-not-yet-set.patch
+%patch0 -p1
+# bcm-custom_event-0.7.2.patch
+%patch1 -p1
+# >> setup
+# << setup
%build
+# >> build pre
pushd wpa_supplicant
- cp %{SOURCE1} ./.config
- CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
- CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
- make %{_smp_mflags}
-popd
+cp %{SOURCE1} ./.config
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
+# << build pre
+
+
+# >> build post
+make %{?jobs:-j%jobs}
+popd
+# << build post
%install
rm -rf %{buildroot}
+# >> install pre
+# << install pre
+
+# >> install post
+rm -rf %{buildroot}
# binary
install -d %{buildroot}/sbin
@@ -57,10 +88,16 @@
rm -f %{name}/doc/.cvsignore
rm -rf %{name}/doc/docbook
-%clean
-rm -rf %{buildroot}
+# << install post
+
+
+
+
+
%files
+%defattr(-,root,root,-)
+# >> files
%defattr(-, root, root)
%doc COPYING README %{name}/eap_testing.txt %{name}/wpa_supplicant.conf
%{_sysconfdir}/dbus-1/system.d/%{name}.conf
@@ -72,3 +109,6 @@
%dir %{_localstatedir}/run/%{name}
%{_mandir}/man8/*
%{_mandir}/man5/*
+# << files
+
+
other changes:
--------------
++++++ 0001-Skip-D-Bus-signals-if-the-dbus_path-is-not-yet-set.patch (new)
--- 0001-Skip-D-Bus-signals-if-the-dbus_path-is-not-yet-set.patch
+++ 0001-Skip-D-Bus-signals-if-the-dbus_path-is-not-yet-set.patch
+From 7cc5995845823e119a2490c3a64c7aef3a3c53e4 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j at w1.fi>
+Date: Sun, 23 May 2010 20:23:11 +0300
+Subject: [PATCH] Skip D-Bus signals if the dbus_path is not yet set
+
+This avoids an invalid D-Bus call during interface initialization.
+The wpa_state change can happen before the D-Bus interface is set up,
+so we must be preparted to handle this early event signal. In theory,
+it should be possible to reorder initialization code to make sure
+D-Bus signals are ready, but that would likely require quite a bit of
+code restructuring, so it looks like a safer option for now is to just
+skip the early event.
+---
+ wpa_supplicant/dbus/dbus_new.c | 3 +++
+ wpa_supplicant/dbus/dbus_old.c | 3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
+index 30c9872..bdfbbac 100644
+--- a/wpa_supplicant/dbus/dbus_new.c
++++ b/wpa_supplicant/dbus/dbus_new.c
+@@ -665,6 +665,9 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
+ WPADBusPropertyAccessor getter;
+ char *prop;
+
++ if (wpa_s->dbus_new_path == NULL)
++ return; /* Skip signal since D-Bus setup is not yet ready */
++
+ switch (property) {
+ case WPAS_DBUS_PROP_AP_SCAN:
+ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_ap_scan;
+diff --git a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c
+index 437a04d..7f25bf0 100644
+--- a/wpa_supplicant/dbus/dbus_old.c
++++ b/wpa_supplicant/dbus/dbus_old.c
+@@ -410,6 +410,9 @@ void wpa_supplicant_dbus_notify_state_change(struct wpa_supplicant *wpa_s,
+ DBusMessage *_signal = NULL;
+ const char *new_state_str, *old_state_str;
+
++ if (wpa_s->dbus_path == NULL)
++ return; /* Skip signal since D-Bus setup is not yet ready */
++
+ /* Do nothing if the control interface is not turned on */
+ if (wpa_s->global == NULL)
+ return;
+--
+1.7.1
+
++++++ bcm-custom_event-0.7.2.patch (new)
--- bcm-custom_event-0.7.2.patch
+++ bcm-custom_event-0.7.2.patch
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index fa49da4..511f613 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -2046,7 +2046,15 @@ enum wpa_event_type {
+ * observed in frames received from the current AP if signal strength
+ * monitoring has been enabled with signal_monitor().
+ */
+- EVENT_SIGNAL_CHANGE
++ EVENT_SIGNAL_CHANGE,
++
++ /**
++ * EVENT_BROADCOM_CUSTOM - Broadcom custom event
++ *
++ * This event is sent when failing to associate while running the
++ * initial scan.
++ */
++ EVENT_BROADCOM_CUSTOM
+ };
+
+
+diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
+index 2614f23..04094ee 100644
+--- a/src/drivers/driver_wext.c
++++ b/src/drivers/driver_wext.c
+@@ -299,6 +299,9 @@ wpa_driver_wext_event_wireless_custom(void *ctx, char *custom)
+ }
+ wpa_supplicant_event(ctx, EVENT_STKSTART, &data);
+ #endif /* CONFIG_PEERKEY */
++ } else if (os_strncmp(custom, "Conn NoNetworks", 15) == 0) {
++ wpa_printf(MSG_DEBUG, "WEXT: Broadcom custom event");
++ wpa_supplicant_event(ctx, EVENT_BROADCOM_CUSTOM, &data);
+ }
+ }
+
+diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
+index 2f3a303..c2fc28a 100644
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
+@@ -1726,6 +1726,15 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+ bgscan_notify_signal_change(
+ wpa_s, data->signal_change.above_threshold);
+ break;
++ case EVENT_BROADCOM_CUSTOM:
++ wpa_printf(MSG_DEBUG, "Broadcom event in state %d",
++ wpa_s->wpa_state);
++ if (wpa_s->wpa_state == WPA_SCANNING) {
++ /* Force scanning */
++ wpa_s->scan_req = 1;
++ wpa_supplicant_req_scan(wpa_s, 0, 0);
++ }
++ break;
+ default:
+ wpa_printf(MSG_INFO, "Unknown event %d", event);
+ break;
++++++ wpa_supplicant-0.7.1.tar.gz -> wpa_supplicant-0.7.2.tar.gz
22085 lines of diff (skipped)
++++++ wpa_supplicant.config
--- wpa_supplicant.config
+++ wpa_supplicant.config
@@ -33,4 +33,4 @@
CONFIG_PKCS12=y
CONFIG_SMARTCARD=y
CONFIG_DEBUG_FILE=y
-
+CONFIG_DRIVER_NL80211=y
++++++ wpa_supplicant.yaml (new)
--- wpa_supplicant.yaml
+++ wpa_supplicant.yaml
+Name: wpa_supplicant
+Summary: WPA/WPA2/IEEE 802.1X Supplicant
+Version: 0.7.2
+Release: 1
+Group: System/Base
+License: BSD
+URL: http://w1.fi/wpa_supplicant/
+Sources:
+ - http://w1.fi/releases/%{name}-%{version}.tar.gz
+ - "%{name}.config"
+Patches:
+ - 0001-Skip-D-Bus-signals-if-the-dbus_path-is-not-yet-set.patch
+ - bcm-custom_event-0.7.2.patch
+Description: |
+ wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support
+ for WPA and WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE 802.1X/WPA
+ component that is used in the client stations. It implements key negotiation
+ with a WPA Authenticator and it controls the roaming and IEEE 802.11
+ authentication/association of the wlan driver.
+PkgBR:
+ - readline
+PkgConfigBR:
+ - openssl
+ - libnl-1
+ - dbus-1
+Configure: none
+Builder: none
More information about the MeeGo-commits
mailing list