Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 17574594e263
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fb5130d79a96
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 31, 2019

  1. jhead: add patches for CVE-2019-1010301, CVE-2019-1010302

    @risicle
    risicle committed Oct 31, 2019
    Copy the full SHA
    7dacaa0 View commit details

  2. Merge pull request #72387 from risicle/ris-jhead-CVE-2019-1010301-101… 

    …0302

jhead: add patches for CVE-2019-1010301, CVE-2019-1010302
    @mmahut
    mmahut authored Oct 31, 2019
    Copy the full SHA
    fb5130d View commit details
Showing with 14 additions and 1 deletion.
  1. +14 −1 pkgs/tools/graphics/jhead/default.nix
15 changes: 14 additions & 1 deletion pkgs/tools/graphics/jhead/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libjpeg }:
{ stdenv, fetchurl, fetchpatch, libjpeg }:

stdenv.mkDerivation rec {
pname = "jhead";
@@ -9,6 +9,19 @@ stdenv.mkDerivation rec {
sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2";
};

patches = [
(fetchpatch {
name = "CVE-2019-1010301.patch";
url = "https://sources.debian.org/data/main/j/jhead/1:3.03-3/debian/patches/36_CVE-2019-1010301";
sha256 = "1vvrg50z5y7sjhfi973wh1q1v79sqp7hk5d4z0dlnx3fqgkjrx7q";
})
(fetchpatch {
name = "CVE-2019-1010302.patch";
url = "https://sources.debian.org/data/main/j/jhead/1:3.03-3/debian/patches/37_CVE-2019-1010302";
sha256 = "1h11mpsi7hpwbi8kpnkjwn6zpqf88f132h0rsg8sggcs3vva2x8y";
})
];

buildInputs = [ libjpeg ];

patchPhase = ''