Merge #137574: libexif: 0.6.22 -> 0.6.23 (into staging-21.05)
This commit is contained in:
commit
99ee77dd6d
@ -1,30 +1,16 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }:
|
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libexif";
|
pname = "libexif";
|
||||||
version = "0.6.22";
|
version = "0.6.23";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release";
|
rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release";
|
||||||
sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1";
|
sha256 = "sha256-Os0yI/IPoe9MuhXgNdDaIg6uohclA2bjeu9t3tbUoNA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "CVE-2020-0198.patch";
|
|
||||||
url = "https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c.patch";
|
|
||||||
sha256 = "1040278g5dbq3vvlyk8cmzb7flpi9bfsp99268hw69i6ilwbdf2k";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
name = "CVE-2020-0452.patch";
|
|
||||||
url = "https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06.patch";
|
|
||||||
excludes = [ "NEWS" ];
|
|
||||||
sha256 = "0k4z1gbbkli6wwyy9qm2qvn0h00qda6wqym61nmmbys7yc2zryj6";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook gettext ];
|
nativeBuildInputs = [ autoreconfHook gettext ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user