From nobody Tue Dec 05 00:09:24 2023 X-Original-To: dev-commits-ports-main@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 4SkgrN3Qcgz531CP; Tue, 5 Dec 2023 00:09:24 +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 4SkgrN2wrZz4ZdB; Tue, 5 Dec 2023 00:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701734964; 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=SkTyU9cFwwLdktGl1u1xkpcxuMaYHoKwwmywnJq74EU=; b=pZGp8yLSgXPzze1bi1f0eDb2Kn35lG9eDrbx2oJn++b65b2v6U7ugfbgGmIbByc/XQkfrE gbo4qMBRd+0XXw02g+UfUgVSUNTqeCbhEfy5CQUbj7rFxjL3j53FHuIvU39vZM8PoD231n nQ9YaNHoFhUIYyvxTbOUBCWfSVXw1MdGjukQK5u29jC6/tvQQb8ZvCAvMr7U0xadixpBNt 1FNZj6YnkAmNghesqAVbYnrkvO6z8TqAAf4z7he6eCW1VY1MJv262pUpLevxWIb293voLg 1V++ZhH8hpEGOCLDp1WSbdr5VTfw+rRlbNQjzgvSGtfTod0lWgBbkCj4oQihSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701734964; 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=SkTyU9cFwwLdktGl1u1xkpcxuMaYHoKwwmywnJq74EU=; b=qMnoc2KWN8IundzkxWhDJOmqlKP2Up6q8FBACrF1kTDLDae76DxPKWUGM0CHwJ7J9rwvK5 xE672wzwFVuFjTrz0XgbdK/f0OpX4FDQs2xHU1NNAMDvQmVp7pCGygWb+YQ9/xYn+GsT/1 g1c67jEKbpTPWrsmLEo2qwVhwz+jl9YYKfeGkoUMcWgQK/rqGEX2ldgk03W+/ipqQCsrGP I+4itZDGWBciLhq4TXxK6YmMPqRx9DyYgSZfCAvtjo7m7UyZOF8YhZMevGIK7eG7lfcCNi NE74YzElGRVT2kNBmWKj4QHSIvhl5Q7UTaMFD02escs99+4vvyOksfxhdhh6LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701734964; a=rsa-sha256; cv=none; b=O2A8PeWNnKHlMFHO8icYDWaIMePtMxUHOZRBGYRKHZuHn7y11QkOtabkqtjBxni34pqsNC 1a2fAz136tfahdwbqIUTR4NjoQmCtc++hJLSkpgj1CXz2aSNx8lTQQVbBHPgto82Q8w6Ab lLQZXZxfxO8hQLlZWiItzFhZzlJz84ZZfEKfNPKBuJbk3Zw3Ho1tCQaG+BsYD+u+EpnoEy KAFTXikxrN3CmmOjsGL+hMyfZTuC3Cdx1U55AVqZ0cZR5NrVKKY7GD5g/HlQ3O0l8n/wIK +MCHIbRwxXmwZq2Bmj5qXLq6vK61gjicHwfwaCe3UCUdrVePRcWaWoMIYVCcZQ== 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 4SkgrN1zx6znB2; Tue, 5 Dec 2023 00:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B509ONV063729; Tue, 5 Dec 2023 00:09:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B509O3s063726; Tue, 5 Dec 2023 00:09:24 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:09:24 GMT Message-Id: <202312050009.3B509O3s063726@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 853f1cb7c8c3 - main - x11-toolkits/open-motif*: MenuShell: computing position uses RC_Type() expecting RowColumn List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 853f1cb7c8c329402edb90430d709d9dda121efd Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=853f1cb7c8c329402edb90430d709d9dda121efd commit 853f1cb7c8c329402edb90430d709d9dda121efd Author: Cy Schubert AuthorDate: 2023-12-04 23:37:10 +0000 Commit: Cy Schubert CommitDate: 2023-12-05 00:02:04 +0000 x11-toolkits/open-motif*: MenuShell: computing position uses RC_Type() expecting RowColumn To compute the position of a menu to display, in some cases the position is computed invoking RC_Type() that expects a RowColumn widget. One case was not verifying this hence leading to coredump. Obtained from: https://sourceforge.net/p/motif/code/merge-requests/5/ --- x11-toolkits/open-motif-devel/Makefile | 2 +- x11-toolkits/open-motif-devel/files/patch-lib_Xm_MenuShell.c | 10 ++++++++++ x11-toolkits/open-motif/Makefile | 2 +- x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c | 10 ++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/x11-toolkits/open-motif-devel/Makefile b/x11-toolkits/open-motif-devel/Makefile index 4a9878e10e31..d34714852e78 100644 --- a/x11-toolkits/open-motif-devel/Makefile +++ b/x11-toolkits/open-motif-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= open-motif PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel diff --git a/x11-toolkits/open-motif-devel/files/patch-lib_Xm_MenuShell.c b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_MenuShell.c new file mode 100644 index 000000000000..af501e746451 --- /dev/null +++ b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_MenuShell.c @@ -0,0 +1,10 @@ +--- lib/Xm/MenuShell.c.orig 2023-02-15 16:42:34.000000000 -0800 ++++ lib/Xm/MenuShell.c 2023-12-04 15:33:32.718284000 -0800 +@@ -988,6 +988,7 @@ + if (bottomEdgeOfMenu >= (Position)dispHeight) + { + if (pulldown_button && XtParent(pulldown_button) && ++ XmIsRowColumn(XtParent(pulldown_button)) && + (RC_Type(XtParent(pulldown_button)) == XmMENU_BAR)) + { + Position y_temp = *y; diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index 0535b7221a7f..47eb20ebd003 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -1,6 +1,6 @@ PORTNAME= open-motif PORTVERSION= 2.3.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits # MASTER_SITES= SF/${PORTNAME}/Motif%202.3.4%20Source%20Code/ MASTER_SITES= SF/motif/Motif%20${PORTVERSION}%20Source%20Code/ diff --git a/x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c b/x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c new file mode 100644 index 000000000000..af94efe107ae --- /dev/null +++ b/x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c @@ -0,0 +1,10 @@ +--- lib/Xm/MenuShell.c.orig 2017-08-16 17:38:43.000000000 -0700 ++++ lib/Xm/MenuShell.c 2023-12-04 15:33:35.350531000 -0800 +@@ -988,6 +988,7 @@ + if (bottomEdgeOfMenu >= (Position)dispHeight) + { + if (pulldown_button && XtParent(pulldown_button) && ++ XmIsRowColumn(XtParent(pulldown_button)) && + (RC_Type(XtParent(pulldown_button)) == XmMENU_BAR)) + { + Position y_temp = *y;