[arch-commits] Commit in wpa_supplicant/trunk (2 files)

Evangelos Foutras foutrelis at archlinux.org
Sun Dec 27 13:33:21 UTC 2015


    Date: Sunday, December 27, 2015 @ 14:33:20
  Author: foutrelis
Revision: 257299

upgpkg: wpa_supplicant 1:2.5-2

Fix issue that was preventing netctl-auto from working (FS#44731).

Added:
  wpa_supplicant/trunk/0001-wpa_supplicant-Do-not-wait-for-monitor-on-P2P-Device-interface.patch
Modified:
  wpa_supplicant/trunk/PKGBUILD

---------------------------------------------------------------------------+
 0001-wpa_supplicant-Do-not-wait-for-monitor-on-P2P-Device-interface.patch |   13 ++++++++++
 PKGBUILD                                                                  |   10 ++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

Added: 0001-wpa_supplicant-Do-not-wait-for-monitor-on-P2P-Device-interface.patch
===================================================================
--- 0001-wpa_supplicant-Do-not-wait-for-monitor-on-P2P-Device-interface.patch	                        (rev 0)
+++ 0001-wpa_supplicant-Do-not-wait-for-monitor-on-P2P-Device-interface.patch	2015-12-27 13:33:20 UTC (rev 257299)
@@ -0,0 +1,13 @@
+diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
+index 29683bc..e588992 100644
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -5227,7 +5227,7 @@ int wpa_supplicant_run(struct wpa_global *global)
+ 
+ 	if (global->params.wait_for_monitor) {
+ 		for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next)
+-			if (wpa_s->ctrl_iface)
++			if (wpa_s->ctrl_iface && !wpa_s->p2p_mgmt)
+ 				wpa_supplicant_ctrl_iface_wait(
+ 					wpa_s->ctrl_iface);
+ 	}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-27 05:59:37 UTC (rev 257298)
+++ PKGBUILD	2015-12-27 13:33:20 UTC (rev 257299)
@@ -3,7 +3,7 @@
 
 pkgname=wpa_supplicant
 pkgver=2.5
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A utility providing key negotiation for WPA wireless networks"
 url="http://hostap.epitest.fi/wpa_supplicant"
@@ -13,13 +13,19 @@
 license=('GPL')
 backup=('etc/wpa_supplicant/wpa_supplicant.conf')
 source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz"
+	0001-wpa_supplicant-Do-not-wait-for-monitor-on-P2P-Device-interface.patch
 	config)
 sha256sums=('cce55bae483b364eae55c35ba567c279be442ed8bab5b80a3c7fb0d057b9b316'
+            '00526474954fb174b7a3a130fd814954ddc76103e110429672ea838bc335d2b9'
             '5163609e133851dfbbee5982954fab22e45bf2c9093e43eb466d8a2c39f8a012')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}/"
+  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
   cp "${srcdir}/config" ./.config
+
+  # http://lists.infradead.org/pipermail/hostap/2015-December/034409.html
+  # http://patchwork.ozlabs.org/patch/561146/
+  patch -Np2 -i "$srcdir/0001-wpa_supplicant-Do-not-wait-for-monitor-on-P2P-Device-interface.patch"
 }
 
 build() {



More information about the arch-commits mailing list