[arch-commits] Commit in dhcpcd/trunk (PKGBUILD remove_ifconfig.patch)

[Ronald van Haren]

    Date: Friday, November 4, 2011 @ 02:49:33
  Author: ronald
Revision: 142022

change net-tools/iproute2 deps and add patch for it to change config file

Added:
  dhcpcd/trunk/remove_ifconfig.patch
Modified:
  dhcpcd/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   12 ++++++++----
 remove_ifconfig.patch |   20 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-04 06:41:37 UTC (rev 142021)
+++ PKGBUILD	2011-11-04 06:49:33 UTC (rev 142022)
@@ -5,23 +5,27 @@
 
 pkgname=dhcpcd
 pkgver=5.2.12
-pkgrel=2
+pkgrel=3
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
 arch=('i686' 'x86_64')
 license=('BSD')
 groups=('base')
-depends=('glibc' 'sh' 'inetutils' 'net-tools')
+depends=('glibc' 'sh' 'inetutils' 'iproute2')
 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.conf.d' 'remove_ifconfig.patch')
 sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
-          'b67b9ce6a2faaca75fea356966a16be2283b7db0')
+          'b67b9ce6a2faaca75fea356966a16be2283b7db0'
+          'de3e14a24b479b2832c6671ba12586444bd86ebe')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # remove ifconfig call but use ip (iproute2) instead
+  patch -Np0 -i ${srcdir}/remove_ifconfig.patch
+
   # configure variables
   ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
 

Added: remove_ifconfig.patch
===================================================================
--- remove_ifconfig.patch	                        (rev 0)
+++ remove_ifconfig.patch	2011-11-04 06:49:33 UTC (rev 142022)
@@ -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