1 |
commit: 4682b8281173d153f8d7bddec72d49b45322f123 |
2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 23 15:47:40 2016 +0000 |
4 |
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 23 15:48:33 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4682b828 |
7 |
|
8 |
net-dns/opendnssec: added version 2.0.1 |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
net-dns/opendnssec/Manifest | 1 + |
13 |
.../files/opendnssec-drop-privileges-2.0.x.patch | 29 +++ |
14 |
.../files/opendnssec-fix-localstatedir-2.0.x.patch | 22 ++ |
15 |
.../files/opendnssec-fix-run-dir-2.0.x.patch | 24 +++ |
16 |
net-dns/opendnssec/opendnssec-2.0.1.ebuild | 240 +++++++++++++++++++++ |
17 |
5 files changed, 316 insertions(+) |
18 |
|
19 |
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest |
20 |
index 4f98250..156c921 100644 |
21 |
--- a/net-dns/opendnssec/Manifest |
22 |
+++ b/net-dns/opendnssec/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST opendnssec-1.3.18.tar.gz 1143889 SHA256 e61d23ae0cc57b6e09d408bade6872fe5241896c61a03e8bc5ceeb65df13a676 SHA512 5df39ba778c9b1245e88b81df7aa491bca0aad2943845284c4f8b4dd729fa69014d45f07bdf99a048ccf668a1c9675a8dd99efcec1abdbd4e06e9738fec6ab6d WHIRLPOOL 7213b8f2f86651114449bc4734452d6065960e26ee289051949ca27ae3b23280cea45ff707f71942eef91c9009200272c0985ef3d3de43c9343ad2e1e54303ce |
25 |
DIST opendnssec-1.4.10.tar.gz 1036069 SHA256 55b44c1da3a665eef0af1d1b3f4d1c57d20f50f77858b1dd3d03ca6ebc1df7cb SHA512 00ba6ceba595f9d4d7736af982b78779f204eb52fcf92222256792368328647ca1a4c84b4db64dcdd9a0119292f132a4efd15e60436c2a125bf6a8fb3f33540e WHIRLPOOL 2122feed10b83b38f8954ebaaf5d065bbf124d573c085559d0b3542dc8b58b8c55a489ceda9707836501a03efbe7a81bc7518e394c86ef1f682822943bbc0a82 |
26 |
DIST opendnssec-1.4.8.2.tar.gz 1043171 SHA256 7fd553ee39173e807477ed1daff6ee2f8b1c83875cd2e52a1df3315bf0015513 SHA512 7f2e10b425f60947aca40c61509b07ddc4363105cc882b518ffa816437299d6f881411cb38325f27b3a34c2005953988b39c945362866dd0f1f7c6ef973bfa06 WHIRLPOOL 38079a89d8e3d039aeab28c80b7fb1a9739014736d6076442c546fae1b13e1c89faa1858beb6f4d2f495d19a2a1187a7af10c55c0ed33563bc9b2d57945de807 |
27 |
+DIST opendnssec-2.0.1.tar.gz 1101523 SHA256 bf874bbb346699a5b539699f90a54e0c15fff0574df7a3c118abb30938b7b346 SHA512 aa12818f92688e087acaff8a6771d2a7da733e04d9e821967d313c7ff880a1056f470b11988eba1e7aad606418c3a4587f654163d74f68e3f61943c74d86d052 WHIRLPOOL 865fbd0d21cd015e87da5f26858e39a233464fb04e56a21683b4713d3836b925eea80973446571da78730ef765d5a1a3fc5f8ad192dd09fdf6eb7467ae417769 |
28 |
|
29 |
diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch |
30 |
new file mode 100644 |
31 |
index 0000000..f3adc48 |
32 |
--- /dev/null |
33 |
+++ b/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch |
34 |
@@ -0,0 +1,29 @@ |
35 |
+diff -ur opendnssec-2.0.1.orig/conf/conf.xml.in opendnssec-2.0.1/conf/conf.xml.in |
36 |
+--- opendnssec-2.0.1.orig/conf/conf.xml.in 2016-07-21 16:15:27.000000000 +0200 |
37 |
++++ opendnssec-2.0.1/conf/conf.xml.in 2016-08-23 15:21:09.633384446 +0200 |
38 |
+@@ -36,12 +36,10 @@ |
39 |
+ </Common> |
40 |
+ |
41 |
+ <Enforcer> |
42 |
+-<!-- |
43 |
+ <Privileges> |
44 |
+ <User>opendnssec</User> |
45 |
+ <Group>opendnssec</Group> |
46 |
+ </Privileges> |
47 |
+---> |
48 |
+ |
49 |
+ <Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore> |
50 |
+ <!--The enforcer interval parameter is no long used in 2.0 and will be deprecated in 2.1 --> |
51 |
+@@ -60,12 +58,10 @@ |
52 |
+ </Enforcer> |
53 |
+ |
54 |
+ <Signer> |
55 |
+-<!-- |
56 |
+ <Privileges> |
57 |
+ <User>opendnssec</User> |
58 |
+ <Group>opendnssec</Group> |
59 |
+ </Privileges> |
60 |
+---> |
61 |
+ |
62 |
+ <WorkingDirectory>@OPENDNSSEC_STATE_DIR@/signer</WorkingDirectory> |
63 |
+ <WorkerThreads>4</WorkerThreads> |
64 |
|
65 |
diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch |
66 |
new file mode 100644 |
67 |
index 0000000..5940c2f |
68 |
--- /dev/null |
69 |
+++ b/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch |
70 |
@@ -0,0 +1,22 @@ |
71 |
+diff -ur opendnssec-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am |
72 |
+--- opendnssec-2.0.1.orig/Makefile.am 2016-07-21 16:15:00.000000000 +0200 |
73 |
++++ opendnssec-2.0.1/Makefile.am 2016-08-23 14:01:50.618393034 +0200 |
74 |
+@@ -30,12 +30,12 @@ |
75 |
+ |
76 |
+ install-data-hook: |
77 |
+ $(INSTALL) -d $(DESTDIR)$(localstatedir) |
78 |
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec |
79 |
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signer |
80 |
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/enforcer |
81 |
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf |
82 |
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned |
83 |
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed |
84 |
++ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec |
85 |
++ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signer |
86 |
++ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/enforcer |
87 |
++ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf |
88 |
++ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned |
89 |
++ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed |
90 |
+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/run |
91 |
+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec |
92 |
+ |
93 |
|
94 |
diff --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch |
95 |
new file mode 100644 |
96 |
index 0000000..5ea9c80 |
97 |
--- /dev/null |
98 |
+++ b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch |
99 |
@@ -0,0 +1,24 @@ |
100 |
+diff -ur opendnssec-2.0.1.orig/m4/opendnssec_common.m4 opendnssec-2.0.1/m4/opendnssec_common.m4 |
101 |
+--- opendnssec-2.0.1.orig/m4/opendnssec_common.m4 2016-07-21 16:15:00.000000000 +0200 |
102 |
++++ opendnssec-2.0.1/m4/opendnssec_common.m4 2016-08-23 14:42:35.033460972 +0200 |
103 |
+@@ -17,7 +17,7 @@ |
104 |
+ OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec |
105 |
+ OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec |
106 |
+ OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec" |
107 |
+-OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec" |
108 |
++OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec" |
109 |
+ |
110 |
+ AC_SUBST([OPENDNSSEC_BIN_DIR]) |
111 |
+ AC_SUBST([OPENDNSSEC_SBIN_DIR]) |
112 |
+diff -ur opendnssec-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am |
113 |
+--- opendnssec-2.0.1.orig/Makefile.am 2016-08-23 14:40:10.009951791 +0200 |
114 |
++++ opendnssec-2.0.1/Makefile.am 2016-08-23 14:43:20.377870776 +0200 |
115 |
+@@ -36,8 +36,6 @@ |
116 |
+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf |
117 |
+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned |
118 |
+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed |
119 |
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run |
120 |
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec |
121 |
+ |
122 |
+ docs: |
123 |
+ (cd libhsm; $(MAKE) doxygen) |
124 |
|
125 |
diff --git a/net-dns/opendnssec/opendnssec-2.0.1.ebuild b/net-dns/opendnssec/opendnssec-2.0.1.ebuild |
126 |
new file mode 100644 |
127 |
index 0000000..f2caf66 |
128 |
--- /dev/null |
129 |
+++ b/net-dns/opendnssec/opendnssec-2.0.1.ebuild |
130 |
@@ -0,0 +1,240 @@ |
131 |
+# Copyright 1999-2016 Gentoo Foundation |
132 |
+# Distributed under the terms of the GNU General Public License v2 |
133 |
+# $Id$ |
134 |
+ |
135 |
+EAPI=5 |
136 |
+ |
137 |
+MY_P="${P/_}" |
138 |
+PKCS11_IUSE="+softhsm opensc external-hsm" |
139 |
+inherit autotools eutils multilib user |
140 |
+ |
141 |
+DESCRIPTION="An open-source turn-key solution for DNSSEC" |
142 |
+HOMEPAGE="http://www.opendnssec.org/" |
143 |
+SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz" |
144 |
+ |
145 |
+LICENSE="BSD GPL-2" |
146 |
+SLOT="0" |
147 |
+KEYWORDS="~amd64 ~x86" |
148 |
+IUSE="debug doc +mysql readline +signer sqlite test ${PKCS11_IUSE}" |
149 |
+ |
150 |
+RDEPEND=" |
151 |
+ dev-lang/perl |
152 |
+ dev-libs/libxml2 |
153 |
+ dev-libs/libxslt |
154 |
+ net-libs/ldns |
155 |
+ mysql? ( |
156 |
+ virtual/mysql |
157 |
+ dev-perl/DBD-mysql |
158 |
+ ) |
159 |
+ opensc? ( dev-libs/opensc ) |
160 |
+ readline? ( sys-libs/readline:0 ) |
161 |
+ softhsm? ( dev-libs/softhsm ) |
162 |
+ sqlite? ( |
163 |
+ dev-db/sqlite:3 |
164 |
+ dev-perl/DBD-SQLite |
165 |
+ ) |
166 |
+" |
167 |
+DEPEND="${RDEPEND} |
168 |
+ doc? ( app-doc/doxygen ) |
169 |
+ test? ( |
170 |
+ app-text/trang |
171 |
+ ) |
172 |
+" |
173 |
+ |
174 |
+REQUIRED_USE=" |
175 |
+ ^^ ( mysql sqlite ) |
176 |
+ ^^ ( softhsm opensc external-hsm ) |
177 |
+" |
178 |
+ |
179 |
+PATCHES=( |
180 |
+ "${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch" |
181 |
+ "${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch" |
182 |
+ "${FILESDIR}/${PN}-drop-privileges-2.0.x.patch" |
183 |
+ "${FILESDIR}/${PN}-use-system-trang.patch" |
184 |
+) |
185 |
+ |
186 |
+S="${WORKDIR}/${MY_P}" |
187 |
+ |
188 |
+DOCS=( MIGRATION NEWS ) |
189 |
+ |
190 |
+check_pkcs11_setup() { |
191 |
+ # PKCS#11 HSM's are often only available with proprietary drivers not |
192 |
+ # available in portage tree. |
193 |
+ |
194 |
+ if use softhsm; then |
195 |
+ PKCS11_LIB=softhsm |
196 |
+ if has_version ">=dev-libs/softhsm-1.3.1"; then |
197 |
+ PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so |
198 |
+ else |
199 |
+ PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so |
200 |
+ fi |
201 |
+ elog "Building with SoftHSM PKCS#11 library support." |
202 |
+ fi |
203 |
+ if use opensc; then |
204 |
+ PKCS11_LIB=opensc |
205 |
+ PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so |
206 |
+ elog "Building with OpenSC PKCS#11 library support." |
207 |
+ fi |
208 |
+ if use external-hsm; then |
209 |
+ if [[ -n ${PKCS11_SCA6000} ]]; then |
210 |
+ PKCS11_LIB=sca6000 |
211 |
+ PKCS11_PATH=${PKCS11_SCA6000} |
212 |
+ elif [[ -n ${PKCS11_ETOKEN} ]]; then |
213 |
+ PKCS11_LIB=etoken |
214 |
+ PKCS11_PATH=${PKCS11_ETOKEN} |
215 |
+ elif [[ -n ${PKCS11_NCIPHER} ]]; then |
216 |
+ PKCS11_LIB=ncipher |
217 |
+ PKCS11_PATH=${PKCS11_NCIPHER} |
218 |
+ elif [[ -n ${PKCS11_AEPKEYPER} ]]; then |
219 |
+ PKCS11_LIB=aepkeyper |
220 |
+ PKCS11_PATH=${PKCS11_AEPKEYPER} |
221 |
+ else |
222 |
+ ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11" |
223 |
+ ewarn "library. To set a path, set one of the following environment variables:" |
224 |
+ ewarn " for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>" |
225 |
+ ewarn " for Aladdin eToken, set: PKCS11_ETOKEN=<path>" |
226 |
+ ewarn " for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>" |
227 |
+ ewarn " for AEP Keyper, set: PKCS11_AEPKEYPER=<path>" |
228 |
+ ewarn "Example:" |
229 |
+ ewarn " PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec" |
230 |
+ ewarn "or store the variable into /etc/make.conf" |
231 |
+ die "USE flag 'external-hsm' set but no PKCS#11 library path specified." |
232 |
+ fi |
233 |
+ elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}" |
234 |
+ fi |
235 |
+} |
236 |
+ |
237 |
+pkg_pretend() { |
238 |
+ if has_version "<net-dns/opendnssec-1.4.10"; then |
239 |
+ ################################################################################ |
240 |
+ eerror "You are already using OpenDNSSEC." |
241 |
+ eerror "In order to migrate to version >=2.0.0 you need to upgrade to" |
242 |
+ eerror "version >=1.4.10 first:" |
243 |
+ eerror "" |
244 |
+ eerror " emerge \"<net-dns/opendnssec-2\"" |
245 |
+ eerror "" |
246 |
+ eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION" |
247 |
+ eerror "for details." |
248 |
+ eerror "" |
249 |
+ die "Please upgrade to version >=1.4.10 first for proper db migraion" |
250 |
+ fi |
251 |
+ |
252 |
+ check_pkcs11_setup |
253 |
+} |
254 |
+ |
255 |
+pkg_setup() { |
256 |
+ enewgroup opendnssec |
257 |
+ enewuser opendnssec -1 -1 -1 opendnssec |
258 |
+ |
259 |
+ # pretend does not preserve variables so we need to run this once more |
260 |
+ check_pkcs11_setup |
261 |
+} |
262 |
+ |
263 |
+src_prepare() { |
264 |
+ local patch |
265 |
+ default |
266 |
+ for patch in "${PATCHES[@]}"; do |
267 |
+ epatch "$patch" |
268 |
+ done |
269 |
+ eautoreconf |
270 |
+} |
271 |
+ |
272 |
+src_configure() { |
273 |
+ econf \ |
274 |
+ --without-cunit \ |
275 |
+ --localstatedir="${EPREFIX}/var" \ |
276 |
+ --disable-static \ |
277 |
+ --with-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \ |
278 |
+ --with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \ |
279 |
+ $(use_with readline) \ |
280 |
+ $(use_enable signer) |
281 |
+} |
282 |
+ |
283 |
+src_compile() { |
284 |
+ default |
285 |
+ use doc && emake docs |
286 |
+} |
287 |
+ |
288 |
+src_install() { |
289 |
+ default |
290 |
+ |
291 |
+ # remove useless .la files |
292 |
+ find "${ED}" -name '*.la' -delete |
293 |
+ |
294 |
+ # Remove subversion tags from config files to avoid useless config updates |
295 |
+ sed -i \ |
296 |
+ -e '/<!-- \$Id:/ d' \ |
297 |
+ "${ED}"/etc/opendnssec/* || die |
298 |
+ |
299 |
+ # install db update/migration stuff |
300 |
+ insinto /usr/share/opendnssec/db |
301 |
+ if use sqlite; then |
302 |
+ doins enforcer/utils/convert_mysql_to_sqlite |
303 |
+ fi |
304 |
+ if use mysql; then |
305 |
+ doins enforcer/utils/convert_sqlite_to_mysql |
306 |
+ fi |
307 |
+ |
308 |
+ insinto /usr/share/opendnssec/db/sql |
309 |
+ if use sqlite; then |
310 |
+ doins enforcer/src/db/schema.sqlite |
311 |
+ fi |
312 |
+ if use mysql; then |
313 |
+ doins enforcer/src/db/schema.mysql |
314 |
+ fi |
315 |
+ |
316 |
+ insinto /usr/share/opendnssec/db/1.4-2.0_db_convert |
317 |
+ doins enforcer/utils/1.4-2.0_db_convert/find_problematic_zones.sql |
318 |
+ doins enforcer/utils/1.4-2.0_db_convert/README.md |
319 |
+ if use sqlite; then |
320 |
+ doins enforcer/utils/1.4-2.0_db_convert/sqlite_convert.sql |
321 |
+ doins enforcer/utils/1.4-2.0_db_convert/convert_sqlite |
322 |
+ fi |
323 |
+ if use mysql; then |
324 |
+ doins enforcer/utils/1.4-2.0_db_convert/convert_mysql |
325 |
+ doins enforcer/utils/1.4-2.0_db_convert/mysql_convert.sql |
326 |
+ fi |
327 |
+ |
328 |
+ # patch scripts to find schema files |
329 |
+ sed -i \ |
330 |
+ -e 's,^SCHEMA=../src/db/,/usr/share/opendnssec/db/,' \ |
331 |
+ -e 's,^SCHEMA=../../src/db/,/usr/share/opendnssec/db/,' \ |
332 |
+ "${ED}"/usr/share/opendnssec/db/convert_* \ |
333 |
+ "${ED}"/usr/share/opendnssec/db/1.4-2.0_db_convert/convert_* |
334 |
+ |
335 |
+ # fix permissions |
336 |
+ fowners root:opendnssec /etc/opendnssec |
337 |
+ fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml |
338 |
+ fowners opendnssec:opendnssec /var/lib/opendnssec/{,enforcer,signconf,signed,signer,unsigned} |
339 |
+ |
340 |
+ # install conf/init script |
341 |
+ newinitd "${FILESDIR}"/opendnssec.initd opendnssec |
342 |
+ newconfd "${FILESDIR}"/opendnssec.confd opendnssec |
343 |
+} |
344 |
+ |
345 |
+pkg_postinst() { |
346 |
+ local v |
347 |
+ if use softhsm; then |
348 |
+ elog "Please make sure that you create your softhsm database in a location writeable" |
349 |
+ elog "by the opendnssec user. You can set its location in /etc/softhsm.conf." |
350 |
+ elog "Suggested configuration is:" |
351 |
+ elog " echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf" |
352 |
+ elog " softhsm --init-token --slot 0 --label OpenDNSSEC" |
353 |
+ elog " chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db" |
354 |
+ fi |
355 |
+ for v in $REPLACING_VERSIONS; do |
356 |
+ case $v in |
357 |
+ 1.4.*) |
358 |
+ ewarn "" |
359 |
+ ewarn "You are upgrading from version 1.4." |
360 |
+ ewarn "" |
361 |
+ ewarn "A migration is needed from 1.4 to 2.0." |
362 |
+ ewarn "For details see /usr/share/doc/${P}/MIGRATION*" |
363 |
+ ewarn "" |
364 |
+ ewarn "For your convenience the mentioned migration scripts and README" |
365 |
+ ewarn "have been installed to /usr/share/${PN}/db/1.4-2.0_db_convert" |
366 |
+ ewarn "" |
367 |
+ ;; |
368 |
+ esac |
369 |
+ done |
370 |
+} |