CVS commit: pkgsrc/devel/SOPE4

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun May 31 14:36:21 UTC 2020

Modified Files:
        pkgsrc/devel/SOPE4: Makefile distinfo
Added Files:
        pkgsrc/devel/SOPE4/patches:
            patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m

Log Message:
devel/SOPE4: fix array[char]


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/SOPE4/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/SOPE4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/SOPE4/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m

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

Modified files:

Index: pkgsrc/devel/SOPE4/Makefile
diff -u pkgsrc/devel/SOPE4/Makefile:1.3 pkgsrc/devel/SOPE4/Makefile:1.4
--- pkgsrc/devel/SOPE4/Makefile:1.3     Sun Apr 12 08:28:28 2020
+++ pkgsrc/devel/SOPE4/Makefile Sun May 31 14:36:21 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2020/04/12 08:28:28 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/31 14:36:21 rillig Exp $
 #
 
 DISTNAME=      SOPE-4.0.8
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  http://www.sogo.nu/files/downloads/SOGo/Sources/
 

Index: pkgsrc/devel/SOPE4/distinfo
diff -u pkgsrc/devel/SOPE4/distinfo:1.2 pkgsrc/devel/SOPE4/distinfo:1.3
--- pkgsrc/devel/SOPE4/distinfo:1.2     Thu Sep 12 04:44:14 2019
+++ pkgsrc/devel/SOPE4/distinfo Sun May 31 14:36:21 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2019/09/12 04:44:14 wiz Exp $
+$NetBSD: distinfo,v 1.3 2020/05/31 14:36:21 rillig Exp $
 
 SHA1 (SOPE-4.0.8.tar.gz) = 0339ba416ff4792e32042dc52e1a50eb8b0c1b9f
 RMD160 (SOPE-4.0.8.tar.gz) = 87d6ba09c6608c88e7d426258559aaf6af886dfb
@@ -9,3 +9,4 @@ SHA1 (patch-sope-core_NGStreams_NGDescri
 SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = 7c945bf174e3de5f6f6daaaaa095956421a43bc3
 SHA1 (patch-sope-core_NGStreams_NGLocalSocketAddress.m) = 306f16ed85cb4aaea7d145eb055448b12ad70507
 SHA1 (patch-sope-core_NGStreams_NGLocalSocketDomain.m) = db9cd064725f64a5ceb739cc90e6c89a4d77ebdc
+SHA1 (patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m) = 20b00937973c64f36324c9670ba08374bccec13b

Added files:

Index: pkgsrc/devel/SOPE4/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m
diff -u /dev/null pkgsrc/devel/SOPE4/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m:1.1
--- /dev/null   Sun May 31 14:36:21 2020
+++ pkgsrc/devel/SOPE4/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m     Sun May 31 14:36:21 2020
@@ -0,0 +1,35 @@
+$NetBSD: patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m,v 1.1 2020/05/31 14:36:21 rillig Exp $
+
+On NetBSD-8.0-x86_64:
+
+libxmlHTMLSAXDriver.m:784:9: error: array subscript is of type 'char' [-Werror,-Wchar-subscripts]
+libxmlHTMLSAXDriver.m:797:49: error: array subscript is of type 'char' [-Werror,-Wchar-subscripts]
+
+https://github.com/inverse-inc/sope/pull/53
+
+--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m.orig        2017-10-18 15:19:24.000000000 +0000
++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
+@@ -781,12 +781,12 @@ static void error(void *udata, const cha
+   SaxParseException *e;
+   
+   if (!reportInvalidTags && msg != NULL) {
+-    if (toupper(msg[0]) == 'T') {
++    if (toupper((unsigned char) msg[0]) == 'T') {
+       if (strncasecmp(tagInvalidMsg, msg, strlen(tagInvalidMsg)) == 0)
+         return;
+     }
+ #if 0
+-    else if (toupper(msg[0]) == 'U') {
++    else if (toupper((unsigned char) msg[0]) == 'U') {
+       if (strncasecmp(unexpectedNobrCloseMsg, msg, 
+                       strlen(unexpectedNobrCloseMsg)) == 0)
+         return;
+@@ -794,7 +794,7 @@ static void error(void *udata, const cha
+     }
+ #endif
+   }
+-  if (!reportUnclosedEntities && msg != NULL && toupper(msg[0]) == 'H') {
++  if (!reportUnclosedEntities && msg != NULL && toupper((unsigned char) msg[0]) == 'H') {
+     if (strncasecmp(unclosedEntityInvalidMsg, msg, 
+                     strlen(unclosedEntityInvalidMsg)) == 0)
+       return;