CVS commit: pkgsrc/textproc/discount

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May  5 22:11:18 UTC 2025

Modified Files:
        pkgsrc/textproc/discount: Makefile distinfo
Added Files:
        pkgsrc/textproc/discount/patches: patch-markdown.c

Log Message:
discount: fix isspace() usage

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/discount/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/discount/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/discount/patches/patch-markdown.c

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

Modified files:

Index: pkgsrc/textproc/discount/Makefile
diff -u pkgsrc/textproc/discount/Makefile:1.17 pkgsrc/textproc/discount/Makefile:1.18
--- pkgsrc/textproc/discount/Makefile:1.17      Fri Oct 13 15:50:20 2023
+++ pkgsrc/textproc/discount/Makefile   Mon May  5 22:11:17 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2023/10/13 15:50:20 schmonz Exp $
+# $NetBSD: Makefile,v 1.18 2025/05/05 22:11:17 wiz Exp $
 
 DISTNAME=              discount-2.2.7d
+PKGREVISION=           1
 CATEGORIES=            textproc
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=Orc/}
 GITHUB_TAG=            v${PKGVERSION_NOREV}

Index: pkgsrc/textproc/discount/distinfo
diff -u pkgsrc/textproc/discount/distinfo:1.16 pkgsrc/textproc/discount/distinfo:1.17
--- pkgsrc/textproc/discount/distinfo:1.16      Sat Oct  7 19:50:24 2023
+++ pkgsrc/textproc/discount/distinfo   Mon May  5 22:11:17 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.16 2023/10/07 19:50:24 schmonz Exp $
+$NetBSD: distinfo,v 1.17 2025/05/05 22:11:17 wiz Exp $
 
 BLAKE2s (discount-2.2.7d.tar.gz) = 57f5465f1b921b1561377c6e4e862ad210f2a100b6527f8909c21f665c434569
 SHA512 (discount-2.2.7d.tar.gz) = d7e652a2687bc31605a9fcb4d95133627778d13e84c0a663ebb848d6b356f4892cc14648540627280590c8d422a9d91b6503bf223be1e7f98c9900d084dfc3b5
 Size (discount-2.2.7d.tar.gz) = 133382 bytes
 SHA1 (patch-Makefile.in) = 7919a26def7f5aceb7fa0570824fd183ac0bb856
 SHA1 (patch-generate.c) = 41a6d7e1dea9c52b24df5853ed0db5b17030b51e
+SHA1 (patch-markdown.c) = 5e149b997817b4269363a7be71ab6c35ef22eb56

Added files:

