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

[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.patch	2013-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.witteveen at 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
===================================================================
--- PKGBUILD	2013-11-17 09:22:58 UTC (rev 199840)
+++ PKGBUILD	2013-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: