diff options
Diffstat (limited to 'dev-libs/libxml2/files')
7 files changed, 0 insertions, 229 deletions
diff --git a/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch b/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch deleted file mode 100644 index 3f69ec2a4d88..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/catalog.c -+++ b/catalog.c -@@ -68,10 +68,10 @@ - #define XML_URN_PUBID "urn:publicid:" - #define XML_CATAL_BREAK ((xmlChar *) -1) - #ifndef XML_XML_DEFAULT_CATALOG --#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" -+#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog" - #endif - #ifndef XML_SGML_DEFAULT_CATALOG --#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog" -+#define XML_SGML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog" - #endif - - #if defined(_WIN32) && defined(_MSC_VER) -@@ -76,7 +76,7 @@ - - #if defined(_WIN32) && defined(_MSC_VER) - #undef XML_XML_DEFAULT_CATALOG --static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog"; -+static char XML_XML_DEFAULT_CATALOG[256] = "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"; - #if defined(_WIN32_WCE) - /* Windows CE don't have a A variant */ - #define GetModuleHandleA GetModuleHandle ---- a/xmlcatalog.c -+++ b/xmlcatalog.c -@@ -43,7 +43,7 @@ - - - #ifndef XML_SGML_DEFAULT_CATALOG --#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog" -+#define XML_SGML_DEFAULT_CATALOG "@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog" - #endif - - /************************************************************************ ---- a/runtest.c -+++ b/runtest.c -@@ -2747,7 +2747,7 @@ - */ - static int - uripMatch(const char * URI) { -- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog"))) -+ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"))) - return(0); - /* Verify we received the escaped URL */ - if (strcmp(urip_rcvsURLs[urip_current], URI)) -@@ -2766,7 +2766,7 @@ - */ - static void * - uripOpen(const char * URI) { -- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog"))) -+ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"))) - return(NULL); - /* Verify we received the escaped URL */ - if (strcmp(urip_rcvsURLs[urip_current], URI)) ---- a/xmllint.c -+++ b/xmllint.c -@@ -103,7 +103,7 @@ - #endif - - #ifndef XML_XML_DEFAULT_CATALOG --#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" -+#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog" - #endif - - typedef enum { diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch deleted file mode 100644 index c979c8414779..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/751922 -https://gitlab.gnome.org/GNOME/libxml2/-/issues/202 - -From c1bae734f3850f6900cf54d186ca0a9102895d82 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Fri, 30 Oct 2020 10:27:23 +0100 -Subject: [PATCH] Fix build with icu-68.1 - -icu-68.1 removed macro definitions for TRUE and FALSE - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- ---- a/encoding.c -+++ b/encoding.c -@@ -1958,7 +1958,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, - #ifdef LIBXML_ICU_ENABLED - else if (handler->uconv_out != NULL) { - ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, -- TRUE); -+ 1); - } - #endif /* LIBXML_ICU_ENABLED */ - else { --- diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch b/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch deleted file mode 100644 index 205b26b54f82..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/749849 - -From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Fri, 7 Aug 2020 21:54:27 +0200 -Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout' - -Make sure that truncated UTF-8 sequences don't cause an out-of-bounds -array access. - -Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for -the report. - -Fixes #178. ---- a/xmllint.c -+++ b/xmllint.c -@@ -528,6 +528,12 @@ static void - xmlHTMLEncodeSend(void) { - char *result; - -+ /* -+ * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might -+ * end with a truncated UTF-8 sequence. This is a hack to at least avoid -+ * an out-of-bounds read. -+ */ -+ memset(&buffer[sizeof(buffer)-4], 0, 4); - result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer); - if (result) { - xmlGenericError(xmlGenericErrorContext, "%s", result); --- diff --git a/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch b/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch deleted file mode 100644 index 7f6fd4ae8266..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/-/issues/252 - -From 5d6403682a3463f29a1f7c27aa54ecb5e3971547 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Thu, 13 May 2021 17:40:22 +0000 -Subject: [PATCH] Disable fuzz tests - -Not all of the fuzz files are included with the dist tarball, -so disabling them for now to get the release in with most tests -given the security bug. ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,9 +2,9 @@ - - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = include . doc example fuzz xstc $(PYTHON_SUBDIR) -+SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR) - --DIST_SUBDIRS = include . doc example fuzz python xstc -+DIST_SUBDIRS = include . doc example python xstc - - AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include - -@@ -210,7 +210,6 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ - $(CHECKER) ./runxmlconf$(EXEEXT) - @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \ - $(MAKE) tests ; fi) -- @cd fuzz; $(MAKE) tests - - check: all runtests - --- diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch b/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch deleted file mode 100644 index 7c5557f9915b..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -844,7 +844,7 @@ if test "$with_python" != "no" ; then - fi - if test "$PYTHON" != "" - then -- PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"` -+ PYTHON_VERSION=`$PYTHON -c "import sysconfig; print(sysconfig.get_config_var('LDVERSION') or sysconfig.get_config_var('py_version_short'))"` - PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"` - # does not work as it produce a /usr/lib/python path instead of/usr/lib64/python - # diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch deleted file mode 100644 index 1e269c3387b3..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/merge_requests/14 - -From 54878c018af979b20ca1bfbf12599973484cae5b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Thu, 3 Jan 2019 05:44:03 -0500 -Subject: [PATCH] fix reader5.py test when building out of tree - -When building out of tree, the relative path this test uses doesn't -work. Resolve the path relative to the test script itself instead. - -Url: https://bugs.gentoo.org/565576 ---- a/python/tests/reader5.py -+++ b/python/tests/reader5.py -@@ -4,6 +4,7 @@ - # this extract the Dragon bibliography entries from the XML specification - # - import libxml2 -+import os - import sys - - # Memory debug specific -@@ -14,7 +15,8 @@ Ravi Sethi, and Jeffrey D. Ullman. - <emph>Compilers: Principles, Techniques, and Tools</emph>. - Reading: Addison-Wesley, 1986, rpt. corr. 1988.</bibl>""" - --f = open('../../test/valid/REC-xml-19980210.xml', 'rb') -+basedir = os.path.dirname(os.path.realpath(__file__)) -+f = open(os.path.join(basedir, '../../test/valid/REC-xml-19980210.xml'), 'rb') - input = libxml2.inputBuffer(f) - reader = input.newTextReader("REC") - res="" --- diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch b/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch deleted file mode 100644 index db20221afe42..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/745162 ---- a/python/libxml.c -+++ b/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); - } |