Zumbi: please call off the NMU. I'm now in dialog with the maintainer.
See my other email. Turns out I was grossly generalising, and they're
targeting around the end of the month.
Good to hear there is progress with upstream.
Personally I'd rather see a non-rc buggy version in testing before a new
upstream version (potentially with new rc bugs) is introduced to unstable
but i'll let you make the final call as to whether to upload my work.
How about you just send me a patch against what's in the Git repository (at
head)?
I've forward ported my changes to the head of your git repo. Patch is
attatched.
Note that the patch doesn't contain the repack of the upstream tarball.
(I don't
think diff can represent that). The repacked upstream tarball I prepared is
available from.
http://mentors.debian.net/debian/pool/main/i/isc-dhcp/isc-dhcp_4.2.2+dfsg.orig.tar.gz
The repacking process I used was basically
Unpack the isc-dhcp tarball
Unpack the embedded bind tarball
delete contrib/zkt/doc/rfc5011.txt doc/rfc and doc/draft
Repack the embedded bind tarball
delete the unpacked files from the bind tarball
Repack the isc-dhcp tarball
diff -urN isc-dhcp/debian/changelog isc-dhcp.new/debian/changelog
--- isc-dhcp/debian/changelog 2012-02-20 10:06:01.000000000 +0000
+++ isc-dhcp.new/debian/changelog 2012-02-20 09:44:26.000000000 +0000
@@ -1,3 +1,18 @@
+isc-dhcp (4.2.2+dfsg-0.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Repack upstream tarball to remove non-free IETF documents from embedded
+ bind tarball. (closes: #645760)
+ * debian/copyright: add reason for repack of upstream tarball
+ * debain/rules: extend clean target to properly cleanup dhcp subdir
+ * debian/patches/apply-bind-fix,
+ debian/patches/manual/fix-bind-non-linux.patch:
+ fix issues related to embedded bind on kfreebsd (closes: #643569)
+ (thanks to Robert Millan for the underlying patch)
+ * debian/control: add patch to build-depends as it is now used directly
+
+ -- Peter Michael Green <plugw...@p10link.net> Sun, 19 Feb 2012 17:26:12 +0000
+
isc-dhcp (4.2.2-3) UNRELEASED; urgency=low
* debian/control: remove transitional packages
diff -urN isc-dhcp/debian/control isc-dhcp.new/debian/control
--- isc-dhcp/debian/control 2012-02-20 10:06:01.000000000 +0000
+++ isc-dhcp.new/debian/control 2012-02-20 09:27:20.000000000 +0000
@@ -5,7 +5,7 @@
Uploaders: Andrew Pollock <apoll...@debian.org>
Vcs-Git: git://git.debian.org/pkg-dhcp/isc-dhcp.git
Vcs-Browser: http://git.debian.org/?p=pkg-dhcp/isc-dhcp.git;a=summary
-Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, po-debconf, libldap2-dev, libssl-dev, autoconf, automake, pkg-config, hardening-wrapper
+Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, po-debconf, libldap2-dev, libssl-dev, autoconf, automake, pkg-config, hardening-wrapper, patch
Standards-Version: 3.9.2
Package: isc-dhcp-server
diff -urN isc-dhcp/debian/copyright isc-dhcp.new/debian/copyright
--- isc-dhcp/debian/copyright 2012-02-20 10:06:01.000000000 +0000
+++ isc-dhcp.new/debian/copyright 2012-02-20 09:41:18.000000000 +0000
@@ -31,3 +31,7 @@
The Debian packaging is (C) 2008, Andrew Pollock <apoll...@debian.org> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+Non-free RFCs and internet drafts were removed from the embedded bind copy in
+the upstream tarball by Peter Michael Green on Sun 19 Feb 2012. See
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=645760 for details.
diff -urN isc-dhcp/debian/patches/apply-bind-fix isc-dhcp.new/debian/patches/apply-bind-fix
--- isc-dhcp/debian/patches/apply-bind-fix 1970-01-01 00:00:00.000000000 +0000
+++ isc-dhcp.new/debian/patches/apply-bind-fix 2012-02-20 09:23:16.000000000 +0000
@@ -0,0 +1,14 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' isc-dhcp-4.2.2.new~/bind/Makefile isc-dhcp-4.2.2.new/bind/Makefile
+--- isc-dhcp-4.2.2.new~/bind/Makefile 2012-02-18 05:18:50.000000000 +0000
++++ isc-dhcp-4.2.2.new/bind/Makefile 2012-02-18 05:21:52.000000000 +0000
+@@ -34,6 +34,10 @@
+ echo ${bindsrcdir} already unpacked... ; \
+ else \
+ gunzip -c bind.tar.gz | tar xf - ; \
++ patch -p1 < ../debian/patches/manual/fix-bind-non-linux.patch ; \
++ cd $(bindsrcdir) ; \
++ autoconf ; \
++ cd .. ; \
+ fi
+
+ @if test -z "${GMAKE}"; then \
diff -urN isc-dhcp/debian/patches/manual/fix-bind-non-linux.patch isc-dhcp.new/debian/patches/manual/fix-bind-non-linux.patch
--- isc-dhcp/debian/patches/manual/fix-bind-non-linux.patch 1970-01-01 00:00:00.000000000 +0000
+++ isc-dhcp.new/debian/patches/manual/fix-bind-non-linux.patch 2012-02-20 09:24:02.000000000 +0000
@@ -0,0 +1,11 @@
+--- bind/bind-9.8.0-P4/configure.in~ 2011-02-03 06:50:05.000000000 +0100
++++ bind/bind-9.8.0-P4/configure.in 2011-10-15 12:56:31.911737774 +0200
+@@ -263,7 +263,7 @@
+ # as it breaks how the two halves (Basic and Advanced) of the IPv6
+ # Socket API were designed to be used but we have to live with it.
+ # Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
+- *-linux*)
++ *-linux* | *-*-gnu | *-gnu*)
+ STD_CDEFINES="$STD_CDEFINES -D_GNU_SOURCE"
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ ;;
diff -urN isc-dhcp/debian/patches/series isc-dhcp.new/debian/patches/series
--- isc-dhcp/debian/patches/series 2012-02-20 10:06:01.000000000 +0000
+++ isc-dhcp.new/debian/patches/series 2012-02-20 09:22:42.000000000 +0000
@@ -1,3 +1,4 @@
dhclient-script-exit-status
fix_exit_hook_doc_manpage
no_loopback_checksum
+apply-bind-fix
diff -urN isc-dhcp/debian/rules isc-dhcp.new/debian/rules
--- isc-dhcp/debian/rules 2012-02-20 10:06:01.000000000 +0000
+++ isc-dhcp.new/debian/rules 2012-02-20 09:26:11.000000000 +0000
@@ -87,6 +87,11 @@
debconf-updatepo
dh_clean
+ rm -rf bind/bind-*
+ rm -f bind/bindvar.tmp
+ rm -f bind/*.log
+ rm -rf bind/lib
+ rm -rf bind/include
install: install-stamp
install-stamp: build-ldap-stamp build-non-ldap-stamp
