rpms
/
bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Merged update from upstream sources 

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/bind.git#d955a1450b6ef009d85e931e669acb2e3fdd3e27
This commit is contained in:
DistroBaker 2021-01-12 20:05:29 +00:00
parent 2446ba7188
commit 30a5379a7f
7 changed files with 131 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -120,3 +120,5 @@ bind-9.7.2b1.tar.gz
/bind-9.11.24.tar.gz.asc /bind-9.11.24.tar.gz.asc
/bind-9.11.25.tar.gz /bind-9.11.25.tar.gz
/bind-9.11.25.tar.gz.asc /bind-9.11.25.tar.gz.asc
/bind-9.11.26.tar.gz
/bind-9.11.26.tar.gz.asc

80
bind-9.11-serve-stale.patch
View File

@ -1,4 +1,4 @@
From 95b25d45662f4fad39cbc9ddbc3b4bcdae0a04ec Mon Sep 17 00:00:00 2001 From d55a57427ee696dec51149950478394e43019607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com> From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Thu, 7 Nov 2019 14:31:03 +0100 Date: Thu, 7 Nov 2019 14:31:03 +0100
Subject: [PATCH] Implement serve-stale in 9.11 Subject: [PATCH] Implement serve-stale in 9.11
@ -276,7 +276,7 @@ Signed-off-by: Petr Menšík <pemensik@redhat.com>
create mode 100755 bin/tests/system/serve-stale/tests.sh create mode 100755 bin/tests/system/serve-stale/tests.sh
diff --git a/bin/named/config.c b/bin/named/config.c diff --git a/bin/named/config.c b/bin/named/config.c
index 5e663c6..560ef04 100644 index 9e071bb..d2cd3bc 100644
--- a/bin/named/config.c --- a/bin/named/config.c
+++ b/bin/named/config.c +++ b/bin/named/config.c
@@ -182,13 +182,14 @@ options {\n\ @@ -182,13 +182,14 @@ options {\n\
@ -291,7 +291,7 @@ index 5e663c6..560ef04 100644
max-clients-per-query 100;\n\ max-clients-per-query 100;\n\
max-ncache-ttl 10800; /* 3 hours */\n\ max-ncache-ttl 10800; /* 3 hours */\n\
max-recursion-depth 7;\n\ max-recursion-depth 7;\n\
max-recursion-queries 75;\n\ max-recursion-queries 100;\n\
+ max-stale-ttl 604800; /* 1 week */\n\ + max-stale-ttl 604800; /* 1 week */\n\
message-compression yes;\n\ message-compression yes;\n\
# min-roots <obsolete>;\n\ # min-roots <obsolete>;\n\
@ -430,7 +430,7 @@ index acfa766..ea6f114 100644
}; };
diff --git a/bin/named/query.c b/bin/named/query.c diff --git a/bin/named/query.c b/bin/named/query.c
index edf42d2..89cc574 100644 index b14f081..a95f5ad 100644
--- a/bin/named/query.c --- a/bin/named/query.c
+++ b/bin/named/query.c +++ b/bin/named/query.c
@@ -149,10 +149,14 @@ last_cmpxchg(isc_stdtime_t *x, isc_stdtime_t *e, isc_stdtime_t r) { @@ -149,10 +149,14 @@ last_cmpxchg(isc_stdtime_t *x, isc_stdtime_t *e, isc_stdtime_t r) {
@ -644,7 +644,7 @@ index edf42d2..89cc574 100644
RECURSIONOK(client)) RECURSIONOK(client))
{ {
if (dns_rdataset_isassociated(rdataset)) if (dns_rdataset_isassociated(rdataset))
@@ -8668,7 +8775,11 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) @@ -8676,7 +8783,11 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
"query_find: unexpected error after resuming: %s", "query_find: unexpected error after resuming: %s",
isc_result_totext(result)); isc_result_totext(result));
CTRACE(ISC_LOG_ERROR, errmsg); CTRACE(ISC_LOG_ERROR, errmsg);
@ -657,7 +657,7 @@ index edf42d2..89cc574 100644
goto cleanup; goto cleanup;
} }
@@ -8924,7 +9035,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) @@ -8932,7 +9043,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
/* /*
* If we have a zero ttl from the cache refetch it. * If we have a zero ttl from the cache refetch it.
*/ */
@ -666,7 +666,7 @@ index edf42d2..89cc574 100644
RECURSIONOK(client)) RECURSIONOK(client))
{ {
if (dns_rdataset_isassociated(rdataset)) if (dns_rdataset_isassociated(rdataset))
@@ -8935,6 +9046,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) @@ -8943,6 +9054,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
if (node != NULL) if (node != NULL)
dns_db_detachnode(db, &node); dns_db_detachnode(db, &node);
@ -674,7 +674,7 @@ index edf42d2..89cc574 100644
INSIST(!REDIRECT(client)); INSIST(!REDIRECT(client));
result = query_recurse(client, qtype, result = query_recurse(client, qtype,
client->query.qname, client->query.qname,
@@ -9215,6 +9327,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) @@ -9223,6 +9335,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
dns_fixedname_name(&wildcardname), dns_fixedname_name(&wildcardname),
true, false); true, false);
cleanup: cleanup:
@ -682,7 +682,7 @@ index edf42d2..89cc574 100644
CTRACE(ISC_LOG_DEBUG(3), "query_find: cleanup"); CTRACE(ISC_LOG_DEBUG(3), "query_find: cleanup");
/* /*
* General cleanup. * General cleanup.
@@ -9271,6 +9384,49 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) @@ -9279,6 +9392,49 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
goto restart; goto restart;
} }
@ -1007,7 +1007,7 @@ index 0acfe3a..2c21c1d 100644
Print a zone's configuration.\n\ Print a zone's configuration.\n\
sign zone [class [view]]\n\ sign zone [class [view]]\n\
diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index 1e3812e..c7fe65f 100644 index 159ded9..12a7208 100644
--- a/bin/rndc/rndc.docbook --- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook +++ b/bin/rndc/rndc.docbook
@@ -689,6 +689,25 @@ @@ -689,6 +689,25 @@
@ -1052,7 +1052,7 @@ index 23bedcd..43385de 100644
+ exit 1 + exit 1
+fi +fi
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index c59cfaf..2b3de5f 100644 index f6412f6..26c8901 100644
--- a/bin/tests/system/conf.sh.in --- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in
@@ -128,7 +128,7 @@ PARALLELDIRS="dnssec rpzrecurse \ @@ -128,7 +128,7 @@ PARALLELDIRS="dnssec rpzrecurse \
@ -2039,7 +2039,7 @@ index 0000000..201c996
+echo "I:exit status: $status" +echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1 +[ $status -eq 0 ] || exit 1
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 1f9df2c..78e75ce 100644 index 99c8680..5fbabfe 100644
--- a/doc/arm/Bv9ARM-book.xml --- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml
@@ -4336,6 +4336,9 @@ badresp:1,adberr:0,findfail:0,valfail:0] @@ -4336,6 +4336,9 @@ badresp:1,adberr:0,findfail:0,valfail:0]
@ -2113,7 +2113,7 @@ index 1f9df2c..78e75ce 100644
<varlistentry> <varlistentry>
<term><command>nocookie-udp-size</command></term> <term><command>nocookie-udp-size</command></term>
<listitem> <listitem>
@@ -7448,13 +7482,19 @@ options { @@ -7449,13 +7483,19 @@ options {
<term><command>resolver-query-timeout</command></term> <term><command>resolver-query-timeout</command></term>
<listitem> <listitem>
<para> <para>
@ -2140,7 +2140,7 @@ index 1f9df2c..78e75ce 100644
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@@ -9015,6 +9055,27 @@ avoid-v6-udp-ports { 40000; range 50000 60000; }; @@ -9016,6 +9056,27 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -2169,7 +2169,7 @@ index 1f9df2c..78e75ce 100644
<term><command>min-roots</command></term> <term><command>min-roots</command></term>
<listitem> <listitem>
diff --git a/doc/arm/logging-categories.xml b/doc/arm/logging-categories.xml diff --git a/doc/arm/logging-categories.xml b/doc/arm/logging-categories.xml
index f0776fe..c4b903a 100644 index 56d05e8..098342b 100644
--- a/doc/arm/logging-categories.xml --- a/doc/arm/logging-categories.xml
+++ b/doc/arm/logging-categories.xml +++ b/doc/arm/logging-categories.xml
@@ -311,6 +311,17 @@ @@ -311,6 +311,17 @@
@ -2982,7 +2982,7 @@ index fa839a0..91b3cab 100644
RUNTIME_CHECK(result == ISC_R_SUCCESS); RUNTIME_CHECK(result == ISC_R_SUCCESS);
isc_buffer_usedregion(&buffer, &r); isc_buffer_usedregion(&buffer, &r);
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 3b75cad..535202b 100644 index 3a60bcf..8ea4d47 100644
--- a/lib/dns/rbtdb.c --- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c
@@ -511,6 +511,7 @@ typedef ISC_LIST(rdatasetheader_t) rdatasetheaderlist_t; @@ -511,6 +511,7 @@ typedef ISC_LIST(rdatasetheader_t) rdatasetheaderlist_t;
@ -3171,7 +3171,7 @@ index 3b75cad..535202b 100644
rdataset->private1 = rbtdb; rdataset->private1 = rbtdb;
rdataset->private2 = node; rdataset->private2 = node;
raw = (unsigned char *)header + sizeof(*header); raw = (unsigned char *)header + sizeof(*header);
@@ -4699,6 +4798,19 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header, @@ -4698,6 +4797,19 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header,
#endif #endif
if (!ACTIVE(header, search->now)) { if (!ACTIVE(header, search->now)) {
@ -3191,7 +3191,7 @@ index 3b75cad..535202b 100644
/* /*
* This rdataset is stale. If no one else is using the * This rdataset is stale. If no one else is using the
* node, we can clean it up right now, otherwise we mark * node, we can clean it up right now, otherwise we mark
@@ -4738,7 +4850,7 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header, @@ -4737,7 +4849,7 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header,
node->data = header->next; node->data = header->next;
free_rdataset(search->rbtdb, mctx, header); free_rdataset(search->rbtdb, mctx, header);
} else { } else {
@ -3200,7 +3200,7 @@ index 3b75cad..535202b 100644
*header_prev = header; *header_prev = header;
} }
} else } else
@@ -5179,7 +5291,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, @@ -5178,7 +5290,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
&locktype, lock, &search, &locktype, lock, &search,
&header_prev)) { &header_prev)) {
/* Do nothing. */ /* Do nothing. */
@ -3209,7 +3209,7 @@ index 3b75cad..535202b 100644
/* /*
* We now know that there is at least one active * We now know that there is at least one active
* non-stale rdataset at this node. * non-stale rdataset at this node.
@@ -5662,7 +5774,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) { @@ -5661,7 +5773,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) {
* refcurrent(rbtnode) must be non-zero. This is so * refcurrent(rbtnode) must be non-zero. This is so
* because 'node' is an argument to the function. * because 'node' is an argument to the function.
*/ */
@ -3218,7 +3218,7 @@ index 3b75cad..535202b 100644
if (log) if (log)
isc_log_write(dns_lctx, category, module, isc_log_write(dns_lctx, category, module,
level, "overmem cache: stale %s", level, "overmem cache: stale %s",
@@ -5670,7 +5782,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) { @@ -5669,7 +5781,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) {
} else if (force_expire) { } else if (force_expire) {
if (! RETAIN(header)) { if (! RETAIN(header)) {
set_ttl(rbtdb, header, 0); set_ttl(rbtdb, header, 0);
@ -3227,7 +3227,7 @@ index 3b75cad..535202b 100644
} else if (log) { } else if (log) {
isc_log_write(dns_lctx, category, module, isc_log_write(dns_lctx, category, module,
level, "overmem cache: " level, "overmem cache: "
@@ -5929,9 +6041,9 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, @@ -5928,9 +6040,9 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
* non-zero. This is so because 'node' is an * non-zero. This is so because 'node' is an
* argument to the function. * argument to the function.
*/ */
@ -3239,7 +3239,7 @@ index 3b75cad..535202b 100644
if (header->type == matchtype) if (header->type == matchtype)
found = header; found = header;
else if (header->type == RBTDB_RDATATYPE_NCACHEANY || else if (header->type == RBTDB_RDATATYPE_NCACHEANY ||
@@ -6233,7 +6345,7 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, @@ -6232,7 +6344,7 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
topheader = topheader->next) topheader = topheader->next)
{ {
set_ttl(rbtdb, topheader, 0); set_ttl(rbtdb, topheader, 0);
@ -3248,7 +3248,7 @@ index 3b75cad..535202b 100644
} }
goto find_header; goto find_header;
} }
@@ -6294,7 +6406,7 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, @@ -6293,7 +6405,7 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
* ncache entry. * ncache entry.
*/ */
set_ttl(rbtdb, topheader, 0); set_ttl(rbtdb, topheader, 0);
@ -3257,7 +3257,7 @@ index 3b75cad..535202b 100644
topheader = NULL; topheader = NULL;
goto find_header; goto find_header;
} }
@@ -6332,8 +6444,11 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, @@ -6331,8 +6443,11 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
} }
/* /*
@ -3271,7 +3271,7 @@ index 3b75cad..535202b 100644
*/ */
if (rbtversion == NULL && trust < header->trust && if (rbtversion == NULL && trust < header->trust &&
(ACTIVE(header, now) || header_nx)) { (ACTIVE(header, now) || header_nx)) {
@@ -6363,6 +6478,10 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, @@ -6362,6 +6477,10 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
if ((options & DNS_DBADD_EXACT) != 0) if ((options & DNS_DBADD_EXACT) != 0)
flags |= DNS_RDATASLAB_EXACT; flags |= DNS_RDATASLAB_EXACT;
@ -3282,7 +3282,7 @@ index 3b75cad..535202b 100644
if ((options & DNS_DBADD_EXACTTTL) != 0 && if ((options & DNS_DBADD_EXACTTTL) != 0 &&
newheader->rdh_ttl != header->rdh_ttl) newheader->rdh_ttl != header->rdh_ttl)
result = DNS_R_NOTEXACT; result = DNS_R_NOTEXACT;
@@ -6406,11 +6525,12 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, @@ -6405,11 +6524,12 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
} }
} }
/* /*
@ -3300,7 +3300,7 @@ index 3b75cad..535202b 100644
*/ */
if (IS_CACHE(rbtdb) && ACTIVE(header, now) && if (IS_CACHE(rbtdb) && ACTIVE(header, now) &&
header->type == dns_rdatatype_ns && header->type == dns_rdatatype_ns &&
@@ -6583,10 +6703,10 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, @@ -6582,10 +6702,10 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
changed->dirty = true; changed->dirty = true;
if (rbtversion == NULL) { if (rbtversion == NULL) {
set_ttl(rbtdb, header, 0); set_ttl(rbtdb, header, 0);
@ -3313,7 +3313,7 @@ index 3b75cad..535202b 100644
} }
} }
if (rbtversion != NULL && !header_nx) { if (rbtversion != NULL && !header_nx) {
@@ -8437,6 +8557,30 @@ nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) { @@ -8436,6 +8556,30 @@ nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) {
return (result); return (result);
} }
@ -3344,7 +3344,7 @@ index 3b75cad..535202b 100644
static dns_dbmethods_t zone_methods = { static dns_dbmethods_t zone_methods = {
attach, attach,
detach, detach,
@@ -8482,7 +8626,9 @@ static dns_dbmethods_t zone_methods = { @@ -8481,7 +8625,9 @@ static dns_dbmethods_t zone_methods = {
NULL, NULL,
hashsize, hashsize,
nodefullname, nodefullname,
@ -3355,7 +3355,7 @@ index 3b75cad..535202b 100644
}; };
static dns_dbmethods_t cache_methods = { static dns_dbmethods_t cache_methods = {
@@ -8530,7 +8676,9 @@ static dns_dbmethods_t cache_methods = { @@ -8529,7 +8675,9 @@ static dns_dbmethods_t cache_methods = {
setcachestats, setcachestats,
hashsize, hashsize,
nodefullname, nodefullname,
@ -3366,7 +3366,7 @@ index 3b75cad..535202b 100644
}; };
isc_result_t isc_result_t
@@ -8801,7 +8949,7 @@ dns_rbtdb_create @@ -8800,7 +8948,7 @@ dns_rbtdb_create
rbtdb->rpzs = NULL; rbtdb->rpzs = NULL;
rbtdb->load_rpzs = NULL; rbtdb->load_rpzs = NULL;
rbtdb->rpz_num = DNS_RPZ_INVALID_NUM; rbtdb->rpz_num = DNS_RPZ_INVALID_NUM;
@ -3375,7 +3375,7 @@ index 3b75cad..535202b 100644
/* /*
* Version Initialization. * Version Initialization.
*/ */
@@ -9219,7 +9367,8 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) { @@ -9218,7 +9366,8 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) {
* rdatasets to work. * rdatasets to work.
*/ */
if (NONEXISTENT(header) || if (NONEXISTENT(header) ||
@ -3385,7 +3385,7 @@ index 3b75cad..535202b 100644
header = NULL; header = NULL;
break; break;
} else } else
@@ -10428,7 +10577,7 @@ static inline bool @@ -10427,7 +10576,7 @@ static inline bool
need_headerupdate(rdatasetheader_t *header, isc_stdtime_t now) { need_headerupdate(rdatasetheader_t *header, isc_stdtime_t now) {
if ((header->attributes & if ((header->attributes &
(RDATASET_ATTR_NONEXISTENT | (RDATASET_ATTR_NONEXISTENT |
@ -3394,7 +3394,7 @@ index 3b75cad..535202b 100644
RDATASET_ATTR_ZEROTTL)) != 0) RDATASET_ATTR_ZEROTTL)) != 0)
return (false); return (false);
@@ -10534,7 +10683,7 @@ expire_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, @@ -10533,7 +10682,7 @@ expire_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header,
bool tree_locked, expire_t reason) bool tree_locked, expire_t reason)
{ {
set_ttl(rbtdb, header, 0); set_ttl(rbtdb, header, 0);
@ -3404,7 +3404,7 @@ index 3b75cad..535202b 100644
/* /*
* Caller must hold the node (write) lock. * Caller must hold the node (write) lock.
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 5e20783..17a4eee 100644 index 49ec49c..2de70a6 100644
--- a/lib/dns/resolver.c --- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c +++ b/lib/dns/resolver.c
@@ -141,16 +141,17 @@ @@ -141,16 +141,17 @@
@ -3468,7 +3468,7 @@ index 5e20783..17a4eee 100644
/* /*
* Add a fudge factor to the expected rtt based on the current * Add a fudge factor to the expected rtt based on the current
@@ -4535,7 +4539,8 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, @@ -4542,7 +4546,8 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
/* /*
* Compute an expiration time for the entire fetch. * Compute an expiration time for the entire fetch.
*/ */
@ -3478,7 +3478,7 @@ index 5e20783..17a4eee 100644
iresult = isc_time_nowplusinterval(&fctx->expires, &interval); iresult = isc_time_nowplusinterval(&fctx->expires, &interval);
if (iresult != ISC_R_SUCCESS) { if (iresult != ISC_R_SUCCESS) {
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
@@ -9059,6 +9064,8 @@ dns_resolver_create(dns_view_t *view, @@ -9105,6 +9110,8 @@ dns_resolver_create(dns_view_t *view,
res->spillattimer = NULL; res->spillattimer = NULL;
res->zspill = 0; res->zspill = 0;
res->zero_no_soa_ttl = false; res->zero_no_soa_ttl = false;
@ -3487,7 +3487,7 @@ index 5e20783..17a4eee 100644
res->query_timeout = DEFAULT_QUERY_TIMEOUT; res->query_timeout = DEFAULT_QUERY_TIMEOUT;
res->maxdepth = DEFAULT_RECURSION_DEPTH; res->maxdepth = DEFAULT_RECURSION_DEPTH;
res->maxqueries = DEFAULT_MAX_QUERIES; res->maxqueries = DEFAULT_MAX_QUERIES;
@@ -10393,17 +10400,20 @@ dns_resolver_gettimeout(dns_resolver_t *resolver) { @@ -10439,17 +10446,20 @@ dns_resolver_gettimeout(dns_resolver_t *resolver) {
} }
void void
@ -3516,7 +3516,7 @@ index 5e20783..17a4eee 100644
} }
void void
@@ -10500,3 +10510,34 @@ dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which) @@ -10546,3 +10556,34 @@ dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which)
return (resolver->quotaresp[which]); return (resolver->quotaresp[which]);
} }

37
bind.spec
View File

@ -66,7 +66,7 @@
Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
Name: bind Name: bind
License: MPLv2.0 License: MPLv2.0
Version: 9.11.25 Version: 9.11.26
Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32 Epoch: 32
Url: https://www.isc.org/downloads/bind/ Url: https://www.isc.org/downloads/bind/
@ -232,7 +232,9 @@ BuildRequires: libmaxminddb-devel
BuildRequires: fstrm-devel protobuf-c-devel BuildRequires: fstrm-devel protobuf-c-devel
%endif %endif
# Needed to regenerate dig.1 manpage # Needed to regenerate dig.1 manpage
BuildRequires: docbook-style-xsl, libxslt # Docbook5 with namespace is required.
# Visit for details: https://gitlab.isc.org/isc-projects/bind9/-/issues/2310
BuildRequires: docbook5-style-xsl, libxslt
%if %{with TSAN} %if %{with TSAN}
BuildRequires: libtsan BuildRequires: libtsan
%endif %endif
@ -583,6 +585,11 @@ are used for building ISC DHCP.
mkdir lib/dns/tests/testdata/dstrandom mkdir lib/dns/tests/testdata/dstrandom
cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data
# Avoid having [FIXME: manual] on top of generated manual pages
# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/4524
find bin lib/lwres/man -name '*.docbook' -exec \
sed -e 's|<refmiscinfo>BIND9|<refmiscinfo class="manual">BIND9|' -i '{}' ';'
%if %{with PKCS11} %if %{with PKCS11}
cp -r bin/named{,-pkcs11} cp -r bin/named{,-pkcs11}
cp -r bin/dnssec{,-pkcs11} cp -r bin/dnssec{,-pkcs11}
@ -727,7 +734,7 @@ export LIBDIR_SUFFIX
--with-cmocka \ --with-cmocka \
%endif %endif
--enable-fixed-rrset \ --enable-fixed-rrset \
--with-docbook-xsl=%{_datadir}/sgml/docbook/xsl-stylesheets \ --with-docbook-xsl=%{_datadir}/sgml/docbook/xsl-ns-stylesheets \
--enable-full-report \ --enable-full-report \
; ;
%if %{with DNSTAP} %if %{with DNSTAP}
@ -739,7 +746,7 @@ export LIBDIR_SUFFIX
%endif %endif
popd popd
%endif %endif
make %{?_smp_mflags} %make_build
### FIXME hack!!! ### FIXME hack!!!
### xsltproc doesn't find properly configured files ### xsltproc doesn't find properly configured files
@ -759,8 +766,7 @@ popd
%if %{with DOC} %if %{with DOC}
# Because oot is not supported in docbook, copy required sources to build directory # Because oot is not supported in docbook, copy required sources to build directory
pushd .. pushd ..
# Note: force all manual pages regeneration, don't preserve timestamps find -name '*.docbook' | while read F; do install -Dvp "$F" "build/$F"; done
find -name '*.docbook' | while read F; do install -Dv "$F" "build/$F"; done
find doc -name '*.xml' | while read F; do [ -f "build/$F" ] || install -Dvp "$F" "build/$F"; done find doc -name '*.xml' | while read F; do [ -f "build/$F" ] || install -Dvp "$F" "build/$F"; done
popd popd
cp -upv ../doc/xsl/*.xsl doc/xsl/ cp -upv ../doc/xsl/*.xsl doc/xsl/
@ -852,7 +858,7 @@ do
-i isc-export-config.sh -i isc-export-config.sh
done; done;
make %{?_smp_mflags} %make_build
popd popd
# export library unit tests # export library unit tests
@ -975,12 +981,12 @@ touch ${RPM_BUILD_ROOT}/%{chroot_sdb_prefix}%{_sysconfdir}/named.conf
#end sdb-chroot #end sdb-chroot
pushd build pushd build
make DESTDIR=${RPM_BUILD_ROOT} install %make_install
popd popd
%if %{with EXPORT_LIBS} %if %{with EXPORT_LIBS}
pushd export-libs pushd export-libs
make DESTDIR=${RPM_BUILD_ROOT} install %make_install
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/%{_export_dir}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf echo "%{_libdir}/%{_export_dir}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf
cp -fp config.h ${RPM_BUILD_ROOT}/%{_includedir}%{_export_dir} cp -fp config.h ${RPM_BUILD_ROOT}/%{_includedir}%{_export_dir}
@ -1032,16 +1038,16 @@ install -m 644 %{SOURCE12} contrib/sdb/pgsql/
pushd contrib/dlz pushd contrib/dlz
pushd modules pushd modules
for DIR in filesystem ldap mysql mysqldyn sqlite3; do for DIR in filesystem ldap mysql mysqldyn sqlite3; do
make -C $DIR DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/bind install %make_install -C $DIR libdir=%{_libdir}/bind
done done
mv mysqldyn/testing/README mysqldyn/testing/README.testing mv mysqldyn/testing/README mysqldyn/testing/README.testing
%if %{with BDB} %if %{with BDB}
make -C bdbhpt DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/bind install %make_install -C bdbhpt libdir=%{_libdir}/bind
%endif %endif
popd popd
%if %{with BDB} %if %{with BDB}
pushd bin/dlzbdb pushd bin/dlzbdb
make DESTDIR=${RPM_BUILD_ROOT} install %make_install
popd popd
%endif %endif
popd popd
@ -1622,6 +1628,13 @@ fi;
%endif %endif
%changelog %changelog
* Wed Jan 06 2021 Petr Menšík <pemensik@redhat.com> - 32:9.11.26-2
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Mon Jan 04 2021 Petr Menšík <pemensik@redhat.com> - 32:9.11.26-1
- Update to 9.11.26
* Mon Nov 30 2020 Petr Menšík <pemensik@redhat.com> - 32:9.11.25-2 * Mon Nov 30 2020 Petr Menšík <pemensik@redhat.com> - 32:9.11.25-2
- Regenerate all manual pages on build - Regenerate all manual pages on build

75
bind99-rh640538.patch
View File

@ -1,40 +1,58 @@
From a76716d5d039947d6fe2cd49a151b16a29e12d42 Mon Sep 17 00:00:00 2001
From: Petr Mensik <pemensik@redhat.com>
Date: Mon, 4 Jan 2021 12:55:49 +0100
Subject: [PATCH] .rh640538
---
bin/dig/dig.docbook | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 1079421..f11abd1 100644 index 8ccf207..6d16d37 100644
--- a/bin/dig/dig.docbook --- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook +++ b/bin/dig/dig.docbook
@@ -1177,6 +1177,39 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr @@ -1336,6 +1336,49 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
</para> </para>
</refsection> </refsection>
+ <refsection><info><title>RETURN CODES</title></info> + <refsection><info><title>RETURN CODES</title></info>
+
+ <para> + <para>
+ <command>Dig</command> return codes are: + <command>Dig</command> return codes are:
+
+ <variablelist> + <variablelist>
+ <varlistentry> + <varlistentry>
+ <listitem> + <term>0</term>
+ <para>0: Everything went well, including things like NXDOMAIN</para> + <listitem>
+ </listitem> + <para>Everything went well, including things like NXDOMAIN.</para>
+ </varlistentry> + </listitem>
+ <varlistentry> + </varlistentry>
+ <listitem> + <varlistentry>
+ <para>1: Usage error</para> + <term>1</term>
+ </listitem> + <listitem>
+ </varlistentry> + <para>Usage error.</para>
+ <varlistentry> + </listitem>
+ <listitem> + </varlistentry>
+ <para>8: Couldn't open batch file</para> +
+ </listitem> + <varlistentry>
+ </varlistentry> + <term>8</term>
+ <varlistentry> + <listitem>
+ <listitem> + <para>Could not open batch file.</para>
+ <para>9: No reply from server</para> + </listitem>
+ </listitem> + </varlistentry>
+ </varlistentry> + <varlistentry>
+ <varlistentry> + <term>9</term>
+ <listitem> + <listitem>
+ <para>10: Internal error</para> + <para>No reply from server.
+ </listitem> + </para>
+ </varlistentry> + </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>10</term>
+ <listitem>
+ <para>Internal error.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist> + </variablelist>
+ </para> + </para>
+ </refsection> + </refsection>
@ -42,3 +60,6 @@ index 1079421..f11abd1 100644
<refsection><info><title>FILES</title></info> <refsection><info><title>FILES</title></info>
<para><filename>/etc/resolv.conf</filename> <para><filename>/etc/resolv.conf</filename>
--
2.26.2

13
ci.fmf Normal file
View File

@ -0,0 +1,13 @@
/test:
summary:
CI plan, picks Tier1 tests, runs in beakerlib.
description:
This special plan has to be named ci.fmf to run in CI.
It selects test which have 'tier 1' in their main.fmf file
discover:
- name: tier1
how: fmf
filter: 'tier: 1'
repository: "https://src.fedoraproject.org/tests/bind.git"
execute:
how: tmt

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (bind-9.11.25.tar.gz) = 852b15b6cf2f77ab103018e6fc078d856653c62c2db0ca2ef4f8bee64a60b06ed481d9fcdf29020e5072c69b9982545f032b2ab4c94dac28848150e04b9cecf9 SHA512 (bind-9.11.26.tar.gz) = 7ec32ca50b7f552d6a0b16ec1e168a24ecbf33420b8df123f74c7b9f615b8267e3e6e973a72f3ce3912eb60e94ebfacbacb4ae3945ac587c73f7cf695b46ce00
SHA512 (bind-9.11.25.tar.gz.asc) = 8cc8e5d21a445d918e82b42057f1d4e73ed977f4eb9584736008b71ae747078d500cc962c3bd03eb4f6a18688b642b108a8e3d673851b0dd4818fc9a33e5faf7 SHA512 (bind-9.11.26.tar.gz.asc) = 3ce0d4dc1ba67d4e7ae84775c82e5a637427f774d7515e947c59761302fb9d665f8daf938d32227512fd99dc0b56754863082a53be24a38d375fc428e5bdab92

2
tests/tests.yml
View File

@ -6,6 +6,6 @@
tags: tags:
- classic - classic
repositories: repositories:
- repo: "https://github.com/InfrastructureServices/bind-tests.git" - repo: "https://src.fedoraproject.org/tests/bind.git"
dest: "bind-tests" dest: "bind-tests"
fmf_filter: "tier: 1" fmf_filter: "tier: 1"