package: bind9
version: 1:9.8.1.dfsg-1.1
severity: serious
Hi,
isc-dhcp now has an embedded copy of the bind9 source, which is
causing all sorts of problems (bugs #643569 and #645760). See
attached patch, which makes it possible to dynamically link isc-dhcp
against it. Note that I had to make a lot of changes to the isc
namespace since it was leading to multiple definitions of the same
symbols. I'm not sure that was the best way to go about fixing that.
Marking as serious since this is leading to RC issues in isc-dhcp.
Thanks,
Mike
diff -u bind9-9.8.1.dfsg/debian/changelog bind9-9.8.1.dfsg/debian/changelog
--- bind9-9.8.1.dfsg/debian/changelog
+++ bind9-9.8.1.dfsg/debian/changelog
@@ -1,3 +1,10 @@
+bind9 (1:9.8.1.dfsg-1.1gilbert1) unstable; urgency=low
+
+ * Build and Install files needed by isc-dhcp.
+ * Clean up all automatically generated files.
+
+ -- Michael Gilbert <michael.s.gilb...@gmail.com> Mon, 16 Jan 2012 11:36:07 -0500
+
bind9 (1:9.8.1.dfsg-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -u bind9-9.8.1.dfsg/debian/rules bind9-9.8.1.dfsg/debian/rules
--- bind9-9.8.1.dfsg/debian/rules
+++ bind9-9.8.1.dfsg/debian/rules
@@ -70,9 +70,14 @@
dh_testroot
-$(MAKE) distclean
find . -name \*.o -exec rm {} \;
+ find . -name Makefile -exec rm {} \;
rm -f build-stamp configure-stamp
rm -f debian/substvars lib/bind/include/isc/platform.h
rm -f contrib/dlz/bin/dlzbdb/Makefile contrib/dlz/drivers/rules
+ rm -f bin/tests/system/dlz/prereq.sh bin/tests/system/gost/prereq.sh
+ rm -f bin/tests/virtual-time/conf.sh contrib/check-secure-delegation.pl
+ rm -f contrib/zone-edit.sh lib/irs/include/irs/platform.h
+ rm -f lib/irs/include/irs/netdb.h lib/export/samples/Makefile-postinstall
rm -f doc/arm/Bv9ARM.pdf
dh_clean
diff -u bind9-9.8.1.dfsg/lib/dns/Makefile.in bind9-9.8.1.dfsg/lib/dns/Makefile.in
--- bind9-9.8.1.dfsg/lib/dns/Makefile.in
+++ bind9-9.8.1.dfsg/lib/dns/Makefile.in
@@ -55,7 +55,7 @@
# Alphabetically
DNSOBJS = acache.@O@ acl.@O@ adb.@O@ byaddr.@O@ \
- cache.@O@ callbacks.@O@ compress.@O@ \
+ cache.@O@ callbacks.@O@ client.@O@ compress.@O@ \
db.@O@ dbiterator.@O@ dbtable.@O@ diff.@O@ dispatch.@O@ \
dlz.@O@ dns64.@O@ dnssec.@O@ ds.@O@ forward.@O@ iptable.@O@ \
journal.@O@ keydata.@O@ keytable.@O@ \
diff -u bind9-9.8.1.dfsg/lib/isc/Makefile.in bind9-9.8.1.dfsg/lib/isc/Makefile.in
--- bind9-9.8.1.dfsg/lib/isc/Makefile.in
+++ bind9-9.8.1.dfsg/lib/isc/Makefile.in
@@ -28,7 +28,7 @@
-I${srcdir}/@ISC_ARCH_DIR@/include \
-I./include \
-I${srcdir}/include @ISC_OPENSSL_INC@
-CDEFINES = @USE_OPENSSL@
+CDEFINES = @USE_OPENSSL@ -DUSE_SOCKETIMPREGISTER -DUSE_TASKIMPREGISTER -DUSE_TIMERIMPREGISTER
CWARNINGS =
# Alphabetically
@@ -61,9 +61,9 @@
netaddr.@O@ netscope.@O@ ondestroy.@O@ \
parseint.@O@ portset.@O@ quota.@O@ radix.@O@ random.@O@ \
ratelimiter.@O@ refcount.@O@ region.@O@ result.@O@ rwlock.@O@ \
- serial.@O@ sha1.@O@ sha2.@O@ sockaddr.@O@ stats.@O@ \
- string.@O@ strtoul.@O@ symtab.@O@ task.@O@ taskpool.@O@ \
- timer.@O@ version.@O@ ${UNIXOBJS} ${NLSOBJS} ${THREADOBJS}
+ serial.@O@ sha1.@O@ sha2.@O@ sockaddr.@O@ socket_api.@O@ stats.@O@ \
+ string.@O@ strtoul.@O@ symtab.@O@ task.@O@ task_api.@O@ taskpool.@O@ \
+ timer.@O@ timer_api.@O@ version.@O@ ${UNIXOBJS} ${NLSOBJS} ${THREADOBJS}
SYMTBLOBJS = backtrace-emptytbl.@O@
# Alphabetically
reverted:
--- bind9-9.8.1.dfsg/contrib/idn/idnkit-1.0-src/util/Makefile
+++ bind9-9.8.1.dfsg.orig/contrib/idn/idnkit-1.0-src/util/Makefile
@@ -1,4 +1,4 @@
+# $Id: Makefile,v 1.1.1.1 2003-06-04 00:27:52 marka Exp $
-# $Id: Makefile,v 1.1.1.1 2003/06/04 00:27:52 marka Exp $
PERL = /usr/local/bin/perl -w
only in patch2:
unchanged:
--- bind9-9.8.1.dfsg.orig/lib/dns/include/dns/Makefile.in
+++ bind9-9.8.1.dfsg/lib/dns/include/dns/Makefile.in
@@ -21,7 +21,7 @@
@BIND9_VERSION@
-HEADERS = acl.h adb.h byaddr.h cache.h callbacks.h cert.h compress.h \
+HEADERS = acl.h adb.h byaddr.h cache.h callbacks.h cert.h client.h compress.h \
db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
dnssec.h ds.h events.h fixedname.h iptable.h journal.h \
keyflags.h keytable.h keyvalues.h lib.h log.h \
@@ -30,7 +30,7 @@
rdata.h rdataclass.h rdatalist.h rdataset.h rdatasetiter.h \
rdataslab.h rdatatype.h request.h resolver.h result.h \
rootns.h rpz.h sdb.h sdlz.h secalg.h secproto.h soa.h ssu.h \
- tcpmsg.h time.h tkey.h tsig.h ttl.h types.h \
+ tcpmsg.h time.h tkey.h tsec.h tsig.h ttl.h types.h \
validator.h version.h view.h xfrin.h zone.h zonekey.h zt.h
GENHEADERS = enumclass.h enumtype.h rdatastruct.h
only in patch2:
unchanged:
--- bind9-9.8.1.dfsg.orig/lib/isc/include/isc/namespace.h
+++ bind9-9.8.1.dfsg/lib/isc/include/isc/namespace.h
@@ -37,6 +37,7 @@
#define isc_app_finish isc__app_finish
#define isc_app_block isc__app_block
#define isc_app_unblock isc__app_unblock
+#define isc_app_ctxfinish isc__app_ctxfinish
#define isc_appctx_create isc__appctx_create
#define isc_appctx_destroy isc__appctx_destroy
#define isc_appctx_settaskmgr isc__appctx_settaskmgr
@@ -87,77 +88,39 @@
#define isc_mempool_setfillcount isc__mempool_setfillcount
#define isc_mempool_getfillcount isc__mempool_getfillcount
-#define isc_socket_create isc__socket_create
-#define isc_socket_attach isc__socket_attach
-#define isc_socket_detach isc__socket_detach
-#define isc_socketmgr_create isc__socketmgr_create
#define isc_socketmgr_create2 isc__socketmgr_create2
-#define isc_socketmgr_destroy isc__socketmgr_destroy
#define isc_socket_open isc__socket_open
#define isc_socket_close isc__socket_close
#define isc_socket_recvv isc__socket_recvv
-#define isc_socket_recv isc__socket_recv
#define isc_socket_recv2 isc__socket_recv2
#define isc_socket_send isc__socket_send
-#define isc_socket_sendto isc__socket_sendto
#define isc_socket_sendv isc__socket_sendv
#define isc_socket_sendtov isc__socket_sendtov
#define isc_socket_sendto2 isc__socket_sendto2
#define isc_socket_cleanunix isc__socket_cleanunix
#define isc_socket_permunix isc__socket_permunix
-#define isc_socket_bind isc__socket_bind
#define isc_socket_filter isc__socket_filter
#define isc_socket_listen isc__socket_listen
#define isc_socket_accept isc__socket_accept
-#define isc_socket_connect isc__socket_connect
#define isc_socket_getname isc__socket_getname
#define isc_socket_gettag isc__socket_gettag
#define isc_socket_getpeername isc__socket_getpeername
-#define isc_socket_getsockname isc__socket_getsockname
-#define isc_socket_cancel isc__socket_cancel
-#define isc_socket_gettype isc__socket_gettype
#define isc_socket_isbound isc__socket_isbound
-#define isc_socket_ipv6only isc__socket_ipv6only
-#define isc_socket_setname isc__socket_setname
#define isc_socketmgr_getmaxsockets isc__socketmgr_getmaxsockets
#define isc_socketmgr_setstats isc__socketmgr_setstats
#define isc_socketmgr_setreserved isc__socketmgr_setreserved
#define isc__socketmgr_maxudp isc___socketmgr_maxudp
-#define isc_socket_fdwatchcreate isc__socket_fdwatchcreate
-#define isc_socket_fdwatchpoke isc__socket_fdwatchpoke
-#define isc_task_create isc__task_create
-#define isc_task_attach isc__task_attach
-#define isc_task_detach isc__task_detach
/* #define isc_task_exiting isc__task_exiting XXXMPA */
-#define isc_task_send isc__task_send
-#define isc_task_sendanddetach isc__task_sendanddetach
-#define isc_task_purgerange isc__task_purgerange
-#define isc_task_purge isc__task_purge
#define isc_task_purgeevent isc__task_purgeevent
#define isc_task_unsendrange isc__task_unsendrange
-#define isc_task_unsend isc__task_unsend
-#define isc_task_onshutdown isc__task_onshutdown
-#define isc_task_shutdown isc__task_shutdown
#define isc_task_destroy isc__task_destroy
-#define isc_task_setname isc__task_setname
#define isc_task_getname isc__task_getname
#define isc_task_gettag isc__task_gettag
#define isc_task_getcurrenttime isc__task_getcurrenttime
-#define isc_taskmgr_create isc__taskmgr_create
-#define isc_taskmgr_destroy isc__taskmgr_destroy
-#define isc_task_beginexclusive isc__task_beginexclusive
-#define isc_task_endexclusive isc__task_endexclusive
-#define isc_timer_create isc__timer_create
-#define isc_timer_reset isc__timer_reset
#define isc_timer_gettype isc__timer_gettype
-#define isc_timer_touch isc__timer_touch
-#define isc_timer_attach isc__timer_attach
-#define isc_timer_detach isc__timer_detach
-#define isc_timermgr_create isc__timermgr_create
#define isc_timermgr_poke isc__timermgr_poke
-#define isc_timermgr_destroy isc__timermgr_destroy
#endif /* BIND9 */
