Bump 1.4 version.

Package-Manager: portage-2.2.12-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x296C6CCA35A64134

3 files changed, 219 insertions, 6 deletions

diff --git a/net-dns/opendnssec/ChangeLog b/net-dns/opendnssec/ChangeLog
index a003b2dc33fc..352ed8047a75 100644
--- a/net-dns/opendnssec/ChangeLog
+++ b/net-dns/opendnssec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/opendnssec
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.40 2014/05/20 21:41:06 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.41 2014/09/15 20:49:06 mschiff Exp $
+
+*opendnssec-1.4.6 (15 Sep 2014)
+
+  15 Sep 2014; Marc Schiffbauer <mschiff@gentoo.org> +opendnssec-1.4.6.ebuild:
+  Bump 1.4 version.
 
   20 May 2014; Marc Schiffbauer <mschiff@gentoo.org> opendnssec-1.4.4.ebuild:
   Do not try to install README anymore.
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 6cfff7657eb6..4f34c82cd394 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -14,15 +14,17 @@ AUX opendnssec.initd-1.3.x 2995 SHA256 597f4e3cbb105110f2d2ae122a11cf16854ddd315
 DIST opendnssec-1.3.16.tar.gz 1173226 SHA256 fa0fe18757a19d6b03e27c2c76f291d61a735f14c2661725df4e569e0be1d04c SHA512 bffc5126aa2df616225531ad71f5b092c89671e241c70bf58390d820e4c76a7a584b27c4bcc3cf2b9740a98a7ae00ed251c5682d9bb9c6688af5feaa02848beb WHIRLPOOL 7673e97885c44eaf2ef36f4da351571dbcde47406a849c46f731f8318b8b53c5703ed3a59e8a878e35272be6c39011b305f99194b8f0d1041c311c8e1654e8f2
 DIST opendnssec-1.3.17.tar.gz 1140751 SHA256 9f0dcfb53a3e10255b2d85e6a30663548eca1ec2e900b7cd5db9329f1710e323 SHA512 6d3172cf5dc1bee1dbd14a5b9a8ada4ce3ebd954e2cd7adde664ac4b5e0cab81ed1cba2e2efeceacedf16f56d40a0874b73d7c844bbbbb6e1be1f8235a4c99f7 WHIRLPOOL 80e3a99dedb2ea1cc6a1d109bcf4e874cc9cc18abfaa233a2533f7a05b7129543cf2fbeaf6c6cde343755cacbca3125a4426c421805425204725f9ddcb156657
 DIST opendnssec-1.4.4.tar.gz 1009728 SHA256 71f930d871e3526f930ac57925f5d5b934988e0b2e9e858926bfc73d9ba9d00e SHA512 aa88049cdd9275b7167e8a135beaa0ea6b9b2030818ec9d7815dbceb906cb0ac19d9a8e6e8571b6c37db452bbf9ab2a615785bad8ffb0a8eb21c50de42cd99b1 WHIRLPOOL 0ce1536aa69c394595105c1803761697d8450bc42e84c6a9e80568ade61fc6e0060f8b4d9bdb9547ff0cd17e27671a4c5fa3576c9d58a47188c7ff87043ccfb1
