Up to 9.18.10

diff --git a/bind.spec b/bind.spec
index a02e1b5e672956600479481f02a502cb3c6790fc..8b89be8f69b3f602404a575aa57c9b99ba36e3f8 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -24,7 +24,7 @@
 %bcond_without epoll           # disable epoll support
 %endif
 
-%define                ver     9.18.9
+%define                ver     9.18.10
 %if 0
 %define                pverdot .P0
 %define                pverdir -P0
@@ -44,12 +44,12 @@ Summary(uk.UTF-8):  BIND - cервер системи доменних імен (
 Summary(zh_CN.UTF-8):  Internet 域名服务器
 Name:          bind
 Version:       %{ver}%{pverdot}
-Release:       2
+Release:       1
 Epoch:         7
 License:       MPL 2.0
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/bind9/%{ver}%{pverdir}/%{name}-%{ver}%{pverdir}.tar.xz
-# Source0-md5: 542ba7a0ae0cb2de151186bd7de4e9cb
+# Source0-md5: 6586d9c376e7ee9674767e1d79d63382
 Source1:       named.init
 Source2:       named.sysconfig
 Source3:       named.logrotate
@@ -58,14 +58,13 @@ Source4:    http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 Source6:       %{name}-hip.tar.gz
 # Source6-md5: 62a8a67f51ff8db9fe815205416a1f62
 Source7:       https://www.internic.net/domain/named.root
-# Source7-md5: f51ae5c1e6f61ef1e45cc4bf0be60414
+# Source7-md5: 92114580597bf12cc91b8ca63dbe5f04
 Source8:       %{name}-127.0.0.zone
 Source9:       %{name}-localhost.zone
 Source10:      %{name}-named.conf
 Source11:      %{name}.tmpfiles
 Source12:      named.service
 
-Patch2:         debug.patch
 Patch3:                jemalloc.patch
 Patch4:                %{name}-ac-libs.patch
 Patch5:                %{name}-edns-client-subnet.patch
@@ -384,7 +383,6 @@ BIND.
 %prep
 %setup -q %{?with_hip:-a6} -n %{name}-%{ver}%{pverdir}
 
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %{?with_hip:%{__mv} bind-hip/hip_55.[ch] lib/dns/rdata/generic}

diff --git a/debug.patch b/debug.patch
deleted file mode 100644 (file)
index 393cf78..0000000
--- a/debug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bind-9.18.9/lib/dns/zone.c~        2022-11-07 23:17:42.000000000 +0100
-+++ bind-9.18.9/lib/dns/zone.c 2022-12-20 11:06:25.886493925 +0100
-@@ -5801,7 +5801,7 @@ dns_zone_detach(dns_zone_t **zonep) {
-                * Stop things being restarted after we cancel them below.
-                */
-               DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_EXITING);
--              dns_zone_log(zone, ISC_LOG_INFO, "final reference detached");
-+              dns_zone_log(zone, ISC_LOG_DEBUG(1), "final reference detached");
-               if (zone->task != NULL) {
-                       /*
-                        * This zone has a task; it can clean