git.iko.soy/typeable/nixpkgs
on master help sign in
libjpeg-turbo: 2.0.1 -> 2.0.2
commitab1ac905b43a1dc64a00cacd0ccf31a6d0bc572c authorEelco Dolstra <edolstra@gmail.com> dateWed 15 May 2019, 22:39 (8 years ago) parenta2aab0e
2 files changed+3−27
pkgs/development/libraries/libjpeg-turbo/default.nix+3−16 pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch−11
pkgs/development/libraries/libjpeg-turbo/default.nix+3−16
@@ -2,29 +2,16 @@
22
33stdenv.mkDerivation rec {
44 name = "libjpeg-turbo-${version}";
5− version = "2.0.1";
5+ version = "2.0.2";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
9− sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75";
9+ sha256 = "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c";
1010 };
1111
1212 patches =
1313 stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
14− ./mingw-boolean.patch
15− ++ [
16− ./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321
17− (fetchpatch {
18− name = "cve-2018-19664.diff";
19− url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff";
20− sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5";
21− })
22− (fetchpatch {
23− name = "CVE-2018-20330.patch";
24− url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff";
25− sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji";
26− })
27− ];
14+ ./mingw-boolean.patch;
2815
2916 outputs = [ "bin" "dev" "out" "man" "doc" ];
3017
pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patchdeleted−11
@@ -1,11 +0,0 @@
1−--- a/CMakeLists.txt
2−+++ b/CMakeLists.txt
3−@@ -999,6 +999,8 @@ foreach(libtype ${TEST_LIBTYPES})
4−
5− add_test(djpeg-${libtype}-rgb-islow-icc-cmp
6− ${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc)
7−+ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES
8−+ DEPENDS djpeg-${libtype}-rgb-islow)
9−
10− add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc"
11− testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2})