Bump revision, Improve confd and initd file

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x296C6CCA35A64134

5 files changed, 17 insertions, 110 deletions

diff --git a/net-dns/opendnssec/ChangeLog b/net-dns/opendnssec/ChangeLog
index f897af7deb01..b0baca88c542 100644
--- a/net-dns/opendnssec/ChangeLog
+++ b/net-dns/opendnssec/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/opendnssec
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.26 2013/07/08 11:43:49 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.27 2013/07/23 20:00:56 mschiff Exp $
+
+*opendnssec-1.4.1-r1 (23 Jul 2013)
+
+  23 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org> -opendnssec-1.4.1.ebuild,
+  +opendnssec-1.4.1-r1.ebuild, -files/opendnssec.confd.14,
+  -files/opendnssec.initd.14:
+  Bump revision, Improve confd and initd file
 
   08 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org> -opendnssec-1.3.13.ebuild,
   -opendnssec-1.4.0.ebuild, +opendnssec-1.4.1.ebuild,
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 9e94b7a16542..0f6b823ff5b2 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -5,18 +5,16 @@ AUX opendnssec-drop-privileges.patch 641 SHA256 9bc831bf45a022a9be1a2bd6ee80d9e0
 AUX opendnssec-fix-localstatedir.patch 1693 SHA256 e9a29b3adf22ef6dd3a0ac43d2a48e2705ae09cd7550b4f3294b89dcd7814ecd SHA512 86700c97bb482f5fa6d99fe8f105c41e8798de542e6cf5fd4d6c14da11237e4fd11eccb2900de4893898d7855e31beb6572c709c2dad9774d5fe440673af2627 WHIRLPOOL 56c5e876e2e2832265474c3772a44efa288eb387438a6864d85956a990f9cedc81e60dc7922448d647702359e835c0fef7db1d6d5e643b195cd6ad26117c3f53
 AUX opendnssec-fix-run-dir.patch 1272 SHA256 cb0fdf4100ba41421e61b7981bd64a1f0b7f2ed8f3d7b10d8a1647003584e26c SHA512 1745430b2c12f4888e20a86a20a87f9c61e0e5fc59e71885cb8d3b0a76380bac931311593822edd1d6b8010d8de4260c9c0e68469529bb0eefc21d2909e9e2f7 WHIRLPOOL 36cd4c1bda088ab20fddae32b5f3f6a4e48cce1dc075ecbba01baa98ad7b7b2fb40ef47e8eb1315ebe63c87ac444b74480341ed95294eb425c8a5db4bb8122eb
 AUX opendnssec-use-system-trang.patch 614 SHA256 7e8485e0f8ff1df5f9f799b908c802cf3670ecfcff6e3bf858d69429638e86b4 SHA512 9e95943d145ce7a05e32af60a944c6ee6d74fdff0fa9f0ea233070b44567bce4f5ca6bde57411effa7bab192ec58face34cddf2c349ccff3b78fc66c1f35074d WHIRLPOOL 82282bc2fc7797ff946aee5cee6e182abde0b65283865a9b084613a0dba7e53762494197c7479a6324fc3c81c8c80acf9d0d8a898a183acfe6ab62cf2a6ed1e6
