CVS commit: pkgsrc/devel/SOPE

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun May 31 14:33:58 UTC 2020

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/SOPE/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/SOPE/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/SOPE/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/SOPE/Makefile
diff -u pkgsrc/devel/SOPE/Makefile:1.49 pkgsrc/devel/SOPE/Makefile:1.50
--- pkgsrc/devel/SOPE/Makefile:1.49     Thu Apr 16 09:40:50 2020
+++ pkgsrc/devel/SOPE/Makefile  Sun May 31 14:33:58 2020
@@ -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/
 

Index: pkgsrc/devel/SOPE/distinfo
diff -u pkgsrc/devel/SOPE/distinfo:1.22 pkgsrc/devel/SOPE/distinfo:1.23
--- pkgsrc/devel/SOPE/distinfo:1.22     Thu Apr 16 09:40:50 2020
+++ pkgsrc/devel/SOPE/distinfo  Sun May 31 14:33:58 2020
@@ -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_NGDescri
 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

Added files:

Index: pkgsrc/devel/SOPE/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m
diff -u /dev/null pkgsrc/devel/SOPE/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m:1.1
--- /dev/null   Sun May 31 14:33:58 2020
+++ pkgsrc/devel/SOPE/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m      Sun May 31 14:33:58 2020
@@ -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;