From 2863dd459de3a116140d7b48f8ac647c915e8470 Mon Sep 17 00:00:00 2001
From: wimpunk <wimpunk@users.sf.net>
Date: Mon, 30 Jul 2007 07:11:22 +0000
Subject: [PATCH] Added debian and ubuntu patches

git-svn-id: svn+ssh://svn.code.sf.net/p/ddclient/code/trunk@69 3873ddee-7413-0410-b6c4-c2c57c1ab35a
---
 svn/patches/debianpatches/abuse_msg.diff      |  14 ++
 svn/patches/debianpatches/cachedir.diff       |  22 +++
 svn/patches/debianpatches/cisco_fw.diff       |  14 ++
 svn/patches/debianpatches/config_path.diff    |  14 ++
 svn/patches/debianpatches/daemon_check.diff   |  16 ++
 .../debianpatches/daemon_interval.diff        |  14 ++
 .../debianpatches/help_nonroot(2).diff        |  46 ++++++
 svn/patches/debianpatches/help_nonroot.diff   |  46 ++++++
 .../debianpatches/ip-up_run-parts.diff        |  14 ++
 svn/patches/debianpatches/maxinterval.diff    |  14 ++
 svn/patches/debianpatches/readme.txt          |  24 +++
 svn/patches/debianpatches/sample_path.diff    |  26 ++++
 .../debianpatches/smc-barricade-7401bra.patch |  23 +++
 .../debianpatches/smc-barricade-fw-alt.diff   |  17 +++
 .../debianpatches/update-new-config.patch     |  22 +++
 svn/patches/ubuntu/checked_ssl_load.diff      |  34 +++++
 svn/patches/ubuntu/config_path.diff           |  11 ++
 svn/patches/ubuntu/daemon_interval.diff       |  11 ++
 svn/patches/ubuntu/dyndns_com.diff            | 144 ++++++++++++++++++
 svn/patches/ubuntu/sample_ubuntu.diff         |  11 ++
 svn/patches/ubuntu/series                     |   6 +
 svn/patches/ubuntu/smc-barricade-fw-alt.diff  |  14 ++
 22 files changed, 557 insertions(+)
 create mode 100644 svn/patches/debianpatches/abuse_msg.diff
 create mode 100644 svn/patches/debianpatches/cachedir.diff
 create mode 100644 svn/patches/debianpatches/cisco_fw.diff
 create mode 100644 svn/patches/debianpatches/config_path.diff
 create mode 100644 svn/patches/debianpatches/daemon_check.diff
 create mode 100644 svn/patches/debianpatches/daemon_interval.diff
 create mode 100644 svn/patches/debianpatches/help_nonroot(2).diff
 create mode 100644 svn/patches/debianpatches/help_nonroot.diff
 create mode 100644 svn/patches/debianpatches/ip-up_run-parts.diff
 create mode 100644 svn/patches/debianpatches/maxinterval.diff
 create mode 100644 svn/patches/debianpatches/readme.txt
 create mode 100644 svn/patches/debianpatches/sample_path.diff
 create mode 100644 svn/patches/debianpatches/smc-barricade-7401bra.patch
 create mode 100644 svn/patches/debianpatches/smc-barricade-fw-alt.diff
 create mode 100644 svn/patches/debianpatches/update-new-config.patch
 create mode 100644 svn/patches/ubuntu/checked_ssl_load.diff
 create mode 100644 svn/patches/ubuntu/config_path.diff
 create mode 100644 svn/patches/ubuntu/daemon_interval.diff
 create mode 100644 svn/patches/ubuntu/dyndns_com.diff
 create mode 100644 svn/patches/ubuntu/sample_ubuntu.diff
 create mode 100644 svn/patches/ubuntu/series
 create mode 100644 svn/patches/ubuntu/smc-barricade-fw-alt.diff

