Improve the initscript to die on certain occasions. Rerun the pkg_pretend phase as the variables are not ensured to be saved.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

5 files changed, 64 insertions, 17 deletions

diff --git a/net-dns/opendnssec/ChangeLog b/net-dns/opendnssec/ChangeLog
index ff748482b5f9..43211367c02e 100644
--- a/net-dns/opendnssec/ChangeLog
+++ b/net-dns/opendnssec/ChangeLog
@@ -1,6 +1,14 @@
 # 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.2 2011/06/02 15:38:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.3 2011/06/06 18:44:39 scarabeus Exp $
+
+*opendnssec-1.3.0_rc2-r1 (06 Jun 2011)
+
+  06 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -opendnssec-1.3.0_rc2.ebuild, +opendnssec-1.3.0_rc2-r1.ebuild,
+  files/opendnssec.confd, files/opendnssec.initd:
+  Improve the initscript to die on certain occasions. Rerun the pkg_pretend
+  phase as the variables are not ensured to be saved.
 
   02 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   opendnssec-1.3.0_rc2.ebuild:
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 33de593fb31f..f754256f3749 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,10 +1,20 @@
+-----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-rename-test.patch 331 RMD160 34705b28224154aa7e13b15d023f16dcfaf7892e SHA1 4e7653e8425e49d98bc14d009788efbb970366e2 SHA256 d140d1da7df9ba34195097394c715fdf01ace6290325dbe9919f6666a11627d7
 AUX opendnssec-use-system-trang.patch 765 RMD160 8d00ea18c61f2505fb445fcd7245bc6d757b72c5 SHA1 cf997f34f78456f37f6e5e93e4a7c78171cd20f3 SHA256 f9c8c58ce8b50183b3b709876a1c4bd0b5a0eb5c0b852995118db5eead1f9f1d
-AUX opendnssec.confd 602 RMD160 7ed98a8d33205ea51eb8da842643f9dca83e513f SHA1 7c92512b21f8eb83944a0ba46fe093c984da6efc SHA256 292246420078b9e9765f10e873602ed8c1ac4d7989f11a6a7eb471961c046c62
-AUX opendnssec.initd 2010 RMD160 ea683029afce4642b911ec1d5a48b7c7f23af3b2 SHA1 0736e32c717a01746515e30479d9e1dc600eb099 SHA256 65e60b6289f7cc4ac0d18429fa50e870ca9f474b589e6d461ea68b903fab7fd0
+AUX opendnssec.confd 604 RMD160 fef2b1642e5fe1aa41e66f673fc03c204ee67228 SHA1 4bb8706c5fea92b23d71e4e8b1e4f4c2e954c41e SHA256 85e67e2df2a86f78e17e64eedbad513c69118649680aa9ca4ecaab73abf9f5e6
+AUX opendnssec.initd 2799 RMD160 865172b8838b03edf15d506af5930f126a303217 SHA1 cf4d84dcab389d81623750488a7e0216e6c019cb SHA256 c73be15d8b2f05a49cb6bb6e110b8db366440012cda4adcc0dc5689aaa2d8b1b
 DIST opendnssec-1.3.0rc2.tar.gz 1668777 RMD160 d7d66029f9aade7f730b6dadd8bde5e8da560b6a SHA1 447da48b4a56987ec3320e2ddc2839c2c14de86a SHA256 f4bf47f6007b2047915291002c52955dd508797276119d7bc4897e257b4ae23b
