Attachment 225170 Details for Bug 256078 – Patch for libxml2 (WIP)

[patch] Patch for libxml2 (WIP)

libxml2-2912-wip.patch (text/plain), 23.15 KB, created by Daniel Engberg on 2021-05-22 11:38:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-05-22 11:38:02 UTC

Size: 23.15 KB

patch

obsolete

>diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
>index 366bb9f46f5e..3b84a116bda6 100644
>--- a/textproc/libxml2/Makefile
>+++ b/textproc/libxml2/Makefile
>@@ -1,76 +1,71 @@
> # Created by: Yukihiro Nakai <Nakai@technologist.com>
> 
> PORTNAME=	libxml2
>-DISTVERSION=	2.9.10
>-PORTREVISION?=	3
>-CATEGORIES?=	textproc gnome
>+DISTVERSION=	2.9.12
>+CATEGORIES=	textproc gnome
> MASTER_SITES=	http://xmlsoft.org/sources/
> DIST_SUBDIR=	gnome2
> 
> MAINTAINER?=	desktop@FreeBSD.org
> COMMENT?=	XML parser library for GNOME
> 
> LICENSE=	MIT TRIO
> LICENSE_COMB=	multi
> LICENSE_NAME_TRIO=	Trio License
> LICENSE_FILE_MIT=	${WRKSRC}/COPYING
> LICENSE_FILE_TRIO=	${FILESDIR}/LICENSE.TRIO
> LICENSE_PERMS_TRIO=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
> GNU_CONFIGURE=	yes
>-USES+=		compiler cpe iconv libtool pathfix pkgconfig shebangfix
>+#USES+=		compiler cpe iconv libtool pathfix pkgconfig shebangfix
>+# += and shebang fix may be needed for py-libxml2 port depending on what route we take
>+USES=		cmake cpe iconv localbase pkgconfig readline
> CPE_VENDOR=	xmlsoft
> USE_LDCONFIG=	yes
>-CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
>-		--with-html-dir=${PREFIX}/share/doc \
>-		--with-html-subdir=${PORTNAME} \
>-		--without-icu \
>-		--with-lzma=/usr \
>-		--without-python
>-INSTALL_TARGET=	install-strip
>-SHEBANG_FILES=	*.py */*.py */*/*.py
>-
>-PLIST_SUB+=	LIBVERSION=${PORTVERSION}
>-
>-.if !defined(MASTERDIR)
>-
>-OPTIONS_DEFINE=	SCHEMA VALIDATION THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
>-OPTIONS_DEFAULT=SCHEMA VALIDATION THREADS
>-SCHEMA_DESC=	XML schema support
>-SCHEMA_CONFIGURE_WITH=	schemas
>-VALIDATION_DESC=	Validation support
>-VALIDATION_CONFIGURE_OFF=	--without-valid
>-THREADS_DESC=	Threads support
>-THREADS_CONFIGURE_WITH=	threads
>-MEM_DEBUG_DESC=	Memory debugging (DEVELOPERS ONLY!)
>-MEM_DEBUG_CONFIGURE_WITH=	mem-debug
>-XMLLINT_HIST_DESC=	History for xmllint
>-XMLLINT_HIST_CONFIGURE_WITH=	history
>+#SHEBANG_FILES=	*.py */*.py */*/*.py
>+# Only needed for python port...
>+
>+PLIST_SUB+=	LIBVERSION=${DISTVERSION}
>+
>+TEST_TARGET=	test
>+
>+CMAKE_OFF?=	LIBXML2_WITH_PYTHON
>+# ?= is only needed for python slave-port
>+
>+#.if !defined(MASTERDIR)
>+
>+OPTIONS_DEFINE=		MEM_DEBUG SCHEMA TEST THREAD_ALLOC THREADS VALIDATION
>+OPTIONS_DEFAULT=	SCHEMA THREADS VALIDATION
>+
>+MEM_DEBUG_DESC=		Memory debugging (DEVELOPERS ONLY!)
>+SCHEMA_DESC=		XML schema support
> THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)
>-THREAD_ALLOC_CONFIGURE_WITH=	thread-alloc
>+VALIDATION_DESC=	Validation support
> 
>-.endif # !defined(MASTERDIR)
>+MEM_DEBUG_CMAKE_BOOL=		LIBXML2_WITH_MEM_DEBUG
>+SCHEMA_CMAKE_BOOL=		LIBXML2_WITH_SCHEMAS
>+TEST_CMAKE_BOOL=		LIBXML2_WITH_TESTS
>+VALIDATION_CMAKE_BOOL=		LIBXML2_WITH_VALID
>+TEST_CMAKE_BOOL=		LIBXML2_WITH_TESTS
>+THREAD_ALLOC_CMAKE_BOOL=	LIBXML2_WITH_THREAD_ALLOC
>+THREADS_CMAKE_BOOL=		LIBXML2_WITH_THREADS
> 
>-.if !defined(MASTERDIR)
>-post-install:
>-	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
>-.endif
>+#.endif # !defined(MASTERDIR)
> 
>-.include <bsd.port.pre.mk>
>+#.if !defined(MASTERDIR)
>+#
>+#.include <bsd.port.pre.mk>
> 
> post-patch:
>-.for d in . doc doc/devhelp doc/examples
>-	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
>-		${WRKSRC}/${d}/Makefile.in
>-.endfor
> .for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1
> 	@${REINPLACE_CMD} -e \
> 		's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \
> 		 s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \
> 		${WRKSRC}/${f}
> .endfor
>-.if ${CHOSEN_COMPILER_TYPE} == gcc
>-	@${REINPLACE_CMD} -e 's/ -Wno-array-bounds//' ${WRKSRC}/configure
>-.endif
> 
>-.include <bsd.port.post.mk>
>+post-install:
>+	@${RLN} ${STAGEDIR}${PREFIX}/lib/libxml2.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libxml2.so.2
>+
>+#.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
>index 58a42709307a..4a8db0b21dfc 100644
>--- a/textproc/libxml2/distinfo
>+++ b/textproc/libxml2/distinfo
>@@ -1,11 +1,3 @@
>-TIMESTAMP = 1602549798
>-SHA256 (gnome2/libxml2-2.9.10.tar.gz) = aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
>-SIZE (gnome2/libxml2-2.9.10.tar.gz) = 5624761
>-SHA256 (gnome2/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a.patch) = 8bab1a7fcc22a8f9a3f89648660bbca424196d82967e213bd27c1dcc9a9544a5
>-SIZE (gnome2/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a.patch) = 1015
>-SHA256 (gnome2/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch) = 4a1dca36e762a0e2affb0779918fbf1665a00d984ffbd3efa45d3d202f87ea8c
>-SIZE (gnome2/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch) = 996
>-SHA256 (gnome2/50f06b3efb638efb0abd95dc62dca05ae67882c2.patch) = 701048e726e2f3f7f2a71a7054030fc154b5edace72e23c5934ecd9ee09ad811
>-SIZE (gnome2/50f06b3efb638efb0abd95dc62dca05ae67882c2.patch) = 1052
>-SHA256 (gnome2/edc7b6abb0c125eeb888748c334897f60aab0854.patch) = eac708cc0bcb19c59c63874e5518f9084b177c8a10981539d90ba41d9e8414a1
>-SIZE (gnome2/edc7b6abb0c125eeb888748c334897f60aab0854.patch) = 3019
>+TIMESTAMP = 1621677997
>+SHA256 (gnome2/libxml2-2.9.12.tar.gz) = c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92
>+SIZE (gnome2/libxml2-2.9.12.tar.gz) = 5681632
>diff --git a/textproc/libxml2/files/patch-CMakeLists.txt b/textproc/libxml2/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..812b2b2bca36
>--- /dev/null
>+++ b/textproc/libxml2/files/patch-CMakeLists.txt
>@@ -0,0 +1,71 @@
>+--- CMakeLists.txt.orig	2021-05-13 12:53:51 UTC
>++++ CMakeLists.txt
>+@@ -1,6 +1,6 @@
>+ cmake_minimum_required(VERSION 3.15)
>+ 
>+-project(libxml2 VERSION 2.9.10 LANGUAGES C)
>++project(libxml2 VERSION 2.9.12 LANGUAGES C)
>+ 
>+ include(CheckCSourceCompiles)
>+ include(CheckFunctionExists)
>+@@ -659,12 +659,12 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DAT
>+ 
>+ configure_package_config_file(
>+ 	libxml2-config.cmake.cmake.in libxml2-config.cmake
>+-	INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
>++	INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
>+ )
>+ 
>+ install(
>+ 	FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config.cmake
>+-	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
>++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
>+ 	COMPONENT development
>+ )
>+ 
>+@@ -676,13 +676,13 @@ write_basic_package_version_file(
>+ 
>+ install(
>+ 	FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake
>+-	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
>++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
>+ 	COMPONENT development
>+ )
>+ 
>+ install(
>+ 	EXPORT LibXml2
>+-	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
>++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
>+ 	NAMESPACE LibXml2::
>+ 	FILE libxml2-export.cmake
>+ 	COMPONENT development
>+@@ -701,7 +701,7 @@ if(LIBXML2_WITH_PYTHON)
>+ 	configure_file(python/setup.py.in setup.py @ONLY)
>+ endif()
>+ 
>+-set(XML_INCLUDEDIR "-I\${includedir}/libxml2")
>++set(XML_INCLUDEDIR "-I\${includedir}/libxml2 -I${CMAKE_INSTALL_OLDINCLUDEDIR}")
>+ set(XML_LIBDIR "-L\${libdir}")
>+ set(XML_LIBS "-lxml2")
>+ set(XML_PRIVATE_LIBS "${Z_LIBS} ${LZMA_LIBS} ${THREAD_LIBS} ${ICONV_LIBS} ${ICU_LIBS} ${M_LIBS}")
>+@@ -709,18 +709,17 @@ set(XML_PRIVATE_LIBS "${Z_LIBS} ${LZMA_LIBS} ${THREAD_
>+ file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}")
>+ string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}")
>+ 
>+-set(prefix "\${pcfiledir}/${PACKAGE_RELATIVE_PATH}")
>++set(prefix "${CMAKE_INSTALL_PREFIX}")
>+ set(exec_prefix "\${prefix}")
>+ set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
>+ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
>+ configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY)
>+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development)
>+ 
>+-set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..")
>+ configure_file(xml2-config.in xml2-config @ONLY)
>+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xml2-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT development)
>+ 
>+-set(XML_INCLUDEDIR "-I${CMAKE_INSTALL_FULL_INCLUDEDIR}/libxml2")
>++set(XML_INCLUDEDIR "-I${CMAKE_INSTALL_FULL_INCLUDEDIR}/libxml2 -I${CMAKE_INSTALL_OLDINCLUDEDIR}")
>+ set(XML_LIBDIR "-L${CMAKE_INSTALL_FULL_LIBDIR}")
>+ configure_file(xml2Conf.sh.in xml2Conf.sh @ONLY)
>+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xml2Conf.sh DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT development)
>diff --git a/textproc/libxml2/files/patch-CVE-2019-20388 b/textproc/libxml2/files/patch-CVE-2019-20388
>deleted file mode 100644
>index a049f2c6f019..000000000000
>--- a/textproc/libxml2/files/patch-CVE-2019-20388
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001
>-From: Zhipeng Xie <xiezhipeng1@huawei.com>
>-Date: Tue, 20 Aug 2019 16:33:06 +0800
>-Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream
>-
>-When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun
>-alloc a new schema for ctxt->schema and set vctxt->xsiAssemble
>-to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize
>-vctxt->xsiAssemble to 0 again which cause the alloced schema
>-can not be freed anymore.
>-
>-Found with libFuzzer.
>-
>-Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
>----
>- xmlschemas.c | 1 -
>- 1 file changed, 1 deletion(-)
>-
>-diff --git a/xmlschemas.c b/xmlschemas.c
>-index 301c8449..39d92182 100644
>---- xmlschemas.c
>-+++ xmlschemas.c
>-@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) {
>-     vctxt->nberrors = 0;
>-     vctxt->depth = -1;
>-     vctxt->skipDepth = -1;
>--    vctxt->xsiAssemble = 0;
>-     vctxt->hasKeyrefs = 0;
>- #ifdef ENABLE_IDC_NODE_TABLES_TEST
>-     vctxt->createIDCNodeTables = 1;
>--- 
>-GitLab
>-
>diff --git a/textproc/libxml2/files/patch-CVE-2020-24977 b/textproc/libxml2/files/patch-CVE-2020-24977
>deleted file mode 100644
>index b3121d980864..000000000000
>--- a/textproc/libxml2/files/patch-CVE-2020-24977
>+++ /dev/null
>@@ -1,36 +0,0 @@
>-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.
>----
>- xmllint.c | 6 ++++++
>- 1 file changed, 6 insertions(+)
>-
>-diff --git a/xmllint.c b/xmllint.c
>-index f6a8e463..c647486f 100644
>---- xmllint.c
>-+++ 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);
>--- 
>-GitLab
>-
>diff --git a/textproc/libxml2/files/patch-CVE-2020-7595 b/textproc/libxml2/files/patch-CVE-2020-7595
>deleted file mode 100644
>index 5bcd916ade7f..000000000000
>--- a/textproc/libxml2/files/patch-CVE-2020-7595
>+++ /dev/null
>@@ -1,32 +0,0 @@
>-From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001
>-From: Zhipeng Xie <xiezhipeng1@huawei.com>
>-Date: Thu, 12 Dec 2019 17:30:55 +0800
>-Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities
>-
>-When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef
>-return NULL which cause a infinite loop in xmlStringLenDecodeEntities
>-
>-Found with libFuzzer.
>-
>-Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
>----
>- parser.c | 3 ++-
>- 1 file changed, 2 insertions(+), 1 deletion(-)
>-
>-diff --git a/parser.c b/parser.c
>-index d1c31963..a34bb6cd 100644
>---- parser.c
>-+++ parser.c
>-@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
>-     else
>-         c = 0;
>-     while ((c != 0) && (c != end) && /* non input consuming loop */
>--	   (c != end2) && (c != end3)) {
>-+           (c != end2) && (c != end3) &&
>-+           (ctxt->instate != XML_PARSER_EOF)) {
>- 
>- 	if (c == 0) break;
>-         if ((c == '&') && (str[1] == '#')) {
>--- 
>-GitLab
>-
>diff --git a/textproc/libxml2/files/patch-Makefile.in b/textproc/libxml2/files/patch-Makefile.in
>deleted file mode 100644
>index d458e1da96c7..000000000000
>--- a/textproc/libxml2/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,29 +0,0 @@
>---- Makefile.in.orig	2019-11-16 14:42:34 UTC
>-+++ Makefile.in
>-@@ -1284,7 +1284,7 @@ am--depfiles: $(am__depfiles_remade)
>- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
>- 
>- .c.lo:
>--@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
>- @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
>- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@@ -1773,7 +1773,7 @@ check-am: all-am
>- 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
>- check: $(BUILT_SOURCES)
>- 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
>--all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
>-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
>- 		config.h
>- install-binPROGRAMS: install-libLTLIBRARIES
>- 
>-@@ -1910,7 +1910,7 @@ info: info-recursive
>- 
>- info-am:
>- 
>--install-data-am: install-cmakeDATA install-data-local \
>-+install-data-am: install-cmakeDATA \
>- 	install-m4dataDATA install-man install-pkgconfigDATA
>- 
>- install-dvi: install-dvi-recursive
>diff --git a/textproc/libxml2/files/patch-Python-39-support b/textproc/libxml2/files/patch-Python-39-support
>deleted file mode 100644
>index 81f9e29b6ea7..000000000000
>--- a/textproc/libxml2/files/patch-Python-39-support
>+++ /dev/null
>@@ -1,92 +0,0 @@
>-From edc7b6abb0c125eeb888748c334897f60aab0854 Mon Sep 17 00:00:00 2001
>-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
>-Date: Fri, 28 Feb 2020 12:48:14 +0100
>-Subject: [PATCH] Parenthesize Py<type>_Check() in ifs
>-
>-In C, if expressions should be parenthesized.
>-PyLong_Check, PyUnicode_Check etc. happened to expand to a parenthesized
>-expression before, but that's not API to rely on.
>-
>-Since Python 3.9.0a4 it needs to be parenthesized explicitly.
>-
>-Fixes https://gitlab.gnome.org/GNOME/libxml2/issues/149
>----
>- python/libxml.c |  4 ++--
>- python/types.c  | 12 ++++++------
>- 2 files changed, 8 insertions(+), 8 deletions(-)
>-
>-diff --git a/python/libxml.c b/python/libxml.c
>-index bc676c4e..81e709f3 100644
>---- python/libxml.c
>-+++ python/libxml.c
>-@@ -294,7 +294,7 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) {
>- 	lenread = PyBytes_Size(ret);
>- 	data = PyBytes_AsString(ret);
>- #ifdef PyUnicode_Check
>--    } else if PyUnicode_Check (ret) {
>-+    } else if (PyUnicode_Check (ret)) {
>- #if PY_VERSION_HEX >= 0x03030000
>-         Py_ssize_t size;
>- 	const char *tmp;
>-@@ -359,7 +359,7 @@ xmlPythonFileRead (void * context, char * buffer, int len) {
>- 	lenread = PyBytes_Size(ret);
>- 	data = PyBytes_AsString(ret);
>- #ifdef PyUnicode_Check
>--    } else if PyUnicode_Check (ret) {
>-+    } else if (PyUnicode_Check (ret)) {
>- #if PY_VERSION_HEX >= 0x03030000
>-         Py_ssize_t size;
>- 	const char *tmp;
>-diff --git a/python/types.c b/python/types.c
>-index c2bafeb1..ed284ec7 100644
>---- python/types.c
>-+++ python/types.c
>-@@ -602,16 +602,16 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
>-     if (obj == NULL) {
>-         return (NULL);
>-     }
>--    if PyFloat_Check (obj) {
>-+    if (PyFloat_Check (obj)) {
>-         ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
>--    } else if PyLong_Check(obj) {
>-+    } else if (PyLong_Check(obj)) {
>- #ifdef PyLong_AS_LONG
>-         ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
>- #else
>-         ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
>- #endif
>- #ifdef PyBool_Check
>--    } else if PyBool_Check (obj) {
>-+    } else if (PyBool_Check (obj)) {
>- 
>-         if (obj == Py_True) {
>-           ret = xmlXPathNewBoolean(1);
>-@@ -620,14 +620,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
>-           ret = xmlXPathNewBoolean(0);
>-         }
>- #endif
>--    } else if PyBytes_Check (obj) {
>-+    } else if (PyBytes_Check (obj)) {
>-         xmlChar *str;
>- 
>-         str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
>-                          PyBytes_GET_SIZE(obj));
>-         ret = xmlXPathWrapString(str);
>- #ifdef PyUnicode_Check
>--    } else if PyUnicode_Check (obj) {
>-+    } else if (PyUnicode_Check (obj)) {
>- #if PY_VERSION_HEX >= 0x03030000
>-         xmlChar *str;
>- 	const char *tmp;
>-@@ -650,7 +650,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
>- 	ret = xmlXPathWrapString(str);
>- #endif
>- #endif
>--    } else if PyList_Check (obj) {
>-+    } else if (PyList_Check (obj)) {
>-         int i;
>-         PyObject *node;
>-         xmlNodePtr cur;
>--- 
>-GitLab
>-
>diff --git a/textproc/libxml2/files/patch-config.h.in b/textproc/libxml2/files/patch-config.h.in
>deleted file mode 100644
>index 326dbd57c71e..000000000000
>--- a/textproc/libxml2/files/patch-config.h.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- config.h.in.orig	2018-03-05 15:54:17 UTC
>-+++ config.h.in
>-@@ -1,5 +1,8 @@
>- /* config.h.in.  Generated from configure.ac by autoheader.  */
>- 
>-+/* XXX */
>-+#define HAVE_VFSCANF
>-+
>- /* Type cast for the gethostbyname() argument */
>- #undef GETHOSTBYNAME_ARG_CAST
>- 
>diff --git a/textproc/libxml2/files/patch-configure b/textproc/libxml2/files/patch-configure
>deleted file mode 100644
>index 59a6d53a2ef6..000000000000
>--- a/textproc/libxml2/files/patch-configure
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- configure.orig	2019-10-30 19:14:22 UTC
>-+++ configure
>-@@ -15525,6 +15525,8 @@ fi
>- 	       fi
>- 	   fi
>-        ;;
>-+       *freebsd*) THREAD_LIBS=""
>-+       ;;
>-     esac
>-     if test "$WITH_THREADS" = "1" ; then
>- 	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
>diff --git a/textproc/libxml2/files/patch-git-106757e8c1e26ad9b8c924c7f304074b79e082c5 b/textproc/libxml2/files/patch-git-106757e8c1e26ad9b8c924c7f304074b79e082c5
>deleted file mode 100644
>index f4b1f8c56d0f..000000000000
>--- a/textproc/libxml2/files/patch-git-106757e8c1e26ad9b8c924c7f304074b79e082c5
>+++ /dev/null
>@@ -1,39 +0,0 @@
>-commit 106757e8c1e26ad9b8c924c7f304074b79e082c5
>-Author: Daniel Cheng <dcheng@google.com>
>-Date:   Fri Apr 10 14:52:03 2020 -0700
>-
>-    Guard new calls to xmlValidatePopElement in xml_reader.c
>-    
>-    Closes #154.
>-
>-commit 386fb27654b93d9fb2880e03fb508d618a2e66f1
>-Author: Åukasz WojniÅowicz <lukasz.wojnilowicz@gmail.com>
>-Date:   Tue Apr 28 17:00:37 2020 +0200
>-
>-    Add LIBXML_VALID_ENABLED to xmlreader
>-    
>-    There are already LIBXML_VALID_ENABLED in this file to guard against
>-    "--without-valid" at "./configure" step, but here they were missing.
>-diff --git xmlreader.c xmlreader.c
>-index 687c8b3c..3fd9aa4c 100644
>---- xmlreader.c
>-+++ xmlreader.c
>-@@ -2260,14 +2260,18 @@ xmlFreeTextReader(xmlTextReaderPtr reader) {
>-     if (reader->ctxt != NULL) {
>-         if (reader->dict == reader->ctxt->dict)
>- 	    reader->dict = NULL;
>-+#ifdef LIBXML_VALID_ENABLED
>- 	if ((reader->ctxt->vctxt.vstateTab != NULL) &&
>- 	    (reader->ctxt->vctxt.vstateMax > 0)){
>-+#ifdef LIBXML_REGEXP_ENABLED
>-             while (reader->ctxt->vctxt.vstateNr > 0)
>-                 xmlValidatePopElement(&reader->ctxt->vctxt, NULL, NULL, NULL);
>-+#endif /* LIBXML_REGEXP_ENABLED */
>- 	    xmlFree(reader->ctxt->vctxt.vstateTab);
>- 	    reader->ctxt->vctxt.vstateTab = NULL;
>- 	    reader->ctxt->vctxt.vstateMax = 0;
>- 	}
>-+#endif /* LIBXML_VALID_ENABLED */
>- 	if (reader->ctxt->myDoc != NULL) {
>- 	    if (reader->preserve == 0)
>- 		xmlTextReaderFreeDoc(reader, reader->ctxt->myDoc);
>diff --git a/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in b/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in
>deleted file mode 100644
>index 77dc8c19fd9c..000000000000
>--- a/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in
>+++ /dev/null
>@@ -1,9 +0,0 @@
>---- libxml-2.0-uninstalled.pc.in.orig	2016-02-09 10:17:32 UTC
>-+++ libxml-2.0-uninstalled.pc.in
>-@@ -8,5 +8,5 @@ Name: libXML
>- Version: @VERSION@
>- Description: libXML library version2.
>- Requires:
>--Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
>-+Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
>- Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@
>diff --git a/textproc/libxml2/files/patch-libxml-2.0.pc.in b/textproc/libxml2/files/patch-libxml-2.0.pc.in
>deleted file mode 100644
>index 1a4857175883..000000000000
>--- a/textproc/libxml2/files/patch-libxml-2.0.pc.in
>+++ /dev/null
>@@ -1,9 +0,0 @@
>---- libxml-2.0.pc.in.orig	2016-02-09 10:17:32 UTC
>-+++ libxml-2.0.pc.in
>-@@ -9,5 +9,5 @@ Version: @VERSION@
>- Description: libXML library version2.
>- Requires:
>- Libs: -L${libdir} -lxml2
>--Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
>-+Libs.private: @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
>- Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
>diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
>index 41a493d45155..372329c811ba 100644
>--- a/textproc/libxml2/pkg-plist
>+++ b/textproc/libxml2/pkg-plist
>@@ -1,62 +1,62 @@
> bin/xml2-config
> bin/xmlcatalog
> bin/xmllint
> include/libxml2/libxml/DOCBparser.h
> include/libxml2/libxml/HTMLparser.h
> include/libxml2/libxml/HTMLtree.h
> include/libxml2/libxml/SAX.h
> include/libxml2/libxml/SAX2.h
> include/libxml2/libxml/c14n.h
> include/libxml2/libxml/catalog.h
> include/libxml2/libxml/chvalid.h
> include/libxml2/libxml/debugXML.h
> include/libxml2/libxml/dict.h
> include/libxml2/libxml/encoding.h
> include/libxml2/libxml/entities.h
> include/libxml2/libxml/globals.h
> include/libxml2/libxml/hash.h
> include/libxml2/libxml/list.h
> include/libxml2/libxml/nanoftp.h
> include/libxml2/libxml/nanohttp.h
> include/libxml2/libxml/parser.h
> include/libxml2/libxml/parserInternals.h
> include/libxml2/libxml/pattern.h
> include/libxml2/libxml/relaxng.h
> include/libxml2/libxml/schemasInternals.h
> include/libxml2/libxml/schematron.h
> include/libxml2/libxml/threads.h
> include/libxml2/libxml/tree.h
> include/libxml2/libxml/uri.h
> include/libxml2/libxml/valid.h
> include/libxml2/libxml/xinclude.h
> include/libxml2/libxml/xlink.h
> include/libxml2/libxml/xmlIO.h
> include/libxml2/libxml/xmlautomata.h
> include/libxml2/libxml/xmlerror.h
> include/libxml2/libxml/xmlexports.h
> include/libxml2/libxml/xmlmemory.h
> include/libxml2/libxml/xmlmodule.h
> include/libxml2/libxml/xmlreader.h
> include/libxml2/libxml/xmlregexp.h
> include/libxml2/libxml/xmlsave.h
> include/libxml2/libxml/xmlschemas.h
> include/libxml2/libxml/xmlschemastypes.h
> include/libxml2/libxml/xmlstring.h
> include/libxml2/libxml/xmlunicode.h
> include/libxml2/libxml/xmlversion.h
> include/libxml2/libxml/xmlwriter.h
> include/libxml2/libxml/xpath.h
> include/libxml2/libxml/xpathInternals.h
> include/libxml2/libxml/xpointer.h
>+lib/cmake/libxml2/libxml2-config-version.cmake
>+lib/cmake/libxml2/libxml2-export-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/libxml2/libxml2-export.cmake
> lib/cmake/libxml2/libxml2-config.cmake
>-lib/libxml2.a
> lib/libxml2.so
> lib/libxml2.so.2
> lib/libxml2.so.%%LIBVERSION%%
> lib/xml2Conf.sh
> libdata/pkgconfig/libxml-2.0.pc
>-share/aclocal/libxml.m4
>-man/man1/xml2-config.1.gz
> man/man1/xmlcatalog.1.gz
> man/man1/xmllint.1.gz
> man/man3/libxml.3.gz

Actions: View | Diff

Attachments on bug 256078: 225170 | 225208