Skip to content

Commit

Permalink
exiv2: include recent Debian security patches
Browse files Browse the repository at this point in the history
This patchset contains patches against:

* CVE-2018-10998
* CVE-2018-11531
* CVE-2018-12264
* CVE-2018-12265

Also adding GPL2 license.

Re #44457 (vulnerability roundup 46 - master)
Re #43716 (add missing licenses)

Please cherry pick to 18.03 if build on master is successful.

Re #44458 (vulnerability roundup 46 - 18.03)
  • Loading branch information
Christian Kauhaus committed Aug 4, 2018
1 parent 6b0451c commit 18e0d4f
Showing 1 changed file with 29 additions and 10 deletions.
39 changes: 29 additions & 10 deletions pkgs/development/libraries/exiv2/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, zlib, expat, gettext }:
{ stdenv, fetchurl, fetchpatch, runCommand, zlib, expat, gettext }:

stdenv.mkDerivation rec {
name = "exiv2-0.26";
Expand All @@ -17,13 +17,31 @@ stdenv.mkDerivation rec {
sha512 = "3f9242dbd4bfa9dcdf8c9820243b13dc14990373a800c4ebb6cf7eac5653cfef"
+ "e6f2c47a94fbee4ed24f0d8c2842729d721f6100a2b215e0f663c89bfefe9e32";
})
(fetchpatch {
# many CVEs - see https://github.com/Exiv2/exiv2/pull/120
url = "https://patch-diff.githubusercontent.com/raw/Exiv2/exiv2/pull/120.patch";
sha256 = "1szl22xmh12hibzaqf2zi8zl377x841m52x4jm5lziw6j8g81sj8";
excludes = [ "test/bugfixes-test.sh" ];
})
];
(fetchpatch {
# many CVEs - see https://github.com/Exiv2/exiv2/pull/120
url = "https://patch-diff.githubusercontent.com/raw/Exiv2/exiv2/pull/120.patch";
sha256 = "1szl22xmh12hibzaqf2zi8zl377x841m52x4jm5lziw6j8g81sj8";
excludes = [ "test/bugfixes-test.sh" ];
})
] ++
(let
debian = fetchurl {
url = http://http.debian.net/debian/pool/main/e/exiv2/exiv2_0.25-4.debian.tar.xz;
sha256 = "0dp9y0d8pbsys5r4j1xyhn5liv6x0p4gncf90bcgnsp5shipzsr1";
};
patches = runCommand "exiv2-debian-patches" {} ''
mkdir $out
tar xf ${debian} -C $out --strip-components=2 debian/patches
'';
in [
"${patches}/CVE-2018-10998.patch"
"${patches}/CVE-2018-11531_1_of_3.patch"
"${patches}/CVE-2018-11531_2_of_3.patch"
"${patches}/CVE-2018-11531_3_of_3.patch"
"${patches}/CVE-2018-12264.patch"
"${patches}/CVE-2018-12265_prereq.patch"
"${patches}/CVE-2018-12265.patch"
]);

postPatch = "patchShebangs ./src/svn_version.sh";

Expand All @@ -32,9 +50,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext ];
propagatedBuildInputs = [ zlib expat ];

meta = {
meta = with stdenv.lib; {
homepage = http://www.exiv2.org/;
description = "A library and command-line utility to manage image metadata";
platforms = stdenv.lib.platforms.all;
platforms = platforms.all;
license = licenses.gpl2;
};
}

0 comments on commit 18e0d4f

Please sign in to comment.