From 6ccc6c7cd11534c6a5f3e83e6c31b6cbdc07114f Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Tue, 4 Dec 2018 00:07:28 +0100 Subject: [PATCH] ddclient: 3.8.3 -> 3.9.0 This release fixes cloudflare protocol usage by switching to a new api version. See release notes: https://sourceforge.net/p/ddclient/news/2018/08/ddclient-390-released. Partially fixes #26691. --- .../ddclient-line-buffer-stdout.patch | 20 ------------------- pkgs/tools/networking/ddclient/default.nix | 8 +++----- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch diff --git a/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch b/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch deleted file mode 100644 index d1ef9e024d2a..000000000000 --- a/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -u ddclient-3.8.1/ddclient ddclient-3.8.1.patched/ddclient ---- ddclient-3.8.1/ddclient 2011-07-11 23:04:21.000000000 +0200 -+++ ddclient-3.8.1.patched/ddclient 2012-11-08 11:52:31.930647236 +0100 -@@ -19,6 +19,7 @@ use strict; - use Getopt::Long; - use Sys::Hostname; - use IO::Socket; -+use IO::Handle qw( ); - - my ($VERSION) = q$Revision: 157 $ =~ /(\d+)/; - -@@ -675,7 +676,7 @@ $SIG{'TERM'} = sub { $caught_term = 1; }; - $SIG{'KILL'} = sub { $caught_kill = 1; }; - # don't fork() if foreground or force is on - if (opt('foreground') || opt('force')) { -- ; -+ STDOUT->autoflush(1); - } elsif (opt('daemon')) { - $SIG{'CHLD'} = 'IGNORE'; - my $pid = fork; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 14de1fea4790..0a44adbbec2d 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -2,19 +2,17 @@ perlPackages.buildPerlPackage rec { name = "ddclient-${version}"; - version = "3.8.3"; + version = "3.9.0"; src = fetchurl { url = "mirror://sourceforge/ddclient/${name}.tar.gz"; - sha256 = "1j8zdn7fy7i0bjk3jf0hxnbnshc2yf054vxq64imxdpfd7n5zgfy"; + sha256 = "0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw"; }; # perl packages by default get devdoc which isn't present outputs = [ "out" ]; - buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 ]; - - patches = [ ./ddclient-line-buffer-stdout.patch ]; + buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP ]; # Use iproute2 instead of ifconfig preConfigure = ''