Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 79d9429c4c7a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3f92c2124a55
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Nov 11, 2019

  1. gdal: add patch for CVE-2019-17545

    @risicle
    risicle committed Nov 11, 2019
    Copy the full SHA
    1f2a133 View commit details

Commits on Nov 16, 2019

  1. Merge #73253: gdal: patch CVE-2019-17545

    @vcunat
    vcunat committed Nov 16, 2019
    Copy the full SHA
    eef525b View commit details

  2. Merge #72958: libexif: fix CVE-2018-20030 

    (cherry picked from commit 908f624)
Fixes #57153.
    @vcunat
    vcunat committed Nov 16, 2019
    Copy the full SHA
    08cc1b8 View commit details

  3. electrum-dash: mark as vulnerable 

    CVE-2018-1000022 in electrum

(cherry picked from commit a50507a)
    @c0bw3b
    c0bw3b committed Nov 16, 2019
    Copy the full SHA
    3f92c21 View commit details
Showing with 28 additions and 7 deletions.
  1. +1 −0 pkgs/applications/misc/electrum/dash.nix
  2. +9 −0 pkgs/development/libraries/gdal/default.nix
  3. +18 −7 pkgs/development/libraries/libexif/default.nix
1 change: 1 addition & 0 deletions pkgs/applications/misc/electrum/dash.nix
View file
Original file line number Diff line number Diff line change
@@ -42,5 +42,6 @@ python2Packages.buildPythonApplication rec {
homepage = https://github.com/dashpay/electrum-dash;
license = licenses.gpl3;
maintainers = with maintainers; [ np ];
knownVulnerabilities = [ "CVE-2018-1000022" ];
};
}
9 changes: 9 additions & 0 deletions pkgs/development/libraries/gdal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3";
};

patches = [
(fetchpatch {
name = "CVE-2019-17545.patch";
url = "https://github.com/OSGeo/gdal/commit/8cd2d2eb6327cf782a74dae263ffa6f89f46c93d.patch";
stripLen = 1;
sha256 = "06h88a659jcqf6ps1m91qy78s6s9krbkwnz28f5qh7032vlp6qpw";
})
];

buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat libxml2 ]
++ (with pythonPackages; [ python numpy wrapPython ])
25 changes: 18 additions & 7 deletions pkgs/development/libraries/libexif/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,21 +9,32 @@ stdenv.mkDerivation rec {
};

patches = [
(fetchpatch {
name = "CVE-2017-7544.patch";
url = https://sourceforge.net/p/libexif/bugs/_discuss/thread/fc394c4b/489a/attachment/xx.pat;
sha256 = "1qgk8hgnxr8d63jsc4vljxz9yg33mbml280dq4a6050rmk9wq4la";
})
(fetchpatch {
name = "CVE-2017-7544.patch";
url = "https://github.com/libexif/libexif/commit/c39acd1692023b26290778a02a9232c873f9d71a.patch";
sha256 = "0xgx6ly2i4q05shb61mfx6njwf1yp347jkznm0ka4m85i41xm6sd";
})
(fetchpatch {
name = "CVE-2018-20030-1.patch";
url = "https://github.com/libexif/libexif/commit/5d28011c40ec86cf52cffad541093d37c263898a.patch";
sha256 = "1wv8s962wmbn2m2xypgirf12g6msrbplpsmd5bh86irfwhkcppj3";
})
(fetchpatch {
name = "CVE-2018-20030-2.patch";
url = "https://github.com/libexif/libexif/commit/6aa11df549114ebda520dde4cdaea2f9357b2c89.patch";
sha256 = "01aqvz63glwq6wg0wr7ykqqghb4abgq77ghvhizbzadg1k4h7drx";
excludes = [ "NEWS" ];
})
];
patchFlags = "-p0";

buildInputs = [ gettext ];

meta = {
homepage = http://libexif.sourceforge.net/;
homepage = https://libexif.github.io/;
description = "A library to read and manipulate EXIF data in digital photographs";
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.erictapen ];
};

}