[arch-commits] Commit in dhcp/trunk (ChangeLog PKGBUILD)

[Eric Bélanger]

    Date: Saturday, July 28, 2012 @ 18:36:14
  Author: eric
Revision: 164254

upgpkg: dhcp 4.2.4.1-1

Upstream update, Fix description, Remove old unused ChangeLog

Modified:
  dhcp/trunk/PKGBUILD
Deleted:
  dhcp/trunk/ChangeLog

-----------+
 ChangeLog |   11 -----------
 PKGBUILD  |   48 +++++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 34 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2012-07-28 20:26:26 UTC (rev 164253)
+++ ChangeLog	2012-07-28 22:36:14 UTC (rev 164254)
@@ -1,11 +0,0 @@
-
-2010-07-16  kevin  <kevin at archlinux.org>
-	* dhcp 4.2.0-1
-
-2009-07-19  kevin  <kevin at archlinux.org>
-	* dhcp 4.1.0.p1-1
-	* Adopted RedHat patch to fix bug where dhcpd won't start if ipv6 module
-	  is not loaded.  Fixes FS#12792.
-	* Added /etc/conf.d/dhcp feature contributed by Fabiano Furtado Pessoa
-	  Coelho <fusca14 at gmail.com>	
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-28 20:26:26 UTC (rev 164253)
+++ PKGBUILD	2012-07-28 22:36:14 UTC (rev 164254)
@@ -5,18 +5,20 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.3.2
-_pkgver=4.2.3-P2
+pkgver=4.2.4.1
+_pkgver=4.2.4-P1
 
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
-source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz
+makedepends=('bash' 'iproute2' 'net-tools')
+source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
         dhcp4 dhcp6 dhcp
         dhcp-4.1.1-missing-ipv6-not-fatal.patch
         dhclient-script-pathFixes.patch)
-md5sums=('14f57fd580d01633d0fad4809007a801'
+md5sums=('0ca7181024651f6323951d5498c8020b'
+         '0dfe000dd88555ea06b282ae5e574d5f'
          'c49b1497837ba56c54e401a66e1bab9b'
          '12c2f3ae47ed23eb698eb7f1bfd80f20'
          '8f357e46e1efcbb746f38737a3f977a2'
@@ -24,13 +26,13 @@
          '541b415a25a169eaf64b681405f79a80')
 
 build() {
-  cd ${srcdir}/${pkgbase}-${_pkgver}
+  cd "${srcdir}/${pkgbase}-${_pkgver}"
 
   # Define _GNU_SOURCE to fix IPV6.
   sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure
 
   # Make not having ipv6 non-fatal.
-  patch -Np0 -i ${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch
+  patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
@@ -40,7 +42,7 @@
 
   make
 
-  patch -i ${srcdir}/dhclient-script-pathFixes.patch client/scripts/linux || return 1
+  patch -i "${srcdir}/dhclient-script-pathFixes.patch" client/scripts/linux
 }
 
 package_dhcp(){
@@ -49,36 +51,36 @@
   backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
   install=dhcp.install
   
-  cd ${srcdir}/${pkgbase}-${_pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  make DESTDIR="${pkgdir}" install
 
-  install -D -m755 ${srcdir}/dhcp4 ${pkgdir}/etc/rc.d/dhcp4
-  install -D -m755 ${srcdir}/dhcp6 ${pkgdir}/etc/rc.d/dhcp6
-  install -D -m644 ${srcdir}/dhcp ${pkgdir}/etc/conf.d/${pkgbase}
-  mkdir -p ${pkgdir}/var/state/dhcp
+  install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4"
+  install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6"
+  install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}"
+  install -d "${pkgdir}/var/state/dhcp"
 
   # Remove dhclient
-  make -C client DESTDIR=${pkgdir} uninstall
+  make -C client DESTDIR="${pkgdir}" uninstall
   
   # install license
-  install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhcp/LICENSE
+  install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE"
 }
 
 package_dhclient(){
-  pkgdesc="dhclient is standalone client from the dhcp package"
+  pkgdesc="A standalone DHCP client from the dhcp package"
   depends=('bash' 'iproute2' 'net-tools')
 
-  cd ${srcdir}/${pkgbase}-${_pkgver}
-  make -C client DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  make -C client DESTDIR="${pkgdir}" install
 
   # move dhclient.conf to dhclient.conf.example
-  mv ${pkgdir}/etc/dhclient.conf{,.example}
+  mv "${pkgdir}"/etc/dhclient.conf{,.example}
   
-  mkdir -p ${pkgdir}/var/state/dhclient
+  install -d "${pkgdir}/var/state/dhclient"
 
   # install dhclient linux script
-  install -m755 -D client/scripts/linux ${pkgdir}/sbin/dhclient-script
+  install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script"
 
   # install license
-  install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhclient/LICENSE
+  install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE"
 }