-AUX opendnssec.confd 594 SHA256 e9853b33a760c9d8c7091f4e0f3e0e5dd2dabd03e59e89301f39b1e10d4f2ba0 SHA512 0c7a50f145d7dc3194600379b0936b2da5439654e18d24b22625fda2fb1c6e8ddc5f6f6313c5d4c5ed59e63d54f7ae3c190bc6e584c3719dc00d157e8b3db75b WHIRLPOOL 060fbd84f5863d80684e8573324e982daa155cf854612bf3ded5b5dbea902353a092c401fc7cbca74f28357653aeb8d9cd81cb4f45a7ddf1993e05329c1f107c
-AUX opendnssec.confd.14 513 SHA256 faafbd15573dd0454d1d2e1a893d8e0ea216fbc2edcb60b9b57e326d1406cac5 SHA512 4cdb4787dbdd1968c77285f7af038a54017baf82bacfecce4a1df97727f896289b91e4153d5c74e0f3a588451a4495db882167dcbb7ce9d526b9c2f55b007950 WHIRLPOOL 278f1ed6b50a210e63416735197c50796685568962bb9d4e4f357e6599cb7a7a596bc4a0e230da3583c04f61df4f8c209c6e935a6f06781963ff2f13cf7493ce
-AUX opendnssec.initd 2799 SHA256 c73be15d8b2f05a49cb6bb6e110b8db366440012cda4adcc0dc5689aaa2d8b1b SHA512 725b1614480e6dcd38c30827eedfe1dc8161b11d424e9a40d8660776352c6c8f496800967511f1543d3449eeaabc4f11437ee7dd1470b88104637242e4760705 WHIRLPOOL bc843f1b26b21e618fca9ca756cb8867441405ed1ea650289d7af7383e6f00d50e20d1b3d60e6909b85cbf039431114a5f4ad7a8cd15c14e0d8e7f1abf8a287e
-AUX opendnssec.initd.14 1920 SHA256 c67619a509ebfe3e395ca2a0fb78567175ccc8e8b331a9b81bad31988ed5ad26 SHA512 62bb01fbe6ee6ff9c98368f888b9efa1bde2db0ad1b1dc5547e8b0d731905f0c038fadc5d810ae70f4e4c58337748d812dd46e0329b0392c4daa4200677ff629 WHIRLPOOL 241ac8b71daa74d20086a4875c0aa9b88d67c6985dc0aa099979bf2d0c82c122fd3dee4360c7f90bdbe9818badd28654ba287979b6b57a9634b9a816c1071199
+AUX opendnssec.confd 513 SHA256 faafbd15573dd0454d1d2e1a893d8e0ea216fbc2edcb60b9b57e326d1406cac5 SHA512 4cdb4787dbdd1968c77285f7af038a54017baf82bacfecce4a1df97727f896289b91e4153d5c74e0f3a588451a4495db882167dcbb7ce9d526b9c2f55b007950 WHIRLPOOL 278f1ed6b50a210e63416735197c50796685568962bb9d4e4f357e6599cb7a7a596bc4a0e230da3583c04f61df4f8c209c6e935a6f06781963ff2f13cf7493ce
+AUX opendnssec.initd 1920 SHA256 c67619a509ebfe3e395ca2a0fb78567175ccc8e8b331a9b81bad31988ed5ad26 SHA512 62bb01fbe6ee6ff9c98368f888b9efa1bde2db0ad1b1dc5547e8b0d731905f0c038fadc5d810ae70f4e4c58337748d812dd46e0329b0392c4daa4200677ff629 WHIRLPOOL 241ac8b71daa74d20086a4875c0aa9b88d67c6985dc0aa099979bf2d0c82c122fd3dee4360c7f90bdbe9818badd28654ba287979b6b57a9634b9a816c1071199
 DIST opendnssec-1.4.1.tar.gz 988263 SHA256 7795ba9f98f9c8292d5f9f9d6ffbf88352a6f77986f43acc1a30141f6027cc82 SHA512 f11f52bc901eaf437ba30eaddceb8b2a4eb8b79f98c40362c22a43389203318980332dcbe05f0574f47f96185c5c9c8f7f29c2282adafa8a012f2d387f9ca90e WHIRLPOOL b1a2a3411c3b7f7ca3ef42eb73c919ca0ed7cff821aecd1f7ba76557dd905d9d3bf9f02cd24c2651859e007ea4c2ce8e5c6bd50121c48ebeff720d42e3b02ffd
-EBUILD opendnssec-1.4.1.ebuild 5997 SHA256 f49067d681cf2361de3f4c6254f68c3b6cd6402d36fcfb4c4918fabd29dba6cb SHA512 776da5acf917960362070554960800dd03c772ea78b356f10360e0858692ce05b0044c80739b3d99b0707a5ccd5f6ad7277692b1d52524478fc3e3295500dc93 WHIRLPOOL 40258cfbe312d3e4289adac98cc759ce9cfc94339561d123378477383b6a7655235e616b6495376644be2fd1c84e9b0cb64c5964dfbe5048c5a2371ed6f120b3
-MISC ChangeLog 5659 SHA256 e6255a7446eeccf505d4ef2c7598c84c949eac719dc23d2e1c8f81064b07cc41 SHA512 7624d085eafa5b29705d0c52ed6a637d24bbc41c17e1cd1d9ceb7390513df92b2ae59adbc071ee25dd284652842329a00f389fd42ef6d9a2c8b2f308bbbb3c83 WHIRLPOOL 79b5513bdcbf4c18f818aa7e41c6ccb34dba54ddc49e72b3af67b1835c23ab079c5074d9cc38ea553c2070b339f10472337fea6b241596706b7754e43ec05a74
+EBUILD opendnssec-1.4.1-r1.ebuild 6000 SHA256 3229ed12f7fd8c0486f9edaa9d36d87b016e4fb75d057d3764dacb531d6de8cf SHA512 4bab5a3e5b4089fd5f8163e87e9c24c93ea2d14ec889f80bedbf01c20155e5fca9844367de81bb434478c213f25fd8f69dcdd684f1f48630da62a1ad5152358b WHIRLPOOL f5e1db5414788a1540d8c064fcf391e8266a10efe78ba222dbca0f9dd5750cf243800ecd3ba512e9a930403bf6522a06ab390f8815da58a21a865cda17aef340
+MISC ChangeLog 5910 SHA256 76159c8ffa50b22b709489bddd9a852884551f683b5fed627bced064a4a927f6 SHA512 d0c832285756891b6ec3e94344f71e7eb6fcd9458baf050cb6374c949633628096f7e17875cd4e6f49ad361373abc680d9bffe83fb93bef3e9ca81822cc20eac WHIRLPOOL 4c4d37ae4c7b4bda9ebc81dc4f45f562367d482ca142e4a5e2880843df79fb69f3476cfc45f3d7eba17d8c9d681012d87c75d5d715e30863412815b5db57633d
 MISC metadata.xml 704 SHA256 a6c48088b1c1acfc99e4f92ca344f2658fce3f898071a6450acfa5ae18faf37d SHA512 519f896fd7a19174a3185a9b19df020975e11d111299eea1475a27339a9d7bf113052182c38d9e4145f0284b1a88171efee9e6da5b3ba155088a9b80323671b3 WHIRLPOOL 86e5d71fe499f9ef1b9fa81a1060e2df8e6895922cebb048ab2344a01471aa3944fcbe32f57e7709cd71f9a2301a561dd0c122465a9965f97beb973f1ec160af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iD8DBQFR2qX5KWxsyjWmQTQRCOhTAJ0SGifjU7niJfknF2d7z+6xMK9n5ACgkdSh
