Version bump. Updated deps. Thanks to Tom Hendrikx. Fixes bug #391905.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 198 insertions, 12 deletions

diff --git a/net-dns/opendnssec/ChangeLog b/net-dns/opendnssec/ChangeLog
index 1b93268791c0..78bf4e78407d 100644
--- a/net-dns/opendnssec/ChangeLog
+++ b/net-dns/opendnssec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/opendnssec
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.10 2011/11/11 12:11:12 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.11 2011/11/27 14:55:18 mschiff Exp $
+
+*opendnssec-1.3.3 (27 Nov 2011)
+
+  27 Nov 2011; <mschiff@gentoo.org> +opendnssec-1.3.3.ebuild:
+  Version bump. Updated deps. Thanks to Tom Hendrikx. Fixes bug #391905.
 
   11 Nov 2011; Marc Schiffbauer <mschiff@gentoo.org> metadata.xml:
   Added myself as maintainer
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index ee6e1954187f..347c0ae2b4e2 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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-use-system-trang.patch 706 RMD160 29ae081376f9c89cebfb566dde6e247e190c8809 SHA1 967f975680c3618c96db354eb12eebb35da27300 SHA256 c704b8e232c950166131be6e70c7b48ff4f57800de7dae2a08012ef5d945f4c7
 AUX opendnssec.confd 604 RMD160 fef2b1642e5fe1aa41e66f673fc03c204ee67228 SHA1 4bb8706c5fea92b23d71e4e8b1e4f4c2e954c41e SHA256 85e67e2df2a86f78e17e64eedbad513c69118649680aa9ca4ecaab73abf9f5e6
 AUX opendnssec.initd 2799 RMD160 865172b8838b03edf15d506af5930f126a303217 SHA1 cf4d84dcab389d81623750488a7e0216e6c019cb SHA256 c73be15d8b2f05a49cb6bb6e110b8db366440012cda4adcc0dc5689aaa2d8b1b
 DIST opendnssec-1.3.2.tar.gz 1078647 RMD160 4e90520e41dd5c24b371c847df43277dfb1f67f9 SHA1 cbcb0e13d9100fded1ff4584c72203b155175668 SHA256 bcd23830445cafa1efd49acfd6aabcfa1835fc1942a67235a7db876c2f300953
+DIST opendnssec-1.3.3.tar.gz 1081139 RMD160 8a9607af9f93fbad05719e02b3629311dad87b39 SHA1 69aed73b5db571a1fc42951750f351fceb4b19df SHA256 a51b1b5eeeba36b0d48ccd217892b910cdae31b0a3341c481c0c387781dcae53
 EBUILD opendnssec-1.3.2.ebuild 5260 RMD160 96cef4ee638bee0419ac64fc10e992321157c393 SHA1 6b948ac738e5d246ad75f06574f14392694af4c2 SHA256 addff328aa20d1a0aec9b983e0ce364ca04068acf4ec14be5264bdea56768e17
-MISC ChangeLog 2295 RMD160 323a173f42e58e86755176c3cc034b740f3c6748 SHA1 5f7147aa615b31488521f74c4c2742aed14a8cfc SHA256 b9dd863802ff8cc179e9c410440d22ba000ff2e55d537b413b68d1aed1266e10
+EBUILD opendnssec-1.3.3.ebuild 5256 RMD160 41aa5b8db483a9433ead686414310414a874944c SHA1 6364ed21114041a4165bc7e7db06fc2af2d2f94f SHA256 ddae8f648e1c29c02b4753346366713239adca1fa86e27046d0ef2ace9d600ba
+MISC ChangeLog 2464 RMD160 44e9cf033f7952b425cee83b31a3b51f7d4d1ebc SHA1 8edbc3a97b0ed67fe7918f1e5d4b5ab71d3bde4a SHA256 f3a9881671675b2114e2e4ac23152bcb9253f39cda5df4329bd220198c0520f8
 MISC metadata.xml 893 RMD160 9ae58ce9e58412bf41947dc0bf919889a97fdb81 SHA1 fb31e875e8cabbfc42b0d7fa5e4072cefd65f3da SHA256 755ed5e90d93b36be4e037b1fd4f7a16ec640547307add3916047b949e48a2f5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iD8DBQFOvRDqKWxsyjWmQTQRAgwUAKCoA4+DBzIsOP2JhY7Z8reV85SCegCggGsf
-WhkKDjffoN0CBR24mDavetE=
-=6cQU
------END PGP SIGNATURE-----
diff --git a/net-dns/opendnssec/opendnssec-1.3.3.ebuild b/net-dns/opendnssec/opendnssec-1.3.3.ebuild
new file mode 100644
index 000000000000..e3bfa4edcfc6
--- /dev/null
+++ b/net-dns/opendnssec/opendnssec-1.3.3.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.3.ebuild,v 1.1 2011/11/27 14:55:18 mschiff Exp $
+
+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 test ${PKCS11_IUSE}"
+
+RDEPEND="
+	dev-lang/perl
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=net-libs/ldns-1.6.9
+	auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.53 )
+	curl? ( net-misc/curl )
+	mysql? (
+		virtual/mysql
+		dev-perl/DBD-mysql
+	)
+	opensc? ( dev-libs/opensc )
+	softhsm? ( dev-libs/softhsm )
+	sqlite? (
+		dev-db/sqlite:3
+		dev-perl/DBD-SQLite
+	)
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? (
+		app-text/trang
+	)
+"
+# test? dev-util/cunit # Requires running test DB
+
+REQUIRED_USE="
+	^^ ( mysql sqlite )
+	^^ ( softhsm opensc external-hsm )
+	eppclient? ( curl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-localstatedir.patch"
+	"${FILESDIR}/${PN}-drop-privileges.patch"
+	"${FILESDIR}/${PN}-use-system-trang.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
+
+	# pretend does not preserve variables so we need to run this once more
+	check_pkcs11_setup
+}
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# $(use_with test cunit "${EPREFIX}/usr/") \
+	econf \
+		--without-cunit \
+		--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_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 '/<!-- \$Id:/ d' \
+		"${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
+}