~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

[alpine-aports] [PATCH 1/2] main/unbound: supply custom config instead of patching the example one

Details
Message ID
<1449866382-17499-1-git-send-email-soeren+git@soeren-tempel.net>
Sender timestamp
1449866381
DKIM signature
missing
Download raw message
Patch: +27 -49
Install the example configuration to /usr/share/doc/unbound/examples
instead. This is a) easier and b) more fool prove.
---
 main/unbound/APKBUILD      | 31 +++++++++++++++++++++----------
 main/unbound/conf.patch    | 39 ---------------------------------------
 main/unbound/configuration |  6 ++++++
 3 files changed, 27 insertions(+), 49 deletions(-)
 delete mode 100644 main/unbound/conf.patch
 create mode 100644 main/unbound/configuration

diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD
index 7a52cff..cfae4e7 100644
--- a/main/unbound/APKBUILD
+++ b/main/unbound/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=unbound
pkgver=1.5.6
pkgrel=4
pkgrel=5
pkgdesc="Unbound is a validating, recursive, and caching DNS resolver"
pkgusers="unbound"
pkggroups="unbound"
@@ -16,8 +16,8 @@ makedepends="$depends_dev python-dev swig linux-headers"
install="$pkgname.pre-install"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-dbg py-unbound:py $pkgname-migrate"
source="http://unbound.net/downloads/unbound-$pkgver.tar.gz
	conf.patch
	swig.patch
	configuration
	update-unbound-root-hints
	migrate-dnscache-to-unbound
	root.hints
