Version bump to correct paths and add runlevel scripts (thanks lorem_ipsum)

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

8 files changed, 121 insertions, 37 deletions

diff --git a/net-dns/dnssec-tools/ChangeLog b/net-dns/dnssec-tools/ChangeLog
index 1a09c642b7cd..3ef84f630042 100644
--- a/net-dns/dnssec-tools/ChangeLog
+++ b/net-dns/dnssec-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/dnssec-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-tools/ChangeLog,v 1.4 2012/06/23 21:44:18 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-tools/ChangeLog,v 1.5 2012/07/05 12:21:40 xmw Exp $
+
+*dnssec-tools-1.13-r1 (05 Jul 2012)
+
+  05 Jul 2012; Michael Weber <xmw@gentoo.org> -dnssec-tools-1.12.2-r2.ebuild,
+  +dnssec-tools-1.13-r1.ebuild, +files/dnssec-tools-1.13-dtinitconf.patch,
+  +files/donutsd.confd, +files/donutsd.initd, +files/rollerd.confd,
+  +files/rollerd.initd:
+  Version bump to correct paths and add runlevel scripts (thanks lorem_ipsum)
 
 *dnssec-tools-1.13 (23 Jun 2012)
 
diff --git a/net-dns/dnssec-tools/Manifest b/net-dns/dnssec-tools/Manifest
index a2209e624957..c43efea345ec 100644
--- a/net-dns/dnssec-tools/Manifest
+++ b/net-dns/dnssec-tools/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST dnssec-tools-1.12.2.tar.gz 3140018 RMD160 2a077c2ef74a4d0427932d8a806cdc32e185211a SHA1 e9912249fae3ec6bd5ad4ee1d73dea28acbefd0d SHA256 d7536e00c63e780f4cc4f6b3d4925078da36f2595682eaebdb936e5903711b60
+AUX dnssec-tools-1.13-dtinitconf.patch 575 RMD160 73e9c3c46b6892680d20ec8ef279e57ae5ba565d SHA1 9f2d775bccbdea99a25be17d8334b74b86847771 SHA256 139c1c27c14e34fc47ceec694ad9156268e26ffc64e8388b1f006a5a5c569f6f
+AUX donutsd.confd 342 RMD160 aab0c279aa663d4e3df9b1743d2eebcac14d8ba9 SHA1 e4fdc9193b43f0a077504ce3a12d9e2e3b1a78f3 SHA256 7af120f5cbec3d0e430c9b04417185e8f1745990665a8a2c8f3fd0baedd63433
+AUX donutsd.initd 633 RMD160 9d973680107d31f1d4e1ceee2242bfa6d2b36a91 SHA1 75e6f5e754338ef5e6e2b5630d9413f8195c5ce2 SHA256 a2f6db359f6c13fc59ec7bfca2a872d81abd8d73f841d105915273787c352a34
+AUX rollerd.confd 346 RMD160 c807dbeeaa0644db321d96aea705e44fb27c0af4 SHA1 7cbb3390686d42ef8b3bdda89a8e6aaa03782e84 SHA256 a2164c46778b848b9161c10edb09bf90b18e04821ae1f666dc0bc95bd1e9137e
+AUX rollerd.initd 520 RMD160 baf78727c4fbd30a095521f8409af6b7c1373c20 SHA1 1bc704090738b0bd064c60e6e98ce6370e586cbc SHA256 f0a415f190d7e0c891fe28f610cd905c733a9bd6ad5e982d2497882f45954c9b
 DIST dnssec-tools-1.13.tar.gz 3299592 RMD160 801534b539d30fc25620b88c436639ff989eb7c4 SHA1 67722968b65f497d256017c6daa944651b5cf305 SHA256 ac2caba324f96170406c202724344315371c3ef83815236e95b48a6021b2be91
-EBUILD dnssec-tools-1.12.2-r2.ebuild 1711 RMD160 8f78b34ebe5d0e933582e6828646b3242d23d381 SHA1 af10453c45ccbfd59259dd699c0dc91980762f34 SHA256 eabf7f3d8e06da87bfe7654444e5cc36a58d22555867507f982f4e2568cbc779
+EBUILD dnssec-tools-1.13-r1.ebuild 1675 RMD160 93558283ec00995f95f02de7e3dbc7914685b335 SHA1 b60a6d911f6b12fe9de1a8b805a669ef588854c6 SHA256 a5c2d46917f64f1ecee948cf885d6795f45456b91607984a669c9bd973678790
 EBUILD dnssec-tools-1.13.ebuild 1231 RMD160 f16bc37f9bceee0d16dc6eb4f4ddab51ad4e39b9 SHA1 4d8272e84267772da561a835416f2fc9ae5ab7f1 SHA256 fa6cad8d548fd813bc0eccfee92b4248138fb6be8a5457cd92f8cf6b847cb571
