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

[Kevin Piché]

    Date: Friday, January 2, 2009 @ 21:43:02
  Author: kevin
Revision: 23123

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

........
  r8420 | eric | 2008-08-10 22:04:26 -0400 (Sun, 10 Aug 2008) | 2 lines
  
  upgpkg: dhcp 3.1.1-1
      FHS man pages
........
  r23122 | kevin | 2009-01-02 21:42:46 -0500 (Fri, 02 Jan 2009) | 1 line
  
  upgpkg: dhcp 4.1.0-1
........

Modified:
  dhcp/repos/extra-i686/	(properties)
  dhcp/repos/extra-i686/PKGBUILD
  dhcp/repos/extra-i686/dhcp.install

--------------+
 PKGBUILD     |   48 ++++++++++++++++++++++++++++--------------------
 dhcp.install |    1 +
 2 files changed, 29 insertions(+), 20 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-01-03 02:42:46 UTC (rev 23122)
+++ extra-i686/PKGBUILD	2009-01-03 02:43:02 UTC (rev 23123)
@@ -1,38 +1,46 @@
 # $Id$
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=dhcp
-pkgver=3.1.1
+pkgver=4.1.0
 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/"
-depends=('glibc')
+depends=('openssl>=0.9.8a')
 backup=('etc/dhcpd.conf' 'etc/dhclient.conf')
 install=dhcp.install
-source=(http://ftp.isc.org/isc/dhcp/dhcp-$pkgver.tar.gz dhcp-3.0.3-tr.c.patch \
-        dhcpd)
-md5sums=('fcc19330a9c3a0efb5620409214652a9' '39866416303b674df08b66b2d094e523'
+source=(http://ftp.isc.org/isc/dhcp/dhcp-${pkgver}.tar.gz dhcp-3.0.3-tr.c.patch
+dhcpd)
+md5sums=('1fffed2e8c3d67b111316d6a9b33db7a' '39866416303b674df08b66b2d094e523'
          '025b8fe98b6c0814428b671b1819a810')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   patch -p1 -i ../dhcp-3.0.3-tr.c.patch || return 1
-  ./configure
+  # Define _GNU_SOURCE to fix IPV6.
+  sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure
+  ./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=$startdir/pkg INCDIR=/usr/include LIBDIR=/usr/lib install
-  install -D -m644 server/dhcpd.conf $startdir/pkg/etc/dhcpd.conf
-  #install -D -m644 client/dhclient.conf $startdir/pkg/etc/dhclient.conf
-  install -D -m755 ../dhcpd $startdir/pkg/etc/rc.d/dhcpd
-  touch $startdir/pkg/var/state/dhcp/dhcpd.leases
-  chmod -R 644 $startdir/pkg/usr/man/*
-  chmod 755 $startdir/pkg/usr/man/man{1,3,5,8}
+  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
+  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' \
-  #$startdir/pkg/etc/dhclient.conf
-  rm -f $startdir/pkg/var/state/dhcp/dhcpd.leases
-  rm -f ${startdir}/pkg/sbin/{dhclient,dhclient-script}
-  rm -f ${startdir}/pkg/usr/man/man{5,8}/dhclient*
+  #${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 $startdir/src/$pkgname-$pkgver/LICENSE \
-                   $startdir/pkg/usr/share/licenses/dhcp/LICENSE
+  install -m644 -D ${srcdir}/${pkgname}-${pkgver}/LICENSE \
+                   ${pkgdir}/usr/share/licenses/dhcp/LICENSE
 }

Modified: extra-i686/dhcp.install
===================================================================
--- extra-i686/dhcp.install	2009-01-03 02:42:46 UTC (rev 23122)
+++ extra-i686/dhcp.install	2009-01-03 02:43:02 UTC (rev 23123)
@@ -1,6 +1,7 @@
 # arg 1:  the new package version
 post_install() {
   [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases
+  echo "If dhcpd doesn' start ensure the ipv6 kernel module is loaded."
 }
 
 # arg 1:  the new package version