Date: Saturday, July 7, 2012 @ 03:20:57 Author: bluewind Revision: 163108
db-move: moved netcfg from [testing] to [core] ( any) Added: netcfg/repos/core-any/PKGBUILD (from rev 163107, netcfg/repos/testing-any/PKGBUILD) netcfg/repos/core-any/git-fixes.patch (from rev 163107, netcfg/repos/testing-any/git-fixes.patch) Deleted: netcfg/repos/core-any/PKGBUILD netcfg/repos/testing-any/ -----------------+ PKGBUILD | 69 ++++++++++++++++++++++++++++-------------------------- git-fixes.patch | 24 ++++++++++++++++++ 2 files changed, 60 insertions(+), 33 deletions(-) Deleted: core-any/PKGBUILD =================================================================== --- core-any/PKGBUILD 2012-07-07 06:45:30 UTC (rev 163107) +++ core-any/PKGBUILD 2012-07-07 07:20:57 UTC (rev 163108) @@ -1,33 +0,0 @@ -# Maintainer: Jouke Witteveen <j.wittev...@gmail.com> - -pkgname=netcfg -pkgver=2.8.5 -pkgrel=1 -pkgdesc="Network configuration and profile scripts" -url="http://archlinux.org/netcfg/" -license=("BSD") -backup=(etc/iftab etc/conf.d/netcfg) -depends=("coreutils" "dhcpcd" "iproute2") -#makedepends=('asciidoc') # The source tarball includes pre-built documentation. -optdepends=('dialog: for the menu based profile and wifi selectors' - 'wpa_supplicant: for wireless networking support' - 'ifplugd: for automatic wired connections through rc.d/net-auto-wired' - 'wpa_actiond: for automatic wireless connections through rc.d/net-auto-wireless' - 'wireless_tools: for interface renaming through net-rename' - 'ifenslave: for bond connections' - 'bridge-utils: for bridge connections' - ) -source=(ftp://ftp.archlinux.org/other/netcfg/netcfg-${pkgver}.tar.xz) -arch=(any) -md5sums=('61019de518f430f421a6353ddb652549') - -package() { - cd "$srcdir/netcfg-${pkgver}" - make DESTDIR="$pkgdir" install - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/netcfg/LICENSE" - - # Shell Completion - install -D -m644 contrib/bash-completion "$pkgdir/usr/share/bash-completion/completions/netcfg" - install -D -m644 contrib/zsh-completion "$pkgdir/usr/share/zsh/site-functions/_netcfg" -} - Copied: netcfg/repos/core-any/PKGBUILD (from rev 163107, netcfg/repos/testing-any/PKGBUILD) =================================================================== --- core-any/PKGBUILD (rev 0) +++ core-any/PKGBUILD 2012-07-07 07:20:57 UTC (rev 163108) @@ -0,0 +1,36 @@ +# Maintainer: Jouke Witteveen <j.wittev...@gmail.com> + +pkgname=netcfg +pkgver=2.8.5 +pkgrel=3 +pkgdesc="Network configuration and profile scripts" +url="http://archlinux.org/netcfg/" +license=("BSD") +backup=(etc/iftab etc/conf.d/netcfg) +depends=("coreutils" "dhcpcd" "iproute2") +#makedepends=('asciidoc') # The source tarball includes pre-built documentation. +optdepends=('dialog: for the menu based profile and wifi selectors' + 'wpa_supplicant: for wireless networking support' + 'ifplugd: for automatic wired connections through rc.d/net-auto-wired' + 'wpa_actiond: for automatic wireless connections through rc.d/net-auto-wireless' + 'wireless_tools: for interface renaming through net-rename' + 'ifenslave: for bond connections' + 'bridge-utils: for bridge connections' + ) +source=(ftp://ftp.archlinux.org/other/netcfg/netcfg-${pkgver}.tar.xz git-fixes.patch) +arch=(any) +md5sums=('61019de518f430f421a6353ddb652549' 'c511a6844769bac9e418644b51315cd2') + +package() { + cd "$srcdir/netcfg-${pkgver}" + + patch -p1 -i "$srcdir/git-fixes.patch" + + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/netcfg/LICENSE" + + # Shell Completion + install -D -m644 contrib/bash-completion "$pkgdir/usr/share/bash-completion/completions/netcfg" + install -D -m644 contrib/zsh-completion "$pkgdir/usr/share/zsh/site-functions/_netcfg" +} + Copied: netcfg/repos/core-any/git-fixes.patch (from rev 163107, netcfg/repos/testing-any/git-fixes.patch) =================================================================== --- core-any/git-fixes.patch (rev 0) +++ core-any/git-fixes.patch 2012-07-07 07:20:57 UTC (rev 163108) @@ -0,0 +1,24 @@ +commit 9eb995ef8a34d552077b2af02787574a6534b1e2 +Author: Tasos Latsas <tlatsas2...@gmail.com> +Date: Sat Jun 30 11:07:45 2012 +0300 + + wifi-menu: fix name of wireless key variable + + Dialog returns the wireless key in variable $key. Uppercase + 'KEY' is used later to create the profile. + + Signed-off-by: Tasos Latsas <tlatsas2...@gmail.com> + +diff --git a/scripts/wifi-menu b/scripts/wifi-menu +index e182f25..ba8eb47 100755 +--- a/scripts/wifi-menu ++++ b/scripts/wifi-menu +@@ -115,7 +115,7 @@ create_profile() + [[ "$OBSCURE" ]] && box="--insecure --passwordbox" || box="--inputbox" + msg="Enter $security security key for\n'$1'" + key=$(dialog $box "$msg" 10 40 --stdout) || return $? +- [[ "${#KEY}" -ge 8 && "${#KEY}" -le 63 ]] || return 4 ++ [[ "${#key}" -ge 8 && "${#key}" -le 63 ]] || return 4 + if [[ "$OBSCURE" ]]; then + key=$(wpa_passphrase "$1" "$key" | grep -m 1 "^[[:space:]]*psk=") + key="KEY=${key#*psk=}"