summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Krizek2018-02-19 17:14:47 +0100
committerTomas Krizek2018-02-20 12:32:43 +0100
commit90b2ce27a4ae772f97a4c4e79f9d60bf6b0856e3 (patch)
tree43f7c95f229cc4a56a1f76c3d1389a7928105378
parent9a46cace29233248aaa883da4f883eb133246cae (diff)
downloadaur-90b2ce27a4ae772f97a4c4e79f9d60bf6b0856e3.tar.gz
update to 2.1.0
-rw-r--r--.SRCINFO28
-rw-r--r--PKGBUILD53
-rw-r--r--install9
-rw-r--r--kresd.conf25
-rw-r--r--kresd.default2
-rw-r--r--root.key1
-rw-r--r--root.keys2
7 files changed, 60 insertions, 60 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d3ce3dbc7d9..fc6553d0b25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,26 @@
-# Generated by mksrcinfo v8
-# Wed Mar 1 15:13:08 UTC 2017
pkgbase = knot-resolver
- pkgdesc = caching full resolver implementation
- pkgver = 1.2.3
+ pkgdesc = full caching DNS resolver implementation
+ pkgver = 2.1.0
pkgrel = 1
url = https://www.knot-resolver.cz/
install = install
- arch = i686
arch = x86_64
license = GPL3
depends = libuv
- depends = gnutls>=3.0
- depends = knot>=2.4.1
- depends = lmdb
+ depends = knot>=2.6.4
depends = luajit
depends = cmocka
- depends = jansson
depends = lua51-sec
depends = lua51-socket
depends = hiredis
depends = libmemcached
- depends = python-sphinx
- depends = python-breathe
- depends = doxygen
- source = https://secure.nic.cz/files/knot-resolver/knot-resolver-1.2.3.tar.xz
+ depends = libsystemd
+ source = https://secure.nic.cz/files/knot-resolver/knot-resolver-2.1.0.tar.xz
source = kresd.conf
- source = kresd.default
- source = root.key
- sha256sums = 81a773f182112b4e11935223f900cfbcca8624f2c382b1e39a68d7c3db81c921
- sha256sums = f078bc02f41d0eab5b1a0d27db088dbfbd121bd677ebe3fd0a86e2175562bbb0
- sha256sums = 48f5d6e29447ad865b19003f9961f8fec17dce174e5aef0c1cac36464c7d98cf
- sha256sums = 422105459af6851fbf55d876fab5069a7b772a1e2f561453165378ca07e6af1c
+ source = root.keys
+ sha256sums = 0e90ac37965839705bc2154cb07587cb31dd5816e37a14f3552d65676638fc6a
+ sha256sums = 929658c7432252d5123ff11ee07759c595c8f5a3f4320a62d451a5f69cd2254a
+ sha256sums = 06c74ef5ef53344c78c9af2b29dc458a2abe93f1bff429705955c033e7a0686f
pkgname = knot-resolver
diff --git a/PKGBUILD b/PKGBUILD
index d349a65d1e9..f647e6fb3d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,46 @@
-# Maintainer: Ondřej Surý <ondrej@sury.org>
+# Maintainer: Tomas Krizek <tomas.krizek@mailbox.org>
+# Contributor: Ondřej Surý <ondrej@sury.org>
-srcname=knot-resolver
-pkgname=${srcname}
-pkgver=1.2.3
+pkgname=knot-resolver
+pkgver=2.1.0
pkgrel=1
-pkgdesc='caching full resolver implementation'
+pkgdesc='full caching DNS resolver implementation'
url='https://www.knot-resolver.cz/'
-arch=('i686' 'x86_64')
+arch=('x86_64')
license=('GPL3')
install=install
-depends=('libuv' 'gnutls>=3.0' 'knot>=2.4.1' 'lmdb' 'luajit' 'cmocka' 'jansson' 'lua51-sec' 'lua51-socket' 'hiredis' 'libmemcached' 'python-sphinx' 'python-breathe' 'doxygen')
-source=("https://secure.nic.cz/files/knot-resolver/${srcname}-${pkgver}.tar.xz"
+depends=('libuv' 'knot>=2.6.4' 'luajit' 'cmocka' 'lua51-sec' 'lua51-socket' 'hiredis' 'libmemcached' 'libsystemd')
+source=("https://secure.nic.cz/files/${pkgname}/${pkgname}-${pkgver}.tar.xz"
"kresd.conf"
- "kresd.default"
- "root.key")
+ "root.keys")
-makevars="PREFIX=/usr SBINDIR=/usr/bin MODULEDIR=/usr/lib/knot-resolver ETCDIR=/etc/knot-resolver V=1"
+_makevars="PREFIX=/usr SBINDIR=/usr/bin LIBDIR=/usr/lib INCLUDEDIR=/usr/include ETCDIR=/etc/knot-resolver V=1"
-sha256sums=('81a773f182112b4e11935223f900cfbcca8624f2c382b1e39a68d7c3db81c921'
- 'f078bc02f41d0eab5b1a0d27db088dbfbd121bd677ebe3fd0a86e2175562bbb0'
- '48f5d6e29447ad865b19003f9961f8fec17dce174e5aef0c1cac36464c7d98cf'
- '422105459af6851fbf55d876fab5069a7b772a1e2f561453165378ca07e6af1c')
+sha256sums=('0e90ac37965839705bc2154cb07587cb31dd5816e37a14f3552d65676638fc6a'
+ '929658c7432252d5123ff11ee07759c595c8f5a3f4320a62d451a5f69cd2254a'
+ '06c74ef5ef53344c78c9af2b29dc458a2abe93f1bff429705955c033e7a0686f')
build() {
- cd "${srcdir}/${srcname}-${pkgver}"
- make ${makevars}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make ${_makevars}
}
check() {
- cd "${srcdir}/${srcname}-${pkgver}"
- make ${makevars}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check-unit ${_makevars}
}
package() {
- cd "${srcdir}/${srcname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
- make ${makevars} DESTDIR="${pkgdir}" install
+ make ${_makevars} DESTDIR="${pkgdir}" install
install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd.socket" "${pkgdir}/usr/lib/systemd/system/kresd.socket"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd-control.socket" "${pkgdir}/usr/lib/systemd/system/kresd-control.socket"
+ install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd-control@.socket" "${pkgdir}/usr/lib/systemd/system/kresd-control@.socket"
install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd-tls.socket" "${pkgdir}/usr/lib/systemd/system/kresd-tls.socket"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd.service" "${pkgdir}/usr/lib/systemd/system/kresd.service"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/tmpfiles/kresd.conf" "${pkgdir}/usr/lib/tmpfiles.d/kresd.conf"
- install -dm 0755 "${pkgdir}/etc/knot-resolver"
+ install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd@.service" "${pkgdir}/usr/lib/systemd/system/kresd@.service"
+ install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/doc/kresd.systemd.7" "${pkgdir}/usr/share/man/man7/kresd.systemd.7"
+ install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/tmpfiles/knot-resolver.conf" "${pkgdir}/usr/lib/tmpfiles.d/knot-resolver.conf"
+ install -dm 0775 "${pkgdir}/etc/knot-resolver"
install -Dm 0644 "${srcdir}/kresd.conf" "${pkgdir}/etc/knot-resolver/kresd.conf"
- install -Dm 0644 "${srcdir}/kresd.default" "${pkgdir}/etc/default/kresd"
- install -dm 0755 "${pkgdir}/var/lib/knot-resolver"
- install -Dm 0644 "${srcdir}/root.key" "${pkgdir}/var/lib/knot-resolver/root.key"
+ install -Dm 0664 "${srcdir}/root.keys" "${pkgdir}/etc/knot-resolver/root.keys"
}
diff --git a/install b/install
index 7f245655312..de23d593f73 100644
--- a/install
+++ b/install
@@ -1,10 +1,11 @@
post_install() {
getent group knot-resolver &>/dev/null || groupadd -r knot-resolver >/dev/null
getent passwd knot-resolver &>/dev/null || useradd -r -g knot-resolver -d /dev/null -s /bin/false -c knot-resolver knot-resolver >/dev/null
- chown knot-resolver:knot-resolver /var/lib/knot-resolver
- chmod 0755 /var/lib/knot-resolver
- chown knot-resolver:knot-resolver /var/lib/knot-resolver/root.key
- chmod 0644 /var/lib/knot-resolver/root.key
+ chown -R root:knot-resolver /etc/knot-resolver
+}
+
+post_upgrade() {
+ chown -R root:knot-resolver /etc/knot-resolver
}
post_remove() {
diff --git a/kresd.conf b/kresd.conf
index 638f381d9f9..81034c07ead 100644
--- a/kresd.conf
+++ b/kresd.conf
@@ -1,7 +1,20 @@
--- Default empty Knot DNS Resolver configuration in -*- lua -*-
--- Bind ports as privileged user (root) --
+-- vim:syntax=lua:
+-- Refer to manual: http://knot-resolver.readthedocs.org/en/latest/daemon.html#configuration
+
+-- Load useful modules
+modules = {
+ 'policy', -- Block queries to local zones/bad sites
+ 'hints', -- Load /etc/hosts and allow custom root hints
+ 'stats', -- Track internal statistics
+ 'predict', -- Prefetch expiring/frequent records
+}
+
+-- See kresd.systemd(7) about configuring network interfaces when using systemd
+-- Listen on localhost (default)
-- net = { '127.0.0.1', '::1' }
--- Switch to unprivileged user --
-user('knot-resolver','knot-resolver')
--- Unprivileged
--- cache.size = 100*MB
+
+-- Enable DNSSEC validation
+trust_anchors.file = '/etc/knot-resolver/root.keys'
+
+-- Cache size
+cache.size = 100 * MB
diff --git a/kresd.default b/kresd.default
deleted file mode 100644
index dcc3d13117d..00000000000
--- a/kresd.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# Used for systemd socket activation
-KRESD_ARGS="--config=/etc/knot-resolver/kresd.conf --verbose --forks=1 --keyfile=/var/lib/knot-resolver/root.key /run/knot-resolver/cache"
diff --git a/root.key b/root.key
deleted file mode 100644
index 6c7d3a15ac8..00000000000
--- a/root.key
+++ /dev/null
@@ -1 +0,0 @@
-. 172800 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b} ;;state=2 [ VALID ] ;;count=0 ;;lastchange=1404118431 ;;Mon Jun 30 10:53:51 2014
diff --git a/root.keys b/root.keys
new file mode 100644
index 00000000000..7578e0405d9
--- /dev/null
+++ b/root.keys
@@ -0,0 +1,2 @@
+. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
+. IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D