@@ -46,7 +46,6 @@ build() {
		--with-libevent \
		--with-ldns \
		--with-pthreads \
		--with-rootkey-file=/usr/share/dnssec-root/trusted-key.key \
		--disable-static \
		--disable-rpath \
		--with-ssl \
@@ -63,16 +62,28 @@ build() {
package() {
	cd "$_builddir"
	make DESTDIR="$pkgdir" install || return 1

	install -D contrib/update-anchor.sh \
		"$pkgdir"/usr/share/$pkgname/update-anchor.sh \
		|| return 1
        install -m755 -D "$srcdir"/unbound.initd \
                "$pkgdir"/etc/init.d/unbound || return 1
	install -d -o unbound -g unbound "$pkgdir"/var/run/unbound || return 1
	install -m644 "$srcdir"/root.hints "$pkgdir"/etc/unbound/ || return 1
	install -Dm755 "$srcdir"/update-unbound-root-hints \
		"$pkgdir"/etc/periodic/monthly/update-unbound-root-hints \
		|| return 1

        install -m755 -D "$srcdir"/unbound.initd "$pkgdir"/etc/init.d/unbound || return 1
	install -d -o unbound -g unbound "$pkgdir"/var/run/unbound || return 1
	install -m644 "$srcdir"/root.hints "$pkgdir"/etc/unbound/ || return 1

	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/examples
	mv "$pkgdir"/etc/unbound/unbound.conf \
		"$pkgdir"/usr/share/doc/$pkgname/examples || return 1
	install -m644 "$srcdir"/configuration \
		"$pkgdir"/etc/unbound/unbound.conf || return 1

	for name in CREDITS Changelog FEATURES README TODO; do
		install -m644 "$_builddir"/doc/$name \
			"$pkgdir"/usr/share/doc/$pkgname/$name || return 1
	done
}

libs() {
@@ -96,22 +107,22 @@ migrate() {
}

md5sums="691a34abd8e9257dd65b70f28326c1f0  unbound-1.5.6.tar.gz
ac71ed8daf79787a0689ae3971bf4350  conf.patch
deb0a18f2250caa53750ee2cecac71e9  swig.patch
762d718e87d79408bc2092ee9b33ecfc  configuration
c1c71cd0e7f9630536a2abf2513c675d  update-unbound-root-hints
5340681e5ec1a1fd47a0de27f5c03c21  migrate-dnscache-to-unbound
b2afc34d106e104730b63876c9a07caf  root.hints
b98eded68339fc605ec7e6cbb50e5aa3  unbound.initd"
sha256sums="ad3823f5895f59da9e408ea273fcf81d8a76914c18864fba256d7f140b83e404  unbound-1.5.6.tar.gz
127f4b97a4200d47265cad6970ba17784e57883c7cb0f7104cfbc7979bd9efc3  conf.patch
d131e19129744f7014167d8701cb39c8358269a89b317b8a74dacfd267e1f516  swig.patch
d019accbbd5213470446217c2ed4cd064b892e67b8c0f189add16f97116af6ef  configuration
0db3ca197b62901fab984cb2559925adbf3307ccd1dca3e1dd69cd1642ff0a36  update-unbound-root-hints
582851b4017044d8642c42c5df09b27494c963e1eebb8be3373b2dbd168d0ac0  migrate-dnscache-to-unbound
9de827bda7ddb3b8d3fac2db56c0fe65a67772a12a874c75091ae8e3f2b31c73  root.hints
d9997000449179dc16f5084bf061453faf09094f843acb1d163757f8000c0cd7  unbound.initd"
sha512sums="2477e3f00b8f5a3a4661ff20b0bc0d1d56c8a65cc6ab9f1308ae86f41c67a998af68d3ac5ba6c9c22a25a251f0410eaf9fee82911bcb3a3e82ffb6383e28dcf7  unbound-1.5.6.tar.gz
a63b849b7bcd923e5ae648ea2a805beed2529afcb8363dd8ee968b964b8bf731f5d2579bc6126619cb1865a498c39e1e0dd7a0f93fecc27569aa5425d6af9ca9  conf.patch
7d2666363be7156b26fd857459492f6e78fbc24bd6923dd51477e09df938d8c617035e4aa8bf91ffcde384e2dff8225eced14d7aaa7690e3a95b34c5f21eaf7d  swig.patch
380800857213e812e3f29560c324afe3108943fa7b4cd7f83865d2583ee4ca5f55904b432c1528d6c5e1fd50538c0cd6f7f02e85d07f8daa47164c0a79bb3e5c  configuration
0f80b507a8f71b0c00729501d861657ce91a57024cd1963c150d0630c71eccceba370d6e732ff39bb807713672550d87a8c8ecdb9fce6b8b4386c12689603700  update-unbound-root-hints
b26a13c1c88da9611a65705dc59f7233c5e0f6aced0d7d66c18536a969a2de627ca5d4bb55eedd81f2f040fa11bde48eaaeca2850f376e72e7a531678a259131  migrate-dnscache-to-unbound
e4a5ac121dd2ef989cf2daed1f8735c215419503e35a322cc3195ee8bbc0810bfb2867d82444263afe378b589ba8b145e3e495aa6ab5c6a0ec91811b1a736efc  root.hints
diff --git a/main/unbound/conf.patch b/main/unbound/conf.patch
deleted file mode 100644
index dcac701..0000000
--- a/main/unbound/conf.patch
@@ -1,39 +0,0 @@
diff -upr unbound-1.5.6.orig/doc/example.conf.in unbound-1.5.6/doc/example.conf.in
--- unbound-1.5.6.orig/doc/example.conf.in	2015-11-16 14:42:32.068772139 +0100
+++ unbound-1.5.6/doc/example.conf.in	2015-11-16 14:42:55.639731588 +0100
@@ -212,7 +212,7 @@ server:
 	# How to do this is specific to your OS.
 	#
 	# If you give "" no chroot is performed. The path must not end in a /.
-	# chroot: "@UNBOUND_CHROOT_DIR@"
+	chroot: ""
 
 	# if given, user privileges are dropped (after binding port),
 	# and the given username is assumed. Default is user "unbound".
@@ -243,7 +243,7 @@ server:
 
 	# file to read root hints from.
 	# get one from ftp://FTP.INTERNIC.NET/domain/named.cache
-	# root-hints: ""
+	root-hints: /etc/unbound/root.hints
 
 	# enable to not answer id.server and hostname.bind queries.
 	# hide-identity: no
@@ -361,7 +361,7 @@ server:
 	# you start unbound (i.e. in the system boot scripts).  And enable:
 	# Please note usage of unbound-anchor root anchor is at your own risk
 	# and under the terms of our LICENSE (see that file in the source).
-	# auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@"
+	# auto-trust-anchor-file: ""
 
 	# File with DLV trusted keys. Same format as trust-anchor-file.
 	# There can be only one DLV configured, it is trusted from root down.
@@ -372,7 +372,7 @@ server:
 	# with several entries, one file per entry.
 	# Zone file format, with DS and DNSKEY entries.
 	# Note this gets out of date, use auto-trust-anchor-file please.
-	# trust-anchor-file: ""
+	trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@"
 	
 	# Trusted key for validation. DS or DNSKEY. specify the RR on a
 	# single line, surrounded by "". TTL is ignored. class is IN default.
diff --git a/main/unbound/configuration b/main/unbound/configuration
new file mode 100644
index 0000000..68bb842
--- /dev/null
+++ b/main/unbound/configuration
@@ -0,0 +1,6 @@
server:
  chroot: ""
  use-syslog: yes
  username: "unbound"
  root-hints: "/etc/unbound/root.hints"
  trust-anchor-file: "/usr/share/dnssec-root/trusted-key.key"
-- 
2.6.4



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 2/2] main/unbound: upgrade to 1.5.7

Details
Message ID
<1449866382-17499-2-git-send-email-soeren+git@soeren-tempel.net>
In-Reply-To
<1449866382-17499-1-git-send-email-soeren+git@soeren-tempel.net> (view parent)
Sender timestamp
1449866382
DKIM signature
missing
Download raw message
Patch: +5 -5
---
 main/unbound/APKBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD
index cfae4e7..8053de8 100644
--- a/main/unbound/APKBUILD
+++ b/main/unbound/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=unbound
pkgver=1.5.6
pkgrel=5
pkgver=1.5.7
pkgrel=0
pkgdesc="Unbound is a validating, recursive, and caching DNS resolver"
pkgusers="unbound"
pkggroups="unbound"
@@ -106,21 +106,21 @@ migrate() {
		"$subpkgdir"/usr/bin/
}

md5sums="691a34abd8e9257dd65b70f28326c1f0  unbound-1.5.6.tar.gz
md5sums="a1253cbbb339dbca03404dcc58365d71  unbound-1.5.7.tar.gz
deb0a18f2250caa53750ee2cecac71e9  swig.patch
762d718e87d79408bc2092ee9b33ecfc  configuration
c1c71cd0e7f9630536a2abf2513c675d  update-unbound-root-hints
5340681e5ec1a1fd47a0de27f5c03c21  migrate-dnscache-to-unbound
b2afc34d106e104730b63876c9a07caf  root.hints
b98eded68339fc605ec7e6cbb50e5aa3  unbound.initd"
sha256sums="ad3823f5895f59da9e408ea273fcf81d8a76914c18864fba256d7f140b83e404  unbound-1.5.6.tar.gz
sha256sums="4b2088e5aa81a2d48f6337c30c1cf7e99b2e2dc4f92e463b3bee626eee731ca8  unbound-1.5.7.tar.gz
d131e19129744f7014167d8701cb39c8358269a89b317b8a74dacfd267e1f516  swig.patch
d019accbbd5213470446217c2ed4cd064b892e67b8c0f189add16f97116af6ef  configuration
0db3ca197b62901fab984cb2559925adbf3307ccd1dca3e1dd69cd1642ff0a36  update-unbound-root-hints
582851b4017044d8642c42c5df09b27494c963e1eebb8be3373b2dbd168d0ac0  migrate-dnscache-to-unbound
9de827bda7ddb3b8d3fac2db56c0fe65a67772a12a874c75091ae8e3f2b31c73  root.hints
d9997000449179dc16f5084bf061453faf09094f843acb1d163757f8000c0cd7  unbound.initd"
sha512sums="2477e3f00b8f5a3a4661ff20b0bc0d1d56c8a65cc6ab9f1308ae86f41c67a998af68d3ac5ba6c9c22a25a251f0410eaf9fee82911bcb3a3e82ffb6383e28dcf7  unbound-1.5.6.tar.gz
sha512sums="7fc000364139519ed837ef9883f2e8a684b5ac19f2d3343626ab0a4c3459a7c3ccf2c79e9d992d82b123c6a38245fc286994365b427145d218e0b3c645c4dc4f  unbound-1.5.7.tar.gz
7d2666363be7156b26fd857459492f6e78fbc24bd6923dd51477e09df938d8c617035e4aa8bf91ffcde384e2dff8225eced14d7aaa7690e3a95b34c5f21eaf7d  swig.patch
380800857213e812e3f29560c324afe3108943fa7b4cd7f83865d2583ee4ca5f55904b432c1528d6c5e1fd50538c0cd6f7f02e85d07f8daa47164c0a79bb3e5c  configuration
0f80b507a8f71b0c00729501d861657ce91a57024cd1963c150d0630c71eccceba370d6e732ff39bb807713672550d87a8c8ecdb9fce6b8b4386c12689603700  update-unbound-root-hints
-- 
2.6.4



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)