tag 645670 patch thanks Hi,
Here is a patch that fixes these two issues. It dynamically links to bind and removes the embedded code (note that it would be more ideal to repackage the upstream source without bind, but for clarity I just remove it in the clean rule for now). Note that you'll have to apply the patch in bug #656150 to bind in order for these changes to work. Best wishes, Mike
diff -u isc-dhcp-4.2.2/debian/rules isc-dhcp-4.2.2/debian/rules --- isc-dhcp-4.2.2/debian/rules +++ isc-dhcp-4.2.2/debian/rules @@ -46,7 +46,8 @@ --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-libbind=/usr $(MAKE) $(CROSS) @@ -78,6 +79,7 @@ dh_testdir rm -f build-stamp install-stamp rm -Rf patched-ldap + rm -rf bind/* [ ! -f Makefile ] || $(MAKE) distclean diff -u isc-dhcp-4.2.2/debian/control isc-dhcp-4.2.2/debian/control --- isc-dhcp-4.2.2/debian/control +++ isc-dhcp-4.2.2/debian/control @@ -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, dpatch, po-debconf, libldap2-dev, libssl-dev, autoconf, automake, pkg-config, hardening-wrapper +Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, dpatch, po-debconf, libldap2-dev, libssl-dev, autoconf, automake, pkg-config, hardening-wrapper, libbind-dev (> 1:9.8.1.dfsg-1.1) Standards-Version: 3.9.2 Package: isc-dhcp-server diff -u isc-dhcp-4.2.2/debian/changelog isc-dhcp-4.2.2/debian/changelog --- isc-dhcp-4.2.2/debian/changelog +++ isc-dhcp-4.2.2/debian/changelog @@ -1,3 +1,13 @@ +isc-dhcp (4.2.2-2gilbert1) unstable; urgency=low + + * Eliminate embedded bind library: + - Fixes a build failure on kfreebsd within the bind sources + (closes: #643569). + - Removes non-free IETF documents again within the bind library + (closes: #645760). + + -- Michael Gilbert <michael.s.gilb...@gmail.com> Mon, 16 Jan 2012 11:47:37 -0500 + isc-dhcp (4.2.2-2) unstable; urgency=low * debian/rules: use dpkg-buildflags to set CFLAGS, and export CFLAGS (closes: only in patch2: unchanged: --- isc-dhcp-4.2.2.orig/Makefile.in +++ isc-dhcp-4.2.2/Makefile.in @@ -182,11 +182,9 @@ doc/ja_JP.eucJP/dhclient-script.8 doc/ja_JP.eucJP/dhclient.8 \ doc/ja_JP.eucJP/dhclient.conf.5 doc/ja_JP.eucJP/dhclient.leases.5 \ doc/ja_JP.eucJP/dhcp-eval.5 doc/ja_JP.eucJP/dhcp-options.5 \ - doc/examples/dhclient-dhcpv6.conf doc/examples/dhcpd-dhcpv6.conf \ - util/bindvar.sh \ - bind/Makefile bind/bind.tar.gz bind/version.tmp + doc/examples/dhclient-dhcpv6.conf doc/examples/dhcpd-dhcpv6.conf -SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server +SUBDIRS = includes tests common dst omapip client dhcpctl relay server nobase_include_HEADERS = dhcpctl/dhcpctl.h all: all-recursive only in patch2: unchanged: --- isc-dhcp-4.2.2.orig/dhcpctl/Makefile.in +++ isc-dhcp-4.2.2/dhcpctl/Makefile.in @@ -64,11 +64,11 @@ am_cltest_OBJECTS = cltest.$(OBJEXT) cltest_OBJECTS = $(am_cltest_OBJECTS) cltest_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \ - ../omapip/libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a + ../omapip/libomapi.a am_omshell_OBJECTS = omshell.$(OBJEXT) omshell_OBJECTS = $(am_omshell_OBJECTS) omshell_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \ - ../omapip/libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a + ../omapip/libomapi.a DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -180,13 +180,11 @@ man_MANS = omshell.1 dhcpctl.3 EXTRA_DIST = $(man_MANS) omshell_SOURCES = omshell.c -omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a +omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a -lisc -ldns libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c cltest_SOURCES = cltest.c -cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a +cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a -lisc -ldns all: all-am only in patch2: unchanged: --- isc-dhcp-4.2.2.orig/client/Makefile.in +++ isc-dhcp-4.2.2/client/Makefile.in @@ -49,8 +49,7 @@ am_dhclient_OBJECTS = clparse.$(OBJEXT) dhclient.$(OBJEXT) \ dhc6.$(OBJEXT) dhclient_OBJECTS = $(am_dhclient_OBJECTS) -dhclient_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a +dhclient_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -171,8 +170,7 @@ scripts/netbsd scripts/nextstep scripts/openbsd \ scripts/solaris scripts/openwrt -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a -ldns -lisc man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) only in patch2: unchanged: --- isc-dhcp-4.2.2.orig/omapip/isclib.c +++ isc-dhcp-4.2.2/omapip/isclib.c @@ -82,8 +82,6 @@ memset(&dhcp_gbl_ctx, 0, sizeof (dhcp_gbl_ctx)); - isc_lib_register(); - /* get the current time for use as the random seed */ gettimeofday(&cur_tv, (struct timezone *)0); isc_random_seed(cur_tv.tv_sec); only in patch2: unchanged: --- isc-dhcp-4.2.2.orig/omapip/Makefile.in +++ isc-dhcp-4.2.2/omapip/Makefile.in @@ -66,8 +66,7 @@ PROGRAMS = $(noinst_PROGRAMS) am_svtest_OBJECTS = test.$(OBJEXT) svtest_OBJECTS = $(am_svtest_OBJECTS) -svtest_DEPENDENCIES = libomapi.a ../bind/lib/libdns.a \ - ../bind/lib/libisc.a +svtest_DEPENDENCIES = libomapi.a DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -182,7 +181,7 @@ man_MANS = omapi.3 EXTRA_DIST = $(man_MANS) svtest_SOURCES = test.c -svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a +svtest_LDADD = libomapi.a -ldns -lisc all: all-am .SUFFIXES: only in patch2: unchanged: --- isc-dhcp-4.2.2.orig/server/Makefile.in +++ isc-dhcp-4.2.2/server/Makefile.in @@ -57,8 +57,7 @@ dhcpd-ldap_casa.$(OBJEXT) dhcpd_OBJECTS = $(am_dhcpd_OBJECTS) dhcpd_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \ - ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \ - ../bind/lib/libisc.a + ../dhcpctl/libdhcpctl.a dhcpd_LINK = $(CCLD) $(dhcpd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes @@ -183,8 +182,7 @@ dhcpd_CFLAGS = $(LDAP_CFLAGS) dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \ - ../bind/lib/libisc.a + ../dhcpctl/libdhcpctl.a -lisc -ldns -lldap man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 EXTRA_DIST = $(man_MANS) only in patch2: unchanged: --- isc-dhcp-4.2.2.orig/relay/Makefile.in +++ isc-dhcp-4.2.2/relay/Makefile.in @@ -45,8 +45,7 @@ PROGRAMS = $(sbin_PROGRAMS) am_dhcrelay_OBJECTS = dhcrelay.$(OBJEXT) dhcrelay_OBJECTS = $(am_dhcrelay_OBJECTS) -dhcrelay_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a +dhcrelay_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -154,8 +153,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' dhcrelay_SOURCES = dhcrelay.c -dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a +dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a -lisc -ldns man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS)