-MISC ChangeLog 978 RMD160 99af7c7f3968597f5689b15526b0f047e96e6131 SHA1 9831adf5428a35f62886a347fca98962bd3ab9f8 SHA256 acba04ff21e5f167011534a182bcfbac8be15759e6e4f9d62ce496e96b40fdff
+MISC ChangeLog 1339 RMD160 1e8560cc5f887236c36ce6876e03d22c5d1a60a1 SHA1 c2ff9a73b2d4c54861ee1726aab056a5d907fec5 SHA256 26d07260a23e5c2b9643799bfbfdf9992d41054d9e8359bdbcd674843b456aa8
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/mOIkACgkQknrdDGLu8JDUrAEAlvm+6wssw5uvI+op9Jbej+KH
-NfeAUkOU/Z5ynx2CvUYA/3JIXJR5J4jYRHludcSasSjPN5l/05ljG2XU98zC6nrZ
-=YEnH
+iF4EAREIAAYFAk/1hqEACgkQknrdDGLu8JAAVAD/eJDOUMYZYpVA7zziMjX3Wk2I
+9d1Qs2OIW9uGo36YRFkA/j6oBvhSlrK3AH3EKYLOxyDFsYsd4xDds08H1Q+EYasm
+=ldi8
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnssec-tools/dnssec-tools-1.12.2-r2.ebuild b/net-dns/dnssec-tools/dnssec-tools-1.13-r1.ebuild
index 5399bc2907ce..b5e1d9959ff1 100644
--- a/net-dns/dnssec-tools/dnssec-tools-1.12.2-r2.ebuild
+++ b/net-dns/dnssec-tools/dnssec-tools-1.13-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-tools/dnssec-tools-1.12.2-r2.ebuild,v 1.1 2012/06/18 15:28:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-tools/dnssec-tools-1.13-r1.ebuild,v 1.1 2012/07/05 12:21:40 xmw Exp $
 
 EAPI=4
 
-inherit qt4-r2
+inherit eutils qt4-r2
 
 DESCRIPTION="tools to ease the deployment of DNSSEC related technologies"
 HOMEPAGE="http://www.dnssec-tools.org/"
@@ -13,10 +13,10 @@ SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 static-libs threads"
+IUSE="static-libs"
 
 RDEPEND="dev-lang/perl
-	dev-libs/openssl
+	dev-perl/Crypt-OpenSSL-Random
 	dev-perl/Getopt-GUI-Long
 	dev-perl/GraphViz
 	dev-perl/MailTools
@@ -27,40 +27,32 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
 		-i Makefile.in || die
