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

Adjust downstream patches to 9.11.11

Browse Source
This commit is contained in:
Petr Menšík 2019-09-25 21:30:47 +02:00
parent 69b861316f
commit 833ef7b7b4
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bind-9.11-rt31459.patch
View File

@ -1,4 +1,4 @@
From 9f62d68da08d21a8b35e27aeebd00afe6e5fb7be Mon Sep 17 00:00:00 2001 From 108a0f57f423a27995ac96272832278f4aa3a612 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org> From: Evan Hunt <each@isc.org>
Date: Tue, 12 Sep 2017 19:05:46 -0700 Date: Tue, 12 Sep 2017 19:05:46 -0700
Subject: [PATCH] rebased rt31459c Subject: [PATCH] rebased rt31459c
@ -24,7 +24,7 @@ Include new unit test
bin/named/server.c | 6 + bin/named/server.c | 6 +
bin/nsupdate/nsupdate.c | 14 +- bin/nsupdate/nsupdate.c | 14 +-
bin/tests/makejournal.c | 6 +- bin/tests/makejournal.c | 6 +-
bin/tests/system/pipelined/pipequeries.c | 21 +- bin/tests/system/pipelined/pipequeries.c | 20 +-
bin/tests/system/pipelined/tests.sh | 4 +- bin/tests/system/pipelined/tests.sh | 4 +-
bin/tests/system/rsabigexponent/bigkey.c | 4 + bin/tests/system/rsabigexponent/bigkey.c | 4 +
bin/tests/system/tkey/keycreate.c | 26 ++- bin/tests/system/tkey/keycreate.c | 26 ++-
@ -49,7 +49,7 @@ Include new unit test
lib/isc/pk11.c | 12 +- lib/isc/pk11.c | 12 +-
lib/isc/win32/include/isc/platform.h.in | 5 + lib/isc/win32/include/isc/platform.h.in | 5 +
win32utils/Configure | 28 ++- win32utils/Configure | 28 ++-
36 files changed, 702 insertions(+), 175 deletions(-) 36 files changed, 701 insertions(+), 175 deletions(-)
create mode 100644 lib/dns/tests/dstrandom_test.c create mode 100644 lib/dns/tests/dstrandom_test.c
diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c
@ -386,7 +386,7 @@ index 61a41b0..acc71a1 100644
isc_log_registercategories(lctx, categories); isc_log_registercategories(lctx, categories);
isc_log_setcontext(lctx); isc_log_setcontext(lctx);
diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index 2fcc064..7b4f617 100644 index c6ab7f8..f0a6ff2 100644
--- a/bin/tests/system/pipelined/pipequeries.c --- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c +++ b/bin/tests/system/pipelined/pipequeries.c
@@ -204,6 +204,7 @@ sendqueries(isc_task_t *task, isc_event_t *event) { @@ -204,6 +204,7 @@ sendqueries(isc_task_t *task, isc_event_t *event) {
@ -397,17 +397,16 @@ index 2fcc064..7b4f617 100644
isc_sockaddr_t bind_any; isc_sockaddr_t bind_any;
struct in_addr inaddr; struct in_addr inaddr;
isc_result_t result; isc_result_t result;
@@ -224,7 +225,8 @@ main(int argc, char *argv[]) { @@ -222,7 +223,7 @@ main(int argc, char *argv[]) {
UNUSED(argv); int c;
isc_commandline_errprint = false; isc_commandline_errprint = false;
- while ((c = isc_commandline_parse(argc, argv, "p:")) != -1) { - while ((c = isc_commandline_parse(argc, argv, "p:")) != -1) {
+ while ((c = isc_commandline_parse(argc, argv, "p:r:")) != -1) + while ((c = isc_commandline_parse(argc, argv, "p:r:")) != -1) {
+ {
switch (c) { switch (c) {
case 'p': case 'p':
result = isc_parse_uint16(&port, result = isc_parse_uint16(&port,
@@ -235,6 +237,9 @@ main(int argc, char *argv[]) { @@ -233,6 +234,9 @@ main(int argc, char *argv[]) {
exit(1); exit(1);
} }
break; break;
@ -417,7 +416,7 @@ index 2fcc064..7b4f617 100644
case '?': case '?':
fprintf(stderr, "%s: invalid argument '%c'", fprintf(stderr, "%s: invalid argument '%c'",
argv[0], c); argv[0], c);
@@ -276,10 +281,18 @@ main(int argc, char *argv[]) { @@ -275,10 +279,18 @@ main(int argc, char *argv[]) {
ectx = NULL; ectx = NULL;
RUNCHECK(isc_entropy_create(mctx, &ectx)); RUNCHECK(isc_entropy_create(mctx, &ectx));
@ -438,7 +437,7 @@ index 2fcc064..7b4f617 100644
taskmgr = NULL; taskmgr = NULL;
RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr)); RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr));
@@ -332,8 +345,8 @@ main(int argc, char *argv[]) { @@ -331,8 +343,8 @@ main(int argc, char *argv[]) {
isc_task_detach(&task); isc_task_detach(&task);
isc_taskmgr_destroy(&taskmgr); isc_taskmgr_destroy(&taskmgr);
@ -1974,7 +1973,7 @@ index 42ff7e0..8d87c44 100644
typedef int (*isc_sockfdwatch_t)(isc_task_t *, isc_socket_t *, void *, int); typedef int (*isc_sockfdwatch_t)(isc_task_t *, isc_socket_t *, void *, int);
diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
index bb9912b..1f583a3 100644 index 7809e7b..c43357a 100644
--- a/lib/isc/pk11.c --- a/lib/isc/pk11.c
+++ b/lib/isc/pk11.c +++ b/lib/isc/pk11.c
@@ -321,14 +321,16 @@ pk11_rand_seed_fromfile(const char *randomfile) { @@ -321,14 +321,16 @@ pk11_rand_seed_fromfile(const char *randomfile) {

7
bind.spec
View File

@ -60,8 +60,8 @@
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.10 Version: 9.11.11
Release: 3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32 Epoch: 32
Url: https://www.isc.org/downloads/bind/ Url: https://www.isc.org/downloads/bind/
# #
@ -1542,6 +1542,9 @@ fi;
%changelog %changelog
* Wed Sep 25 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.11-1
- Update to 9.11.11
* Wed Sep 04 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.10-3 * Wed Sep 04 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.10-3
- Share pkcs11-utils and dnssec-utils manuals instead of recommend - Share pkcs11-utils and dnssec-utils manuals instead of recommend