From 0ba6ae2c12e3a5c0b7a2aac812e25a02a32ae0b3 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Mon, 15 Jul 2024 19:47:29 -0700 Subject: 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/files/patch-Imakefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'textproc/mgdiff/files/patch-Imakefile') 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 -- cgit v1.2.3