Skip to content

Commit

Permalink
exiv2: 0.28.0 -> 0.28.1
Browse files Browse the repository at this point in the history
https://github.com/Exiv2/exiv2/blob/v0.28.1/doc/ChangeLog

Fixes CVE-2023-44398 (High).

Exiv2/exiv2#2762 is now fixed upstream, so
make `checkPhase` run unconditionally again.
  • Loading branch information
6t8k authored and wegank committed Nov 9, 2023
1 parent 7aaa664 commit 3940405
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions pkgs/development/libraries/exiv2/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, doxygen
, gettext
Expand All @@ -19,17 +20,24 @@

stdenv.mkDerivation rec {
pname = "exiv2";
version = "0.28.0";
version = "0.28.1";

outputs = [ "out" "lib" "dev" "doc" "man" ];

src = fetchFromGitHub {
owner = "exiv2";
repo = "exiv2";
rev = "v${version}";
hash = "sha256-nEoLJWxSJmAonCbW/iZKjLrKMj09mwEaSUXUcUu8GxU=";
hash = "sha256-Jim8vYWyCa16LAJ1GuP8cCzhXIc2ouo6hVsHg3UQbdg=";
};

patches = [
(fetchpatch {
url = "https://github.com/Exiv2/exiv2/commit/c351c7cce317571934abf693055779a59df30d6e.patch";
hash = "sha256-fWJT4IUBrAELl6ku0M1iTzGFX74le8Z0UzTJLU/gYls=";
})
];

nativeBuildInputs = [
cmake
doxygen
Expand Down Expand Up @@ -67,8 +75,7 @@ stdenv.mkDerivation rec {
"doc"
];

# https://github.com/Exiv2/exiv2/issues/2762
doCheck = lib.versionOlder brotli.version "1.1.0";
doCheck = true;

preCheck = ''
patchShebangs ../test/
Expand Down

0 comments on commit 3940405

Please sign in to comment.