diff --git a/svn/patches/debianpatches/abuse_msg.diff b/svn/patches/debianpatches/abuse_msg.diff
new file mode 100644
index 0000000..ce1f746
--- /dev/null
+++ b/svn/patches/debianpatches/abuse_msg.diff
@@ -0,0 +1,14 @@
+Index: ddclient-3.7.0/ddclient
+===================================================================
+--- ddclient-3.7.0.orig/ddclient	2006-12-01 23:22:37.043910433 +0100
++++ ddclient-3.7.0/ddclient	2006-12-01 23:24:59.469182565 +0100
+@@ -2231,7 +2231,7 @@
+        '!yours'   => 'The hostname specified exists, but not under the username currently being used',
+        '!donator' => 'The offline setting was set, when the user is not a donator',
+        '!active'  => 'The hostname specified is in a Custom DNS domain which has not yet been activated.',
+-       'abuse',   => 'The hostname specified is blocked for abuse; contact support@dyndns.org to be unblocked',
++       'abuse',   => 'The hostname specified is blocked for abuse; fill in the form at http://support.dyndns.org/abuse.php to be unblocked',
+ 
+        'numhost'  => 'System error: Too many or too few hosts found. Contact support@dyndns.org',
+        'dnserr'   => 'System error: DNS error encountered. Contact support@dyndns.org',
+
diff --git a/svn/patches/debianpatches/cachedir.diff b/svn/patches/debianpatches/cachedir.diff
new file mode 100644
index 0000000..3134537
--- /dev/null
+++ b/svn/patches/debianpatches/cachedir.diff
@@ -0,0 +1,22 @@
+Index: ddclient-3.7.0/ddclient
+===================================================================
+--- ddclient-3.7.0.orig/ddclient	2006-06-14 22:03:52.000000000 +0200
++++ ddclient-3.7.0/ddclient	2006-12-01 23:25:19.748088891 +0100
+@@ -22,6 +22,7 @@
+ my $now       = time;
+ my $hostname  = hostname();
+ my $etc       = ($program =~ /test/i) ? './'   : '/etc/ddclient/';
++my $cachedir  = ($program =~ /test/i) ? './'   : '/var/cache/ddclient/';
+ my $savedir   = ($program =~ /test/i) ? 'URL/' : '/tmp/';
+ my $msgs      = '';
+ my $last_msgs = '';
+@@ -296,7 +297,7 @@
+     'global-defaults'    => {
+ 	'daemon'              => setv(T_DELAY, 0, 0, 1, 0,                    interval('60s')),
+ 	'file'                => setv(T_FILE,  0, 0, 1, "$etc$program.conf",  undef),
+-	'cache'               => setv(T_FILE,  0, 0, 1, "$etc$program.cache", undef),
++	'cache'               => setv(T_FILE,  0, 0, 1, "$cachedir$program.cache", undef),
+ 	'pid'                 => setv(T_FILE,  0, 0, 1, "",                   undef),
+ 	'proxy'               => setv(T_FQDNP, 0, 0, 1, '',                   undef),
+ 	'protocol'            => setv(T_PROTO, 0, 0, 1, 'dyndns2',            undef),
+
diff --git a/svn/patches/debianpatches/cisco_fw.diff b/svn/patches/debianpatches/cisco_fw.diff
new file mode 100644
index 0000000..6772535
--- /dev/null
+++ b/svn/patches/debianpatches/cisco_fw.diff
@@ -0,0 +1,14 @@
+Index: ddclient-3.7.0/ddclient
+===================================================================
+--- ddclient-3.7.0.orig/ddclient	2006-12-01 23:22:37.121898536 +0100
++++ ddclient-3.7.0/ddclient	2006-12-01 23:24:41.551915957 +0100
+@@ -1823,7 +1823,7 @@
+ 	# Protect special HTML characters (like '?')
+ 	$queryif =~ s/([\?&= ])/sprintf("%%%02x",ord($1))/ge;
+ 
+-	$url   = "http://${arg}/level/1/exec/show/ip/interface/brief/${queryif}/CR";
++	$url   = "http://".opt('fw')."/level/1/exec/show/ip/interface/brief/${queryif}/CR";
+ 	$reply = geturl('', $url, opt('fw-login'), opt('fw-password')) || '';
+ 	$arg   = $url;
+ 
+
diff --git a/svn/patches/debianpatches/config_path.diff b/svn/patches/debianpatches/config_path.diff
new file mode 100644
index 0000000..b59effb
--- /dev/null
+++ b/svn/patches/debianpatches/config_path.diff
@@ -0,0 +1,14 @@
+Index: ddclient-3.7.0/ddclient
+===================================================================
+--- ddclient-3.7.0.orig/ddclient	2006-12-01 23:22:37.151893960 +0100
++++ ddclient-3.7.0/ddclient	2006-12-01 23:22:37.171890909 +0100
+@@ -21,7 +21,7 @@
+ $program  =~ s/d$//;
+ my $now       = time;
+ my $hostname  = hostname();
+-my $etc       = ($program =~ /test/i) ? './'   : '/etc/ddclient/';
++my $etc       = ($program =~ /test/i) ? './'   : '/etc/';
+ my $cachedir  = ($program =~ /test/i) ? './'   : '/var/cache/ddclient/';
+ my $savedir   = ($program =~ /test/i) ? 'URL/' : '/tmp/';
+ my $msgs      = '';
+
diff --git a/svn/patches/debianpatches/daemon_check.diff b/svn/patches/debianpatches/daemon_check.diff
new file mode 100644
index 0000000..75699d8
--- /dev/null
+++ b/svn/patches/debianpatches/daemon_check.diff
@@ -0,0 +1,16 @@
+Index: ddclient-3.7.0/ddclient
+===================================================================
+--- ddclient-3.7.0.orig/ddclient	2006-12-01 23:22:37.023913484 +0100
++++ ddclient-3.7.0/ddclient	2006-12-01 23:25:03.977494794 +0100
+@@ -993,8 +993,8 @@
+ 
+     $opt{'timeout'}  = 0               if opt('timeout') < 0;
+     $opt{'daemon'}   = minimum('daemon')
+-      if   define($opt{'daemon'},$globals{'daemon'},0) 
+-	&& define($opt{'daemon'},$globals{'daemon'}) < minimum('daemon');
++      if   interval(define($opt{'daemon'},$globals{'daemon'},0))
++	&& interval(define($opt{'daemon'},$globals{'daemon'})) < minimum('daemon');
+     
+     ## define or modify host options specified on the command-line
+     if (exists $opt{'options'} && defined $opt{'options'}) {
+
diff --git a/svn/patches/debianpatches/daemon_interval.diff b/svn/patches/debianpatches/daemon_interval.diff
new file mode 100644
index 0000000..91f0648
--- /dev/null
+++ b/svn/patches/debianpatches/daemon_interval.diff
@@ -0,0 +1,14 @@
+Index: ddclient-3.7.0/ddclient
+===================================================================
+--- ddclient-3.7.0.orig/ddclient	2006-12-01 23:22:36.919929347 +0100
++++ ddclient-3.7.0/ddclient	2006-12-01 23:25:15.960666685 +0100
+@@ -966,6 +966,8 @@
+ sub init_config {
+     %opt = %saved_opt;
+ 
++    $opt{'daemon'}=interval($opt{'daemon'}) if defined $opt{'daemon'};
++
+     ## 
+     $opt{'quiet'}   = 0 if   opt('verbose');
+ 
+
diff --git a/svn/patches/debianpatches/help_nonroot(2).diff b/svn/patches/debianpatches/help_nonroot(2).diff
new file mode 100644
index 0000000..3056836
--- /dev/null
+++ b/svn/patches/debianpatches/help_nonroot(2).diff
@@ -0,0 +1,46 @@
+Index: ddclient-3.7.0/ddclient
+===================================================================
+--- ddclient-3.7.0.orig/ddclient	2006-12-01 23:22:37.083904332 +0100
++++ ddclient-3.7.0/ddclient	2006-12-01 23:24:46.118219338 +0100
+@@ -553,6 +553,12 @@
+ 
+ test_geturl(opt('geturl')) if opt('geturl');
+ 
++## process help option
++if (opt('help')) {
++    *STDERR = *STDOUT;
++    usage(0);
++}
++
+ ## read config file because 'daemon' mode may be defined there.
+ read_config(define($opt{'file'}, default('file')), \%config, \%globals);
+ init_config();
+@@ -1109,16 +1115,14 @@
+ 	    $config{$h}{'cacheable'} = [ @{$services{$proto}{'cacheable'}} ];
+ 	}
+     }
+-    if (opt('help')) {
+-	*STDERR = *STDOUT;
+-	usage();
+-    }
+ }
+ 
+ ######################################################################
+ ## usage
+ ######################################################################
+ sub usage {
++    my $exitcode = 1;
++    $exitcode = shift if @_ != 0; # use first arg if given
+     my $msg = '';
+     if (@_) {
+ 	my $format = shift;
+@@ -1128,7 +1132,7 @@
+     }
+     printf STDERR "%s%s\n", $msg, $opt_usage;
+     sendmail();
+-    exit 1;
++    exit $exitcode;
+ }
+ 
+ ######################################################################
+
diff --git a/svn/patches/debianpatches/help_nonroot.diff b/svn/patches/debianpatches/help_nonroot.diff
new file mode 100644
index 0000000..3056836
--- /dev/null
+++ b/svn/patches/debianpatches/help_nonroot.diff
@@ -0,0 +1,46 @@
+Index: ddclient-3.7.0/ddclient
+===================================================================
+--- ddclient-3.7.0.orig/ddclient	2006-12-01 23:22:37.083904332 +0100
++++ ddclient-3.7.0/ddclient	2006-12-01 23:24:46.118219338 +0100
+@@ -553,6 +553,12 @@
+ 
+ test_geturl(opt('geturl')) if opt('geturl');
+ 
++## process help option
++if (opt('help')) {
++    *STDERR = *STDOUT;
++    usage(0);
++}
++
+ ## read config file because 'daemon' mode may be defined there.
+ read_config(define($opt{'file'}, default('file')), \%config, \%globals);
+ init_config();
+@@ -1109,16 +1115,14 @@
+ 	    $config{$h}{'cacheable'} = [ @{$services{$proto}{'cacheable'}} ];
+ 	}
+     }
+-    if (opt('help')) {
+-	*STDERR = *STDOUT;
+-	usage();
+-    }
+ }
+ 
+ ######################################################################
+ ## usage
+ ######################################################################
+ sub usage {
++    my $exitcode = 1;
++    $exitcode = shift if @_ != 0; # use first arg if given
+     my $msg = '';
+     if (@_) {
+ 	my $format = shift;
+@@ -1128,7 +1132,7 @@
+     }
+     printf STDERR "%s%s\n", $msg, $opt_usage;
+     sendmail();
+-    exit 1;
++    exit $exitcode;
+ }
+ 
+ ######################################################################
+
diff --git a/svn/patches/debianpatches/ip-up_run-parts.diff b/svn/patches/debianpatches/ip-up_run-parts.diff
new file mode 100644
index 0000000..2a504d9
--- /dev/null
+++ b/svn/patches/debianpatches/ip-up_run-parts.diff
@@ -0,0 +1,14 @@
+Index: ddclient-3.7.0/sample-etc_ppp_ip-up.local
+===================================================================
+--- ddclient-3.7.0.orig/sample-etc_ppp_ip-up.local	2006-06-14 21:59:40.000000000 +0200
++++ ddclient-3.7.0/sample-etc_ppp_ip-up.local	2006-12-01 23:22:37.101901586 +0100
+@@ -34,7 +34,7 @@
+ 		;;
+ *)		(
+ 			sleep 5
+-			ddclient -daemon=0 -syslog -use=if -if=$1 >/dev/null 2>&1
++			ddclient -daemon=0 -syslog -use=if -if=$IP >/dev/null 2>&1
+ 		) &
+ 		;;
+ esac
+
diff --git a/svn/patches/debianpatches/maxinterval.diff b/svn/patches/debianpatches/maxinterval.diff
new file mode 100644
index 0000000..b245c9d
--- /dev/null
+++ b/svn/patches/debianpatches/maxinterval.diff
@@ -0,0 +1,14 @@
+Index: ddclient-3.7.0/ddclient
+===================================================================
+--- ddclient-3.7.0.orig/ddclient	2006-12-01 23:22:37.062907535 +0100
++++ ddclient-3.7.0/ddclient	2006-12-01 23:24:53.543086628 +0100
+@@ -357,7 +357,7 @@
+ 	'atime'               => setv(T_NUMBER, 0, 1, 0, 0,                   undef),
+ 	'status'              => setv(T_ANY,    0, 1, 0, '',                  undef),
+ 	'min-interval'        => setv(T_DELAY,  0, 0, 1, interval('30s'),     0),
+-	'max-interval'        => setv(T_DELAY,  0, 0, 1, interval('15d'),     0),
++	'max-interval'        => setv(T_DELAY,  0, 0, 1, interval('30d'),     0),
+ 	'min-error-interval'  => setv(T_DELAY,  0, 0, 1, interval('5m'),      0),
+ 
+ 	'warned-min-interval'       => setv(T_ANY,    0, 1, 0, 0,             undef),
+
diff --git a/svn/patches/debianpatches/readme.txt b/svn/patches/debianpatches/readme.txt
new file mode 100644
index 0000000..cbd54f5
--- /dev/null
+++ b/svn/patches/debianpatches/readme.txt
@@ -0,0 +1,24 @@
+(submitted by Torsten)
+
+cisco_fw.diff
+config_path.diff
+daemon_check.diff
+daemon_interval.diff
+maxinterval.diff
+sample_path.diff
+smc-barricade-7401bra.patch
+smc-barricade-fw-alt.diff
+update-new-config.patch
+
+cisco_fw.diff: Not sure what this change was about, have to check my
+     change log.
+daemon_check.diff: Changes interpretation of the daemon parameter
+      to interval (to allow 5m for minutes etc.) when checking for min
+       value.
+daemon_interval.diff: Changes interpretation of daemon interval during
+        input (now that I look at this, those two could probably be merged).
+	maxinterval.diff: Increase max interval for updates.
+	sample_path.diff: Adjust path in stamples.
+	update-new-config.patch: Force update if config has changed (still
+	 needed?)
+	 smc-*: Support for two more routers.
diff --git a/svn/patches/debianpatches/sample_path.diff b/svn/patches/debianpatches/sample_path.diff
new file mode 100644
index 0000000..2bfb485
--- /dev/null
+++ b/svn/patches/debianpatches/sample_path.diff
@@ -0,0 +1,26 @@
+Index: ddclient-3.6.2/sample-etc_cron.d_ddclient
+===================================================================
+--- ddclient-3.6.2.orig/sample-etc_cron.d_ddclient	2002-01-04 00:56:34.000000000 +0100
++++ ddclient-3.6.2/sample-etc_cron.d_ddclient	2005-10-18 23:41:12.000000000 +0200
+@@ -10,7 +10,7 @@
+ ######################################################################
+ ## force an update twice a month
+ ##
+-30 23 1,15 * *	root    /root/bin/ddclient -daemon=0 -syslog -quiet -force
++30 23 1,15 * *	root    /usr/sbin/ddclient -daemon=0 -syslog -quiet -force
+ ######################################################################
+ ## retry failed updates every hour (only if you are not using daemon-mode)
+ ##
+Index: ddclient-3.6.2/sample-etc_dhcpc_dhcpcd-eth0.exe
+===================================================================
+--- ddclient-3.6.2.orig/sample-etc_dhcpc_dhcpcd-eth0.exe	2005-10-18 23:40:22.000000000 +0200
++++ ddclient-3.6.2/sample-etc_dhcpc_dhcpcd-eth0.exe	2005-10-18 23:41:02.000000000 +0200
+@@ -15,6 +15,6 @@
+ 192.168.*)	;;
+ *)
+ 	logger -t dhcpcd IP address changed to $1
+-	/root/bin/ddclient -daemon=0 -syslog -use=ip -ip=$1 >/dev/null 2>&1
++	/usr/sbin/ddclient -daemon=0 -syslog -use=ip -ip=$1 >/dev/null 2>&1
+ 	;;
+ esac
+
diff --git a/svn/patches/debianpatches/smc-barricade-7401bra.patch b/svn/patches/debianpatches/smc-barricade-7401bra.patch
new file mode 100644
index 0000000..aadfec5
--- /dev/null
+++ b/svn/patches/debianpatches/smc-barricade-7401bra.patch
@@ -0,0 +1,23 @@
+Add support for SMC7401BRA:
+
+ddclient support several kind of firewall to retrieve IP address, two of
+them are smc-barricade and smc-barricade-alt, but these both doesn't
+work with an SMC7401BRA.
+
+Index: ddclient
+===================================================================
+--- ddclient.orig	2006-12-01 23:22:36.958923399 +0100
++++ ddclient	2006-12-01 23:25:09.796607052 +0100
+@@ -73,6 +73,11 @@
+ 				  'url'  => '/status.htm',
+ 				  'skip' => 'IP Address',
+ 			        },
++    'smc-barricade-7401bra'  => {
++				  'name' => 'SMC Barricade 7401BRA FW',
++				  'url'  => '/admin/wan1.htm',
++				  'skip' => 'IP Address',
++			        },
+     'netgear-rt3xx'          => {
+ 				  'name' => 'Netgear FW',
+ 				  'url'  => '/mtenSysStatus.html',
+
diff --git a/svn/patches/debianpatches/smc-barricade-fw-alt.diff b/svn/patches/debianpatches/smc-barricade-fw-alt.diff
new file mode 100644
index 0000000..c42637e
--- /dev/null
+++ b/svn/patches/debianpatches/smc-barricade-fw-alt.diff
@@ -0,0 +1,17 @@
+Index: ddclient-3.7.0/ddclient
+===================================================================
+--- ddclient-3.7.0.orig/ddclient	2006-12-01 23:22:37.003916535 +0100
++++ ddclient-3.7.0/ddclient	2006-12-01 23:25:06.131166238 +0100
+@@ -73,6 +73,11 @@
+ 				  'url'  => '/status.htm',
+ 				  'skip' => 'IP Address',
+ 			        },
++    'smc-barricade-alt'      => {
++				  'name' => 'SMC Barricade FW (alternate config)',
++				  'url'  => '/status.HTM',
++				  'skip' => 'WAN IP',
++			        },
+     'smc-barricade-7401bra'  => {
+ 				  'name' => 'SMC Barricade 7401BRA FW',
+ 				  'url'  => '/admin/wan1.htm',
+
diff --git a/svn/patches/debianpatches/update-new-config.patch b/svn/patches/debianpatches/update-new-config.patch
new file mode 100644
index 0000000..4dd6240
--- /dev/null
+++ b/svn/patches/debianpatches/update-new-config.patch
@@ -0,0 +1,22 @@
+ddclient did not update the dynamic DNS entry if the config changes. 
+This patch by Frans Pop to fixes this problem reported as  Debian bug 
+#217041. 
+Index: ddclient
+===================================================================
+--- ddclient.orig	2006-12-01 23:22:36.938926449 +0100
++++ ddclient	2006-12-01 23:25:12.987120319 +0100
+@@ -1998,6 +1998,13 @@
+     } elsif (defined($sub) && &$sub($host)) {
+ 	$update = 1;
+ 
++    } elsif (($cache{$host}{'static'} ne $config{$host}{'static'}) ||
++	     ($cache{$host}{'wildcard'} ne $config{$host}{'wildcard'}) ||
++	     ($cache{$host}{'mx'} ne $config{$host}{'mx'}) ||
++	     ($cache{$host}{'backupmx'} ne $config{$host}{'backupmx'})) {
++	info("updating %s because host settings have been changed.", $host);
++	$update = 1;
++
+     } else {
+ 	success("%s: skipped: IP address was already set to %s.", $host, $ip)
+ 	    if opt('verbose');
+
diff --git a/svn/patches/ubuntu/checked_ssl_load.diff b/svn/patches/ubuntu/checked_ssl_load.diff
new file mode 100644
index 0000000..305ffb6
--- /dev/null
+++ b/svn/patches/ubuntu/checked_ssl_load.diff
@@ -0,0 +1,34 @@
+--- ddclient-3.7.1/ddclient.orig	2007-05-03 23:24:39.000000000 +0100
++++ ddclient-3.7.1/ddclient	2007-05-03 23:27:44.000000000 +0100
+@@ -1635,6 +1642,20 @@
+     $res;
+ }
+ ######################################################################
++## load_ssl_support
++######################################################################
++sub load_ssl_support {
++    my $ssl_loaded = eval {require IO::Socket::SSL};
++    unless ($ssl_loaded) {
++        fatal(<<"EOM");
++Error loading the Perl module IO::Socket::SSL needed for SSL connect.
++On Debian, the package libio-socket-ssl-perl must be installed.
++EOM
++    }
++    import  IO::Socket::SSL;
++    { no warnings; $IO::Socket::SSL::DEBUG = 0; }
++}
++######################################################################
+ ## geturl
+ ######################################################################
+ sub geturl {
+@@ -1663,9 +1684,7 @@
+     if ( $globals{'ssl'} and (caller(1))[3] ne 'main::get_ip' ) {
+         $use_ssl      = 1;
+         $default_port = 443;
+-        require IO::Socket::SSL;
+-        import  IO::Socket::SSL;
+-        { no warnings; $IO::Socket::SSL::DEBUG = 0; }
++		load_ssl_support;
+     } else {
+         $use_ssl      = 0;
+         $default_port = 80;
diff --git a/svn/patches/ubuntu/config_path.diff b/svn/patches/ubuntu/config_path.diff
new file mode 100644
index 0000000..3908302
--- /dev/null
+++ b/svn/patches/ubuntu/config_path.diff
@@ -0,0 +1,11 @@
+--- ddclient-3.7.1/ddclient.orig	2007-04-28 14:31:23.000000000 +0100
++++ ddclient-3.7.1/ddclient	2007-04-28 14:31:33.000000000 +0100
+@@ -21,7 +21,7 @@
+ $program  =~ s/d$//;
+ my $now       = time;
+ my $hostname  = hostname();
+-my $etc       = ($program =~ /test/i) ? './'   : '/etc/ddclient/';
++my $etc       = ($program =~ /test/i) ? './'   : '/etc/';
+ my $cachedir  = ($program =~ /test/i) ? './'   : '/var/cache/ddclient/';
+ my $savedir   = ($program =~ /test/i) ? 'URL/' : '/tmp/';
+ my $msgs      = '';
diff --git a/svn/patches/ubuntu/daemon_interval.diff b/svn/patches/ubuntu/daemon_interval.diff
new file mode 100644
index 0000000..d997b32
--- /dev/null
+++ b/svn/patches/ubuntu/daemon_interval.diff
@@ -0,0 +1,11 @@
+--- ddclient-3.7.1/ddclient.orig	2007-04-28 20:43:53.000000000 +0100
++++ ddclient-3.7.1/ddclient	2007-04-28 20:42:57.000000000 +0100
+@@ -977,6 +977,8 @@
+ sub init_config {
+     %opt = %saved_opt;
+
++	$opt{'daemon'}=interval($opt{'daemon'}) if defined $opt{'daemon'};
++
+     ##
+     $opt{'quiet'}   = 0 if   opt('verbose');
+
diff --git a/svn/patches/ubuntu/dyndns_com.diff b/svn/patches/ubuntu/dyndns_com.diff
new file mode 100644
index 0000000..c66ce6c
--- /dev/null
+++ b/svn/patches/ubuntu/dyndns_com.diff
@@ -0,0 +1,144 @@
+--- ddclient-3.7.1/ddclient.orig	2007-04-30 00:40:49.000000000 +0100
++++ ddclient-3.7.1/ddclient	2007-04-30 00:40:59.000000000 +0100
+@@ -54,7 +54,7 @@
+
+ ## strategies for obtaining an ip address.
+ my %builtinweb = (
+-   'dyndns'       => { 'url' => 'http://checkip.dyndns.org/', 'skip' => 'Current IP Address', },
++   'dyndns'       => { 'url' => 'http://checkip.dyndns.com/', 'skip' => 'Current IP Address:', },
+    'dnspark'      => { 'url' => 'http://ipdetect.dnspark.com/', 'skip' => 'Current Address:', },
+ );
+ my %builtinfw = (
+@@ -342,7 +342,7 @@
+ 	'postscript'          => setv(T_POSTS, 0, 0, 1, '',                   undef),
+     },
+     'service-common-defaults'       => {
+-	'server'	      => setv(T_FQDNP,  1, 0, 1, 'members.dyndns.org', undef),
++	'server'	      => setv(T_FQDNP,  1, 0, 1, 'members.dyndns.com', undef),
+ 	'login'               => setv(T_LOGIN,  1, 0, 1, '',                  undef),
+ 	'password'            => setv(T_PASSWD, 1, 0, 1, '',                  undef),
+ 	'host'                => setv(T_STRING, 1, 1, 1, '',                  undef),
+@@ -1915,7 +1915,7 @@
+ For example:
+   protocol=hammernode1, \\
+   login=my-hn-login, password=my-hn-password  myhost.hn.org
+-  login=my-login, password=my-password  myhost.dyndns.org,my2nd.dyndns.org
++  login=my-login, password=my-password  myhost.dyndns.com,my2nd.dyndns.com
+
+ specifies two host definitions.
+
+@@ -1925,7 +1925,7 @@
+
+ The second host definition will use the current default protocol
+ ('dyndns2'), my-login and my-password to update the ip-address of
+-myhost.dyndns.org and my2ndhost.dyndns.org.
++myhost.dyndns.com and my2ndhost.dyndns.com.
+
+ The order of this sequence is significant because the values of any
+ global variable definitions are bound to a host definition when the
+@@ -2065,13 +2065,13 @@
+ o 'dyndns1'
+
+ The 'dyndns1' protocol is a deprecated protocol used by the free dynamic
+-DNS service offered by www.dyndns.org. The 'dyndns2' should be used to
+-update the www.dyndns.org service.  However, other services are also
++DNS service offered by www.dyndns.com. The 'dyndns2' should be used to
++update the www.dyndns.com service.  However, other services are also
+ using this protocol so support is still provided by ${program}.
+
+ Configuration variables applicable to the 'dyndns1' protocol are:
+   protocol=dyndns1             ##
+-  server=fqdn.of.service       ## defaults to members.dyndns.org
++  server=fqdn.of.service       ## defaults to members.dyndns.com
+   backupmx=no|yes              ## indicates that this host is the primary MX for the domain.
+   mx=any.host.domain           ## a host MX'ing for this host definition.
+   wildcard=no|yes              ## add a DNS wildcard CNAME record that points to {host}
+@@ -2082,16 +2082,16 @@
+ Example ${program}.conf file entries:
+   ## single host update
+   protocol=dyndns1,                                         \\
+-  login=my-dyndns.org-login,                                \\
+-  password=my-dyndns.org-password                           \\
+-  myhost.dyndns.org
++  login=my-dyndns.com-login,                                \\
++  password=my-dyndns.com-password                           \\
++  myhost.dyndns.com
+
+   ## multiple host update with wildcard'ing mx, and backupmx
+   protocol=dyndns1,                                         \\
+-  login=my-dyndns.org-login,                                \\
+-  password=my-dyndns.org-password,                          \\
++  login=my-dyndns.com-login,                                \\
++  password=my-dyndns.com-password,                          \\
+   mx=a.host.willing.to.mx.for.me,backupmx=yes,wildcard=yes  \\
+-  myhost.dyndns.org,my2ndhost.dyndns.org
++  myhost.dyndns.com,my2ndhost.dyndns.com
+ EoEXAMPLE
+ }
+ ######################################################################
+@@ -2177,13 +2177,13 @@
+ o 'dyndns2'
+
+ The 'dyndns2' protocol is a newer low-bandwidth protocol used by a
+-free dynamic DNS service offered by www.dyndns.org.  It supports
++free dynamic DNS service offered by www.dyndns.com.  It supports
+ features of the older 'dyndns1' in addition to others.  [These will be
+ supported in a future version of ${program}.]
+
+ Configuration variables applicable to the 'dyndns2' protocol are:
+   protocol=dyndns2             ##
+-  server=fqdn.of.service       ## defaults to members.dyndns.org
++  server=fqdn.of.service       ## defaults to members.dyndns.com
+   backupmx=no|yes              ## indicates that this host is the primary MX for the domain.
+   static=no|yes                ## indicates that this host has a static IP address.
+   custom=no|yes                ## indicates that this host is a 'custom' top-level domain name.
+@@ -2196,21 +2196,21 @@
+ Example ${program}.conf file entries:
+   ## single host update
+   protocol=dyndns2,                                         \\
+-  login=my-dyndns.org-login,                                \\
+-  password=my-dyndns.org-password                           \\
+-  myhost.dyndns.org
++  login=my-dyndns.com-login,                                \\
++  password=my-dyndns.com-password                           \\
++  myhost.dyndns.com
+
+   ## multiple host update with wildcard'ing mx, and backupmx
+   protocol=dyndns2,                                         \\
+-  login=my-dyndns.org-login,                                \\
+-  password=my-dyndns.org-password,                          \\
++  login=my-dyndns.com-login,                                \\
++  password=my-dyndns.com-password,                          \\
+   mx=a.host.willing.to.mx.for.me,backupmx=yes,wildcard=yes  \\
+-  myhost.dyndns.org,my2ndhost.dyndns.org
++  myhost.dyndns.com,my2ndhost.dyndns.com
+
+   ## multiple host update to the custom DNS service
+   protocol=dyndns2,                                         \\
+-  login=my-dyndns.org-login,                                \\
+-  password=my-dyndns.org-password                           \\
++  login=my-dyndns.com-login,                                \\
++  password=my-dyndns.com-password                           \\
+   my-toplevel-domain.com,my-other-domain.com
+ EoEXAMPLE
+ }
+@@ -2234,8 +2234,8 @@
+        '!active'  => 'The hostname specified is in a Custom DNS domain which has not yet been activated.',
+        'abuse',   => 'The hostname specified is blocked for abuse; fill in the form at http://support.dyndns.org/abuse.php to be unblocked',
+
+-       'numhost'  => 'System error: Too many or too few hosts found. Contact support@dyndns.org',
+-       'dnserr'   => 'System error: DNS error encountered. Contact support@dyndns.org',
++       'numhost'  => 'System error: Too many or too few hosts found. Contact support@dyndns.com',
++       'dnserr'   => 'System error: DNS error encountered. Contact support@dyndns.com',
+
+        'nochg'    => 'No update required; unnecessary attempts to change to the current address are considered abusive',
+     );
+@@ -2507,7 +2507,7 @@
+
+ Configuration variables applicable to the 'hammernode1' protocol are:
+   protocol=hammernode1         ##
+-  server=fqdn.of.service       ## defaults to members.dyndns.org
++  server=fqdn.of.service       ## defaults to members.dyndns.com
+   login=service-login          ## login name and password  registered with the service
+   password=service-password    ##
+   fully.qualified.host         ## the host registered with the service.
diff --git a/svn/patches/ubuntu/sample_ubuntu.diff b/svn/patches/ubuntu/sample_ubuntu.diff
new file mode 100644
index 0000000..ab2a7cd
--- /dev/null
+++ b/svn/patches/ubuntu/sample_ubuntu.diff
@@ -0,0 +1,11 @@
+--- ddclient-3.7.1/sample-etc_rc.d_init.d_ddclient.ubuntu.orig	2007-04-28 13:01:23.000000000 +0100
++++ ddclient-3.7.1/sample-etc_rc.d_init.d_ddclient.ubuntu	2007-04-28 13:01:51.000000000 +0100
+@@ -5,7 +5,7 @@
+ # Submitted by paolo martinelli
+ 
+ DDCLIENT=/usr/sbin/ddclient
+-CONF=/etc/ddclient/ddclient.conf
++CONF=/etc/ddclient.conf
+ PIDFILE=/var/run/ddclient.pid
+ 
+ test -x $DDCLIENT || exit 0
diff --git a/svn/patches/ubuntu/series b/svn/patches/ubuntu/series
new file mode 100644
index 0000000..698bcdd
--- /dev/null
+++ b/svn/patches/ubuntu/series
@@ -0,0 +1,6 @@
+config_path.diff
+dyndns_com.diff
+daemon_interval.diff
+sample_ubuntu.diff
+smc-barricade-fw-alt.diff
+checked_ssl_load.diff
diff --git a/svn/patches/ubuntu/smc-barricade-fw-alt.diff b/svn/patches/ubuntu/smc-barricade-fw-alt.diff
new file mode 100644
index 0000000..a91c63f
--- /dev/null
+++ b/svn/patches/ubuntu/smc-barricade-fw-alt.diff
@@ -0,0 +1,14 @@
+--- ddclient-3.7.1/ddclient.orig	2007-04-30 00:43:32.000000000 +0100
++++ ddclient-3.7.1/ddclient	2007-05-03 23:07:24.000000000 +0100
+@@ -73,6 +73,11 @@
+ 				  'url'  => '/status.htm',
+ 				  'skip' => 'IP Address',
+ 			        },
++    'smc-barricade-alt'      => {
++				  'name' => 'SMC Barricade FW (alternate config)',
++				  'url'  => '/status.HTM',
++				  'skip' => 'WAN IP',
++			        },
+     'smc-barricade-7401bra'  => {
+ 				  'name' => 'SMC Barricade 7401BRA FW',
+ 				  'url'  => '/admin/wan1.htm',