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

(Portage version: 2.1.11.4/cvs/Linux x86_64)

7 files changed, 110 insertions, 30 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/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"
+}