nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

jhead: 3.04 -> 3.06.0.1

Browse Source 
Fixes CVE-2020-6624 and CVE-2020-6625.

(cherry picked from commit 7050620e33)
This commit is contained in:
Thomas Gerbet
2021-04-16 16:46:04 +02:00
parent 52c0ba2d86
commit d3524effbe
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/tools/graphics/jhead/default.nix
View File

@@ -1,31 +1,20 @@
{ stdenv, fetchurl, fetchpatch, libjpeg }:
{ 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 \