[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-67-g0531c84

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 0531c8475bac44d4bd3cc62f9f644aac302492d3
Author: Andrew Pollock <apollock at debian.org>
Date:   Wed Mar 14 07:01:09 2012 -0700

    Patch the bind Makefile to run autoconf
    
    It looks like the modifcation make to the embedded BIND's configure.in isn't
    going to take effect with the Makefile calling autoconf, so do that

diff --git a/debian/changelog b/debian/changelog
index 368b7ee..fe491e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+isc-dhcp (4.2.2.dfsg.1-4) unstable; urgency=low
+
+  * The "Zoe woke up at 4am and I couldn't get back to sleep so I had some
+    extra time to work on this" release
+  * patch the Makefile for the embedded BIND libraries so that autoconf is run
+    so that the modification to configure.in to fix the FTBFS on kFreeBSD
+    actually does something useful (closes: #643569)
+
+ -- Andrew Pollock <apollock at debian.org>  Wed, 14 Mar 2012 06:25:28 -0700
+
 isc-dhcp (4.2.2.dfsg.1-3) unstable; urgency=low
 
   * debian/control: remove transitional packages
diff --git a/debian/patches/bind-autoconf b/debian/patches/bind-autoconf
new file mode 100644
index 0000000..39e3450
--- /dev/null
+++ b/debian/patches/bind-autoconf
@@ -0,0 +1,13 @@
+Index: isc-dhcp/bind/Makefile
+===================================================================
+--- isc-dhcp.orig/bind/Makefile	2012-01-07 20:51:59.887859045 -0800
++++ isc-dhcp/bind/Makefile	2012-03-14 06:24:51.197110723 -0700
+@@ -45,7 +45,7 @@
+ # Currently disable the epoll and devpoll options as they don't interact
+ # well with the DHCP code.
+ 	@echo Configuring BIND Export libraries for DHCP.
+-	@(cd ${bindsrcdir} && ./configure --disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib --with-gssapi=no > ${binddir}/configure.log)
++	@(cd ${bindsrcdir} && autoconf && ./configure --disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib --with-gssapi=no > ${binddir}/configure.log)
+ 
+ # Build the export libraries
+ 	@echo Building BIND Export libraries - this takes some time.
diff --git a/debian/patches/series b/debian/patches/series
index 930e1f1..01a06ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 dhclient-script-exit-status
 fix_exit_hook_doc_manpage
 no_loopback_checksum
+bind-autoconf

-- 
ISC DHCP packaging for Debian