public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/scarabeus:master commit in: net-dns/opendnssec/files/, net-dns/opendnssec/
@ 2011-06-02 12:20 Tomas Chvatal
  0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal @ 2011-06-02 12:20 UTC (permalink / raw
  To: gentoo-commits

commit:     4199cbdb9158fa424e28e2eb16be2d37459d5c90
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 12:20:00 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 12:20:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=4199cbdb

[net-dns/opendnssec] Bump to 1.3.0_rc2. Manage crypto implementations. Add initscript and so on.

---
 net-dns/opendnssec/Manifest                        |   11 +-
 .../files/opendnssec-drop-privileges.patch         |   43 +++++
 .../files/opendnssec-fix-localstatedir.patch       |   32 ++++
 .../opendnssec/files/opendnssec-rename-test.patch  |   11 ++
 .../files/opendnssec-use-system-trang.patch        |   30 +++
 net-dns/opendnssec/files/opendnssec.confd          |   14 ++
 net-dns/opendnssec/files/opendnssec.initd          |   91 ++++++++++
 net-dns/opendnssec/metadata.xml                    |   18 ++
 net-dns/opendnssec/opendnssec-1.2.1.ebuild         |   49 -----
 net-dns/opendnssec/opendnssec-1.3.0_rc2.ebuild     |  185 ++++++++++++++++++++
 10 files changed, 433 insertions(+), 51 deletions(-)

diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 597c5f5..674a1b4 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,2 +1,9 @@
-DIST opendnssec-1.2.1.tar.gz 1649465 RMD160 5cc50ee68bf4e531b400f70a0a07cbe6d2047b43 SHA1 e9fd9a4e33dc6d02f08ebf7454183fb53b4818a2 SHA256 3463edd1bed103d7fa68493b3008259da0c950d8f1e45d4b90ab0e1106d29502
-EBUILD opendnssec-1.2.1.ebuild 1010 RMD160 0c47386865e5f06622cdf619ccfe9e18ae1447d6 SHA1 058f41d65a4e52d3c1f521b99b4476ba3e91f26b SHA256 fb2ca838132eb8196eab9f4c6efd3f6c19df9a9e332a7fdb319589201c9b307b
+AUX opendnssec-drop-privileges.patch 906 RMD160 c7e5f09d08c7431fbe0d5496e980f1468de5185a SHA1 875529fd365e9168f4a34334c884e01b670974d3 SHA256 faecb049748efab2652b890020106748039dbe7022d943393ac50b71b429b340
+AUX opendnssec-fix-localstatedir.patch 1693 RMD160 9f7b783350fe0418f97cb78090fd8f02fc016447 SHA1 0875f47614990ce9c454cee2b1a6ef51c4c30ad9 SHA256 e9a29b3adf22ef6dd3a0ac43d2a48e2705ae09cd7550b4f3294b89dcd7814ecd
+AUX opendnssec-rename-test.patch 331 RMD160 34705b28224154aa7e13b15d023f16dcfaf7892e SHA1 4e7653e8425e49d98bc14d009788efbb970366e2 SHA256 d140d1da7df9ba34195097394c715fdf01ace6290325dbe9919f6666a11627d7
+AUX opendnssec-use-system-trang.patch 765 RMD160 8d00ea18c61f2505fb445fcd7245bc6d757b72c5 SHA1 cf997f34f78456f37f6e5e93e4a7c78171cd20f3 SHA256 f9c8c58ce8b50183b3b709876a1c4bd0b5a0eb5c0b852995118db5eead1f9f1d
+AUX opendnssec.confd 496 RMD160 b6667e7dfdd9872ee8d9656e374c0fdec04e9106 SHA1 0a9411a4b28a856763b94990c91cbb44b8970651 SHA256 1c6b999c6e23f8834f7cca2d044a273d7fb7b784fab4b808076bf2fd8deee1b6
+AUX opendnssec.initd 1904 RMD160 11ece935faf50bc14152c943d8535dd4110672dd SHA1 9e32ea1ac827e64e43908d400bbffc0b21845d9d SHA256 f21952e38caf60e3f9fd0e28e39ae3f4f6d5bb28a9066c9029b71b179ab8a7ca
+DIST opendnssec-1.3.0rc2.tar.gz 1668777 RMD160 d7d66029f9aade7f730b6dadd8bde5e8da560b6a SHA1 447da48b4a56987ec3320e2ddc2839c2c14de86a SHA256 f4bf47f6007b2047915291002c52955dd508797276119d7bc4897e257b4ae23b
+EBUILD opendnssec-1.3.0_rc2.ebuild 4971 RMD160 af7c1c32e1b7fb4acc037b933fb52b5dc6eb76ea SHA1 8245574d9b22cf5e61cbe8ee7a0e1cb8c61d46c2 SHA256 06a4a61cf211cbc8eca12b9e00b39241568e7441e69f6a1df7e7e57db9c14fd2
+MISC metadata.xml 949 RMD160 5e7a1c1a843c39419fb93f3edecc35bdbc9a7fdc SHA1 b956cada0576409d10708d3cdf473d84ac89d4e2 SHA256 615711bce50ebc27af5a97dbab4a01c17f0e9370b9a6d801e4561975eceea905

diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
new file mode 100644
index 0000000..7c9f723
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
@@ -0,0 +1,43 @@
+Index: conf/conf.xml.in
+===================================================================
+--- conf/conf.xml.in	(revision 3022)
++++ conf/conf.xml.in	(working copy)
+@@ -38,12 +38,10 @@
+ 	</Common>
+ 
+ 	<Enforcer>
+-<!--
+ 		<Privileges>
+ 			<User>opendnssec</User>
+ 			<Group>opendnssec</Group>
+ 		</Privileges>
+--->
+ 
+ 		<Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
+ 		<Interval>PT3600S</Interval>
+@@ -56,12 +54,10 @@
+ 	</Enforcer>
+ 
+ 	<Signer>
+-<!--
+ 		<Privileges>
+ 			<User>opendnssec</User>
+ 			<Group>opendnssec</Group>
+ 		</Privileges>
+--->
+ 
+ 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
+ 		<WorkerThreads>8</WorkerThreads>
+@@ -80,12 +76,10 @@
+ 	</Signer>
+ 
+ 	<Auditor>
+-<!--
+ 		<Privileges>
+ 			<User>opendnssec</User>
+ 			<Group>opendnssec</Group>
+ 		</Privileges>
+--->
+ 
+ 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
+ 	</Auditor>

diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch
new file mode 100644
index 0000000..3958c6c
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch
@@ -0,0 +1,32 @@
+diff -urN opendnssec-1.3.0rc2.old/Makefile.am opendnssec-1.3.0rc2/Makefile.am
+--- opendnssec-1.3.0rc2.old/Makefile.am	2011-06-02 13:48:56.000000000 +0200
++++ opendnssec-1.3.0rc2/Makefile.am	2011-06-02 13:49:19.000000000 +0200
+@@ -31,11 +31,11 @@
+ 
+ install-data-hook:
+ 	$(INSTALL) -d $(DESTDIR)$(localstatedir)
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/tmp
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
++	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec
++	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/tmp
++	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
++	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
++	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
+ 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
+ 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
+ 
+diff -urN opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4 opendnssec-1.3.0rc2/m4/opendnssec_common.m4
+--- opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4	2011-06-02 13:48:56.000000000 +0200
++++ opendnssec-1.3.0rc2/m4/opendnssec_common.m4	2011-06-02 13:49:36.000000000 +0200
+@@ -18,7 +18,7 @@
+ OPENDNSSEC_LIBEXEC_DIR=$full_libexecdir/opendnssec
+ OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
+ OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
+-OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
++OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec"
+ OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
+ 
+ AC_SUBST([OPENDNSSEC_BIN_DIR])

diff --git a/net-dns/opendnssec/files/opendnssec-rename-test.patch b/net-dns/opendnssec/files/opendnssec-rename-test.patch
new file mode 100644
index 0000000..39ef262
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-rename-test.patch
@@ -0,0 +1,11 @@
+--- a/conf/Makefile.am
++++ b/conf/Makefile.am
+@@ -27,7 +27,7 @@ SUFFIXES = .rng .rnc .xml
+ 		(echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
+ 	${TRANG} $< $@
+ 
+-regress: $(RNG)
++check: $(RNG)
+ 	@test -x ${XMLLINT} || \
+ 		(echo "xmllint is required for regression tests"; false)
+ 	@for i in ${XML}; do \

diff --git a/net-dns/opendnssec/files/opendnssec-use-system-trang.patch b/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
new file mode 100644
index 0000000..967b3bb
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
@@ -0,0 +1,30 @@
+--- a/conf/Makefile.am
++++ b/conf/Makefile.am
+@@ -7,7 +7,7 @@ RNG =	conf.rng kasp.rng zonelist.rng sig
+ XML =	conf.xml kasp.xml zonelist.xml signconf.xml zonefetch.xml
+ XSL=	kasp2html.xsl
+ 
+-TRANG=	$(srcdir)/trang/trang.jar
++TRANG=	/usr/bin/trang
+ 
+ sysconfdir = @sysconfdir@/opendnssec
+ datadir = @datadir@/opendnssec
+@@ -16,9 +16,6 @@ noinst_DATA = ${XML} ${XSL}
+ 
+ dist_data_DATA = ${RNG} ${RNC} ${XSL}
+ 
+-EXTRA_DIST =	${TRANG} \
+-		$(srcdir)/trang/copying.txt
+-
+ CLEANFILES =+		*.xml
+ DISTCLEANFILES =+	*.rng
+ 
+@@ -28,7 +25,7 @@ SUFFIXES = .rng .rnc .xml
+ .rnc.rng:
+ 	@test -x ${JAVA} || \
+ 		(echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
+-	${JAVA} -jar ${TRANG} $< $@
++	${TRANG} $< $@
+ 
+ regress: $(RNG)
+ 	@test -x ${XMLLINT} || \

diff --git a/net-dns/opendnssec/files/opendnssec.confd b/net-dns/opendnssec/files/opendnssec.confd
new file mode 100644
index 0000000..36555b0
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec.confd
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Variables containing default binaries used in the opendnssec
+# initscript. You can alter them to another applications/paths
+# if required.
+
+CHECKCONF_BIN=/usr/bin/ods-kaspcheck
+CONTROL_BIN=/usr/sbin/ods-control
+ENFORCER_BIN=/usr/sbin/ods-enforcerd
+SIGNER_BIN=/usr/sbin/ods-signerd
+EPPCLIENT_BIN=/usr/sbin/eppclientd
+EPPCLIENT_PIDFILE=/var/lib/run/opendnssec/eppclientd.pid

diff --git a/net-dns/opendnssec/files/opendnssec.initd b/net-dns/opendnssec/files/opendnssec.initd
new file mode 100644
index 0000000..0b0090a
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec.initd
@@ -0,0 +1,91 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+description="An open-source turn-key solution for DNSSEC"
+
+depend() {
+	need net
+	use logger
+}
+
+checkconfig() {
+	if [ -x "${CHECKCONFIG_BIN}" ]; then
+		output=$(${CHECKCONFIG_BIN} 2>&1| grep -v -E "^/etc/opendnssec/(conf|kasp).xml validates")
+		if [ -n "$output" ]; then
+			echo $output
+		fi
+
+		errors=$(echo $output | grep ERROR | wc -l)
+		if [ $errors -gt 0 ]; then
+			ewarn "$errors error(s) found in OpenDNSSEC configuration."
+		fi
+		return $errors
+	fi
+	# can't validate config, just die
+	return 1
+}
+
+
+start_enforcer() {
+	if [ -x "${ENFORCER_BIN}" ]; then
+		ebegin "Starting OpenDNSSEC Enforcer"
+		${CONTROL_BIN} enforcer start > /dev/null
+		eend $?
+	fi
+}
+
+stop_enforcer() {
+	if [ -x "${ENFORCER_BIN}" ]; then
+		ebegin "Stopping OpenDNSSEC Enforcer"
+		${CONTROL_BIN} enforcer stop > /dev/null
+		eend $?
+	fi
+}
+
+start_signer() {
+	if [ -x "${SIGNER_BIN}" ]; then
+		ebegin "Starting OpenDNSSEC Signer"
+		${CONTROL_BIN} signer start > /dev/null 2>&1
+		eend $?
+	fi
+}
+
+stop_signer() {
+	if [ -x "${SIGNER_BIN}" ]; then
+		ebegin "Stopping OpenDNSSEC Signer"
+		${CONTROL_BIN} signer stop > /dev/null 2>&1
+		eend $?
+	fi
+}
+
+start_eppclient() {
+	if [ -x "${EPPCLIENT_BIN}" ]; then
+		ebegin "Starting OpenDNSSEC Eppclient"
+		start-stop-daemon --start --user opendnssec --group opendnssec --exec "${EPPCLIENT_BIN}" --pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
+		eend $?
+	fi
+}
+
+stop_eppclient() {
+	if [ -x "${EPPCLIENT_BIN}" ]; then
+		ebegin "Stopping OpenDNSSEC Eppclient"
+		start-stop-daemon --stop --exec "${EPPCLIENT_BIN}" --pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
+		eend $?
+	fi
+}
+
+start() {
+	checkconfig || return $?
+	start_enforcer || return $?
+	start_signer || return $?
+	start_eppclient || return $?
+}
+
+stop() {
+	stop_eppclient
+	stop_signer
+	stop_enforcer
+	sleep 5
+}

diff --git a/net-dns/opendnssec/metadata.xml b/net-dns/opendnssec/metadata.xml
new file mode 100644
index 0000000..4298d0e
--- /dev/null
+++ b/net-dns/opendnssec/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>scarabeus@gentoo.org</email>
+		<name>Tomáš Chvátal</name>
+	</maintainer>
+	<use>
+		<flag name='auditor'>Enables auditing capabilities for OpenDNSSEC</flag>
+		<flag name='eppclient'>Enables support for automatic submission of DNSSEC keys to an upstream epp server</flag>
+		<flag name='signer'>Enables signing capabilities for OpenDNSSEC</flag>
+		<flag name='opensc'>Enables support for storing DNSSEC keys through a <pkg>dev-libs/opensc</pkg> PKCS#11 interface</flag>
+		<flag name='softhsm'>Enables support for storing DNSSEC keys in a <pkg>dev-libs/softhsm</pkg> PKCS#11 object</flag>
+		<flag name='external-hsm'>Enables support for storing DNSSEC keys through an arbitrary non-portage PKCS#11 interface, specified through an environment variable</flag>
+	</use>
+</pkgmetadata>
+

diff --git a/net-dns/opendnssec/opendnssec-1.2.1.ebuild b/net-dns/opendnssec/opendnssec-1.2.1.ebuild
deleted file mode 100644
index 1f8b6d5..0000000
--- a/net-dns/opendnssec/opendnssec-1.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl debug doc eppclient ldns mysql sqlite"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=net-libs/ldns-1.6.7
-	curl? ( net-misc/curl )
-	mysql? ( virtual/mysql )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cunit )
-"
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	eppclient? ( curl )
-"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--with-ldns \
-		--with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		$(use_with curl) \
-		$(use_with sqlite sqlite3) \
-		$(use_with mysql) \
-		$(use_with test cunit) \
-		$(use_enable eppclient) \
-		$(use_enable debug timeshift)
-}
-

diff --git a/net-dns/opendnssec/opendnssec-1.3.0_rc2.ebuild b/net-dns/opendnssec/opendnssec-1.3.0_rc2.ebuild
new file mode 100644
index 0000000..98d83bf
--- /dev/null
+++ b/net-dns/opendnssec/opendnssec-1.3.0_rc2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+MY_P="${P/_}"
+PKCS11_IUSE="+softhsm opensc external-hsm"
+inherit base autotools multilib
+
+DESCRIPTION="An open-source turn-key solution for DNSSEC"
+HOMEPAGE="http://www.opendnssec.org/"
+SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="auditor +curl debug doc eppclient mysql +signer +sqlite ${PKCS11_IUSE}"
+
+RDEPEND="
+	dev-lang/perl
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=net-libs/ldns-1.6.7
+	auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.52 )
+	curl? ( net-misc/curl )
+	mysql? (
+		virtual/mysql
+		dev-perl/DBD-mysql
+	)
+	sqlite? (
+		dev-db/sqlite:3
+		dev-perl/DBD-SQLite
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/trang
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cunit )
+"
+
+REQUIRED_USE="
+	^^ ( mysql sqlite )
+	^^ ( softhsm opensc external-hsm )
+	eppclient? ( curl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-use-system-trang.patch"
+	"${FILESDIR}/${PN}-fix-localstatedir.patch"
+	"${FILESDIR}/${PN}-rename-test.patch"
+	"${FILESDIR}/${PN}-drop-privileges.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( MIGRATION NEWS README )
+
+check_pkcs11_setup() {
+	# PKCS#11 HSM's are often only available with proprietary drivers not
+	# available in portage tree.
+
+	if use softhsm; then
+		PKCS11_LIB=softhsm
+		PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
+		elog "Building with SoftHSM PKCS#11 library support."
+	fi
+	if use opensc; then
+		PKCS11_LIB=opensc
+		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
+		elog "Building with OpenSC PKCS#11 library support."
+	fi
+	if use external-hsm; then
+		if [[ -n ${PKCS11_SCA6000} ]]; then
+			PKCS11_LIB=sca6000
+			PKCS11_PATH=${PKCS11_SCA6000}
+
+		elif [[ -n ${PKCS11_ETOKEN} ]]; then
+			PKCS11_LIB=etoken
+			PKCS11_PATH=${PKCS11_ETOKEN}
+
+		elif [[ -n ${PKCS11_NCIPHER} ]]; then
+			PKCS11_LIB=ncipher
+			PKCS11_PATH=${PKCS11_NCIPHER}
+
+		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
+			PKCS11_LIB=aepkeyper
+			PKCS11_PATH=${PKCS11_AEPKEYPER}
+		else
+			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
+			ewarn "library. To set a path, set one of the following environment variables:"
+			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
+			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
+			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
+			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
+			ewarn "Example:"
+			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
+			ewarn "or store the variable into /etc/make.conf"
+			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
+		fi
+		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
+	fi
+}
+
+pkg_pretend() {
+	local i
+
+	for i in "eppclient mysql"; do
+		if use ${i}; then
+			ewarn "Usage of ${i} is considered experimental."
+			ewarn "Do not report bugs against this feature."
+		fi
+	done
+
+	check_pkcs11_setup
+}
+
+pkg_setup() {
+	enewgroup opendnssec
+	enewuser opendnssec -1 -1 -1 opendnssec
+}
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var/" \
+		--disable-static \
+		--with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
+		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
+		$(use_with curl) \
+		$(use_with test cunit) \
+		$(use_enable auditor) \
+		$(use_enable debug timeshift) \
+		$(use_enable eppclient) \
+		$(use_enable signer)
+}
+
+src_compile() {
+	default
+	use doc && emake docs
+}
+
+src_install() {
+	default
+
+	# remove useless .la files
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	# Remove subversion tags from config files to avoid useless config updates
+	sed -i \
+		-e 's/<!-- \$Id:.* \$ -->//g' \
+		"${ED}"/etc/opendnssec/* || die
+
+	# install update scripts
+	insinto /usr/share/opendnssec
+	use sqlite && doins enforcer/utils/migrate_keyshare_sqlite3.pl
+	use mysql && doins enforcer/utils/migrate_keyshare_mysql.pl
+
+	# fix permissions
+	fowners root:opendnssec /etc/opendnssec
+	fowners root:opendnssec /etc/opendnssec/{conf,kasp,zonelist,zonefetch}.xml
+	use eppclient && fowners root:opendnssec /etc/opendnssec/eppclientd.conf
+
+	fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
+	fowners opendnssec:opendnssec /var/run/opendnssec
+
+	# install conf/init script
+	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
+	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
+}
+
+pkg_postinst() {
+	if use softhsm; then
+		elog "Please make sure that you create your softhsm database in a location writeable"
+		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
+		elog "Suggested configuration is:"
+		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
+		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
+		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
+	fi
+}



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] dev/scarabeus:master commit in: net-dns/opendnssec/files/, net-dns/opendnssec/
@ 2011-06-02 12:28 Tomas Chvatal
  0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal @ 2011-06-02 12:28 UTC (permalink / raw
  To: gentoo-commits

commit:     c09d096c59dea8f23ffd9afb059ef4de93c25c6d
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 12:27:39 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 12:27:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=c09d096c

[net-dns/opendnssec] Move to main tree.

---
 net-dns/opendnssec/Manifest                        |    9 -
 .../files/opendnssec-drop-privileges.patch         |   43 -----
 .../files/opendnssec-fix-localstatedir.patch       |   32 ----
 .../opendnssec/files/opendnssec-rename-test.patch  |   11 --
 .../files/opendnssec-use-system-trang.patch        |   30 ---
 net-dns/opendnssec/files/opendnssec.confd          |   14 --
 net-dns/opendnssec/files/opendnssec.initd          |   91 ----------
 net-dns/opendnssec/metadata.xml                    |   18 --
 net-dns/opendnssec/opendnssec-1.3.0_rc2.ebuild     |  185 --------------------
 9 files changed, 0 insertions(+), 433 deletions(-)

diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
deleted file mode 100644
index 674a1b4..0000000
--- a/net-dns/opendnssec/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX opendnssec-drop-privileges.patch 906 RMD160 c7e5f09d08c7431fbe0d5496e980f1468de5185a SHA1 875529fd365e9168f4a34334c884e01b670974d3 SHA256 faecb049748efab2652b890020106748039dbe7022d943393ac50b71b429b340
-AUX opendnssec-fix-localstatedir.patch 1693 RMD160 9f7b783350fe0418f97cb78090fd8f02fc016447 SHA1 0875f47614990ce9c454cee2b1a6ef51c4c30ad9 SHA256 e9a29b3adf22ef6dd3a0ac43d2a48e2705ae09cd7550b4f3294b89dcd7814ecd
-AUX opendnssec-rename-test.patch 331 RMD160 34705b28224154aa7e13b15d023f16dcfaf7892e SHA1 4e7653e8425e49d98bc14d009788efbb970366e2 SHA256 d140d1da7df9ba34195097394c715fdf01ace6290325dbe9919f6666a11627d7
-AUX opendnssec-use-system-trang.patch 765 RMD160 8d00ea18c61f2505fb445fcd7245bc6d757b72c5 SHA1 cf997f34f78456f37f6e5e93e4a7c78171cd20f3 SHA256 f9c8c58ce8b50183b3b709876a1c4bd0b5a0eb5c0b852995118db5eead1f9f1d
-AUX opendnssec.confd 496 RMD160 b6667e7dfdd9872ee8d9656e374c0fdec04e9106 SHA1 0a9411a4b28a856763b94990c91cbb44b8970651 SHA256 1c6b999c6e23f8834f7cca2d044a273d7fb7b784fab4b808076bf2fd8deee1b6
-AUX opendnssec.initd 1904 RMD160 11ece935faf50bc14152c943d8535dd4110672dd SHA1 9e32ea1ac827e64e43908d400bbffc0b21845d9d SHA256 f21952e38caf60e3f9fd0e28e39ae3f4f6d5bb28a9066c9029b71b179ab8a7ca
-DIST opendnssec-1.3.0rc2.tar.gz 1668777 RMD160 d7d66029f9aade7f730b6dadd8bde5e8da560b6a SHA1 447da48b4a56987ec3320e2ddc2839c2c14de86a SHA256 f4bf47f6007b2047915291002c52955dd508797276119d7bc4897e257b4ae23b
-EBUILD opendnssec-1.3.0_rc2.ebuild 4971 RMD160 af7c1c32e1b7fb4acc037b933fb52b5dc6eb76ea SHA1 8245574d9b22cf5e61cbe8ee7a0e1cb8c61d46c2 SHA256 06a4a61cf211cbc8eca12b9e00b39241568e7441e69f6a1df7e7e57db9c14fd2
-MISC metadata.xml 949 RMD160 5e7a1c1a843c39419fb93f3edecc35bdbc9a7fdc SHA1 b956cada0576409d10708d3cdf473d84ac89d4e2 SHA256 615711bce50ebc27af5a97dbab4a01c17f0e9370b9a6d801e4561975eceea905

diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
deleted file mode 100644
index 7c9f723..0000000
--- a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: conf/conf.xml.in
-===================================================================
---- conf/conf.xml.in	(revision 3022)
-+++ conf/conf.xml.in	(working copy)
-@@ -38,12 +38,10 @@
- 	</Common>
- 
- 	<Enforcer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
- 		<Interval>PT3600S</Interval>
-@@ -56,12 +54,10 @@
- 	</Enforcer>
- 
- 	<Signer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 		<WorkerThreads>8</WorkerThreads>
-@@ -80,12 +76,10 @@
- 	</Signer>
- 
- 	<Auditor>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 	</Auditor>

diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch
deleted file mode 100644
index 3958c6c..0000000
--- a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -urN opendnssec-1.3.0rc2.old/Makefile.am opendnssec-1.3.0rc2/Makefile.am
---- opendnssec-1.3.0rc2.old/Makefile.am	2011-06-02 13:48:56.000000000 +0200
-+++ opendnssec-1.3.0rc2/Makefile.am	2011-06-02 13:49:19.000000000 +0200
-@@ -31,11 +31,11 @@
- 
- install-data-hook:
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/tmp
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/tmp
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
- 
-diff -urN opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4 opendnssec-1.3.0rc2/m4/opendnssec_common.m4
---- opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4	2011-06-02 13:48:56.000000000 +0200
-+++ opendnssec-1.3.0rc2/m4/opendnssec_common.m4	2011-06-02 13:49:36.000000000 +0200
-@@ -18,7 +18,7 @@
- OPENDNSSEC_LIBEXEC_DIR=$full_libexecdir/opendnssec
- OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
- OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
--OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
-+OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec"
- OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
- 
- AC_SUBST([OPENDNSSEC_BIN_DIR])

diff --git a/net-dns/opendnssec/files/opendnssec-rename-test.patch b/net-dns/opendnssec/files/opendnssec-rename-test.patch
deleted file mode 100644
index 39ef262..0000000
--- a/net-dns/opendnssec/files/opendnssec-rename-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/conf/Makefile.am
-+++ b/conf/Makefile.am
-@@ -27,7 +27,7 @@ SUFFIXES = .rng .rnc .xml
- 		(echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
- 	${TRANG} $< $@
- 
--regress: $(RNG)
-+check: $(RNG)
- 	@test -x ${XMLLINT} || \
- 		(echo "xmllint is required for regression tests"; false)
- 	@for i in ${XML}; do \

diff --git a/net-dns/opendnssec/files/opendnssec-use-system-trang.patch b/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
deleted file mode 100644
index 967b3bb..0000000
--- a/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/conf/Makefile.am
-+++ b/conf/Makefile.am
-@@ -7,7 +7,7 @@ RNG =	conf.rng kasp.rng zonelist.rng sig
- XML =	conf.xml kasp.xml zonelist.xml signconf.xml zonefetch.xml
- XSL=	kasp2html.xsl
- 
--TRANG=	$(srcdir)/trang/trang.jar
-+TRANG=	/usr/bin/trang
- 
- sysconfdir = @sysconfdir@/opendnssec
- datadir = @datadir@/opendnssec
-@@ -16,9 +16,6 @@ noinst_DATA = ${XML} ${XSL}
- 
- dist_data_DATA = ${RNG} ${RNC} ${XSL}
- 
--EXTRA_DIST =	${TRANG} \
--		$(srcdir)/trang/copying.txt
--
- CLEANFILES =+		*.xml
- DISTCLEANFILES =+	*.rng
- 
-@@ -28,7 +25,7 @@ SUFFIXES = .rng .rnc .xml
- .rnc.rng:
- 	@test -x ${JAVA} || \
- 		(echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
--	${JAVA} -jar ${TRANG} $< $@
-+	${TRANG} $< $@
- 
- regress: $(RNG)
- 	@test -x ${XMLLINT} || \

diff --git a/net-dns/opendnssec/files/opendnssec.confd b/net-dns/opendnssec/files/opendnssec.confd
deleted file mode 100644
index 36555b0..0000000
--- a/net-dns/opendnssec/files/opendnssec.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Variables containing default binaries used in the opendnssec
-# initscript. You can alter them to another applications/paths
-# if required.
-
-CHECKCONF_BIN=/usr/bin/ods-kaspcheck
-CONTROL_BIN=/usr/sbin/ods-control
-ENFORCER_BIN=/usr/sbin/ods-enforcerd
-SIGNER_BIN=/usr/sbin/ods-signerd
-EPPCLIENT_BIN=/usr/sbin/eppclientd
-EPPCLIENT_PIDFILE=/var/lib/run/opendnssec/eppclientd.pid

diff --git a/net-dns/opendnssec/files/opendnssec.initd b/net-dns/opendnssec/files/opendnssec.initd
deleted file mode 100644
index 0b0090a..0000000
--- a/net-dns/opendnssec/files/opendnssec.initd
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-description="An open-source turn-key solution for DNSSEC"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ -x "${CHECKCONFIG_BIN}" ]; then
-		output=$(${CHECKCONFIG_BIN} 2>&1| grep -v -E "^/etc/opendnssec/(conf|kasp).xml validates")
-		if [ -n "$output" ]; then
-			echo $output
-		fi
-
-		errors=$(echo $output | grep ERROR | wc -l)
-		if [ $errors -gt 0 ]; then
-			ewarn "$errors error(s) found in OpenDNSSEC configuration."
-		fi
-		return $errors
-	fi
-	# can't validate config, just die
-	return 1
-}
-
-
-start_enforcer() {
-	if [ -x "${ENFORCER_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Enforcer"
-		${CONTROL_BIN} enforcer start > /dev/null
-		eend $?
-	fi
-}
-
-stop_enforcer() {
-	if [ -x "${ENFORCER_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Enforcer"
-		${CONTROL_BIN} enforcer stop > /dev/null
-		eend $?
-	fi
-}
-
-start_signer() {
-	if [ -x "${SIGNER_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Signer"
-		${CONTROL_BIN} signer start > /dev/null 2>&1
-		eend $?
-	fi
-}
-
-stop_signer() {
-	if [ -x "${SIGNER_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Signer"
-		${CONTROL_BIN} signer stop > /dev/null 2>&1
-		eend $?
-	fi
-}
-
-start_eppclient() {
-	if [ -x "${EPPCLIENT_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Eppclient"
-		start-stop-daemon --start --user opendnssec --group opendnssec --exec "${EPPCLIENT_BIN}" --pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
-		eend $?
-	fi
-}
-
-stop_eppclient() {
-	if [ -x "${EPPCLIENT_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Eppclient"
-		start-stop-daemon --stop --exec "${EPPCLIENT_BIN}" --pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
-		eend $?
-	fi
-}
-
-start() {
-	checkconfig || return $?
-	start_enforcer || return $?
-	start_signer || return $?
-	start_eppclient || return $?
-}
-
-stop() {
-	stop_eppclient
-	stop_signer
-	stop_enforcer
-	sleep 5
-}

diff --git a/net-dns/opendnssec/metadata.xml b/net-dns/opendnssec/metadata.xml
deleted file mode 100644
index 4298d0e..0000000
--- a/net-dns/opendnssec/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>scarabeus@gentoo.org</email>
-		<name>Tomáš Chvátal</name>
-	</maintainer>
-	<use>
-		<flag name='auditor'>Enables auditing capabilities for OpenDNSSEC</flag>
-		<flag name='eppclient'>Enables support for automatic submission of DNSSEC keys to an upstream epp server</flag>
-		<flag name='signer'>Enables signing capabilities for OpenDNSSEC</flag>
-		<flag name='opensc'>Enables support for storing DNSSEC keys through a <pkg>dev-libs/opensc</pkg> PKCS#11 interface</flag>
-		<flag name='softhsm'>Enables support for storing DNSSEC keys in a <pkg>dev-libs/softhsm</pkg> PKCS#11 object</flag>
-		<flag name='external-hsm'>Enables support for storing DNSSEC keys through an arbitrary non-portage PKCS#11 interface, specified through an environment variable</flag>
-	</use>
-</pkgmetadata>
-

diff --git a/net-dns/opendnssec/opendnssec-1.3.0_rc2.ebuild b/net-dns/opendnssec/opendnssec-1.3.0_rc2.ebuild
deleted file mode 100644
index 98d83bf..0000000
--- a/net-dns/opendnssec/opendnssec-1.3.0_rc2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit base autotools multilib
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="auditor +curl debug doc eppclient mysql +signer +sqlite ${PKCS11_IUSE}"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=net-libs/ldns-1.6.7
-	auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.52 )
-	curl? ( net-misc/curl )
-	mysql? (
-		virtual/mysql
-		dev-perl/DBD-mysql
-	)
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/trang
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cunit )
-"
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-	eppclient? ( curl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-use-system-trang.patch"
-	"${FILESDIR}/${PN}-fix-localstatedir.patch"
-	"${FILESDIR}/${PN}-rename-test.patch"
-	"${FILESDIR}/${PN}-drop-privileges.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS README )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	local i
-
-	for i in "eppclient mysql"; do
-		if use ${i}; then
-			ewarn "Usage of ${i} is considered experimental."
-			ewarn "Do not report bugs against this feature."
-		fi
-	done
-
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-}
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var/" \
-		--disable-static \
-		--with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		$(use_with curl) \
-		$(use_with test cunit) \
-		$(use_enable auditor) \
-		$(use_enable debug timeshift) \
-		$(use_enable eppclient) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e 's/<!-- \$Id:.* \$ -->//g' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install update scripts
-	insinto /usr/share/opendnssec
-	use sqlite && doins enforcer/utils/migrate_keyshare_sqlite3.pl
-	use mysql && doins enforcer/utils/migrate_keyshare_mysql.pl
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{conf,kasp,zonelist,zonefetch}.xml
-	use eppclient && fowners root:opendnssec /etc/opendnssec/eppclientd.conf
-
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
-	fowners opendnssec:opendnssec /var/run/opendnssec
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-}



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-06-02 12:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-02 12:28 [gentoo-commits] dev/scarabeus:master commit in: net-dns/opendnssec/files/, net-dns/opendnssec/ Tomas Chvatal
  -- strict thread matches above, loose matches on Subject: below --
2011-06-02 12:20 Tomas Chvatal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox