From 113106df1b8e2bbb1ba6cb8b11b36cd7be3e393d Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 20 Feb 2016 12:14:29 +0100 Subject: [PATCH] ddclient: 3.8.2 -> 3.8.3 Also remove patch for issue that has been fixed upstream, add simple meta section, and minor other cleanups. --- .../ddclient/ddclient-foreground.patch | 12 ---------- pkgs/tools/networking/ddclient/default.nix | 23 ++++++++++++------- 2 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 pkgs/tools/networking/ddclient/ddclient-foreground.patch diff --git a/pkgs/tools/networking/ddclient/ddclient-foreground.patch b/pkgs/tools/networking/ddclient/ddclient-foreground.patch deleted file mode 100644 index 1ae3621f5079..000000000000 --- a/pkgs/tools/networking/ddclient/ddclient-foreground.patch +++ /dev/null @@ -1,12 +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 -@@ -574,7 +574,7 @@ - "usage: ${program} [options]", - "options are:", - [ "daemon", "=s", "-daemon delay : run as a daemon, specify delay as an interval." ], --+ [ "foreground", "!", "-foreground : do not fork" ], -+ [ "foreground", "!", "-foreground : do not fork" ], - [ "proxy", "=s", "-proxy host : use 'host' as the HTTP proxy" ], - [ "server", "=s", "-server host : update DNS information on 'host'" ], - [ "protocol", "=s", "-protocol type : update protocol used" ], diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 41688d843513..1664fbf37077 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,24 +1,25 @@ -{buildPerlPackage, fetchurl, perlPackages, iproute}: +{ stdenv, buildPerlPackage, fetchurl, perlPackages, iproute }: -buildPerlPackage { - name = "ddclient-3.8.2"; +buildPerlPackage rec { + name = "ddclient-${version}"; + version = "3.8.3"; src = fetchurl { - url = mirror://sourceforge/ddclient/ddclient-3.8.2.tar.gz ; - sha256 = "17mcdqxcwa6c05m8xhxi4r37j4qvbp3wgbpvzqgmrmgwava5wcrw"; + url = "mirror://sourceforge/ddclient/${name}.tar.gz"; + sha256 = "1j8zdn7fy7i0bjk3jf0hxnbnshc2yf054vxq64imxdpfd7n5zgfy"; }; buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ]; - patches = [ ./ddclient-foreground.patch ./ddclient-line-buffer-stdout.patch ]; + patches = [ ./ddclient-line-buffer-stdout.patch ]; # Use iproute2 instead of ifconfig - preConfigure = '' + preConfigure = '' touch Makefile.PL substituteInPlace ddclient --replace 'in the output of ifconfig' 'in the output of ip addr show' substituteInPlace ddclient --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' substituteInPlace ddclient --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' - ''; + ''; installPhase = '' mkdir -p $out/bin @@ -26,4 +27,10 @@ buildPerlPackage { ''; doCheck = false; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/p/ddclient/wiki/Home/; + description = "Client for updating dynamic DNS service entries"; + license = licenses.gpl2Plus; + }; }