11 files changed, 143 insertions, 30 deletions
diff --git a/net-dns/ddclient/ChangeLog b/net-dns/ddclient/ChangeLog
index 2133586b3302..38972198765b 100644
--- a/net-dns/ddclient/ChangeLog
+++ b/net-dns/ddclient/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-dns/ddclient
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ChangeLog,v 1.12 2004/12/29 03:00:31 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ChangeLog,v 1.13 2005/04/01 22:20:38 seemant Exp $
+
+*ddclient-3.6.6 (01 Apr 2005)
+
+  01 Apr 2005; Seemant Kulleen <seemant@gentoo.org>
+  -files/ddclient-3.6.2-gentoo.diff, -files/ddclient-3.6.3-gentoo.diff,
+  -files/ddclient-3.6.3-mss1.diff, +files/ddclient.init,
+  +files/ddclient-daemon0inconfig.diff, +files/ddclient-gentoo.diff,
+  +files/ddclient-mss1.diff, ddclient-3.6.2.ebuild, ddclient-3.6.3.ebuild,
+  +ddclient-3.6.6.ebuild:
+  Get rid of some crufy diffs in files/ -- the changes across the versioned
+  diffs were not real changes, and so the diffs are shared now. Additionally,
+  with this version bump is a new initscript to take advantage of the chuid
+  argument to start-stop-daemon so that ddclient runs as the ddclient user,
+  rather than root.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index 52dc796d13b0..1f6b74b7b31d 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -1,10 +1,13 @@
-MD5 0bbe1ca0328372d806ab82e66a772496 ddclient-3.6.3.ebuild 788
-MD5 9a444c22ce20892b6940e29074316723 ddclient-3.6.2.ebuild 712
 MD5 49a28685e59d15b0250d7360aca4d201 ChangeLog 1695
+MD5 9a444c22ce20892b6940e29074316723 ddclient-3.6.2.ebuild 712
 MD5 8a294636aa63272177527a8786f6e458 metadata.xml 335
-MD5 71bb38899e4dd28eb29fdab1f29c8d26 files/ddclient-3.6.3-mss1.diff 415
+MD5 bb61d750c54c12d4af59c580417d5af2 ddclient-3.6.3.ebuild 787
+MD5 4f2e4e1d2d23b0fcd4df59249c468278 ddclient-3.6.6.ebuild 790
 MD5 c92c32c51f9e7178f456592ea0bef643 files/ddclient-3.6.2-gentoo.diff 427
-MD5 938d0005b167a69deca19f3b6de7738f files/ddclient.rc6 718
 MD5 b05219cfd27200ba052fcada5fde3430 files/ddclient-3.6.3-gentoo.diff 422
-MD5 bfa4dd80f9d6255946772e0adb981bf7 files/digest-ddclient-3.6.3 65
+MD5 71bb38899e4dd28eb29fdab1f29c8d26 files/ddclient-3.6.3-mss1.diff 415
+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 8547bd5960dc49726d62e1699742e474 files/ddclient-3.6.5-daemon0inconfig.diff 581
+MD5 488f3a86b6234899dc87b1d1475b9f8c files/digest-ddclient-3.6.6 65
diff --git a/net-dns/ddclient/ddclient-3.6.2.ebuild b/net-dns/ddclient/ddclient-3.6.2.ebuild
index d43bea42702f..f94323ef24ad 100644
--- a/net-dns/ddclient/ddclient-3.6.2.ebuild
+++ b/net-dns/ddclient/ddclient-3.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2.ebuild,v 1.16 2004/10/20 18:42:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ddclient-3.6.2.ebuild,v 1.17 2005/04/01 22:20:38 seemant Exp $
 
 inherit eutils
 
