From bf5bc99f8162790ef3fc7a53d990c58797965725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Tue, 3 Sep 2019 13:12:13 +0200
Subject: [PATCH] Add GeoIP to bind-chroot (#1497646)

named can use ACLs defined by GeoIP of request. Such information is not
available by default under named-chroot service. Enable GeoIP databases
under chroot without explicit configuration.
---
 bind.spec          | 5 ++++-
 named-chroot.files | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bind.spec b/bind.spec
index e8b5e29..8f0a2c3 100644
--- a/bind.spec
+++ b/bind.spec
@@ -39,7 +39,7 @@
 %endif
 %global        chroot_create_directories /dev /run/named %{_localstatedir}/{log,named,tmp} \\\
                                          %{_sysconfdir}/{crypto-policies/back-ends,pki/dnssec-keys,named} \\\
-                                         %{_libdir}/bind
+                                         %{_libdir}/bind %{_datadir}/GeoIP
 
 %global        selinuxbooleans   named_write_master_zones=1
 ## The order of libs is important. See lib/Makefile.in for details
@@ -1397,6 +1397,7 @@ fi;
 %dir %{chroot_prefix}/usr
 %dir %{chroot_prefix}/%{_libdir}
 %dir %{chroot_prefix}/%{_libdir}/bind
+%dir %{chroot_prefix}/%{_datadir}/GeoIP
 %defattr(0660,root,named,01770)
 %dir %{chroot_prefix}%{_localstatedir}/named
 %defattr(0660,named,named,0770)
@@ -1435,6 +1436,7 @@ fi;
 %dir %{chroot_sdb_prefix}/usr
 %dir %{chroot_sdb_prefix}/%{_libdir}
 %dir %{chroot_sdb_prefix}/%{_libdir}/bind
+%dir %{chroot_sdb_prefix}/%{_datadir}/GeoIP
 %defattr(0660,named,named,0770)
 %dir %{chroot_sdb_prefix}%{_localstatedir}/tmp
 %dir %{chroot_sdb_prefix}%{_localstatedir}/log
@@ -1540,6 +1542,7 @@ fi;
 %changelog
 * Tue Sep 03 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.10-2
 - Move some administration utilities back to bind-utils (#1720380)
+- Add GeoIP to bind-chroot (#1497646)
 
 * Tue Aug 27 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.10-1
 - Update to 9.11.10
diff --git a/named-chroot.files b/named-chroot.files
index b38cbe6..43c559a 100644
--- a/named-chroot.files
+++ b/named-chroot.files
@@ -16,6 +16,7 @@
 /etc/named
 /usr/lib64/bind
 /usr/lib/bind
+/usr/share/GeoIP
 /run/named
 # Warning: the order is important
 # If a directory containing $ROOTDIR is listed here,