CVS commit: pkgsrc/textproc/discount/patches

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan  4 21:56:49 UTC 2026

Added Files:
        pkgsrc/textproc/discount/patches: patch-generate.c patch-markdown.c

Log Message:
discount: restore patches after update revert


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.6 pkgsrc/textproc/discount/patches/patch-generate.c
cvs rdiff -u -r0 -r1.4 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.

Added files:

Index: pkgsrc/textproc/discount/patches/patch-generate.c
diff -u /dev/null pkgsrc/textproc/discount/patches/patch-generate.c:1.6
--- /dev/null   Sun Jan  4 21:56:49 2026
+++ pkgsrc/textproc/discount/patches/patch-generate.c   Sun Jan  4 21:56:49 2026
@@ -0,0 +1,42 @@
+$NetBSD: patch-generate.c,v 1.6 2026/01/04 21:56:49 wiz Exp $
+
+Fix self-tests on NetBSD.
+
+--- generate.c.orig    2023-08-23 08:09:27.000000000 +0000
++++ generate.c
+@@ -766,7 +766,7 @@ linkylinky(int image, MMIOT *f)
+               goodlink = 1;
+           }
+           else {
+-              if ( isspace(peek(f,1)) )
++              if ( isspace((unsigned char)peek(f,1)) )
+                   pull(f);
+ 
+               if ( peek(f,1) == '[' ) {
+@@ -1216,7 +1216,7 @@ islike(MMIOT *f, char *s)
+     }
+ 
+     for (i=1; i < len; i++)
+-      if (tolower(peek(f,i)) != s[i])
++      if (tolower((unsigned char)peek(f,i)) != s[i])
+           return 0;
+     return 1;
+ }
+@@ -1336,7 +1336,7 @@ tickhandler(MMIOT *f, int tickchar, int
+     int endticks, size;
+     int tick = nrticks(0, tickchar, f);
+ 
+-    if ( !allow_space && isspace(peek(f,tick)) )
++    if ( !allow_space && isspace((unsigned char)peek(f,tick)) )
+       return 0;
+ 
+     if ( (tick >= minticks) && (size = matchticks(f,tickchar,tick,&endticks)) ) {
+@@ -1364,7 +1364,7 @@ text(MMIOT *f)
+     int smartyflags = 0;
+ 
+     while (1) {
+-        if ( is_flag_set(f->flags, MKD_AUTOLINK) && isalpha(peek(f,1)) && !tag_text(f) )
++        if ( is_flag_set(f->flags, MKD_AUTOLINK) && isalpha((unsigned char)peek(f,1)) && !tag_text(f) )
+           maybe_autolink(f);
+ 
+         c = pull(f);

Index: pkgsrc/textproc/discount/patches/patch-markdown.c
diff -u /dev/null pkgsrc/textproc/discount/patches/patch-markdown.c:1.4
--- /dev/null   Sun Jan  4 21:56:49 2026
+++ pkgsrc/textproc/discount/patches/patch-markdown.c   Sun Jan  4 21:56:49 2026
@@ -0,0 +1,115 @@
+$NetBSD: patch-markdown.c,v 1.4 2026/01/04 21:56:49 wiz Exp $
+
+Fix isspace() argument.
+https://github.com/Orc/discount/pull/293
+
+--- 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;
+       }
+     }