netctl: update to 1.6.

This commit is contained in:
Juan RP 2014-03-11 13:21:48 +01:00
parent b43d583dde
commit 06e69cdf0d
2 changed files with 3 additions and 26 deletions

View file

@ -1,23 +0,0 @@
From 015f975586317cf851319e9616bdccfafdd81741 Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Wed, 05 Mar 2014 22:00:56 +0000
Subject: Fix adding of interfaces
`shift 3` doesn't do anything if there are only 2 parameters.
---
diff --git a/src/lib/network b/src/lib/network
index a875101..0250c3d 100755
--- src/lib/network
+++ src/lib/network
@@ -17,8 +17,7 @@ is_interface() {
# $4...: additional arguments
interface_add() {
local type="$1" name="$2" link="$3"
- shift 3
- ip link add ${link:+link "$link"} name "$name" type "$type" "$@" || return
+ do_debug ip link add ${link:+link "$link"} name "$name" type "$type" "${@:4}" || return
if [[ -x "$PROFILE_DIR/interfaces/$name" ]]; then
source "$PROFILE_DIR/interfaces/$name"
fi
--
cgit v0.9.2-18-g5137

View file

@ -1,7 +1,7 @@
# Template file for 'netctl' # Template file for 'netctl'
pkgname=netctl pkgname=netctl
version=1.5 version=1.6
revision=2 revision=1
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="iproute2 openresolv dhcpcd wpa_supplicant dialog systemd-devel" makedepends="iproute2 openresolv dhcpcd wpa_supplicant dialog systemd-devel"
depends="iproute2 openresolv dhcpcd wpa_supplicant dialog systemd" depends="iproute2 openresolv dhcpcd wpa_supplicant dialog systemd"
@ -14,7 +14,7 @@ maintainer="Ypnose <linuxienATlegtuxDOTorg>"
homepage="http://projects.archlinux.org/netctl.git/" homepage="http://projects.archlinux.org/netctl.git/"
license="GPL" license="GPL"
distfiles="ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${version}.tar.xz" distfiles="ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=44e6ae25ac46f5ea1cbe0d10f10bc4ca54e2c2e1bfb5d03f27936371a01db3b2 checksum=cff07bdf44fd9461b7582946707b171711ba4e29cff378d05cc7e88966f7c07d
do_install() { do_install() {
make PREFIX=/usr DESTDIR=$DESTDIR install make PREFIX=/usr DESTDIR=$DESTDIR install