CVS commit: pkgsrc/textproc/ispell

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Oct 26 19:16:53 UTC 2025

Modified Files:
        pkgsrc/textproc/ispell: Makefile.common distinfo
        pkgsrc/textproc/ispell/patches: patch-ae
Added Files:
        pkgsrc/textproc/ispell/patches: patch-correct.c patch-parse.y

Log Message:
textproc/ispell: fix build with gcc 14


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/ispell/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/ispell/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/ispell/patches/patch-ae
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/ispell/patches/patch-correct.c \
    pkgsrc/textproc/ispell/patches/patch-parse.y

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/ispell/Makefile.common
diff -u pkgsrc/textproc/ispell/Makefile.common:1.3 pkgsrc/textproc/ispell/Makefile.common:1.4
--- pkgsrc/textproc/ispell/Makefile.common:1.3  Tue Nov  7 08:43:39 2023
+++ pkgsrc/textproc/ispell/Makefile.common      Sun Oct 26 19:16:52 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2023/11/07 08:43:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2025/10/26 19:16:52 vins Exp $
 
 # used by textproc/ispell/Makefile
 # used by textproc/ispell-en_GB/Makefile
 
 DISTNAME=      ispell-3.4.06
+PKGREVISION=   1
 
 DISTINFO_FILE= ${.CURDIR}/../../textproc/ispell/distinfo

Index: pkgsrc/textproc/ispell/distinfo
diff -u pkgsrc/textproc/ispell/distinfo:1.12 pkgsrc/textproc/ispell/distinfo:1.13
--- pkgsrc/textproc/ispell/distinfo:1.12        Tue Nov  7 08:43:39 2023
+++ pkgsrc/textproc/ispell/distinfo     Sun Oct 26 19:16:52 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2023/11/07 08:43:39 wiz Exp $
+$NetBSD: distinfo,v 1.13 2025/10/26 19:16:52 vins Exp $
 
 BLAKE2s (ispell-3.4.06.tar.gz) = b494c7efa96d9c936af79d47f80dae930376025ddd9906b291a65a68cb4b7ecf
 SHA512 (ispell-3.4.06.tar.gz) = 276447f12ea87c5c75909b974ae2225ff6abd330a04b2e1c493161a807792cd0cf1143cb9b991b986d92a88ae831edb016650ba885c918055b94aa7de2b81384
@@ -6,9 +6,11 @@ Size (ispell-3.4.06.tar.gz) = 672723 byt
 SHA1 (patch-Makefile) = e77f0502e3c4cda4f55e16f91030175f192844bb
 SHA1 (patch-ac) = 4faa82bdd628500aa35d94b2d4a1860919097b72
 SHA1 (patch-ad) = c47a406acf52244868e7a561ab7f1c9d394d4034
-SHA1 (patch-ae) = adc803bd66f62236a2b879713f326b4c7ac7199f
+SHA1 (patch-ae) = cb32a4c2a38dfbaa62d610d10fd68da856055dfb
 SHA1 (patch-ai) = 1fbf9385818e0a0fcd4049d0407212b1456d2744
 SHA1 (patch-al) = ea63fc7dbc2200794157d9be781210cd8a4e671f
 SHA1 (patch-ar) = c5082129f55fb232db34e0796423e60fcd4ed5c2
+SHA1 (patch-correct.c) = 16f62f40c9ae2370f3fab90a5ff5e8ebbdebd834
 SHA1 (patch-deformatters_Makefile) = a66a43f679491df718149c0b6db36ed0f9962535
 SHA1 (patch-languages_english_english.2) = ae4d249890746a979787282c2e48aad3921ac77c
+SHA1 (patch-parse.y) = 71a64178bf336b5cec39184be2f0aeffb08c9dd3

Index: pkgsrc/textproc/ispell/patches/patch-ae
diff -u pkgsrc/textproc/ispell/patches/patch-ae:1.4 pkgsrc/textproc/ispell/patches/patch-ae:1.5
--- pkgsrc/textproc/ispell/patches/patch-ae:1.4 Wed May 14 02:28:13 2014
+++ pkgsrc/textproc/ispell/patches/patch-ae     Sun Oct 26 19:16:53 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2014/05/14 02:28:13 rodent Exp $
+$NetBSD: patch-ae,v 1.5 2025/10/26 19:16:53 vins Exp $
 
 --- lookup.c.orig      Thu Apr 14 21:25:52 2005
 +++ lookup.c
@@ -31,3 +31,12 @@ $NetBSD: patch-ae,v 1.4 2014/05/14 02:28
        else
            entry->affix = NULL;
        }
+@@ -531,7 +531,7 @@ struct dent * lookup (s, dotree)
+       if (s1  &&  s1[0] == schar[0]
+         &&  strcmp ((char *) s1 + 1, (char *) schar + 1) == 0)
+           return dp;
+-      while (dp->flagfield & MOREVARIANTS)    /* Skip variations */
++      while ((dp->flagfield & MOREVARIANTS) && dp->next != NULL)      /* Skip variations */
+           dp = dp->next;
+       }
+     if (dotree)

Added files:

Index: pkgsrc/textproc/ispell/patches/patch-correct.c
diff -u /dev/null pkgsrc/textproc/ispell/patches/patch-correct.c:1.1
--- /dev/null   Sun Oct 26 19:16:53 2025
+++ pkgsrc/textproc/ispell/patches/patch-correct.c      Sun Oct 26 19:16:53 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-correct.c,v 1.1 2025/10/26 19:16:53 vins Exp $
+
+Fix NULL pointer dereference in lookup() function.
+
+--- correct.c.orig     2022-02-06 07:21:53.852873905 +0000
++++ correct.c
+@@ -1536,7 +1536,7 @@ static void save_root_cap (word, pattern
+               return;
+               }
+           }
+-      while (dent->flagfield & MOREVARIANTS)
++      while ((dent->flagfield & MOREVARIANTS) && dent->next != NULL)
+           {
+           dent = dent->next;
+           if (captype (dent->flagfield) == FOLLOWCASE
+@@ -1577,7 +1577,7 @@ static void save_root_cap (word, pattern
+     len = icharlen (p);
+     if (dent->flagfield & MOREVARIANTS)
+       dent = dent->next;      /* Skip place-holder entry */
+-    for (  ;  ;  )
++    for (  ; dent != NULL ;  )
+       {
+       if (flagsareok (dent))
+           {
Index: pkgsrc/textproc/ispell/patches/patch-parse.y
diff -u /dev/null pkgsrc/textproc/ispell/patches/patch-parse.y:1.1
--- /dev/null   Sun Oct 26 19:16:53 2025
+++ pkgsrc/textproc/ispell/patches/patch-parse.y        Sun Oct 26 19:16:53 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-parse.y,v 1.1 2025/10/26 19:16:53 vins Exp $
+
+Prevent implicit declaration of bcopy.
+
+--- parse.y.orig       2025-10-26 19:10:34.789087124 +0000
++++ parse.y
+@@ -133,6 +133,7 @@ static char Rcs_Id[] =
+  */
+ 
+ #include <ctype.h>
++#include <strings.h>
+ #include "config.h"
+ #include "ispell.h"
+ #include "proto.h"