Date: Monday, January 7, 2013 @ 16:57:19 Author: ronald Revision: 174850
db-move: moved dhcpcd from [testing] to [core] (i686, x86_64) Added: dhcpcd/repos/core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch (from rev 174849, dhcpcd/repos/testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch) dhcpcd/repos/core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch (from rev 174849, dhcpcd/repos/testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch) dhcpcd/repos/core-i686/PKGBUILD (from rev 174849, dhcpcd/repos/testing-i686/PKGBUILD) dhcpcd/repos/core-i686/dhcpcd.conf.d (from rev 174849, dhcpcd/repos/testing-i686/dhcpcd.conf.d) dhcpcd/repos/core-i686/dhcpcd.service (from rev 174849, dhcpcd/repos/testing-i686/dhcpcd.service) dhcpcd/repos/core-i686/dhcpcd_.service (from rev 174849, dhcpcd/repos/testing-i686/dhcpcd_.service) dhcpcd/repos/core-i686/remove_ifconfig.patch (from rev 174849, dhcpcd/repos/testing-i686/remove_ifconfig.patch) dhcpcd/repos/core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch (from rev 174849, dhcpcd/repos/testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch) dhcpcd/repos/core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch (from rev 174849, dhcpcd/repos/testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch) dhcpcd/repos/core-x86_64/PKGBUILD (from rev 174849, dhcpcd/repos/testing-x86_64/PKGBUILD) dhcpcd/repos/core-x86_64/dhcpcd.conf.d (from rev 174849, dhcpcd/repos/testing-x86_64/dhcpcd.conf.d) dhcpcd/repos/core-x86_64/dhcpcd.service (from rev 174849, dhcpcd/repos/testing-x86_64/dhcpcd.service) dhcpcd/repos/core-x86_64/dhcpcd_.service (from rev 174849, dhcpcd/repos/testing-x86_64/dhcpcd_.service) dhcpcd/repos/core-x86_64/remove_ifconfig.patch (from rev 174849, dhcpcd/repos/testing-x86_64/remove_ifconfig.patch) Deleted: dhcpcd/repos/core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch dhcpcd/repos/core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch dhcpcd/repos/core-i686/PKGBUILD dhcpcd/repos/core-i686/dhcpcd.conf.d dhcpcd/repos/core-i686/dhcpcd.service dhcpcd/repos/core-i686/dhcpcd_.service dhcpcd/repos/core-i686/remove_ifconfig.patch dhcpcd/repos/core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch dhcpcd/repos/core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch dhcpcd/repos/core-x86_64/PKGBUILD dhcpcd/repos/core-x86_64/dhcpcd.conf.d dhcpcd/repos/core-x86_64/dhcpcd.service dhcpcd/repos/core-x86_64/dhcpcd_.service dhcpcd/repos/core-x86_64/remove_ifconfig.patch dhcpcd/repos/testing-i686/ dhcpcd/repos/testing-x86_64/ -------------------------------------------------------------------+ core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch | 66 ++--- core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch | 122 +++++----- core-i686/PKGBUILD | 114 ++++----- core-i686/dhcpcd.conf.d | 12 core-i686/dhcpcd.service | 26 +- core-i686/dhcpcd_.service | 30 +- core-i686/remove_ifconfig.patch | 40 +-- core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch | 66 ++--- core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch | 122 +++++----- core-x86_64/PKGBUILD | 114 ++++----- core-x86_64/dhcpcd.conf.d | 12 core-x86_64/dhcpcd.service | 26 +- core-x86_64/dhcpcd_.service | 30 +- core-x86_64/remove_ifconfig.patch | 40 +-- 14 files changed, 410 insertions(+), 410 deletions(-) Deleted: core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch =================================================================== --- core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-01-07 21:45:18 UTC (rev 174849) +++ core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -1,33 +0,0 @@ -From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 -From: Dan McGee <d...@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 <d...@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/core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch (from rev 174849, dhcpcd/repos/testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch) =================================================================== --- core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch (rev 0) +++ core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -0,0 +1,33 @@ +From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 +From: Dan McGee <d...@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 <d...@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: core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch =================================================================== --- core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-01-07 21:45:18 UTC (rev 174849) +++ core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -1,61 +0,0 @@ -From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <d...@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...@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/core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch (from rev 174849, dhcpcd/repos/testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch) =================================================================== --- core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch (rev 0) +++ core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -0,0 +1,61 @@ +From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d...@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...@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: core-i686/PKGBUILD =================================================================== --- core-i686/PKGBUILD 2013-01-07 21:45:18 UTC (rev 174849) +++ core-i686/PKGBUILD 2013-01-07 21:57:19 UTC (rev 174850) @@ -1,57 +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.3 -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') -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=('d64b589d15821aa5851fda81078183cc61a3e45a' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0' - 'd5304eb00828d4ee2fd879addce473ea09c47635' - '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 - - # Create Binary Symlink - install -d ${pkgdir}/usr/sbin - ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd - - # 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@.service - install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543 -} Copied: dhcpcd/repos/core-i686/PKGBUILD (from rev 174849, dhcpcd/repos/testing-i686/PKGBUILD) =================================================================== --- core-i686/PKGBUILD (rev 0) +++ core-i686/PKGBUILD 2013-01-07 21:57:19 UTC (rev 174850) @@ -0,0 +1,57 @@ +# $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.4 +pkgrel=1 +pkgdesc="RFC2131 compliant DHCP client daemon" +url="http://roy.marples.name/projects/dhcpcd/" +arch=('i686' 'x86_64') +license=('BSD') +groups=('base') +depends=('glibc' 'sh') +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=('18a09d8fabf926e5d32bd6315b40d77247b11596' + 'b67b9ce6a2faaca75fea356966a16be2283b7db0' + 'd5304eb00828d4ee2fd879addce473ea09c47635' + '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 + + # Create Binary Symlink + install -d ${pkgdir}/usr/sbin + ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd + + # 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@.service + install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543 +} Deleted: core-i686/dhcpcd.conf.d =================================================================== --- core-i686/dhcpcd.conf.d 2013-01-07 21:45:18 UTC (rev 174849) +++ core-i686/dhcpcd.conf.d 2013-01-07 21:57:19 UTC (rev 174850) @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP client daemon -# - -DHCPCD_ARGS="-q" - Copied: dhcpcd/repos/core-i686/dhcpcd.conf.d (from rev 174849, dhcpcd/repos/testing-i686/dhcpcd.conf.d) =================================================================== --- core-i686/dhcpcd.conf.d (rev 0) +++ core-i686/dhcpcd.conf.d 2013-01-07 21:57:19 UTC (rev 174850) @@ -0,0 +1,6 @@ +# +# Arguments to be passed to the DHCP client daemon +# + +DHCPCD_ARGS="-q" + Deleted: core-i686/dhcpcd.service =================================================================== --- core-i686/dhcpcd.service 2013-01-07 21:45:18 UTC (rev 174849) +++ core-i686/dhcpcd.service 2013-01-07 21:57:19 UTC (rev 174850) @@ -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/core-i686/dhcpcd.service (from rev 174849, dhcpcd/repos/testing-i686/dhcpcd.service) =================================================================== --- core-i686/dhcpcd.service (rev 0) +++ core-i686/dhcpcd.service 2013-01-07 21:57:19 UTC (rev 174850) @@ -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: core-i686/dhcpcd_.service =================================================================== --- core-i686/dhcpcd_.service 2013-01-07 21:45:18 UTC (rev 174849) +++ core-i686/dhcpcd_.service 2013-01-07 21:57:19 UTC (rev 174850) @@ -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] -Alias=multi-user.target.wants/dhcpcd@eth0.service Copied: dhcpcd/repos/core-i686/dhcpcd_.service (from rev 174849, dhcpcd/repos/testing-i686/dhcpcd_.service) =================================================================== --- core-i686/dhcpcd_.service (rev 0) +++ core-i686/dhcpcd_.service 2013-01-07 21:57:19 UTC (rev 174850) @@ -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] +Alias=multi-user.target.wants/dhcpcd@eth0.service Deleted: core-i686/remove_ifconfig.patch =================================================================== --- core-i686/remove_ifconfig.patch 2013-01-07 21:45:18 UTC (rev 174849) +++ core-i686/remove_ifconfig.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -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/core-i686/remove_ifconfig.patch (from rev 174849, dhcpcd/repos/testing-i686/remove_ifconfig.patch) =================================================================== --- core-i686/remove_ifconfig.patch (rev 0) +++ core-i686/remove_ifconfig.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -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: core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch =================================================================== --- core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-01-07 21:45:18 UTC (rev 174849) +++ core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -1,33 +0,0 @@ -From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 -From: Dan McGee <d...@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 <d...@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/core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch (from rev 174849, dhcpcd/repos/testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch) =================================================================== --- core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch (rev 0) +++ core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -0,0 +1,33 @@ +From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 +From: Dan McGee <d...@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 <d...@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: core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch =================================================================== --- core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-01-07 21:45:18 UTC (rev 174849) +++ core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -1,61 +0,0 @@ -From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <d...@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...@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/core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch (from rev 174849, dhcpcd/repos/testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch) =================================================================== --- core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch (rev 0) +++ core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -0,0 +1,61 @@ +From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d...@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...@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: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2013-01-07 21:45:18 UTC (rev 174849) +++ core-x86_64/PKGBUILD 2013-01-07 21:57:19 UTC (rev 174850) @@ -1,57 +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.3 -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') -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=('d64b589d15821aa5851fda81078183cc61a3e45a' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0' - 'd5304eb00828d4ee2fd879addce473ea09c47635' - '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 - - # Create Binary Symlink - install -d ${pkgdir}/usr/sbin - ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd - - # 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@.service - install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543 -} Copied: dhcpcd/repos/core-x86_64/PKGBUILD (from rev 174849, dhcpcd/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2013-01-07 21:57:19 UTC (rev 174850) @@ -0,0 +1,57 @@ +# $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.4 +pkgrel=1 +pkgdesc="RFC2131 compliant DHCP client daemon" +url="http://roy.marples.name/projects/dhcpcd/" +arch=('i686' 'x86_64') +license=('BSD') +groups=('base') +depends=('glibc' 'sh') +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=('18a09d8fabf926e5d32bd6315b40d77247b11596' + 'b67b9ce6a2faaca75fea356966a16be2283b7db0' + 'd5304eb00828d4ee2fd879addce473ea09c47635' + '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 + + # Create Binary Symlink + install -d ${pkgdir}/usr/sbin + ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd + + # 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@.service + install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543 +} Deleted: core-x86_64/dhcpcd.conf.d =================================================================== --- core-x86_64/dhcpcd.conf.d 2013-01-07 21:45:18 UTC (rev 174849) +++ core-x86_64/dhcpcd.conf.d 2013-01-07 21:57:19 UTC (rev 174850) @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP client daemon -# - -DHCPCD_ARGS="-q" - Copied: dhcpcd/repos/core-x86_64/dhcpcd.conf.d (from rev 174849, dhcpcd/repos/testing-x86_64/dhcpcd.conf.d) =================================================================== --- core-x86_64/dhcpcd.conf.d (rev 0) +++ core-x86_64/dhcpcd.conf.d 2013-01-07 21:57:19 UTC (rev 174850) @@ -0,0 +1,6 @@ +# +# Arguments to be passed to the DHCP client daemon +# + +DHCPCD_ARGS="-q" + Deleted: core-x86_64/dhcpcd.service =================================================================== --- core-x86_64/dhcpcd.service 2013-01-07 21:45:18 UTC (rev 174849) +++ core-x86_64/dhcpcd.service 2013-01-07 21:57:19 UTC (rev 174850) @@ -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/core-x86_64/dhcpcd.service (from rev 174849, dhcpcd/repos/testing-x86_64/dhcpcd.service) =================================================================== --- core-x86_64/dhcpcd.service (rev 0) +++ core-x86_64/dhcpcd.service 2013-01-07 21:57:19 UTC (rev 174850) @@ -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: core-x86_64/dhcpcd_.service =================================================================== --- core-x86_64/dhcpcd_.service 2013-01-07 21:45:18 UTC (rev 174849) +++ core-x86_64/dhcpcd_.service 2013-01-07 21:57:19 UTC (rev 174850) @@ -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] -Alias=multi-user.target.wants/dhcpcd@eth0.service Copied: dhcpcd/repos/core-x86_64/dhcpcd_.service (from rev 174849, dhcpcd/repos/testing-x86_64/dhcpcd_.service) =================================================================== --- core-x86_64/dhcpcd_.service (rev 0) +++ core-x86_64/dhcpcd_.service 2013-01-07 21:57:19 UTC (rev 174850) @@ -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] +Alias=multi-user.target.wants/dhcpcd@eth0.service Deleted: core-x86_64/remove_ifconfig.patch =================================================================== --- core-x86_64/remove_ifconfig.patch 2013-01-07 21:45:18 UTC (rev 174849) +++ core-x86_64/remove_ifconfig.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -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/core-x86_64/remove_ifconfig.patch (from rev 174849, dhcpcd/repos/testing-x86_64/remove_ifconfig.patch) =================================================================== --- core-x86_64/remove_ifconfig.patch (rev 0) +++ core-x86_64/remove_ifconfig.patch 2013-01-07 21:57:19 UTC (rev 174850) @@ -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