From nobody Sun Aug 25 11:54:40 2024 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 4WsC0K18wHz5S8Xs; Sun, 25 Aug 2024 11:54:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WsC0J6ZJ2z4WbS; Sun, 25 Aug 2024 11:54:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724586880; 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=QejzyWlbhcCK7rOGgx4JIhE7ij7RaKtnSRPXBKRQx3g=; b=cCuCnFWUaxyxDZkYkmz7PdnDJYVkAgWEzHkTIPUcB16cdumByIi4eGVwmfTQVgX5mxwK5g UIDJ0jPcMowkCfFdFtiWfkTyAd5+gIt5IhZN8ejo1VOMizDuvQuSeV60SI4kf0/aQVrsAl XLiB/XDA3Zgo8okIVhwn5pC/XOKqi2CchZx6T/XOuk9wx8yiOeqKHi7fipbnAI6ofYR1B+ nwx/dPz2geM0osMr1ElOh2De04QoBSY39o7VbxEei9OTs5SSGTX3Hs+VE6dRP4Omf2gNF9 LRfYTRmhR91i8JV80hWXtrzFVVFbz5UMk6MU/y2HNljqp6B/9+RBE16Sdau9kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724586880; a=rsa-sha256; cv=none; b=N0/z9d/AuNobkQqlkCCOHs7yO4aaAL2c/PXO/T5aYJl7v+kaeCTp7LuXIFAwm42x20RK6u gqs5Xs97MqyC/S3E9vQDHPa5G8LtocgIxV4RSA/QEoAf23FYm9f31IcAnm1ObaJn08J3eH waIhZzIb3iDaBg/s9CyDwW7aXRLkm5C+Fxld4zQOT8YuTX19p3vTkJ6wjCAMF/RGyE3V7M FhrTUqEgjJ+PBLkgIrJ46pS1w7hYdw7gifLS7mQSeqS9A+VsPNxpprjmXpdfbOsXMQirYz M1Gi68JlxpwFo6SbtbpsRMrGHgdkn9STKrq78ILMu6Gw/Oh9lKfOig8YAuRxpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724586880; 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=QejzyWlbhcCK7rOGgx4JIhE7ij7RaKtnSRPXBKRQx3g=; b=LoonzHS7o90OUE/PlfqK4mFsjTVig5LCkwD26HuOdTZqW7yQuTlE9SLjuUnys8dLakHcK8 jYYzAqWYR9CqnkZaX7J2Nm1oHzL/CHGO8VrIPcTD+sts/NMZjnYrdhmvxCLCKhXl+5XGSl tgOohuLB740vHpntoApohTV68rR3jeaqdR11p1FfVrwaiDXeRxDcsvUfdXQlXhAEVuHzBr 2x98V025yvOGWbXvB8IeB8bvjppSRL8xkQam/6wSHbUjkPdSr3SgDT7GSVOfrJ9ifrjUZk gmiijRMZ8nQWSc0uykzXldapzymrehHyMyL23DUx3Ot3jLaEBDfebY/svPdYJA== 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 4WsC0J648bzMJ6; Sun, 25 Aug 2024 11:54:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47PBseY7070958; Sun, 25 Aug 2024 11:54:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47PBselP070955; Sun, 25 Aug 2024 11:54:40 GMT (envelope-from git) Date: Sun, 25 Aug 2024 11:54:40 GMT Message-Id: <202408251154.47PBselP070955@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 4095b1563fb8 - 2024Q3 - devel/mcpp: update to 2.7.2.1, fix CVE 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 4095b1563fb800a65076d8d9f4de9cc6c851686a Auto-Submitted: auto-generated The branch 2024Q3 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=4095b1563fb800a65076d8d9f4de9cc6c851686a commit 4095b1563fb800a65076d8d9f4de9cc6c851686a Author: Älven AuthorDate: 2024-08-23 07:55:44 +0000 Commit: Fernando Apesteguía CommitDate: 2024-08-25 11:54:24 +0000 devel/mcpp: update to 2.7.2.1, fix CVE ChangeLog: https://github.com/museoa/mcpp/compare/2.7.2...2.7.2.1 Fixes CVE-2019-14274: heap-based buffer overflow * Base Score: 5.5 MEDIUM * Vector: CVSS:3.1/AV:L/AC:L/PR:N/UI:R/S:U/C:N/I:N/A:H PR: 280962 Reported by: alster@vinterdalen.se MFH: 2024Q3 (security fix) Security: CVE-2019-14274 (cherry picked from commit 1386a9a718e50df51bbe3027d6e3abf4425a7be6) --- devel/mcpp/Makefile | 12 ++++++------ devel/mcpp/distinfo | 5 +++-- devel/mcpp/files/patch-src__internal.H | 19 ------------------- devel/mcpp/files/patch-src__main.c | 11 ----------- devel/mcpp/files/patch-src__support.c | 20 -------------------- devel/mcpp/files/patch-src__system.c | 21 --------------------- 6 files changed, 9 insertions(+), 79 deletions(-) diff --git a/devel/mcpp/Makefile b/devel/mcpp/Makefile index 1c0643bd66f0..d448b23248e4 100644 --- a/devel/mcpp/Makefile +++ b/devel/mcpp/Makefile @@ -1,8 +1,6 @@ PORTNAME= mcpp -PORTVERSION= 2.7.2 -PORTREVISION= 4 +DISTVERSION= 2.7.2.1 CATEGORIES= devel -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/V.${PORTVERSION} MAINTAINER= kmatsui@t3.rim.or.jp COMMENT= Alternative C/C++ preprocessor @@ -12,11 +10,13 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe libtool +CPE_VENDOR= mcpp_project +USE_GITHUB= yes +GH_ACCOUNT= museoa +USE_LDCONFIG= yes + GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --enable-mcpplib -USE_LDCONFIG= yes -CPE_VENDOR= mcpp_project OPTIONS_DEFINE= DOCS diff --git a/devel/mcpp/distinfo b/devel/mcpp/distinfo index df4fd5418fd2..3482a738eb8e 100644 --- a/devel/mcpp/distinfo +++ b/devel/mcpp/distinfo @@ -1,2 +1,3 @@ -SHA256 (mcpp-2.7.2.tar.gz) = 3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864 -SIZE (mcpp-2.7.2.tar.gz) = 1533457 +TIMESTAMP = 1724203382 +SHA256 (museoa-mcpp-2.7.2.1_GH0.tar.gz) = ec6c2ead79b2334fccf56b8811256c4fccbbe2350e6a2e52dc83a1c7ad995af4 +SIZE (museoa-mcpp-2.7.2.1_GH0.tar.gz) = 1523105 diff --git a/devel/mcpp/files/patch-src__internal.H b/devel/mcpp/files/patch-src__internal.H deleted file mode 100644 index c21a9a6f765e..000000000000 --- a/devel/mcpp/files/patch-src__internal.H +++ /dev/null @@ -1,19 +0,0 @@ ---- ./src/internal.H.orig 2008-08-27 15:01:16.000000000 +0200 -+++ ./src/internal.H 2011-03-30 19:57:37.000000000 +0200 -@@ -390,6 +390,8 @@ - extern char identifier[]; /* Lastly scanned name */ - extern IFINFO ifstack[]; /* Information of #if nesting */ - extern char work_buf[]; -+extern FILEINFO * sh_file; -+extern int sh_line; - /* Temporary buffer for directive line and macro expansion */ - - /* main.c */ -@@ -557,6 +559,6 @@ - #endif - #endif - --#if HOST_HAVE_STPCPY -+#if HOST_HAVE_STPCPY && !defined(stpcpy) - extern char * stpcpy( char * dest, const char * src); - #endif diff --git a/devel/mcpp/files/patch-src__main.c b/devel/mcpp/files/patch-src__main.c deleted file mode 100644 index 2bfbd5c674bf..000000000000 --- a/devel/mcpp/files/patch-src__main.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/main.c.orig 2008-11-05 09:34:46.000000000 +0100 -+++ ./src/main.c 2011-03-30 19:57:37.000000000 +0200 -@@ -326,6 +326,8 @@ - = FALSE; - option_flags.trig = TRIGRAPHS_INIT; - option_flags.dig = DIGRAPHS_INIT; -+ sh_file = NULL; -+ sh_line = 0; - } - - int mcpp_lib_main diff --git a/devel/mcpp/files/patch-src__support.c b/devel/mcpp/files/patch-src__support.c deleted file mode 100644 index 08de1ec8b695..000000000000 --- a/devel/mcpp/files/patch-src__support.c +++ /dev/null @@ -1,20 +0,0 @@ ---- ./src/support.c.orig 2008-06-10 10:32:33.000000000 +0200 -+++ ./src/support.c 2011-03-30 19:57:37.000000000 +0200 -@@ -188,7 +188,7 @@ - size_t length - ) - { -- if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */ -+ if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */ - size_t size = MAX( BUF_INCR_SIZE, length); - - if (mem_buf_p->buffer == NULL) { /* 1st append */ -@@ -1722,6 +1722,8 @@ - sp -= 2; - while (*sp != '\n') /* Until end of line */ - mcpp_fputc( *sp++, OUT); -+ mcpp_fputc( '\n', OUT); -+ wrong_line = TRUE; - } - goto end_line; - default: /* Not a comment */ diff --git a/devel/mcpp/files/patch-src__system.c b/devel/mcpp/files/patch-src__system.c deleted file mode 100644 index 5e80aabb2378..000000000000 --- a/devel/mcpp/files/patch-src__system.c +++ /dev/null @@ -1,21 +0,0 @@ ---- ./src/system.c.orig 2008-11-26 10:53:51.000000000 +0100 -+++ ./src/system.c 2011-03-30 19:57:37.000000000 +0200 -@@ -3858,6 +3858,9 @@ - } - #endif - -+FILEINFO* sh_file; -+int sh_line; -+ - void sharp( - FILEINFO * sharp_file, - int flag /* Flag to append to the line for GCC */ -@@ -3868,8 +3871,6 @@ - * else (i.e. 'sharp_file' is NULL) 'infile'. - */ - { -- static FILEINFO * sh_file; -- static int sh_line; - FILEINFO * file; - int line; -