diff --git a/.cvsignore b/.cvsignore index 20fb525..2815858 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -bind-9.7.0a2.tar.gz +bind-9.7.0a3.tar.gz config-4.tar.bz2 diff --git a/bind-9.3.1rc1-sdb_tools-Makefile.in b/bind-9.3.1rc1-sdb_tools-Makefile.in index 33dbfcd..7f3c5e2 100644 --- a/bind-9.3.1rc1-sdb_tools-Makefile.in +++ b/bind-9.3.1rc1-sdb_tools-Makefile.in @@ -10,6 +10,8 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include \ ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} +CDEFINES = -DBIND9 + DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ diff --git a/bind-9.5-libidn.patch b/bind-9.5-libidn.patch index bb0070a..b8e9ba5 100644 --- a/bind-9.5-libidn.patch +++ b/bind-9.5-libidn.patch @@ -1,6 +1,6 @@ -diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c ---- bind-9.6.1b1/bin/dig/dighost.c.libidn 2009-02-25 03:39:21.000000000 +0100 -+++ bind-9.6.1b1/bin/dig/dighost.c 2009-03-30 15:01:41.350136527 +0200 +diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c +--- bind-9.7.0a3/bin/dig/dighost.c.libidn 2009-09-01 02:22:24.000000000 +0200 ++++ bind-9.7.0a3/bin/dig/dighost.c 2009-09-16 12:58:36.044643387 +0200 @@ -44,6 +44,11 @@ #include #endif @@ -28,7 +28,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c /*% * Exit Codes: * -@@ -1012,6 +1025,9 @@ setup_system(void) { +@@ -1029,6 +1042,9 @@ setup_system(void) { dig_searchlist_t *domain = NULL; lwres_result_t lwresult; unsigned int lwresflags; @@ -38,7 +38,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c debug("setup_system()"); -@@ -1068,8 +1084,15 @@ setup_system(void) { +@@ -1087,8 +1103,15 @@ setup_system(void) { #ifdef WITH_IDN initialize_idn(); @@ -55,7 +55,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c if (keyfile[0] != 0) setup_file_key(); else if (keysecret[0] != 0) -@@ -1770,12 +1793,18 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -1789,12 +1812,18 @@ setup_lookup(dig_lookup_t *lookup) { idn_result_t mr; char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME]; #endif @@ -75,7 +75,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c REQUIRE(lookup != NULL); INSIST(!free_now); -@@ -1812,6 +1841,16 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -1831,6 +1860,16 @@ setup_lookup(dig_lookup_t *lookup) { mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname, utf8_textname, sizeof(utf8_textname)); idn_check_result(mr, "convert textname to UTF-8"); @@ -92,7 +92,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c #endif /* -@@ -1831,6 +1870,15 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -1850,6 +1889,15 @@ setup_lookup(dig_lookup_t *lookup) { lookup->origin = ISC_LIST_HEAD(search_list); lookup->need_search = ISC_FALSE; } @@ -108,7 +108,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c #else if ((count_dots(lookup->textname) >= ndots) || !usesearch) { lookup->origin = NULL; /* Force abs lookup */ -@@ -1857,6 +1905,20 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -1876,6 +1924,20 @@ setup_lookup(dig_lookup_t *lookup) { IDN_IDNCONV | IDN_LENCHECK, utf8_textname, idn_textname, sizeof(idn_textname)); idn_check_result(mr, "convert UTF-8 textname to IDN encoding"); @@ -129,22 +129,21 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c #else if (lookup->origin != NULL) { debug("trying origin %s", lookup->origin->origin); -@@ -1913,6 +1975,14 @@ setup_lookup(dig_lookup_t *lookup) { - dns_rootname, - ISC_FALSE, +@@ -1931,6 +1993,13 @@ setup_lookup(dig_lookup_t *lookup) { + result = dns_name_fromtext(lookup->name, &b, + dns_rootname, 0, &lookup->namebuf); +#elif defined (WITH_LIBIDN) + len = strlen (ascii_name); + isc_buffer_init(&b, ascii_name, len); + isc_buffer_add(&b, len); + result = dns_name_fromtext(lookup->name, &b, -+ dns_rootname, -+ ISC_FALSE, ++ dns_rootname, 0, + &lookup->namebuf); #else len = strlen(lookup->textname); isc_buffer_init(&b, lookup->textname, len); -@@ -3432,7 +3502,7 @@ destroy_libs(void) { +@@ -3449,7 +3518,7 @@ destroy_libs(void) { void * ptr; dig_message_t *chase_msg; #endif @@ -153,7 +152,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c isc_result_t result; #endif -@@ -3471,6 +3541,10 @@ destroy_libs(void) { +@@ -3488,6 +3557,10 @@ destroy_libs(void) { result = dns_name_settotextfilter(NULL); check_result(result, "dns_name_settotextfilter"); #endif @@ -164,7 +163,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c dns_name_destroy(); if (commctx != NULL) { -@@ -3647,6 +3721,79 @@ idn_check_result(idn_result_t r, const c +@@ -3664,6 +3737,79 @@ idn_check_result(idn_result_t r, const c } } #endif /* WITH_IDN */ @@ -244,19 +243,23 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c #ifdef DIG_SIGCHASE void -diff -up bind-9.6.1b1/bin/dig/Makefile.in.libidn bind-9.6.1b1/bin/dig/Makefile.in ---- bind-9.6.1b1/bin/dig/Makefile.in.libidn 2007-06-20 01:46:59.000000000 +0200 -+++ bind-9.6.1b1/bin/dig/Makefile.in 2009-03-30 15:00:42.883135505 +0200 -@@ -45,7 +45,7 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} +diff -up bind-9.7.0a3/bin/dig/Makefile.in.libidn bind-9.7.0a3/bin/dig/Makefile.in +--- bind-9.7.0a3/bin/dig/Makefile.in.libidn 2009-09-03 01:48:01.000000000 +0200 ++++ bind-9.7.0a3/bin/dig/Makefile.in 2009-09-16 12:59:00.314643312 +0200 +@@ -46,10 +46,10 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${LWRESDEPLIBS} LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \ - ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ + ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn + NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCNOSYMLIBS} \ +- ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ ++ ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn + SUBDIRS = -@@ -63,6 +63,8 @@ HTMLPAGES = dig.html host.html nslookup. +@@ -67,6 +67,8 @@ HTMLPAGES = dig.html host.html nslookup. MANOBJS = ${MANPAGES} ${HTMLPAGES} diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch index 5ce3d17..726a96f 100644 --- a/bind-9.5-sdb.patch +++ b/bind-9.5-sdb.patch @@ -1,6 +1,6 @@ -diff -up bind-9.7.0a2/bin/Makefile.in.sdb bind-9.7.0a2/bin/Makefile.in ---- bind-9.7.0a2/bin/Makefile.in.sdb 2009-06-10 02:27:21.000000000 +0200 -+++ bind-9.7.0a2/bin/Makefile.in 2009-09-15 14:43:48.966994484 +0200 +diff -up bind-9.7.0a3/bin/Makefile.in.sdb bind-9.7.0a3/bin/Makefile.in +--- bind-9.7.0a3/bin/Makefile.in.sdb 2009-06-10 02:27:21.000000000 +0200 ++++ bind-9.7.0a3/bin/Makefile.in 2009-09-16 12:55:29.034655166 +0200 @@ -19,7 +19,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ @@ -11,28 +11,33 @@ diff -up bind-9.7.0a2/bin/Makefile.in.sdb bind-9.7.0a2/bin/Makefile.in TARGETS = @BIND9_MAKE_RULES@ -diff -up bind-9.7.0a2/bin/named/Makefile.in.sdb bind-9.7.0a2/bin/named/Makefile.in ---- bind-9.7.0a2/bin/named/Makefile.in.sdb 2009-09-15 14:41:03.827015348 +0200 -+++ bind-9.7.0a2/bin/named/Makefile.in 2009-09-15 14:41:03.886994927 +0200 +diff -up bind-9.7.0a3/bin/named/Makefile.in.sdb bind-9.7.0a3/bin/named/Makefile.in +--- bind-9.7.0a3/bin/named/Makefile.in.sdb 2009-09-16 12:55:28.994644340 +0200 ++++ bind-9.7.0a3/bin/named/Makefile.in 2009-09-16 12:56:40.424643332 +0200 @@ -45,7 +45,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} --CDEFINES = @USE_DLZ@ -+CDEFINES = +-CDEFINES = -DBIND9 @USE_DLZ@ ++CDEFINES = -DBIND9 CWARNINGS = -@@ -68,7 +68,7 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} +@@ -69,11 +69,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \ - ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@ + @LIBS@ + NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ + ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \ +- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@ ++ @LIBS@ + SUBDIRS = unix -@@ -81,8 +81,7 @@ OBJS = builtin.@O@ client.@O@ config.@O +@@ -86,8 +86,7 @@ OBJS = builtin.@O@ client.@O@ config.@O tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \ zoneconf.@O@ \ lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \ @@ -42,7 +47,7 @@ diff -up bind-9.7.0a2/bin/named/Makefile.in.sdb bind-9.7.0a2/bin/named/Makefile. UOBJS = unix/os.@O@ -@@ -93,8 +92,7 @@ SRCS = builtin.c client.c config.c cont +@@ -100,8 +99,7 @@ SRCS = builtin.c client.c config.c cont tkeyconf.c tsigconf.c update.c xfrout.c \ zoneconf.c \ lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ @@ -52,16 +57,16 @@ diff -up bind-9.7.0a2/bin/named/Makefile.in.sdb bind-9.7.0a2/bin/named/Makefile. MANPAGES = named.8 lwresd.8 named.conf.5 -@@ -158,5 +156,3 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i +@@ -166,5 +164,3 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i ${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5 - -@DLZ_DRIVER_RULES@ -diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c ---- bind-9.7.0a2/bin/named-sdb/main.c.sdb 2009-09-15 14:41:03.846995272 +0200 -+++ bind-9.7.0a2/bin/named-sdb/main.c 2009-09-15 14:41:03.886994927 +0200 -@@ -74,6 +74,9 @@ +diff -up bind-9.7.0a3/bin/named-sdb/main.c.sdb bind-9.7.0a3/bin/named-sdb/main.c +--- bind-9.7.0a3/bin/named-sdb/main.c.sdb 2009-09-16 12:55:29.014643786 +0200 ++++ bind-9.7.0a3/bin/named-sdb/main.c 2009-09-16 12:55:29.034655166 +0200 +@@ -75,6 +75,9 @@ * Include header files for database drivers here. */ /* #include "xxdb.h" */ @@ -71,7 +76,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c /* * Include DLZ drivers if appropriate. -@@ -685,6 +688,10 @@ setup(void) { +@@ -757,6 +760,10 @@ setup(void) { ns_main_earlyfatal("isc_app_start() failed: %s", isc_result_totext(result)); @@ -82,7 +87,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version, saved_command_line); -@@ -766,6 +773,57 @@ setup(void) { +@@ -840,6 +847,57 @@ setup(void) { isc_result_totext(result)); #endif @@ -140,7 +145,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c ns_server_create(ns_g_mctx, &ns_g_server); } -@@ -793,6 +851,10 @@ cleanup(void) { +@@ -867,6 +925,10 @@ cleanup(void) { dns_name_destroy(); @@ -151,9 +156,9 @@ diff -up bind-9.7.0a2/bin/named-sdb/main.c.sdb bind-9.7.0a2/bin/named-sdb/main.c isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ISC_LOG_NOTICE, "exiting"); ns_log_shutdown(); -diff -up bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb bind-9.7.0a2/bin/named-sdb/Makefile.in ---- bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb 2009-09-15 14:41:03.846995272 +0200 -+++ bind-9.7.0a2/bin/named-sdb/Makefile.in 2009-09-15 14:43:19.486994430 +0200 +diff -up bind-9.7.0a3/bin/named-sdb/Makefile.in.sdb bind-9.7.0a3/bin/named-sdb/Makefile.in +--- bind-9.7.0a3/bin/named-sdb/Makefile.in.sdb 2009-09-16 12:55:29.014643786 +0200 ++++ bind-9.7.0a3/bin/named-sdb/Makefile.in 2009-09-16 12:57:05.617143628 +0200 @@ -28,10 +28,10 @@ top_srcdir = @top_srcdir@ # # Add database drivers here. @@ -168,7 +173,7 @@ diff -up bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb bind-9.7.0a2/bin/named-sdb/M DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers -@@ -72,7 +72,7 @@ LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9L +@@ -77,7 +77,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BI SUBDIRS = unix @@ -177,16 +182,16 @@ diff -up bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb bind-9.7.0a2/bin/named-sdb/M OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \ controlconf.@O@ interfacemgr.@O@ \ -@@ -125,7 +125,7 @@ config.@O@: config.c bind.keys.h +@@ -132,7 +132,7 @@ config.@O@: config.c bind.keys.h -DNS_SYSCONFDIR=\"${sysconfdir}\" \ -c ${srcdir}/config.c -named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS} +named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ - ${OBJS} ${UOBJS} ${LIBS} - -@@ -149,14 +149,8 @@ statschannel.@O@: bind9.xsl.h + export MAKE_SYMTABLE="yes"; \ + export BASEOBJS="${OBJS} ${UOBJS}"; \ + ${FINALBUILDCMD} +@@ -157,14 +157,8 @@ statschannel.@O@: bind9.xsl.h installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} @@ -203,10 +208,10 @@ diff -up bind-9.7.0a2/bin/named-sdb/Makefile.in.sdb bind-9.7.0a2/bin/named-sdb/M + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir} @DLZ_DRIVER_RULES@ -diff -up bind-9.7.0a2/configure.in.sdb bind-9.7.0a2/configure.in ---- bind-9.7.0a2/configure.in.sdb 2009-07-15 00:38:37.000000000 +0200 -+++ bind-9.7.0a2/configure.in 2009-09-15 14:43:00.036994464 +0200 -@@ -2958,6 +2958,8 @@ AC_CONFIG_FILES([ +diff -up bind-9.7.0a3/configure.in.sdb bind-9.7.0a3/configure.in +--- bind-9.7.0a3/configure.in.sdb 2009-09-04 02:44:54.000000000 +0200 ++++ bind-9.7.0a3/configure.in 2009-09-16 12:55:29.044644803 +0200 +@@ -3144,6 +3144,8 @@ AC_CONFIG_FILES([ bin/confgen/unix/Makefile bin/named/Makefile bin/named/unix/Makefile @@ -215,7 +220,7 @@ diff -up bind-9.7.0a2/configure.in.sdb bind-9.7.0a2/configure.in bin/rndc/Makefile bin/dig/Makefile bin/nsupdate/Makefile -@@ -2979,6 +2981,7 @@ AC_CONFIG_FILES([ +@@ -3165,6 +3167,7 @@ AC_CONFIG_FILES([ bin/tests/headerdep_test.sh bin/tools/Makefile bin/dnssec/Makefile diff --git a/bind-96-dyndb.patch b/bind-96-dyndb.patch index 3e505ac..4966fd1 100644 --- a/bind-96-dyndb.patch +++ b/bind-96-dyndb.patch @@ -1,7 +1,7 @@ -diff -up bind-9.7.0a2/bin/named/main.c.dyndb bind-9.7.0a2/bin/named/main.c ---- bind-9.7.0a2/bin/named/main.c.dyndb 2009-05-07 11:33:52.000000000 +0200 -+++ bind-9.7.0a2/bin/named/main.c 2009-09-15 14:35:49.054494598 +0200 -@@ -44,6 +44,7 @@ +diff -up bind-9.7.0a3/bin/named/main.c.dyndb bind-9.7.0a3/bin/named/main.c +--- bind-9.7.0a3/bin/named/main.c.dyndb 2009-09-01 20:40:25.000000000 +0200 ++++ bind-9.7.0a3/bin/named/main.c 2009-09-16 10:47:35.744643926 +0200 +@@ -45,6 +45,7 @@ #include #include @@ -9,7 +9,7 @@ diff -up bind-9.7.0a2/bin/named/main.c.dyndb bind-9.7.0a2/bin/named/main.c #include #include #include -@@ -770,6 +771,8 @@ setup(void) { +@@ -844,6 +845,8 @@ setup(void) { static void cleanup(void) { @@ -18,9 +18,9 @@ diff -up bind-9.7.0a2/bin/named/main.c.dyndb bind-9.7.0a2/bin/named/main.c destroy_managers(); ns_server_destroy(&ns_g_server); -diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c ---- bind-9.7.0a2/bin/named/server.c.dyndb 2009-08-05 19:35:33.000000000 +0200 -+++ bind-9.7.0a2/bin/named/server.c 2009-09-15 14:35:49.064494786 +0200 +diff -up bind-9.7.0a3/bin/named/server.c.dyndb bind-9.7.0a3/bin/named/server.c +--- bind-9.7.0a3/bin/named/server.c.dyndb 2009-09-10 03:49:29.000000000 +0200 ++++ bind-9.7.0a3/bin/named/server.c 2009-09-16 10:47:35.744643926 +0200 @@ -58,6 +58,7 @@ #ifdef DLZ #include @@ -29,7 +29,7 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c #include #include #include -@@ -1036,6 +1037,72 @@ configure_peer(const cfg_obj_t *cpeer, i +@@ -1054,6 +1055,72 @@ configure_peer(const cfg_obj_t *cpeer, i } static isc_result_t @@ -102,7 +102,7 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) { isc_result_t result; const cfg_obj_t *algorithms; -@@ -1245,6 +1312,7 @@ configure_view(dns_view_t *view, const c +@@ -1263,6 +1330,7 @@ configure_view(dns_view_t *view, const c unsigned int dlzargc; char **dlzargv; #endif @@ -110,7 +110,7 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c const cfg_obj_t *disabled; const cfg_obj_t *obj; const cfg_listelt_t *element; -@@ -1429,6 +1497,37 @@ configure_view(dns_view_t *view, const c +@@ -1447,6 +1515,37 @@ configure_view(dns_view_t *view, const c #endif /* @@ -148,7 +148,7 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c * Obtain configuration parameters that affect the decision of whether * we can reuse/share an existing cache. */ -@@ -3581,6 +3680,7 @@ load_configuration(const char *filename, +@@ -3598,6 +3697,7 @@ load_configuration(const char *filename, result = isc_task_beginexclusive(server->task); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -156,7 +156,7 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c /* * Parse the global default pseudo-config file. */ -@@ -4927,6 +5027,8 @@ loadconfig(ns_server_t *server) { +@@ -4944,6 +5044,8 @@ loadconfig(ns_server_t *server) { static isc_result_t reload(ns_server_t *server) { isc_result_t result; @@ -165,9 +165,9 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c CHECK(loadconfig(server)); result = load_zones(server, ISC_FALSE); -diff -up /dev/null bind-9.7.0a2/lib/dns/dynamic_db.c ---- /dev/null 2009-09-15 11:43:46.690717252 +0200 -+++ bind-9.7.0a2/lib/dns/dynamic_db.c 2009-09-15 14:35:49.064494786 +0200 +diff -up /dev/null bind-9.7.0a3/lib/dns/dynamic_db.c +--- /dev/null 2009-09-16 12:27:54.710000266 +0200 ++++ bind-9.7.0a3/lib/dns/dynamic_db.c 2009-09-16 10:47:35.744643926 +0200 @@ -0,0 +1,364 @@ +/* + * Copyright (C) 2008-2009 Red Hat, Inc. @@ -533,9 +533,9 @@ diff -up /dev/null bind-9.7.0a2/lib/dns/dynamic_db.c + + return args->timermgr; +} -diff -up /dev/null bind-9.7.0a2/lib/dns/include/dns/dynamic_db.h ---- /dev/null 2009-09-15 11:43:46.690717252 +0200 -+++ bind-9.7.0a2/lib/dns/include/dns/dynamic_db.h 2009-09-15 14:35:49.064494786 +0200 +diff -up /dev/null bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h +--- /dev/null 2009-09-16 12:27:54.710000266 +0200 ++++ bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h 2009-09-16 10:47:35.744643926 +0200 @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2008-2009 Red Hat, Inc. @@ -587,9 +587,9 @@ diff -up /dev/null bind-9.7.0a2/lib/dns/include/dns/dynamic_db.h +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args); + +#endif -diff -up bind-9.7.0a2/lib/dns/include/dns/log.h.dyndb bind-9.7.0a2/lib/dns/include/dns/log.h ---- bind-9.7.0a2/lib/dns/include/dns/log.h.dyndb 2009-01-18 00:47:43.000000000 +0100 -+++ bind-9.7.0a2/lib/dns/include/dns/log.h 2009-09-15 14:35:49.064494786 +0200 +diff -up bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb bind-9.7.0a3/lib/dns/include/dns/log.h +--- bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb 2009-01-18 00:47:43.000000000 +0100 ++++ bind-9.7.0a3/lib/dns/include/dns/log.h 2009-09-16 10:47:35.744643926 +0200 @@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul #define DNS_LOGMODULE_HINTS (&dns_modules[24]) #define DNS_LOGMODULE_ACACHE (&dns_modules[25]) @@ -598,9 +598,9 @@ diff -up bind-9.7.0a2/lib/dns/include/dns/log.h.dyndb bind-9.7.0a2/lib/dns/inclu ISC_LANG_BEGINDECLS -diff -up bind-9.7.0a2/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns/include/dns/Makefile.in ---- bind-9.7.0a2/lib/dns/include/dns/Makefile.in.dyndb 2008-11-15 00:47:33.000000000 +0100 -+++ bind-9.7.0a2/lib/dns/include/dns/Makefile.in 2009-09-15 14:35:49.064494786 +0200 +diff -up bind-9.7.0a3/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/include/dns/Makefile.in +--- bind-9.7.0a3/lib/dns/include/dns/Makefile.in.dyndb 2008-11-15 00:47:33.000000000 +0100 ++++ bind-9.7.0a3/lib/dns/include/dns/Makefile.in 2009-09-16 10:47:35.744643926 +0200 @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ HEADERS = acl.h adb.h byaddr.h cache.h callbacks.h \ @@ -610,10 +610,10 @@ diff -up bind-9.7.0a2/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \ keytable.h keyvalues.h lib.h log.h master.h masterdump.h \ message.h name.h ncache.h \ -diff -up bind-9.7.0a2/lib/dns/include/dns/types.h.dyndb bind-9.7.0a2/lib/dns/include/dns/types.h ---- bind-9.7.0a2/lib/dns/include/dns/types.h.dyndb 2009-07-19 06:18:05.000000000 +0200 -+++ bind-9.7.0a2/lib/dns/include/dns/types.h 2009-09-15 14:35:49.064494786 +0200 -@@ -56,6 +56,7 @@ typedef struct dns_dbtable dns_dbtable +diff -up bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb bind-9.7.0a3/lib/dns/include/dns/types.h +--- bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb 2009-09-01 02:22:27.000000000 +0200 ++++ bind-9.7.0a3/lib/dns/include/dns/types.h 2009-09-16 10:47:35.744643926 +0200 +@@ -60,6 +60,7 @@ typedef struct dns_dbtable dns_dbtable typedef void dns_dbversion_t; typedef struct dns_dlzimplementation dns_dlzimplementation_t; typedef struct dns_dlzdb dns_dlzdb_t; @@ -621,9 +621,9 @@ diff -up bind-9.7.0a2/lib/dns/include/dns/types.h.dyndb bind-9.7.0a2/lib/dns/inc typedef struct dns_sdlzimplementation dns_sdlzimplementation_t; typedef struct dns_decompress dns_decompress_t; typedef struct dns_dispatch dns_dispatch_t; -diff -up bind-9.7.0a2/lib/dns/log.c.dyndb bind-9.7.0a2/lib/dns/log.c ---- bind-9.7.0a2/lib/dns/log.c.dyndb 2007-06-19 01:47:40.000000000 +0200 -+++ bind-9.7.0a2/lib/dns/log.c 2009-09-15 14:35:49.064494786 +0200 +diff -up bind-9.7.0a3/lib/dns/log.c.dyndb bind-9.7.0a3/lib/dns/log.c +--- bind-9.7.0a3/lib/dns/log.c.dyndb 2007-06-19 01:47:40.000000000 +0200 ++++ bind-9.7.0a3/lib/dns/log.c 2009-09-16 10:47:35.744643926 +0200 @@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns { "dns/hints", 0 }, { "dns/acache", 0 }, @@ -632,9 +632,9 @@ diff -up bind-9.7.0a2/lib/dns/log.c.dyndb bind-9.7.0a2/lib/dns/log.c { NULL, 0 } }; -diff -up bind-9.7.0a2/lib/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns/Makefile.in ---- bind-9.7.0a2/lib/dns/Makefile.in.dyndb 2009-09-15 14:35:49.044494756 +0200 -+++ bind-9.7.0a2/lib/dns/Makefile.in 2009-09-15 14:36:51.104494645 +0200 +diff -up bind-9.7.0a3/lib/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/Makefile.in +--- bind-9.7.0a3/lib/dns/Makefile.in.dyndb 2009-09-16 10:47:35.714664894 +0200 ++++ bind-9.7.0a3/lib/dns/Makefile.in 2009-09-16 10:47:35.744643926 +0200 @@ -57,8 +57,8 @@ DSTOBJS = @DST_EXTRA_OBJS@ \ DNSOBJS = acache.@O@ acl.@O@ adb.@O@ byaddr.@O@ \ cache.@O@ callbacks.@O@ compress.@O@ \ @@ -667,9 +667,9 @@ diff -up bind-9.7.0a2/lib/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns/Makefile.in libdns.@SA@: ${OBJS} ${AR} ${ARFLAGS} $@ ${OBJS} ${RANLIB} $@ -diff -up bind-9.7.0a2/lib/isccfg/namedconf.c.dyndb bind-9.7.0a2/lib/isccfg/namedconf.c ---- bind-9.7.0a2/lib/isccfg/namedconf.c.dyndb 2009-07-29 19:52:00.000000000 +0200 -+++ bind-9.7.0a2/lib/isccfg/namedconf.c 2009-09-15 14:37:13.096994453 +0200 +diff -up bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb bind-9.7.0a3/lib/isccfg/namedconf.c +--- bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb 2009-09-02 18:10:03.000000000 +0200 ++++ bind-9.7.0a3/lib/isccfg/namedconf.c 2009-09-16 10:52:11.257143715 +0200 @@ -87,6 +87,7 @@ static cfg_type_t cfg_type_controls; static cfg_type_t cfg_type_controls_sockaddr; static cfg_type_t cfg_type_destinationlist; @@ -678,15 +678,15 @@ diff -up bind-9.7.0a2/lib/isccfg/namedconf.c.dyndb bind-9.7.0a2/lib/isccfg/named static cfg_type_t cfg_type_ixfrdifftype; static cfg_type_t cfg_type_key; static cfg_type_t cfg_type_logfile; -@@ -760,6 +761,7 @@ namedconf_or_view_clauses[] = { +@@ -791,6 +792,7 @@ namedconf_or_view_clauses[] = { { "zone", &cfg_type_zone, CFG_CLAUSEFLAG_MULTI }, /* only 1 DLZ per view allowed */ { "dlz", &cfg_type_dynamically_loadable_zones, 0 }, + { "dynamic-db", &cfg_type_dynamic_db, CFG_CLAUSEFLAG_MULTI }, { "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI }, { "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI }, - { "managed-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI }, -@@ -1531,6 +1533,40 @@ static cfg_type_t cfg_type_dialuptype = + { "managed-keys", &cfg_type_managedkeys, CFG_CLAUSEFLAG_MULTI }, +@@ -1561,6 +1563,40 @@ static cfg_type_t cfg_type_dialuptype = &cfg_rep_string, dialup_enums }; diff --git a/bind-nonexec.patch b/bind-nonexec.patch index 9e65912..9d842df 100644 --- a/bind-nonexec.patch +++ b/bind-nonexec.patch @@ -1,28 +1,31 @@ ---- bind-9.2.4rc6/lib/dns/Makefile.in.nonexec 2004-04-14 20:35:27.000000000 -0400 -+++ bind-9.2.4rc6/lib/dns/Makefile.in 2004-07-16 19:25:40.000000000 -0400 -@@ -136,7 +136,7 @@ +diff -up bind-9.7.0a3/lib/bind9/Makefile.in.nonexec bind-9.7.0a3/lib/bind9/Makefile.in +--- bind-9.7.0a3/lib/bind9/Makefile.in.nonexec 2009-09-03 01:48:01.000000000 +0200 ++++ bind-9.7.0a3/lib/bind9/Makefile.in 2009-09-16 10:46:27.554643093 +0200 +@@ -78,7 +78,7 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs -- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ ${DESTDIR}${libdir} -+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns.@A@ ${DESTDIR}${libdir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind9.@A@ ${DESTDIR}${libdir} ++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libbind9.@A@ ${DESTDIR}${libdir} clean distclean:: - rm -f libdns.@A@ timestamp ---- bind-9.2.4rc6/lib/isc/Makefile.in.nonexec 2004-03-09 01:11:44.000000000 -0500 -+++ bind-9.2.4rc6/lib/isc/Makefile.in 2004-07-16 19:24:46.000000000 -0400 -@@ -105,7 +105,7 @@ + rm -f libbind9.@A@ timestamp +diff -up bind-9.7.0a3/lib/dns/Makefile.in.nonexec bind-9.7.0a3/lib/dns/Makefile.in +--- bind-9.7.0a3/lib/dns/Makefile.in.nonexec 2009-09-01 02:22:26.000000000 +0200 ++++ bind-9.7.0a3/lib/dns/Makefile.in 2009-09-16 10:46:27.554643093 +0200 +@@ -132,7 +132,7 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs -- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir} -+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc.@A@ ${DESTDIR}${libdir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ ${DESTDIR}${libdir} ++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns.@A@ ${DESTDIR}${libdir} clean distclean:: - rm -f libisc.@A@ libisc.la timestamp ---- bind-9.2.4rc6/lib/isccc/Makefile.in.nonexec 2004-03-09 01:12:25.000000000 -0500 -+++ bind-9.2.4rc6/lib/isccc/Makefile.in 2004-07-16 19:26:40.000000000 -0400 -@@ -80,7 +80,7 @@ + rm -f libdns.@A@ timestamp +diff -up bind-9.7.0a3/lib/isccc/Makefile.in.nonexec bind-9.7.0a3/lib/isccc/Makefile.in +--- bind-9.7.0a3/lib/isccc/Makefile.in.nonexec 2009-09-03 01:48:03.000000000 +0200 ++++ bind-9.7.0a3/lib/isccc/Makefile.in 2009-09-16 10:46:27.554643093 +0200 +@@ -80,7 +80,7 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs @@ -31,9 +34,10 @@ clean distclean:: rm -f libisccc.@A@ timestamp ---- bind-9.2.4rc6/lib/isccfg/Makefile.in.nonexec 2004-03-09 01:12:30.000000000 -0500 -+++ bind-9.2.4rc6/lib/isccfg/Makefile.in 2004-07-16 19:27:22.000000000 -0400 -@@ -77,7 +77,7 @@ +diff -up bind-9.7.0a3/lib/isccfg/Makefile.in.nonexec bind-9.7.0a3/lib/isccfg/Makefile.in +--- bind-9.7.0a3/lib/isccfg/Makefile.in.nonexec 2009-09-03 01:48:03.000000000 +0200 ++++ bind-9.7.0a3/lib/isccfg/Makefile.in 2009-09-16 10:46:27.554643093 +0200 +@@ -77,7 +77,7 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs @@ -42,26 +46,27 @@ clean distclean:: rm -f libisccfg.@A@ timestamp ---- bind-9.2.4rc6/lib/lwres/Makefile.in.nonexec 2004-03-09 01:12:32.000000000 -0500 -+++ bind-9.2.4rc6/lib/lwres/Makefile.in 2004-07-16 19:28:19.000000000 -0400 -@@ -76,7 +76,7 @@ +diff -up bind-9.7.0a3/lib/isc/Makefile.in.nonexec bind-9.7.0a3/lib/isc/Makefile.in +--- bind-9.7.0a3/lib/isc/Makefile.in.nonexec 2009-09-04 20:13:44.000000000 +0200 ++++ bind-9.7.0a3/lib/isc/Makefile.in 2009-09-16 10:47:07.074642868 +0200 +@@ -121,7 +121,7 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs -- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} liblwres.@A@ ${DESTDIR}${libdir} -+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} liblwres.@A@ ${DESTDIR}${libdir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir} ++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc.@A@ ${DESTDIR}${libdir} - clean distclean:: - rm -f liblwres.@A@ liblwres.la timestamp -diff -up bind-9.5.0rc1/lib/bind9/Makefile.in.nonexec bind-9.5.0rc1/lib/bind9/Makefile.in ---- bind-9.5.0rc1/lib/bind9/Makefile.in.nonexec 2008-05-22 15:40:03.000000000 +0200 -+++ bind-9.5.0rc1/lib/bind9/Makefile.in 2008-05-22 15:41:22.000000000 +0200 + install:: @ISC_ARCH_DIR@/include/isc/atomic.h + ${INSTALL_DATA} @ISC_ARCH_DIR@/include/isc/atomic.h ${DESTDIR}${includedir}/isc +diff -up bind-9.7.0a3/lib/lwres/Makefile.in.nonexec bind-9.7.0a3/lib/lwres/Makefile.in +--- bind-9.7.0a3/lib/lwres/Makefile.in.nonexec 2007-06-20 01:47:22.000000000 +0200 ++++ bind-9.7.0a3/lib/lwres/Makefile.in 2009-09-16 10:46:27.554643093 +0200 @@ -78,7 +78,7 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs -- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind9.@A@ ${DESTDIR}${libdir} -+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libbind9.@A@ ${DESTDIR}${libdir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} liblwres.@A@ ${DESTDIR}${libdir} ++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} liblwres.@A@ ${DESTDIR}${libdir} clean distclean:: - rm -f libbind9.@A@ timestamp + rm -f liblwres.@A@ liblwres.la timestamp diff --git a/bind.spec b/bind.spec index 8527830..9c35ae6 100644 --- a/bind.spec +++ b/bind.spec @@ -5,7 +5,7 @@ #%define PATCHVER P1 #%define PREVER rc1 #%define VERSION %{version}-%{PATCHVER} -%define PREVER a2 +%define PREVER a3 %define VERSION %{version}%{PREVER} %{?!SDB: %define SDB 1} @@ -20,7 +20,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.7.0 -Release: 0.2.%{PREVER}%{?dist} +Release: 0.3.%{PREVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -232,7 +232,7 @@ sed -i -e \ 's/RELEASEVER=\(.*\)/RELEASEVER=\1-RedHat-%{version}-%{release}/' \ version -libtoolize -c -f; aclocal -I m4 --force; autoheader -f; autoconf -f +libtoolize -c -f; aclocal -I m4 --force; autoconf -f %configure \ --with-libtool \ @@ -595,6 +595,9 @@ rm -rf ${RPM_BUILD_ROOT} %ghost %{chroot_prefix}/etc/localtime %changelog +* Wed Sep 16 2009 Adam Tkac 32:9.7.0-0.3.a3 +- update to 9.7.0a3 + * Tue Sep 15 2009 Adam Tkac 32:9.7.0-0.2.a2 - improve chroot related documentation (#507795) - add NetworkManager dispatcher script to reload named when network interface is diff --git a/sources b/sources index f529e02..fd500e6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e2e3fd011f57dcec46d2f968016e3e93 bind-9.7.0a2.tar.gz +ff61597579dcb629213c7421b26e9457 bind-9.7.0a3.tar.gz de68e10e91e05ab100be879b5bcaa6cb config-4.tar.bz2