From 53486a21fa1ab6a0e1cb39524d29e87be1dc2605 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Thu, 12 May 2011 10:11:55 +0000
Subject: [PATCH] updated patches, hope they work

---
 net-dns/ddclient/Manifest                     |  5 +-
 net-dns/ddclient/ddclient-3.8.0.ebuild        |  2 +-
 .../files/ddclient-3.8.0-everydns.patch       | 93 +++++++++++++++++++
 .../files/ddclient-noip-he-dot-net.patch      | 11 ++-
 4 files changed, 103 insertions(+), 8 deletions(-)
 create mode 100644 net-dns/ddclient/files/ddclient-3.8.0-everydns.patch

diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index a58c83f..a1cbde7 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -1,5 +1,6 @@
+AUX ddclient-3.8.0-everydns.patch 3455 RMD160 cfd93bd916a6165eaac75129881b7499b6268b96 SHA1 021feb6724d895207d50eeaf063b8560fb7d95cf SHA256 fb8d3703ea465818970efd9ebae6acff7de0177db060d7b1ba43016764ba994d
 AUX ddclient-everydns.patch 3454 RMD160 e9ea63e8a055e7c6070c3b0b0b4dbc8627a162fd SHA1 b9ca9ba95f2412e81c8c24b0105278750dbb46b2 SHA256 72efe00568fe3691824e0335509a9302e739558c1955bcca1c1b9e6296b824e9
-AUX ddclient-noip-he-dot-net.patch 485 RMD160 cdb83422239c7ddaa303b9ff0e357857c25bf3fe SHA1 fbd68709f051753de5b8c6fde33e743facd270dc SHA256 0e8cdb112d75dccd56d062109fbfe2c63dbef84d6960e5a633af9de051d10647
+AUX ddclient-noip-he-dot-net.patch 499 RMD160 e9582e5b61321ebb2d66d1c9765b96429e46028e SHA1 f455125a9f92f6b136b4c8c61610b792eb183345 SHA256 bb5ca0232f2a9ae5fe315142c3a7a2528c4b73f74d9837bb693e1985400f8bf1
 AUX ddclient-reasonable-security.patch 858 RMD160 0be9d1a9412225361f6352322ee5af6279730393 SHA1 171f220000c5ada3208f9f5765ef3347c7cbde7d SHA256 4ae67c01b41e0ae2f52b60e43072a872373201cc81f92108cd674b89eabda044
 AUX ddclient.confd 97 RMD160 dab278d7ed0ab8fe9f01c072be549d532f20b5d4 SHA1 90ede573df78aa242b9fec7f6d9f05f0c937fb2b SHA256 7a05a1c016dcffa2033da00e8a58072d0df33c31bc8b96170929032567cb44ab
 AUX ddclient.init 732 RMD160 53c6674ff80bf0d222178bde2a2d28a3cd9ee635 SHA1 3b65b01e7a7e1d85843f75c701fbb43d5d124ccd SHA256 2e7aecd2ffe978006632d78bb3a7c5eede2490f6af769399c2bb35c531e11146
@@ -8,4 +9,4 @@ AUX ddclient.rc6 718 RMD160 8faeb700539275e8ede58c857981b858e36c32fe SHA1 514ff1
 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
 EBUILD ddclient-3.7.3-r1.ebuild 2410 RMD160 fb93c0d02b31024477a92bde52446237d580feda SHA1 434a77b141cd950cddf35b013e6fa79f574b1eba SHA256 843ddef8a25b1259e65818df166e86d58a9f984cbb4408872d158f77dce2bbf1
-EBUILD ddclient-3.8.0.ebuild 2461 RMD160 761dd711aaf12ee0d7908a7e9001ed1da995381a SHA1 ed0ac33ae5a8ebb0ecde592cb22d36d953dc1d23 SHA256 f89d91ce0b09272cf840e20a9468098881343888bab42ea872a5adae8db3fd57
+EBUILD ddclient-3.8.0.ebuild 2460 RMD160 3715881f5b54a66ef018492d89f0d9e9da284cfa SHA1 50a5d820c8b6f0dc8c215aacdb35e11c8d0ad179 SHA256 7c1d213835895ad2056fc7a73d4c45aaca01d5a7f17a61e9e281c3ebbee88a08
diff --git a/net-dns/ddclient/ddclient-3.8.0.ebuild b/net-dns/ddclient/ddclient-3.8.0.ebuild
index 7af0785..339271e 100644
--- a/net-dns/ddclient/ddclient-3.8.0.ebuild
+++ b/net-dns/ddclient/ddclient-3.8.0.ebuild
@@ -27,7 +27,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-reasonable-security.patch"
 	epatch "${FILESDIR}/${PN}-noip-he-dot-net.patch"
-	epatch "${FILESDIR}/${PN}-everydns.patch"
+	epatch "${FILESDIR}/${P}-everydns.patch"
 
 	einfo "Applying version string fix"
 	if ! sed -i "s/3\.7\.1/$PV/" "$PN"; then
