[arch-commits] Commit in bind/trunk (PKGBUILD bind.install empty.zone named.conf)

[Sébastien Luttringer]

    Date: Tuesday, December 3, 2019 @ 04:22:41
  Author: seblu
Revision: 370258

upgpkg: bind 9.14.8-4

- remove empty zones (added auto by named)
- add warning message about geoip2 switch

Added:
  bind/trunk/bind.install
Modified:
  bind/trunk/PKGBUILD
  bind/trunk/named.conf
Deleted:
  bind/trunk/empty.zone

--------------+
 PKGBUILD     |   15 ++++++---------
 bind.install |   10 ++++++++++
 empty.zone   |    8 --------
 named.conf   |   10 ----------
 4 files changed, 16 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-03 03:40:34 UTC (rev 370257)
+++ PKGBUILD	2019-12-03 04:22:41 UTC (rev 370258)
@@ -7,7 +7,7 @@
 pkgname=(bind bind-tools)
 _pkgver=9.14.8
 pkgver=${_pkgver//-/.}
-pkgrel=3
+pkgrel=4
 url='https://www.isc.org/software/bind/'
 license=('MPL2')
 arch=('x86_64')
@@ -23,18 +23,16 @@
         'named.service'
         'localhost.zone'
         'localhost.ip6.zone'
-        '127.0.0.zone'
-        'empty.zone')
+        '127.0.0.zone')
 sha256sums=('e545aa75ced6695a9bf4b591606ef00260fb3c055c2865b299cfe0fe6eeea076'
             'SKIP'
             'f0423c4ee8495da487e07e9144bec1d25f46a0cd2dfa7cfd7a761ef15bfefc98'
             '7c0acefcfcc3ae093550caed7ec90fe84bec8f7477459ffa7e71dda76bcbdb2c'
-            'aeba2dce22039c2abf02d384602b434fd992733b31774ca6e80f4cb8999b8fa5'
+            'e08a01d41b18bdb771d534daca99642314939aafdb088e5cfcf0ef2d33f8e7eb'
             '3f0f8db0a1deae270dd166b4750be7c1041b4b44891176f35a8df7dd55d24d34'
             '0011708e516128647dd25b59b6ebc465f36e85bbe0a8fbdc3eb04b7f28c2197f'
             'c06fc270e32a843c8b6d86335a2ec607d405dfba6875de8d8a9abde39a9e2c17'
-            'b88fd2b99e7d42d414b329b814b9ff3304fa0ef9c67df81bde235bbfa0f3a3b8'
-            '4adfd0433850f3b6e168a80d211b8a0c3de95711315bdeb47dfae4c1af3d5dec')
+            'b88fd2b99e7d42d414b329b814b9ff3304fa0ef9c67df81bde235bbfa0f3a3b8')
 
 prepare() {
   cd bind-$_pkgver
@@ -80,8 +78,8 @@
   backup=('etc/named.conf'
           'var/named/127.0.0.zone'
           'var/named/localhost.zone'
-          'var/named/localhost.ip6.zone'
-          'var/named/empty.zone')
+          'var/named/localhost.ip6.zone')
+  install=bind.install
 
   cd "bind-$_pkgver"
   install -dm755 "$pkgdir/usr/share/licenses/$pkgname/"
@@ -101,7 +99,6 @@
   install    -m640 -o 0 -g 40 localhost.zone "$pkgdir/var/named"
   install    -m640 -o 0 -g 40 localhost.ip6.zone "$pkgdir/var/named"
   install    -m640 -o 0 -g 40 127.0.0.zone "$pkgdir/var/named"
-  install    -m640 -o 0 -g 40 empty.zone "$pkgdir/var/named"
 }
 
 package_bind-tools() {

Added: bind.install
===================================================================
--- bind.install	                        (rev 0)
+++ bind.install	2019-12-03 04:22:41 UTC (rev 370258)
@@ -0,0 +1,10 @@
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  (( $(vercmp "$2" '9.14.8-2') > 0 )) || cat <<EOF
+==> Switched to geoip2 databases.
+==> Remember to update your configuration if you use geoip features.
+EOF
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Deleted: empty.zone
===================================================================
--- empty.zone	2019-12-03 03:40:34 UTC (rev 370257)
+++ empty.zone	2019-12-03 04:22:41 UTC (rev 370258)
@@ -1,8 +0,0 @@
-@                               1D IN SOA   localhost. root.localhost. (
-                                    42     ; serial (yyyymmdd##)
-                                    3H     ; refresh
-                                    15M    ; retry
-                                    1W     ; expiry
-                                    1D )   ; minimum ttl
-
-                                1D  IN  NS  localhost.

Modified: named.conf
===================================================================
--- named.conf	2019-12-03 03:40:34 UTC (rev 370257)
+++ named.conf	2019-12-03 04:22:41 UTC (rev 370258)
@@ -34,16 +34,6 @@
     file "localhost.ip6.zone";
 };
 
-zone "255.in-addr.arpa" IN {
-    type master;
-    file "empty.zone";
-};
-
-zone "0.in-addr.arpa" IN {
-    type master;
-    file "empty.zone";
-};
-
 //zone "example.org" IN {
 //    type slave;
 //    file "example.zone";