Sun May 31 14:33:58 2020 UTC ()
devel/SOPE: fix array[char]


(rillig)
diff -r1.49 -r1.50 pkgsrc/devel/SOPE/Makefile
diff -r1.22 -r1.23 pkgsrc/devel/SOPE/distinfo
diff -r0 -r1.1 pkgsrc/devel/SOPE/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m
cvs diff -r1.49 -r1.50 pkgsrc/devel/SOPE/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/SOPE/Makefile 2020/04/16 09:40:50 1.49
+++ pkgsrc/devel/SOPE/Makefile 2020/05/31 14:33:58 1.50
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.49 2020/04/16 09:40:50 manu Exp $ 1# $NetBSD: Makefile,v 1.50 2020/05/31 14:33:58 rillig Exp $
2# 2#
3 3
4DISTNAME= SOPE-2.3.23 4DISTNAME= SOPE-2.3.23
5PKGREVISION= 6 5PKGREVISION= 7
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ 7MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/inverse-inc/sope 10HOMEPAGE= https://github.com/inverse-inc/sope
11# Original SOPE: http://sope.opengroupware.org/ 11# Original SOPE: http://sope.opengroupware.org/
12COMMENT= Framework for writing clever web servers driven by objects 12COMMENT= Framework for writing clever web servers driven by objects
13LICENSE= gnu-lgpl-v2 13LICENSE= gnu-lgpl-v2
14 14
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16 16
17WRKSRC= ${WRKDIR}/SOPE 17WRKSRC= ${WRKDIR}/SOPE
18HAS_CONFIGURE= yes 18HAS_CONFIGURE= yes
cvs diff -r1.22 -r1.23 pkgsrc/devel/SOPE/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/SOPE/distinfo 2020/04/16 09:40:50 1.22
+++ pkgsrc/devel/SOPE/distinfo 2020/05/31 14:33:58 1.23
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.22 2020/04/16 09:40:50 manu Exp $ 1$NetBSD: distinfo,v 1.23 2020/05/31 14:33:58 rillig Exp $
2 2
3SHA1 (SOPE-2.3.23.tar.gz) = ad9632a8ba20060179591ceb91bfbc9313311867 3SHA1 (SOPE-2.3.23.tar.gz) = ad9632a8ba20060179591ceb91bfbc9313311867
4RMD160 (SOPE-2.3.23.tar.gz) = b2decc467ebebf3518a4b3bbb55f1964fb1b33a7 4RMD160 (SOPE-2.3.23.tar.gz) = b2decc467ebebf3518a4b3bbb55f1964fb1b33a7
5SHA512 (SOPE-2.3.23.tar.gz) = d10d3ac530f31dfe5a18ce0bdd89efe0545714a9a52bb0ff07b0566025e90438035e2363390ab7e5daae55a77bf3a7ba766f1ebc96dc764af28dbe756398516d 5SHA512 (SOPE-2.3.23.tar.gz) = d10d3ac530f31dfe5a18ce0bdd89efe0545714a9a52bb0ff07b0566025e90438035e2363390ab7e5daae55a77bf3a7ba766f1ebc96dc764af28dbe756398516d
6Size (SOPE-2.3.23.tar.gz) = 2283214 bytes 6Size (SOPE-2.3.23.tar.gz) = 2283214 bytes
7SHA1 (patch-general.make) = 080d097aca56c4aae59beadd0c0829c6b1798aa3 7SHA1 (patch-general.make) = 080d097aca56c4aae59beadd0c0829c6b1798aa3
8SHA1 (patch-sope-core_NGStreams_NGActiveSocket.m) = c06a04b009f894eee0161eb8bd3f9c7011b6de3e 8SHA1 (patch-sope-core_NGStreams_NGActiveSocket.m) = c06a04b009f894eee0161eb8bd3f9c7011b6de3e
9SHA1 (patch-sope-core_NGStreams_NGDescriptorFunctions.m) = e3045db3205cd859d78c3953e0f1565626c69d04 9SHA1 (patch-sope-core_NGStreams_NGDescriptorFunctions.m) = e3045db3205cd859d78c3953e0f1565626c69d04
10SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = e0262b32d6ac3766b06a797d19a976180078a780 10SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = e0262b32d6ac3766b06a797d19a976180078a780
11SHA1 (patch-sope-core_NGStreams_NGLocalSocketAddress.m) = 26288c147ef39ef3a63bc03cc83be123b364d206 11SHA1 (patch-sope-core_NGStreams_NGLocalSocketAddress.m) = 26288c147ef39ef3a63bc03cc83be123b364d206
12SHA1 (patch-sope-core_NGStreams_NGLocalSocketDomain.m) = 2b8d2e842e6de346bf908bf38bbf4c5de4d93e89 12SHA1 (patch-sope-core_NGStreams_NGLocalSocketDomain.m) = 2b8d2e842e6de346bf908bf38bbf4c5de4d93e89
 13SHA1 (patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m) = 20b00937973c64f36324c9670ba08374bccec13b
File Added: pkgsrc/devel/SOPE/patches/patch-sope-xml_libxmlSAXDriver_libxmlHTMLSAXDriver.m
$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;