CVS commit: pkgsrc/textproc

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Aug  6 18:48:42 UTC 2024

Modified Files:
        pkgsrc/textproc/libxml2: Makefile distinfo
        pkgsrc/textproc/py-libxml2: Makefile
Added Files:
        pkgsrc/textproc/libxml2/patches: patch-nanohttp.c

Log Message:
textproc/libxml2: Avoid ctype(3) abuse.


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 pkgsrc/textproc/libxml2/Makefile
cvs rdiff -u -r1.147 -r1.148 pkgsrc/textproc/libxml2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/libxml2/patches/patch-nanohttp.c
cvs rdiff -u -r1.97 -r1.98 pkgsrc/textproc/py-libxml2/Makefile

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

Modified files:

Index: pkgsrc/textproc/libxml2/Makefile
diff -u pkgsrc/textproc/libxml2/Makefile:1.181 pkgsrc/textproc/libxml2/Makefile:1.182
--- pkgsrc/textproc/libxml2/Makefile:1.181      Mon Jun 17 18:48:24 2024
+++ pkgsrc/textproc/libxml2/Makefile    Tue Aug  6 18:48:42 2024
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.181 2024/06/17 18:48:24 adam Exp $
+# $NetBSD: Makefile,v 1.182 2024/08/06 18:48:42 riastradh Exp $
 
 .include "../../textproc/libxml2/Makefile.common"
 
+PKGREVISION=   1
+
 COMMENT=       XML parser library from the GNOME project
 LICENSE=       modified-bsd
 

Index: pkgsrc/textproc/libxml2/distinfo
diff -u pkgsrc/textproc/libxml2/distinfo:1.147 pkgsrc/textproc/libxml2/distinfo:1.148
--- pkgsrc/textproc/libxml2/distinfo:1.147      Mon Jun 17 18:48:24 2024
+++ pkgsrc/textproc/libxml2/distinfo    Tue Aug  6 18:48:42 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.147 2024/06/17 18:48:24 adam Exp $
+$NetBSD: distinfo,v 1.148 2024/08/06 18:48:42 riastradh Exp $
 
 BLAKE2s (libxml2-2.12.8.tar.xz) = 18a1d86e24c48a116bf35dd702529245d73b6fb69b48eba25ae691d078530038
 SHA512 (libxml2-2.12.8.tar.xz) = 59baac9a82a734045112be6da12bbbe80a71575145424c2225e4bd9f8d54e53c674dcbc9576eb55f646632335702e7f0b1928f96a851159ace9b26f677fd3d77
 Size (libxml2-2.12.8.tar.xz) = 2643728 bytes
 SHA1 (patch-configure) = 88b8910f5606eabff74ac3754dfe734e5d8617d7
+SHA1 (patch-nanohttp.c) = b0e9c3e7bcd97180f77586970c8cd8f6931c0ab7

Index: pkgsrc/textproc/py-libxml2/Makefile
diff -u pkgsrc/textproc/py-libxml2/Makefile:1.97 pkgsrc/textproc/py-libxml2/Makefile:1.98
--- pkgsrc/textproc/py-libxml2/Makefile:1.97    Mon Jun 17 18:48:25 2024
+++ pkgsrc/textproc/py-libxml2/Makefile Tue Aug  6 18:48:42 2024
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.97 2024/06/17 18:48:25 adam Exp $
+# $NetBSD: Makefile,v 1.98 2024/08/06 18:48:42 riastradh Exp $
 
 PYTHON_27_ACCEPTED=    yes
 
 .include "../../textproc/libxml2/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 
 COMMENT=       Python wrapper for libxml2
 LICENSE=       modified-bsd

Added files:

Index: pkgsrc/textproc/libxml2/patches/patch-nanohttp.c
diff -u /dev/null pkgsrc/textproc/libxml2/patches/patch-nanohttp.c:1.1
--- /dev/null   Tue Aug  6 18:48:42 2024
+++ pkgsrc/textproc/libxml2/patches/patch-nanohttp.c    Tue Aug  6 18:48:42 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-nanohttp.c,v 1.1 2024/08/06 18:48:42 riastradh Exp $
+
+Avoid ctype(3) abuse.
+
+--- nanohttp.c.orig    2024-06-12 10:56:14.000000000 +0000
++++ nanohttp.c
+@@ -1274,7 +1274,7 @@ xmlNanoHTTPHostnameMatch(const char *pat
+ 
+     for (; idx_pattern >= 0 && idx_hostname >= 0; 
+            --idx_pattern, --idx_hostname) {
+-      if (tolower(pattern_start[idx_pattern]) != tolower(hostname[idx_hostname]))
++      if (tolower((unsigned char)pattern_start[idx_pattern]) != tolower((unsigned char)hostname[idx_hostname]))
+           break;
+     }
+ 
+@@ -1306,7 +1306,7 @@ xmlNanoHTTPBypassProxy(const char *hostn
+     env = cpy;
+ 
+     /* The remainder of the function is basically a tokenizing: */
+-    while (isspace(*env))
++    while (isspace((unsigned char)*env))
+       ++env;
+     if (*env == '\0') {
+       xmlFree(cpy);
+@@ -1327,7 +1327,7 @@ xmlNanoHTTPBypassProxy(const char *hostn
+           return 1;
+       }
+ 
+-      while (isspace(*env))
++      while (isspace((unsigned char)*env))
+           ++env;
+       p = env;
+     }