Date: Tuesday, April 11, 2023 @ 22:08:21
Author: heftig
Revision: 473866
archrelease: copy trunk to staging-x86_64
Added:
libxml2/repos/staging-x86_64/0001-Fix-python3-unicode-errors.patch
(from rev 473865, libxml2/trunk/0001-Fix-python3-unicode-errors.patch)
libxml2/repos/staging-x86_64/0002-HACK-Don-t-run-fuzzing-tests.patch
(from rev 473865, libxml2/trunk/0002-HACK-Don-t-run-fuzzing-tests.patch)
libxml2/repos/staging-x86_64/PKGBUILD
(from rev 473865, libxml2/trunk/PKGBUILD)
Deleted:
libxml2/repos/staging-x86_64/PKGBUILD
libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
libxml2/repos/staging-x86_64/no-fuzz.diff
--------------------------------------------+
0001-Fix-python3-unicode-errors.patch | 57 +++++++
0002-HACK-Don-t-run-fuzzing-tests.patch | 29 +++
PKGBUILD | 208 ++++++++++++++-------------
libxml2-2.9.8-python3-unicode-errors.patch | 43 -----
no-fuzz.diff | 19 --
5 files changed, 194 insertions(+), 162 deletions(-)
Copied: libxml2/repos/staging-x86_64/0001-Fix-python3-unicode-errors.patch
(from rev 473865, libxml2/trunk/0001-Fix-python3-unicode-errors.patch)
===================================================================
--- 0001-Fix-python3-unicode-errors.patch (rev 0)
+++ 0001-Fix-python3-unicode-errors.patch 2023-04-11 22:08:21 UTC (rev
473866)
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Tue, 11 Apr 2023 21:55:36 +0000
+Subject: [PATCH] Fix python3 unicode errors
+
+Patch taken from Fedora at
+https://src.fedoraproject.org/rpms/libxml2/raw/c1fa5c85e9d3a0b7340aaf34d2e5134cf47f5d66/f/libxml2-2.9.8-python3-unicode-errors.patch
+
+Works around https://bugzilla.gnome.org/show_bug.cgi?id=789714
+and https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
+---
+ python/libxml.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/python/libxml.c b/python/libxml.c
+index e071e824ca39..9d476f4fcd92 100644
+--- a/python/libxml.c
++++ b/python/libxml.c
+@@ -1621,28 +1621,37 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
const char *msg,
+ 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);
+ #endif
+
+
+ if (libxml_xmlPythonErrorFuncHandler == NULL) {
+ va_start(ap, msg);
+ vfprintf(stderr, msg, ap);
+ va_end(ap);
+ } else {
+ va_start(ap, msg);
+ if (vsnprintf(str, 999, msg, ap) >= 998)
+ 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);
+ }
Copied: libxml2/repos/staging-x86_64/0002-HACK-Don-t-run-fuzzing-tests.patch
(from rev 473865, libxml2/trunk/0002-HACK-Don-t-run-fuzzing-tests.patch)
===================================================================
--- 0002-HACK-Don-t-run-fuzzing-tests.patch (rev 0)
+++ 0002-HACK-Don-t-run-fuzzing-tests.patch 2023-04-11 22:08:21 UTC (rev
473866)
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Tue, 11 Apr 2023 21:59:24 +0000
+Subject: [PATCH] HACK: Don't run fuzzing tests
+
+They take way too long.
+---
+ Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 316109b16148..3ef672fe911f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,12 +2,12 @@
+
+ ACLOCAL_AMFLAGS = -I m4
+
+-SUBDIRS = include . doc example fuzz xstc
++SUBDIRS = include . doc example xstc
+ if WITH_PYTHON
+ SUBDIRS += python
+ endif
+
+-DIST_SUBDIRS = include . doc example fuzz python xstc
++DIST_SUBDIRS = include . doc example python xstc
+
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
-DSYSCONFDIR='"$(sysconfdir)"'
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-11 22:08:03 UTC (rev 473865)
+++ PKGBUILD 2023-04-11 22:08:21 UTC (rev 473866)
@@ -1,100 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Jan de Groot <[email protected]>
-# Contributor: Tom Gundersen <[email protected]>
-# Contributor: John Proctor <[email protected]>
-
-pkgbase=libxml2
-pkgname=(libxml2 libxml2-docs)
-pkgver=2.10.3
-pkgrel=3
-pkgdesc="XML C parser and toolkit"
-url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home";
-arch=(x86_64)
-license=(custom:MIT)
-depends=(
- icu
- ncurses
- readline
- xz
- zlib
-)
-makedepends=(
- git
- python
-)
-_commit=f507d167f1755b7eaea09fb1a44d29aab828b6d1 # tags/v2.10.3^0
-source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit";
- libxml2-2.9.8-python3-unicode-errors.patch
- no-fuzz.diff
- https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
-sha256sums=('SKIP'
- '3d07a50fc0963bda05fc5269dedc51f108260699e25e455bb31f6d80c2a9cada'
- '3908e7a53b20109bdfde143238f36e22a154dbb7d363b634e54c0a18328f4656'
- '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
-
-pkgver() {
- cd libxml2
- git describe --tags | sed 's/-rc/rc/;s/^v//;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd libxml2
-
- # Use xmlconf from conformance test suite
- ln -s ../xmlconf
-
- # https://src.fedoraproject.org/rpms/libxml2/tree/rawhide
- git apply -3 ../libxml2-2.9.8-python3-unicode-errors.patch
-
- # Do not run fuzzing tests
- git apply -3 ../no-fuzz.diff
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd libxml2
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-threads \
- --with-history \
- --with-python=/usr/bin/python \
- --with-icu \
- --disable-static
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- cd libxml2
- make check
-}
-
-package_libxml2() {
- optdepends=('python: Python bindings')
- provides=(libxml2.so)
-
- cd libxml2
-
- make DESTDIR="$pkgdir" install
-
- mkdir -p ../doc/usr/share
- mv "$pkgdir"/usr/share/{doc,gtk-doc} -t ../doc/usr/share
-
- install -Dm644 Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-package_libxml2-docs() {
- pkgdesc+=" (documentation)"
- depends=()
-
- mv doc/* "$pkgdir"
-
- install -Dm644 libxml2/Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 473865,
libxml2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-11 22:08:21 UTC (rev 473866)
@@ -0,0 +1,108 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Jan de Groot <[email protected]>
+# Contributor: Tom Gundersen <[email protected]>
+# Contributor: John Proctor <[email protected]>
+
+pkgbase=libxml2
+pkgname=(
+ libxml2
+ libxml2-docs
+)
+pkgver=2.10.4
+pkgrel=1
+pkgdesc="XML C parser and toolkit"
+url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home";
+arch=(x86_64)
+license=(custom:MIT)
+depends=(
+ icu
+ ncurses
+ readline
+ xz
+ zlib
+)
+makedepends=(
+ git
+ python
+)
+_commit=223cb03a5d27b1b2393b266a8657443d046139d6 # tags/v2.10.4^0
+source=(
+ "git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit";
+ 0001-Fix-python3-unicode-errors.patch
+ 0002-HACK-Don-t-run-fuzzing-tests.patch
+ https://www.w3.org/XML/Test/xmlts20130923.tar.gz
+)
+b2sums=('SKIP'
+
'ec5a0955906c5fdd4bc65248bdb46f315460f4b2208bf37c49f55ef7468585786bdf563aa3e9357370d4f1ff947a6d4467869eeb2ca6b77ca5e40ffa45213a13'
+
'ec247c8caad963307d8f487176fde518cfb087bbff3f10c2a5846b90a04c9909c2f0e6aaf8ded4784f46586eafb16df493caf1debc20ff10014f03b1f1f8241d'
+
'63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be')
+
+pkgver() {
+ cd libxml2
+ git describe --tags | sed 's/-rc/rc/;s/^v//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd libxml2
+
+ # Use xmlconf from conformance test suite
+ ln -s ../xmlconf
+
+ # https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
+ git apply -3 ../0001-Fix-python3-unicode-errors.patch
+
+ # Do not run fuzzing tests
+ git apply -3 ../0002-HACK-Don-t-run-fuzzing-tests.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ local configure_options=(
+ --prefix=/usr
+ --sysconfdir=/etc
+ --localstatedir=/var
+ --with-history
+ --with-icu
+ --with-python=/usr/bin/python
+ --with-threads
+ --disable-static
+ )
+
+ cd libxml2
+
+ ./configure "${configure_options[@]}"
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd libxml2
+ make check
+}
+
+package_libxml2() {
+ optdepends=('python: Python bindings')
+ provides=(libxml2.so)
+
+ cd libxml2
+
+ make DESTDIR="$pkgdir" install
+
+ mkdir -p ../doc/usr/share
+ mv "$pkgdir"/usr/share/{doc,gtk-doc} -t ../doc/usr/share
+
+ install -Dm644 Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+package_libxml2-docs() {
+ pkgdesc+=" (documentation)"
+ depends=()
+
+ mv doc/* "$pkgdir"
+
+ install -Dm644 libxml2/Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim:set sw=2 sts=-1 et:
Deleted: libxml2-2.9.8-python3-unicode-errors.patch
===================================================================
--- libxml2-2.9.8-python3-unicode-errors.patch 2023-04-11 22:08:03 UTC (rev
473865)
+++ libxml2-2.9.8-python3-unicode-errors.patch 2023-04-11 22:08:21 UTC (rev
473866)
@@ -1,43 +0,0 @@
-diff --git i/python/libxml.c w/python/libxml.c
-index e071e824..9d476f4f 100644
---- i/python/libxml.c
-+++ w/python/libxml.c
-@@ -1621,28 +1621,37 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
const char *msg,
- 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);
- #endif
-
-
- if (libxml_xmlPythonErrorFuncHandler == NULL) {
- va_start(ap, msg);
- vfprintf(stderr, msg, ap);
- va_end(ap);
- } else {
- va_start(ap, msg);
- if (vsnprintf(str, 999, msg, ap) >= 998)
- 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);
- }
Deleted: no-fuzz.diff
===================================================================
--- no-fuzz.diff 2023-04-11 22:08:03 UTC (rev 473865)
+++ no-fuzz.diff 2023-04-11 22:08:21 UTC (rev 473866)
@@ -1,19 +0,0 @@
-diff --git i/Makefile.am w/Makefile.am
-index 316109b1..3ef672fe 100644
---- i/Makefile.am
-+++ w/Makefile.am
-@@ -2,12 +2,12 @@
-
- ACLOCAL_AMFLAGS = -I m4
-
--SUBDIRS = include . doc example fuzz xstc
-+SUBDIRS = include . doc example xstc
- if WITH_PYTHON
- SUBDIRS += python
- endif
-
--DIST_SUBDIRS = include . doc example fuzz python xstc
-+DIST_SUBDIRS = include . doc example python xstc
-
- AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
-DSYSCONFDIR='"$(sysconfdir)"'
-
