From nobody Fri Apr 28 14:28:10 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7FMH0wtVz48XP1; Fri, 28 Apr 2023 14:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7FMG700Tz41VK; Fri, 28 Apr 2023 14:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682692091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f85ck0S7M7ugQc7ZvJuBEDw1QRyY/UR4arRsymU7So8=; b=v8qv1qMsz0Jn3G3M0or2jt/nYsD5NK25yRloiM74hrOcbeSfTxQCinHzwSmiO6u1byQ9i3 cX2pmgpJRlQibFjQnIHuFFzjKQLPfxklzT06ZHOM4uja52ekgoLhce/M9nCb64jBigAsfF yB4uWu9sGw/avLo12fnnV+gkSpvmxMThVLi2fp/xGPvbGl3R36btPqx1q4m7uYx1uPP9Tb hdy/BIiMIC62QmdULEK8pLyxq+Kpo3ErRoBPHeoXlHytl6NusTxUidfz4uZT/qD8hR3tLW PNzdpDuQ8Hq3ZFwZhmS1hsHBUXAOf4McMTg2QBA8ATyT9r8AJsvRCfFqKtDJdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682692091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f85ck0S7M7ugQc7ZvJuBEDw1QRyY/UR4arRsymU7So8=; b=Q+KEwfBnqEGG2fDq9n+Olf+eMx3GuqAzV2DRGZUpt7s9+lDCqZz/12D6Y1h0hWph7jDxCY gVxFbE4gOcNo56Mwerk/C0RZHKcBFVY904rZdQqQ/rqXJkoYVHApsBVsb0VbHUaGggRhXx ERGNXSLA/zx2d2LQ/OdncNxt+ZK40daCKPsnQH6uoaM0So2+uJ6snovvIp2eEMkiIIc7we kRFYR5p/miO7CfA144cFzhpZtcGoo2h4tszy2JvstaTnAavQxHrM6kCxF33lrbBV5qUNeE Zi0SMgX4glhwNXvXWfwkkrLYiQlrmp+jVQrVwoum5F8XJ1N5EQl+40Dtn4qb2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682692091; a=rsa-sha256; cv=none; b=hvjYxXZwEej0X66fS3OSbUL68jBupboDKjjxeC1CsumkQBSNUO1/WQZvgTk/VLZd2vv1Lm vkdSm4AjRCtoIUinfqc9HMTfKgzJCy/bvfyp8yReq3+eNMiAfSRA3MSTee/6HgPIaXSw2o HCBU/1F4/p367UOSM68xvAHz5znNjcpNiMu2uTToj3qTeUkA02G/fWAIb6hRfhxuQw7mc3 d/5M83wiUOBN68C0cWCc4NIdHPY4lwPKXLMFRlg6IWtNIxjMzI04nKSO8wayBucmbKRPOg EMJU3frelmGNPnaapPg3aOgVjEyETlp6GuTQBo9Ap+UB9jmm3o8+R5ieIqxkLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7FMG63kCz133b; Fri, 28 Apr 2023 14:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SESAnM063257; Fri, 28 Apr 2023 14:28:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SESAjH063256; Fri, 28 Apr 2023 14:28:10 GMT (envelope-from git) Date: Fri, 28 Apr 2023 14:28:10 GMT Message-Id: <202304281428.33SESAjH063256@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 840aa2982c30 - 2023Q2 - print/ghostscript9-agpl-base: add patch to fix CVE-2023-28879 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 840aa2982c3036f0e05e89420d34476ce593260c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=840aa2982c3036f0e05e89420d34476ce593260c commit 840aa2982c3036f0e05e89420d34476ce593260c Author: Nicholas Taylor AuthorDate: 2023-04-28 14:16:35 +0000 Commit: Matthias Andree CommitDate: 2023-04-28 14:26:20 +0000 print/ghostscript9-agpl-base: add patch to fix CVE-2023-28879 and bump PORTREVISION. vulndb update in upcoming separate commit. Note I am bumping the branch to PORTREVISION=10 (not 9) as well so we have the fixed version on the same PORTREVISION, on branch and main line. Security: CVE-2023-28879 Security: 25872b25-da2d-11ed-b715-a1e76793953b PR: 270823 MFH: 2023Q2 Approved by: hrs@ through maintainer timeout, 15d (cherry picked from commit 6ff53aa124d487f75e4bcdc2267f15acdc72f523) --- print/ghostscript9-agpl-base/Makefile | 2 +- .../ghostscript9-agpl-base/files/patch-base_cbcp.c | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile index 6d6c48119c96..305e44397735 100644 --- a/print/ghostscript9-agpl-base/Makefile +++ b/print/ghostscript9-agpl-base/Makefile @@ -1,6 +1,6 @@ PORTNAME= ghostscript PORTVERSION= 9.56.1 -PORTREVISION= 8 +PORTREVISION= 10 CATEGORIES= print MASTER_SITES= https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//g}/ PKGNAMESUFFIX= 9-agpl-base diff --git a/print/ghostscript9-agpl-base/files/patch-base_cbcp.c b/print/ghostscript9-agpl-base/files/patch-base_cbcp.c new file mode 100644 index 000000000000..f1048393c10c --- /dev/null +++ b/print/ghostscript9-agpl-base/files/patch-base_cbcp.c @@ -0,0 +1,23 @@ +--- base/sbcp.c ++++ base/sbcp.c +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001-2021 Artifex Software, Inc. ++/* Copyright (C) 2001-2023 Artifex Software, Inc. + All Rights Reserved. + + This software is provided AS-IS with no warranty, either express or +@@ -50,6 +50,14 @@ s_xBCPE_process(stream_state * st, stream_cursor_read * pr, + byte ch = *++p; + + if (ch <= 31 && escaped[ch]) { ++ /* Make sure we have space to store two characters in the write buffer, ++ * if we don't then exit without consuming the input character, we'll process ++ * that on the next time round. ++ */ ++ if (pw->limit - q < 2) { ++ p--; ++ break; ++ } + if (p == rlimit) { + p--; + break;