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

[Florian Pritz]

    Date: Wednesday, June 17, 2015 @ 10:27:48
  Author: bluewind
Revision: 240971

upgpkg: netctl 1.11-1

upstream update

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

-----------------------------------------------------------------+
 0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch |   29 ----------
 PKGBUILD                                                        |   22 ++-----
 2 files changed, 6 insertions(+), 45 deletions(-)

Deleted: 0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch
===================================================================
--- 0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch	2015-06-17 06:18:50 UTC (rev 240970)
+++ 0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch	2015-06-17 08:27:48 UTC (rev 240971)
@@ -1,29 +0,0 @@
-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-06-17 06:18:50 UTC (rev 240970)
+++ PKGBUILD	2015-06-17 08:27:48 UTC (rev 240971)
@@ -1,8 +1,8 @@
 # Maintainer: Jouke Witteveen <j.witteveen at gmail.com>
 
 pkgname=netctl
-pkgver=1.10
-pkgrel=2
+pkgver=1.11
+pkgrel=1
 pkgdesc='Profile based systemd network management'
 url='http://projects.archlinux.org/netctl.git/'
 license=('GPL')
@@ -19,22 +19,12 @@
             'ppp: for PPP connections'
             'openvswitch: for Open vSwitch connections'
            )
-source=(https://sources.archlinux.org/other/packages/netctl/netctl-${pkgver}.tar.xz{,.sig}
-        0001-Redirect-wpa_supplicant-output-in-wpa_start-closes-1.patch)
+source=(ftp://ftp.archlinux.org/other/packages/netctl/netctl-${pkgver}.tar.xz{,.sig})
 arch=('any')
-md5sums=('15e9b126fd15efe4fc814fa18623d76e'
-         'SKIP'
-         '9ed06138ec001be186ef07a1725a4f34')
-validpgpkeys=(CFA6AF15E5C74149FC1D8C086D1655C14CE1C13E)
+md5sums=('1465a0595af16fd88a5f1ecdcebc0f0c'
+         'c6a69063c4eb98099d34cbf19ca206a7')
+validpgpkeys=('CFA6AF15E5C74149FC1D8C086D1655C14CE1C13E')  # Florian Pritz
 
-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