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

2015-06-17 Thread 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 evange...@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
===
--- PKGBUILD2015-06-17 06:18:50 UTC (rev 240970)
+++ PKGBUILD2015-06-17 08:27:48 UTC (rev 240971)
@@ -1,8 +1,8 @@
 # Maintainer: Jouke Witteveen j.wittev...@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


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

2015-04-26 Thread 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 evange...@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
===
--- PKGBUILD2015-04-26 10:45:08 UTC (rev 238044)
+++ PKGBUILD2015-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


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

2013-11-17 Thread Florian Pritz
Date: Sunday, November 17, 2013 @ 10:39:00
  Author: bluewind
Revision: 199841

upgpkg: netctl 1.4-2

hotfix for wifi-menu -o generated wpa profiles

Added:
  netctl/trunk/0001-Fix-typo-in-detection-of-hex-keys.patch
Modified:
  netctl/trunk/PKGBUILD

--+
 0001-Fix-typo-in-detection-of-hex-keys.patch |   35 +
 PKGBUILD |   24 +++--
 2 files changed, 51 insertions(+), 8 deletions(-)

Added: 0001-Fix-typo-in-detection-of-hex-keys.patch
===
--- 0001-Fix-typo-in-detection-of-hex-keys.patch
(rev 0)
+++ 0001-Fix-typo-in-detection-of-hex-keys.patch2013-11-17 09:39:00 UTC 
(rev 199841)
@@ -0,0 +1,35 @@
+From 3dc6d75f5fa4813fe5c998b13582912fffd88159 Mon Sep 17 00:00:00 2001
+From: Jouke Witteveen j.wittev...@gmail.com
+Date: Sat, 16 Nov 2013 23:12:11 +0100
+Subject: [PATCH] Fix typo in detection of hex keys
+
+Errata to f5065. $Key has a capital.
+---
+ src/lib/wpa | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/wpa b/src/lib/wpa
+index 6f21c0f..ff869db 100644
+--- a/src/lib/wpa
 b/src/lib/wpa
+@@ -218,7 +218,7 @@ wpa_make_config_block() {
+   wep)
+ echo key_mgmt=NONE
+ echo wep_tx_keyidx=0
+-if (( ${#Key} % 2 == 0 ))  [[ $key = +([[:xdigit:]]) ]]; then
++if (( ${#Key} % 2 == 0 ))  [[ $Key = +([[:xdigit:]]) ]]; then
+ echo wep_key0=$Key
+ else
+ echo wep_key0=$(wpa_quote $Key)
+@@ -226,7 +226,7 @@ wpa_make_config_block() {
+   ;;
+   wpa)
+ echo proto=RSN WPA
+-if [[ ${#key} -eq 64  $key = +([[:xdigit:]]) ]]; then
++if [[ ${#Key} -eq 64  $Key = +([[:xdigit:]]) ]]; then
+ echo psk=$Key
+ else
+ echo psk=$(wpa_quote $Key)
+-- 
+1.8.4.2
+

Modified: PKGBUILD
===
--- PKGBUILD2013-11-17 09:22:58 UTC (rev 199840)
+++ PKGBUILD2013-11-17 09:39:00 UTC (rev 199841)
@@ -2,7 +2,7 @@
 
 pkgname=netctl
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Profile based systemd network management'
 url='http://projects.archlinux.org/netctl.git/'
 license=('GPL')
@@ -19,17 +19,25 @@
 'ifenslave: for bond connections'
 'ppp: for pppoe connections'
)
-source=(ftp://ftp.archlinux.org/other/packages/netctl/netctl-${pkgver}.tar.xz{,.sig})
+source=(ftp://ftp.archlinux.org/other/packages/netctl/netctl-${pkgver}.tar.xz{,.sig}
+0001-Fix-typo-in-detection-of-hex-keys.patch)
 arch=('any')
 md5sums=('825f07c432bff1de0254ab800f22cb61'
- '868fa2e0f80911a63b0b91b8b73978e5')
+ 'SKIP'
+ '951b058a3c9879b77a2e0d211bb03111')
 
+ prepare() {
+   cd $srcdir/netctl-${pkgver}
+   patch -p1 -i $srcdir/0001-Fix-typo-in-detection-of-hex-keys.patch
+ }
+
 package() {
-  cd $srcdir/netctl-${pkgver}
-  make DESTDIR=$pkgdir install
+   cd $srcdir/netctl-${pkgver}
+   make DESTDIR=$pkgdir install
 
-  # Shell Completion
-  install -D -m644 contrib/bash-completion 
$pkgdir/usr/share/bash-completion/completions/netctl
-  install -D -m644 contrib/zsh-completion 
$pkgdir/usr/share/zsh/site-functions/_netctl
+   # Shell Completion
+   install -D -m644 contrib/bash-completion 
$pkgdir/usr/share/bash-completion/completions/netctl
+   install -D -m644 contrib/zsh-completion 
$pkgdir/usr/share/zsh/site-functions/_netctl
 }
 
+# vim: set noet: