diff options
author | Allen Zhong | 2020-01-15 18:01:29 +0800 |
---|---|---|
committer | Allen Zhong | 2020-01-15 18:01:29 +0800 |
commit | 826463c885d479bd960d9c37aa6fe87e224984cf (patch) | |
tree | ff493de5d007cfb8fe28d90b886e0d9b0040ea4d | |
parent | 55d43b46ffa52ea8f1d3a6e501f1230bcc5bd074 (diff) | |
download | aur-826463c885d479bd960d9c37aa6fe87e224984cf.tar.gz |
upgrade version and sync upstream changes
-rw-r--r-- | .SRCINFO | 28 | ||||
-rw-r--r-- | PKGBUILD | 47 | ||||
-rw-r--r-- | bind.install | 10 | ||||
-rw-r--r-- | empty.zone | 8 | ||||
-rw-r--r-- | named.conf | 15 |
5 files changed, 45 insertions, 63 deletions
@@ -1,5 +1,5 @@ pkgbase = bind-rl - pkgver = 9.14.1 + pkgver = 9.14.9 pkgrel = 1 url = https://www.isc.org/software/bind/ arch = x86_64 @@ -12,7 +12,6 @@ pkgbase = bind-rl makedepends = openssl makedepends = readline makedepends = libidn2 - makedepends = geoip makedepends = dnssec-anchors makedepends = python makedepends = json-c @@ -21,9 +20,10 @@ pkgbase = bind-rl makedepends = zlib makedepends = icu makedepends = xz + makedepends = libmaxminddb options = !emptydirs - source = https://ftp.isc.org/isc/bind9/9.14.1/bind-9.14.1.tar.gz - source = https://ftp.isc.org/isc/bind9/9.14.1/bind-9.14.1.tar.gz.asc + source = https://ftp.isc.org/isc/bind9/9.14.9/bind-9.14.9.tar.gz + source = https://ftp.isc.org/isc/bind9/9.14.9/bind-9.14.9.tar.gz.asc source = tmpfiles.conf source = sysusers.conf source = named.conf @@ -31,21 +31,20 @@ pkgbase = bind-rl source = localhost.zone source = localhost.ip6.zone source = 127.0.0.zone - source = empty.zone validpgpkeys = AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38 - sha1sums = 29e43a99c059c5458822833b2267f237361feca6 + sha1sums = a45f4c8b44755d8c4019181d0787e4e72d836661 sha1sums = SKIP sha1sums = c5a2bcd9b0f009ae71f3a03fbdbe012196962a11 sha1sums = 9537f4835a1f736788d0733c7996a10db2d4eee4 - sha1sums = c017aae379c32c7cb1aa1ad84776b83e3a5c139f + sha1sums = 34d828cf20b425cf49a838926e01470c12083bee sha1sums = 62b06487323dd0d515a4dc659b8ecd193c29107b sha1sums = 6704303a6ed431a29b1d8fe7b12decd4d1f2f50f sha1sums = 52da8f1c0247a11b16daa4e03d920e8f09315cbe sha1sums = 9c33726088342207ad06d33b2c13408290a0c8ad - sha1sums = 4f4457b310cbbeadca2272eced062a9c2b2b42fe pkgname = bind-rl pkgdesc = The ISC DNS Server, with Response Rate Limit (RRL) enabled + install = bind.install depends = glibc depends = libxml2 depends = libcap @@ -54,15 +53,17 @@ pkgname = bind-rl depends = geoip depends = json-c depends = bind-tools + depends = zlib + depends = lmdb + depends = libmaxminddb provides = dns-server - provides = bind=9.14.1 + provides = bind=9.14.9 conflicts = bind replaces = bind backup = etc/named.conf backup = var/named/127.0.0.zone backup = var/named/localhost.zone backup = var/named/localhost.ip6.zone - backup = var/named/empty.zone pkgname = bind-rl-tools pkgdesc = The ISC DNS tools @@ -76,16 +77,17 @@ pkgname = bind-rl-tools depends = bash depends = openssl depends = readline - depends = geoip depends = libidn2 depends = dnssec-anchors depends = json-c depends = lmdb depends = xz depends = icu + depends = python-ply + depends = libmaxminddb optdepends = python: for python scripts - provides = dnsutils=9.14.1 - provides = bind-tools=9.14.1 + provides = dnsutils=9.14.9 + provides = bind-tools=9.14.9 conflicts = dnsutils conflicts = bind-tools replaces = dnsutils @@ -6,7 +6,7 @@ pkgbase=bind-rl pkgname=(bind-rl bind-rl-tools) -_pkgver=9.14.1 +_pkgver=9.14.9 pkgver=${_pkgver//-/.} pkgrel=1 url='https://www.isc.org/software/bind/' @@ -14,8 +14,8 @@ license=('MPL2') arch=('x86_64') options=('!emptydirs') makedepends=('libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'openssl' 'readline' - 'libidn2' 'geoip' 'dnssec-anchors' 'python' 'json-c' 'python-ply' 'lmdb' - 'zlib' 'icu' 'xz') + 'libidn2' 'dnssec-anchors' 'python' 'json-c' 'python-ply' 'lmdb' 'zlib' 'icu' + 'xz' 'libmaxminddb') validpgpkeys=('AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38') #ISC Code Signing Key 2019 – 2020 (codesign@isc.org) source=("https://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc} 'tmpfiles.conf' @@ -24,32 +24,27 @@ source=("https://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc} 'named.service' 'localhost.zone' 'localhost.ip6.zone' - '127.0.0.zone' - 'empty.zone') -sha1sums=('29e43a99c059c5458822833b2267f237361feca6' + '127.0.0.zone') +sha1sums=('a45f4c8b44755d8c4019181d0787e4e72d836661' 'SKIP' 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' '9537f4835a1f736788d0733c7996a10db2d4eee4' - 'c017aae379c32c7cb1aa1ad84776b83e3a5c139f' + '34d828cf20b425cf49a838926e01470c12083bee' '62b06487323dd0d515a4dc659b8ecd193c29107b' '6704303a6ed431a29b1d8fe7b12decd4d1f2f50f' '52da8f1c0247a11b16daa4e03d920e8f09315cbe' - '9c33726088342207ad06d33b2c13408290a0c8ad' - '4f4457b310cbbeadca2272eced062a9c2b2b42fe') + '9c33726088342207ad06d33b2c13408290a0c8ad') prepare() { - msg2 'Getting a fresh version of root DNS' - # no more using source array, lack of versioning. - curl -o root.hint https://www.internic.net/zones/named.root - [[ -s root.hint ]] cd bind-$_pkgver # apply patch from the source array (should be a pacman feature) - local filename - for filename in "${source[@]}"; do - if [[ "$filename" =~ \.patch$ ]]; then - msg2 "Applying patch ${filename##*/}" - patch -p1 -N -i "$srcdir/${filename##*/}" - fi + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + msg2 "Applying patch $src..." + patch -Np1 < "../$src" done } @@ -67,7 +62,7 @@ build() { --enable-dnsrps \ --enable-rrl \ --with-python=/usr/bin/python \ - --with-geoip \ + --with-geoip2 \ --with-openssl \ --with-libidn2 \ --with-libjson \ @@ -82,14 +77,14 @@ package_bind-rl() { pkgdesc='The ISC DNS Server, with Response Rate Limit (RRL) enabled' provides=('dns-server' "bind=$pkgver") depends=('glibc' 'libxml2' 'libcap' 'libseccomp' 'openssl' 'geoip' 'json-c' - 'bind-tools') + 'bind-tools' 'zlib' 'lmdb' 'libmaxminddb') conflicts=('bind') replaces=('bind') 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/" @@ -106,18 +101,16 @@ package_bind-rl() { install -D -m640 -o 0 -g 40 named.conf "$pkgdir/etc/named.conf" install -d -m770 -o 0 -g 40 "$pkgdir/var/named" - install -m640 -o 0 -g 40 root.hint "$pkgdir/var/named" 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-rl-tools() { pkgdesc='The ISC DNS tools' depends=('glibc' 'libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'python' 'bash' - 'openssl' 'readline' 'geoip' 'libidn2' 'dnssec-anchors' 'json-c' - 'lmdb' 'xz' 'icu') + 'openssl' 'readline' 'libidn2' 'dnssec-anchors' 'json-c' 'lmdb' 'xz' + 'icu' 'python-ply' 'libmaxminddb') optdepends=('python: for python scripts') conflicts=('dnsutils' 'bind-tools') replaces=('dnsutils' 'host' 'bind-tools') diff --git a/bind.install b/bind.install new file mode 100644 index 000000000000..144156898e5a --- /dev/null +++ b/bind.install @@ -0,0 +1,10 @@ +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + (( $(vercmp "$2" '9.14.1-1') > 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: diff --git a/empty.zone b/empty.zone deleted file mode 100644 index 7501c74ed07f..000000000000 --- a/empty.zone +++ /dev/null @@ -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. diff --git a/named.conf b/named.conf index 827445d3b2bd..2ac668d4c38f 100644 --- a/named.conf +++ b/named.conf @@ -34,21 +34,6 @@ zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" 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 "." IN { - type hint; - file "root.hint"; -}; - //zone "example.org" IN { // type slave; // file "example.zone"; |