From 74f70469b14b0a1fa010927c21ba56dcd1052233 Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Feb 17 2022 22:21:17 +0000 Subject: Update to 9.16.26 (#2055120) --- diff --git a/.gitignore b/.gitignore index 741f979..de3fb36 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,5 @@ bind-9.7.2b1.tar.gz /bind-9.16.24.tar.xz.asc /bind-9.16.25.tar.xz /bind-9.16.25.tar.xz.asc +/bind-9.16.26.tar.xz +/bind-9.16.26.tar.xz.asc diff --git a/bind-9.16-pthread-dlz.patch b/bind-9.16-pthread-dlz.patch deleted file mode 100644 index 627d235..0000000 --- a/bind-9.16-pthread-dlz.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5996c73516ad1a21eff008145f4643d9eded2c80 Mon Sep 17 00:00:00 2001 -From: Evan Hunt -Date: Tue, 25 Jan 2022 12:28:48 -0800 -Subject: [PATCH] restore missing lines in dlz_pthread.h - -some lines were accidentally deleted during a backport that -made it imposisble to build DLZ modules. ---- - contrib/dlz/modules/include/dlz_pthread.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/contrib/dlz/modules/include/dlz_pthread.h b/contrib/dlz/modules/include/dlz_pthread.h -index c1b6db637e..4479f836c0 100644 ---- a/contrib/dlz/modules/include/dlz_pthread.h -+++ b/contrib/dlz/modules/include/dlz_pthread.h -@@ -19,6 +19,11 @@ - #ifndef DLZ_PTHREAD_H - #define DLZ_PTHREAD_H 1 - -+#ifndef PTHREADS -+#define PTHREADS 1 -+#endif /* ifndef PTHREADS */ -+ -+#ifdef PTHREADS - #include - #define dlz_mutex_t pthread_mutex_t - #define dlz_mutex_init pthread_mutex_init --- -2.34.1 - diff --git a/bind.spec b/bind.spec index 574b0fe..ef10977 100644 --- a/bind.spec +++ b/bind.spec @@ -52,8 +52,8 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server Name: bind License: MPLv2.0 -Version: 9.16.25 -Release: 3%{?dist} +Version: 9.16.26 +Release: 1%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -102,8 +102,6 @@ Patch149:bind-9.11-kyua-pkcs11.patch Patch157:bind-9.11-fips-tests.patch # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/2689 Patch164:bind-9.11-rh1666814.patch -# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/5757 -Patch165:bind-9.16-pthread-dlz.patch # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/5795 Patch167:bind-9.16-hp-workers-rh2048235.patch Patch168:bind-9.16-hp-workers-rh2048235-dyndb.patch @@ -405,7 +403,6 @@ in HTML and PDF format. %patch130 -p1 -b .libdb %patch157 -p1 -b .fips-tests %patch164 -p1 -b .rh1666814 -%patch165 -p1 -b .pthread-dlz %patch167 -p1 -b .rh2048235 %patch168 -p1 -b .rh2048235-dyndb @@ -1130,6 +1127,9 @@ fi; %endif %changelog +* Thu Feb 17 2022 Petr Menšík - 32:9.16.26-1 +- Update to 9.16.26 (#2055120) + * Fri Feb 11 2022 Petr Menšík - 32:9.16.25-3 - Allow reservation of extra hp threads (#2048235) diff --git a/sources b/sources index fcfd18b..e1701b9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bind-9.16.25.tar.xz) = e43c0e59159d3a5642db051f3982d8767fb726426380c32960fefe4b9afd05708ed8f7e80a98b803a580b048e1a368c888e2dd5695fa5fcd7b8b75574a27cb62 -SHA512 (bind-9.16.25.tar.xz.asc) = ceb0af75619f2a2da4f183bb7d367f5a302ee41e140bc710b47aefedc3717b9cd7452f988e480a8798734f532338f3c03252a704e45b9d0a31f46ea499d1d572 +SHA512 (bind-9.16.26.tar.xz) = d75e9e0c0853dbfeb0a1e765c2e39d83393c9be5a48cfccd84e758a0f11cf9d480f892431bbba9f7579dfef82e03987580619878d2a5bb5dc35f5dbb35101dbe +SHA512 (bind-9.16.26.tar.xz.asc) = 5779ac2330ef93682a83d349b42f0fd3f8b14fb59010f399a60cdee1180ad2911c2ec7204d3e13dc06b1c8397949474be045c6d38b6c5a9599810c6159f0fb91