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

[Evangelos Foutras]

    Date: Sunday, April 26, 2015 @ 14:03:42
  Author: foutrelis
Revision: 238045

upgpkg: netctl 1.10-2

Fix wifi-menu to work with wpa_supplicant 2.4.

Added:
  netctl/trunk/0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch
Modified:
  netctl/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch |   29 ++++++++++
 PKGBUILD                                                        |   16 ++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

Added: 0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch
===================================================================
--- 0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch	                        (rev 0)
+++ 0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch	2015-04-26 12:03:42 UTC (rev 238045)
@@ -0,0 +1,29 @@
+From f87ee53ca82e270e6d3cbea8e5672b068e450d79 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Sun, 26 Apr 2015 10:54:34 +0300
+Subject: [PATCH] Redirect wpa_supplicant output in wpa_start() (closes #112)
+
+wpa_supplicant>=2.4 sets stdout to be line-buffered. This breaks
+wpa_supplicant_scan() since the startup message from wpa_supplicant
+("Successfully initialized wpa_supplicant") gets printed before the
+essids filename.
+---
+ src/lib/wpa | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/wpa b/src/lib/wpa
+index e8ce8b1..b5fda8a 100644
+--- a/src/lib/wpa
++++ b/src/lib/wpa
+@@ -80,7 +80,7 @@ wpa_start() {
+     fi
+ 
+     do_debug wpa_supplicant -B -P "$pidfile" -i "$interface" -D "$driver" \
+-                            "$configuration" $WPAOptions
++                            "$configuration" $WPAOptions > /dev/null
+ 
+     # Wait up to one second for the pid file to appear
+     if ! timeout_wait 1 '[[ -f $pidfile ]]'; then
+-- 
+2.3.6
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-26 10:45:08 UTC (rev 238044)
+++ PKGBUILD	2015-04-26 12:03:42 UTC (rev 238045)
@@ -2,7 +2,7 @@
 
 pkgname=netctl
 pkgver=1.10
-pkgrel=1
+pkgrel=2
 pkgdesc='Profile based systemd network management'
 url='http://projects.archlinux.org/netctl.git/'
 license=('GPL')
@@ -19,12 +19,22 @@
             'ppp: for PPP connections'
             'openvswitch: for Open vSwitch connections'
            )
-source=(https://sources.archlinux.org/other/packages/netctl/netctl-${pkgver}.tar.xz{,.sig})
+source=(https://sources.archlinux.org/other/packages/netctl/netctl-${pkgver}.tar.xz{,.sig}
+        0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch)
 arch=('any')
 md5sums=('15e9b126fd15efe4fc814fa18623d76e'
-         '03be68cfc9c015cf5f97c878c898d883')
+         'SKIP'
+         '9ed06138ec001be186ef07a1725a4f34')
 validpgpkeys=(CFA6AF15E5C74149FC1D8C086D1655C14CE1C13E)
 
+prepare() {
+  cd "$srcdir/netctl-${pkgver}"
+
+  # Fix wifi-menu to work with wpa_supplicant 2.4
+  # https://github.com/joukewitteveen/netctl/issues/112
+  patch -Np1 -i ../0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch
+}
+
 package() {
   cd "$srcdir/netctl-${pkgver}"
   make DESTDIR="$pkgdir" install