From 3bd7080e5325c7423468b4a190c070ac8fa6bfd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Wed, 21 Jul 2021 21:30:04 +0200
Subject: [PATCH] Update to 9.16.19

Remove support for PREVER and PATCHVER, since upstream no longer
releases them. Simplifies a bit versioning.

Resolves: rhbz#1984627
---
 .gitignore |  2 ++
 bind.spec  | 19 +++++++++----------
 sources    |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8a32a1b..c54e3d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,3 +152,5 @@ bind-9.7.2b1.tar.gz
 /bind-9.16.17.tar.xz.asc
 /bind-9.16.18.tar.xz
 /bind-9.16.18.tar.xz.asc
+/bind-9.16.19.tar.xz
+/bind-9.16.19.tar.xz.asc
diff --git a/bind.spec b/bind.spec
index fe8128a..820b53d 100644
--- a/bind.spec
+++ b/bind.spec
@@ -1,12 +1,8 @@
 #
-# Red Hat BIND package .spec file
+# Red Hat BIND9 package .spec file
 #
 # vim:expandtab ts=2:
 
-#%%global PATCHVER P1
-#%%global PREVER rc1
-%global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}}
-
 # bcond_without is built by default, unless --without X is passed
 # bcond_with is built only when --with X is passed to build
 %bcond_with    SYSTEMTEST
@@ -57,14 +53,14 @@
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  MPLv2.0
-Version:  9.16.18
-Release:  5%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Version:  9.16.19
+Release:  1%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
-Source0:  https://downloads.isc.org/isc/bind9/%{BINDVERSION}/bind-%{BINDVERSION}.tar.xz
+Source0:  https://downloads.isc.org/isc/bind9/%{version}/bind-%{version}.tar.xz
 Source1:  named.sysconfig
-Source2:  https://downloads.isc.org/isc/bind9/%{BINDVERSION}/bind-%{BINDVERSION}.tar.xz.asc
+Source2:  https://downloads.isc.org/isc/bind9/%{version}/bind-%{version}.tar.xz.asc
 Source3:  named.logrotate
 Source4:  https://downloads.isc.org/isc/pgpkeys/codesign2021.txt
 Source16: named.conf
@@ -399,7 +395,7 @@ in HTML and PDF format.
 # RHEL does not yet support this verification
 %{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE0}'
 %endif
-%setup -q -n %{name}-%{BINDVERSION}
+%setup -q
 
 # Common patches
 %patch10 -p1 -b .PIE
@@ -1132,6 +1128,9 @@ fi;
 %endif
 
 %changelog
+* Wed Jul 21 2021 Petr Menšík <pemensik@redhat.com> - 32:9.16.19-1
+- Update to 9.16.19 (#1984627)
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 32:9.16.18-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 07b3b7d..5c71987 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bind-9.16.18.tar.xz) = 6ba2f14324ebdc66d2a6d60e929fb47e170dd7662cf4b18ef3ad9da30a61b43c7d5539e931c483ab36e63ae0398aeed255fd672489fb332dccf182df9aa102f9
-SHA512 (bind-9.16.18.tar.xz.asc) = 384887fec89de30436b3c570843f2ae532b9bb54065991a8778c63262a3608c724a7007c55989c4f9132d7718f5a08b447b0c73ff9025f5fa6d47ee41200dabe
+SHA512 (bind-9.16.19.tar.xz) = 47a0867a34c73dd939f6e24ab63e1a9cc7ba3e4d42987dbf1be424afe320734587b09b26c3b3371861fe79e3ddc08a81a019bba0cadecf76e20f717103578dca
+SHA512 (bind-9.16.19.tar.xz.asc) = 91f35ce1eb53d874653f3bf56412cc8f90400e2064b1e0f5c9978f16a61a3eac0c19f80843fef49f4db0f4bc5e3df62458a6f09cada8f923ab8ea296165f4f2e