summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Zhong2018-09-11 18:46:15 +0800
committerAllen Zhong2018-09-11 18:46:15 +0800
commit1a30ffd4fcedd4a5b38196f63dad581053fa8099 (patch)
tree555a18fee7a95fd18918f74d4efa6513ca4b5167
parent928bd007571b70aee350524ef0249042cca2612a (diff)
downloadaur-1a30ffd4fcedd4a5b38196f63dad581053fa8099.tar.gz
upgpkg: sync with latest extra package
-rw-r--r--.SRCINFO86
-rw-r--r--.gitignore2
-rw-r--r--01-fix-forgotten-log.patch41
-rw-r--r--PKGBUILD104
-rw-r--r--bind.install13
-rw-r--r--named.logrotate6
-rw-r--r--named.service3
-rw-r--r--root.hint88
-rw-r--r--tmpfiles.d1
9 files changed, 137 insertions, 207 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fce444766c6..4d54d9e03a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,28 @@
+# Generated by mksrcinfo v8
+# Tue Sep 11 09:51:10 UTC 2018
pkgbase = bind-rl
- pkgdesc = The ISC BIND nameserver with Response Rate Limiting(RRL) enabled.
- pkgver = 9.10.2.P1
+ pkgver = 9.13.2
pkgrel = 1
- url = http://www.isc.org/software/bind/
- install = bind.install
- arch = i686
+ url = https://www.isc.org/software/bind/
arch = x86_64
- license = custom:ISC
- depends = glibc
- depends = libxml2
- depends = libcap
- depends = openssl
- depends = geoip
- depends = bind-tools
- provides = dns-server
- conflicts = bind
+ license = MPL2
+ makedepends = libcap
+ makedepends = libxml2
+ makedepends = zlib
+ makedepends = krb5
+ makedepends = e2fsprogs
+ makedepends = openssl
+ makedepends = readline
+ makedepends = idnkit
+ makedepends = geoip
+ makedepends = dnssec-anchors
+ makedepends = python
+ makedepends = json-c
+ makedepends = python-ply
+ makedepends = libseccomp
options = !emptydirs
- 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
- source = http://ftp.isc.org/isc/bind9/9.10.2-P1/bind-9.10.2-P1.tar.gz
- source = http://ftp.isc.org/isc/bind9/9.10.2-P1/bind-9.10.2-P1.tar.gz.asc
+ source = https://ftp.isc.org/isc/bind9/9.13.2/bind-9.13.2.tar.gz
+ source = https://ftp.isc.org/isc/bind9/9.13.2/bind-9.13.2.tar.gz.asc
source = tmpfiles.conf
source = sysusers.conf
source = named.conf
@@ -31,16 +31,56 @@ pkgbase = bind-rl
source = localhost.ip6.zone
source = 127.0.0.zone
source = empty.zone
- sha1sums = 1c25e0d3faeac4c78ef338e7a6f1145f53d973f3
+ sha1sums = bd9c44cd1a19aa100ebd1f9fe94ce47e47e0eca7
sha1sums = SKIP
sha1sums = c5a2bcd9b0f009ae71f3a03fbdbe012196962a11
sha1sums = 9537f4835a1f736788d0733c7996a10db2d4eee4
sha1sums = c017aae379c32c7cb1aa1ad84776b83e3a5c139f
- sha1sums = cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec
+ sha1sums = 62b06487323dd0d515a4dc659b8ecd193c29107b
sha1sums = 6704303a6ed431a29b1d8fe7b12decd4d1f2f50f
sha1sums = 52da8f1c0247a11b16daa4e03d920e8f09315cbe
sha1sums = 9c33726088342207ad06d33b2c13408290a0c8ad
sha1sums = 4f4457b310cbbeadca2272eced062a9c2b2b42fe
pkgname = bind-rl
+ pkgdesc = The ISC DNS Server
+ depends = glibc
+ depends = libxml2
+ depends = libcap
+ depends = libseccomp
+ depends = openssl
+ depends = geoip
+ depends = json-c
+ depends = bind-tools
+ provides = dns-server
+ 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
+ depends = glibc
+ depends = libcap
+ depends = libseccomp
+ depends = libxml2
+ depends = zlib
+ depends = krb5
+ depends = e2fsprogs
+ depends = openssl
+ depends = readline
+ depends = geoip
+ depends = idnkit
+ depends = dnssec-anchors
+ depends = json-c
+ optdepends = python: for python scripts
+ provides = dnsutils=9.13.2
+ conflicts = dnsutils
+ conflicts = bind-tools
+ replaces = dnsutils
+ replaces = host
+ replaces = bind-tools
diff --git a/.gitignore b/.gitignore
index 4601b3df4a5..2c26a28e960 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ pkg/
*.swp
cookies
+*.log
+
*.c
*.cpp
*.h
diff --git a/01-fix-forgotten-log.patch b/01-fix-forgotten-log.patch
deleted file mode 100644
index a9af283d59f..00000000000
--- a/01-fix-forgotten-log.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# https://lists.isc.org/pipermail/bind-users/2014-May/093124.html
-From 73a2c0ec42c0915bde0275c81861f57645daf683 Mon Sep 17 00:00:00 2001
-From: Tony Finch <dot@dotat.at>
-Date: Thu, 28 Nov 2013 17:23:57 +0000
-Subject: [PATCH] Disable XXXMPA verbose packet logging in EDNS fallback code.
-
----
- lib/dns/resolver.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
-index 11c805f..e50071e 100644
---- a/lib/dns/resolver.c
-+++ b/lib/dns/resolver.c
-@@ -7339,9 +7339,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
- sizeof(addrbuf));
- snprintf(buf, sizeof(buf), "received packet from %s "
- "(bad edns):\n", addrbuf);
-+/*
- dns_message_logpacket(message, buf,
- DNS_LOGCATEGORY_RESOLVER, DNS_LOGMODULE_RESOLVER,
- ISC_LOG_NOTICE, fctx->res->mctx);
-+*/
- dns_adb_changeflags(fctx->adb, query->addrinfo,
- DNS_FETCHOPT_NOEDNS0,
- DNS_FETCHOPT_NOEDNS0);
-@@ -7369,9 +7371,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
- sizeof(addrbuf));
- snprintf(buf, sizeof(buf), "received packet from %s (no opt):\n",
- addrbuf);
-+/*
- dns_message_logpacket(message, buf,
- DNS_LOGCATEGORY_RESOLVER, DNS_LOGMODULE_RESOLVER,
- ISC_LOG_NOTICE, fctx->res->mctx);
-+*/
- dns_adb_changeflags(fctx->adb, query->addrinfo,
- DNS_FETCHOPT_NOEDNS0,
- DNS_FETCHOPT_NOEDNS0);
---
-1.9.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 3c48eb96dbf..4af7b09a9c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,28 +4,22 @@
# Contributor: judd <jvinet@zeroflux.org>
# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
-pkgname=bind-rl
-_pkgname=bind
-_pkgver=9.10.2-P1
-pkgver=9.10.2.P1
+pkgbase=bind-rl
+pkgname=(bind-rl bind-rl-tools)
+_pkgver=9.13.2
+pkgver=${_pkgver//-/.}
pkgrel=1
-pkgdesc='The ISC BIND nameserver with Response Rate Limiting(RRL) enabled.'
-url='http://www.isc.org/software/bind/'
-license=('custom:ISC')
-arch=('i686' 'x86_64')
+url='https://www.isc.org/software/bind/'
+license=('MPL2')
+arch=('x86_64')
options=('!emptydirs')
-depends=('glibc' 'libxml2' 'libcap' 'openssl' 'geoip' 'bind-tools')
-conflicts=('bind')
-provides=('dns-server')
-backup=('etc/named.conf'
- 'var/named/127.0.0.zone'
- 'var/named/localhost.zone'
- 'var/named/localhost.ip6.zone'
- 'var/named/empty.zone')
-install=$_pkgname.install
+makedepends=('libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'openssl' 'readline'
+ 'idnkit' 'geoip' 'dnssec-anchors' 'python' 'json-c' 'python-ply' 'libseccomp')
validpgpkeys=('2B48A38AE1CF9886435F89EE45AC7857189CDBC5'
- 'ADBE9446286C794905F1E0756FA6EBC9911A4C02') #ISC, Inc
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc}
+ 'ADBE9446286C794905F1E0756FA6EBC9911A4C02' #ISC, Inc)
+ 'BE0E9748B718253A28BB89FFF1B11BF05CF02E57' #Internet Systems Consortium, Inc.
+ )
+source=("https://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc}
'tmpfiles.conf'
'sysusers.conf'
'named.conf'
@@ -34,56 +28,82 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc}
'localhost.ip6.zone'
'127.0.0.zone'
'empty.zone')
-sha1sums=('1c25e0d3faeac4c78ef338e7a6f1145f53d973f3'
+sha1sums=('bd9c44cd1a19aa100ebd1f9fe94ce47e47e0eca7'
'SKIP'
'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
'9537f4835a1f736788d0733c7996a10db2d4eee4'
'c017aae379c32c7cb1aa1ad84776b83e3a5c139f'
- 'cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec'
+ '62b06487323dd0d515a4dc659b8ecd193c29107b'
'6704303a6ed431a29b1d8fe7b12decd4d1f2f50f'
'52da8f1c0247a11b16daa4e03d920e8f09315cbe'
'9c33726088342207ad06d33b2c13408290a0c8ad'
'4f4457b310cbbeadca2272eced062a9c2b2b42fe')
prepare() {
- # remove dig to avoid conflict with dnsutils
- sed -i 's/dig//' $_pkgname-$_pkgver/bin/Makefile.in
-
msg2 'Getting a fresh version of root DNS'
# no more using source array, lack of versioning.
- curl -o root.hint http://www.internic.net/zones/named.root
+ 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
+ done
}
build() {
cd bind-$_pkgver
+ export CFLAGS+=' -DDIG_SIGCHASE'
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--sbindir=/usr/bin \
--localstatedir=/var \
--disable-static \
+ --enable-ipv6 \
+ --enable-filter-aaaa \
+ --enable-fixed-rrset \
+ --enable-seccomp \
+ --enable-full-report \
+ --enable-rrl \
--with-python=/usr/bin/python \
--with-geoip \
- --with-ipv6 \
--with-idn \
--with-openssl \
+ --with-libjson \
--with-libxml2 \
- --with-libtool \
- --enable-rrl
+ --with-libtool
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
-package() {
- pushd "bind-$_pkgver"
- install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+package_bind-rl() {
+ pkgdesc='The ISC DNS Server'
+ provides=('dns-server')
+ depends=('glibc' 'libxml2' 'libcap' 'libseccomp' 'openssl' 'geoip' 'json-c'
+ 'bind-tools')
+ 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')
+
+ cd "bind-$_pkgver"
+ install -dm755 "$pkgdir/usr/share/licenses/$pkgname/"
+ install -Dm644 LICENSE COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/"
for _d in bin/{check,confgen,named,rndc}; do
(cd "$_d" && make DESTDIR="$pkgdir" install)
done
cd "$srcdir"
- install -D -m644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$_pkgname.conf"
- install -D -m644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$_pkgname.conf"
+ install -D -m644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+ install -D -m644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
install -D -m644 named.service "$pkgdir/usr/lib/systemd/system/named.service"
install -D -m640 -o 0 -g 40 named.conf "$pkgdir/etc/named.conf"
@@ -96,3 +116,21 @@ package() {
install -m640 -o 0 -g 40 empty.zone "$pkgdir/var/named"
}
+package_bind-rl-tools() {
+ pkgdesc='The ISC DNS tools'
+ depends=('glibc' 'libcap' 'libseccomp' 'libxml2' 'zlib' 'krb5' 'e2fsprogs'
+ 'openssl' 'readline' 'geoip' 'idnkit' 'dnssec-anchors' 'json-c')
+ optdepends=('python: for python scripts')
+ conflicts=('dnsutils' 'bind-tools')
+ replaces=('dnsutils' 'host' 'bind-tools')
+ provides=("dnsutils=$pkgver")
+
+ cd "bind-$_pkgver"
+ install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ make DESTDIR="$pkgdir" SUBDIRS="" install
+ (cd lib && make DESTDIR="$pkgdir" install)
+ for _d in bin/{dig,dnssec,delv,nsupdate,python,tools}; do
+ (cd "$_d" && make DESTDIR="$pkgdir" install)
+ done
+}
+
diff --git a/bind.install b/bind.install
deleted file mode 100644
index a38c4150337..00000000000
--- a/bind.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- systemd-sysusers bind.conf
- systemd-tmpfiles --create bind.conf
-
- # create an rndc.key if it doesn't already exist
- if [[ ! -s etc/rndc.key ]]; then
- rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
- chown root:named etc/rndc.key
- chmod 640 etc/rndc.key
- fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/named.logrotate b/named.logrotate
deleted file mode 100644
index 5f9a47693f8..00000000000
--- a/named.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/named.log {
- missingok
- postrotate
- /bin/kill -HUP `cat /run/named/named.pid 2>/dev/null` 2>/dev/null || true
- endscript
-}
diff --git a/named.service b/named.service
index 1a7832edcf2..e8625b14f95 100644
--- a/named.service
+++ b/named.service
@@ -4,8 +4,7 @@ After=network.target
[Service]
ExecStart=/usr/bin/named -f -u named
-ExecReload=/usr/bin/rndc reload
-ExecStop=/usr/bin/rndc stop
+ExecReload=/usr/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
diff --git a/root.hint b/root.hint
deleted file mode 100644
index 6c19741298d..00000000000
--- a/root.hint
+++ /dev/null
@@ -1,88 +0,0 @@
-; This file holds the information on root name servers needed to
-; initialize cache of Internet domain name servers
-; (e.g. reference this file in the "cache . <file>"
-; configuration file of BIND domain name servers).
-;
-; This file is made available by InterNIC
-; under anonymous FTP as
-; file /domain/named.cache
-; on server FTP.INTERNIC.NET
-; -OR- RS.INTERNIC.NET
-;
-; last update: Jan 3, 2013
-; related version of root zone: 2013010300
-;
-; formerly NS.INTERNIC.NET
-;
-. 3600000 IN NS A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4
-A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:BA3E::2:30
-;
-; FORMERLY NS1.ISI.EDU
-;
-. 3600000 NS B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201
-;
-; FORMERLY C.PSI.NET
-;
-. 3600000 NS C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12
-;
-; FORMERLY TERP.UMD.EDU
-;
-. 3600000 NS D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13
-D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2D::D
-;
-; FORMERLY NS.NASA.GOV
-;
-. 3600000 NS E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10
-;
-; FORMERLY NS.ISC.ORG
-;
-. 3600000 NS F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241
-F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2F::F
-;
-; FORMERLY NS.NIC.DDN.MIL
-;
-. 3600000 NS G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4
-;
-; FORMERLY AOS.ARL.ARMY.MIL
-;
-. 3600000 NS H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53
-H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803F:235
-;
-; FORMERLY NIC.NORDU.NET
-;
-. 3600000 NS I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
-I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53
-;
-; OPERATED BY VERISIGN, INC.
-;
-. 3600000 NS J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30
-J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:C27::2:30
-;
-; OPERATED BY RIPE NCC
-;
-. 3600000 NS K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
-K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FD::1
-;
-; OPERATED BY ICANN
-;
-. 3600000 NS L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42
-L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42
-;
-; OPERATED BY WIDE
-;
-. 3600000 NS M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33
-M.ROOT-SERVERS.NET. 3600000 AAAA 2001:DC3::35
-; End of File
diff --git a/tmpfiles.d b/tmpfiles.d
deleted file mode 100644
index 1cfc82d08e7..00000000000
--- a/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/named 0750 named named -