diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-11-06 20:24:12 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-11-07 03:00:02 +0100 |
| commit | bd953aa8c3d07ab46316ac6b5af07721202faf16 (patch) | |
| tree | 355a1498a3818b9080019966f56bad4111d327b9 /source/l/libxml2 | |
| parent | bda0a08bfe7825d51ae2daad4d2f3d2be82220ba (diff) | |
| download | current-bd953aa8c3d07ab46316ac6b5af07721202faf16.tar.gz | |
Sat Nov 6 20:24:12 UTC 202120211106202412
a/kernel-generic-5.15.1-x86_64-1.txz: Upgraded.
a/kernel-huge-5.15.1-x86_64-1.txz: Upgraded.
a/kernel-modules-5.15.1-x86_64-1.txz: Upgraded.
ap/ksh93-20211105_77827c5-x86_64-1.txz: Upgraded.
Switched to ksh93u+m. Thanks to aikempshall and GazL.
d/kernel-headers-5.15.1-x86-1.txz: Upgraded.
k/kernel-source-5.15.1-noarch-1.txz: Upgraded.
l/libxml2-2.9.12-x86_64-4.txz: Rebuilt.
Patched to fix python3 unicode errors. Thanks to Daedra.
l/python-pycparser-2.21-x86_64-1.txz: Upgraded.
l/vte-0.66.1-x86_64-1.txz: Upgraded.
tcl/tcl-8.6.12-x86_64-1.txz: Upgraded.
tcl/tk-8.6.12-x86_64-1.txz: Upgraded.
xap/pan-0.148-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/libxml2')
| -rwxr-xr-x | source/l/libxml2/libxml2.SlackBuild | 3 | ||||
| -rw-r--r-- | source/l/libxml2/libxml2.python3-unicode-errors.patch | 34 |
2 files changed, 36 insertions, 1 deletions
diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild index 85006e47..0968495a 100755 --- a/source/l/libxml2/libxml2.SlackBuild +++ b/source/l/libxml2/libxml2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libxml2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -80,6 +80,7 @@ find . \ -exec chmod 644 {} \+ zcat $CWD/libxml2.do-not-check-crc.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/libxml2.python3-unicode-errors.patch.gz | patch -p1 --verbose || exit 1 # Fixes for python-3.9.x: sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c} diff --git a/source/l/libxml2/libxml2.python3-unicode-errors.patch b/source/l/libxml2/libxml2.python3-unicode-errors.patch new file mode 100644 index 00000000..e87dcded --- /dev/null +++ b/source/l/libxml2/libxml2.python3-unicode-errors.patch @@ -0,0 +1,34 @@ +Index: libxml2-2.9.5/python/libxml.c +=================================================================== +--- libxml2-2.9.5.orig/python/libxml.c ++++ libxml2-2.9.5/python/libxml.c +@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + PyObject *message; + PyObject *result; + char str[1000]; ++ unsigned char *ptr = (unsigned char *)str; + + #ifdef DEBUG_ERROR + printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); +@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + str[999] = 0; + va_end(ap); + ++#if PY_MAJOR_VERSION >= 3 ++ /* Ensure the error string doesn't start at UTF8 continuation. */ ++ while (*ptr && (*ptr & 0xc0) == 0x80) ++ ptr++; ++#endif ++ + list = PyTuple_New(2); + PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); + Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); +- message = libxml_charPtrConstWrap(str); ++ message = libxml_charPtrConstWrap(ptr); + PyTuple_SetItem(list, 1, message); + result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); ++ /* Forget any errors caused in the error handler. */ ++ PyErr_Clear(); + Py_XDECREF(list); + Py_XDECREF(result); + } |