From 66ddbbdf47a450cb8a44356b96b114524db0d498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Wed, 3 Aug 2022 20:17:30 +0200
Subject: [PATCH] Update to 9.18.5 (#2109170)

https://downloads.isc.org/isc/bind9/9.18.5/doc/arm/html/notes.html#notes-for-bind-9-18-5

Changes NSEC3 default count to zero.
---
 .gitignore         |  2 ++
 bind-9.5-PIE.patch | 13 +++++--------
 bind.spec          |  7 +++++--
 sources            |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4bfd826..c04e554 100644
--- a/.gitignore
+++ b/.gitignore
@@ -186,3 +186,5 @@ bind-9.7.2b1.tar.gz
 /bind-9.18.3.tar.xz.asc
 /bind-9.18.4.tar.xz
 /bind-9.18.4.tar.xz.asc
+/bind-9.18.5.tar.xz
+/bind-9.18.5.tar.xz.asc
diff --git a/bind-9.5-PIE.patch b/bind-9.5-PIE.patch
index 3f47a0a..1420cf3 100644
--- a/bind-9.5-PIE.patch
+++ b/bind-9.5-PIE.patch
@@ -1,8 +1,8 @@
 diff --git a/bin/named/Makefile.am b/bin/named/Makefile.am
-index 7065a90..e2e485b 100644
+index 57a023b..085f2f7 100644
 --- a/bin/named/Makefile.am
 +++ b/bin/named/Makefile.am
-@@ -32,6 +32,7 @@ AM_CPPFLAGS +=				\
+@@ -32,9 +32,12 @@ AM_CPPFLAGS +=				\
  endif HAVE_LIBXML2
  
  AM_CPPFLAGS +=						\
@@ -10,11 +10,8 @@ index 7065a90..e2e485b 100644
  	-DNAMED_LOCALSTATEDIR=\"${localstatedir}\"	\
  	-DNAMED_SYSCONFDIR=\"${sysconfdir}\"
  
-@@ -122,5 +123,7 @@ named_LDADD +=					\
- 	$(LIBNGHTTP2_LIBS)
- endif HAVE_LIBNGHTTP2
- 
 +AM_LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack
 +
- MAINTAINERCLEANFILES =				\
- 	named.conf.rst
+ sbin_PROGRAMS = named
+ 
+ nodist_named_SOURCES = xsl.c
diff --git a/bind.spec b/bind.spec
index 5745128..d1752e8 100644
--- a/bind.spec
+++ b/bind.spec
@@ -60,8 +60,8 @@ Conflicts: %1 \
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  MPLv2.0
-Version:  9.18.4
-Release:  2%{?dist}
+Version:  9.18.5
+Release:  1%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -933,6 +933,9 @@ fi;
 %endif
 
 %changelog
+* Wed Aug 03 2022 Petr Menšík <pemensik@redhat.com> - 32:9.18.5-1
+- Update to 9.18.5 (#2109170)
+
 * Wed Jul 20 2022 Petr Menšík <pemensik@redhat.com> - 32:9.18.4-2
 - Stop enabling selinux booleans on every upgrade
 - Deprecate python3-bind for smooth upgrade
diff --git a/sources b/sources
index 73a8b25..36eaf12 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bind-9.18.4.tar.xz) = 5deb46f6549e42087734fe80f8cd8de8f3fa54590e4635f8c0e2e8d362f8756404e911e46d7fe1cd75f0f19217532ca402e7a5947111f16e412c8aaa754b9e16
-SHA512 (bind-9.18.4.tar.xz.asc) = dfe7b24c499e6e54bc836350b73ef24deb78e1394059d75acc434512b3a60ab44708d3e1faa861be161afa0e69f789fd6b75dd881777679e4845a56f2fd6ab9a
+SHA512 (bind-9.18.5.tar.xz) = 41149e2a225125af0923ac597a31975b0a09eba64c0c4fe2ac6e6d6ae54ef8a72ff95db44d3b516af965871b6bde1b5e20489dd483c120e6f938744f56ab39c3
+SHA512 (bind-9.18.5.tar.xz.asc) = 66464762bb19115d31e6fd19cd18d31d81579e080e42828ccf5f7180488e24eab707d3296bdf6265340cd4e4334ed8147ea6bc3f40cf30c11d702b7394d4c345