-EBUILD opendnssec-1.3.0_rc2.ebuild 5081 RMD160 5dcde4b96e290bf8e8dbfa50ee7aa8e91d25cdf1 SHA1 054b62a29849dcd16ad57941fdcbe095d392c5e6 SHA256 ba901b22cb95ea76bf933f0afb74a75765b3c23e5bd38efa2202a5a3357b0c1c
-MISC ChangeLog 801 RMD160 16d4d2f258e6a3b29cfd3805b80508360b059e7d SHA1 43b600f07665028966db319f6719de7e899508a7 SHA256 1bd21ffb5120d9dc5d829f009d725ea5d7b1f6f76daac4aa065878322453330d
+EBUILD opendnssec-1.3.0_rc2-r1.ebuild 5174 RMD160 47b21437e946a277dd3f78efebac4f6970f61aae SHA1 ec65c604c24314ef5d76f8ba7bbb0e876a6da3d5 SHA256 b03a781a4523429fee7ca2960ad68cfbf0d58f246d82779a93bfadb5b66cd9b0
+MISC ChangeLog 1142 RMD160 36ffb192ae7c5661097d355a94ed9883c7575f05 SHA1 f1e83c7d2462f55e0d308e8706c661d402c252e1 SHA256 dc184fc441ec301f22ebaa395578a2b249fad51e0b82f0edb1e2e27aab37e4d1
 MISC metadata.xml 949 RMD160 5e7a1c1a843c39419fb93f3edecc35bdbc9a7fdc SHA1 b956cada0576409d10708d3cdf473d84ac89d4e2 SHA256 615711bce50ebc27af5a97dbab4a01c17f0e9370b9a6d801e4561975eceea905
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3tIB0ACgkQHB6c3gNBRYe4pwCfSjkLNmv716ZMK8x3PFMOFvHs
+f24AnA/am5stn1Jta2bTezSxyyDugvig
+=/oXF
+-----END PGP SIGNATURE-----
diff --git a/net-dns/opendnssec/files/opendnssec.confd b/net-dns/opendnssec/files/opendnssec.confd
index d019e280cf70..88a7f2499fb1 100644
--- a/net-dns/opendnssec/files/opendnssec.confd
+++ b/net-dns/opendnssec/files/opendnssec.confd
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/files/opendnssec.confd,v 1.1 2011/06/02 12:26:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/files/opendnssec.confd,v 1.2 2011/06/06 18:44:40 scarabeus Exp $
 
 # Variables containing default binaries used in the opendnssec
 # initscript. You can alter them to another applications/paths
 # if required.
 
-CHECKCONF_BIN=/usr/bin/ods-kaspcheck
+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 b/net-dns/opendnssec/files/opendnssec.initd
index 8b14ac2333ff..1f63aa09bd82 100644
--- a/net-dns/opendnssec/files/opendnssec.initd
+++ b/net-dns/opendnssec/files/opendnssec.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/files/opendnssec.initd,v 1.1 2011/06/02 12:26:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/files/opendnssec.initd,v 1.2 2011/06/06 18:44:40 scarabeus Exp $
 
 description="An open-source turn-key solution for DNSSEC"
 
@@ -23,16 +23,23 @@ checkconfig() {
 		fi
 		return $errors
 	fi
+	eerror "Unable to execute ${CHECKCONFIG_BIN:-config binary}"
 	# can't validate config, just die
 	return 1
 }
 
 
 start_enforcer() {
-	if [ -x "${ENFORCER_BIN}" ]; then
+	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
 }
 
@@ -45,10 +52,16 @@ stop_enforcer() {
 }
 
 start_signer() {
-	if [ -x "${SIGNER_BIN}" ]; then
+	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
 }
 
@@ -61,17 +74,33 @@ stop_signer() {
 }
 
 start_eppclient() {
-	if [ -x "${EPPCLIENT_BIN}" ]; then
+	if [ -n "${EPPCLIENT_BIN}" ] && [ -x "${EPPCLIENT_BIN}" ]; then
 		ebegin "Starting OpenDNSSEC Eppclient"
-		start-stop-daemon --start --user opendnssec --group opendnssec --exec "${EPPCLIENT_BIN}" --pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
+		start-stop-daemon \
+			--start \
+			--user opendnssec --group opendnssec \
+			--exec "${EPPCLIENT_BIN}" \
+			--pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
 		eend $?
+	else
+		# eppclient is ofptional so if we use the default binary and it
+		# is not used we won't die
+		if [ -n "${EPPCLIENT_BIN}" ] && \
+				[ "${EPPCLIENT_BIN}" != "/usr/sbin/eppclientd" ]; then
+			eerror "OpenDNSSEC Eppclient binary not executable"
+			return 1
+		fi
+		einfo "OpenDNSSEC Eppclient not used."
 	fi
 }
 
 stop_eppclient() {
 	if [ -x "${EPPCLIENT_BIN}" ]; then
 		ebegin "Stopping OpenDNSSEC Eppclient"
-		start-stop-daemon --stop --exec "${EPPCLIENT_BIN}" --pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
+		start-stop-daemon \
+			--stop \
+			--exec "${EPPCLIENT_BIN}" \
+			--pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
 		eend $?
 	fi
 }
diff --git a/net-dns/opendnssec/opendnssec-1.3.0_rc2.ebuild b/net-dns/opendnssec/opendnssec-1.3.0_rc2-r1.ebuild
index 1532633f1f25..128f662630e7 100644
--- a/net-dns/opendnssec/opendnssec-1.3.0_rc2.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.3.0_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.0_rc2.ebuild,v 1.3 2011/06/04 01:15:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.0_rc2-r1.ebuild,v 1.1 2011/06/06 18:44:39 scarabeus Exp $
 
 EAPI=4
 
@@ -76,15 +76,12 @@ check_pkcs11_setup() {
 		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}
@@ -120,6 +117,9 @@ pkg_pretend() {
 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() {