+DIST opendnssec-1.4.6.tar.gz 1014314 SHA256 53f9c454f331822925d76c9d9e5e7cb3fe2dfb03e3c467f67f9412f10d0fd5ec SHA512 c01e6e46e2007d0ae4035253484590d9a892be8284b179b6d3cdb0f8481789a67a79f9043d04de0aecc165fb44d88dac0eb02444f48e0ccd366f118a2bbb5c18 WHIRLPOOL 4535fb49879b27698b0ba88f05b2fd963c69829446a7d5eb8419c19768059347e0adfd1b59efe50b2acd5550758f499290e02ee52b1b92695e8f9061ad465bf0
 EBUILD opendnssec-1.3.16.ebuild 5472 SHA256 4dd30d39e0cbd7962600c3335a9282aa79009f74e44bb9fc9103eea019633713 SHA512 c97d24a725cdccb273e17849072342983847549c696c6634c2b73519d36e26e2fa2b0da0a8bed047ccf1fe385aeabad630cf8b8c6b166d0a2c9e0f895dfd197b WHIRLPOOL 5fe1d43769f4aa2c7c6b3e4647edf9270aae1f6ca87e8393cb96df5b59ec67ae05e1bf9421928c9e9b83c59a345c346dc2db8861716f2db43bedd79281db2080
 EBUILD opendnssec-1.3.17.ebuild 5744 SHA256 cb32351b2bab79723df0a06fa832e2e92ef01126f4abcb13d646bbe2f61826ef SHA512 2b55b7d5c3ac612fa65b132513e276b77316bcc7e60aa74d0d7ed2122b8465287175c39f9aaa8e72fd417186165850c744d07c84d7d3d73736f8a1930c19ae10 WHIRLPOOL 50587976b6f4f5d8f52c3175207eb91bfb69a698f61ad8361407fad84d3ce7cc2688f2e9050ad151967a6149b041bbd39f3c5214e860b284c40ec14badc75664
 EBUILD opendnssec-1.4.4.ebuild 5943 SHA256 331a11b5d4f6ca944815b3bfdc418e958153a4f9a53726bdc59e4e0eab5e161f SHA512 927c2f92c68f73413cbe16d65e02168de6433674976fe0feca071e482e8588e28516e946a8d6fbae579898181a0323bc77a35fc9df48dcfbb67388ac27c5f6a5 WHIRLPOOL fe80e62b981a302c8eb014d7df2b7295a6cb577e684c7b67eba5a06a55ba92ceaa73ce9aab6862d33700da72bb092c3fcbae1aa29e1916c48f02f6644960b64e
-MISC ChangeLog 8524 SHA256 c79fe0c4b51d86e5f84acce4ef6bbf23a834772117d90ee23687b41df09e2da1 SHA512 228d4effec42150264ab3045267d5eb88c4160bb8a35f958cf10d5f703131750aef0ca61506e5308da891f8e97cabc34b29cbb613fdc3e3c99e0275437ba9878 WHIRLPOOL 6d5b5c8c47405127f9a9ca5bfec55db77117f778556b390b256a9d23109a80ad913f8c29fce4f7504ad0d509a983547730960708939602d79620a6652e9b204f
+EBUILD opendnssec-1.4.6.ebuild 5943 SHA256 f4d322e4f052947afeccb4cfd93eda2a8c8a6e8ea08ed09e47892f9f6a824332 SHA512 d1dff49487e1e119a8c835ccc1245072ff6c353035d4b058e5fe3b4d84753de0870915a584e3c18a94a4d840314816c6c46a9d04c19519160818bdbef96b5b74 WHIRLPOOL 6117de8390d7eed56233cecee5a8878ae1352064600936c7f63d17d7bf03d8ddcc9d066aff873a0e0d8e061857e1483ce4cef5c993833aa9a0811398fe80720a
+MISC ChangeLog 8657 SHA256 bb18feaad623241ce6cde8dfc964daa3c0c3b591bfb8ce607f011b57882bdf9b SHA512 f9bb7b9da252c72b2631cc5e119e5a3f8db2d2aaf722d7f501b56f578d6331814cc784cec852e363a7fcc4a34598b7d3c17d77a211d776e0378f612c9312db4e WHIRLPOOL c9aea13d3e4aac009ab4327861391181153c0c7a6dd6648068ec45c2f7c0545064ff89bc848dd3c9bc2dff30d576b2584012dfbd0ea149ea9510484295543eea
 MISC metadata.xml 893 SHA256 755ed5e90d93b36be4e037b1fd4f7a16ec640547307add3916047b949e48a2f5 SHA512 1d38e1358749b738329056cea9dd5b6ab50e6295ba5e6b43809ff0cb8da7c3de97d3a406de1e977f28f623b6c27411185419475eaf0268f9a29452a61049525b WHIRLPOOL c659bf7b14c9f6f4db912dac69a7ff0e417f67b85a1952d58b5b653329df0d8435fad466140c34abad40eb54200a85b29e9de233f52b586852447e20a14e6a96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iD8DBQFTe8vzKWxsyjWmQTQRCBVZAJ937D75nFCMJVoqke658CKJmd7ZgQCdGR19
