[arch-commits] Commit in dhcpcd/trunk (PKGBUILD dhcpcd.conf.d)

[Ronald van Haren]

    Date: Friday, October 31, 2008 @ 08:31:42
  Author: ronald
Revision: 17656

upgpkg: dhcpcd 4.0.3-1

Modified:
  dhcpcd/trunk/PKGBUILD
  dhcpcd/trunk/dhcpcd.conf.d

---------------+
 PKGBUILD      |   23 +++++++++++++----------
 dhcpcd.conf.d |    2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-31 11:35:59 UTC (rev 17655)
+++ PKGBUILD	2008-10-31 12:31:42 UTC (rev 17656)
@@ -3,20 +3,20 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=4.0.2
-pkgrel=2
+pkgver=4.0.3
+pkgrel=1
 pkgdesc="A DHCP client daemon"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://roy.marples.name/dhcpcd"
 groups=('base')
 depends=('glibc')
-backup=('etc/conf.d/dhcpcd')
-source=(http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2
-	dhcpcd.conf.d)
+backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
+source=(http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2 \
+	'dhcpcd.conf.d')
 options=('emptydirs')
-md5sums=('7cdc25f37f37260f94335d5b6c76f40e'
-         '533c51cc09fb4202798c7d5421bc3084')
+md5sums=('bd9ae1039e437273a141e773b229f7a3'
+         '372d33485556982b64a97f301e17c5dd')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -24,7 +24,7 @@
   #disable DUID usage
   #echo "#undef ENABLE_DUID" >> config.h
   
-  # fix installation locations
+# fix installation locations
   export PREFIX=/usr 
   sed -i 's/${PREFIX}\/etc/\/etc/' Makefile || return 1
   sed -i 's/\/db/\/lib\/dhcpcd/' Makefile || return 1
@@ -38,14 +38,17 @@
   install -d $startdir/pkg/usr/sbin || return 1
   ln -sf /sbin/dhcpcd $pkgdir/usr/sbin/dhcpcd || return 1
   
-  # install standard configuration file
+# install configuration file used in /etc/rc.d/network
   install -Dm644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/dhcpcd || return 1
 
-  # get the license
+# get the license
   install -d $pkgdir/usr/share/licenses/$pkgname || return 1
   awk '{if(FNR<27)print $0}' $srcdir/$pkgname-$pkgver/config.h \
 	>> $pkgdir/usr/share/licenses/$pkgname/license || return 1
 
 # make man pages FHS compliant
   mv -f $pkgdir/usr/man $pkgdir/usr/share/man || return 1
+
+# set options in /etc/dhcpcd.conf
+  echo noipv4ll >> $pkgdir/etc/dhcpcd.conf # disable ip4vall
 }

Modified: dhcpcd.conf.d
===================================================================
--- dhcpcd.conf.d	2008-10-31 11:35:59 UTC (rev 17655)
+++ dhcpcd.conf.d	2008-10-31 12:31:42 UTC (rev 17656)
@@ -2,5 +2,5 @@
 # Arguments to be passed to the DHCP client daemon
 #
 
-DHCPCD_ARGS="-q -L -t 30 -h $HOSTNAME"
+DHCPCD_ARGS="-q"