Fixes bug 380351

Package-Manager: portage-2.1.10.3/cvs/Linux i686

4 files changed, 127 insertions, 5 deletions

diff --git a/net-dns/ddclient/ChangeLog b/net-dns/ddclient/ChangeLog
index 0a3218fffc40..8a96069dd8d4 100644
--- a/net-dns/ddclient/ChangeLog
+++ b/net-dns/ddclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/ddclient
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ChangeLog,v 1.42 2011/08/13 00:47:23 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ChangeLog,v 1.43 2011/08/23 20:52:03 titanofold Exp $
+
+*ddclient-3.8.1-r2 (23 Aug 2011)
+
+  23 Aug 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  +ddclient-3.8.1-r2.ebuild, +files/ddclient.initd-r2:
+  Fixes bug 380351
 
 *ddclient-3.8.1-r1 (13 Aug 2011)
 
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index 04f67c9674d0..5d172388082d 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -5,6 +5,7 @@ AUX ddclient-reasonable-security.patch 858 RMD160 0be9d1a9412225361f6352322ee5af
 AUX ddclient.confd 97 RMD160 dab278d7ed0ab8fe9f01c072be549d532f20b5d4 SHA1 90ede573df78aa242b9fec7f6d9f05f0c937fb2b SHA256 7a05a1c016dcffa2033da00e8a58072d0df33c31bc8b96170929032567cb44ab
 AUX ddclient.initd 1227 RMD160 033f85c34d5126ce259687c565e16e78f01c4a6e SHA1 cc5e7fff44cba718090178db4cea756727007796 SHA256 9b2767317351437dcf71c59ef4ab15af0e4953465b17774980449885059aa925
 AUX ddclient.initd-r1 1195 RMD160 3b3355b15cd525a88b9c2d8bceb18749bb6cc1bb SHA1 e114f5a8485c270a2960e2ffa7790f2a130910bf SHA256 48befb2e5ce84e3912ce790a56f438ff988a2d2716fdcd2c127682a042702451
+AUX ddclient.initd-r2 1195 RMD160 57c5bbf4fdd0177cd496fb60c5e96bf67be12c78 SHA1 fc2334d3a76efb49ddf4529cc976bccedeb44fd9 SHA256 4b8751bff328bbe07433fef461374c3f88dbe02fd41b44be7f133c638e03249e
 AUX iproute2.patch 1394 RMD160 a00957383caac99a71a75002900db5451ea506c6 SHA1 cec85753255f3d77f2249550591cbf8d497a304a SHA256 182a2bde1aa66a79fe38ea08e5fa612a8421c2554ea1bfd179c22628899d9871
 DIST ddclient-3.7.3.tar.gz 42034 RMD160 df40a809132102b9326fa7e9d735723e1de8ed37 SHA1 aa4368a58e5b344bffd6561fc7fed304c007fe84 SHA256 f1f57fdca170d9349cb99a3b8b33672d983e0e41c43c2bbb940927380ee12962
 DIST ddclient-3.8.0.tar.gz 45893 RMD160 771ed13aa248c13af11e0466888513418bae98fb SHA1 ff889adacf916bebb25522d9cc1eda0e9593a7f4 SHA256 88f0f1cfafd2d7a813e72c3a3f1f2a08e9bf06ccd1d49ddb3f942dd4b9331fb3
@@ -12,13 +13,14 @@ DIST ddclient-3.8.1.tar.gz 48600 RMD160 7b702d28c47e48ed19eedd6b2e50930f394e9631
 EBUILD ddclient-3.7.3-r1.ebuild 2363 RMD160 2965e17d6b5b943f91d11ce9b006f2f8828cb264 SHA1 2eb1fd92bd856353ec41f85ab1dff011e356e72d SHA256 9debac9ee7520b5fbd6d79d836b0cb93cbc662f04112065e8eeab51e6bff5dba
 EBUILD ddclient-3.8.0.ebuild 2368 RMD160 bde7d181fd90058db991d7b35041eecca7606849 SHA1 c844c52f0b07fc94d7cf9a6ddaecec1f223b3779 SHA256 6cd8f2e4a03dd5d11d38f41fe3c7e2d03885b264a18c9cfce800542445107a4f
 EBUILD ddclient-3.8.1-r1.ebuild 2049 RMD160 43b72602d9a6294bf3c101795f7c3756b563b6fc SHA1 6fddca79231e813829c6bf166bc3050cf9359be6 SHA256 7ac216f409ca06aecb329824c060ac478b2393cae0bbe48d60d16f444d548e80
+EBUILD ddclient-3.8.1-r2.ebuild 2048 RMD160 40508849c1d6fab00c4847821c6666eeca58b7ad SHA1 d6215cadc92af35a3ef4904f43e3897215d153e7 SHA256 03e351ef7b7f6dc9762beab9ba2e18269cea5aa876fd81bb3a82150cbe6fcf3c
 EBUILD ddclient-3.8.1.ebuild 1946 RMD160 f65c05812387bf1616e71df7dc5d6f1ddd375e23 SHA1 ef38507f784299ccfc25d9b1aa1714fabba2aba8 SHA256 820511af15f4072e4771ecfc92f019f19884843a43acb991cac0e37d80774fb8