-Rkhyu1S5ZQ3jjnO7pWXrnx8=
-=ayW3
+iD8DBQFUF1DHKWxsyjWmQTQRCN21AJ9mI/BR19vZK8jsznDYpt/EkCDxZQCfYzCy
+/xuSfcCHdU5fTlNqTnNzlpw=
+=1Km7
 -----END PGP SIGNATURE-----
diff --git a/net-dns/opendnssec/opendnssec-1.4.6.ebuild b/net-dns/opendnssec/opendnssec-1.4.6.ebuild
new file mode 100644
index 000000000000..817e182d6b50
--- /dev/null
+++ b/net-dns/opendnssec/opendnssec-1.4.6.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.4.6.ebuild,v 1.1 2014/09/15 20:49:06 mschiff Exp $
+
+EAPI=5
+
+MY_P="${P/_}"
+PKCS11_IUSE="+softhsm opensc external-hsm"
+inherit base autotools multilib user
+
+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 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +mysql +signer sqlite test ${PKCS11_IUSE}"
+
+RDEPEND="
+	dev-lang/perl
+	dev-libs/libxml2
+	dev-libs/libxslt
+	net-libs/ldns
+	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
+	)
+"
+
+REQUIRED_USE="
+	^^ ( mysql sqlite )
+	^^ ( softhsm opensc external-hsm )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-localstatedir.patch"
+	"${FILESDIR}/${PN}-fix-run-dir.patch"
+	"${FILESDIR}/${PN}-drop-privileges.patch"
+	"${FILESDIR}/${PN}-use-system-trang.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( MIGRATION NEWS )
+
+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
+		if has_version ">=dev-libs/softhsm-1.3.1"; then
+			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
+		else
+			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
+		fi
+		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() {
+	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() {
+	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_enable debug timeshift) \
+		$(use_enable signer)
+}
+
+src_compile() {
+	default
+	use doc && emake docs
+}
+
+src_install() {
+	default
+
+	# remove useless .la files
+	find "${ED}" -name '*.la' -delete
+
+	# 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
+	if use sqlite; then
+		doins enforcer/utils/migrate_keyshare_sqlite3.pl
+		doins enforcer/utils/migrate_adapters_1.sqlite3
+	fi
+	if use mysql; then
+		doins enforcer/utils/migrate_keyshare_mysql.pl
+		doins enforcer/utils/migrate_adapters_1.mysql
+	fi
+
+	# fix permissions
+	fowners root:opendnssec /etc/opendnssec
+	fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
+	fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
+
+	# install conf/init script
+	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
+	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
+}
+
+pkg_postinst() {
+	local v
+	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
+
+	for v in $REPLACING_VERSIONS; do
+		case $v in
+			1.3.*)
+				ewarn ""
+				ewarn "You are upgrading from version 1.3."
+				ewarn ""
+				ewarn "Please be aware of the following:"
+				ewarn "  * OpenDNSSEC now supports both input and output adapters for"
+				ewarn "    AXFR and IXFR in addition to file transfer."
+				ewarn "    -> The zonefetch.xml file has been replaced by addns.xml"
+				ewarn "       to support this enhancement."
+				ewarn "    -> changes to the KASP database mean that a database"
+				ewarn "       migration is required to upgrade to 1.4 from earlier"
+				ewarn "       versions of OpenDNSSEC."
+				ewarn "  * The auditor is no longer supported."
+				ewarn ""
+				ewarn "You can find more information here:"
+				ewarn "  * /usr/share/doc/opendnssec*/MIGRATION*"
+				ewarn "  * https://wiki.opendnssec.org/display/DOCS/Migrating+zone+fetcher+to+DNS+adapters"
+				ewarn "  * https://wiki.opendnssec.org/display/DOCS/Migrating+from+earlier+versions+of+OpenDNSSEC"
+				ewarn ""
+			;;
+		esac
+	done
+}