From 51492262b8eb7ad4fac2f6087398451d43d5be9d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 28 Apr 2019 14:17:42 -0500 Subject: [PATCH] leptonica: 1.74.1 -> 1.78.0 Multiple CVE's, see 1.77.0 notes. http://www.leptonica.com/source/version-notes.html --- .../libraries/leptonica/default.nix | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index b9b6c3c7c24..5ec9162c5ac 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,33 +4,13 @@ stdenv.mkDerivation rec { name = "leptonica-${version}"; - version = "1.74.1"; + version = "1.78.0"; src = fetchurl { url = "http://www.leptonica.org/source/${name}.tar.gz"; - sha256 = "0qpcidvv6igybrrhj0m6j47g642c8sk1qn4dpj82mgd38xx52skl"; + sha256 = "122s9b8hi93va4lgwnwrbma50x5fp740npy0s92xybd2wy0jxvg2"; }; - patches = stdenv.lib.singleton (fetchpatch { - # configure: Support pkg-config - url = "https://github.com/DanBloomberg/leptonica/commit/" - + "4476d162cc191a0fefb2ce434153e12bbf188664.patch"; - sha256 = "1razzp2g49shfaravfqpxm3ivcd1r92lvqysll6nnf6d1wp9865s"; - }); - - postPatch = '' - # Remove the AC_SUBST() macros on *_LIBS, because the *_LIBS variables will - # be automatically set by PKG_CHECK_MODULES() since autotools 0.24 and - # using the ones that are set here in Leptonica's configure.ac do not - # include -L linker flags. - sed -i -e '/PKG_CHECK_MODULES/,/^ *\])/s/AC_SUBST([^)]*)//' configure.ac - - # The giflib package doesn't ship a pkg-config file, so we need to inject - # the linker search path. - substituteInPlace configure.ac --replace -lgif \ - ${stdenv.lib.escapeShellArg "'-L${giflib}/lib -lgif'"} - ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ];