aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortcely <tcely@users.noreply.github.com>2019-01-12 09:05:01 -0500
committerLeonardo Arena <rnalrd@alpinelinux.org>2019-02-08 09:43:13 +0000
commit68d8ee10fde23bdcc9118ecbb2b970fab1dfcdc9 (patch)
treeb41c932378868f2561271f4e6188c67df0a16d6d
parentc6ef04727ccd0f79244e2dddcffe8b47db8a3d35 (diff)
downloadaports-68d8ee10fde23bdcc9118ecbb2b970fab1dfcdc9.tar.bz2
aports-68d8ee10fde23bdcc9118ecbb2b970fab1dfcdc9.tar.xz
testing/knot-resolver: use dnssec-root instead of root.keys
We use a copy so that knot-resolver may write new keys itself.
-rw-r--r--testing/knot-resolver/APKBUILD10
-rw-r--r--testing/knot-resolver/root.keys2
2 files changed, 4 insertions, 8 deletions
diff --git a/testing/knot-resolver/APKBUILD b/testing/knot-resolver/APKBUILD
index f2a34fb0bb..65adb20d2f 100644
--- a/testing/knot-resolver/APKBUILD
+++ b/testing/knot-resolver/APKBUILD
@@ -15,7 +15,7 @@ depends_dnstap=""
depends_dnstap_dev="fstrm-dev protobuf-c-dev"
depends_http="$pkgname lua5.1-http"
depends_dev="knot-dev libedit-dev libuv-dev luajit-dev $depends_dnstap_dev"
-makedepends="$depends_dev bash vim"
+makedepends="$depends_dev bash dnssec-root vim"
checkdepends="cmocka-dev"
install="$pkgname.pre-install"
subpackages="$pkgname-mod-http:http:noarch $pkgname-mod-dnstap:dnstap $pkgname-dev $pkgname-doc $pkgname-openrc"
@@ -23,8 +23,7 @@ source="https://secure.nic.cz/files/$pkgname/$pkgname-$pkgver.tar.xz
$pkgname.initd
$pkgname.confd
$pkgname.logrotate
- config
- root.keys"
+ config"
# secfixes:
# 2.3.0-r0:
@@ -58,7 +57,7 @@ package() {
./etc/$pkgname/config
install -m 755 -o kresd -g kresd -d ./var/lib/$pkgname
- install -m 644 -o kresd -D "$srcdir"/root.keys \
+ install -m 644 -o kresd -D /usr/share/dnssec-root/trusted-key.key \
./var/lib/$pkgname/root.keys
install -m 755 -D "$srcdir"/$pkgname.initd ./etc/init.d/$pkgname
@@ -89,5 +88,4 @@ sha512sums="e80163a1790c5855921ae1536950b77fb74b73b75234920e49ffb956f799820b53cc
0e9b947ed0fe39a600ba8fe3cdeacf07521cdd6c371007dd15524f67c75ea024994a8c11820d70c57ef180c90f492eae69ef167152ad84c24a47c885710a7974 knot-resolver.initd
9d0d629405df243dc0f782abd6fcaaaf13fbce78d881f7ce213cfd2a55cfbfd87af2ba976061bf7b5d3d055edec98b42632395390f2a469648c27f96124997a6 knot-resolver.confd
688aeacb0c1f21c7e532533b402e67068897217713fb668636df7533000b493981ddfa0497f8dba7da7c804ee4ab8d587a4f52155b4e2bf1f4025d2588d314bb knot-resolver.logrotate
-913a557dde84e9dac7c7300ab093285865fa57f3875fc357e680f04a0e85af6610a0e33da6262431cbb06a2c5a115952e742e48c8568d4eb82182906170b4a73 config
-5c816e2f04ee81cec294660130efe90adefdacad453cd7c05df7e0455fdb6fa52efa7ada3e3bf8690d65d8be3dcdeeedbabcedce2d9539ab000b7c72c4f0b9ec root.keys"
+913a557dde84e9dac7c7300ab093285865fa57f3875fc357e680f04a0e85af6610a0e33da6262431cbb06a2c5a115952e742e48c8568d4eb82182906170b4a73 config"
diff --git a/testing/knot-resolver/root.keys b/testing/knot-resolver/root.keys
deleted file mode 100644
index 51c8a76a25..0000000000
--- a/testing/knot-resolver/root.keys
+++ /dev/null
@@ -1,2 +0,0 @@
-. 172800 DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ; Valid: ; KeyTag:19036
-. 172800 DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ; Valid: ; KeyTag:20326