From cca45cc3e146a7b0abba24b3f72ae245f51473ee Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Sat, 9 Jun 2018 15:49:36 +0200 Subject: [PATCH] Get libtiff on the same patch level as Debian. The imported patch file contains: CVE-2017-9935 CVE-2017-11613 CVE-2017-17095 CVE-2017-18013 CVE-2018-5784 CVE-2018-7456 Re #41748 (master) Re #41749 (release-18.03 - needs to be cherry-picked) --- pkgs/development/libraries/libtiff/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index ab1bda9ed299..6676944d5291 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { prePatch = let debian = fetchurl { - url = http://snapshot.debian.org/archive/debian-debug/20180128T155203Z//pool/main/t/tiff/tiff_4.0.9-3.debian.tar.xz; - sha256 = "0wya42y7kcq093g3h7ca10cm5sns1mgnkjmdd2qdi59v8arga4y4"; + url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-5.debian.tar.xz; + sha256 = "15lwcsd46gini27akms2ngyxnwi1hs2yskrv5x2wazs5fw5ii62w"; }; in '' - tar xf '${debian}' - patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')" + tar xf ${debian} + patches="$patches $(sed 's|^|debian/patches/|' < debian/patches/series)" ''; outputs = [ "bin" "dev" "out" "man" "doc" ];