diff -Nru ddclient-3.8.1/debian/changelog ddclient-3.8.1/debian/changelog --- ddclient-3.8.1/debian/changelog 2012-09-18 11:31:02.000000000 +0000 +++ ddclient-3.8.1/debian/changelog 2013-07-29 14:49:06.000000000 +0000 @@ -1,3 +1,16 @@ +ddclient (3.8.1-1ubuntu2) saucy; urgency=low + + * debian/ddclient.NetworkManager + - Use NetworkManager dispatcher to stop/start ddclient, fixes DNS lookup + errors that caused checkins to fail (LP: #998700) + * debian/ddclient.init + - lintian reports missing runlevels for stop, adjusted to 0 1 6 + [ Tristan Schmelcher ] + * debian/ddclient.init + - ddclient init script fails to stop process (LP: #980409) + + -- Ken VanDine Mon, 29 Jul 2013 09:41:53 -0400 + ddclient (3.8.1-1ubuntu1) quantal; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru ddclient-3.8.1/debian/ddclient.NetworkManager ddclient-3.8.1/debian/ddclient.NetworkManager --- ddclient-3.8.1/debian/ddclient.NetworkManager 1970-01-01 00:00:00.000000000 +0000 +++ ddclient-3.8.1/debian/ddclient.NetworkManager 2013-07-29 13:38:52.000000000 +0000 @@ -0,0 +1,15 @@ +#!/bin/sh + +export LC_ALL=C + +if [ "$2" = "down" ]; then + /sbin/ip route ls | grep -q '^default' || { + [ -f /var/run/ddclient.pid ] && /usr/sbin/service ddclient stop || : + } && { :; } +fi + +if [ "$2" = "up" ]; then + /sbin/ip -o route show dev "$1" | grep -q '^default' && { + /usr/sbin/service ddclient start || : + } || { :; } +fi diff -Nru ddclient-3.8.1/debian/ddclient.init ddclient-3.8.1/debian/ddclient.init --- ddclient-3.8.1/debian/ddclient.init 2012-08-10 00:33:15.000000000 +0000 +++ ddclient-3.8.1/debian/ddclient.init 2013-07-29 14:40:29.000000000 +0000 @@ -7,7 +7,7 @@ # Required-Start: $local_fs $remote_fs $network $syslog # Required-Stop: $local_fs $remote_fs $network $syslog # Default-Start: 2 3 4 5 -# Default-Stop: 1 +# Default-Stop: 0 1 6 # Short-Description: Update dynamic domain name service entries ### END INIT INFO @@ -52,12 +52,12 @@ # 1 if daemon was already running # 2 if daemon could not be started start-stop-daemon --test --start --quiet \ - --pidfile $PIDFILE --name $NAME --startas $DAEMON \ + --pidfile $PIDFILE --startas $DAEMON \ >/dev/null \ || return 1 start-stop-daemon --start --quiet \ - --pidfile $PIDFILE --name $NAME --startas $DAEMON \ + --pidfile $PIDFILE --startas $DAEMON \ -- $OPTIONS \ || return 2 } @@ -77,7 +77,7 @@ # 2 if daemon could not be stopped # other if a failure occurred start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 \ - --pidfile $PIDFILE --name $NAME + --pidfile $PIDFILE $NAME return "$?" } diff -Nru ddclient-3.8.1/debian/rules ddclient-3.8.1/debian/rules --- ddclient-3.8.1/debian/rules 2012-08-10 00:33:15.000000000 +0000 +++ ddclient-3.8.1/debian/rules 2013-07-29 13:52:04.000000000 +0000 @@ -32,6 +32,9 @@ install -m 755 ddclient \ $(DESTDIR)/usr/sbin/ddclient + + install -D -m 755 debian/ddclient.NetworkManager \ + $(DESTDIR)/etc/NetworkManager/dispatcher.d/50-ddclient %.8 : %.xml xmlto -o $(@D) man $<