Merge pull request #136364 from LeSuisse/fig2dev-3.2.8b

fig2dev: 3.2.8a -> 3.2.8b
This commit is contained in:
Martin Weinelt 2021-09-05 14:46:24 +02:00 committed by GitHub
commit c1065c53e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, ghostscript , ghostscript
, libpng , libpng
, makeWrapper , makeWrapper
@ -14,22 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fig2dev"; pname = "fig2dev";
version = "3.2.8a"; version = "3.2.8b";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3"; sha256 = "1jv8rg71dsy00lpg434r5zqs5qrg8mxqvv2gpcjjvmzsm551d2j1";
}; };
patches = [
(fetchpatch {
name = "CVE-2021-3561.patch";
# Using Debian patch since it is not possible to download it directly from Sourceforge
url = "https://sources.debian.org/data/main/f/fig2dev/1:3.2.8-3/debian/patches/33_sanitize-color.patch";
sha256 = "1bppr3li03nj4qjibnddr2f38mpk55pcn5z6k98pf00gabq33fgs";
})
];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libpng ]; buildInputs = [ libpng ];