From nobody Tue Jul 16 12:42:16 2024 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 4WNdxh3Hn4z5RFfm; Tue, 16 Jul 2024 12:42:16 +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 4WNdxh2kvcz49X3; Tue, 16 Jul 2024 12:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721133736; 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=OWFC+eZVLuBhQHvF2+Hnfpub09x8Jf2NOORL2NDTBOk=; b=IjBNXxwJAQUy3tl+JY2TmfuEkJ0hxIJPYKWWCB0OuZfOZ8bazh/01hLZAnQX74tbcWZjO7 EcGnDVVOWMFCz6PmjN4YFlHbcRt5acTm2Sy2ZaBmsdnjaqthG3O9NUeAkTFMfaASe5LiK4 gMXDtkbkXT+qV5QBnm/VFipDED5DL3N1lfha+j1XDly/zQahiVZoTnizLdfVifMt5FZw8W 7OScX/c9Gmph1zuq2iKJCf5QE5ZEEU7X9TmaI9itj6WiqjLQfltha93wrNeWJf6D2r0Bsg 1fZKAzqgL7WVGxBx27XTIH+IvsbC3aMSE8n9t1BCoCqNWS0jRA4zG9v1055VTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721133736; a=rsa-sha256; cv=none; b=RzmQygDf8T4RMyXWTTSil3r2LJEohuN0AyJb7810fI4+puO0HkGFWUd+Oh+IQHlOlmUtDA otsD3rFYBOi6VhiczPIyC4XU+ScJiLCsgcahHnRRGlLS2LbTd9Hqu1YoW/jHKkuMW0XZO9 T4L2zoc2t7Hy/QEdZzv9goqk7ynbQBrzW76yBXMd85x5W+CU0wi5PRZGY1/kWJgye/oH3F cA7LiSjbNB+9HyEZtnWhkZU/Vt8Rcq0KwF5xA7woOsEZGU9XpwMIgT5m5RzFXDm3yUrETG v8lEGTk9GdOvifzEAxzlGhf1cL3TorUQv9S00i69PABdv+V8BWkMRe/GtEJnqQ== 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=1721133736; 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=OWFC+eZVLuBhQHvF2+Hnfpub09x8Jf2NOORL2NDTBOk=; b=rxXMZo9/nOB02qNZZJFZsAuR35gX1ZWh/W8UNeCJt+vezI+cmzm+Z0zRmbVuMYqphuZSu9 5Fo+5n9wa2fsQOvMk+Hazzf1xZdnAnIMxuWFWSJLLi52exgimwYbhqpdLSBmod92LAAmX/ od/o00el+4M5Fv47Vye/AN7x88k095zPaVkEsZQlilMsUEWmss7OOD3kfbM01tfqMMVVok VocLPJX0pmWXTNX4LJ1/jgalKBYTE177V0uz3Tk99/CnNHg1v7R6tX5i7zA1KcVLUETu3y +5V4viV17+0b+6fVhLxOHvOhwKo0eqaVmfV//bgNwfe3RV5+H9tJYovmBPewwQ== 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 4WNdxh2LC7zc3x; Tue, 16 Jul 2024 12:42:16 +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 46GCgG0i016796; Tue, 16 Jul 2024 12:42:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46GCgGpG016793; Tue, 16 Jul 2024 12:42:16 GMT (envelope-from git) Date: Tue, 16 Jul 2024 12:42:16 GMT Message-Id: <202407161242.46GCgGpG016793@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: 0ba6ae2c12e3 - main - textproc/mgdiff: Fix segfault when with open file dialogue box 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 0ba6ae2c12e3a5c0b7a2aac812e25a02a32ae0b3 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ba6ae2c12e3a5c0b7a2aac812e25a02a32ae0b3 commit 0ba6ae2c12e3a5c0b7a2aac812e25a02a32ae0b3 Author: Cy Schubert AuthorDate: 2024-07-16 02:47:29 +0000 Commit: Cy Schubert CommitDate: 2024-07-16 12:41:56 +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) MFH: 2024Q3 --- 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