diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2024-12-25 09:40:01 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2025-01-30 22:46:02 +0000 |
| commit | 247942461c30d027927f28aae09a13fe2f7e7842 (patch) | |
| tree | 333fc5fca5abc6747a1cc8f52a298c9ad4f45062 | |
| parent | [Backport release-24.11] audiobookshelf: 2.17.7 -> 2.18.1 (#376925) (diff) | |
| download | nixpkgs-origin/backport-368082-to-release-24.11.tar.gz | |
jbig2enc: 0.29.0 -> 0.30.0origin/backport-368082-to-release-24.11
https://github.com/agl/jbig2enc/releases/tag/0.30
Fixes CVE-2018-11230.
(cherry picked from commit 74e9d007839867a3f4e052fd9629bde0d44baafd)
| -rw-r--r-- | pkgs/by-name/jb/jbig2enc/package.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/by-name/jb/jbig2enc/package.nix b/pkgs/by-name/jb/jbig2enc/package.nix index 6cb7ca15d17d..95b38a0a905a 100644 --- a/pkgs/by-name/jb/jbig2enc/package.nix +++ b/pkgs/by-name/jb/jbig2enc/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, leptonica, zlib, libwebp, @@ -10,18 +9,19 @@ libjpeg, libpng, libtiff, + python3, autoreconfHook, }: stdenv.mkDerivation rec { pname = "jbig2enc"; - version = "0.29"; + version = "0.30"; src = fetchFromGitHub { owner = "agl"; repo = "jbig2enc"; rev = version; - hash = "sha256-IAL4egXgaGmCilzcryjuvOoHhahyrfGWY68GBfXXgAM="; + hash = "sha256-B19l2NdMq+wWKQ5f/y5aoPiBtQnn6sqpaIoyIq+ugTg="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -34,20 +34,13 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff - ]; - - patches = [ - (fetchpatch { - name = "fix-build-leptonica-1.83.patch"; - url = "https://github.com/agl/jbig2enc/commit/ea050190466f5336c69c6a11baa1cb686677fcab.patch"; - hash = "sha256-+kScjFgDEU9F7VOUNAhm2XBjGm49fzAH8hYhmTm8xv8="; - }) + python3 ]; # We don't want to install this Python 2 script - postInstall = '' - rm "$out/bin/pdf.py" - ''; + #postInstall = '' + # rm "$out/bin/pdf.py" + #''; # This is necessary, because the resulting library has # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib |