diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-24 18:25:09 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-24 18:25:09 +0000 |
| commit | cb026a2bd22d2656d88a7883e44caa31402d7646 (patch) | |
| tree | 804c389adfe6dc6deb38dfd90167b03b4f828bce /nixpkgs/pkgs/development/libraries/libjpeg-turbo | |
| parent | 5781972383d0382dc9353ac720a5d751ca17cd05 (diff) | |
| parent | 650a295621b27c4ebe0fa64a63fd25323e64deb3 (diff) | |
| download | nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.gz nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.bz2 nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.lz nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.xz nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.tar.zst nixlib-cb026a2bd22d2656d88a7883e44caa31402d7646.zip | |
Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libjpeg-turbo')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix | 19 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch | 11 |
2 files changed, 3 insertions, 27 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index ebcf51dfd030..23fa2f44b46f 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -2,29 +2,16 @@ stdenv.mkDerivation rec { name = "libjpeg-turbo-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75"; + sha256 = "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c"; }; patches = stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") - ./mingw-boolean.patch - ++ [ - ./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321 - (fetchpatch { - name = "cve-2018-19664.diff"; - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff"; - sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5"; - }) - (fetchpatch { - name = "CVE-2018-20330.patch"; - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff"; - sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji"; - }) - ]; + ./mingw-boolean.patch; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch deleted file mode 100644 index c0f7fef44938..000000000000 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -999,6 +999,8 @@ foreach(libtype ${TEST_LIBTYPES}) - - add_test(djpeg-${libtype}-rgb-islow-icc-cmp - ${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc) -+ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES -+ DEPENDS djpeg-${libtype}-rgb-islow) - - add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc" - testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2}) |