Index: pkgsrc/textproc/discount/patches/patch-markdown.c
diff -u /dev/null pkgsrc/textproc/discount/patches/patch-markdown.c:1.1
--- /dev/null   Mon May  5 22:11:18 2025
+++ pkgsrc/textproc/discount/patches/patch-markdown.c   Mon May  5 22:11:18 2025
@@ -0,0 +1,116 @@
+$NetBSD: patch-markdown.c,v 1.1 2025/05/05 22:11:18 wiz Exp $
+
+Fix isspace() argument.
+
+Mailed upstream 20250505.
+
+--- markdown.c.orig    2025-05-05 22:01:49.993582379 +0000
++++ markdown.c
+@@ -40,7 +40,7 @@ __mkd_footsort(Footnote *a, Footnote *b)
+       ac = tolower(T(a->tag)[i]);
+       bc = tolower(T(b->tag)[i]);
+ 
+-      if ( isspace(ac) && isspace(bc) )
++      if ( isspace((unsigned char)ac) && isspace((unsigned char)bc) )
+           continue;
+       if ( ac != bc )
+           return ac - bc;
+@@ -54,7 +54,7 @@ __mkd_footsort(Footnote *a, Footnote *b)
+ static int
+ nextblank(Line *t, int i)
+ {
+-    while ( (i < S(t->text)) && !isspace(T(t->text)[i]) )
++    while ( (i < S(t->text)) && !isspace((unsigned char)T(t->text)[i]) )
+       ++i;
+     return i;
+ }
+@@ -65,7 +65,7 @@ nextblank(Line *t, int i)
+ static int
+ nextnonblank(Line *t, int i)
+ {
+-    while ( (i < S(t->text)) && isspace(T(t->text)[i]) )
++    while ( (i < S(t->text)) && isspace((unsigned char)T(t->text)[i]) )
+       ++i;
+     return i;
+ }
+@@ -99,7 +99,7 @@ skipempty(Line *p)
+ void
+ ___mkd_tidy(Cstring *t)
+ {
+-    while ( S(*t) && isspace(T(*t)[S(*t)-1]) )
++    while ( S(*t) && isspace((unsigned char)T(*t)[S(*t)-1]) )
+       --S(*t);
+ }
+ 
+@@ -131,7 +131,7 @@ isopentag(Line *p)
+      */
+     for ( i=1; i < len && T(p->text)[i] != '>' 
+                      && T(p->text)[i] != '/'
+-                     && !isspace(T(p->text)[i]); ++i )
++                     && !isspace((unsigned char)T(p->text)[i]); ++i )
+       ;
+ 
+ 
+@@ -203,7 +203,7 @@ checkline(Line *l, mkd_flag_t flags)
+     
+     if (l->dle >= 4) { l->kind=chk_code; return; }
+ 
+-    for ( eol = S(l->text); eol > l->dle && isspace(T(l->text)[eol-1]); --eol )
++    for ( eol = S(l->text); eol > l->dle && isspace((unsigned char)T(l->text)[eol-1]); --eol )
+       ;
+ 
+     for (i=l->dle; i<eol; i++) {
+@@ -467,7 +467,7 @@ static int
+ is_extra_dd(Line *t)
+ {
+     return (t->dle < 4) && (T(t->text)[t->dle] == ':')
+-                      && isspace(T(t->text)[t->dle+1]);
++                      && isspace((unsigned char)T(t->text)[t->dle+1]);
+ }
+ 
+ 
+@@ -522,7 +522,7 @@ islist(Line *t, int *clip, mkd_flag_t fl
+                                     && isdefinition(t,clip,list_type,flags) )
+       return DL;
+ 
+-    if ( strchr("*-+", T(t->text)[t->dle]) && isspace(T(t->text)[t->dle+1]) ) {
++    if ( strchr("*-+", T(t->text)[t->dle]) && isspace((unsigned char)T(t->text)[t->dle+1]) ) {
+       i = nextnonblank(t, t->dle+1);
+       *clip = (i > 4) ? 4 : i;
+       *list_type = UL;
+@@ -583,7 +583,7 @@ headerblock(Paragraph *pp, int htyp)
+ 
+           pp->hnumber = i;
+ 
+-          while ( (i < S(p->text)) && isspace(T(p->text)[i]) )
++          while ( (i < S(p->text)) && isspace((unsigned char)T(p->text)[i]) )
+               ++i;
+ 
+           CLIP(p->text, 0, i);
+@@ -592,7 +592,7 @@ headerblock(Paragraph *pp, int htyp)
+           for (j=S(p->text); (j > 1) && (T(p->text)[j-1] == '#'); --j)
+               ;
+ 
+-          while ( j && isspace(T(p->text)[j-1]) )
++          while ( j && isspace((unsigned char)T(p->text)[j-1]) )
+               --j;
+ 
+           S(p->text) = j;
+@@ -1095,7 +1095,7 @@ addfootnote(Line *p, MMIOT* f)
+       return np;
+     }
+ 
+-    while ( (j < S(p->text)) && !isspace(T(p->text)[j]) )
++    while ( (j < S(p->text)) && !isspace((unsigned char)T(p->text)[j]) )
+       EXPAND(foot->link) = T(p->text)[j++];
+     EXPAND(foot->link) = 0;
+     S(foot->link)--;
+@@ -1296,7 +1296,7 @@ actually_a_table(MMIOT *f, Line *pp)
+     for ( j=r->dle; j < S(r->text); ++j ) {
+       c = T(r->text)[j];
+ 
+-      if ( !(isspace(c)||(c=='-')||(c==':')||(c=='|')) ) {
++      if ( !(isspace((unsigned char)c)||(c=='-')||(c==':')||(c=='|')) ) {
+           return 0;
+       }
+     }