diff options
author | Jan Malakhovski <oxij@oxij.org> | 2016-11-06 09:57:26 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2016-11-06 10:00:22 +0000 |
commit | d9db3208890b805569a9a85fe15fff624010fa99 (patch) | |
tree | f03826e4d68ea79dd544bf3ec2c637e110c5dfb2 | |
parent | 4440cf6d8169e9171b87f11475a518a658fa4dae (diff) |
libtiff: patch for some more CVEs, fix patch urls
-rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index b632b910f01f9..45810283e0522 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -2,6 +2,7 @@ let version = "4.0.6"; + debversion = "3"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; @@ -19,35 +20,48 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ + patches = let p = "https://sources.debian.net/data/main/t/tiff/${version}-${debversion}/debian/patches"; in [ (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/01-CVE-2015-8665_and_CVE-2015-8683.patch"; + url = "${p}/01-CVE-2015-8665_and_CVE-2015-8683.patch"; sha256 = "1c4zmvxj124873al8fvkiv8zq7wx5mv2vd4f1y9w8liv92cm7hkc"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/02-fix_potential_out-of-bound_writes_in_decode_functions.patch"; + url = "${p}/02-fix_potential_out-of-bound_writes_in_decode_functions.patch"; sha256 = "0rsc7zh7cdhgcmx2vbjfaqrb0g93a3924ngqkrzb14w5j2fqfbxv"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch"; + url = "${p}/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch"; sha256 = "1s01xhp4sl04yhqhqwp50gh43ykcqk230mmbv62vhy2jh7v0ky3a"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch"; + url = "${p}/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch"; sha256 = "0by35qxpzv9ib3mnh980gd30jf3qmsfp2kl730rq4pq66wpzg9m8"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/05-CVE-2016-6223.patch"; + url = "${p}/05-CVE-2016-6223.patch"; sha256 = "0rh8ia0wsf5yskzwdjrlbiilc9m0lq0igs42k6922pl3sa1lxzv1"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/06-CVE-2016-5321.patch"; + url = "${p}/06-CVE-2016-5321.patch"; sha256 = "0n0igfxbd3kqvvj2k2xgysrp63l4v2gd110fwkk4apfpm0hvzwh0"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/07-CVE-2016-5323.patch"; + url = "${p}/07-CVE-2016-5323.patch"; sha256 = "1j6w8g6qizkx5h4aq95kxzx6bgkn4jhc8l22swwhvlkichsh4910"; }) + (fetchpatch { + url = "${p}/08-CVE-2016-3623_CVE-2016-3624.patch"; + sha256 = "1xnvwjvgyxi387h1sdiyp4360a3176jmipb7ghm8vwiz7cisdn9z"; + }) + (fetchpatch { + url = "${p}/09-CVE-2016-5652.patch"; + sha256 = "1yqfq32gzh21ab2jfqkq13gaz0nin0492l06adzsyhr5brvdhnx8"; + }) + (fetchpatch { + url = "${p}/10-CVE-2016-3658.patch"; + sha256 = "01kb8rfk30fgjf1hy0m088yhjfld1yyh4bk3gkg8jx3dl9bd076d"; + }) + ]; |