summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Krizek2019-04-19 08:47:14 +0200
committerTomas Krizek2019-04-19 08:51:07 +0200
commit705aa7f05ca5aa28d8d637ce43181ecf4fdc6d7f (patch)
tree24502e3780be7fcbdd6f4ccb5ae8a37be622b68b
parente9bbc06a81727d67a10dde08ca0d7a28fe8da48f (diff)
downloadaur-705aa7f05ca5aa28d8d637ce43181ecf4fdc6d7f.tar.gz
update to 4.0.0
-rw-r--r--.SRCINFO19
-rw-r--r--01-compat-Knot-DNS-2.8.patch12
-rw-r--r--PKGBUILD90
3 files changed, 59 insertions, 62 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e88f458337f..faa6e3b953f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,33 @@
pkgbase = knot-resolver
pkgdesc = full caching DNS resolver implementation
- pkgver = 3.2.1
- pkgrel = 2
+ pkgver = 4.0.0
+ pkgrel = 1
url = https://www.knot-resolver.cz/
install = install
arch = x86_64
arch = armv7h
license = GPL3
- depends = cmocka
+ makedepends = cmocka
+ makedepends = meson
+ makedepends = systemd-libs
depends = dnssec-anchors
depends = gnutls
depends = knot>=2.8
depends = libedit
- depends = libsystemd
depends = libuv
depends = lmdb
depends = lua51-sec
depends = lua51-socket
depends = luajit
+ depends = systemd
+ optdepends = lua51-basexx: experimental_dot_auth module,
+ optdepends = lua51-http: http module,
+ optdepends = lua51-filesystem: prefill module,
options = debug
options = strip
backup = etc/knot-resolver/kresd.conf
- source = https://secure.nic.cz/files/knot-resolver/knot-resolver-3.2.1.tar.xz
- source = 01-compat-Knot-DNS-2.8.patch
- sha256sums = d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b
- sha256sums = SKIP
+ source = https://secure.nic.cz/files/knot-resolver/knot-resolver-4.0.0.tar.xz
+ sha256sums = 37161d931e64535ce38c33b9635f06a43cd1541945bf2c79a55e37f230de1631
pkgname = knot-resolver
diff --git a/01-compat-Knot-DNS-2.8.patch b/01-compat-Knot-DNS-2.8.patch
deleted file mode 100644
index 966846cad82..00000000000
--- a/01-compat-Knot-DNS-2.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/daemon/lua/kres-gen.lua b/daemon/lua/kres-gen.lua
-index eeb8ff7c..4bf6d63b 100644
---- a/daemon/lua/kres-gen.lua
-+++ b/daemon/lua/kres-gen.lua
-@@ -394,6 +394,7 @@ struct zs_scanner {
- _Bool automatic;
- void (*record)(zs_scanner_t *);
- void (*error)(zs_scanner_t *);
-+ void (*comment)(zs_scanner_t *);
- void *data;
- } process;
- struct {
diff --git a/PKGBUILD b/PKGBUILD
index ee3e6dac5f4..2af43866449 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: Tomas Krizek <tomas.krizek@mailbox.org>
+# Maintainer: Tomas Krizek <tomas.krizek@nic.cz>
# Contributor: Ondřej Surý <ondrej@sury.org>
pkgname=knot-resolver
-pkgver=3.2.1
-pkgrel=2
+pkgver=4.0.0
+pkgrel=1
pkgdesc='full caching DNS resolver implementation'
url='https://www.knot-resolver.cz/'
arch=('x86_64' 'armv7h')
@@ -11,54 +11,60 @@ license=('GPL3')
backup=('etc/knot-resolver/kresd.conf')
options=(debug strip)
install=install
-depends=('cmocka'
- 'dnssec-anchors'
- 'gnutls'
- 'knot>=2.8'
- 'libedit'
- 'libsystemd'
- 'libuv'
- 'lmdb'
- 'lua51-sec'
- 'lua51-socket'
- 'luajit')
-source=("https://secure.nic.cz/files/${pkgname}/${pkgname}-${pkgver}.tar.xz"
- "01-compat-Knot-DNS-2.8.patch")
+depends=(
+ 'dnssec-anchors'
+ 'gnutls'
+ 'knot>=2.8'
+ 'libedit'
+ 'libuv'
+ 'lmdb'
+ 'lua51-sec'
+ 'lua51-socket'
+ 'luajit'
+ 'systemd'
+)
+optdepends=(
+ 'lua51-basexx: experimental_dot_auth module',
+ 'lua51-http: http module',
+ 'lua51-filesystem: prefill module',
+)
+makedepends=(
+ 'cmocka'
+ 'meson'
+ 'systemd-libs'
+)
-_makevars="PREFIX=/usr SBINDIR=/usr/bin LIBDIR=/usr/lib INCLUDEDIR=/usr/include ETCDIR=/etc/knot-resolver KEYFILE_DEFAULT=/etc/trusted-key.key V=1"
-
-sha256sums=('d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b'
- 'SKIP')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/01-compat-Knot-DNS-2.8.patch"
-}
+source=("https://secure.nic.cz/files/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('37161d931e64535ce38c33b9635f06a43cd1541945bf2c79a55e37f230de1631')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make ${_makevars}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ meson build_arch \
+ --buildtype=release \
+ --prefix=/usr \
+ --sbindir=bin \
+ -Dkeyfile_default=/etc/trusted-key.key \
+ -Dsystemd_files=enabled \
+ -Dclient=enabled \
+ -Dinstall_kresd_conf=enabled \
+ -Dunit_tests=enabled
+ ninja -C build_arch
}
check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make check-unit ${_makevars}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ meson test -C build_arch
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ DESTDIR=${pkgdir} ninja -C build_arch install
+
+ # add kresd.target to multi-user.target.wants to support enabling kresd services
+ install -d -m 0755 "${pkgdir}/usr/lib/systemd/system/multi-user.target.wants"
+ ln -s ../kresd.target "${pkgdir}/usr/lib/systemd/system/multi-user.target.wants/kresd.target"
- make ${_makevars} DESTDIR="${pkgdir}" install
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd.socket" "${pkgdir}/usr/lib/systemd/system/kresd.socket"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd-control@.socket" "${pkgdir}/usr/lib/systemd/system/kresd-control@.socket"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd-tls.socket" "${pkgdir}/usr/lib/systemd/system/kresd-tls.socket"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd@.service" "${pkgdir}/usr/lib/systemd/system/kresd@.service"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd.target" "${pkgdir}/usr/lib/systemd/system/kresd.target"
- install -dm 0755 "${pkgdir}/usr/lib/systemd/system/multi-user.target.wants"
- ln -s ../kresd.target "${pkgdir}/usr/lib/systemd/system/multi-user.target.wants/kresd.target"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd.systemd.7" "${pkgdir}/usr/share/man/man7/kresd.systemd.7"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/tmpfiles/knot-resolver.conf" "${pkgdir}/usr/lib/tmpfiles.d/knot-resolver.conf"
- install -dm 0775 "${pkgdir}/etc/knot-resolver"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/kresd.no_ta.conf" "${pkgdir}/etc/knot-resolver/kresd.conf"
+ # remove modules with missing dependencies
+ rm "${pkgdir}/usr/lib/knot-resolver/kres_modules/etcd.lua"
}