From nobody Tue Jul 16 12:45:01 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 4WNf0t12MHz5RFtj; Tue, 16 Jul 2024 12:45:02 +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 4WNf0s6TNyz49Y8; Tue, 16 Jul 2024 12:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721133901; 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=kjHpzze4jGKTmi9lIKpu8YrJwE1/BFpLwCTzHKz8xJ0=; b=elXsAAyLAN/VJgP0W6KCFu4aDFQ/klev6CUWdRphl/QYW9FLaGXQ8vMRWvPy8bwLC5OoM3 C34Wpht6NbdO9oBncEkYiyrkZ8oFzvm/N4QbqsMrYoDjExYUOsmBRbkft5uvVs/dPmDhzp gIK1ntHhvMsThy5CTcPsL0LfZV/5meerRxAWjd2rzcr4NccWxKIcv4R73AydWPyGinjNyi B2sXoCPB5d449qtR9rBf49FyV9Rc5jjp2dc9K1UVNkdojVcYFgCBj5sbD/FJhGmXrXP4hN SxhdWwJ/fjn4cbEsHIYTaatLKlorG3I59IeDFbCVMMb7dmfim6xpgx7PbZBZ4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721133901; a=rsa-sha256; cv=none; b=CT9g2k1rdKJpd8leb3cJi6DFudSpG4uEjLyOrcqKxo7u6EyDIoqwAAJ6Ogc8rnCRVDscMl JiujMSIz/ZnXFbAtf7V3zXUzl1tt7u9N1W9Z4/urgTV2rBsQDyLtVLHbi59CirIuqNT3s8 QrTixh4Mzye5CGbwE9BtntvfEWiilmZ6pxM8XJ+zjCFK+QOufHwh7/pPOJNGZfIJGlZYRC BEvXMYRsWYoLX5TUaX0urqjRW7Sc7de3Nz+icCFum1kEaIOwaD9BSO+YxZr3LeqAOrSLVP zC7Px+p0Dz6ixqJ2EcmqPwvT3t91JULhCZW/SBmUb6LDKzWH4qDTahtqsSJ1Pw== 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=1721133901; 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=kjHpzze4jGKTmi9lIKpu8YrJwE1/BFpLwCTzHKz8xJ0=; b=WpkIMRUJAnGA6lESEC+jD6D2XfbuMhGqk16UpU4/uz1F2w6+gQ3A+Kv2cKkd8DzSGvNp6u 0iRMWZjzp0RxUSR+QwSHJy5ZzHUzK/AYrLPMuP6IGpflMhuttB8/DiV7qO1kuGkATpMQTO fcymcRpCoLC+eVD+UGZ++mEk5vJ9K5gQEk8UHQdwf5UAaPu4D+yrFaddrnKnSL+EsDamlN y+dpLvJFg/frlHvpprSiRIja39mrNUdXD9qNPJbPLubViMyr3VIITDIHkH7ohCXvzjc9jP Mjqj1UL4mzJ1Nh3b2svT70wq+ejvybIH0zF9p2eYP3APd5yye/rGuXBf6rBwmA== 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 4WNf0s5z49zcld; Tue, 16 Jul 2024 12:45:01 +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 46GCj1lf017318; Tue, 16 Jul 2024 12:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46GCj1M1017315; Tue, 16 Jul 2024 12:45:01 GMT (envelope-from git) Date: Tue, 16 Jul 2024 12:45:01 GMT Message-Id: <202407161245.46GCj1M1017315@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 04a09c2ce889 - 2024Q3 - textproc/mgdiff: Fix segfault when with open file dialogue box 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 04a09c2ce8894c4f5252d6d0256f5bce799ec289 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=04a09c2ce8894c4f5252d6d0256f5bce799ec289 commit 04a09c2ce8894c4f5252d6d0256f5bce799ec289 Author: Cy Schubert AuthorDate: 2024-07-16 02:47:29 +0000 Commit: Cy Schubert CommitDate: 2024-07-16 12:44:47 +0000 textproc/mgdiff: Fix segfault when with open file dialogue box Under open-motif we see a segfault when mgdiff calls regexec() in libgnuregexec's regexec.c at line 782. Let's avoid libgnuregexec entirely and use the regexec(3) provided by FreeBSD's libc instead. This resolves the segfault and as a bonus we reduce mgdiff's dependency list. We also remove a now incorrect comment in the patch. It was misleading since the EXTRA_LIBRARIES for Dell SVR4 had already been removed. PR: 280289 Approved by: portmaster@BSDforge.com (maintainer) (cherry picked from commit 0ba6ae2c12e3a5c0b7a2aac812e25a02a32ae0b3) --- textproc/mgdiff/Makefile | 4 +--- textproc/mgdiff/files/patch-Imakefile | 16 ++++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile index eec90044081a..8dbf744a3bbc 100644 --- a/textproc/mgdiff/Makefile +++ b/textproc/mgdiff/Makefile @@ -1,6 +1,6 @@ PORTNAME= mgdiff PORTVERSION= 1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MASTER_SITES= XCONTRIB/applications DISTNAME= ${PORTNAME} @@ -11,8 +11,6 @@ WWW= https://BSDforge.com/projects/textproc/mgdiff/ LICENSE= MIT -LIB_DEPENDS= libgnuregex.so:devel/libgnuregex - USES= imake motif xorg USE_XORG= ice sm x11 xext xmu xt diff --git a/textproc/mgdiff/files/patch-Imakefile b/textproc/mgdiff/files/patch-Imakefile index 19bd1d2e89a3..1f4b65832d85 100644 --- a/textproc/mgdiff/files/patch-Imakefile +++ b/textproc/mgdiff/files/patch-Imakefile @@ -1,11 +1,15 @@ ---- Imakefile.orig 2019-09-28 11:43:48 UTC +diff a/Imakefile.orig b/Imakefile +index 963bd53..36a7257 100644 +--- Imakefile.orig +++ Imakefile -@@ -8,7 +8,7 @@ XMLIB = -lXm - XCOMM - XCOMM for Dell SVR4 - XCOMM +@@ -5,10 +5,6 @@ + XCOMM Imakefile,v 2.0 1994/05/19 02:01:00 dan Exp + + XMLIB = -lXm +-XCOMM +-XCOMM for Dell SVR4 +-XCOMM -EXTRA_LIBRARIES = -lc -lucb -+EXTRA_LIBRARIES = -lgnuregex SRCS = mgdiff.c rundiff.c misc.c files.c spawn.c manual.c modal.c legend.c OBJS = mgdiff.o rundiff.o misc.o files.o spawn.o manual.o modal.o legend.o