[pkgsrc/trunk]: pkgsrc/devel/SOPE devel/SOPE: fix array[char]

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/10f3dbb79295
branches:  trunk
changeset: 433140:10f3dbb79295
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun May 31 14:33:58 2020 +0000

description:
devel/SOPE: fix array[char]

diffstat:

 devel/SOPE/Makefile                                                     |   4 +-
 devel/SOPE/distinfo                                                     |   3 +-
 devel/SOPE/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m |  35 ++++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)

diffs (67 lines):

diff -r 72c17dae6728 -r 10f3dbb79295 devel/SOPE/Makefile
--- a/devel/SOPE/Makefile       Sun May 31 14:11:42 2020 +0000
+++ b/devel/SOPE/Makefile       Sun May 31 14:33:58 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2020/04/16 09:40:50 manu Exp $
+# $NetBSD: Makefile,v 1.50 2020/05/31 14:33:58 rillig Exp $
 #
 
 DISTNAME=      SOPE-2.3.23
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    devel
 MASTER_SITES=  http://www.sogo.nu/files/downloads/SOGo/Sources/
 
diff -r 72c17dae6728 -r 10f3dbb79295 devel/SOPE/distinfo
--- a/devel/SOPE/distinfo       Sun May 31 14:11:42 2020 +0000
+++ b/devel/SOPE/distinfo       Sun May 31 14:33:58 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2020/04/16 09:40:50 manu Exp $
+$NetBSD: distinfo,v 1.23 2020/05/31 14:33:58 rillig Exp $
 
 SHA1 (SOPE-2.3.23.tar.gz) = ad9632a8ba20060179591ceb91bfbc9313311867
 RMD160 (SOPE-2.3.23.tar.gz) = b2decc467ebebf3518a4b3bbb55f1964fb1b33a7
@@ -10,3 +10,4 @@
 SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = e0262b32d6ac3766b06a797d19a976180078a780
 SHA1 (patch-sope-core_NGStreams_NGLocalSocketAddress.m) = 26288c147ef39ef3a63bc03cc83be123b364d206
 SHA1 (patch-sope-core_NGStreams_NGLocalSocketDomain.m) = 2b8d2e842e6de346bf908bf38bbf4c5de4d93e89
+SHA1 (patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m) = 20b00937973c64f36324c9670ba08374bccec13b
diff -r 72c17dae6728 -r 10f3dbb79295 devel/SOPE/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/SOPE/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m   Sun May 31 14:33:58 2020 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m,v 1.1 2020/05/31 14:33:58 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;