summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2023-10-26 09:39:56 +0200
committerVladimír Čunát <v@cunat.cz>2023-10-26 09:39:56 +0200
commitd70a459f01ea3d15b6372a53ce06e7936d882342 (patch)
tree25ad901ffa2d7de7ac7d6c1498571388f16e39f4
parentMerge pull request #263511 from NixOS/backport-263467-to-release-23.05 (diff)
parentminizip: apply patch for CVE-2023-45853 (diff)
downloadnixpkgs-d70a459f01ea3d15b6372a53ce06e7936d882342.tar.gz
Merge #263083: minizip: apply patch for CVE-2023-45853
...into release-23.05
-rw-r--r--pkgs/development/libraries/minizip/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix
index 1fb737ed7a75..a7af395598fc 100644
--- a/pkgs/development/libraries/minizip/default.nix
+++ b/pkgs/development/libraries/minizip/default.nix
@@ -1,10 +1,20 @@
-{ lib, stdenv, zlib, autoreconfHook }:
+{ lib, stdenv, zlib, autoreconfHook, fetchpatch }:
stdenv.mkDerivation {
pname = "minizip";
version = zlib.version;
inherit (zlib) src;
+ patches = [
+ (fetchpatch {
+ name = "CVE-2023-45853.patch";
+ url = "https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c.patch";
+ hash = "sha256-yayfe1g9HsvgMN28WF/MYkH7dGMX4PsK53FcnfL3InM=";
+ })
+ ];
+
+ patchFlags = [ "-p3" ];
+
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib ];