From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SPJGEOgcLGClRAAA0tVLHw (envelope-from ) for ; Tue, 16 Feb 2021 19:28:40 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8L36C+gcLGAgawAAbx9fmQ (envelope-from ) for ; Tue, 16 Feb 2021 19:28:40 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3D1892AACA for ; Tue, 16 Feb 2021 20:28:39 +0100 (CET) Received: from localhost ([::1]:42394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC61W-0000d2-EF for larch@yhetil.org; Tue, 16 Feb 2021 14:28:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5nQ-0005NS-L8 for guix-patches@gnu.org; Tue, 16 Feb 2021 14:14:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lC5nO-0004nr-4B for guix-patches@gnu.org; Tue, 16 Feb 2021 14:14:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lC5nN-0001bL-W3 for guix-patches@gnu.org; Tue, 16 Feb 2021 14:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46566] [PATCH 2/2] gnu: ghostscript: Update to 9.53.3. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Feb 2021 19:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46566 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46566@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 46566-submit@debbugs.gnu.org id=B46566.16135027855978 (code B ref 46566); Tue, 16 Feb 2021 19:14:01 +0000 Received: (at 46566) by debbugs.gnu.org; 16 Feb 2021 19:13:05 +0000 Received: from localhost ([127.0.0.1]:41594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lC5mT-0001YK-G2 for submit@debbugs.gnu.org; Tue, 16 Feb 2021 14:13:05 -0500 Received: from mail-wr1-f53.google.com ([209.85.221.53]:33065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lC5mR-0001Xm-Nd for 46566@debbugs.gnu.org; Tue, 16 Feb 2021 14:13:04 -0500 Received: by mail-wr1-f53.google.com with SMTP id 7so14670848wrz.0 for <46566@debbugs.gnu.org>; Tue, 16 Feb 2021 11:13:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nMVaaMS+EHYqeopNmsJNhbDkwtbnK1Za3ZyY4JJg4hw=; b=VbOl5bQ14iG6O3QavESeIUKVOFOD6i6EJZix7VRXIf2XE12dEWlb3sXcDuPjuW2cLe Gj2cwQbhHcj34cd3Lhok9jg2MfNY+l/UeFnqle7wF8DSyprRyO8YY5BIUgcNBdc7CEiT D1Rq9+gtWz34j7xyhAiBf0etqRqDpPAwD3rs6p00dvT65yHe/ZIoCnHrXPpypaOjFbV/ N/i2LbW0qz56uc8fa2yoUgVrMTD0xC6T5UU+GNxHBJVboEhX9UzTRZivx+CM+tHxmDC8 DuHX1Rys2GwX/enLU11eHX81S99DsRg14X1aJY7ydekhH9vZB3PFRvHI5q7pr06dfaRQ Vvlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nMVaaMS+EHYqeopNmsJNhbDkwtbnK1Za3ZyY4JJg4hw=; b=BPTBigCe9XKMcbnUuZnS1tjB+1Fpti82TUSbOuXRdoJPAj+Xb0p/RW0TcOgBRUtsUJ 5Y2aq8Km33FnBExHegMIHckoJS/pnHzXavwiqsPwyjiL4tpNEe1vojW4weWUNrIM/c0l 6dGLKVunwwosZMZuVVeWIYEvz+uFZ/zFmd7yuQ3RqdYg4lvXpt9y7nFfhBwp9CKX6wKL iTyMgZNH3OaytUgTdzviGyJWNMN/VHX0/3sYFmsnzR9ibaAmO4anIjZNc/YBp2QLpQTq EAV+PIgO9YxwoxONQh6XYJ2MK6Fao0JNB+/0SmH/T5ysNWM2D2BkXxUHgj81/mxD1m69 U3rQ== X-Gm-Message-State: AOAM530m1rwSXnk5IkjyEV6l6LOfgR2Gv3gccjrpKXUtDIFT1EnWLuZg AbaefgCMMdH4nwyYixqxb+VMOCN7YmY= X-Google-Smtp-Source: ABdhPJxF3FFSCbKGCCXN+Ov6qLtDJu9HmyBMhVW/tdkvcfW045kk300YCauCmZpHMT5OdEG4KllJkA== X-Received: by 2002:adf:8084:: with SMTP id 4mr23839730wrl.49.1613502778148; Tue, 16 Feb 2021 11:12:58 -0800 (PST) Received: from localhost.localdomain ([88.163.74.64]) by smtp.gmail.com with ESMTPSA id f14sm5046905wmc.32.2021.02.16.11.12.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Feb 2021 11:12:57 -0800 (PST) From: Vincent Legoll Date: Tue, 16 Feb 2021 20:12:47 +0100 Message-Id: <20210216191247.6715-2-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210216191247.6715-1-vincent.legoll@gmail.com> References: <20210216191247.6715-1-vincent.legoll@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.74 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=VbOl5bQ1; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3D1892AACA X-Spam-Score: 2.74 X-Migadu-Scanner: scn0.migadu.com X-TUID: ycimG18ngQRp * gnu/packages/patches/ghostscript-CVE-2020-15900.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/ghostscript.scm (ghostscript): Update to 9.53.3. [source](patches): Remove it. [native-inputs]: Add jbig2dec. --- gnu/local.mk | 1 - gnu/packages/ghostscript.scm | 6 ++-- .../patches/ghostscript-CVE-2020-15900.patch | 36 ------------------- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 gnu/packages/patches/ghostscript-CVE-2020-15900.patch diff --git a/gnu/local.mk b/gnu/local.mk index b9757fe69e..3caa6c6fc9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1061,7 +1061,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-monad-par-fix-tests.patch \ %D%/packages/patches/ghc-pandoc-fix-html-tests.patch \ %D%/packages/patches/ghc-pandoc-fix-latex-test.patch \ - %D%/packages/patches/ghostscript-CVE-2020-15900.patch \ %D%/packages/patches/ghostscript-freetype-compat.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 19430d315a..53a631b095 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -160,7 +160,7 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (version "9.52") + (version "9.53.3") (source (origin (method url-fetch) @@ -170,9 +170,8 @@ printing, and psresize, for adjusting page sizes.") "/ghostscript-" version ".tar.xz")) (sha256 (base32 - "0z1w42y2jmcpl2m1l3z0sfii6zmvzcwcgzn6bydklia6ig7jli2p")) + "0d52w9ajv1rz533119ywgmkzkapp74riwny0d21v0zkcbg45p7ww")) (patches (search-patches "ghostscript-freetype-compat.patch" - "ghostscript-CVE-2020-15900.patch" "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) @@ -271,6 +270,7 @@ printing, and psresize, for adjusting page sizes.") ("pkg-config" ,pkg-config) ;needed for freetype ("python" ,python-minimal-wrapper) ("tcl" ,tcl) + ("jbig2dec" ,jbig2dec) ;; When cross-compiling, some of the natively-built tools require all ;; these libraries. diff --git a/gnu/packages/patches/ghostscript-CVE-2020-15900.patch b/gnu/packages/patches/ghostscript-CVE-2020-15900.patch deleted file mode 100644 index b6658d7c7f..0000000000 --- a/gnu/packages/patches/ghostscript-CVE-2020-15900.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix CVE-2020-15900. - -https://cve.circl.lu/cve/CVE-2020-15900 -https://artifex.com/security-advisories/CVE-2020-15900 - -Taken from upstream: -https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5d499272b95a6b890a1397e11d20937de000d31b - -diff --git a/psi/zstring.c b/psi/zstring.c ---- a/psi/zstring.c -+++ b/psi/zstring.c -@@ -142,13 +142,18 @@ search_impl(i_ctx_t *i_ctx_p, bool forward) - return 0; - found: - op->tas.type_attrs = op1->tas.type_attrs; -- op->value.bytes = ptr; -- r_set_size(op, size); -+ op->value.bytes = ptr; /* match */ -+ op->tas.rsize = size; /* match */ - push(2); -- op[-1] = *op1; -- r_set_size(op - 1, ptr - op[-1].value.bytes); -- op1->value.bytes = ptr + size; -- r_set_size(op1, count + (!forward ? (size - 1) : 0)); -+ op[-1] = *op1; /* pre */ -+ op[-3].value.bytes = ptr + size; /* post */ -+ if (forward) { -+ op[-1].tas.rsize = ptr - op[-1].value.bytes; /* pre */ -+ op[-3].tas.rsize = count; /* post */ -+ } else { -+ op[-1].tas.rsize = count; /* pre */ -+ op[-3].tas.rsize -= count + size; /* post */ -+ } - make_true(op); - return 0; - } -- 2.30.0