summary refs log tree commit diff
diff options
context:
space:
mode:
authorLeSuisse <thomas@gerbet.me>2021-07-14 00:35:09 +0200
committerGitHub <noreply@github.com>2021-07-14 00:35:09 +0200
commit3d260a2d0edffce5095a5f813e9227c4864e9715 (patch)
tree37ca85b0d920b92bd795a9ca5b94cd5b188798bf
parent8a74be203968afb97d42319806294ea1c6ad06c1 (diff)
downloadnixpkgs-3d260a2d0edffce5095a5f813e9227c4864e9715.tar
nixpkgs-3d260a2d0edffce5095a5f813e9227c4864e9715.tar.gz
nixpkgs-3d260a2d0edffce5095a5f813e9227c4864e9715.tar.bz2
nixpkgs-3d260a2d0edffce5095a5f813e9227c4864e9715.tar.lz
nixpkgs-3d260a2d0edffce5095a5f813e9227c4864e9715.tar.xz
nixpkgs-3d260a2d0edffce5095a5f813e9227c4864e9715.tar.zst
nixpkgs-3d260a2d0edffce5095a5f813e9227c4864e9715.zip
libsForQt5.kimageformats: fix CVE-2021-36083 (#130115)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
-rw-r--r--pkgs/development/libraries/kde-frameworks/kimageformats.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index 4ad3ba74100..00a9ef015f2 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -15,10 +15,19 @@ mkDerivation {
       url = "https://invent.kde.org/frameworks/kimageformats/-/commit/bf3f94da766d66a0470ab744dbe1ced4697b572d.diff";
       sha256 = "18d67l5kj9sv88jdpi061k9rl3adzkx9l51ng7saylrkfddwc3ig";
     })
+    (fetchpatch { # included in kimageformats >= 5.82
+      name = "CVE-2021-36083.patch";
+      url = "https://invent.kde.org/frameworks/kimageformats/-/commit/297ed9a2fe339bfe36916b9fce628c3242e5be0f.diff";
+      sha256 = "16axaljgaar0j5796x1mjps93y92393x8zywh3nzw7rm9w2qxzml";
+    })
   ];
 
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ karchive openexr libavif qtbase ];
   outputs = [ "out" ]; # plugins only
   CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR";
+
+  meta = with lib; {
+    broken = versionOlder qtbase.version "5.14";
+  };
 }