diff --git a/net-dns/ddclient/files/ddclient-3.8.0-everydns.patch b/net-dns/ddclient/files/ddclient-3.8.0-everydns.patch
new file mode 100644
index 0000000..496d15d
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient-3.8.0-everydns.patch
@@ -0,0 +1,93 @@
+--- ddclient.orig	2011-05-12 09:48:40.000000000 +0000
++++ ddclient	2011-05-12 09:54:27.000000000 +0000
+@@ -524,6 +524,16 @@
+                           $variables{'service-common-defaults'},
+                         ),
+     },
++    'everydns' => {
++        'updateable' => undef,
++        'update'     => \&nic_everydns_update,
++        'examples'   => \&nic_everydns_examples,
++        'variables'  => merge(
++                          { 'server'       => setv(T_FQDNP, 1, 0, 1, 'dyn.everydns.net', undef) },
++                          { 'min-interval' => setv(T_DELAY, 0, 0, 1, 0, interval('15m')) },
++                          $variables{'service-common-defaults'},
++                        ),
++    },
+ );
+ $variables{'merged'} = merge($variables{'global-defaults'},
+ 			     $variables{'service-common-defaults'},
+@@ -3377,6 +3387,73 @@
+         }
+     }
+ }
++######################################################################
++## nic_everydns_examples
++######################################################################
++sub nic_everydns_examples {
++    return <<EoEXAMPLE;
++o 'everydns'
++
++The 'everydns' protocol is the protocol used by the free dynamic
++DNS service offered by EveryDNS at www.everydns.net. So far it actually ignores the
++value of the domain, it just updates all domains associated with the account
++that belongs to the given credentials
++
++Configuration variables applicable to the 'everydns' protocol are:
++  protocol=everydns            ## 
++  server=dyn.everydns.net      ## defaults to members.dyndns.org
++  login=service-login          ## login name and password  registered with the service
++  password=service-password    ##
++  domain.name                  ## the domain registered with the service.
++
++Example ${program}.conf file entries:
++  ## single host update
++  protocol=everydns,                                    \\
++  login=my-everydns.net-login,                          \\
++  password=my-everydns.net-password                     \\
++  my-example-domain.com
++
++EoEXAMPLE
++}
++######################################################################
++## nic_everydns_update
++######################################################################
++sub nic_everydns_update {
++    debug("\nnic_everydns_update -------------------");
++
++    ## update each configured domain
++    foreach my $h (@_) {
++	my $ip = delete $config{$h}{'wantip'};
++	info("setting IP address to %s for %s", $ip, $h);
++	verbose("UPDATE:","updating %s", $h);
++
++	my $url;
++	$url   = "http://$config{$h}{'server'}/index.php";
++	$url  .= "?ver=0.1";
++	$url  .= "&ip=$ip" if $ip;
++	# $url  .= "&domain=$d" if $d;
++	
++	my $reply = geturl(opt('proxy'), $url, $config{$h}{'login'}, $config{$h}{'password'});
++	if (!defined($reply) || !$reply) {
++	    failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'});
++	    last;
++	}
++	last if !header_ok($h, $reply);
++	
++	my @reply = split /\n/, $reply;
++	if (grep /^Exit Code: 0$/i, @reply) {
++	    $config{$h}{'ip'}     = $ip;
++	    $config{$h}{'mtime'}  = $now;
++	    $config{$h}{'status'} = 'good';
++	    success("updating %s: good: IP address set to %s", $h, $ip);
++	} else {
++	    $config{$h}{'status'} = 'failed';
++	    warning("SENT:    %s", $url) unless opt('verbose');
++	    warning("REPLIED: %s", $reply);
++	    failed("updating %s: Invalid reply.", $h);
++	}
++    }
++}
+ 
+ ######################################################################
+ # vim: ai ts=4 sw=4 tw=78 :
diff --git a/net-dns/ddclient/files/ddclient-noip-he-dot-net.patch b/net-dns/ddclient/files/ddclient-noip-he-dot-net.patch
index 05e00e1..4603524 100644
--- a/net-dns/ddclient/files/ddclient-noip-he-dot-net.patch
+++ b/net-dns/ddclient/files/ddclient-noip-he-dot-net.patch
@@ -1,14 +1,15 @@
---- ddclient.orig	2009-01-27 20:14:02.000000000 +0100
-+++ ddclient	2011-05-12 01:34:15.995845012 +0200
-@@ -2460,9 +2460,8 @@
+--- ddclient.orig	2009-01-27 19:14:02.000000000 +0000
++++ ddclient	2011-05-12 09:48:01.000000000 +0000
+@@ -2460,9 +2460,9 @@
  	info("setting IP address to %s for %s", $ip, $hosts);
  	verbose("UPDATE:","updating %s", $hosts);
  
 -	my $url = "http://$config{$h}{'server'}/nic/update?system=";
 -    $url .= 'noip';
 -	$url  .= "&hostname=$hosts";
-+	my $url = "http://$config{$h}{'server'}/nic/update?";
-+	$url  .= "hostname=$hosts";
++	my $url = "http://$config{$h}{'server'}/nic/update?"
++	$url  .= "hostname=";
++	$url  .= "$hosts";
  	$url  .= "&myip=";
  	$url  .= $ip            if $ip;