aboutsummaryrefslogtreecommitdiffstats
path: root/main/knot
diff options
context:
space:
mode:
Diffstat (limited to 'main/knot')
-rw-r--r--main/knot/APKBUILD60
-rw-r--r--main/knot/knot.post-upgrade8
2 files changed, 47 insertions, 21 deletions
diff --git a/main/knot/APKBUILD b/main/knot/APKBUILD
index 12c564e3f9..b63d0506a4 100644
--- a/main/knot/APKBUILD
+++ b/main/knot/APKBUILD
@@ -4,19 +4,24 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=knot
-pkgver=3.0.8
-pkgrel=2
+pkgver=3.1.5
+pkgrel=0
pkgdesc="An high-performance authoritative-only DNS server"
url="https://www.knot-dns.cz/"
# testsuite fails on 32 bit arches with musl 1.2
arch="all !x86 !armhf !armv7"
license="GPL-3.0-or-later"
-depends_dev="$pkgname $pkgname-libs-static $pkgname-utils"
+depends_dev="
+ $pkgname=$pkgver-r$pkgrel
+ $pkgname-libs-static=$pkgver-r$pkgrel
+ $pkgname-utils=$pkgver-r$pkgrel
+ "
checkdepends="softhsm"
makedepends="
bison
bsd-compat-headers
flex
+ fstrm-dev
gnutls-dev
jansson-dev
libcap-ng-dev
@@ -25,17 +30,22 @@ makedepends="
libtool
lmdb-dev
m4
+ libmaxminddb-dev
nghttp2-dev
openssl1.1-compat-dev
perl
+ protobuf-c-dev
sed
userspace-rcu-dev
zlib-dev
"
install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
-pkgusers="$pkgname"
-pkggroups="$pkgname"
-subpackages="$pkgname-libs
+pkgusers="knot"
+pkggroups="knot"
+subpackages="
+ $pkgname-mod-dnstap:_module
+ $pkgname-mod-geoip:_module
+ $pkgname-libs
$pkgname-libs-static
$pkgname-utils
$pkgname-dev
@@ -46,6 +56,7 @@ source="https://secure.nic.cz/files/$pkgname-dns/$pkgname-$pkgver.tar.xz
knotd.confd
knotd.initd
"
+
# tests fail due to alignment problems on armv6
[ "$CARCH" = "armhf" ] && options="!check"
@@ -67,8 +78,11 @@ build() {
--prefix=/usr \
--sysconfdir=/etc \
--libexecdir="/usr/lib/$pkgname" \
+ --enable-maxminddb \
--with-rundir="/run/$pkgname" \
--with-storage="/var/lib/$pkgname" \
+ --with-module-dnstap=shared \
+ --with-module-geoip=shared \
--disable-silent-rules
make
}
@@ -80,39 +94,43 @@ check() {
package() {
make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir/run"
- chown "${pkgusers%% *}:${pkggroups%% *}" "$pkgdir/var/lib/$pkgname"
- chmod 750 "$pkgdir/var/lib/$pkgname"
+ rm -rf "$pkgdir"/run
+ install -d -m750 -o knot -g knot "$pkgdir"/var/lib/$pkgname
- install -Dm 644 "$srcdir/knotd.confd" \
- "$pkgdir/etc/conf.d/knotd"
- install -Dm 755 "$srcdir/knotd.initd" \
- "$pkgdir/etc/init.d/knotd"
+ install -D -m755 "$srcdir"/knotd.initd "$pkgdir"/etc/init.d/knotd
+ install -D -m644 "$srcdir"/knotd.confd "$pkgdir"/etc/conf.d/knotd
}
libs() {
pkgdesc="Libraries used by the Knot DNS server and client applications"
- cd "$pkgdir"
- mkdir -p "$subpkgdir/usr/lib"
- mv ./usr/lib/libdnssec.so.* \
- ./usr/lib/libknot.so.* \
- ./usr/lib/libzscanner.so.* \
- "$subpkgdir/usr/lib/"
+ amove usr/lib/libdnssec.so.*
+ amove usr/lib/libknot.so.*
+ amove usr/lib/libzscanner.so.*
}
utils() {
pkgdesc="Knot and DNS client utilities shipped with the Knot DNS server"
amove usr/bin
- amove usr/sbin/keymgr usr/sbin/kjournalprint usr/sbin/kcatalogprint
+ amove usr/sbin/keymgr
+ amove usr/sbin/kjournalprint
+ amove usr/sbin/kcatalogprint
+}
+
+_module() {
+ local modname=${subpkgname#$pkgname-mod-}
+ pkgdesc="$modname module for Knot DNS"
+ depends="$pkgname=$pkgver-r$pkgrel"
+
+ amove usr/lib/$pkgname/modules-${pkgver%.*}/$modname.so
}
gpg_signature_extensions="asc"
gpgfingerprints="good:742F A4E9 5829 B6C5 EAC6 B857 10BB 7AF6 FEBB D6AB"
sha512sums="
-0ed55681210211427b54634428c07ac313a6fbc20492ab127f171a26e48a06e22d8360391a8f80247206c339ce76c32f0a82d6db2ec5dfb43cbfa8f455a4ee60 knot-3.0.8.tar.xz
+3a8cf04a2d65e04343a70009d43796ae00bf09e34348119b55ba70dac7deb7ff42906d88ef0e413d33dec28a952396a51781dee96727c0c2047b4c5ade54e6fa knot-3.1.5.tar.xz
471d3c639a8235ba09491c99d36c0a4f1074d6055ccfd3807be02a30d3ed5bbe69a84f0414ea7810db6bbc1e38f5837108e5744fc59f949ed78a262a7de4597e knotd.confd
979f06a83dd4326920a682f8190319577faf904e0e379b3c55e0420eb43dcb55d86c6727015634fa0c2dff1dddac43bbd5a216ff04f217ad91d670eb899dbefa knotd.initd
"
diff --git a/main/knot/knot.post-upgrade b/main/knot/knot.post-upgrade
index 29d0388ec6..478873583f 100644
--- a/main/knot/knot.post-upgrade
+++ b/main/knot/knot.post-upgrade
@@ -19,5 +19,13 @@ if [ "$(apk version -t "$ver_old" "3.0.0-r0")" = "<" ]; then
*
EOF
fi
+if [ "$(apk version -t "$ver_old" "3.1.4-r0")" = "<" ]; then
+ cat >&2 <<-EOF
+ *
+ * GeoIP module has been moved to a subpackage. If you use it, install it:
+ * apk add knot-mod-geoip.
+ *
+ EOF
+fi
exit 0