diff options
| author | Robert Helgesson <robert@rycee.net> | 2020-06-19 21:32:59 +0200 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2020-06-19 22:02:25 +0200 |
| commit | 7395b11cd4c2a16fa060e8b419113ca872d36c78 (patch) | |
| tree | 9d76b2979688bb221c95ebc58fae7547bd0a3b73 /pkgs/tools/graphics/jhead | |
| parent | 619f370777e88b8ea038e9f7389f2fd2b9e31661 (diff) | |
| download | nixpkgs-7395b11cd4c2a16fa060e8b419113ca872d36c78.tar nixpkgs-7395b11cd4c2a16fa060e8b419113ca872d36c78.tar.gz nixpkgs-7395b11cd4c2a16fa060e8b419113ca872d36c78.tar.bz2 nixpkgs-7395b11cd4c2a16fa060e8b419113ca872d36c78.tar.lz nixpkgs-7395b11cd4c2a16fa060e8b419113ca872d36c78.tar.xz nixpkgs-7395b11cd4c2a16fa060e8b419113ca872d36c78.tar.zst nixpkgs-7395b11cd4c2a16fa060e8b419113ca872d36c78.zip | |
jhead: 3.03 -> 3.04
Diffstat (limited to 'pkgs/tools/graphics/jhead')
| -rw-r--r-- | pkgs/tools/graphics/jhead/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 9f5ffcad8fd..19a0e26d9cc 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -2,34 +2,27 @@ stdenv.mkDerivation rec { pname = "jhead"; - version = "3.03"; + version = "3.04"; src = fetchurl { url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz"; - sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2"; + sha256 = "1j831bqw1qpkbchdriwcy3sgzvbagaj45wlc124fs9bc9z7vp2gg"; }; 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"; + url = "https://sources.debian.org/data/main/j/jhead/1:3.04-2/debian/patches/01_gpsinfo.c"; + sha256 = "0r8hdbfrdxip4dwz5wqsv47a29j33cx7w5zx4jdhp5l1ihg003lz"; }) ]; buildInputs = [ libjpeg ]; - patchPhase = '' - substituteInPlace makefile \ - --replace /usr/local/bin $out/bin + makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ]; + patchPhase = '' + sed -i '/dpkg-buildflags/d' makefile substituteInPlace jhead.c \ - --replace "\" Compiled: \"__DATE__" "" \ --replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim" ''; |