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

[Bartłomiej Piotrowski]

    Date: Friday, October 7, 2016 @ 14:53:14
  Author: bpiotrowski
Revision: 277870

upgpkg: wpa_supplicant 1:2.6-1

new upstream release

Modified:
  wpa_supplicant/trunk/PKGBUILD
Deleted:
  wpa_supplicant/trunk/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 |   13 ---------
 PKGBUILD                                                                  |   14 ++--------
 2 files changed, 4 insertions(+), 23 deletions(-)

Deleted: 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	2016-10-07 14:53:06 UTC (rev 277869)
+++ 0001-wpa_supplicant-Do-not-wait-for-monitor-on-P2P-Device-interface.patch	2016-10-07 14:53:14 UTC (rev 277870)
@@ -1,13 +0,0 @@
-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	2016-10-07 14:53:06 UTC (rev 277869)
+++ PKGBUILD	2016-10-07 14:53:14 UTC (rev 277870)
@@ -2,8 +2,8 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=wpa_supplicant
-pkgver=2.5
-pkgrel=3
+pkgver=2.6
+pkgrel=1
 epoch=1
 pkgdesc="A utility providing key negotiation for WPA wireless networks"
 url="http://hostap.epitest.fi/wpa_supplicant"
@@ -13,19 +13,13 @@
 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'
+        config)
+sha256sums=('b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450'
             '5163609e133851dfbbee5982954fab22e45bf2c9093e43eb466d8a2c39f8a012')
 
 prepare() {
   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() {