[pkg-dhcp-commits] [isc-dhcp] 01/01: release 4.2.4-7

[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 860aad2c63c3aebe4f96d584ac336fd5658878b2
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Dec 21 16:42:40 2013 -0500

    release 4.2.4-7
---
 debian/changelog | 7 +++++++
 debian/rules     | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7763ead..440129e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.2.4-7) unstable; urgency=low
+
+  * Set --with-ldapcrypto to restore openssl support (closes: #692808).
+    - Thanks to Christian Hoffmann and Stéphane Graber.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Mon, 27 May 2013 20:35:09 +0000
+
 isc-dhcp (4.2.4-6) unstable; urgency=high
 
   * Fix cve-2013-2494: issues with regular expression handling in the embedded
diff --git a/debian/rules b/debian/rules
index 6f52e53..cebed19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@ bind-stamp:
 build-ldap-stamp: bind-stamp
 	dh_testdir
 
+	test ! -f Makefile || $(MAKE) distclean
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc/dhcp \
@@ -52,7 +53,8 @@ build-ldap-stamp: bind-stamp
 		--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 \
-		--with-ldap
+		--with-ldap \
+		--with-ldapcrypto \
 		
 	$(MAKE) $(CROSS)
 
@@ -63,7 +65,7 @@ build-ldap-stamp: bind-stamp
 	
 build: build-arch build-indep
 
-build-arch: build-ldap-stamp clean build-non-ldap-stamp build-arch-stamp
+build-arch: build-ldap-stamp build-non-ldap-stamp build-arch-stamp
 build-indep:
 
 build-arch-stamp:
@@ -73,6 +75,7 @@ build-arch-stamp:
 build-non-ldap-stamp: bind-stamp
 	dh_testdir
 
+	test ! -f Makefile || $(MAKE) distclean
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc/dhcp \
@@ -88,6 +91,7 @@ build-non-ldap-stamp: bind-stamp
 clean:
 	dh_testdir
 	rm -f build*stamp install*stamp bind-stamp
+	rm -rf isc-dhcp-server-ldap
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f Makefile client/Makefile config.log config.status

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