add the missing conf.d file from bug #117124, and patched the ebuild to die on failed installs. Additionally, make sample config files install as .sample files, to close bug #148074 by Paul Bredbury

(Portage version: 2.1.2_pre1)

3 files changed, 15 insertions, 8 deletions

diff --git a/net-dns/ddclient/ChangeLog b/net-dns/ddclient/ChangeLog
index 9f801e4ef54d..df9b000a3a8c 100644
--- a/net-dns/ddclient/ChangeLog
+++ b/net-dns/ddclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/ddclient
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ChangeLog,v 1.23 2006/09/08 10:55:41 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ChangeLog,v 1.24 2006/09/18 15:49:38 seemant Exp $
+
+  18 Sep 2006; Seemant Kulleen <seemant@gentoo.org> +files/ddclient.confd,
+  ddclient-3.7.0.ebuild:
+  add the missing conf.d file from bug #117124, and patched the ebuild to die
+  on failed installs. Additionally, make sample config files install as
+  .sample files, to close bug #148074 by Paul Bredbury
 
   08 Sep 2006; Seemant Kulleen <seemant@gentoo.org>
   +files/ddclient-reasonable-security.patch:
diff --git a/net-dns/ddclient/ddclient-3.7.0.ebuild b/net-dns/ddclient/ddclient-3.7.0.ebuild
index 6bb1cfaba773..1c701878b766 100644
--- a/net-dns/ddclient/ddclient-3.7.0.ebuild
+++ b/net-dns/ddclient/ddclient-3.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ddclient-3.7.0.ebuild,v 1.1 2006/09/08 00:22:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ddclient-3.7.0.ebuild,v 1.2 2006/09/18 15:49:38 seemant Exp $
 
 inherit eutils
 
@@ -41,21 +41,20 @@ src_install() {
 	dosbin ${PN} || die "dosbin failed"
 	dodoc README* Change* COPYRIGHT sample*
 
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die "newinitd failed"
 
-	# Determine name of sample configuration file
+	# Filename of sample conf - use live filename if available
 	local sample=${PN}.conf
-	[[ -e /etc/${PN}/${sample} ]] && sample=${PN}-sample.conf
+	[[ -e "${ROOT}/etc/${PN}/${sample}" ]] && sample="${sample}.sample"
 
 	insinto /etc/${PN}
 	insopts -m 0640 -o root -g ${PN}
-	newins sample-etc_${PN}.conf ${sample}
+	newins sample-etc_${PN}.conf "${sample}" || die "newins conf failed"
 
 	insinto /etc/conf.d
 	insopts -m 0644 -o root -g root
-	newins "${FILESDIR}"/${PN}.confd ${PN}
+	newins "${FILESDIR}"/${PN}.confd ${PN} || die "newins confd failed"
 
 	diropts -m 0755 -o ${PN} -g ${PN}
 	keepdir /var/{cache,run}/${PN}
 }
-
diff --git a/net-dns/ddclient/files/ddclient.confd b/net-dns/ddclient/files/ddclient.confd
new file mode 100644
index 000000000000..2408a40bb6f4
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient.confd
@@ -0,0 +1,2 @@
+# No need to specify a pid in /etc/ddclient/ddclient.conf
+PIDFILE=/var/run/ddclient/ddclient.pid