-
-	rm -r validator/apps/{dnssec-{check,nodes,system-tray},lookup}
+	sed -e 's:/usr/local/etc:/etc:g' \
+		-e 's:/usr/local:/usr:g' \
+		-i tools/donuts/donuts \
+		-i tools/etc/dnssec-tools/dnssec-tools.conf \
+		-i tools/scripts/genkrf || die
+	epatch "${FILESDIR}"/${P}-dtinitconf.patch
 }
 
 src_configure() {
 	econf \
 		--disable-bind-checks \
-		--with-dlv \
-		--with-nsec3 \
-		--with-gnu-ld \
-		--with-validator \
+		--without-validator \
 		--with-perl-build-args=INSTALLDIRS=vendor \
-		$(use_with ipv6) \
-		$(use_enable static-libs static) \
-		$(use_with threads)
-}
-
-src_compile() {
-	my_prognames="VALIDATOR=dnssec-validate
-		GETHOST=dnssec-gethost
-		GETADDR=dnssec-getaddr
-		GETRRSET=dnssec-getrrset
-		GETQUERY=dnssec-getquery
-		GETNAME=dnssec-getname
-		CHECK_CONF=dnssec-libval_check_conf
-		SRES_TEST=dnssec-libsres_test"
-	emake $my_prognames
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" $my_prognames install
-	if ! use static-libs ; then
-		find "${D}" -name "*.la" -delete || die
-	fi
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/rollerd.initd rollerd
+	newconfd "${FILESDIR}"/rollerd.confd rollerd
+
+	newinitd "${FILESDIR}"/donutsd.initd donutsd
+	newconfd "${FILESDIR}"/donutsd.confd donutsd
+
+	prune_libtool_files
 }
 
 pkg_postinst() {
@@ -68,4 +60,6 @@ pkg_postinst() {
 	elog "Please run 'dtinitconf' in order to set up the required"
 	elog "/etc/dnssec-tools/dnssec-tools.conf file"
 	einfo
+	elog "DNSSEC Validator has been split into net-dns/dnsval"
+	einfo
 }
diff --git a/net-dns/dnssec-tools/files/dnssec-tools-1.13-dtinitconf.patch b/net-dns/dnssec-tools/files/dnssec-tools-1.13-dtinitconf.patch
new file mode 100644
index 000000000000..9432771406c6
--- /dev/null
+++ b/net-dns/dnssec-tools/files/dnssec-tools-1.13-dtinitconf.patch
@@ -0,0 +1,23 @@
+--- dnssec-tools-1.13/tools/scripts/dtinitconf
++++ dnssec-tools-1.13/tools/scripts/dtinitconf
+@@ -59,7 +59,9 @@
+ my @COMMON_BINDLOCS =
+ (
+ 	"/usr/local/sbin",
++	"/usr/local/bin",
+ 	"/usr/sbin",
++	"/usr/bin",
+ );
+ 
+ #
+@@ -421,8 +423,8 @@
+ 
+ 	$admin	   = $opts{'admin'}	|| dnssec_tools_default("admin");
+ 
+-	$binddir   = $opts{'binddir'};
+-	$dtdir	   = $opts{'dtdir'};
++	$binddir   = $opts{'binddir'} || 'path';
++	$dtdir	   = $opts{'dtdir'} || 'path';
+ #	$viewimg   = $opts{'viewimage'}	|| dnssec_tools_default("viewimage");
+ 
+ 	$outfile   = $opts{'outfile'}	|| getconffile();
diff --git a/net-dns/dnssec-tools/files/donutsd.confd b/net-dns/dnssec-tools/files/donutsd.confd
new file mode 100644
index 000000000000..12a9e2809120
--- /dev/null
+++ b/net-dns/dnssec-tools/files/donutsd.confd
@@ -0,0 +1,9 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-tools/files/donutsd.confd,v 1.1 2012/07/05 12:21:40 xmw Exp $
+
+DONUTSD_CMD="donutsd"
+DONUTSD_CONFPATH="/etc/dnssec-tools/donutsd.db"
+DONUTSD_PID="/var/run/donutsd.pid"
+DONUTSD_OPTS=""
+
diff --git a/net-dns/dnssec-tools/files/donutsd.initd b/net-dns/dnssec-tools/files/donutsd.initd
new file mode 100644
index 000000000000..5495d31f50ac
--- /dev/null
+++ b/net-dns/dnssec-tools/files/donutsd.initd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-tools/files/donutsd.initd,v 1.1 2012/07/05 12:21:40 xmw Exp $
+
+depend() {
+	need mta
+}
+
+start() {
+	ebegin "Starting the DNSSEC monitoring daemon"
+	start-stop-daemon --start --pidfile ${DONUTSD_PIDFILE} --make-pidfile --background --exec ${DONUTSD_CMD} -- -i ${DONUTSD_CONFPATH} ${DONUTSD_OPTS}
+	eend $? "failed to start donutsd"
+}
+
+stop() {
+	ebegin "Stopping donutsd"
+	start-stop-daemon --stop --pidfile ${DONUTSD_PIDFILE}
+	eend $? "Failed to stop donutsd"
+}
diff --git a/net-dns/dnssec-tools/files/rollerd.confd b/net-dns/dnssec-tools/files/rollerd.confd
new file mode 100644
index 000000000000..4495ebc14c22
--- /dev/null
+++ b/net-dns/dnssec-tools/files/rollerd.confd
@@ -0,0 +1,9 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-tools/files/rollerd.confd,v 1.1 2012/07/05 12:21:40 xmw Exp $
+
+ROLLERD_CMD="rollerd"
+ROLLERD_RRFILE="/etc/dnssec-tools/dnssec-tools.rollrec"
+ROLLERD_KRFDIR="/var/bind/pri"
+ROLLERD_OPTS=""
+
diff --git a/net-dns/dnssec-tools/files/rollerd.initd b/net-dns/dnssec-tools/files/rollerd.initd
new file mode 100644
index 000000000000..d8f08ede0d48
--- /dev/null
+++ b/net-dns/dnssec-tools/files/rollerd.initd
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-tools/files/rollerd.initd,v 1.1 2012/07/05 12:21:40 xmw Exp $
+
+start() {
+	ebegin "Starting DNSSEC control daemon"
+	"${ROLLERD_CMD}" --rrfile "${ROLLERD_RRFILE}" \
+		-directory "${ROLLERD_KRFDIR}" ${ROLLERD_OPTS}
+	eend $? "failed to start rollerd"
+}
+
+stop() {
+	ebegin "stoping rollerd"
+	/usr/bin/rollctl -halt
+	eend $? "failed to stop rollerd"
+}