1 |
commit: 0bb9c7c0bb2cc6374ec42b46253b76029f7e3077 |
2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 5 03:12:07 2016 +0000 |
4 |
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 5 03:12:21 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb9c7c0 |
7 |
|
8 |
net-dns/unbound: version bump, also fix #563568 |
9 |
|
10 |
Thanks to Christian Apeltauer for the libressl patch |
11 |
|
12 |
Package-Manager: portage-2.2.26 |
13 |
|
14 |
net-dns/unbound/Manifest | 1 + |
15 |
.../files/unbound-1.5.7-trust-anchor-file.patch | 12 ++ |
16 |
net-dns/unbound/unbound-1.5.7.ebuild | 125 +++++++++++++++++++++ |
17 |
3 files changed, 138 insertions(+) |
18 |
|
19 |
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest |
20 |
index 5d72036..df4c6d0 100644 |
21 |
--- a/net-dns/unbound/Manifest |
22 |
+++ b/net-dns/unbound/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST unbound-1.4.22.tar.gz 4735801 SHA256 1caf5081b2190ecdb23fc4d998b7999e28640c941f53baff7aee03c092a7d29f SHA512 0593cad3966f24f76b93bbc9c906c096c645e9360a57034c5ed4f04baeaa021eb9169a8e9cd0a98651c7a564d9feda8b9490e3b87ad469f6ce1dd1fcb05d9974 WHIRLPOOL 4de27d6c4548c46c83b95a7f21efd8d75898ddb92e3af84fbd1d07a39e29a121e593ddbf13676f914d4ee428942bf345c9b93937165725ece5031fc67ab9eacc |
25 |
DIST unbound-1.5.1.tar.gz 4805176 SHA256 0ff82709fb2bd7ecbde8dbdcf60fa417d2b43379570a3d460193a76a169900ec SHA512 85d7069cf47709aceb7d9457c8befb1b327adfb098d8aa98082fc9bf710274e8ba86b56d796c86917639bb7e57ab5c40af1bc79090de038c6375be2c3877e0c4 WHIRLPOOL e23f7d399a1f01da5aec98ff0fa3b377e8a76789d237ceaf0e9146c96a97088716a0ec6c0f68f95f57af16743e73c1bc7209889a04a698bf7aa5d0706c7514f5 |
26 |
DIST unbound-1.5.6.tar.gz 4849569 SHA256 ad3823f5895f59da9e408ea273fcf81d8a76914c18864fba256d7f140b83e404 SHA512 2477e3f00b8f5a3a4661ff20b0bc0d1d56c8a65cc6ab9f1308ae86f41c67a998af68d3ac5ba6c9c22a25a251f0410eaf9fee82911bcb3a3e82ffb6383e28dcf7 WHIRLPOOL 72fd050bd49422783014549b4764f6279be7d4deec50ccf2a97e6cc2592f79d69a3f823ed0849dc3f685908c60234386820e01bde43d5db4c6c616e5e2dee44b |
27 |
+DIST unbound-1.5.7.tar.gz 4859573 SHA256 4b2088e5aa81a2d48f6337c30c1cf7e99b2e2dc4f92e463b3bee626eee731ca8 SHA512 7fc000364139519ed837ef9883f2e8a684b5ac19f2d3343626ab0a4c3459a7c3ccf2c79e9d992d82b123c6a38245fc286994365b427145d218e0b3c645c4dc4f WHIRLPOOL 9b2d18f09f46bed5da9818f5df0acbcc6d4a166943bbdb617494081614aa9b75a03ed0425679f40265f70e34ed66e01302182ec4050f0bb1f034fa5db28340f3 |
28 |
|
29 |
diff --git a/net-dns/unbound/files/unbound-1.5.7-trust-anchor-file.patch b/net-dns/unbound/files/unbound-1.5.7-trust-anchor-file.patch |
30 |
new file mode 100644 |
31 |
index 0000000..c4c0ffa |
32 |
--- /dev/null |
33 |
+++ b/net-dns/unbound/files/unbound-1.5.7-trust-anchor-file.patch |
34 |
@@ -0,0 +1,12 @@ |
35 |
+diff -ur unbound-1.5.7.orig/doc/example.conf.in unbound-1.5.7/doc/example.conf.in |
36 |
+--- unbound-1.5.7.orig/doc/example.conf.in 2015-12-10 08:59:18.000000000 +0100 |
37 |
++++ unbound-1.5.7/doc/example.conf.in 2016-01-05 04:08:01.666760015 +0100 |
38 |
+@@ -378,7 +378,7 @@ |
39 |
+ # with several entries, one file per entry. |
40 |
+ # Zone file format, with DS and DNSKEY entries. |
41 |
+ # Note this gets out of date, use auto-trust-anchor-file please. |
42 |
+- # trust-anchor-file: "" |
43 |
++ # trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@" |
44 |
+ |
45 |
+ # Trusted key for validation. DS or DNSKEY. specify the RR on a |
46 |
+ # single line, surrounded by "". TTL is ignored. class is IN default. |
47 |
|
48 |
diff --git a/net-dns/unbound/unbound-1.5.7.ebuild b/net-dns/unbound/unbound-1.5.7.ebuild |
49 |
new file mode 100644 |
50 |
index 0000000..c2874dc |
51 |
--- /dev/null |
52 |
+++ b/net-dns/unbound/unbound-1.5.7.ebuild |
53 |
@@ -0,0 +1,125 @@ |
54 |
+# Copyright 1999-2016 Gentoo Foundation |
55 |
+# Distributed under the terms of the GNU General Public License v2 |
56 |
+# $Id$ |
57 |
+ |
58 |
+EAPI=5 |
59 |
+PYTHON_COMPAT=( python2_7 ) |
60 |
+ |
61 |
+inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user |
62 |
+ |
63 |
+MY_P=${PN}-${PV/_/} |
64 |
+DESCRIPTION="A validating, recursive and caching DNS resolver" |
65 |
+HOMEPAGE="http://unbound.net/" |
66 |
+SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz" |
67 |
+ |
68 |
+LICENSE="BSD GPL-2" |
69 |
+SLOT="0" |
70 |
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86" |
71 |
+IUSE="debug dnstap +ecdsa gost libressl python selinux static-libs test threads" |
72 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
73 |
+ |
74 |
+# Note: expat is needed by executable only but the Makefile is custom |
75 |
+# and doesn't make it possible to easily install the library without |
76 |
+# the executables. MULTILIB_USEDEP may be dropped once build system |
77 |
+# is fixed. |
78 |
+ |
79 |
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] |
80 |
+ >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] |
81 |
+ libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] ) |
82 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) |
83 |
+ dnstap? ( |
84 |
+ dev-libs/fstrm[${MULTILIB_USEDEP}] |
85 |
+ >=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}] |
86 |
+ ) |
87 |
+ ecdsa? ( |
88 |
+ !libressl? ( dev-libs/openssl:0[-bindist] ) |
89 |
+ ) |
90 |
+ python? ( ${PYTHON_DEPS} )" |
91 |
+ |
92 |
+DEPEND="${CDEPEND} |
93 |
+ python? ( dev-lang/swig ) |
94 |
+ test? ( |
95 |
+ net-dns/ldns-utils[examples] |
96 |
+ dev-util/splint |
97 |
+ app-text/wdiff |
98 |
+ )" |
99 |
+ |
100 |
+RDEPEND="${CDEPEND} |
101 |
+ selinux? ( sec-policy/selinux-bind )" |
102 |
+ |
103 |
+# bug #347415 |
104 |
+RDEPEND="${RDEPEND} |
105 |
+ net-dns/dnssec-root" |
106 |
+ |
107 |
+S=${WORKDIR}/${MY_P} |
108 |
+ |
109 |
+pkg_setup() { |
110 |
+ enewgroup unbound |
111 |
+ enewuser unbound -1 -1 /etc/unbound unbound |
112 |
+ |
113 |
+ use python && python-single-r1_pkg_setup |
114 |
+} |
115 |
+ |
116 |
+src_prepare() { |
117 |
+ # To avoid below error messages, set 'trust-anchor-file' to same value in |
118 |
+ # 'auto-trust-anchor-file'. |
119 |
+ # [23109:0] error: Could not open autotrust file for writing, |
120 |
+ # /etc/dnssec/root-anchors.txt: Permission denied |
121 |
+ epatch "${FILESDIR}"/${P}-trust-anchor-file.patch |
122 |
+ |
123 |
+ # required for the python part |
124 |
+ multilib_copy_sources |
125 |
+} |
126 |
+ |
127 |
+src_configure() { |
128 |
+ [[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack |
129 |
+ multilib-minimal_src_configure |
130 |
+} |
131 |
+ |
132 |
+multilib_src_configure() { |
133 |
+ econf \ |
134 |
+ $(use_enable debug) \ |
135 |
+ $(use_enable gost) \ |
136 |
+ $(use_enable dnstap) \ |
137 |
+ $(use_enable ecdsa) \ |
138 |
+ $(use_enable static-libs static) \ |
139 |
+ $(multilib_native_use_with python pythonmodule) \ |
140 |
+ $(multilib_native_use_with python pyunbound) \ |
141 |
+ $(use_with threads pthreads) \ |
142 |
+ --disable-flto \ |
143 |
+ --disable-rpath \ |
144 |
+ --with-libevent="${EPREFIX}"/usr \ |
145 |
+ --with-pidfile="${EPREFIX}"/var/run/unbound.pid \ |
146 |
+ --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \ |
147 |
+ --with-ssl="${EPREFIX}"/usr \ |
148 |
+ --with-libexpat="${EPREFIX}"/usr |
149 |
+ |
150 |
+ # http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html |
151 |
+ # $(use_enable debug lock-checks) \ |
152 |
+ # $(use_enable debug alloc-checks) \ |
153 |
+ # $(use_enable debug alloc-lite) \ |
154 |
+ # $(use_enable debug alloc-nonregional) \ |
155 |
+} |
156 |
+ |
157 |
+multilib_src_install_all() { |
158 |
+ prune_libtool_files --modules |
159 |
+ use python && python_optimize |
160 |
+ |
161 |
+ newinitd "${FILESDIR}"/unbound.initd unbound |
162 |
+ newconfd "${FILESDIR}"/unbound.confd unbound |
163 |
+ |
164 |
+ systemd_dounit "${FILESDIR}"/unbound.service |
165 |
+ systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service" |
166 |
+ systemd_dounit "${FILESDIR}"/unbound-anchor.service |
167 |
+ |
168 |
+ dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES} |
169 |
+ |
170 |
+ # bug #315519 |
171 |
+ dodoc contrib/unbound_munin_ |
172 |
+ |
173 |
+ docinto selinux |
174 |
+ dodoc contrib/selinux/* |
175 |
+ |
176 |
+ exeinto /usr/share/${PN} |
177 |
+ doexe contrib/update-anchor.sh |
178 |
+} |