[bind/f17] Update to 9.9.2
Adam Tkac
atkac at fedoraproject.org
Thu Oct 11 11:55:55 UTC 2012
commit cf5a7008d19e65388c4eaf77aadaec46da49da8f
Author: Adam Tkac <atkac at redhat.com>
Date: Thu Oct 11 13:54:46 2012 +0200
Update to 9.9.2
- bind97-rh714049.patch has been dropped
- patches merged
- bind98-rh816164.patch
Signed-off-by: Adam Tkac <atkac at redhat.com>
Conflicts:
bind.spec
.gitignore | 1 +
bind-9.5-sdb.patch | 46 +++++++-------
bind-96-dyndb.patch | 88 +++++++++++++-------------
bind.spec | 20 ++++---
bind97-rh714049.patch | 160 -------------------------------------------------
bind98-rh816164.patch | 41 -------------
bind99-buildfix.patch | 10 ++--
sources | 2 +-
8 files changed, 86 insertions(+), 282 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc7c0d1..b6deb00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ bind-9.7.2b1.tar.gz
/bind-9.9.1-P1.tar.gz
/bind-9.9.1-P2.tar.gz
/bind-9.9.1-P3.tar.gz
+/bind-9.9.2.tar.gz
diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch
index 354c3f2..4bbf2a8 100644
--- a/bind-9.5-sdb.patch
+++ b/bind-9.5-sdb.patch
@@ -1,20 +1,20 @@
-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
+diff -up bind-9.9.2/bin/Makefile.in.sdb bind-9.9.2/bin/Makefile.in
+--- bind-9.9.2/bin/Makefile.in.sdb 2012-09-27 02:35:19.000000000 +0200
++++ bind-9.9.2/bin/Makefile.in 2012-10-11 13:23:43.933988077 +0200
@@ -19,8 +19,8 @@ srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
-SUBDIRS = named rndc dig dnssec tests tools nsupdate \
-- check confgen @PKCS11_TOOLS@
+- check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+SUBDIRS = named named-sdb rndc dig dnssec tests tools nsupdate \
-+ check confgen @PKCS11_TOOLS@ sdb_tools
++ check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools
TARGETS =
@BIND9_MAKE_RULES@
-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
+diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
+--- bind-9.9.2/bin/named/Makefile.in.sdb 2012-10-11 13:21:35.877105690 +0200
++++ bind-9.9.2/bin/named/Makefile.in 2012-10-11 13:21:36.099105521 +0200
@@ -45,7 +45,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
@@ -24,7 +24,7 @@ diff -up bind-9.8.1rc1/bin/named/Makefile.in.sdb bind-9.8.1rc1/bin/named/Makefil
CWARNINGS =
-@@ -69,11 +69,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS}
+@@ -69,11 +69,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS}
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@@ -64,9 +64,9 @@ diff -up bind-9.8.1rc1/bin/named/Makefile.in.sdb bind-9.8.1rc1/bin/named/Makefil
${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
-
- at DLZ_DRIVER_RULES@
-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
+diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/bin/named-sdb/main.c
+--- bind-9.9.2/bin/named-sdb/main.c.sdb 2012-10-11 13:21:36.052105556 +0200
++++ bind-9.9.2/bin/named-sdb/main.c 2012-10-11 13:21:36.099105521 +0200
@@ -83,6 +83,9 @@
* Include header files for database drivers here.
*/
@@ -77,7 +77,7 @@ diff -up bind-9.8.1rc1/bin/named-sdb/main.c.sdb bind-9.8.1rc1/bin/named-sdb/main
#ifdef CONTRIB_DLZ
/*
-@@ -787,6 +790,10 @@ setup(void) {
+@@ -802,6 +805,10 @@ setup(void) {
ns_main_earlyfatal("isc_app_start() failed: %s",
isc_result_totext(result));
@@ -88,7 +88,7 @@ diff -up bind-9.8.1rc1/bin/named-sdb/main.c.sdb bind-9.8.1rc1/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);
-@@ -880,6 +887,57 @@ setup(void) {
+@@ -914,6 +921,57 @@ setup(void) {
isc_result_totext(result));
#endif
@@ -146,7 +146,7 @@ diff -up bind-9.8.1rc1/bin/named-sdb/main.c.sdb bind-9.8.1rc1/bin/named-sdb/main
ns_server_create(ns_g_mctx, &ns_g_server);
}
-@@ -911,6 +969,10 @@ cleanup(void) {
+@@ -945,6 +1003,10 @@ cleanup(void) {
dns_name_destroy();
@@ -157,9 +157,9 @@ diff -up bind-9.8.1rc1/bin/named-sdb/main.c.sdb bind-9.8.1rc1/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.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
+diff -up bind-9.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makefile.in
+--- bind-9.9.2/bin/named-sdb/Makefile.in.sdb 2012-10-11 13:21:36.045105563 +0200
++++ bind-9.9.2/bin/named-sdb/Makefile.in 2012-10-11 13:21:36.100105520 +0200
@@ -28,10 +28,10 @@ top_srcdir = @top_srcdir@
#
# Add database drivers here.
@@ -209,10 +209,10 @@ diff -up bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb bind-9.8.1rc1/bin/named-sdb
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb at EXEEXT@ ${DESTDIR}${sbindir}
@DLZ_DRIVER_RULES@
-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([
+diff -up bind-9.9.2/configure.in.sdb bind-9.9.2/configure.in
+--- bind-9.9.2/configure.in.sdb 2012-10-11 13:21:36.000000000 +0200
++++ bind-9.9.2/configure.in 2012-10-11 13:24:35.710940464 +0200
+@@ -3571,11 +3571,14 @@ AC_CONFIG_FILES([
bin/dnssec/Makefile
bin/named/Makefile
bin/named/unix/Makefile
@@ -220,6 +220,8 @@ diff -up bind-9.8.1rc1/configure.in.sdb bind-9.8.1rc1/configure.in
+ bin/named-sdb/unix/Makefile
bin/nsupdate/Makefile
bin/pkcs11/Makefile
+ bin/python/Makefile
+ bin/python/dnssec-checkds.py
bin/rndc/Makefile
+ bin/sdb_tools/Makefile
bin/tests/Makefile
diff --git a/bind-96-dyndb.patch b/bind-96-dyndb.patch
index bc9bc4a..7593059 100644
--- a/bind-96-dyndb.patch
+++ b/bind-96-dyndb.patch
@@ -1,6 +1,6 @@
-diff -up bind-9.9.0/bin/named/main.c.dyndb bind-9.9.0/bin/named/main.c
---- bind-9.9.0/bin/named/main.c.dyndb 2012-02-07 00:46:22.000000000 +0100
-+++ bind-9.9.0/bin/named/main.c 2012-03-05 13:53:07.260068145 +0100
+diff -up bind-9.9.2/bin/named/main.c.dyndb bind-9.9.2/bin/named/main.c
+--- bind-9.9.2/bin/named/main.c.dyndb 2012-09-27 02:35:19.000000000 +0200
++++ bind-9.9.2/bin/named/main.c 2012-10-11 13:13:10.626497598 +0200
@@ -45,6 +45,7 @@
#include <isccc/result.h>
@@ -9,9 +9,9 @@ diff -up bind-9.9.0/bin/named/main.c.dyndb bind-9.9.0/bin/named/main.c
#include <dns/name.h>
#include <dns/result.h>
#include <dns/view.h>
-diff -up bind-9.9.0/bin/named/server.c.dyndb bind-9.9.0/bin/named/server.c
---- bind-9.9.0/bin/named/server.c.dyndb 2012-02-23 08:02:18.000000000 +0100
-+++ bind-9.9.0/bin/named/server.c 2012-03-05 13:54:03.620914961 +0100
+diff -up bind-9.9.2/bin/named/server.c.dyndb bind-9.9.2/bin/named/server.c
+--- bind-9.9.2/bin/named/server.c.dyndb 2012-09-27 02:35:19.000000000 +0200
++++ bind-9.9.2/bin/named/server.c 2012-10-11 13:13:10.630497590 +0200
@@ -63,6 +63,7 @@
#include <dns/db.h>
#include <dns/dispatch.h>
@@ -93,7 +93,7 @@ diff -up bind-9.9.0/bin/named/server.c.dyndb bind-9.9.0/bin/named/server.c
disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
isc_result_t result;
const cfg_obj_t *algorithms;
-@@ -1572,6 +1639,7 @@ configure_view(dns_view_t *view, cfg_obj
+@@ -1586,6 +1653,7 @@ configure_view(dns_view_t *view, cfg_obj
const cfg_obj_t *dlz;
unsigned int dlzargc;
char **dlzargv;
@@ -101,7 +101,7 @@ diff -up bind-9.9.0/bin/named/server.c.dyndb bind-9.9.0/bin/named/server.c
const cfg_obj_t *disabled;
const cfg_obj_t *obj;
const cfg_listelt_t *element;
-@@ -1801,6 +1869,8 @@ configure_view(dns_view_t *view, cfg_obj
+@@ -1816,6 +1884,8 @@ configure_view(dns_view_t *view, cfg_obj
}
}
@@ -110,7 +110,7 @@ diff -up bind-9.9.0/bin/named/server.c.dyndb bind-9.9.0/bin/named/server.c
/*
* Obtain configuration parameters that affect the decision of whether
* we can reuse/share an existing cache.
-@@ -2693,6 +2763,37 @@ configure_view(dns_view_t *view, cfg_obj
+@@ -2721,6 +2791,37 @@ configure_view(dns_view_t *view, cfg_obj
dns_view_setrootdelonly(view, ISC_FALSE);
/*
@@ -148,7 +148,7 @@ diff -up bind-9.9.0/bin/named/server.c.dyndb bind-9.9.0/bin/named/server.c
* Setup automatic empty zones. If recursion is off then
* they are disabled by default.
*/
-@@ -4340,6 +4441,7 @@ load_configuration(const char *filename,
+@@ -4388,6 +4489,7 @@ load_configuration(const char *filename,
cfg_aclconfctx_detach(&ns_g_aclconfctx);
CHECK(cfg_aclconfctx_create(ns_g_mctx, &ns_g_aclconfctx));
@@ -156,7 +156,7 @@ diff -up bind-9.9.0/bin/named/server.c.dyndb bind-9.9.0/bin/named/server.c
/*
* Parse the global default pseudo-config file.
*/
-@@ -5434,6 +5536,8 @@ shutdown_server(isc_task_t *task, isc_ev
+@@ -5493,6 +5595,8 @@ shutdown_server(isc_task_t *task, isc_ev
dns_view_detach(&view);
}
@@ -165,9 +165,9 @@ diff -up bind-9.9.0/bin/named/server.c.dyndb bind-9.9.0/bin/named/server.c
while ((nsc = ISC_LIST_HEAD(server->cachelist)) != NULL) {
ISC_LIST_UNLINK(server->cachelist, nsc, link);
dns_cache_detach(&nsc->cache);
-diff -up bind-9.9.0/lib/dns/dynamic_db.c.dyndb bind-9.9.0/lib/dns/dynamic_db.c
---- bind-9.9.0/lib/dns/dynamic_db.c.dyndb 2012-03-05 13:53:07.249068386 +0100
-+++ bind-9.9.0/lib/dns/dynamic_db.c 2012-03-05 13:53:07.250068364 +0100
+diff -up bind-9.9.2/lib/dns/dynamic_db.c.dyndb bind-9.9.2/lib/dns/dynamic_db.c
+--- bind-9.9.2/lib/dns/dynamic_db.c.dyndb 2012-10-11 13:13:10.630497590 +0200
++++ bind-9.9.2/lib/dns/dynamic_db.c 2012-10-11 13:13:10.630497590 +0200
@@ -0,0 +1,366 @@
+/*
+ * Copyright (C) 2008-2011 Red Hat, Inc.
@@ -535,9 +535,9 @@ diff -up bind-9.9.0/lib/dns/dynamic_db.c.dyndb bind-9.9.0/lib/dns/dynamic_db.c
+
+ return args->timermgr;
+}
-diff -up bind-9.9.0/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.9.0/lib/dns/include/dns/dynamic_db.h
---- bind-9.9.0/lib/dns/include/dns/dynamic_db.h.dyndb 2012-03-05 13:53:07.250068364 +0100
-+++ bind-9.9.0/lib/dns/include/dns/dynamic_db.h 2012-03-05 13:53:07.250068364 +0100
+diff -up bind-9.9.2/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.9.2/lib/dns/include/dns/dynamic_db.h
+--- bind-9.9.2/lib/dns/include/dns/dynamic_db.h.dyndb 2012-10-11 13:13:10.631497588 +0200
++++ bind-9.9.2/lib/dns/include/dns/dynamic_db.h 2012-10-11 13:13:10.631497588 +0200
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2008-2011 Red Hat, Inc.
@@ -589,20 +589,20 @@ diff -up bind-9.9.0/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.9.0/lib/dns/in
+isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
+
+#endif
-diff -up bind-9.9.0/lib/dns/include/dns/log.h.dyndb bind-9.9.0/lib/dns/include/dns/log.h
---- bind-9.9.0/lib/dns/include/dns/log.h.dyndb 2011-10-14 00:48:24.000000000 +0200
-+++ bind-9.9.0/lib/dns/include/dns/log.h 2012-03-05 13:53:07.250068364 +0100
-@@ -75,6 +75,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
- #define DNS_LOGMODULE_ACACHE (&dns_modules[25])
+diff -up bind-9.9.2/lib/dns/include/dns/log.h.dyndb bind-9.9.2/lib/dns/include/dns/log.h
+--- bind-9.9.2/lib/dns/include/dns/log.h.dyndb 2012-09-27 02:35:19.000000000 +0200
++++ bind-9.9.2/lib/dns/include/dns/log.h 2012-10-11 13:13:45.309399482 +0200
+@@ -76,6 +76,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
#define DNS_LOGMODULE_DLZ (&dns_modules[26])
#define DNS_LOGMODULE_DNSSEC (&dns_modules[27])
-+#define DNS_LOGMODULE_DYNDB (&dns_modules[28])
+ #define DNS_LOGMODULE_CRYPTO (&dns_modules[28])
++#define DNS_LOGMODULE_DYNDB (&dns_modules[29])
ISC_LANG_BEGINDECLS
-diff -up bind-9.9.0/lib/dns/include/dns/Makefile.in.dyndb bind-9.9.0/lib/dns/include/dns/Makefile.in
---- bind-9.9.0/lib/dns/include/dns/Makefile.in.dyndb 2011-11-14 19:32:34.000000000 +0100
-+++ bind-9.9.0/lib/dns/include/dns/Makefile.in 2012-03-05 13:53:07.251068342 +0100
+diff -up bind-9.9.2/lib/dns/include/dns/Makefile.in.dyndb bind-9.9.2/lib/dns/include/dns/Makefile.in
+--- bind-9.9.2/lib/dns/include/dns/Makefile.in.dyndb 2012-09-27 02:35:19.000000000 +0200
++++ bind-9.9.2/lib/dns/include/dns/Makefile.in 2012-10-11 13:13:10.632497587 +0200
@@ -22,7 +22,7 @@ top_srcdir = @top_srcdir@
@BIND9_VERSION@
@@ -612,9 +612,9 @@ diff -up bind-9.9.0/lib/dns/include/dns/Makefile.in.dyndb bind-9.9.0/lib/dns/inc
dlz.h 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.9.0/lib/dns/include/dns/types.h.dyndb bind-9.9.0/lib/dns/include/dns/types.h
---- bind-9.9.0/lib/dns/include/dns/types.h.dyndb 2011-12-08 17:07:21.000000000 +0100
-+++ bind-9.9.0/lib/dns/include/dns/types.h 2012-03-05 13:53:07.251068342 +0100
+diff -up bind-9.9.2/lib/dns/include/dns/types.h.dyndb bind-9.9.2/lib/dns/include/dns/types.h
+--- bind-9.9.2/lib/dns/include/dns/types.h.dyndb 2012-09-27 02:35:19.000000000 +0200
++++ bind-9.9.2/lib/dns/include/dns/types.h 2012-10-11 13:13:10.632497587 +0200
@@ -60,6 +60,7 @@ typedef struct dns_dbtable dns_dbtable
typedef void dns_dbversion_t;
typedef struct dns_dlzimplementation dns_dlzimplementation_t;
@@ -623,21 +623,21 @@ diff -up bind-9.9.0/lib/dns/include/dns/types.h.dyndb bind-9.9.0/lib/dns/include
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.9.0/lib/dns/log.c.dyndb bind-9.9.0/lib/dns/log.c
---- bind-9.9.0/lib/dns/log.c.dyndb 2011-10-14 00:48:24.000000000 +0200
-+++ bind-9.9.0/lib/dns/log.c 2012-03-05 13:53:07.251068342 +0100
-@@ -81,6 +81,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
- { "dns/acache", 0 },
+diff -up bind-9.9.2/lib/dns/log.c.dyndb bind-9.9.2/lib/dns/log.c
+--- bind-9.9.2/lib/dns/log.c.dyndb 2012-09-27 02:35:19.000000000 +0200
++++ bind-9.9.2/lib/dns/log.c 2012-10-11 13:15:15.085414483 +0200
+@@ -82,6 +82,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
{ "dns/dlz", 0 },
{ "dns/dnssec", 0 },
+ { "dns/crypto", 0 },
+ { "dns/dynamic_db", 0 },
{ NULL, 0 }
};
-diff -up bind-9.9.0/lib/dns/Makefile.in.dyndb bind-9.9.0/lib/dns/Makefile.in
---- bind-9.9.0/lib/dns/Makefile.in.dyndb 2012-03-05 13:53:07.229068824 +0100
-+++ bind-9.9.0/lib/dns/Makefile.in 2012-03-05 13:53:07.252068320 +0100
-@@ -58,7 +58,7 @@ DNSOBJS = acache. at O@ acl. at O@ adb. at O@ bya
+diff -up bind-9.9.2/lib/dns/Makefile.in.dyndb bind-9.9.2/lib/dns/Makefile.in
+--- bind-9.9.2/lib/dns/Makefile.in.dyndb 2012-10-11 13:13:10.605497637 +0200
++++ bind-9.9.2/lib/dns/Makefile.in 2012-10-11 13:13:10.633497585 +0200
+@@ -59,7 +59,7 @@ DNSOBJS = acache. at O@ acl. at O@ adb. at O@ bya
cache. at O@ callbacks. at O@ clientinfo. at O@ compress. at O@ \
db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
dlz. at O@ dns64. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ \
@@ -646,7 +646,7 @@ diff -up bind-9.9.0/lib/dns/Makefile.in.dyndb bind-9.9.0/lib/dns/Makefile.in
lib. at O@ log. at O@ lookup. at O@ \
master. at O@ masterdump. at O@ message. at O@ \
name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ \
-@@ -87,7 +87,7 @@ DNSSRCS = acache.c acl.c adb.c byaddr.c
+@@ -88,7 +88,7 @@ DNSSRCS = acache.c acl.c adb.c byaddr.c
cache.c callbacks.c clientinfo.c compress.c \
db.c dbiterator.c dbtable.c diff.c dispatch.c \
dlz.c dns64.c dnssec.c ds.c forward.c iptable.c journal.c \
@@ -655,7 +655,7 @@ diff -up bind-9.9.0/lib/dns/Makefile.in.dyndb bind-9.9.0/lib/dns/Makefile.in
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 \
-@@ -118,6 +118,11 @@ version. at O@: version.c
+@@ -119,6 +119,11 @@ version. at O@: version.c
-DLIBAGE=${LIBAGE} \
-c ${srcdir}/version.c
@@ -667,9 +667,9 @@ diff -up bind-9.9.0/lib/dns/Makefile.in.dyndb bind-9.9.0/lib/dns/Makefile.in
libdns. at SA@: ${OBJS}
${AR} ${ARFLAGS} $@ ${OBJS}
${RANLIB} $@
-diff -up bind-9.9.0/lib/isccfg/namedconf.c.dyndb bind-9.9.0/lib/isccfg/namedconf.c
---- bind-9.9.0/lib/isccfg/namedconf.c.dyndb 2011-11-07 01:14:11.000000000 +0100
-+++ bind-9.9.0/lib/isccfg/namedconf.c 2012-03-05 13:53:07.253068299 +0100
+diff -up bind-9.9.2/lib/isccfg/namedconf.c.dyndb bind-9.9.2/lib/isccfg/namedconf.c
+--- bind-9.9.2/lib/isccfg/namedconf.c.dyndb 2012-09-27 02:35:19.000000000 +0200
++++ bind-9.9.2/lib/isccfg/namedconf.c 2012-10-11 13:13:10.634497583 +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;
@@ -686,7 +686,7 @@ diff -up bind-9.9.0/lib/isccfg/namedconf.c.dyndb bind-9.9.0/lib/isccfg/namedconf
{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
{ "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI },
{ "managed-keys", &cfg_type_managedkeys, CFG_CLAUSEFLAG_MULTI },
-@@ -1878,6 +1880,40 @@ static cfg_type_t cfg_type_dialuptype =
+@@ -1983,6 +1985,40 @@ static cfg_type_t cfg_type_dialuptype =
&cfg_rep_string, dialup_enums
};
diff --git a/bind.spec b/bind.spec
index 5f71114..fb24493 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,11 +2,11 @@
# Red Hat BIND package .spec file
#
-%define PATCHVER P3
+#%define PATCHVER P3
#%define PREVER rc2
#%define VERSION %{version}%{PREVER}
-#%define VERSION %{version}
-%define VERSION %{version}-%{PATCHVER}
+#%define VERSION %{version}-%{PATCHVER}
+%define VERSION %{version}
%{?!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.9.1
-Release: 10.%{PATCHVER}%{?dist}
+Version: 9.9.2
+Release: 1%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,12 +66,10 @@ Patch110:bind97-rh570851.patch
Patch111:bind97-exportlib.patch
Patch112:bind97-rh645544.patch
Patch119:bind97-rh693982.patch
-Patch121:bind97-rh714049.patch
Patch123:bind98-rh735103.patch
Patch124:nslookup-norec.patch
Patch125:bind99-buildfix.patch
Patch127:bind99-forward.patch
-Patch129:bind98-rh816164.patch
Patch130:bind-9.9.1-P2-multlib-conflict.patch
# SDB patches
@@ -261,14 +259,12 @@ mkdir m4
%patch111 -p1 -b .exportlib
%patch112 -p1 -b .rh645544
%patch119 -p1 -b .rh693982
-%patch121 -p1 -b .rh714049
%patch123 -p1 -b .rh735103
pushd bin/dig
%patch124 -p0 -b .nslookup-norec
popd
%patch125 -p1 -b .buildfix
%patch127 -p1 -b .forward
-%patch129 -p1 -b .rh816164
%patch130 -p1 -b .multlib-conflict
%if %{SDB}
@@ -773,6 +769,12 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Thu Oct 11 2012 Adam Tkac <atkac redhat com> 32:9.9.2-1
+- update to 9.9.2
+- bind97-rh714049.patch has been dropped
+- patches merged
+ - bind98-rh816164.patch
+
* Mon Sep 24 2012 Tomas Hozza <thozza at redhat.com> 32:9.9.1-10.P3
- Fixed last line in chroot %%postun script (#859687)
diff --git a/bind99-buildfix.patch b/bind99-buildfix.patch
index 9e35067..22db644 100644
--- a/bind99-buildfix.patch
+++ b/bind99-buildfix.patch
@@ -1,12 +1,12 @@
-diff -up bind-9.9.0b1/bin/tests/system/Makefile.in.buildfix bind-9.9.0b1/bin/tests/system/Makefile.in
---- bind-9.9.0b1/bin/tests/system/Makefile.in.buildfix 2011-11-10 12:52:41.990270700 +0100
-+++ bind-9.9.0b1/bin/tests/system/Makefile.in 2011-11-10 12:52:52.596269957 +0100
+diff -up bind-9.9.2/bin/tests/system/Makefile.in.buildfix bind-9.9.2/bin/tests/system/Makefile.in
+--- bind-9.9.2/bin/tests/system/Makefile.in.buildfix 2012-09-27 02:35:19.000000000 +0200
++++ bind-9.9.2/bin/tests/system/Makefile.in 2012-10-11 13:33:21.245382076 +0200
@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@
--SUBDIRS = dlzexternal filter-aaaa lwresd rpz tkey tsiggss
-+SUBDIRS = filter-aaaa lwresd rpz tkey tsiggss
+-SUBDIRS = dlzexternal filter-aaaa lwresd rpz rsabigexponent tkey tsiggss
++SUBDIRS = filter-aaaa lwresd rpz rsabigexponent tkey tsiggss
TARGETS =
@BIND9_MAKE_RULES@
diff --git a/sources b/sources
index 9ff6ff9..0a31c23 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8f407c9a988d7b447a54b4cb54230dcb bind-9.9.1-P3.tar.gz
+3b37d8de1bb15d3e887ce9ee8e07cd71 bind-9.9.2.tar.gz
76857526420dc8e153ad688aeb5a2c4b config-8.tar.bz2
More information about the scm-commits
mailing list