[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. upstream/4.1.1-63-gf549762

[Andrew Pollock]

The following commit has been merged in the master branch:
commit f549762a24649df61010667bd73eaa917f8f2170
Author: Andrew Pollock <apollock at debian.org>
Date:   Sun Jul 4 22:56:38 2010 -0700

    Define as much as possible via ./configure
    
    Also correctly specify the DHCPv6 paths. Fixes bug#587884

diff --git a/debian/changelog b/debian/changelog
index d3840f4..7789e7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.1.1-P1-6) experimental; urgency=low
+
+  * debian/rules: configure client to use correct path for DHCPv6 leases file
+    (closes: #587884)
+
+ -- Andrew Pollock <apollock at debian.org>  Fri, 02 Jul 2010 21:04:16 -0700
+
 isc-dhcp (4.1.1-P1-5) experimental; urgency=low
 
   * split out the udeb dhclient-script so there's one for Linux and one for
diff --git a/debian/rules b/debian/rules
index cd2838e..64a64fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,6 @@ else
 CFLAGS += -O2
 endif
 
-CFLAGS += -D_PATH_DHCPD_DB='"/var/lib/dhcp/dhcpd.leases"'
-CFLAGS += -D_PATH_DHCLIENT_DB='"/var/lib/dhcp/dhclient.leases"'
 CFLAGS += -D_PATH_DHCLIENT_SCRIPT='"/sbin/dhclient-script"'
 CFLAGS += -D_PATH_DHCPD_CONF='"/etc/dhcp/dhcpd.conf"'
 CFLAGS += -D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"'
@@ -45,6 +43,10 @@ patched-ldap/build-stamp:
 	./configure \
 		--prefix=$(DESTDIR)/usr \
 		--sysconfdir=$(DESTDIR)/etc/dhcp \
+		--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+		--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
+		--with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
+		--with-cli6-lease-file=/var/lib/dhcp/dhclient6.leases \
 		--enable-ldap-conf --disable-ldap-casa
 		
 	for f in common ../minires ../dst ../omapip ../dhcpctl ../server; do \
@@ -64,7 +66,11 @@ build-stamp: patched-ldap/build-stamp
 	
 	./configure \
 		--prefix=$(DESTDIR)/usr \
-		--sysconfdir=$(DESTDIR)/etc/dhcp
+		--sysconfdir=$(DESTDIR)/etc/dhcp \
+		--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+		--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
+		--with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
+		--with-cli6-lease-file=/var/lib/dhcp/dhclient6.leases
 	
 	$(MAKE) $(CROSS)
 

-- 
ISC DHCP packaging for Debian