From d0b16e592667007cbcd2963e6a6f060544abe490 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Sat, 17 Nov 2018 14:54:03 -0800
Subject: [PATCH] clightning: 0.6.1 -> 0.6.3

Versions before 0.6.3 have a potential coin-stealing DoS vulnerability.

Please upgrade!

backported from commits:

ca67e65182290c66d0b4e784ac547119ed027265 0.6.2 -> 0.6.3
b0fbc9ed40738176b1539009bcae88f5f63b8eab split native build inputs
3c1d7118e6cf60df88a6e44509cd137c8cf6b4ac 0.6.1 -> 0.6.2

Signed-off-by: William Casarin <jb55@jb55.com>
---
 pkgs/applications/altcoins/clightning.nix | 26 ++++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix
index 5ef1c06688de..38b49fcb1c33 100644
--- a/pkgs/applications/altcoins/clightning.nix
+++ b/pkgs/applications/altcoins/clightning.nix
@@ -1,24 +1,30 @@
 { stdenv, python3, pkgconfig, which, libtool, autoconf, automake,
-  autogen, sqlite, gmp, zlib, fetchFromGitHub }:
+  autogen, sqlite, gmp, zlib, fetchzip }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "clightning-${version}";
-  version = "0.6.1";
+  version = "0.6.3";
 
-  src = fetchFromGitHub {
-    fetchSubmodules = true;
-    owner = "ElementsProject";
-    repo = "lightning";
-    rev = "v${version}";
-    sha256 = "0qx30i1c97ic4ii8bm0sk9dh76nfg4ihl9381gxjj14i4jr1q8y4";
+  src = fetchzip {
+    #
+    # NOTE 0.6.3 release zip was bugged, this zip is a fix provided by the team
+    # https://github.com/ElementsProject/lightning/issues/2254#issuecomment-453791475
+    #
+    # replace url with:
+    #   https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip
+    # for future relases
+    #
+    url = "https://github.com/ElementsProject/lightning/files/2752675/clightning-v0.6.3.zip";
+    sha256 = "0k5pwimwn69pcakiq4a7qnjyf4i8w1jlacwrjazm1sfivr6nfiv6";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs = [ which sqlite gmp zlib autoconf libtool automake autogen python3 pkgconfig ];
+  nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which ];
+  buildInputs = [ sqlite gmp zlib python3 ];
 
-  makeFlags = [ "prefix=$(out)" ];
+  makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
 
   configurePhase = ''
     ./configure --prefix=$out --disable-developer --disable-valgrind