[arch-commits] Commit in dhcp/repos (5 files)

Mon Jul 20 03:16:44 UTC 2009

Date: Sunday, July 19, 2009 @ 23:16:44
  Author: kevin
Revision: 46754

Merged revisions 46753 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/dhcp/trunk

........
  r46753 | kevin | 2009-07-19 23:16:29 -0400 (Sun, 19 Jul 2009) | 2 lines
  
  upgpkg: dhcp 4.1.0.p1-1
      Updated to 4.1.0p1 and fixed FS#12792
........

Added:
  dhcp/repos/extra-i686/ChangeLog
    (from rev 46753, dhcp/trunk/ChangeLog)
Modified:
  dhcp/repos/extra-i686/	(properties)
  dhcp/repos/extra-i686/PKGBUILD
  dhcp/repos/extra-i686/dhcpd
Deleted:
  dhcp/repos/extra-i686/dhcp-3.0.3-tr.c.patch

-----------------------+
 ChangeLog             |    8 ++++++++
 PKGBUILD              |   33 ++++++++++++++-------------------
 dhcp-3.0.3-tr.c.patch |   10 ----------
 dhcpd                 |    3 ++-
 4 files changed, 24 insertions(+), 30 deletions(-)


Property changes on: dhcp/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /dhcp/trunk:1-23122
   + /dhcp/trunk:1-46753

Copied: dhcp/repos/extra-i686/ChangeLog (from rev 46753, dhcp/trunk/ChangeLog)
===================================================================

--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2009-07-20 03:16:44 UTC (rev 46754)
@@ -0,0 +1,8 @@
+
+2009-07-19  K. Piche  <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: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-20 03:16:29 UTC (rev 46753)
+++ extra-i686/PKGBUILD	2009-07-20 03:16:44 UTC (rev 46754)
@@ -1,46 +1,41 @@
 # $Id$
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=dhcp
-pkgver=4.1.0
+# separate patch levels with a period to maintain proper versioning.
+pkgver=4.1.0.p1
+_pkgver=4.1.0p1
 pkgrel=1
 pkgdesc="A DHCP server, client, and relay agent"
 arch=(i686 x86_64)
 license=('custom:isc-dhcp')
-url="http://www.isc.org/sw/dhcp/"
+url="https://www.isc.org/software/dhcp"
 depends=('openssl>=0.9.8a')
-backup=('etc/dhcpd.conf' 'etc/dhclient.conf')
+backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
 install=dhcp.install
-source=(http://ftp.isc.org/isc/dhcp/dhcp-${pkgver}.tar.gz dhcp-3.0.3-tr.c.patch
-dhcpd)
-md5sums=('1fffed2e8c3d67b111316d6a9b33db7a' '39866416303b674df08b66b2d094e523'
-         '025b8fe98b6c0814428b671b1819a810')
+source=(http://ftp.isc.org/isc/${pkgname}/${pkgname}-${_pkgver}.tar.gz
+dhcpd dhcp.conf.d dhcp-4.1.0-missing-ipv6-not-fatal.patch)
+md5sums=('325ff8338c5a21f89d5304ac13ffebdf' 'df22cffa7d7415ece7bb025b7bf774dd'
+         '49da3192e5c885e3c7d02f447c2dea5e' '401eb8819fc1d10fda3f8e02ad9fe421')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i ../dhcp-3.0.3-tr.c.patch || return 1
+  cd ${srcdir}/${pkgname}-${_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 -Np1 -i ${srcdir}/dhcp-4.1.0-missing-ipv6-not-fatal.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
       --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases
   make || return 1
   make DESTDIR=${pkgdir} install
 
-  #install -D -m644 server/dhcpd.conf ${pkgdir}/etc/dhcpd.conf
-  #install -D -m644 client/dhclient.conf ${pkgdir}/etc/dhclient.conf
   install -D -m755 ${srcdir}/dhcpd ${pkgdir}/etc/rc.d/dhcpd
+  install -D -m644 ${srcdir}/dhcp.conf.d ${pkgdir}/etc/conf.d/${pkgname}
   mkdir -p ${pkgdir}/var/state/dhcp
-  #touch ${pkgdir}/var/state/dhcp/dhcpd.leases
-  #chmod -R 644 ${pkgdir}/usr/share/man/*
-  #chmod 755 ${pkgdir}/usr/share/man/man{1,3,5,8}
-  #sed -i 's|etc/dhclient-script|sbin/dhclient-script|g' \
-  #${pkgdir}/etc/dhclient.conf
-  #rm -f ${pkgdir}/var/state/dhcp/dhcpd.leases
-  #rm -f ${pkgdir}/sbin/{dhclient,dhclient-script}
   rm -f ${pkgdir}/etc/dhclient.conf
   rm -f ${pkgdir}/usr/sbin/dhclient
   rm -f ${pkgdir}/usr/share/man/man{5,8}/dhclient*
   # install licenses
-  install -m644 -D ${srcdir}/${pkgname}-${pkgver}/LICENSE \
+  install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \
                    ${pkgdir}/usr/share/licenses/dhcp/LICENSE
 }

Deleted: extra-i686/dhcp-3.0.3-tr.c.patch
===================================================================
--- extra-i686/dhcp-3.0.3-tr.c.patch	2009-07-20 03:16:29 UTC (rev 46753)
+++ extra-i686/dhcp-3.0.3-tr.c.patch	2009-07-20 03:16:44 UTC (rev 46754)
@@ -1,10 +0,0 @@
---- work.linux-2.2/common/tr.c	2005/08/14 11:34:24	1.1
-+++ work.linux-2.2/common/tr.c	2005/08/14 11:35:16
-@@ -40,6 +40,7 @@ static char copyright[] =
- #include "includes/netinet/if_ether.h"
- #include "netinet/if_tr.h"
- #include <sys/time.h>
-+#include <linux/types.h>
- 
- /*
-  * token ring device handling subroutines.  These are required as token-ring

Modified: extra-i686/dhcpd
===================================================================
--- extra-i686/dhcpd	2009-07-20 03:16:29 UTC (rev 46753)
+++ extra-i686/dhcpd	2009-07-20 03:16:44 UTC (rev 46754)
@@ -2,6 +2,7 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/dhcp
 
 PIDFILE="/var/run/dhcpd.pid"
 PID=`cat $PIDFILE 2>/dev/null`
@@ -9,7 +10,7 @@
   start)
     stat_busy "Starting DHCP Server"
     if [ "$PID" = "" ]; then 
-       /usr/sbin/dhcpd -q
+       /usr/sbin/dhcpd $DHCP_ARGS 
     fi
     if [ "$PID" != "" -o $? -gt 0 ]; then
       stat_fail


