Mail archive
alpine-aports

[alpine-aports] [PATCH 3/5] main/unbound: simplify cron

From: Sören Tempel <soeren+git_at_soeren-tempel.net>
Date: Sun, 25 Oct 2015 13:58:04 +0100

No need to fetch the root.hints file twice since the ftp servers should
never distribute invalid root hints. Also make the ftp host and
destination path configurable using an environment variable.
---
 main/unbound/APKBUILD                  |  8 ++++----
 main/unbound/update-unbound-root-hints | 31 ++++---------------------------
 2 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD
index 3823827..7734f3a 100644
--- a/main/unbound/APKBUILD
+++ b/main/unbound/APKBUILD
_at_@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa_at_alpinelinux.org>
 pkgname=unbound
 pkgver=1.5.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver"
 pkgusers="unbound"
 pkggroups="unbound"
_at_@ -93,18 +93,18 @@ migrate() {
 md5sums="691a34abd8e9257dd65b70f28326c1f0  unbound-1.5.6.tar.gz
 32fe2914a2723142d3eae9ea556872d3  conf.patch
 deb0a18f2250caa53750ee2cecac71e9  swig.patch
-c1c71cd0e7f9630536a2abf2513c675d  update-unbound-root-hints
+26461c76ac3295772087e7ad4469dc89  update-unbound-root-hints
 5340681e5ec1a1fd47a0de27f5c03c21  migrate-dnscache-to-unbound
 b98eded68339fc605ec7e6cbb50e5aa3  unbound.initd"
 sha256sums="ad3823f5895f59da9e408ea273fcf81d8a76914c18864fba256d7f140b83e404  unbound-1.5.6.tar.gz
 48bedb743eda892f82adc8b4ce2e4f5ad216f1ab50d432aef768377edc98165c  conf.patch
 d131e19129744f7014167d8701cb39c8358269a89b317b8a74dacfd267e1f516  swig.patch
-0db3ca197b62901fab984cb2559925adbf3307ccd1dca3e1dd69cd1642ff0a36  update-unbound-root-hints
+b3616d7e7e022ff8a5e012b3b2ade2266515083e17569a1937a0bde81b75c006  update-unbound-root-hints
 582851b4017044d8642c42c5df09b27494c963e1eebb8be3373b2dbd168d0ac0  migrate-dnscache-to-unbound
 d9997000449179dc16f5084bf061453faf09094f843acb1d163757f8000c0cd7  unbound.initd"
 sha512sums="2477e3f00b8f5a3a4661ff20b0bc0d1d56c8a65cc6ab9f1308ae86f41c67a998af68d3ac5ba6c9c22a25a251f0410eaf9fee82911bcb3a3e82ffb6383e28dcf7  unbound-1.5.6.tar.gz
 2214882954ed813c564a34cbf433240814f1cc03e62b7aa007d054406d17fa0359514400afe53b9cb0445d25a29ccf9bf27c5974901d30bbfb2bfaf5e755da2b  conf.patch
 7d2666363be7156b26fd857459492f6e78fbc24bd6923dd51477e09df938d8c617035e4aa8bf91ffcde384e2dff8225eced14d7aaa7690e3a95b34c5f21eaf7d  swig.patch
-0f80b507a8f71b0c00729501d861657ce91a57024cd1963c150d0630c71eccceba370d6e732ff39bb807713672550d87a8c8ecdb9fce6b8b4386c12689603700  update-unbound-root-hints
+ac0f8799026e5024ef5071657ef704bd64922454a9fabe37da524faaea50fe8aa3ff3acfa892d32674bedd97e53c88a483acc5c8dfffd526819015825a635924  update-unbound-root-hints
 b26a13c1c88da9611a65705dc59f7233c5e0f6aced0d7d66c18536a969a2de627ca5d4bb55eedd81f2f040fa11bde48eaaeca2850f376e72e7a531678a259131  migrate-dnscache-to-unbound
 540e7a11fa5421e2d103c42d69faf1ba005adcadfac2f65091795a2f00e5b5acd1436b4d2adfe2bb0fdfcbfb44d0967d6bce87620c618549fcd7e32019040f29  unbound.initd"
diff --git a/main/unbound/update-unbound-root-hints b/main/unbound/update-unbound-root-hints
index ee127de..238afc1 100644
--- a/main/unbound/update-unbound-root-hints
+++ b/main/unbound/update-unbound-root-hints
_at_@ -1,30 +1,7 @@
 #!/bin/sh
 
-check_format() {
-	# check that we have some ipv4 addresses and some '.' hints
-	egrep -q '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]' "$1" \
-		&& egrep -q '^\.[[:space:]]+' "$1"
-}
+: ${UNBOUND_ROOTHINTS:="ftp.internic.net/domain/named.cache"}
+: ${UNBOUND_HINTSDEST:="/etc/unbound/root.hints"}
 
-ftphosts="FTP.INTERNIC.NET RS.INTERNIC.NET"
-roothints=domain/named.cache
-unbound_dir=/etc/unbound
-outfile=$unbound_dir/root.hints
-
-if [ "$1" = "--verify" ]; then
-	if check_format $outfile; then
-		echo "$outfile: ok"
-		exit 0
-	else
-		echo "$outfile: failed"
-		exit 1
-	fi
-fi
-
-for host in $ftphosts; do
-	url=ftp://$host/$roothints
-	if wget -q -O ${outfile}.new $url && check_format ${outfile}.new; then
-		mv ${outfile}.new $outfile && exit 0
-	fi
-done
-exit 1
+wget -q -O "${UNBOUND_HINTSDEST}" "${UNBOUND_ROOTHINTS}"
+exit 0
-- 
2.6.1
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Sun Oct 25 2015 - 13:58:04 GMT