[bind/f16] Update to 9.8.4
Adam Tkac
atkac at fedoraproject.org
Thu Oct 11 11:08:42 UTC 2012
commit 4125e0520dcae484d691335e29620335c2e28701
Author: Adam Tkac <atkac at redhat.com>
Date: Thu Oct 11 13:08:17 2012 +0200
Update to 9.8.4
bind97-rh714049.patch has been dropped
Signed-off-by: Adam Tkac <atkac at redhat.com>
.gitignore | 1 +
bind-96-dyndb.patch | 86 +++++++++++++-------------
bind.spec | 16 +++--
bind97-rh714049.patch | 160 -------------------------------------------------
sources | 2 +-
5 files changed, 54 insertions(+), 211 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b022e2c..7a1add2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ bind-9.7.2b1.tar.gz
/bind-9.8.3-P1.tar.gz
/bind-9.8.3-P2.tar.gz
/bind-9.8.3-P3.tar.gz
+/bind-9.8.4.tar.gz
diff --git a/bind-96-dyndb.patch b/bind-96-dyndb.patch
index 92173dd..31bfc8c 100644
--- a/bind-96-dyndb.patch
+++ b/bind-96-dyndb.patch
@@ -1,6 +1,6 @@
-diff -up bind-9.8.2rc1/bin/named/main.c.dyndb bind-9.8.2rc1/bin/named/main.c
---- bind-9.8.2rc1/bin/named/main.c.dyndb 2011-11-05 01:45:52.000000000 +0100
-+++ bind-9.8.2rc1/bin/named/main.c 2012-03-16 15:48:31.933504783 +0100
+diff -up bind-9.8.4/bin/named/main.c.dyndb bind-9.8.4/bin/named/main.c
+--- bind-9.8.4/bin/named/main.c.dyndb 2012-09-27 02:32:45.000000000 +0200
++++ bind-9.8.4/bin/named/main.c 2012-10-11 13:03:27.236962798 +0200
@@ -45,6 +45,7 @@
#include <isccc/result.h>
@@ -9,9 +9,9 @@ diff -up bind-9.8.2rc1/bin/named/main.c.dyndb bind-9.8.2rc1/bin/named/main.c
#include <dns/name.h>
#include <dns/result.h>
#include <dns/view.h>
-diff -up bind-9.8.2rc1/bin/named/server.c.dyndb bind-9.8.2rc1/bin/named/server.c
---- bind-9.8.2rc1/bin/named/server.c.dyndb 2011-12-22 09:25:16.000000000 +0100
-+++ bind-9.8.2rc1/bin/named/server.c 2012-03-16 15:48:31.937504796 +0100
+diff -up bind-9.8.4/bin/named/server.c.dyndb bind-9.8.4/bin/named/server.c
+--- bind-9.8.4/bin/named/server.c.dyndb 2012-09-27 02:32:45.000000000 +0200
++++ bind-9.8.4/bin/named/server.c 2012-10-11 13:03:27.239962789 +0200
@@ -61,6 +61,7 @@
#include <dns/db.h>
#include <dns/dispatch.h>
@@ -93,7 +93,7 @@ diff -up bind-9.8.2rc1/bin/named/server.c.dyndb bind-9.8.2rc1/bin/named/server.c
disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
isc_result_t result;
const cfg_obj_t *algorithms;
-@@ -1562,6 +1629,7 @@ configure_view(dns_view_t *view, cfg_obj
+@@ -1576,6 +1643,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.8.2rc1/bin/named/server.c.dyndb bind-9.8.2rc1/bin/named/server.c
const cfg_obj_t *disabled;
const cfg_obj_t *obj;
const cfg_listelt_t *element;
-@@ -1792,6 +1860,8 @@ configure_view(dns_view_t *view, cfg_obj
+@@ -1806,6 +1874,8 @@ configure_view(dns_view_t *view, cfg_obj
}
}
@@ -110,7 +110,7 @@ diff -up bind-9.8.2rc1/bin/named/server.c.dyndb bind-9.8.2rc1/bin/named/server.c
/*
* Obtain configuration parameters that affect the decision of whether
* we can reuse/share an existing cache.
-@@ -2689,6 +2759,37 @@ configure_view(dns_view_t *view, cfg_obj
+@@ -2703,6 +2773,37 @@ configure_view(dns_view_t *view, cfg_obj
dns_view_setrootdelonly(view, ISC_FALSE);
/*
@@ -148,7 +148,7 @@ diff -up bind-9.8.2rc1/bin/named/server.c.dyndb bind-9.8.2rc1/bin/named/server.c
* Setup automatic empty zones. If recursion is off then
* they are disabled by default.
*/
-@@ -4295,6 +4396,7 @@ load_configuration(const char *filename,
+@@ -4336,6 +4437,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.8.2rc1/bin/named/server.c.dyndb bind-9.8.2rc1/bin/named/server.c
/*
* Parse the global default pseudo-config file.
*/
-@@ -5336,6 +5438,8 @@ shutdown_server(isc_task_t *task, isc_ev
+@@ -5377,6 +5479,8 @@ shutdown_server(isc_task_t *task, isc_ev
dns_view_detach(&view);
}
@@ -165,9 +165,9 @@ diff -up bind-9.8.2rc1/bin/named/server.c.dyndb bind-9.8.2rc1/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.8.2rc1/lib/dns/dynamic_db.c.dyndb bind-9.8.2rc1/lib/dns/dynamic_db.c
---- bind-9.8.2rc1/lib/dns/dynamic_db.c.dyndb 2012-03-16 15:48:31.938504800 +0100
-+++ bind-9.8.2rc1/lib/dns/dynamic_db.c 2012-03-16 15:48:31.938504800 +0100
+diff -up bind-9.8.4/lib/dns/dynamic_db.c.dyndb bind-9.8.4/lib/dns/dynamic_db.c
+--- bind-9.8.4/lib/dns/dynamic_db.c.dyndb 2012-10-11 13:03:27.240962786 +0200
++++ bind-9.8.4/lib/dns/dynamic_db.c 2012-10-11 13:03:27.240962786 +0200
@@ -0,0 +1,366 @@
+/*
+ * Copyright (C) 2008-2011 Red Hat, Inc.
@@ -535,9 +535,9 @@ diff -up bind-9.8.2rc1/lib/dns/dynamic_db.c.dyndb bind-9.8.2rc1/lib/dns/dynamic_
+
+ return args->timermgr;
+}
-diff -up bind-9.8.2rc1/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.8.2rc1/lib/dns/include/dns/dynamic_db.h
---- bind-9.8.2rc1/lib/dns/include/dns/dynamic_db.h.dyndb 2012-03-16 15:48:31.938504800 +0100
-+++ bind-9.8.2rc1/lib/dns/include/dns/dynamic_db.h 2012-03-16 15:48:31.938504800 +0100
+diff -up bind-9.8.4/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.8.4/lib/dns/include/dns/dynamic_db.h
+--- bind-9.8.4/lib/dns/include/dns/dynamic_db.h.dyndb 2012-10-11 13:03:27.240962786 +0200
++++ bind-9.8.4/lib/dns/include/dns/dynamic_db.h 2012-10-11 13:03:27.240962786 +0200
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2008-2011 Red Hat, Inc.
@@ -589,20 +589,20 @@ diff -up bind-9.8.2rc1/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.8.2rc1/lib/
+isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
+
+#endif
-diff -up bind-9.8.2rc1/lib/dns/include/dns/log.h.dyndb bind-9.8.2rc1/lib/dns/include/dns/log.h
---- bind-9.8.2rc1/lib/dns/include/dns/log.h.dyndb 2011-10-16 01:46:14.000000000 +0200
-+++ bind-9.8.2rc1/lib/dns/include/dns/log.h 2012-03-16 15:48:31.939504804 +0100
-@@ -75,6 +75,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
- #define DNS_LOGMODULE_ACACHE (&dns_modules[25])
+diff -up bind-9.8.4/lib/dns/include/dns/log.h.dyndb bind-9.8.4/lib/dns/include/dns/log.h
+--- bind-9.8.4/lib/dns/include/dns/log.h.dyndb 2012-09-27 02:32:45.000000000 +0200
++++ bind-9.8.4/lib/dns/include/dns/log.h 2012-10-11 13:04:16.006813863 +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_CRYPTO (&dns_modules[28])
+#define DNS_LOGMODULE_DYNDB (&dns_modules[28])
ISC_LANG_BEGINDECLS
-diff -up bind-9.8.2rc1/lib/dns/include/dns/Makefile.in.dyndb bind-9.8.2rc1/lib/dns/include/dns/Makefile.in
---- bind-9.8.2rc1/lib/dns/include/dns/Makefile.in.dyndb 2011-02-28 02:20:02.000000000 +0100
-+++ bind-9.8.2rc1/lib/dns/include/dns/Makefile.in 2012-03-16 15:49:12.828637215 +0100
+diff -up bind-9.8.4/lib/dns/include/dns/Makefile.in.dyndb bind-9.8.4/lib/dns/include/dns/Makefile.in
+--- bind-9.8.4/lib/dns/include/dns/Makefile.in.dyndb 2012-09-27 02:32:45.000000000 +0200
++++ bind-9.8.4/lib/dns/include/dns/Makefile.in 2012-10-11 13:03:27.241962783 +0200
@@ -22,7 +22,7 @@ top_srcdir = @top_srcdir@
@BIND9_VERSION@
@@ -612,9 +612,9 @@ diff -up bind-9.8.2rc1/lib/dns/include/dns/Makefile.in.dyndb bind-9.8.2rc1/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.2rc1/lib/dns/include/dns/types.h.dyndb bind-9.8.2rc1/lib/dns/include/dns/types.h
---- bind-9.8.2rc1/lib/dns/include/dns/types.h.dyndb 2010-12-08 03:46:16.000000000 +0100
-+++ bind-9.8.2rc1/lib/dns/include/dns/types.h 2012-03-16 15:48:31.940504807 +0100
+diff -up bind-9.8.4/lib/dns/include/dns/types.h.dyndb bind-9.8.4/lib/dns/include/dns/types.h
+--- bind-9.8.4/lib/dns/include/dns/types.h.dyndb 2012-09-27 02:32:45.000000000 +0200
++++ bind-9.8.4/lib/dns/include/dns/types.h 2012-10-11 13:03:27.242962781 +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.8.2rc1/lib/dns/include/dns/types.h.dyndb bind-9.8.2rc1/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.2rc1/lib/dns/log.c.dyndb bind-9.8.2rc1/lib/dns/log.c
---- bind-9.8.2rc1/lib/dns/log.c.dyndb 2011-10-16 01:46:14.000000000 +0200
-+++ bind-9.8.2rc1/lib/dns/log.c 2012-03-16 15:48:31.940504807 +0100
-@@ -81,6 +81,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
- { "dns/acache", 0 },
+diff -up bind-9.8.4/lib/dns/log.c.dyndb bind-9.8.4/lib/dns/log.c
+--- bind-9.8.4/lib/dns/log.c.dyndb 2012-09-27 02:32:45.000000000 +0200
++++ bind-9.8.4/lib/dns/log.c 2012-10-11 13:04:51.191713938 +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.8.2rc1/lib/dns/Makefile.in.dyndb bind-9.8.2rc1/lib/dns/Makefile.in
---- bind-9.8.2rc1/lib/dns/Makefile.in.dyndb 2012-03-16 15:48:31.917504732 +0100
-+++ bind-9.8.2rc1/lib/dns/Makefile.in 2012-03-16 15:49:47.692750113 +0100
-@@ -56,7 +56,7 @@ DSTOBJS = @DST_EXTRA_OBJS@ @OPENSSLLINKO
+diff -up bind-9.8.4/lib/dns/Makefile.in.dyndb bind-9.8.4/lib/dns/Makefile.in
+--- bind-9.8.4/lib/dns/Makefile.in.dyndb 2012-10-11 13:03:27.206962885 +0200
++++ bind-9.8.4/lib/dns/Makefile.in 2012-10-11 13:03:27.242962781 +0200
+@@ -57,7 +57,7 @@ DSTOBJS = @DST_EXTRA_OBJS@ @OPENSSLLINKO
# Alphabetically
DNSOBJS = acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
cache. at O@ callbacks. at O@ compress. at O@ \
@@ -646,7 +646,7 @@ diff -up bind-9.8.2rc1/lib/dns/Makefile.in.dyndb bind-9.8.2rc1/lib/dns/Makefile.
dlz. at O@ dns64. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ \
journal. at O@ keydata. at O@ keytable. at O@ \
lib. at O@ log. at O@ lookup. at O@ \
-@@ -85,7 +85,7 @@ DSTSRCS = @DST_EXTRA_SRCS@ @OPENSSLLINKS
+@@ -86,7 +86,7 @@ DSTSRCS = @DST_EXTRA_SRCS@ @OPENSSLLINKS
DNSSRCS = acache.c acl.c adb.c byaddr.c \
cache.c callbacks.c compress.c \
@@ -655,7 +655,7 @@ diff -up bind-9.8.2rc1/lib/dns/Makefile.in.dyndb bind-9.8.2rc1/lib/dns/Makefile.
dlz.c dns64.c dnssec.c ds.c forward.c iptable.c journal.c \
keydata.c keytable.c lib.c log.c lookup.c \
master.c masterdump.c message.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.8.2rc1/lib/dns/Makefile.in.dyndb bind-9.8.2rc1/lib/dns/Makefile.
libdns. at SA@: ${OBJS}
${AR} ${ARFLAGS} $@ ${OBJS}
${RANLIB} $@
-diff -up bind-9.8.2rc1/lib/isccfg/namedconf.c.dyndb bind-9.8.2rc1/lib/isccfg/namedconf.c
---- bind-9.8.2rc1/lib/isccfg/namedconf.c.dyndb 2011-11-07 01:31:48.000000000 +0100
-+++ bind-9.8.2rc1/lib/isccfg/namedconf.c 2012-03-16 15:48:31.942504813 +0100
+diff -up bind-9.8.4/lib/isccfg/namedconf.c.dyndb bind-9.8.4/lib/isccfg/namedconf.c
+--- bind-9.8.4/lib/isccfg/namedconf.c.dyndb 2012-09-27 02:32:45.000000000 +0200
++++ bind-9.8.4/lib/isccfg/namedconf.c 2012-10-11 13:03:27.244962775 +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.8.2rc1/lib/isccfg/namedconf.c.dyndb bind-9.8.2rc1/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 },
-@@ -1862,6 +1864,40 @@ static cfg_type_t cfg_type_dialuptype =
+@@ -1966,6 +1968,40 @@ static cfg_type_t cfg_type_dialuptype =
&cfg_rep_string, dialup_enums
};
diff --git a/bind.spec b/bind.spec
index eb28e14..a7a3ae8 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,11 +2,11 @@
# Red Hat BIND package .spec file
#
-%define PATCHVER P3
+#%define PATCHVER P3
#%define VERSION %{version}%{PREVER}
#%define PREVER rc2
-#%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.8.3
-Release: 4.%{PATCHVER}%{?dist}
+Version: 9.8.4
+Release: 1%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,7 +63,6 @@ Patch111:bind97-exportlib.patch
Patch112:bind97-rh645544.patch
Patch118:bind97-rh699951.patch
Patch119:bind97-rh693982.patch
-Patch121:bind97-rh714049.patch
Patch122:bind98-dlz_buildfix.patch
Patch123:bind98-rh735103.patch
Patch124:bind99-forward.patch
@@ -283,7 +282,6 @@ mkdir m4
%patch112 -p1 -b .rh645544
%patch118 -p1 -b .rh699951
%patch119 -p1 -b .rh693982
-%patch121 -p1 -b .rh714049
%patch122 -p1 -b .dlz_buildfix
%patch123 -p1 -b .rh735103
%patch124 -p1 -b .forward
@@ -755,6 +753,10 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Thu Oct 11 2012 Adam Tkac <atkac redhat com> 32:9.8.4-1
+- update to 9.8.4
+- bind97-rh714049.patch has been dropped
+
* Tue Sep 13 2012 Adam Tkac <atkac redhat com> 32:9.8.3-4.P3
- update to 9.8.3-P3
diff --git a/sources b/sources
index d001cc7..441f7c0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-86f72cf1a99c4d7d1978c201a92fb3f3 bind-9.8.3-P3.tar.gz
+7d991ec73b625b9f071afa3759411f52 bind-9.8.4.tar.gz
76857526420dc8e153ad688aeb5a2c4b config-8.tar.bz2
More information about the scm-commits
mailing list