[bind/f15: 1/4] Rebase to 9.8.1rc1 and update patches.
Adam Tkac
atkac at fedoraproject.org
Wed Aug 31 16:00:41 UTC 2011
commit 86c080f6b655f57175ac1be02d9c637240b2a962
Author: Adam Tkac <atkac at redhat.com>
Date: Wed Aug 31 14:57:44 2011 +0200
Rebase to 9.8.1rc1 and update patches.
bind97-cleanup.patch, bind97-rh674334.patch and bind98-includes.patch were
merged.
Signed-off-by: Adam Tkac <atkac at redhat.com>
.gitignore | 1 +
bind-9.5-sdb-sqlite-bld.patch | 36 ++--
bind-9.5-sdb.patch | 46 ++--
bind-96-dyndb.patch | 100 +++++-----
bind.spec | 25 ++-
bind97-cleanup.patch | 452 -----------------------------------------
bind97-exportlib.patch | 6 +-
bind97-rh674334.patch | 122 -----------
bind98-includes.patch | 12 -
sources | 2 +-
10 files changed, 110 insertions(+), 692 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b798f6e..f944c73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ bind-9.7.2b1.tar.gz
/bind-9.8.0-P1.tar.gz
/bind-9.8.0-P2.tar.gz
/bind-9.8.0-P4.tar.gz
+/bind-9.8.1rc1.tar.gz
diff --git a/bind-9.5-sdb-sqlite-bld.patch b/bind-9.5-sdb-sqlite-bld.patch
index 4f69a57..768af1c 100644
--- a/bind-9.5-sdb-sqlite-bld.patch
+++ b/bind-9.5-sdb-sqlite-bld.patch
@@ -1,15 +1,15 @@
-diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named-sdb/main.c
---- bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld 2008-07-21 12:19:50.000000000 +0200
-+++ bind-9.5.1b1/bin/named-sdb/main.c 2008-07-21 12:19:50.000000000 +0200
-@@ -74,6 +74,7 @@
+diff -up bind-9.8.1rc1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.8.1rc1/bin/named-sdb/main.c
+--- bind-9.8.1rc1/bin/named-sdb/main.c.sdb-sqlite-bld 2011-08-31 14:41:15.646020840 +0200
++++ bind-9.8.1rc1/bin/named-sdb/main.c 2011-08-31 14:41:35.132019452 +0200
+@@ -85,6 +85,7 @@
/* #include "xxdb.h" */
#include "ldapdb.h"
#include "pgsqldb.h"
+#include "sqlitedb.h"
#include "dirdb.h"
- /*
-@@ -646,6 +647,7 @@ setup(void) {
+ #ifdef CONTRIB_DLZ
+@@ -792,6 +793,7 @@ setup(void) {
ldapdb_clear();
pgsqldb_clear();
@@ -17,7 +17,7 @@ diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named
dirdb_clear();
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-@@ -743,6 +745,23 @@ setup(void) {
+@@ -921,6 +923,23 @@ setup(void) {
ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
);
@@ -41,7 +41,7 @@ diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named
result = dirdb_init();
if (result != ISC_R_SUCCESS)
{
-@@ -787,6 +806,7 @@ cleanup(void) {
+@@ -971,6 +990,7 @@ cleanup(void) {
ldapdb_clear();
pgsqldb_clear();
@@ -49,10 +49,10 @@ diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named
dirdb_clear();
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-diff -up bind-9.5.1b1/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/named-sdb/Makefile.in
---- bind-9.5.1b1/bin/named-sdb/Makefile.in.sdb-sqlite-bld 2008-07-21 12:19:50.000000000 +0200
-+++ bind-9.5.1b1/bin/named-sdb/Makefile.in 2008-07-21 12:19:50.000000000 +0200
-@@ -26,10 +26,10 @@ top_srcdir = @top_srcdir@
+diff -up bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.8.1rc1/bin/named-sdb/Makefile.in
+--- bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb-sqlite-bld 2011-08-31 14:41:15.646020840 +0200
++++ bind-9.8.1rc1/bin/named-sdb/Makefile.in 2011-08-31 14:41:15.658020839 +0200
+@@ -28,10 +28,10 @@ top_srcdir = @top_srcdir@
#
# Add database drivers here.
#
@@ -66,10 +66,10 @@ diff -up bind-9.5.1b1/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/
DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers
-diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/sdb_tools/Makefile.in
---- bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld 2008-07-21 12:19:50.000000000 +0200
-+++ bind-9.5.1b1/bin/sdb_tools/Makefile.in 2008-07-21 12:22:13.000000000 +0200
-@@ -30,11 +30,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS}
+diff -up bind-9.8.1rc1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.8.1rc1/bin/sdb_tools/Makefile.in
+--- bind-9.8.1rc1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld 2011-08-31 14:41:15.651020840 +0200
++++ bind-9.8.1rc1/bin/sdb_tools/Makefile.in 2011-08-31 14:41:15.658020839 +0200
+@@ -32,11 +32,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS}
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
@@ -84,7 +84,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/
MANPAGES = zone2ldap.1
-@@ -48,6 +48,9 @@ zone2ldap at EXEEXT@: zone2ldap. at O@ ${DEPLI
+@@ -50,6 +50,9 @@ zone2ldap at EXEEXT@: zone2ldap. at O@ ${DEPLI
zonetodb at EXEEXT@: zonetodb. at O@ ${DEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb. at O@ -lpq ${LIBS}
@@ -94,7 +94,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/
ldap2zone at EXEEXT@: ldap2zone. at O@ ${DEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ldap2zone. at O@ -lldap -llber ${LIBS}
-@@ -62,4 +65,5 @@ install:: ${TARGETS} installdirs
+@@ -64,4 +67,5 @@ install:: ${TARGETS} installdirs
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap at EXEEXT@ ${DESTDIR}${sbindir}
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone at EXEEXT@ ${DESTDIR}${sbindir}
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb at EXEEXT@ ${DESTDIR}${sbindir}
diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch
index 88dda90..354c3f2 100644
--- a/bind-9.5-sdb.patch
+++ b/bind-9.5-sdb.patch
@@ -1,6 +1,6 @@
-diff -up bind-9.8.0rc1/bin/Makefile.in.sdb bind-9.8.0rc1/bin/Makefile.in
---- bind-9.8.0rc1/bin/Makefile.in.sdb 2009-10-05 14:07:08.000000000 +0200
-+++ bind-9.8.0rc1/bin/Makefile.in 2011-02-21 16:28:51.678648382 +0100
+diff -up bind-9.8.1rc1/bin/Makefile.in.sdb bind-9.8.1rc1/bin/Makefile.in
+--- bind-9.8.1rc1/bin/Makefile.in.sdb 2009-10-05 14:07:08.000000000 +0200
++++ bind-9.8.1rc1/bin/Makefile.in 2011-08-31 14:34:24.049049431 +0200
@@ -19,8 +19,8 @@ srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
@@ -12,14 +12,14 @@ diff -up bind-9.8.0rc1/bin/Makefile.in.sdb bind-9.8.0rc1/bin/Makefile.in
TARGETS =
@BIND9_MAKE_RULES@
-diff -up bind-9.8.0rc1/bin/named/Makefile.in.sdb bind-9.8.0rc1/bin/named/Makefile.in
---- bind-9.8.0rc1/bin/named/Makefile.in.sdb 2011-02-21 16:28:51.618648508 +0100
-+++ bind-9.8.0rc1/bin/named/Makefile.in 2011-02-21 16:29:11.808606048 +0100
+diff -up bind-9.8.1rc1/bin/named/Makefile.in.sdb bind-9.8.1rc1/bin/named/Makefile.in
+--- bind-9.8.1rc1/bin/named/Makefile.in.sdb 2011-08-31 14:34:23.927049440 +0200
++++ bind-9.8.1rc1/bin/named/Makefile.in 2011-08-31 14:39:33.980027898 +0200
@@ -45,7 +45,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
--CDEFINES = @USE_DLZ@ @USE_PKCS11@ @USE_OPENSSL@
+-CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @USE_OPENSSL@
+CDEFINES = @USE_PKCS11@ @USE_OPENSSL@
CWARNINGS =
@@ -46,7 +46,7 @@ diff -up bind-9.8.0rc1/bin/named/Makefile.in.sdb bind-9.8.0rc1/bin/named/Makefil
- ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
+ lwdgnba. at O@ lwdgrbn. at O@ lwdnoop. at O@ lwsearch. at O@
- UOBJS = unix/os. at O@
+ UOBJS = unix/os. at O@ unix/dlz_dlopen_driver. at O@
@@ -100,8 +99,7 @@ SRCS = builtin.c client.c config.c cont
tkeyconf.c tsigconf.c update.c xfrout.c \
@@ -64,10 +64,10 @@ diff -up bind-9.8.0rc1/bin/named/Makefile.in.sdb bind-9.8.0rc1/bin/named/Makefil
${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
-
- at DLZ_DRIVER_RULES@
-diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main.c
---- bind-9.8.0rc1/bin/named-sdb/main.c.sdb 2011-02-21 16:28:51.638648466 +0100
-+++ bind-9.8.0rc1/bin/named-sdb/main.c 2011-02-21 16:28:51.678648382 +0100
-@@ -81,6 +81,9 @@
+diff -up bind-9.8.1rc1/bin/named-sdb/main.c.sdb bind-9.8.1rc1/bin/named-sdb/main.c
+--- bind-9.8.1rc1/bin/named-sdb/main.c.sdb 2011-08-31 14:34:23.977049436 +0200
++++ bind-9.8.1rc1/bin/named-sdb/main.c 2011-08-31 14:40:09.833025405 +0200
+@@ -83,6 +83,9 @@
* Include header files for database drivers here.
*/
/* #include "xxdb.h" */
@@ -75,9 +75,9 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main
+#include "pgsqldb.h"
+#include "dirdb.h"
+ #ifdef CONTRIB_DLZ
/*
- * Include DLZ drivers if appropriate.
-@@ -784,6 +787,10 @@ setup(void) {
+@@ -787,6 +790,10 @@ setup(void) {
ns_main_earlyfatal("isc_app_start() failed: %s",
isc_result_totext(result));
@@ -88,7 +88,7 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main
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);
-@@ -867,6 +874,57 @@ setup(void) {
+@@ -880,6 +887,57 @@ setup(void) {
isc_result_totext(result));
#endif
@@ -146,7 +146,7 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main
ns_server_create(ns_g_mctx, &ns_g_server);
}
-@@ -894,6 +952,10 @@ cleanup(void) {
+@@ -911,6 +969,10 @@ cleanup(void) {
dns_name_destroy();
@@ -157,9 +157,9 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "exiting");
ns_log_shutdown();
-diff -up bind-9.8.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.8.0rc1/bin/named-sdb/Makefile.in
---- bind-9.8.0rc1/bin/named-sdb/Makefile.in.sdb 2011-02-21 16:28:51.628648487 +0100
-+++ bind-9.8.0rc1/bin/named-sdb/Makefile.in 2011-02-21 16:28:51.678648382 +0100
+diff -up bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb bind-9.8.1rc1/bin/named-sdb/Makefile.in
+--- bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb 2011-08-31 14:34:23.960049438 +0200
++++ bind-9.8.1rc1/bin/named-sdb/Makefile.in 2011-08-31 14:34:24.051049431 +0200
@@ -28,10 +28,10 @@ top_srcdir = @top_srcdir@
#
# Add database drivers here.
@@ -209,10 +209,10 @@ diff -up bind-9.8.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.8.0rc1/bin/named-sdb
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb at EXEEXT@ ${DESTDIR}${sbindir}
@DLZ_DRIVER_RULES@
-diff -up bind-9.8.0rc1/configure.in.sdb bind-9.8.0rc1/configure.in
---- bind-9.8.0rc1/configure.in.sdb 2011-02-03 06:50:05.000000000 +0100
-+++ bind-9.8.0rc1/configure.in 2011-02-21 16:30:15.788470563 +0100
-@@ -3285,9 +3285,12 @@ AC_CONFIG_FILES([
+diff -up bind-9.8.1rc1/configure.in.sdb bind-9.8.1rc1/configure.in
+--- bind-9.8.1rc1/configure.in.sdb 2011-07-26 23:59:57.000000000 +0200
++++ bind-9.8.1rc1/configure.in 2011-08-31 14:34:24.053049431 +0200
+@@ -3423,9 +3423,12 @@ AC_CONFIG_FILES([
bin/dnssec/Makefile
bin/named/Makefile
bin/named/unix/Makefile
diff --git a/bind-96-dyndb.patch b/bind-96-dyndb.patch
index 94bf019..176be49 100644
--- a/bind-96-dyndb.patch
+++ b/bind-96-dyndb.patch
@@ -1,6 +1,6 @@
-diff -up bind-9.8.0-P4/bin/named/main.c.dyndb bind-9.8.0-P4/bin/named/main.c
---- bind-9.8.0-P4/bin/named/main.c.dyndb 2010-12-22 04:59:02.000000000 +0100
-+++ bind-9.8.0-P4/bin/named/main.c 2011-07-26 15:36:04.042778520 +0200
+diff -up bind-9.8.1rc1/bin/named/main.c.dyndb bind-9.8.1rc1/bin/named/main.c
+--- bind-9.8.1rc1/bin/named/main.c.dyndb 2011-03-11 07:47:00.000000000 +0100
++++ bind-9.8.1rc1/bin/named/main.c 2011-08-31 14:25:02.244088457 +0200
@@ -45,6 +45,7 @@
#include <isccc/result.h>
@@ -9,7 +9,7 @@ diff -up bind-9.8.0-P4/bin/named/main.c.dyndb bind-9.8.0-P4/bin/named/main.c
#include <dns/name.h>
#include <dns/result.h>
#include <dns/view.h>
-@@ -871,6 +872,8 @@ setup(void) {
+@@ -884,6 +885,8 @@ setup(void) {
static void
cleanup(void) {
@@ -18,18 +18,18 @@ diff -up bind-9.8.0-P4/bin/named/main.c.dyndb bind-9.8.0-P4/bin/named/main.c
destroy_managers();
ns_server_destroy(&ns_g_server);
-diff -up bind-9.8.0-P4/bin/named/server.c.dyndb bind-9.8.0-P4/bin/named/server.c
---- bind-9.8.0-P4/bin/named/server.c.dyndb 2011-02-16 20:46:12.000000000 +0100
-+++ bind-9.8.0-P4/bin/named/server.c 2011-07-26 15:37:42.489778503 +0200
-@@ -63,6 +63,7 @@
- #ifdef DLZ
+diff -up bind-9.8.1rc1/bin/named/server.c.dyndb bind-9.8.1rc1/bin/named/server.c
+--- bind-9.8.1rc1/bin/named/server.c.dyndb 2011-08-02 06:58:45.000000000 +0200
++++ bind-9.8.1rc1/bin/named/server.c 2011-08-31 14:29:04.261071645 +0200
+@@ -61,6 +61,7 @@
+ #include <dns/db.h>
+ #include <dns/dispatch.h>
#include <dns/dlz.h>
- #endif
+#include <dns/dynamic_db.h>
#include <dns/dns64.h>
#include <dns/forward.h>
#include <dns/journal.h>
-@@ -1158,6 +1159,72 @@ configure_peer(const cfg_obj_t *cpeer, i
+@@ -1151,6 +1152,72 @@ configure_peer(const cfg_obj_t *cpeer, i
}
static isc_result_t
@@ -102,18 +102,21 @@ diff -up bind-9.8.0-P4/bin/named/server.c.dyndb bind-9.8.0-P4/bin/named/server.c
disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
isc_result_t result;
const cfg_obj_t *algorithms;
-@@ -1574,6 +1641,7 @@ configure_view(dns_view_t *view, cfg_par
+@@ -1562,6 +1629,7 @@ configure_view(dns_view_t *view, cfg_obj
+ const cfg_obj_t *dlz;
unsigned int dlzargc;
char **dlzargv;
- #endif
+ const cfg_obj_t *dynamic_db_list;
const cfg_obj_t *disabled;
const cfg_obj_t *obj;
const cfg_listelt_t *element;
-@@ -1834,6 +1902,37 @@ configure_view(dns_view_t *view, cfg_par
- #endif
+@@ -1792,6 +1860,39 @@ configure_view(dns_view_t *view, cfg_obj
+ }
+ }
- /*
++
++
++ /*
+ * Configure dynamic databases.
+ */
+ dynamic_db_list = NULL;
@@ -137,28 +140,27 @@ diff -up bind-9.8.0-P4/bin/named/server.c.dyndb bind-9.8.0-P4/bin/named/server.c
+ while (element != NULL) {
+ obj = cfg_listelt_value(element);
+ CHECK(configure_dynamic_db(obj, mctx, args));
-+
++
+ element = cfg_list_next(element);
+ }
+
+ dns_dyndb_arguments_destroy(mctx, args);
+ }
+
-+ /*
+ /*
* Obtain configuration parameters that affect the decision of whether
* we can reuse/share an existing cache.
- */
-@@ -4187,6 +4286,7 @@ load_configuration(const char *filename,
- result = isc_task_beginexclusive(server->task);
- RUNTIME_CHECK(result == ISC_R_SUCCESS);
+@@ -4292,6 +4393,7 @@ load_configuration(const char *filename,
+ cfg_aclconfctx_detach(&ns_g_aclconfctx);
+ CHECK(cfg_aclconfctx_create(ns_g_mctx, &ns_g_aclconfctx));
+ dns_dynamic_db_cleanup(ISC_FALSE);
/*
* Parse the global default pseudo-config file.
*/
-diff -up bind-9.8.0-P4/lib/dns/dynamic_db.c.dyndb bind-9.8.0-P4/lib/dns/dynamic_db.c
---- bind-9.8.0-P4/lib/dns/dynamic_db.c.dyndb 2011-07-26 15:36:04.047778520 +0200
-+++ bind-9.8.0-P4/lib/dns/dynamic_db.c 2011-07-26 15:36:04.047778520 +0200
+diff -up bind-9.8.1rc1/lib/dns/dynamic_db.c.dyndb bind-9.8.1rc1/lib/dns/dynamic_db.c
+--- bind-9.8.1rc1/lib/dns/dynamic_db.c.dyndb 2011-08-31 14:25:02.249088456 +0200
++++ bind-9.8.1rc1/lib/dns/dynamic_db.c 2011-08-31 14:25:02.249088456 +0200
@@ -0,0 +1,366 @@
+/*
+ * Copyright (C) 2008-2011 Red Hat, Inc.
@@ -526,9 +528,9 @@ diff -up bind-9.8.0-P4/lib/dns/dynamic_db.c.dyndb bind-9.8.0-P4/lib/dns/dynamic_
+
+ return args->timermgr;
+}
-diff -up bind-9.8.0-P4/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.8.0-P4/lib/dns/include/dns/dynamic_db.h
---- bind-9.8.0-P4/lib/dns/include/dns/dynamic_db.h.dyndb 2011-07-26 15:36:04.047778520 +0200
-+++ bind-9.8.0-P4/lib/dns/include/dns/dynamic_db.h 2011-07-26 15:36:04.047778520 +0200
+diff -up bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h
+--- bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h.dyndb 2011-08-31 14:25:02.249088456 +0200
++++ bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h 2011-08-31 14:25:02.249088456 +0200
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2008-2011 Red Hat, Inc.
@@ -580,9 +582,9 @@ diff -up bind-9.8.0-P4/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.8.0-P4/lib/
+isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
+
+#endif
-diff -up bind-9.8.0-P4/lib/dns/include/dns/log.h.dyndb bind-9.8.0-P4/lib/dns/include/dns/log.h
---- bind-9.8.0-P4/lib/dns/include/dns/log.h.dyndb 2009-12-18 23:16:49.000000000 +0100
-+++ bind-9.8.0-P4/lib/dns/include/dns/log.h 2011-07-26 15:36:04.048778520 +0200
+diff -up bind-9.8.1rc1/lib/dns/include/dns/log.h.dyndb bind-9.8.1rc1/lib/dns/include/dns/log.h
+--- bind-9.8.1rc1/lib/dns/include/dns/log.h.dyndb 2009-12-18 23:16:49.000000000 +0100
++++ bind-9.8.1rc1/lib/dns/include/dns/log.h 2011-08-31 14:25:02.250088456 +0200
@@ -74,6 +74,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
#define DNS_LOGMODULE_ACACHE (&dns_modules[25])
#define DNS_LOGMODULE_DLZ (&dns_modules[26])
@@ -591,9 +593,9 @@ diff -up bind-9.8.0-P4/lib/dns/include/dns/log.h.dyndb bind-9.8.0-P4/lib/dns/inc
ISC_LANG_BEGINDECLS
-diff -up bind-9.8.0-P4/lib/dns/include/dns/Makefile.in.dyndb bind-9.8.0-P4/lib/dns/include/dns/Makefile.in
---- bind-9.8.0-P4/lib/dns/include/dns/Makefile.in.dyndb 2009-10-09 01:48:10.000000000 +0200
-+++ bind-9.8.0-P4/lib/dns/include/dns/Makefile.in 2011-07-26 15:36:04.048778520 +0200
+diff -up bind-9.8.1rc1/lib/dns/include/dns/Makefile.in.dyndb bind-9.8.1rc1/lib/dns/include/dns/Makefile.in
+--- bind-9.8.1rc1/lib/dns/include/dns/Makefile.in.dyndb 2011-02-28 02:20:02.000000000 +0100
++++ bind-9.8.1rc1/lib/dns/include/dns/Makefile.in 2011-08-31 14:25:02.250088456 +0200
@@ -22,7 +22,7 @@ top_srcdir = @top_srcdir@
@BIND9_VERSION@
@@ -603,9 +605,9 @@ diff -up bind-9.8.0-P4/lib/dns/include/dns/Makefile.in.dyndb bind-9.8.0-P4/lib/d
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 nsec.h \
-diff -up bind-9.8.0-P4/lib/dns/include/dns/types.h.dyndb bind-9.8.0-P4/lib/dns/include/dns/types.h
---- bind-9.8.0-P4/lib/dns/include/dns/types.h.dyndb 2010-12-08 03:46:16.000000000 +0100
-+++ bind-9.8.0-P4/lib/dns/include/dns/types.h 2011-07-26 15:36:04.049778520 +0200
+diff -up bind-9.8.1rc1/lib/dns/include/dns/types.h.dyndb bind-9.8.1rc1/lib/dns/include/dns/types.h
+--- bind-9.8.1rc1/lib/dns/include/dns/types.h.dyndb 2010-12-08 03:46:16.000000000 +0100
++++ bind-9.8.1rc1/lib/dns/include/dns/types.h 2011-08-31 14:25:02.251088456 +0200
@@ -60,6 +60,7 @@ typedef struct dns_dbtable dns_dbtable
typedef void dns_dbversion_t;
typedef struct dns_dlzimplementation dns_dlzimplementation_t;
@@ -614,9 +616,9 @@ diff -up bind-9.8.0-P4/lib/dns/include/dns/types.h.dyndb bind-9.8.0-P4/lib/dns/i
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.8.0-P4/lib/dns/log.c.dyndb bind-9.8.0-P4/lib/dns/log.c
---- bind-9.8.0-P4/lib/dns/log.c.dyndb 2009-12-19 00:49:03.000000000 +0100
-+++ bind-9.8.0-P4/lib/dns/log.c 2011-07-26 15:36:04.049778520 +0200
+diff -up bind-9.8.1rc1/lib/dns/log.c.dyndb bind-9.8.1rc1/lib/dns/log.c
+--- bind-9.8.1rc1/lib/dns/log.c.dyndb 2009-12-19 00:49:03.000000000 +0100
++++ bind-9.8.1rc1/lib/dns/log.c 2011-08-31 14:25:02.251088456 +0200
@@ -80,6 +80,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
{ "dns/acache", 0 },
{ "dns/dlz", 0 },
@@ -625,9 +627,9 @@ diff -up bind-9.8.0-P4/lib/dns/log.c.dyndb bind-9.8.0-P4/lib/dns/log.c
{ NULL, 0 }
};
-diff -up bind-9.8.0-P4/lib/dns/Makefile.in.dyndb bind-9.8.0-P4/lib/dns/Makefile.in
---- bind-9.8.0-P4/lib/dns/Makefile.in.dyndb 2011-07-26 15:36:04.028778520 +0200
-+++ bind-9.8.0-P4/lib/dns/Makefile.in 2011-07-26 15:36:04.050778520 +0200
+diff -up bind-9.8.1rc1/lib/dns/Makefile.in.dyndb bind-9.8.1rc1/lib/dns/Makefile.in
+--- bind-9.8.1rc1/lib/dns/Makefile.in.dyndb 2011-08-31 14:25:02.230088458 +0200
++++ bind-9.8.1rc1/lib/dns/Makefile.in 2011-08-31 14:25:02.251088456 +0200
@@ -58,7 +58,7 @@ DNSOBJS = acache. at O@ acl. at O@ adb. at O@ bya
cache. at O@ callbacks. at O@ compress. at O@ \
db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
@@ -646,7 +648,7 @@ diff -up bind-9.8.0-P4/lib/dns/Makefile.in.dyndb bind-9.8.0-P4/lib/dns/Makefile.
master.c masterdump.c message.c \
name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
rbt.c rbtdb.c rbtdb64.c rcode.c rdata.c rdatalist.c \
-@@ -116,6 +116,11 @@ version. at O@: version.c
+@@ -118,6 +118,11 @@ version. at O@: version.c
-DLIBAGE=${LIBAGE} \
-c ${srcdir}/version.c
@@ -658,9 +660,9 @@ diff -up bind-9.8.0-P4/lib/dns/Makefile.in.dyndb bind-9.8.0-P4/lib/dns/Makefile.
libdns. at SA@: ${OBJS}
${AR} ${ARFLAGS} $@ ${OBJS}
${RANLIB} $@
-diff -up bind-9.8.0-P4/lib/isccfg/namedconf.c.dyndb bind-9.8.0-P4/lib/isccfg/namedconf.c
---- bind-9.8.0-P4/lib/isccfg/namedconf.c.dyndb 2011-02-03 06:50:08.000000000 +0100
-+++ bind-9.8.0-P4/lib/isccfg/namedconf.c 2011-07-26 15:36:04.051778520 +0200
+diff -up bind-9.8.1rc1/lib/isccfg/namedconf.c.dyndb bind-9.8.1rc1/lib/isccfg/namedconf.c
+--- bind-9.8.1rc1/lib/isccfg/namedconf.c.dyndb 2011-05-23 22:56:11.000000000 +0200
++++ bind-9.8.1rc1/lib/isccfg/namedconf.c 2011-08-31 14:25:02.253088456 +0200
@@ -89,6 +89,7 @@ static cfg_type_t cfg_type_controls;
static cfg_type_t cfg_type_controls_sockaddr;
static cfg_type_t cfg_type_destinationlist;
@@ -669,7 +671,7 @@ diff -up bind-9.8.0-P4/lib/isccfg/namedconf.c.dyndb bind-9.8.0-P4/lib/isccfg/nam
static cfg_type_t cfg_type_ixfrdifftype;
static cfg_type_t cfg_type_key;
static cfg_type_t cfg_type_logfile;
-@@ -861,6 +862,7 @@ namedconf_or_view_clauses[] = {
+@@ -860,6 +861,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 },
@@ -677,7 +679,7 @@ diff -up bind-9.8.0-P4/lib/isccfg/namedconf.c.dyndb bind-9.8.0-P4/lib/isccfg/nam
{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
{ "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI },
{ "managed-keys", &cfg_type_managedkeys, CFG_CLAUSEFLAG_MULTI },
-@@ -1843,6 +1845,40 @@ static cfg_type_t cfg_type_dialuptype =
+@@ -1860,6 +1862,40 @@ static cfg_type_t cfg_type_dialuptype =
&cfg_rep_string, dialup_enums
};
diff --git a/bind.spec b/bind.spec
index 7d8a545..f805839 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,11 +2,11 @@
# Red Hat BIND package .spec file
#
-%define PATCHVER P4
-#%define PREVER rc1
+#%define PATCHVER P4
+%define PREVER rc1
#%define VERSION %{version}
-#%define VERSION %{version}%{PREVER}
-%define VERSION %{version}-%{PATCHVER}
+#%define VERSION %{version}-%{PATCHVER}
+%define VERSION %{version}%{PREVER}
%{?!SDB: %define SDB 1}
%{?!test: %define test 0}
@@ -21,8 +21,8 @@
Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
Name: bind
License: ISC
-Version: 9.8.0
-Release: 9.%{PATCHVER}%{?dist}
+Version: 9.8.1
+Release: 0.1.%{PREVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,9 +61,6 @@ Patch109:bind97-rh478718.patch
Patch110:bind97-rh570851.patch
Patch111:bind97-exportlib.patch
Patch112:bind97-rh645544.patch
-Patch113:bind97-rh674334.patch
-Patch115:bind97-cleanup.patch
-Patch116:bind98-includes.patch
Patch117:bind98-rh725741.patch
# SDB patches
@@ -301,9 +298,6 @@ mkdir m4
%patch110 -p1 -b .rh570851
%patch111 -p1 -b .exportlib
%patch112 -p1 -b .rh645544
-%patch113 -p1 -b .rh674334
-%patch115 -p1 -b .cleanup
-%patch116 -p1 -b .includes
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -772,6 +766,13 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Wed Aug 31 2011 Adam Tkac <atkac redhat com> 32:9.8.1-0.1.rc1
+- update to 9.8.1rc1
+- patches merged
+ - bind97-rh674334.patch
+ - bind97-cleanup.patch
+ - bind98-includes.patch
+
* Wed Aug 03 2011 Adam Tkac <atkac redhat com> 32:9.8.0-9.P4
- improve patch for #725741
diff --git a/bind97-exportlib.patch b/bind97-exportlib.patch
index b6cf7c3..1f5aa20 100644
--- a/bind97-exportlib.patch
+++ b/bind97-exportlib.patch
@@ -70,7 +70,7 @@ diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
install:: timestamp installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns. at A@ \
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns-export. at A@ \
- ${DESTDIR}${export_libdir}
+ ${DESTDIR}${export_libdir}/
clean distclean::
- rm -f libdns. at A@ timestamp
@@ -122,7 +122,7 @@ diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
install:: timestamp installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libirs. at A@ \
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libirs-export. at A@ \
- ${DESTDIR}${export_libdir}
+ ${DESTDIR}${export_libdir}/
clean distclean::
- rm -f libirs. at A@ libirs.la timestamp
@@ -173,7 +173,7 @@ diff -up bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib bind-9.7.2-P2/lib
install:: timestamp installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg. at A@ \
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisccfg-export. at A@ \
- ${DESTDIR}${export_libdir}
+ ${DESTDIR}${export_libdir}/
clean distclean::
- rm -f libisccfg. at A@ timestamp
diff --git a/sources b/sources
index 6861c36..e97acf4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
76857526420dc8e153ad688aeb5a2c4b config-8.tar.bz2
-13e36e3f28dc1ce7675b45a4192e8389 bind-9.8.0-P4.tar.gz
+64f3cfe9fb2c3e03e1dc7e29b6f33125 bind-9.8.1rc1.tar.gz
More information about the scm-commits
mailing list