@@ -10,14 +10,14 @@ SRC_URI="http://burry.ca:4141/ddclient/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ppc sparc x86"
+KEYWORDS="~alpha ppc sparc x86 ~amd64"
 IUSE=""
 
 RDEPEND="dev-lang/perl"
 
 src_unpack() {
-	unpack ${P}.tar.gz
-	epatch ${FILESDIR}/${PF}-gentoo.diff
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${PN}-gentoo.diff
 }
 
 src_install() {
diff --git a/net-dns/ddclient/ddclient-3.6.3.ebuild b/net-dns/ddclient/ddclient-3.6.3.ebuild
index 1282c588f227..1ce6bed0bd6d 100644
--- a/net-dns/ddclient/ddclient-3.6.3.ebuild
+++ b/net-dns/ddclient/ddclient-3.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3.ebuild,v 1.9 2004/12/22 20:55:53 config Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ddclient-3.6.3.ebuild,v 1.10 2005/04/01 22:20:38 seemant Exp $
 
 inherit eutils
 
@@ -10,16 +10,15 @@ SRC_URI="http://members.rogers.com/ddclient/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PF}-gentoo.diff
-	epatch ${FILESDIR}/${PF}-mss1.diff
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${PN}-gentoo.diff
+	epatch ${FILESDIR}/${PN}-mss1.diff
 }
 
 src_install() {
diff --git a/net-dns/ddclient/ddclient-3.6.6.ebuild b/net-dns/ddclient/ddclient-3.6.6.ebuild
new file mode 100644
index 000000000000..fc7f611038d9
--- /dev/null
+++ b/net-dns/ddclient/ddclient-3.6.6.ebuild
@@ -0,0 +1,62 @@
+# 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 $
+
+inherit eutils
+
+DESCRIPTION="A perl based client for dyndns"
+HOMEPAGE="http://burry.ca:4141/ddclient/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+
+pkg_setup() {
+	enewgroup ddclient 460
+	enewuser  ddclient 460 /bin/false /dev/null ddclient
+}
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${PN}-mss1.diff
+	epatch ${FILESDIR}/${PN}-daemon0inconfig.diff
+}
+
+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
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/ddclient.init ddclient
+
+	chown root:ddclient ${D}/etc/ddclient/*
+	chmod 640 /etc/ddclient/*
+}
+
+pkg_postinst() {
+	echo
+	einfo
+	ewarn "The files in ${ROOT}etc/ddclient will be chowned to"
+	ewarn "root:ddclient, and chmodded to 640:"
+	ewarn "(user/group read; user write)"
+	ewarn "Please run etc-update and update your initscript to take"
+	ewarn "advantage of non-root permissions on the daemon"
+	ewarn "Further, please note that your config files must be owned"
+	ewarn "by the user ddclient or have group ownership by ddclient."
+	ewarn "In other words, please follow the ownership/permissions scheme"
+	ewarn "that has been laid out in /etc/ddclient for you."
+	einfo
+	ebeep
+	epause
+
+	chown root:ddclient ${ROOT}/etc/ddclient/*
+	chmod 640 ${ROOT}/etc/ddclient/*
+}
diff --git a/net-dns/ddclient/files/ddclient-3.6.2-gentoo.diff b/net-dns/ddclient/files/ddclient-3.6.2-gentoo.diff
deleted file mode 100644
index 8b5c383a0fa9..000000000000
--- a/net-dns/ddclient/files/ddclient-3.6.2-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ddclient-3.6.2/ddclient~	Mon Jul  2 18:18:12 2001
-+++ ddclient-3.6.2/ddclient	Mon Jul  9 16:52:02 2001
-@@ -20,7 +20,7 @@
- $program  =~ s/d$//;
- my $now       = time;
- my $hostname  = hostname();
--my $etc       = ($program =~ /test/i) ? './'   : '/etc/';
-+my $etc       = ($program =~ /test/i) ? './'   : '/etc/ddclient/';
- my $savedir   = ($program =~ /test/i) ? 'URL/' : '/tmp/';
- my $msgs      = '';
- my $last_msgs = '';
diff --git a/net-dns/ddclient/files/ddclient-daemon0inconfig.diff b/net-dns/ddclient/files/ddclient-daemon0inconfig.diff
new file mode 100644
index 000000000000..732a6e9362d4
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient-daemon0inconfig.diff
@@ -0,0 +1,15 @@
+--- ddclient.orig	2005-01-16 15:18:36.485003496 -0500
++++ ddclient	2005-01-16 15:19:15.628052848 -0500
+@@ -924,6 +924,12 @@
+ 	my $def    = $variables{'merged'}{$k};
+ 	my $ovalue = define($globals{$k}, $def->{'default'});
+ 	my $value  = check_value($ovalue, $def);
++
++	# we should really be allowed to set daemon to 0 in the config file
++	if ($k eq 'daemon' && $ovalue == 0) {
++		$value = $ovalue;
++	}
++
+ 	if ($def->{'required'} && !defined $value) {
+ 	    $value = default($k);
+ 	    warning("'%s=%s' is an invalid %s. (using default of %s)", $k, $ovalue, $def->{'type'}, $value);
diff --git a/net-dns/ddclient/files/ddclient-3.6.3-gentoo.diff b/net-dns/ddclient/files/ddclient-gentoo.diff
index 01f224ce9850..01f224ce9850 100644
--- a/net-dns/ddclient/files/ddclient-3.6.3-gentoo.diff
+++ b/net-dns/ddclient/files/ddclient-gentoo.diff
diff --git a/net-dns/ddclient/files/ddclient-3.6.3-mss1.diff b/net-dns/ddclient/files/ddclient-mss1.diff
index 27ca8b143e29..27ca8b143e29 100644
--- a/net-dns/ddclient/files/ddclient-3.6.3-mss1.diff
+++ b/net-dns/ddclient/files/ddclient-mss1.diff
diff --git a/net-dns/ddclient/files/ddclient.init b/net-dns/ddclient/files/ddclient.init
new file mode 100644
index 000000000000..6af552acef32
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient.init
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/files/ddclient.init,v 1.1 2005/04/01 22:20:38 seemant Exp $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/ddclient/ddclient.conf ] ; then
+		eerror "You need a /etc/ddclient/ddclient.conf file to run ddclient"
+		eerror "There is a sample file in /etc/ddclient/"
+		return 1
+	fi
+
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting DDClient"
+	start-stop-daemon --start --chuid ddclient --quiet --exec /usr/sbin/ddclient 2&>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping DDClient"
+	start-stop-daemon --stop --quiet --name ddclient
+	eend $?
+}
diff --git a/net-dns/ddclient/files/digest-ddclient-3.6.6 b/net-dns/ddclient/files/digest-ddclient-3.6.6
new file mode 100644
index 000000000000..2bcb01da561b
--- /dev/null
+++ b/net-dns/ddclient/files/digest-ddclient-3.6.6
@@ -0,0 +1 @@
+MD5 9bdc93c0352c5fcc650773da7ecedb6d ddclient-3.6.6.tar.gz 36726