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: 8260cd5bc65f
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: 289466dd6a11
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 18, 2020

  1. libexif: 0.6.21 -> 0.6.22 

    Also:
- build from git
- enable cross compilation

(cherry picked from commit e761cfe)
    @erictapen
    erictapen committed Jun 18, 2020
    Copy the full SHA
    b6558a1 View commit details

  2. Merge pull request #91009 from erictapen/19.09-libexif-0.6.22 

    [19.09] libexif: 0.6.21 -> 0.6.22 for security fixes
    @flokli
    flokli authored Jun 18, 2020
    Copy the full SHA
    289466d View commit details
Showing with 14 additions and 35 deletions.
  1. +14 −35 pkgs/development/libraries/libexif/default.nix
49 changes: 14 additions & 35 deletions pkgs/development/libraries/libexif/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,24 @@
{ stdenv, fetchurl, fetchpatch, gettext }:
{ stdenv, fetchFromGitHub, autoreconfHook, gettext }:

stdenv.mkDerivation rec {
name = "libexif-0.6.21";
pname = "libexif";
version = "0.6.22";

src = fetchurl {
url = "mirror://sourceforge/libexif/${name}.tar.bz2";
sha256 = "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release";
sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1";
};

patches = [
(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" ];
})
(fetchpatch {
name = "CVE-2019-9278.patch";
url = "https://github.com/libexif/libexif/commit/75aa73267fdb1e0ebfbc00369e7312bac43d0566.patch";
sha256 = "10ikg33mips5zq9as7l9xqnyzbg1wwr4sw17517nzf4hafjpasrj";
})
];
nativeBuildInputs = [ autoreconfHook gettext ];

buildInputs = [ gettext ];

meta = {
homepage = https://libexif.github.io/;
meta = with stdenv.lib; {
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 ];
license = licenses.lgpl21;
platforms = platforms.unix;
maintainers = with maintainers; [ erictapen ];
};

}