[arch-commits] Commit in dhcpcd/repos (26 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Sun Jun 2 04:09:22 UTC 2013
Date: Sunday, June 2, 2013 @ 06:09:22
Author: foutrelis
Revision: 186974
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
dhcpcd/repos/testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch
(from rev 186973, dhcpcd/trunk/0001-Set-hostname-via-proc-if-file-is-available.patch)
dhcpcd/repos/testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch
(from rev 186973, dhcpcd/trunk/0001-set-MTU-via-sysfs-if-file-is-available.patch)
dhcpcd/repos/testing-i686/PKGBUILD
(from rev 186973, dhcpcd/trunk/PKGBUILD)
dhcpcd/repos/testing-i686/dhcpcd.service
(from rev 186973, dhcpcd/trunk/dhcpcd.service)
dhcpcd/repos/testing-i686/dhcpcd_.service
(from rev 186973, dhcpcd/trunk/dhcpcd_.service)
dhcpcd/repos/testing-i686/remove_ifconfig.patch
(from rev 186973, dhcpcd/trunk/remove_ifconfig.patch)
dhcpcd/repos/testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch
(from rev 186973, dhcpcd/trunk/0001-Set-hostname-via-proc-if-file-is-available.patch)
dhcpcd/repos/testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch
(from rev 186973, dhcpcd/trunk/0001-set-MTU-via-sysfs-if-file-is-available.patch)
dhcpcd/repos/testing-x86_64/PKGBUILD
(from rev 186973, dhcpcd/trunk/PKGBUILD)
dhcpcd/repos/testing-x86_64/dhcpcd.service
(from rev 186973, dhcpcd/trunk/dhcpcd.service)
dhcpcd/repos/testing-x86_64/dhcpcd_.service
(from rev 186973, dhcpcd/trunk/dhcpcd_.service)
dhcpcd/repos/testing-x86_64/remove_ifconfig.patch
(from rev 186973, dhcpcd/trunk/remove_ifconfig.patch)
Deleted:
dhcpcd/repos/testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch
dhcpcd/repos/testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch
dhcpcd/repos/testing-i686/PKGBUILD
dhcpcd/repos/testing-i686/dhcpcd.conf.d
dhcpcd/repos/testing-i686/dhcpcd.service
dhcpcd/repos/testing-i686/dhcpcd_.service
dhcpcd/repos/testing-i686/remove_ifconfig.patch
dhcpcd/repos/testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch
dhcpcd/repos/testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch
dhcpcd/repos/testing-x86_64/PKGBUILD
dhcpcd/repos/testing-x86_64/dhcpcd.conf.d
dhcpcd/repos/testing-x86_64/dhcpcd.service
dhcpcd/repos/testing-x86_64/dhcpcd_.service
dhcpcd/repos/testing-x86_64/remove_ifconfig.patch
----------------------------------------------------------------------+
/0001-Set-hostname-via-proc-if-file-is-available.patch | 66 +++++
/0001-set-MTU-via-sysfs-if-file-is-available.patch | 122 ++++++++++
/PKGBUILD | 108 ++++++++
/dhcpcd.service | 26 ++
/dhcpcd_.service | 30 ++
/remove_ifconfig.patch | 40 +++
testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch | 33 --
testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch | 61 -----
testing-i686/PKGBUILD | 58 ----
testing-i686/dhcpcd.conf.d | 6
testing-i686/dhcpcd.service | 13 -
testing-i686/dhcpcd_.service | 15 -
testing-i686/remove_ifconfig.patch | 20 -
testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch | 33 --
testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch | 61 -----
testing-x86_64/PKGBUILD | 58 ----
testing-x86_64/dhcpcd.conf.d | 6
testing-x86_64/dhcpcd.service | 13 -
testing-x86_64/dhcpcd_.service | 15 -
testing-x86_64/remove_ifconfig.patch | 20 -
20 files changed, 392 insertions(+), 412 deletions(-)
Deleted: testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch
===================================================================
--- testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,33 +0,0 @@
-From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
-From: Dan McGee <dan at archlinux.org>
-Date: Sun, 19 Jun 2011 16:04:25 -0500
-Subject: [PATCH] Set hostname via /proc if file is available
-
-On Linux, the hostname can be set via this file if available, precluding
-the need for a `hostname` binary.
-
-Signed-off-by: Dan McGee <dan at archlinux.org>
----
- dhcpcd-hooks/30-hostname | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
-index 65d1a13..af94262 100644
---- a/dhcpcd-hooks/30-hostname
-+++ b/dhcpcd-hooks/30-hostname
-@@ -21,7 +21,11 @@ need_hostname()
- try_hostname()
- {
- if valid_domainname "$1"; then
-- hostname "$1"
-+ if [ -w /proc/sys/kernel/hostname ]; then
-+ echo "$1" > /proc/sys/kernel/hostname
-+ else
-+ hostname "$1"
-+ fi
- else
- syslog err "Invalid hostname: $1"
- fi
---
-1.7.5.4
-
Copied: dhcpcd/repos/testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch (from rev 186973, dhcpcd/trunk/0001-Set-hostname-via-proc-if-file-is-available.patch)
===================================================================
--- testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch (rev 0)
+++ testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,33 @@
+From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
+From: Dan McGee <dan at archlinux.org>
+Date: Sun, 19 Jun 2011 16:04:25 -0500
+Subject: [PATCH] Set hostname via /proc if file is available
+
+On Linux, the hostname can be set via this file if available, precluding
+the need for a `hostname` binary.
+
+Signed-off-by: Dan McGee <dan at archlinux.org>
+---
+ dhcpcd-hooks/30-hostname | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
+index 65d1a13..af94262 100644
+--- a/dhcpcd-hooks/30-hostname
++++ b/dhcpcd-hooks/30-hostname
+@@ -21,7 +21,11 @@ need_hostname()
+ try_hostname()
+ {
+ if valid_domainname "$1"; then
+- hostname "$1"
++ if [ -w /proc/sys/kernel/hostname ]; then
++ echo "$1" > /proc/sys/kernel/hostname
++ else
++ hostname "$1"
++ fi
+ else
+ syslog err "Invalid hostname: $1"
+ fi
+--
+1.7.5.4
+
Deleted: testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch
===================================================================
--- testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,61 +0,0 @@
-From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <d at falconindy.com>
-Date: Tue, 21 Jun 2011 09:32:47 -0400
-Subject: [PATCH] set MTU via sysfs if file is available
-
-On Linux, a network interface's MTU can be set by writing to
-/sys/class/net/$interface/mtu, which removes the dependency on ifconfig.
-
-Signed-off-by: Dave Reisner <d at falconindy.com>
----
- dhcpcd-hooks/10-mtu | 4 ++--
- dhcpcd-run-hooks.in | 11 +++++++++++
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu
-index 639697c..8763930 100644
---- a/dhcpcd-hooks/10-mtu
-+++ b/dhcpcd-hooks/10-mtu
-@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then
- elif [ -n "$new_interface_mtu" ] && $if_up; then
- # The smalled MTU dhcpcd can work with is 576
- if [ "$new_interface_mtu" -ge 576 ]; then
-- if ifconfig "$interface" mtu "$new_interface_mtu"; then
-+ if set_mtu "$interface" "$new_interface_mtu"; then
- syslog info "$interface: MTU set to $new_interface_mtu"
- # Save the MTU so we can restore it later
- if [ ! -e "$mtu_dir/$interface" ]; then
-@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then
- # No MTU in this state, so restore the prior MTU
- mtu=$(cat "$mtu_dir/$interface")
- syslog info "$interface: MTU restored to $mtu"
-- ifconfig "$interface" mtu "$mtu"
-+ set_mtu "$interface" "$mtu"
- rm "$mtu_dir/$interface"
- fi
- fi
-diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
-index 0e60338..843f3ca 100644
---- a/dhcpcd-run-hooks.in
-+++ b/dhcpcd-run-hooks.in
-@@ -215,6 +215,17 @@ service_condcommand()
- service_exists $1 && service_status $1 && service_cmd $1 $2
- }
-
-+# Set MTU for an interface
-+set_mtu() {
-+ local interface=$1 mtu=$2
-+
-+ if [ -e /sys/class/net/$interface/mtu ]; then
-+ echo "$mtu" > /sys/class/net/$interface/mtu
-+ else
-+ ifconfig "$interface" mtu "$mtu"
-+ fi
-+}
-+
- # We source each script into this one so that scripts run earlier can
- # remove variables from the environment so later scripts don't see them.
- # Thus, the user can create their dhcpcd.enter/exit-hook script to configure
---
-1.7.5.4
-
Copied: dhcpcd/repos/testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch (from rev 186973, dhcpcd/trunk/0001-set-MTU-via-sysfs-if-file-is-available.patch)
===================================================================
--- testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch (rev 0)
+++ testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,61 @@
+From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <d at falconindy.com>
+Date: Tue, 21 Jun 2011 09:32:47 -0400
+Subject: [PATCH] set MTU via sysfs if file is available
+
+On Linux, a network interface's MTU can be set by writing to
+/sys/class/net/$interface/mtu, which removes the dependency on ifconfig.
+
+Signed-off-by: Dave Reisner <d at falconindy.com>
+---
+ dhcpcd-hooks/10-mtu | 4 ++--
+ dhcpcd-run-hooks.in | 11 +++++++++++
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu
+index 639697c..8763930 100644
+--- a/dhcpcd-hooks/10-mtu
++++ b/dhcpcd-hooks/10-mtu
+@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then
+ elif [ -n "$new_interface_mtu" ] && $if_up; then
+ # The smalled MTU dhcpcd can work with is 576
+ if [ "$new_interface_mtu" -ge 576 ]; then
+- if ifconfig "$interface" mtu "$new_interface_mtu"; then
++ if set_mtu "$interface" "$new_interface_mtu"; then
+ syslog info "$interface: MTU set to $new_interface_mtu"
+ # Save the MTU so we can restore it later
+ if [ ! -e "$mtu_dir/$interface" ]; then
+@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then
+ # No MTU in this state, so restore the prior MTU
+ mtu=$(cat "$mtu_dir/$interface")
+ syslog info "$interface: MTU restored to $mtu"
+- ifconfig "$interface" mtu "$mtu"
++ set_mtu "$interface" "$mtu"
+ rm "$mtu_dir/$interface"
+ fi
+ fi
+diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
+index 0e60338..843f3ca 100644
+--- a/dhcpcd-run-hooks.in
++++ b/dhcpcd-run-hooks.in
+@@ -215,6 +215,17 @@ service_condcommand()
+ service_exists $1 && service_status $1 && service_cmd $1 $2
+ }
+
++# Set MTU for an interface
++set_mtu() {
++ local interface=$1 mtu=$2
++
++ if [ -e /sys/class/net/$interface/mtu ]; then
++ echo "$mtu" > /sys/class/net/$interface/mtu
++ else
++ ifconfig "$interface" mtu "$mtu"
++ fi
++}
++
+ # We source each script into this one so that scripts run earlier can
+ # remove variables from the environment so later scripts don't see them.
+ # Thus, the user can create their dhcpcd.enter/exit-hook script to configure
+--
+1.7.5.4
+
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-i686/PKGBUILD 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tom Killian <tom.archlinux.org>
-# Contributor: Judd Vinet <jvinet.zeroflux.org>
-
-pkgname=dhcpcd
-pkgver=5.6.8
-pkgrel=2
-pkgdesc="RFC2131 compliant DHCP client daemon"
-url="http://roy.marples.name/projects/dhcpcd/"
-arch=('i686' 'x86_64')
-license=('BSD')
-groups=('base')
-depends=('glibc' 'sh')
-provides=('dhcp-client')
-backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
-options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
-source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
- 'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service')
-sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917'
- 'b67b9ce6a2faaca75fea356966a16be2283b7db0'
- '6245b8db7e6f39a0305571726bb693a53901c400'
- 'e49e01041f831281a1cd0c97ca21204e0aa07fda')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # configure variables
- ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
- --rundir=/run
-
- # Build
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # Install Configuration File used in /etc/rc.d/network
- install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
-
- # Install License
- install -d $pkgdir/usr/share/licenses/$pkgname
- awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
- >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
- # Set Options in /etc/dhcpcd.conf
- echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
-
- # install systemd files
- install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd at .service
- install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
-
- # usrmove
- cd "$pkgdir"
- mv sbin usr/bin
-}
Copied: dhcpcd/repos/testing-i686/PKGBUILD (from rev 186973, dhcpcd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Tom Killian <tom.archlinux.org>
+# Contributor: Judd Vinet <jvinet.zeroflux.org>
+
+pkgname=dhcpcd
+pkgver=5.6.8
+pkgrel=3
+pkgdesc="RFC2131 compliant DHCP client daemon"
+url="http://roy.marples.name/projects/dhcpcd/"
+arch=('i686' 'x86_64')
+license=('BSD')
+groups=('base')
+depends=('glibc' 'sh')
+provides=('dhcp-client')
+backup=('etc/dhcpcd.conf')
+options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
+source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
+ 'dhcpcd_.service' 'dhcpcd.service')
+sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917'
+ '6245b8db7e6f39a0305571726bb693a53901c400'
+ 'e49e01041f831281a1cd0c97ca21204e0aa07fda')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # configure variables
+ ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
+ --rundir=/run
+
+ # Build
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # Install License
+ install -d $pkgdir/usr/share/licenses/$pkgname
+ awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
+ >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+ # Set Options in /etc/dhcpcd.conf
+ echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
+
+ # install systemd files
+ install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd at .service
+ install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
+
+ # usrmove
+ cd "$pkgdir"
+ mv sbin usr/bin
+}
Deleted: testing-i686/dhcpcd.conf.d
===================================================================
--- testing-i686/dhcpcd.conf.d 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-i686/dhcpcd.conf.d 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP client daemon
-#
-
-DHCPCD_ARGS="-q"
-
Deleted: testing-i686/dhcpcd.service
===================================================================
--- testing-i686/dhcpcd.service 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-i686/dhcpcd.service 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,13 +0,0 @@
-[Unit]
-Description=dhcpcd on all interfaces
-Wants=network.target
-Before=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpcd.pid
-ExecStart=/sbin/dhcpcd -q -b
-ExecStop=/sbin/dhcpcd -x
-
-[Install]
-WantedBy=multi-user.target
Copied: dhcpcd/repos/testing-i686/dhcpcd.service (from rev 186973, dhcpcd/trunk/dhcpcd.service)
===================================================================
--- testing-i686/dhcpcd.service (rev 0)
+++ testing-i686/dhcpcd.service 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,13 @@
+[Unit]
+Description=dhcpcd on all interfaces
+Wants=network.target
+Before=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpcd.pid
+ExecStart=/sbin/dhcpcd -q -b
+ExecStop=/sbin/dhcpcd -x
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/dhcpcd_.service
===================================================================
--- testing-i686/dhcpcd_.service 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-i686/dhcpcd_.service 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,15 +0,0 @@
-[Unit]
-Description=dhcpcd on %I
-Wants=network.target
-Before=network.target
-BindsTo=sys-subsystem-net-devices-%i.device
-After=sys-subsystem-net-devices-%i.device
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpcd-%I.pid
-ExecStart=/usr/sbin/dhcpcd -q -w %I
-ExecStop=/usr/sbin/dhcpcd -x %I
-
-[Install]
-WantedBy=multi-user.target
Copied: dhcpcd/repos/testing-i686/dhcpcd_.service (from rev 186973, dhcpcd/trunk/dhcpcd_.service)
===================================================================
--- testing-i686/dhcpcd_.service (rev 0)
+++ testing-i686/dhcpcd_.service 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,15 @@
+[Unit]
+Description=dhcpcd on %I
+Wants=network.target
+Before=network.target
+BindsTo=sys-subsystem-net-devices-%i.device
+After=sys-subsystem-net-devices-%i.device
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpcd-%I.pid
+ExecStart=/usr/sbin/dhcpcd -q -w %I
+ExecStop=/usr/sbin/dhcpcd -x %I
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/remove_ifconfig.patch
===================================================================
--- testing-i686/remove_ifconfig.patch 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-i686/remove_ifconfig.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,20 +0,0 @@
---- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100
-+++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100
-@@ -7,7 +7,7 @@
- elif [ -n "$new_interface_mtu" ] && $if_up; then
- # The smalled MTU dhcpcd can work with is 576
- if [ "$new_interface_mtu" -ge 576 ]; then
-- if ifconfig "$interface" mtu "$new_interface_mtu"; then
-+ if ip link set "$interface" mtu "$new_interface_mtu"; then
- syslog info "$interface: MTU set to $new_interface_mtu"
- # Save the MTU so we can restore it later
- if [ ! -e "$mtu_dir/$interface" ]; then
-@@ -21,7 +21,7 @@
- # No MTU in this state, so restore the prior MTU
- mtu=$(cat "$mtu_dir/$interface")
- syslog info "$interface: MTU restored to $mtu"
-- ifconfig "$interface" mtu "$mtu"
-+ ip link set "$interface" mtu "$new_interface_mtu"
- rm "$mtu_dir/$interface"
- fi
- fi
Copied: dhcpcd/repos/testing-i686/remove_ifconfig.patch (from rev 186973, dhcpcd/trunk/remove_ifconfig.patch)
===================================================================
--- testing-i686/remove_ifconfig.patch (rev 0)
+++ testing-i686/remove_ifconfig.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,20 @@
+--- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100
++++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100
+@@ -7,7 +7,7 @@
+ elif [ -n "$new_interface_mtu" ] && $if_up; then
+ # The smalled MTU dhcpcd can work with is 576
+ if [ "$new_interface_mtu" -ge 576 ]; then
+- if ifconfig "$interface" mtu "$new_interface_mtu"; then
++ if ip link set "$interface" mtu "$new_interface_mtu"; then
+ syslog info "$interface: MTU set to $new_interface_mtu"
+ # Save the MTU so we can restore it later
+ if [ ! -e "$mtu_dir/$interface" ]; then
+@@ -21,7 +21,7 @@
+ # No MTU in this state, so restore the prior MTU
+ mtu=$(cat "$mtu_dir/$interface")
+ syslog info "$interface: MTU restored to $mtu"
+- ifconfig "$interface" mtu "$mtu"
++ ip link set "$interface" mtu "$new_interface_mtu"
+ rm "$mtu_dir/$interface"
+ fi
+ fi
Deleted: testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch
===================================================================
--- testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,33 +0,0 @@
-From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
-From: Dan McGee <dan at archlinux.org>
-Date: Sun, 19 Jun 2011 16:04:25 -0500
-Subject: [PATCH] Set hostname via /proc if file is available
-
-On Linux, the hostname can be set via this file if available, precluding
-the need for a `hostname` binary.
-
-Signed-off-by: Dan McGee <dan at archlinux.org>
----
- dhcpcd-hooks/30-hostname | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
-index 65d1a13..af94262 100644
---- a/dhcpcd-hooks/30-hostname
-+++ b/dhcpcd-hooks/30-hostname
-@@ -21,7 +21,11 @@ need_hostname()
- try_hostname()
- {
- if valid_domainname "$1"; then
-- hostname "$1"
-+ if [ -w /proc/sys/kernel/hostname ]; then
-+ echo "$1" > /proc/sys/kernel/hostname
-+ else
-+ hostname "$1"
-+ fi
- else
- syslog err "Invalid hostname: $1"
- fi
---
-1.7.5.4
-
Copied: dhcpcd/repos/testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch (from rev 186973, dhcpcd/trunk/0001-Set-hostname-via-proc-if-file-is-available.patch)
===================================================================
--- testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch (rev 0)
+++ testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,33 @@
+From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
+From: Dan McGee <dan at archlinux.org>
+Date: Sun, 19 Jun 2011 16:04:25 -0500
+Subject: [PATCH] Set hostname via /proc if file is available
+
+On Linux, the hostname can be set via this file if available, precluding
+the need for a `hostname` binary.
+
+Signed-off-by: Dan McGee <dan at archlinux.org>
+---
+ dhcpcd-hooks/30-hostname | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
+index 65d1a13..af94262 100644
+--- a/dhcpcd-hooks/30-hostname
++++ b/dhcpcd-hooks/30-hostname
+@@ -21,7 +21,11 @@ need_hostname()
+ try_hostname()
+ {
+ if valid_domainname "$1"; then
+- hostname "$1"
++ if [ -w /proc/sys/kernel/hostname ]; then
++ echo "$1" > /proc/sys/kernel/hostname
++ else
++ hostname "$1"
++ fi
+ else
+ syslog err "Invalid hostname: $1"
+ fi
+--
+1.7.5.4
+
Deleted: testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch
===================================================================
--- testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,61 +0,0 @@
-From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <d at falconindy.com>
-Date: Tue, 21 Jun 2011 09:32:47 -0400
-Subject: [PATCH] set MTU via sysfs if file is available
-
-On Linux, a network interface's MTU can be set by writing to
-/sys/class/net/$interface/mtu, which removes the dependency on ifconfig.
-
-Signed-off-by: Dave Reisner <d at falconindy.com>
----
- dhcpcd-hooks/10-mtu | 4 ++--
- dhcpcd-run-hooks.in | 11 +++++++++++
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu
-index 639697c..8763930 100644
---- a/dhcpcd-hooks/10-mtu
-+++ b/dhcpcd-hooks/10-mtu
-@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then
- elif [ -n "$new_interface_mtu" ] && $if_up; then
- # The smalled MTU dhcpcd can work with is 576
- if [ "$new_interface_mtu" -ge 576 ]; then
-- if ifconfig "$interface" mtu "$new_interface_mtu"; then
-+ if set_mtu "$interface" "$new_interface_mtu"; then
- syslog info "$interface: MTU set to $new_interface_mtu"
- # Save the MTU so we can restore it later
- if [ ! -e "$mtu_dir/$interface" ]; then
-@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then
- # No MTU in this state, so restore the prior MTU
- mtu=$(cat "$mtu_dir/$interface")
- syslog info "$interface: MTU restored to $mtu"
-- ifconfig "$interface" mtu "$mtu"
-+ set_mtu "$interface" "$mtu"
- rm "$mtu_dir/$interface"
- fi
- fi
-diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
-index 0e60338..843f3ca 100644
---- a/dhcpcd-run-hooks.in
-+++ b/dhcpcd-run-hooks.in
-@@ -215,6 +215,17 @@ service_condcommand()
- service_exists $1 && service_status $1 && service_cmd $1 $2
- }
-
-+# Set MTU for an interface
-+set_mtu() {
-+ local interface=$1 mtu=$2
-+
-+ if [ -e /sys/class/net/$interface/mtu ]; then
-+ echo "$mtu" > /sys/class/net/$interface/mtu
-+ else
-+ ifconfig "$interface" mtu "$mtu"
-+ fi
-+}
-+
- # We source each script into this one so that scripts run earlier can
- # remove variables from the environment so later scripts don't see them.
- # Thus, the user can create their dhcpcd.enter/exit-hook script to configure
---
-1.7.5.4
-
Copied: dhcpcd/repos/testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch (from rev 186973, dhcpcd/trunk/0001-set-MTU-via-sysfs-if-file-is-available.patch)
===================================================================
--- testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch (rev 0)
+++ testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,61 @@
+From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <d at falconindy.com>
+Date: Tue, 21 Jun 2011 09:32:47 -0400
+Subject: [PATCH] set MTU via sysfs if file is available
+
+On Linux, a network interface's MTU can be set by writing to
+/sys/class/net/$interface/mtu, which removes the dependency on ifconfig.
+
+Signed-off-by: Dave Reisner <d at falconindy.com>
+---
+ dhcpcd-hooks/10-mtu | 4 ++--
+ dhcpcd-run-hooks.in | 11 +++++++++++
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu
+index 639697c..8763930 100644
+--- a/dhcpcd-hooks/10-mtu
++++ b/dhcpcd-hooks/10-mtu
+@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then
+ elif [ -n "$new_interface_mtu" ] && $if_up; then
+ # The smalled MTU dhcpcd can work with is 576
+ if [ "$new_interface_mtu" -ge 576 ]; then
+- if ifconfig "$interface" mtu "$new_interface_mtu"; then
++ if set_mtu "$interface" "$new_interface_mtu"; then
+ syslog info "$interface: MTU set to $new_interface_mtu"
+ # Save the MTU so we can restore it later
+ if [ ! -e "$mtu_dir/$interface" ]; then
+@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then
+ # No MTU in this state, so restore the prior MTU
+ mtu=$(cat "$mtu_dir/$interface")
+ syslog info "$interface: MTU restored to $mtu"
+- ifconfig "$interface" mtu "$mtu"
++ set_mtu "$interface" "$mtu"
+ rm "$mtu_dir/$interface"
+ fi
+ fi
+diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
+index 0e60338..843f3ca 100644
+--- a/dhcpcd-run-hooks.in
++++ b/dhcpcd-run-hooks.in
+@@ -215,6 +215,17 @@ service_condcommand()
+ service_exists $1 && service_status $1 && service_cmd $1 $2
+ }
+
++# Set MTU for an interface
++set_mtu() {
++ local interface=$1 mtu=$2
++
++ if [ -e /sys/class/net/$interface/mtu ]; then
++ echo "$mtu" > /sys/class/net/$interface/mtu
++ else
++ ifconfig "$interface" mtu "$mtu"
++ fi
++}
++
+ # We source each script into this one so that scripts run earlier can
+ # remove variables from the environment so later scripts don't see them.
+ # Thus, the user can create their dhcpcd.enter/exit-hook script to configure
+--
+1.7.5.4
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-x86_64/PKGBUILD 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tom Killian <tom.archlinux.org>
-# Contributor: Judd Vinet <jvinet.zeroflux.org>
-
-pkgname=dhcpcd
-pkgver=5.6.8
-pkgrel=2
-pkgdesc="RFC2131 compliant DHCP client daemon"
-url="http://roy.marples.name/projects/dhcpcd/"
-arch=('i686' 'x86_64')
-license=('BSD')
-groups=('base')
-depends=('glibc' 'sh')
-provides=('dhcp-client')
-backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
-options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
-source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
- 'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service')
-sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917'
- 'b67b9ce6a2faaca75fea356966a16be2283b7db0'
- '6245b8db7e6f39a0305571726bb693a53901c400'
- 'e49e01041f831281a1cd0c97ca21204e0aa07fda')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # configure variables
- ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
- --rundir=/run
-
- # Build
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # Install Configuration File used in /etc/rc.d/network
- install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
-
- # Install License
- install -d $pkgdir/usr/share/licenses/$pkgname
- awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
- >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
- # Set Options in /etc/dhcpcd.conf
- echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
-
- # install systemd files
- install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd at .service
- install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
-
- # usrmove
- cd "$pkgdir"
- mv sbin usr/bin
-}
Copied: dhcpcd/repos/testing-x86_64/PKGBUILD (from rev 186973, dhcpcd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Tom Killian <tom.archlinux.org>
+# Contributor: Judd Vinet <jvinet.zeroflux.org>
+
+pkgname=dhcpcd
+pkgver=5.6.8
+pkgrel=3
+pkgdesc="RFC2131 compliant DHCP client daemon"
+url="http://roy.marples.name/projects/dhcpcd/"
+arch=('i686' 'x86_64')
+license=('BSD')
+groups=('base')
+depends=('glibc' 'sh')
+provides=('dhcp-client')
+backup=('etc/dhcpcd.conf')
+options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
+source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
+ 'dhcpcd_.service' 'dhcpcd.service')
+sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917'
+ '6245b8db7e6f39a0305571726bb693a53901c400'
+ 'e49e01041f831281a1cd0c97ca21204e0aa07fda')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # configure variables
+ ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
+ --rundir=/run
+
+ # Build
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # Install License
+ install -d $pkgdir/usr/share/licenses/$pkgname
+ awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
+ >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+ # Set Options in /etc/dhcpcd.conf
+ echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
+
+ # install systemd files
+ install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd at .service
+ install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
+
+ # usrmove
+ cd "$pkgdir"
+ mv sbin usr/bin
+}
Deleted: testing-x86_64/dhcpcd.conf.d
===================================================================
--- testing-x86_64/dhcpcd.conf.d 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-x86_64/dhcpcd.conf.d 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP client daemon
-#
-
-DHCPCD_ARGS="-q"
-
Deleted: testing-x86_64/dhcpcd.service
===================================================================
--- testing-x86_64/dhcpcd.service 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-x86_64/dhcpcd.service 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,13 +0,0 @@
-[Unit]
-Description=dhcpcd on all interfaces
-Wants=network.target
-Before=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpcd.pid
-ExecStart=/sbin/dhcpcd -q -b
-ExecStop=/sbin/dhcpcd -x
-
-[Install]
-WantedBy=multi-user.target
Copied: dhcpcd/repos/testing-x86_64/dhcpcd.service (from rev 186973, dhcpcd/trunk/dhcpcd.service)
===================================================================
--- testing-x86_64/dhcpcd.service (rev 0)
+++ testing-x86_64/dhcpcd.service 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,13 @@
+[Unit]
+Description=dhcpcd on all interfaces
+Wants=network.target
+Before=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpcd.pid
+ExecStart=/sbin/dhcpcd -q -b
+ExecStop=/sbin/dhcpcd -x
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/dhcpcd_.service
===================================================================
--- testing-x86_64/dhcpcd_.service 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-x86_64/dhcpcd_.service 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,15 +0,0 @@
-[Unit]
-Description=dhcpcd on %I
-Wants=network.target
-Before=network.target
-BindsTo=sys-subsystem-net-devices-%i.device
-After=sys-subsystem-net-devices-%i.device
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpcd-%I.pid
-ExecStart=/usr/sbin/dhcpcd -q -w %I
-ExecStop=/usr/sbin/dhcpcd -x %I
-
-[Install]
-WantedBy=multi-user.target
Copied: dhcpcd/repos/testing-x86_64/dhcpcd_.service (from rev 186973, dhcpcd/trunk/dhcpcd_.service)
===================================================================
--- testing-x86_64/dhcpcd_.service (rev 0)
+++ testing-x86_64/dhcpcd_.service 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,15 @@
+[Unit]
+Description=dhcpcd on %I
+Wants=network.target
+Before=network.target
+BindsTo=sys-subsystem-net-devices-%i.device
+After=sys-subsystem-net-devices-%i.device
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpcd-%I.pid
+ExecStart=/usr/sbin/dhcpcd -q -w %I
+ExecStop=/usr/sbin/dhcpcd -x %I
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/remove_ifconfig.patch
===================================================================
--- testing-x86_64/remove_ifconfig.patch 2013-06-02 04:08:56 UTC (rev 186973)
+++ testing-x86_64/remove_ifconfig.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -1,20 +0,0 @@
---- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100
-+++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100
-@@ -7,7 +7,7 @@
- elif [ -n "$new_interface_mtu" ] && $if_up; then
- # The smalled MTU dhcpcd can work with is 576
- if [ "$new_interface_mtu" -ge 576 ]; then
-- if ifconfig "$interface" mtu "$new_interface_mtu"; then
-+ if ip link set "$interface" mtu "$new_interface_mtu"; then
- syslog info "$interface: MTU set to $new_interface_mtu"
- # Save the MTU so we can restore it later
- if [ ! -e "$mtu_dir/$interface" ]; then
-@@ -21,7 +21,7 @@
- # No MTU in this state, so restore the prior MTU
- mtu=$(cat "$mtu_dir/$interface")
- syslog info "$interface: MTU restored to $mtu"
-- ifconfig "$interface" mtu "$mtu"
-+ ip link set "$interface" mtu "$new_interface_mtu"
- rm "$mtu_dir/$interface"
- fi
- fi
Copied: dhcpcd/repos/testing-x86_64/remove_ifconfig.patch (from rev 186973, dhcpcd/trunk/remove_ifconfig.patch)
===================================================================
--- testing-x86_64/remove_ifconfig.patch (rev 0)
+++ testing-x86_64/remove_ifconfig.patch 2013-06-02 04:09:22 UTC (rev 186974)
@@ -0,0 +1,20 @@
+--- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100
++++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100
+@@ -7,7 +7,7 @@
+ elif [ -n "$new_interface_mtu" ] && $if_up; then
+ # The smalled MTU dhcpcd can work with is 576
+ if [ "$new_interface_mtu" -ge 576 ]; then
+- if ifconfig "$interface" mtu "$new_interface_mtu"; then
++ if ip link set "$interface" mtu "$new_interface_mtu"; then
+ syslog info "$interface: MTU set to $new_interface_mtu"
+ # Save the MTU so we can restore it later
+ if [ ! -e "$mtu_dir/$interface" ]; then
+@@ -21,7 +21,7 @@
+ # No MTU in this state, so restore the prior MTU
+ mtu=$(cat "$mtu_dir/$interface")
+ syslog info "$interface: MTU restored to $mtu"
+- ifconfig "$interface" mtu "$mtu"
++ ip link set "$interface" mtu "$new_interface_mtu"
+ rm "$mtu_dir/$interface"
+ fi
+ fi
More information about the arch-commits
mailing list