[gentoo-commits] gentoo-x86 commit in net-dns/ddclient/files: ddclient.confd-r1 cmd-over-cfg.patch ddclient.initd-r3

[Aaron Swenson (titanofold)]

titanofold    11/11/13 16:42:02

  Added:                ddclient.confd-r1 cmd-over-cfg.patch
                        ddclient.initd-r3
  Log:
  Fixes bug 386161. Initscript now creates (/var)?/run/ddclient folder for those on tmpfs.
  
  (Portage version: 2.1.10.11/cvs/Linux i686)

Revision  Changes    Path
1.1                  net-dns/ddclient/files/ddclient.confd-r1

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/ddclient/files/ddclient.confd-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/ddclient/files/ddclient.confd-r1?rev=1.1&content-type=text/plain

Index: ddclient.confd-r1
===================================================================
# No need to specify a pid in /etc/ddclient/ddclient.conf
#PIDFILE=/var/run/ddclient/ddclient.pid



1.1                  net-dns/ddclient/files/cmd-over-cfg.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/ddclient/files/cmd-over-cfg.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/ddclient/files/cmd-over-cfg.patch?rev=1.1&content-type=text/plain

Index: cmd-over-cfg.patch
===================================================================
--- 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.



1.1                  net-dns/ddclient/files/ddclient.initd-r3

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/ddclient/files/ddclient.initd-r3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/ddclient/files/ddclient.initd-r3?rev=1.1&content-type=text/plain

Index: ddclient.initd-r3
===================================================================
#!/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 $?
}