Package: ddclient Version: 3.8.0-9 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu lucid ubuntu-patch
This makes it so the user doesn't have the option during config and also adds a warning in the config file in case they change it manually. *** /tmp/tmpJn9HWo In Ubuntu, we've applied the attached patch to achieve the following: * Fixed PPP and daemon mode incompatibility (LP: #152875); Debian bug #462207. We thought you might be interested in doing the same. -- System Information: Debian Release: squeeze/sid APT prefers lucid-updates APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-16-generic (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=C (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru ddclient-3.8.0/debian/changelog ddclient-3.8.0/debian/changelog diff -Nru ddclient-3.8.0/debian/config ddclient-3.8.0/debian/config --- ddclient-3.8.0/debian/config 2010-02-05 06:22:16.000000000 -0500 +++ ddclient-3.8.0/debian/config 2010-03-24 12:41:05.000000000 -0400 @@ -152,9 +152,18 @@ # maybe ask the user to override the default values db_input medium ddclient/run_ipup || true - db_input medium ddclient/run_daemon || true db_go - + + # if using ipup dont use daemon, bug #462207 + db_get ddclient/run_ipup + if [ "$RET" = "true" ]; then + db_set ddclient/run_daemon false + else + db_input medium ddclient/run_daemon || true + db_go + fi + + # if ddclient should run in daemon mode we ask for the update interval db_get ddclient/run_daemon if [ "$RET" = "true" ]; then diff -Nru ddclient-3.8.0/debian/ddclient.templates ddclient-3.8.0/debian/ddclient.templates --- ddclient-3.8.0/debian/ddclient.templates 2010-01-20 17:37:15.000000000 -0500 +++ ddclient-3.8.0/debian/ddclient.templates 2010-03-24 13:06:26.000000000 -0400 @@ -68,6 +68,7 @@ _Description: Run ddclient on PPP connect? You should enable this option if ddclient should be run every time a PPP connection is established. + Note: This mode is not compatible with daemon mode. Template: ddclient/run_daemon Type: boolean diff -Nru ddclient-3.8.0/debian/postinst ddclient-3.8.0/debian/postinst --- ddclient-3.8.0/debian/postinst 2010-01-20 17:37:15.000000000 -0500 +++ ddclient-3.8.0/debian/postinst 2010-03-24 14:07:50.000000000 -0400 @@ -60,10 +60,11 @@ # /etc/default/ddclient # Set to "true" if ddclient should be run every time a new ppp connection is -# established. This might be useful, if you are using dial-on-demand +# established. This might be useful, if you are using dial-on-demand. run_ipup="$run_ipup" # Set to "true" if ddclient should run in daemon mode +# If tis is changed to true, run_ipup must be set to false. run_daemon="$run_daemon" # Set the time interval between the updates of the dynamic DNS name in seconds.