[pkg-dhcp-commits] [isc-dhcp] 01/01: release 4.3.3-3

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit c73beffe409f3521fac9b56e9bf5565baba07595
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Sep 6 13:22:50 2015 -0400

    release 4.3.3-3
---
 debian/changelog |  6 ++++++
 debian/rules     | 13 +++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac5c351..03bed7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+isc-dhcp (4.3.3-3) unstable; urgency=medium
+
+  * Revert change to lease file paths (closes: #798177).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 06 Sep 2015 16:47:39 +0000
+
 isc-dhcp (4.3.3-2) unstable; urgency=medium
 
   * Use default paths for lease files.
diff --git a/debian/rules b/debian/rules
index 25b2065..acc598c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,17 +7,22 @@ DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+LEASE_PATH=/var/lib/dhcp
 DHCLIENT_SCRIPT=/sbin/dhclient-script
 
 CFLAGS+=-Wall
 CFLAGS+=-I/usr/include/bind-export
+
 CFLAGS+=-D_PATH_DHCPD_CONF='"/etc/dhcp/dhcpd.conf"'
-CFLAGS+=-D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"'
+CFLAGS+=-D_PATH_DHCPD_DB='"$(LEASE_PATH)/dhcpd.leases"'
+CFLAGS+=-D_PATH_DHCPD6_DB='"$(LEASE_PATH)/dhcpd6.leases"'
+
 CFLAGS+=-D_PATH_DHCLIENT_SCRIPT='"$(DHCLIENT_SCRIPT)"'
+CFLAGS+=-D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"'
+CFLAGS+=-D_PATH_DHCLIENT_DB='"$(LEASE_PATH)/dhclient.leases"'
+CFLAGS+=-D_PATH_DHCLIENT6_DB='"$(LEASE_PATH)/dhclient6.leases"'
 
-CONFFLAGS=--prefix=/usr \
-          --enable-log-pid \
-          --enable-paranoia \
+CONFFLAGS=--prefix=/usr --enable-log-pid --enable-paranoia
 
 # cross-architecture building
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git