Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1521320046286040"
MIME-Version: 1.0
Date: Sat, 17 Mar 2018 20:54:06 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/discount
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20180317205406.61FD6FB40@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1521320046286040
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Sat Mar 17 20:54:06 UTC 2018

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

Log Message:
Cast tolower/isspace/isalpha args to unsigned char to fix self-tests on
NetBSD. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/discount/Makefile \
    pkgsrc/textproc/discount/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/discount/patches/patch-generate.c

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


--_----------=_1521320046286040
Content-Disposition: inline
Content-Length: 2731
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/discount/Makefile
diff -u pkgsrc/textproc/discount/Makefile:1.5 pkgsrc/textproc/discount/Makefile:1.6
--- pkgsrc/textproc/discount/Makefile:1.5	Fri Mar 16 03:45:18 2018
+++ pkgsrc/textproc/discount/Makefile	Sat Mar 17 20:54:06 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2018/03/16 03:45:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2018/03/17 20:54:06 schmonz Exp $
 #
 
 DISTNAME=	discount-2.2.3a
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.bz2
Index: pkgsrc/textproc/discount/distinfo
diff -u pkgsrc/textproc/discount/distinfo:1.5 pkgsrc/textproc/discount/distinfo:1.6
--- pkgsrc/textproc/discount/distinfo:1.5	Fri Mar 16 03:45:18 2018
+++ pkgsrc/textproc/discount/distinfo	Sat Mar 17 20:54:06 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2018/03/16 03:45:18 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2018/03/17 20:54:06 schmonz Exp $
 
 SHA1 (discount-2.2.3a.tar.bz2) = 9ff2985b89e7bc7ca6a18f82aade2b25db2c97f8
 RMD160 (discount-2.2.3a.tar.bz2) = 66a13d6848251ab8a73a59ba4ec95befe9bbdc2d
@@ -6,3 +6,4 @@ SHA512 (discount-2.2.3a.tar.bz2) = cf995
 Size (discount-2.2.3a.tar.bz2) = 98325 bytes
 SHA1 (patch-Makefile.in) = ee288e3b03368dbc4a0f4c472bfbbdf2283b9967
 SHA1 (patch-configure.inc) = 19e31e0b845e6c3f3822b556223d7a3cc3e2c028
+SHA1 (patch-generate.c) = b584de3a654c3bc3f2a2b1204926164c6ed67035

Added files:

Index: pkgsrc/textproc/discount/patches/patch-generate.c
diff -u /dev/null pkgsrc/textproc/discount/patches/patch-generate.c:1.1
--- /dev/null	Sat Mar 17 20:54:06 2018
+++ pkgsrc/textproc/discount/patches/patch-generate.c	Sat Mar 17 20:54:06 2018
@@ -0,0 +1,33 @@
+$NetBSD: patch-generate.c,v 1.1 2018/03/17 20:54:06 schmonz Exp $
+
+Fix self-tests on NetBSD.
+
+--- generate.c.orig	2018-03-02 22:52:05.000000000 +0000
++++ generate.c
+@@ -1151,7 +1151,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;
+ }
+@@ -1269,7 +1269,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)) ) {
+@@ -1297,7 +1297,7 @@ text(MMIOT *f)
+     int smartyflags = 0;
+ 
+     while (1) {
+-        if ( (f->flags & MKD_AUTOLINK) && isalpha(peek(f,1)) && !tag_text(f) )
++        if ( (f->flags & MKD_AUTOLINK) && isalpha((unsigned char)peek(f,1)) && !tag_text(f) )
+ 	    maybe_autolink(f);
+ 
+         c = pull(f);


--_----------=_1521320046286040--