more fixes (this time from flameeyes) for running ddclient daemon as non-root user. Fixes were in bug #76625, which was opened by: Giacomo Graziosi <darkssj@email.it> for the version bump

Package-Manager: portage-1.585-cvs

3 files changed, 27 insertions, 22 deletions

diff --git a/net-dns/ddclient/ChangeLog b/net-dns/ddclient/ChangeLog
index 98df3026b8de..f6c1cd6ae7e4 100644
--- a/net-dns/ddclient/ChangeLog
+++ b/net-dns/ddclient/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/ddclient
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ChangeLog,v 1.14 2005/04/02 16:34:29 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ChangeLog,v 1.15 2005/04/04 13:44:05 seemant Exp $
+
+  04 Apr 2005; Seemant Kulleen <seemant@gentoo.org> ddclient-3.6.6.ebuild:
+  more fixes (this time from flameeyes) for running ddclient daemon as
+  non-root user. Fixes were in bug #76625, which was opened by: Giacomo
+  Graziosi <darkssj@email.it> for the version bump
 
   02 Apr 2005; Jason Wever <weeve@gentoo.org> ddclient-3.6.3.ebuild:
   Stable on SPARC wrt bug #76625.
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index 841dc313f1ea..7ef068e41cd4 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -1,13 +1,13 @@
-MD5 7e84a11ed040b76f88f32ea67001ae4a ChangeLog 2506
-MD5 12b862f820872409361618e25f0d759e ddclient-3.6.2.ebuild 722
-MD5 b8d668f958515062588e752c36801f66 ddclient-3.6.3.ebuild 786
+MD5 c43c6ea39ad846a871dea4a6dc4fd11b ChangeLog 2778
 MD5 8a294636aa63272177527a8786f6e458 metadata.xml 335
-MD5 ec10c6b4f2df2f3eeb5888a9ac13e07e ddclient-3.6.6.ebuild 1699
-MD5 8547bd5960dc49726d62e1699742e474 files/ddclient-daemon0inconfig.diff 581
-MD5 b05219cfd27200ba052fcada5fde3430 files/ddclient-gentoo.diff 422
+MD5 b8d668f958515062588e752c36801f66 ddclient-3.6.3.ebuild 786
+MD5 3eb96c23d6ae6b548dd70ea51187be0f ddclient-3.6.6.ebuild 1733
+MD5 12b862f820872409361618e25f0d759e ddclient-3.6.2.ebuild 722
 MD5 938d0005b167a69deca19f3b6de7738f files/ddclient.rc6 718
 MD5 e76dc7def07572534af2a567136a3e31 files/digest-ddclient-3.6.2 65
 MD5 bfa4dd80f9d6255946772e0adb981bf7 files/digest-ddclient-3.6.3 65
+MD5 488f3a86b6234899dc87b1d1475b9f8c files/digest-ddclient-3.6.6 65
+MD5 8547bd5960dc49726d62e1699742e474 files/ddclient-daemon0inconfig.diff 581
 MD5 71bb38899e4dd28eb29fdab1f29c8d26 files/ddclient-mss1.diff 415
+MD5 b05219cfd27200ba052fcada5fde3430 files/ddclient-gentoo.diff 422
 MD5 edb34c213f0018c0a0a8e6e09f83e45e files/ddclient.init 732
-MD5 488f3a86b6234899dc87b1d1475b9f8c files/digest-ddclient-3.6.6 65
diff --git a/net-dns/ddclient/ddclient-3.6.6.ebuild b/net-dns/ddclient/ddclient-3.6.6.ebuild
index fc7f611038d9..878ea70ebbfc 100644
--- a/net-dns/ddclient/ddclient-3.6.6.ebuild
+++ b/net-dns/ddclient/ddclient-3.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ddclient-3.6.6.ebuild,v 1.1 2005/04/01 22:20:38 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ddclient-3.6.6.ebuild,v 1.2 2005/04/04 13:44:05 seemant Exp $
 
 inherit eutils
 
@@ -16,29 +16,32 @@ IUSE=""
 RDEPEND="dev-lang/perl"
 
 pkg_setup() {
-	enewgroup ddclient 460
-	enewuser  ddclient 460 /bin/false /dev/null ddclient
+	enewgroup ddclient -1
+	enewuser  ddclient -1 /bin/false /dev/null ddclient
 }
 
 src_unpack() {
 	unpack ${A}; cd ${S}
 	epatch ${FILESDIR}/${PN}-mss1.diff
 	epatch ${FILESDIR}/${PN}-daemon0inconfig.diff
+
+	sed -i 's:/var/run/ddclient.pid:/var/run/ddclient/ddclient.pid:' \
+		sample-etc_ddclient.conf
 }
 
 src_install() {
 	dosbin ddclient || die "dosbin"
-	insinto /etc/ddclient
-	doins sample-etc_[c-p]*
-	newins sample-etc_ddclient.conf ddclient.conf
-
 	dodoc README* Change* COPYRIGHT
+	dodoc sample-etc_[c-p]*
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/ddclient.init ddclient
+	newinitd ${FILESDIR}/ddclient.init ddclient
+	
+	insinto /etc/ddclient
+	insopts -m 0640 -g ddclient -o root
+	newins sample-etc_ddclient.conf ddclient.conf
 
-	chown root:ddclient ${D}/etc/ddclient/*
-	chmod 640 /etc/ddclient/*
+	diropts -m 0755 -g ddclient -o ddclient
+	keepdir /var/run/ddclient
 }
 
 pkg_postinst() {
@@ -56,7 +59,4 @@ pkg_postinst() {
 	einfo
 	ebeep
 	epause
-
-	chown root:ddclient ${ROOT}/etc/ddclient/*
-	chmod 640 ${ROOT}/etc/ddclient/*
 }