From a6454b966c54dc482d2fdc554a09c44ded84e763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Fri, 18 Oct 2019 13:24:50 +0200
Subject: [PATCH] Update to 9.14.7

Rebase to new sources

14.5:
A SipHash 2-4 based DNS Cookie (RFC 7873) algorithm has been added.
---
 bind-9.14.4.tar.gz.asc | 16 ----------------
 bind-9.14.7.tar.gz.asc | 16 ++++++++++++++++
 bind.spec              | 13 ++++++++-----
 3 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 bind-9.14.4.tar.gz.asc
 create mode 100644 bind-9.14.7.tar.gz.asc

diff --git a/bind-9.14.4.tar.gz.asc b/bind-9.14.4.tar.gz.asc
deleted file mode 100644
index 46eb6f8..0000000
--- a/bind-9.14.4.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABAgAdFiEErj+seWcR7Fn8AHqkdLtrmky7PTgFAl0u4wkACgkQdLtrmky7
-PThVjxAAgSBMHHL5U/vjlK1ZaNdOlwdG2b48+IYu3TkOnFHoAoX0Zkt12xgdWdHi
-ChL645zHeCo16a7OY40wcDhmSa9lIB+M7D7SNNhFAp0Ta2DGKy3mvSloTup/XDeJ
-cdb7rOQdvh70nf+YV4NKADP/QvQdAmMOEhNIZzAW2u+LOCcJwVAlaN1cMt2GEYLM
-0qhKynPKNWcotA9RnCH3K2eNPT4u8X6MyU1XqA+JHJvwFLwJq6xpV8l7IfHEnK5l
-6nhul6IlYAclHtFEw4rADQScQE8Zg2PXtb8Ajn/ml2nXbSjluprAWgHd8aUl2/gV
-VZVzGI9ZaZD9a2Vkj9pJcNKWMcGk0tlBME5Sv9BIwx8jna66kze9z0AhaziwDgnV
-4Ur+xYo784FzSXoxhwvSQlvbs18TZHTx9vYTg2xUIFO2bjIfdAY2oe2Hegr8u9mj
-tCxnOJYE+xLJaj3CsPEoPwDcyV11Swka6+jqsA8ngVb99Y/tct8+BDd6zgjRQaSG
-7ETk6Hi09QFAMe2YPy+BwcHhk05SD784Cvs3KH9W7x0uFVIdc7xVs+vwe+5SH/Q3
-IPCKfhk0k4A/dmjYSmKvzkT5UyIdt/VqVYuVFmMFLqs3Xf0F1KUt/3fJJJfGhaOp
-tflZWGpR6Gou7TY/kMM35yGz9HnZ5uSWAOUhEQAHG1uKck49GjA=
-=DwY1
------END PGP SIGNATURE-----
diff --git a/bind-9.14.7.tar.gz.asc b/bind-9.14.7.tar.gz.asc
new file mode 100644
index 0000000..1134ae1
--- /dev/null
+++ b/bind-9.14.7.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABAgAdFiEErj+seWcR7Fn8AHqkdLtrmky7PTgFAl2WMpEACgkQdLtrmky7
+PTh/sg//QbNRAQvADQfwF1PPo+JxB+3WzQ9oJAWeHbOoiubwkUwO9xE+BEnTNd5o
+oM1lSLqFxNykOTaoeJlqPftPod1cxo7lSzkwflugGyB/59wliCpqCg053YV4x9mO
+QggvA/E50+0FI/Om/7v4GHGADu/JE83FovOueWAB0LgqfDSD6QFcNFF9sUJJ4P7r
+FcEXSWj8QbrHMWBKncZUOpD2ECotvtrYmi0DTHl1XfigESDQpWtsnTFuabCCsvkh
+ch9wQRplAes2Mf/aS5tl1y0QKKBFuEjtGiTdgrDl6o9GLnx6CueX5saZehu2EVkr
+fq2vEYUC2lRQSjuxSMMJ3L0TGUcl7+ixlAIISS2K9L5Xx7MhBXt/EH5KiKPfsEet
+3EH+DhxV5uXjDU7MgvREnxT+ssV23e0HWTz4tVVQ9LpvYmWPIgLcSOhHCc57yoQF
+c46V0f69dMWbMAlQ93EZSG274ZvpIszpK8+3hGI3/TuDFFgiQJeJJBFVtYJMle69
+3mEEclfzO7fBiXZFec6nVx2309bL64bafN7zszPKXl4XgoefOfD0v0eWqQT4fxfm
+dnGC0qMqSZs5F+d0fISV5JUUNYzt9PZjvnzqLLGOeTF6l3/n9G1mmNsXcxJ1OEIF
+6qh1oO7JTPjt0MFhKac4QjNQi/Bnp25O3I/PRyWZCbiwXkyvyQU=
+=ZT7s
+-----END PGP SIGNATURE-----
diff --git a/bind.spec b/bind.spec
index 46c9a43..92240f7 100644
--- a/bind.spec
+++ b/bind.spec
@@ -64,15 +64,15 @@
 #
 
 # lib*.so.X versions of selected libraries
-%global sover_dns 1309
-%global sover_isc 1308
+%global sover_dns 1310
+%global sover_isc 1309
 %global sover_irs 1301
 %global sover_isccfg 1302
 
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  MPLv2.0
-Version:  9.14.4
+Version:  9.14.7
 Release:  1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
@@ -1269,6 +1269,7 @@ fi;
 %endif
 
 %files
+# TODO: Move from lib/bind to lib/named, as used by upstream
 %{_libdir}/bind
 %{_libdir}/named
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named
@@ -1284,7 +1285,6 @@ fi;
 %{_sbindir}/named
 %{_sbindir}/rndc*
 %{_libexecdir}/generate-rndc-key.sh
-%{_libdir}/named/filter-aaaa.so
 %{_mandir}/man1/mdig.1*
 %{_mandir}/man1/named-rrchecker.1*
 %{_mandir}/man5/named.conf.5*
@@ -1346,7 +1346,7 @@ fi;
 %files libs
 %{_libdir}/libbind9.so.1302*
 %{_libdir}/libisccc.so.1302*
-%{_libdir}/libns.so.1306*
+%{_libdir}/libns.so.1307*
 
 %files libs-lite
 %{_libdir}/libdns.so.%{sover_dns}*
@@ -1605,6 +1605,9 @@ fi;
 
 
 %changelog
+* Wed Jan 08 2020 Petr Menšík <pemensik@redhat.com> - 32:9.14.7-1
+- Update to 9.14.7
+
 * Wed Jan 08 2020 Petr Menšík <pemensik@redhat.com> - 32:9.14.4-1
 - Update to 9.14.4
 - Add GeoLite2 support