[arch-commits] CVS update of arch/build/network/dhclient (PKGBUILD dhclient.conf)

[Jan de Groot]

    Date: Wednesday, April 25, 2007 @ 18:29:56
  Author: jgc
    Path: /home/cvs-arch/arch/build/network/dhclient

Modified: PKGBUILD (1.2 -> 1.3)
 Removed: dhclient.conf (1.1)

upgpkg: dhclient 3.0.5-1
Update to latest stable version
Get rid of that dead ugly chaotic dhclient.conf (yes, this is where chaos.lan comes from in networkmanager configs)


---------------+
 PKGBUILD      |   40 ++++++++++++++++++++--------------------
 dhclient.conf |   40 ----------------------------------------
 2 files changed, 20 insertions(+), 60 deletions(-)


Index: arch/build/network/dhclient/PKGBUILD
diff -u arch/build/network/dhclient/PKGBUILD:1.2 arch/build/network/dhclient/PKGBUILD:1.3
--- arch/build/network/dhclient/PKGBUILD:1.2	Thu Oct 26 17:58:15 2006
+++ arch/build/network/dhclient/PKGBUILD	Wed Apr 25 18:29:56 2007
@@ -1,30 +1,30 @@
-#$Id: PKGBUILD,v 1.2 2006/10/26 21:58:15 andyrtr Exp $
-# Maintainer: Arjan Timmerman <arjan at archlinux.org>
+#$Id: PKGBUILD,v 1.3 2007/04/25 22:29:56 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Mirko Messer <mirk at chao.ch>
 pkgname=dhclient 
-pkgver=3.0.4
+pkgver=3.0.5
 pkgrel=1
 pkgdesc="dhclient is standalone client from the dhcp package"
 arch=(i686 x86_64)
 url="http://www.isc.org/index.pl?/sw/dhcp/"
-license=""
+license=('custom')
 depends=('bash')
-backup=('etc/dhclient.conf')
-source=(ftp://ftp.isc.org/isc/dhcp/dhcp-$pkgver.tar.gz \
-	arch-nm.patch dhclient.conf)
-md5sums=('004ef935fd54b8046b16bdde31a9e151' '68e968789f577e12fa596500c9ae8fc9'\
-         '5df0aba50e2705bd23ac1b1998be5cd2')
+source=(ftp://ftp.isc.org/isc/dhcp/dhcp-${pkgver}.tar.gz \
+	arch-nm.patch)
+md5sums=('ce5d30d4645e4eab1f54561b487d1ec7' '68e968789f577e12fa596500c9ae8fc9')
 
 build() {
-	export MAKEFLAGS="-j1"
-	cd $startdir/src/dhcp-$pkgver
-        patch -p1 -i ../arch-nm.patch
-        ./configure
-        cd work*/minires && make
-        cd ../omapip && make
-	cd ../dst && make
-        cd ../common && make
-        cd ../client
-        make DESTDIR=$startdir/pkg install
-        cp $startdir/src/dhclient.conf $startdir/pkg/etc/dhclient.conf
+  export MAKEFLAGS="-j1"
+  cd ${startdir}/src/dhcp-${pkgver}
+  patch -p1 -i ${startdir}/src/arch-nm.patch
+  ./configure
+  cd work*/minires && make
+  cd ../omapip && make
+  cd ../dst && make
+  cd ../common && make
+  cd ../client
+  make DESTDIR=${startdir}/pkg install
+  mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
+  install -m644 ${startdir}/src/dhcp-${pkgver}/LICENSE \
+                ${startdir}/pkg/usr/share/licenses/${pkgname}/
 }
Index: arch/build/network/dhclient/dhclient.conf
diff -u arch/build/network/dhclient/dhclient.conf:1.1 arch/build/network/dhclient/dhclient.conf:removed
--- arch/build/network/dhclient/dhclient.conf:1.1	Thu Jun 29 03:23:50 2006
+++ arch/build/network/dhclient/dhclient.conf	Wed Apr 25 18:29:56 2007
@@ -1,40 +0,0 @@
-##
-#read man dhclient.conf !
-##
-send host-name "thinktank"; #CHANGE ME TO YOUR HOSTNAME 
-#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
-send dhcp-lease-time 3600;
-supersede domain-name "chaos.lan";
-prepend domain-name-servers 127.0.0.1;
-#deleted: domain-name, host-name
-request subnet-mask, broadcast-address, time-offset, routers,
-	domain-name-servers, domain-name;
-require subnet-mask, domain-name-servers;
-timeout 60;
-retry 60;
-reboot 10;
-select-timeout 5;
-initial-interval 2;
-script "/sbin/dhclient-script";
-media "-link0 -link1 -link2", "link0 link1";
-reject 192.33.137.209;
-
-#alias {
-#  interface "ep0";
-#  fixed-address 192.5.5.213;
-#  option subnet-mask 255.255.255.255;
-#}
-
-#lease {
-#  interface "ep0";
-#  fixed-address 192.33.137.200;
-#  medium "link0 link1";
-#  option host-name "andare.swiftmedia.com";
-#  option subnet-mask 255.255.255.0;
-#  option broadcast-address 192.33.137.255;
-#  option routers 192.33.137.250;
-#  option domain-name-servers 127.0.0.1;
-#  renew 2 2000/1/12 00:00:01;
-#  rebind 2 2000/1/12 00:00:01;
-#  expire 2 2000/1/12 00:00:01;
-#}