diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2021-04-16 16:46:04 +0200 |
|---|---|---|
| committer | Thomas Gerbet <thomas@gerbet.me> | 2021-04-17 09:54:01 +0200 |
| commit | 7050620e332eaf117dca4fd8130ae16a8f942b60 (patch) | |
| tree | 80634bb8542856f21188cc8fcad62c7d29bccfd4 /pkgs/tools/graphics/jhead | |
| parent | 37f49597e3e6e9126692e3741b58f0582e952340 (diff) | |
| download | nixpkgs-7050620e332eaf117dca4fd8130ae16a8f942b60.tar nixpkgs-7050620e332eaf117dca4fd8130ae16a8f942b60.tar.gz nixpkgs-7050620e332eaf117dca4fd8130ae16a8f942b60.tar.bz2 nixpkgs-7050620e332eaf117dca4fd8130ae16a8f942b60.tar.lz nixpkgs-7050620e332eaf117dca4fd8130ae16a8f942b60.tar.xz nixpkgs-7050620e332eaf117dca4fd8130ae16a8f942b60.tar.zst nixpkgs-7050620e332eaf117dca4fd8130ae16a8f942b60.zip | |
jhead: 3.04 -> 3.06.0.1
Fixes CVE-2020-6624 and CVE-2020-6625.
Diffstat (limited to 'pkgs/tools/graphics/jhead')
| -rw-r--r-- | pkgs/tools/graphics/jhead/default.nix | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index ab5fd4f5401..16e57252275 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -1,31 +1,20 @@ -{ lib, stdenv, fetchurl, fetchpatch, libjpeg }: +{ lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { pname = "jhead"; - version = "3.04"; + version = "3.06.0.1"; - src = fetchurl { - url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz"; - sha256 = "1j831bqw1qpkbchdriwcy3sgzvbagaj45wlc124fs9bc9z7vp2gg"; + src = fetchFromGitHub { + owner = "Matthias-Wandel"; + repo = "jhead"; + rev = version; + sha256 = "0zgh36486cpcnf7xg6dwf7rhz2h4gpayqvdk8hmrx6y418b2pfyf"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/j/jhead/1:3.04-2/debian/patches/01_gpsinfo.c"; - sha256 = "0r8hdbfrdxip4dwz5wqsv47a29j33cx7w5zx4jdhp5l1ihg003lz"; - }) - ]; - buildInputs = [ libjpeg ]; makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ]; - patchPhase = '' - sed -i '/dpkg-buildflags/d' makefile - substituteInPlace jhead.c \ - --replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim" - ''; - installPhase = '' mkdir -p \ $out/bin \ @@ -43,10 +32,5 @@ stdenv.mkDerivation rec { license = licenses.publicDomain; maintainers = with maintainers; [ rycee ]; platforms = platforms.all; - # https://github.com/NixOS/nixpkgs/issues/90828 - knownVulnerabilities = [ - "CVE-2020-6624" - "CVE-2020-6625" - ]; }; } |