From patchwork Sat Feb 20 21:10:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 27166 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4F30827BC49; Sat, 20 Feb 2021 21:11:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C62CC27BC48 for ; Sat, 20 Feb 2021 21:11:31 +0000 (GMT) Received: from localhost ([::1]:51826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lDZXG-0002Dc-W6 for patchwork@mira.cbaines.net; Sat, 20 Feb 2021 16:11:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDZWo-0002CG-Nc for guix-patches@gnu.org; Sat, 20 Feb 2021 16:11:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41446) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lDZWo-0004aA-Cd for guix-patches@gnu.org; Sat, 20 Feb 2021 16:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lDZWo-0004E9-8O for guix-patches@gnu.org; Sat, 20 Feb 2021 16:11: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: Sat, 20 Feb 2021 21:11:02 +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.161385543016204 (code B ref 46566); Sat, 20 Feb 2021 21:11:02 +0000 Received: (at 46566) by debbugs.gnu.org; 20 Feb 2021 21:10:30 +0000 Received: from localhost ([127.0.0.1]:52991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDZWH-0004DH-Jr for submit@debbugs.gnu.org; Sat, 20 Feb 2021 16:10:29 -0500 Received: from mail-wr1-f46.google.com ([209.85.221.46]:44104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDZWC-0004Cp-5H for 46566@debbugs.gnu.org; Sat, 20 Feb 2021 16:10:26 -0500 Received: by mail-wr1-f46.google.com with SMTP id h98so9953289wrh.11 for <46566@debbugs.gnu.org>; Sat, 20 Feb 2021 13:10:24 -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=qS1QizpCuoZ9bThIW7HNbmPl8Cwq0cUIz05aytUH9Rw=; b=sMhHBAHIpZlMlGdQfa0oA8aTzvqhWJVgB/UqU42Ju2oxAXb6iEZ3bHUq7Jaa70P3aP kLCPqhZIWM0BTYMJc+FrlFgHnUxz8M4Js7VxQmgB2B8hDXafJmyoG/iISwk/1pfTfJbs JGxOX/MFy2WADVS5kD0Ili7WllhGx7QO6Quf/nXy0jtD9matyURoPEoCF5X0c9tUOXPu RWrmm/11JB/zOPdYDtSBxTeXDGyeHx+sirq8y6iVMqEdFNjV6La5yO0gqN51ZCTEFey6 M8CnRyPKG0Dnyf+Scz8RByWiZEo2GCk97RcjufA4uKHCzWDOX2Xfdwyp19/kj7RcRTCf wOng== 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=qS1QizpCuoZ9bThIW7HNbmPl8Cwq0cUIz05aytUH9Rw=; b=tsgERjdZ7Itwa1E2dDjhic3bKvn3aD9b9WD2zjQlhtpTKyZaSaCLyeVBYfLxbpnl5L qvQ0XbXPyHAk9HQlTJdDdTOR1Ibvj+Zkmxftg3rO4Y08F9maDRHxTWfPGsHqGB6vqy3s NWbVFF+BZAVy6ITU/UGzG8+tdWrEA9T5B0cJnfuC+d83jx1emA/EEaL4xUSI1k0esIU2 Pu3f6fwrsNb+p98N4lbGhQZnZExU3qavTsw4ncGFrAnnVm4qxKH+uZ3ibcepU91bvP2Y K+XWWLKnsQ4mrtdvPKqW21Wwgvf9URMiX193R8S7DW7977HjPesbXJzTnxN8IEY4POYP uQvQ== X-Gm-Message-State: AOAM533tvCfNyum1e6Jj7zLAvuZSTE2BJh8+38HBW8913NdTUmCrI7wY WvbdxyQXlGO0DVmtUH9oRShPt/gUqPs= X-Google-Smtp-Source: ABdhPJy15gU9JocKGOMBx5jHKSwj1EA1rmkMq2dq232KcHjuhIEd5inzS5dJDrvzJoyrwru/A7SXvA== X-Received: by 2002:a05:6000:4e:: with SMTP id k14mr14782005wrx.281.1613855418464; Sat, 20 Feb 2021 13:10:18 -0800 (PST) Received: from localhost.localdomain ([88.163.74.64]) by smtp.gmail.com with ESMTPSA id h17sm13195710wrw.74.2021.02.20.13.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Feb 2021 13:10:18 -0800 (PST) From: Vincent Legoll Date: Sat, 20 Feb 2021 22:10:09 +0100 Message-Id: <20210220211009.6014-2-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210220211009.6014-1-vincent.legoll@gmail.com> References: <20210220211009.6014-1-vincent.legoll@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ghostscript.scm (ghostscript): Update to 9.53.3. [source]: Remove obsolete patch 'ghostscript-CVE-2020-15900.patch'. * gnu/packages/patches/ghostscript-CVE-2020-15900.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/ghostscript.scm | 5 ++- .../patches/ghostscript-CVE-2020-15900.patch | 36 ------------------- 3 files changed, 2 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..2a13cbd83f 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")) 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; - }