Fixes bug 386161. Initscript now creates (/var)?/run/ddclient folder for those on tmpfs.

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

6 files changed, 145 insertions, 6 deletions

diff --git a/net-dns/ddclient/ChangeLog b/net-dns/ddclient/ChangeLog
index 2dde8e3da152..b2e60e1c0cc5 100644
--- a/net-dns/ddclient/ChangeLog
+++ b/net-dns/ddclient/ChangeLog
@@ -1,6 +1,14 @@
 # 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.49 2011/10/18 21:01:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ChangeLog,v 1.50 2011/11/13 16:42:02 titanofold Exp $
+
+*ddclient-3.8.1-r4 (13 Nov 2011)
+
+  13 Nov 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  +ddclient-3.8.1-r4.ebuild, +files/cmd-over-cfg.patch,
+  +files/ddclient.confd-r1, +files/ddclient.initd-r3:
+  Fixes bug 386161. Initscript now creates (/var)?/run/ddclient folder for
+  those on tmpfs.
 
   18 Oct 2011; Jeroen Roovers <jer@gentoo.org> ddclient-3.8.1-r3.ebuild:
   Stable for HPPA (bug #382717).
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index 5ca38a7d7a50..7aea88bde589 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -1,11 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX cmd-over-cfg.patch 488 RMD160 1f95833603de5f9bd8856da53523052ef1a47fa1 SHA1 6245d26b708062f90b993e76428b1508598baec2 SHA256 4b384d925abdae2cce0e65baa44ca0356d22aabbb669fe5183bbd652a3e2fc35
 AUX ddclient-reasonable-security.patch 858 RMD160 0be9d1a9412225361f6352322ee5af6279730393 SHA1 171f220000c5ada3208f9f5765ef3347c7cbde7d SHA256 4ae67c01b41e0ae2f52b60e43072a872373201cc81f92108cd674b89eabda044
 AUX ddclient.confd 97 RMD160 dab278d7ed0ab8fe9f01c072be549d532f20b5d4 SHA1 90ede573df78aa242b9fec7f6d9f05f0c937fb2b SHA256 7a05a1c016dcffa2033da00e8a58072d0df33c31bc8b96170929032567cb44ab
+AUX ddclient.confd-r1 98 RMD160 6b6af77db55f813b8a78c4ea28d3a8af709e0c62 SHA1 23dd170b7fef9dcdf0e03d2f227fb636abc36d9c SHA256 a6b1c281bfa4d963f9556f702cc4e3068e19a25991e9b6baf3547bee24974e82
 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 ddclient.initd-r3 1430 RMD160 694c3e69e387aaf3f11742e494db9d5a92d78085 SHA1 294c187689202c203efb86265f96f24d7006e0b6 SHA256 6ae30ced2535ef2042f838e7cacf0c2299d840e30a3fae76c874d91fd950bd0f
 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
@@ -15,13 +18,14 @@ EBUILD ddclient-3.8.0.ebuild 2368 RMD160 bde7d181fd90058db991d7b35041eecca760684
 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-r3.ebuild 1495 RMD160 7485ef332f3864b90cfc7acaad4ed1a242c8485f SHA1 fa05a5d24511675e88a36b8eca019494567c8245 SHA256 058c62f084ad310bda0b9d2dc5210dd3f1357ff28832abaa94effaa54db2b330
+EBUILD ddclient-3.8.1-r4.ebuild 1489 RMD160 263647d7dfa747ed8ba92dbf14bac871b8324c13 SHA1 2a8f763fd951d1c4fcdc0aa8b72fad7c08c80630 SHA256 a7f5015c567645a2c0dc646579de38362f60f98f9ab50f32f0d6ab88ce17e5d4
 EBUILD ddclient-3.8.1.ebuild 1946 RMD160 f65c05812387bf1616e71df7dc5d6f1ddd375e23 SHA1 ef38507f784299ccfc25d9b1aa1714fabba2aba8 SHA256 820511af15f4072e4771ecfc92f019f19884843a43acb991cac0e37d80774fb8
-MISC ChangeLog 8472 RMD160 251b42b0dac502f9fe65a83d306acaa55c819e13 SHA1 eba19d91a0b88eb29eb79922427b7e0295b351e7 SHA256 7f8ebb2e47c359c182795b802a5f02cdb14e4b5be8d89fa42c6dbab0c80a52e7
+MISC ChangeLog 8773 RMD160 04b9a466ee5b9c61ef8557c9e465fc1e907c6df2 SHA1 9940f2325becd1d8f21b99ec4bd7260125c1270c SHA256 f1486dbb580ec8674808250ed95a516ea59e9f0b2a57c537bd663330f14c384e
 MISC metadata.xml 398 RMD160 b4b6bd4596f169743bb790417f2f4050b8cc857d SHA1 811d01615f0ce6e350e0fdf68b73cabdb0a5df24 SHA256 d0a2a6ad14e6f7f63b3ccb79e848eda64aa03abfa61cbd1bfdc59bc69acaeab2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6d6TIACgkQVWmRsqeSphO00wCeKjNo40lRSU/zkPLkfF4O0m9K
-7JgAn3OGMu/Q61BSrRzduzFz2TV1RIXD
-=l9Q9
+iF4EAREIAAYFAk6/818ACgkQVxOqA9G7/aB5nAD/eSIugeXL3RC/RNaNnW54pt03
+6YoL4e4t+FZGhY5tmq4A/1i4LF8gmsMPGt9btaksDvuBBTHXLgtUvf2mzD+y2eCC
+=8BkQ
 -----END PGP SIGNATURE-----
diff --git a/net-dns/ddclient/ddclient-3.8.1-r4.ebuild b/net-dns/ddclient/ddclient-3.8.1-r4.ebuild
new file mode 100644
index 000000000000..4772aa4cfbb6
--- /dev/null
+++ b/net-dns/ddclient/ddclient-3.8.1-r4.ebuild
@@ -0,0 +1,56 @@
+# 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-r4.ebuild,v 1.1 2011/11/13 16:42:02 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"
+
+RDEPEND=">=dev-lang/perl-5.1
+		 dev-perl/Digest-SHA1
+		 dev-perl/IO-Socket-SSL
+		 hardened? ( sys-apps/iproute2 )
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	# Remove pid line, because it is specified in /etc/init.d/ddclient
+	ebegin "Removing PID setup from ${PN}.conf"
+	if ! sed '/^pid/d' -i "sample-etc_${PN}.conf"; then
+		eerror "Failed to remove pid from /etc/${PN}/${PN}.conf"
+	fi
+	eend $?
+
+	use hardened && epatch "${FILESDIR}/iproute2.patch"
+
+	epatch "${FILESDIR}/cmd-over-cfg.patch"
+}
+
+src_install() {
+	dosbin ${PN}
+	dodoc Change* COPYRIGHT README* RELEASENOTE sample*
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	keepdir /var/cache/${PN}
+	fowners -R ${PN}:${PN} /var/cache/${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}
+}
diff --git a/net-dns/ddclient/files/cmd-over-cfg.patch b/net-dns/ddclient/files/cmd-over-cfg.patch
new file mode 100644
index 000000000000..9033873fde74
--- /dev/null
+++ b/net-dns/ddclient/files/cmd-over-cfg.patch
@@ -0,0 +1,11 @@
+--- ddclient.old	2011-11-13 10:14:59.957846596 -0500
++++ ddclient	2011-11-13 10:18:33.864245944 -0500
+@@ -773,7 +773,7 @@
+ 		foreach my $h (sort keys %config) {
+ 			next if $config{$h}{'protocol'} ne lc($s);
+ 			$examined{$h} = 1;
+-			my $use = $config{$h}{'use'} || opt('use');
++			my $use = opt('use') || $config{$h}{'use'};
+ 			local $opt{$use} = $config{$h}{$use} if $config{$h}{$use};
+ 			# bug #13: we should only do this once
+ 			# use isn't enough, we have to save the origin to.
diff --git a/net-dns/ddclient/files/ddclient.confd-r1 b/net-dns/ddclient/files/ddclient.confd-r1
new file mode 100644
index 000000000000..69ad0eeff87d
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient.confd-r1
@@ -0,0 +1,2 @@
+# No need to specify a pid in /etc/ddclient/ddclient.conf
+#PIDFILE=/var/run/ddclient/ddclient.pid
diff --git a/net-dns/ddclient/files/ddclient.initd-r3 b/net-dns/ddclient/files/ddclient.initd-r3
new file mode 100644
index 000000000000..2fe7c5bd4f75
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient.initd-r3
@@ -0,0 +1,58 @@
+#!/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-r3,v 1.1 2011/11/13 16:42:02 titanofold Exp $
+
+if [ -d /run ] ; then
+	PIDFILE=${PIDFILE:-/run/ddclient/ddclient.pid}
+else
+	PIDFILE=${PIDFILE:-/var/run/ddclient/ddclient.pid}
+fi
+
+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
+
+	local piddir=$(dirname ${PIDFILE})
+	if [ ! -d ${piddir} ] ; then
+		ebegin "Making ${piddir}"
+		mkdir -p ${piddir}
+		eend $?
+		ebegin "Changing permissions of ${piddir}"
+		chown ddclient:ddclient ${piddir}
+		eend $?
+	fi
+
+	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 $?
+}