-MISC ChangeLog 7520 RMD160 8ed58228431ad88139f13f6cfc4a7c4e114a2be0 SHA1 45c54ce59732608aa0cb47de8e0849b13a37457f SHA256 9036a61a8b6bf4a9cd90b5d4b19d25b28866ee5f40cb2ae39a33150fad74f018
+MISC ChangeLog 7685 RMD160 13de53fbea60fca2a19c24ee71b0d89bddbc2c22 SHA1 0277a5db3ca6ec633c1cbc397da2603648f96bb2 SHA256 4234a5da7ea949d7e80386c08f299ae021f7cf868eb15fc73808c94a643a7e26
 MISC metadata.xml 419 RMD160 753e3754c0902c495ba7cf0750aaf07a45a1b2dc SHA1 eb420eb838969fddf1036360a7daf0ab89a68358 SHA256 3306b3709dc4d62dc5a192ad014e48814da19dae81720e308aee86f60591867a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5FyaEACgkQCOhwUhu5AElj4wD/coSDKe+ZGcFxT5BiedZ03rSv
-6B8c5e5wGy6R28fO/8AA/RBvtn6HZRuzOZWCQZ62U9ygCMcRfODGMYH0Xt4q2Lg7
-=ANe7
+iF4EAREIAAYFAk5UEvkACgkQCOhwUhu5AEkMWAEAvUGziDS8hxXyM4skxBKchuph
+8j7LrueQ94KNll3+bnQBAKmcwZMS9bpOhG0Py1Xv73neus2dnkZBgvk1t9s9Zp4O
+=7jZM
 -----END PGP SIGNATURE-----
diff --git a/net-dns/ddclient/ddclient-3.8.1-r2.ebuild b/net-dns/ddclient/ddclient-3.8.1-r2.ebuild
new file mode 100644
index 000000000000..e445424a449f
--- /dev/null
+++ b/net-dns/ddclient/ddclient-3.8.1-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ddclient-3.8.1-r2.ebuild,v 1.1 2011/08/23 20:52:03 titanofold Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Perl updater client for dynamic DNS services"
+HOMEPAGE="http://ddclient.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="hardened ssl"
+
+RDEPEND=">=dev-lang/perl-5.1
+		 hardened? ( sys-apps/iproute2 )
+		 ssl? ( dev-perl/IO-Socket-SSL )
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	# Remove pid line, because it is specified in /etc/conf.d/ddclient
+	einfo "Applying PID setup"
+	if ! sed '/^pid/d' -i "sample-etc_${PN}.conf"; then
+		eerror "Failed to remove pid from /etc/${PN}/${PN}.conf"
+		eerror "Please set the PID in /etc/conf.d/${PN}, not /etc/${PN}/${PN}.conf"
+	fi
+
+	use hardened && epatch "${FILESDIR}/iproute2.patch"
+
+	if ! use ssl; then
+		einfo "Disabling SSL per your USE flags"
+		sed '/^ssl/,/ssl-library$/d' -i "sample-etc_${PN}.conf" || \
+			eerror "Failed to remove ssl from /etc/$PN/$PN.conf"
+	fi
+}
+
+src_install() {
+	dosbin ${PN}
+	dodoc Change* COPYRIGHT README* RELEASENOTE sample*
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	keepdir /var/{cache,run}/${PN}
+	fowners -R ${PN}:${PN} /var/{cache,run}/${PN}
+
+	insinto /etc/${PN}
+	insopts -m 0600 -o ${PN} -g ${PN}
+	newins sample-etc_${PN}.conf ${PN}.conf
+	newins sample-etc_${PN}.conf ${PN}.conf.sample
+	fowners -R ${PN}:${PN} /etc/${PN}
+}
+
+pkg_postinst() {
+	use ssl && return
+	ewarn
+	ewarn "$PN will not have support for ssl, which means your dynamic DNS account"
+	ewarn "information -- including your password -- will be sent over the Internet in the"
+	ewarn "clear. To secure your information, add 'ssl' to your USEflags,"
+	ewarn "emerge -N ddclient, and add 'ssl=yes' to /etc/$PN/$PN.conf"
+	ewarn
+}
diff --git a/net-dns/ddclient/files/ddclient.initd-r2 b/net-dns/ddclient/files/ddclient.initd-r2
new file mode 100644
index 000000000000..af7bd98d2b43
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient.initd-r2
@@ -0,0 +1,44 @@
+#!/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/ddclient/files/ddclient.initd-r2,v 1.1 2011/08/23 20:52:03 titanofold Exp $
+
+# Default location if not specified in /etc/conf.d/ddclient
+PIDFILE=${PIDFILE:-/var/run/ddclient/ddclient.pid}
+
+depend() {
+	before cron
+	need net
+	use dns logger squid
+}
+
+checkconfig() {
+	local conf="/etc/ddclient/ddclient.conf"
+
+	if [ -e "${conf}" ] ; then
+		if [ -n "$(find /etc/ddclient -maxdepth 1 -name ddclient.conf -perm +0044)" ] ; then
+			eerror "${conf} must not be world or group readable. Try:"
+			eerror "    chmod 600 ${conf}"
+			eerror "    chown ddclient:ddclient ${conf}"
+			return 1
+		fi
+	else
+		eerror "${conf} is needed to run ddclient"
+		eerror "There is a sample file in /etc/ddclient/"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --user ddclient --exec /usr/sbin/ddclient \
+		--name ddclient --pidfile "${PIDFILE}" -- -pid="${PIDFILE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --signal USR1 --pidfile "${PIDFILE}"
+	eend $?
+}