[arch-commits] Commit in dhcpcd/trunk (4 files)
Dave Reisner
dreisner at nymeria.archlinux.org
Tue Jun 25 13:46:44 UTC 2013
Date: Tuesday, June 25, 2013 @ 15:46:43
Author: dreisner
Revision: 188916
upgpkg: dhcpcd 6.0.2-1
- drop unneeded patches and hacks
Modified:
dhcpcd/trunk/PKGBUILD
Deleted:
dhcpcd/trunk/0001-Set-hostname-via-proc-if-file-is-available.patch
dhcpcd/trunk/0001-set-MTU-via-sysfs-if-file-is-available.patch
dhcpcd/trunk/remove_ifconfig.patch
-------------------------------------------------------+
0001-Set-hostname-via-proc-if-file-is-available.patch | 33 --------
0001-set-MTU-via-sysfs-if-file-is-available.patch | 61 ----------------
PKGBUILD | 23 ++----
remove_ifconfig.patch | 20 -----
4 files changed, 11 insertions(+), 126 deletions(-)
Deleted: 0001-Set-hostname-via-proc-if-file-is-available.patch
===================================================================
--- 0001-Set-hostname-via-proc-if-file-is-available.patch 2013-06-25 11:50:23 UTC (rev 188915)
+++ 0001-Set-hostname-via-proc-if-file-is-available.patch 2013-06-25 13:46:43 UTC (rev 188916)
@@ -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
-
Deleted: 0001-set-MTU-via-sysfs-if-file-is-available.patch
===================================================================
--- 0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-06-25 11:50:23 UTC (rev 188915)
+++ 0001-set-MTU-via-sysfs-if-file-is-available.patch 2013-06-25 13:46:43 UTC (rev 188916)
@@ -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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-25 11:50:23 UTC (rev 188915)
+++ PKGBUILD 2013-06-25 13:46:43 UTC (rev 188916)
@@ -4,8 +4,8 @@
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
-pkgver=5.6.8
-pkgrel=3
+pkgver=6.0.2
+pkgrel=1
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/projects/dhcpcd/"
arch=('i686' 'x86_64')
@@ -15,9 +15,9 @@
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" \
+source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
'dhcpcd_.service' 'dhcpcd.service')
-sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917'
+sha1sums=('3adca5969fa4b81b827d3ddfd97b8a7bfde20530'
'6245b8db7e6f39a0305571726bb693a53901c400'
'e49e01041f831281a1cd0c97ca21204e0aa07fda')
@@ -25,8 +25,11 @@
cd ${srcdir}/${pkgname}-${pkgver}
# configure variables
- ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
- --rundir=/run
+ ./configure \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib/dhcpcd \
+ --dbdir=/var/lib/dhcpcd \
+ --rundir=/run
# Build
make
@@ -38,8 +41,8 @@
# 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
+ sed 26q "$srcdir/$pkgname-$pkgver/control.h" \
+ >>"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
# Set Options in /etc/dhcpcd.conf
echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
@@ -47,8 +50,4 @@
# 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: remove_ifconfig.patch
===================================================================
--- remove_ifconfig.patch 2013-06-25 11:50:23 UTC (rev 188915)
+++ remove_ifconfig.patch 2013-06-25 13:46:43 UTC (rev 188916)
@@ -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
More information about the arch-commits
mailing list