-g9NJ17d6p8oUIiydsrcF7L4=
-=Jg8M
+iD8DBQFR7uD9KWxsyjWmQTQRCHW/AJ41lEfLGIYln9ANI+dMA0kuLh+dhACcDFQo
+jZX+YfkRxavicPwHLCe4g+c=
+=Ul58
 -----END PGP SIGNATURE-----
diff --git a/net-dns/opendnssec/files/opendnssec.confd.14 b/net-dns/opendnssec/files/opendnssec.confd.14
deleted file mode 100644
index 73e79e1c4e4b..000000000000
--- a/net-dns/opendnssec/files/opendnssec.confd.14
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/files/opendnssec.confd.14,v 1.1 2013/05/12 22:03:21 mschiff Exp $
-
-# Variables containing default binaries used in the opendnssec
-# initscript. You can alter them to another applications/paths
-# if required.
-
-CHECKCONFIG_BIN=/usr/bin/ods-kaspcheck
-CONTROL_BIN=/usr/sbin/ods-control
-ENFORCER_BIN=/usr/sbin/ods-enforcerd
-SIGNER_BIN=/usr/sbin/ods-signerd
diff --git a/net-dns/opendnssec/files/opendnssec.initd.14 b/net-dns/opendnssec/files/opendnssec.initd.14
deleted file mode 100644
index f20618e8abbe..000000000000
--- a/net-dns/opendnssec/files/opendnssec.initd.14
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/files/opendnssec.initd.14,v 1.1 2013/05/12 22:03:21 mschiff Exp $
-
-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
-	eerror "Unable to execute ${CHECKCONFIG_BIN:-config binary}"
-	# can't validate config, just die
-	return 1
-}
-
-
-start_enforcer() {
-	if [ -n "${ENFORCER_BIN}" ] && [ -x "${ENFORCER_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Enforcer"
-		${CONTROL_BIN} enforcer start > /dev/null
-		eend $?
-	else
-		if [ -n "${ENFORCER_BIN}" ]; then
-			eerror "OpenDNSSEC Enforcer binary not executable"
-			return 1
-		fi
-		einfo "OpenDNSSEC Enforcer not used."
-	fi
-}
-
-stop_enforcer() {
-	if [ -x "${ENFORCER_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Enforcer"
-		${CONTROL_BIN} enforcer stop > /dev/null
-		eend $?
-	fi
-}
-
-start_signer() {
-	if [ -n "${SIGNER_BIN}" ] && [ -x "${SIGNER_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Signer"
-		${CONTROL_BIN} signer start > /dev/null 2>&1
-		eend $?
-	else
-		if [ -n "${SIGNER_BIN}" ]; then
-			eerror "OpenDNSSEC Signer binary not executable"
-			return 1
-		fi
-		einfo "OpenDNSSEC Signer not used."
-	fi
-}
-
-stop_signer() {
-	if [ -x "${SIGNER_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Signer"
-		${CONTROL_BIN} signer stop > /dev/null 2>&1
-		eend $?
-	fi
-}
-
-start() {
-	checkconfig || return $?
-	start_enforcer || return $?
-	start_signer || return $?
-}
-
-stop() {
-	stop_signer
-	stop_enforcer
-	sleep 5
-}
diff --git a/net-dns/opendnssec/opendnssec-1.4.1.ebuild b/net-dns/opendnssec/opendnssec-1.4.1-r1.ebuild
index 9811b9152e79..3c105618cb77 100644
--- a/net-dns/opendnssec/opendnssec-1.4.1.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.4.1.ebuild,v 1.1 2013/07/08 11:43:49 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.4.1-r1.ebuild,v 1.1 2013/07/23 20:00:56 mschiff Exp $
 
-EAPI=4
+EAPI=5
 
 MY_P="${P/_}"
 PKCS11_IUSE="+softhsm opensc external-hsm"