Attachment 252189 Details for Bug 279705 – Patch for libxml2 v8

[patch] Patch for libxml2 v8

libxml2-2132v3.patch (text/plain), 21.39 KB, created by Daniel Engberg on 2024-07-20 09:28:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-07-20 09:28:26 UTC

Size: 21.39 KB

patch

obsolete

>diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
>index 2d5623ef7b61..8017575befd3 100644
>--- a/textproc/libxml2/Makefile
>+++ b/textproc/libxml2/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	libxml2
>-DISTVERSION=	2.11.8
>+DISTVERSION=	2.13.2
> PORTREVISION?=	0
> CATEGORIES?=	textproc gnome
> MASTER_SITES=	GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
>@@ -27,20 +27,21 @@ CMAKE_TESTING_ON=	LIBXML2_WITH_TESTS
> 
> CMAKE_ARGS=	-DCMAKE_INSTALL_SYSCONFDIR=share
> CMAKE_OFF+=	LIBXML2_WITH_TESTS
>+CMAKE_ON+=	LIBXML2_WITH_HTTP \
>+		LIBXML2_WITH_LZMA \
>+		LIBXML2_WITH_ZLIB
> 
> PLIST_SUB+=	LIBVERSION=${DISTVERSION}
> 
>-OPTIONS_DEFINE=	DOCS ICU MEM_DEBUG READLINE THREAD_ALLOC
>+OPTIONS_DEFINE=	DOCS ICU READLINE THREAD_ALLOC
> OPTIONS_DEFAULT=	READLINE
> OPTIONS_SUB=		yes
> 
>-MEM_DEBUG_DESC=		Memory debugging (DEVELOPERS ONLY!)
> READLINE_DESC=		History for xmllint
> THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)
> 
> ICU_LIB_DEPENDS=		libicudata.so:devel/icu
> ICU_CMAKE_BOOL=			LIBXML2_WITH_ICU
>-MEM_DEBUG_CONFIGURE_WITH=	LIBXML2_WITH_MEM_DEBUG
> READLINE_LIB_DEPENDS=		libreadline.so:devel/readline
> READLINE_CMAKE_OFF=		-DHAVE_LIBHISTORY=false \
> 				-DHAVE_LIBREADLINE=false
>@@ -51,6 +52,8 @@ post-patch:
> 		's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \
> 		 s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \
> 		${WRKSRC}/doc/xmllint.1
>+	@${RM} ${PATCH_WRKSRC}/test/XInclude/docs/*.orig
>+	@${RM} ${PATCH_WRKSRC}/result/XInclude/*.orig
> 
> post-install:
> .if defined(LIBXML2_SLAVE)
>diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
>index d12bdcd5863c..a7136add2c9d 100644
>--- a/textproc/libxml2/distinfo
>+++ b/textproc/libxml2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1715748402
>-SHA256 (gnome/libxml2-2.11.8.tar.xz) = 53961af1721b72246180cd844b7ddae36ea8e1e4e27b683567990a1ee78b02c1
>-SIZE (gnome/libxml2-2.11.8.tar.xz) = 2628212
>+TIMESTAMP = 1720198491
>+SHA256 (gnome/libxml2-2.13.2.tar.xz) = e7c8f5e0b5542159e0ddc409c22c9164304b581eaa9930653a76fb845b169263
>+SIZE (gnome/libxml2-2.13.2.tar.xz) = 2580584
>diff --git a/textproc/libxml2/files/patch-CMakeLists.txt b/textproc/libxml2/files/patch-CMakeLists.txt
>deleted file mode 100644
>index 6926e72e1e54..000000000000
>--- a/textproc/libxml2/files/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,33 +0,0 @@
>---- CMakeLists.txt.orig	2023-08-11 18:59:11 UTC
>-+++ CMakeLists.txt
>-@@ -395,13 +395,17 @@ if(LIBXML2_WITH_ICU)
>- 	if(WIN32)
>- 		set(ICU_LIBS "-licudt -licuin -licuuc")
>- 	else()
>--		set(ICU_LIBS "-licudata -licui18n -licuuc")
>-+		set(ICU_LIBS_DIR "${ICU_INCLUDE_DIRS}")
>-+		STRING(REGEX REPLACE "include" "lib" ICU_LIBS_DIR ${ICU_LIBS_DIR})
>-+		set(ICU_LIBS "-L${ICU_LIBS_DIR} -licudata -licui18n -licuuc")
>- 	endif()
>- endif()
>- 
>- if(LIBXML2_WITH_LZMA)
>- 	target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA)
>--	set(LZMA_LIBS "-llzma")
>-+	set(LZMA_LIBS_DIR "${LIBLZMA_INCLUDE_DIRS}")
>-+	STRING(REGEX REPLACE "include" "lib" LZMA_LIBS_DIR ${LZMA_LIBS_DIR})
>-+	set(LZMA_LIBS "-L${LZMA_LIBS_DIR} -llzma")
>- endif()
>- 
>- if(LIBXML2_WITH_THREADS)
>-@@ -411,7 +415,9 @@ endif()
>- 
>- if(LIBXML2_WITH_ZLIB)
>- 	target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB)
>--	set(Z_LIBS "-lz")
>-+	set(Z_LIBS_DIR "${ZLIB_INCLUDE_DIRS}")
>-+	STRING(REGEX REPLACE "include" "lib" Z_LIBS_DIR ${Z_LIBS_DIR})
>-+	set(Z_LIBS "-L${Z_LIBS_DIR} -lz")
>- endif()
>- 
>- set_target_properties(
>diff --git a/textproc/libxml2/files/patch-git-01-600c6ca4bcefc9abcba7aadf4e1a172d19ef39d4 b/textproc/libxml2/files/patch-git-01-600c6ca4bcefc9abcba7aadf4e1a172d19ef39d4
>new file mode 100644
>index 000000000000..e85aeb07b078
>--- /dev/null
>+++ b/textproc/libxml2/files/patch-git-01-600c6ca4bcefc9abcba7aadf4e1a172d19ef39d4
>@@ -0,0 +1,25 @@
>+From 600c6ca4bcefc9abcba7aadf4e1a172d19ef39d4 Mon Sep 17 00:00:00 2001
>+From: Daniel E <daniel.engberg.lists@pyret.net>
>+Date: Sun, 23 Jun 2024 12:16:47 +0000
>+Subject: [PATCH] cmake: Don't install meson build scripts in documentation
>+
>+Add meson.build files as exclusions
>+---
>+ CMakeLists.txt | 1 +
>+ 1 file changed, 1 insertion(+)
>+
>+diff --git a/CMakeLists.txt b/CMakeLists.txt
>+index a207e1453..168b7c92d 100644
>+--- CMakeLists.txt
>++++ CMakeLists.txt
>+@@ -550,6 +550,7 @@ install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONEN
>+ install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
>+ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT documentation
>+     PATTERN "Makefile.*" EXCLUDE
>++    PATTERN "meson.build" EXCLUDE
>+     PATTERN "*.1" EXCLUDE
>+     PATTERN "*.py" EXCLUDE
>+     PATTERN "*.res" EXCLUDE
>+-- 
>+GitLab
>+
>diff --git a/textproc/libxml2/files/patch-git-02-dd5adf54c9a2edd452ff828277d85b1d18431d75 b/textproc/libxml2/files/patch-git-02-dd5adf54c9a2edd452ff828277d85b1d18431d75
>new file mode 100644
>index 000000000000..59f5b9d4eb59
>--- /dev/null
>+++ b/textproc/libxml2/files/patch-git-02-dd5adf54c9a2edd452ff828277d85b1d18431d75
>@@ -0,0 +1,25 @@
>+From dd5adf54c9a2edd452ff828277d85b1d18431d75 Mon Sep 17 00:00:00 2001
>+From: Nick Wellnhofer <wellnhofer@aevum.de>
>+Date: Sat, 6 Jul 2024 20:24:19 +0200
>+Subject: [PATCH] Undeprecate xmlKeepBlanksDefault
>+
>+---
>+ include/libxml/parser.h | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+diff --git a/include/libxml/parser.h b/include/libxml/parser.h
>+index ad8ca4d58..78d29cada 100644
>+--- include/libxml/parser.h
>++++ include/libxml/parser.h
>+@@ -948,7 +948,7 @@ XML_DEPRECATED XMLPUBFUN int
>+ 		xmlSubstituteEntitiesDefault(int val);
>+ XML_DEPRECATED XMLPUBFUN int
>+                 xmlThrDefSubstituteEntitiesDefaultValue(int v);
>+-XML_DEPRECATED XMLPUBFUN int
>++XMLPUBFUN int
>+ 		xmlKeepBlanksDefault	(int val);
>+ XML_DEPRECATED XMLPUBFUN int
>+ 		xmlThrDefKeepBlanksDefaultValue(int v);
>+-- 
>+GitLab
>+
>diff --git a/textproc/libxml2/files/patch-git-03-e30cb632e734394ddbd7bd62b57cee3586424352 b/textproc/libxml2/files/patch-git-03-e30cb632e734394ddbd7bd62b57cee3586424352
>new file mode 100644
>index 000000000000..b4a265f5a2b0
>--- /dev/null
>+++ b/textproc/libxml2/files/patch-git-03-e30cb632e734394ddbd7bd62b57cee3586424352
>@@ -0,0 +1,32 @@
>+From e30cb632e734394ddbd7bd62b57cee3586424352 Mon Sep 17 00:00:00 2001
>+From: Nick Wellnhofer <wellnhofer@aevum.de>
>+Date: Mon, 8 Jul 2024 11:23:39 +0200
>+Subject: [PATCH] parser: Fix error return of xmlParseBalancedChunkMemory
>+
>+Only return an error code if the chunk is not well-formed to match the
>+2.12 behavior. Return 0 on non-fatal errors like invalid namespaces.
>+
>+Fixes #765.
>+---
>+ parser.c | 5 ++++-
>+ 1 file changed, 4 insertions(+), 1 deletion(-)
>+
>+diff --git a/parser.c b/parser.c
>+index 1a0ff156c..436b65047 100644
>+--- parser.c
>++++ parser.c
>+@@ -12535,7 +12535,10 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax,
>+     else
>+         xmlFreeNodeList(list);
>+ 
>+-    ret = ctxt->errNo;
>++    if (!ctxt->wellFormed)
>++        ret = ctxt->errNo;
>++    else
>++        ret = XML_ERR_OK;
>+ 
>+     xmlFreeInputStream(input);
>+     xmlFreeParserCtxt(ctxt);
>+-- 
>+GitLab
>+
>diff --git a/textproc/libxml2/files/patch-git-04-bf43e8a888cbee75e13622fea8a722b9d166c437 b/textproc/libxml2/files/patch-git-04-bf43e8a888cbee75e13622fea8a722b9d166c437
>new file mode 100644
>index 000000000000..c16c1d0b0b6a
>--- /dev/null
>+++ b/textproc/libxml2/files/patch-git-04-bf43e8a888cbee75e13622fea8a722b9d166c437
>@@ -0,0 +1,99 @@
>+From bf43e8a888cbee75e13622fea8a722b9d166c437 Mon Sep 17 00:00:00 2001
>+From: Nick Wellnhofer <wellnhofer@aevum.de>
>+Date: Tue, 9 Jul 2024 12:29:53 +0200
>+Subject: [PATCH] io: Fix return value of xmlFileRead
>+
>+This broke in commit 6d27c54.
>+
>+Fixes #766.
>+---
>+ CMakeLists.txt |  2 +-
>+ testparser.c   | 31 +++++++++++++++++++++++++++++++
>+ xmlIO.c        |  2 +-
>+ 3 files changed, 33 insertions(+), 2 deletions(-)
>+
>+diff --git a/CMakeLists.txt b/CMakeLists.txt
>+index 723e23442..f99fd368f 100644
>+--- CMakeLists.txt
>++++ CMakeLists.txt
>+@@ -528,7 +528,7 @@ if(LIBXML2_WITH_TESTS)
>+     endif()
>+     add_test(NAME testchar COMMAND testchar)
>+     add_test(NAME testdict COMMAND testdict)
>+-    add_test(NAME testparser COMMAND testparser)
>++    add_test(NAME testparser COMMAND testparser WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
>+     add_test(NAME testrecurse COMMAND testrecurse WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
>+     add_test(NAME testThreads COMMAND testThreads WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
>+ endif()
>+diff --git a/testparser.c b/testparser.c
>+index 81eb24398..1f8e58c44 100644
>+--- testparser.c
>++++ testparser.c
>+@@ -4,6 +4,8 @@
>+  * See Copyright for the status of this software.
>+  */
>+ 
>++#define XML_DEPRECATED
>++
>+ #include <libxml/parser.h>
>+ #include <libxml/uri.h>
>+ #include <libxml/xmlreader.h>
>+@@ -95,6 +97,34 @@ testNodeGetContent(void) {
>+     return err;
>+ }
>+ 
>++static int
>++testCFileIO(void) {
>++    xmlDocPtr doc;
>++    int err = 0;
>++
>++    /* Deprecated FILE-based API */
>++    xmlRegisterInputCallbacks(xmlFileMatch, xmlFileOpen, xmlFileRead,
>++                              xmlFileClose);
>++    doc = xmlReadFile("test/ent1", NULL, 0);
>++
>++    if (doc == NULL) {
>++        err = 1;
>++    } else {
>++        xmlNodePtr root = xmlDocGetRootElement(doc);
>++
>++        if (root == NULL || !xmlStrEqual(root->name, BAD_CAST "EXAMPLE"))
>++            err = 1;
>++    }
>++
>++    xmlFreeDoc(doc);
>++    xmlPopInputCallbacks();
>++
>++    if (err)
>++        fprintf(stderr, "xmlReadFile failed with FILE input callbacks\n");
>++
>++    return err;
>++}
>++
>+ #ifdef LIBXML_SAX1_ENABLED
>+ static int
>+ testBalancedChunk(void) {
>+@@ -540,6 +570,7 @@ main(void) {
>+     err |= testStandaloneWithEncoding();
>+     err |= testUnsupportedEncoding();
>+     err |= testNodeGetContent();
>++    err |= testCFileIO();
>+ #ifdef LIBXML_SAX1_ENABLED
>+     err |= testBalancedChunk();
>+ #endif
>+diff --git a/xmlIO.c b/xmlIO.c
>+index 640d909c4..5bac7130d 100644
>+--- xmlIO.c
>++++ xmlIO.c
>+@@ -776,7 +776,7 @@ xmlFileRead(void * context, char * buffer, int len) {
>+     if ((bytes < (size_t) len) && (ferror(file)))
>+         return(-xmlIOErr(0, "fread()"));
>+ 
>+-    return(len);
>++    return(bytes);
>+ }
>+ 
>+ #ifdef LIBXML_OUTPUT_ENABLED
>+-- 
>+GitLab
>+
>diff --git a/textproc/libxml2/files/patch-git-05-8699ba234b5a1328f0f30ca739b8f1dbc90ccf5e b/textproc/libxml2/files/patch-git-05-8699ba234b5a1328f0f30ca739b8f1dbc90ccf5e
>new file mode 100644
>index 000000000000..45c06ed554d9
>--- /dev/null
>+++ b/textproc/libxml2/files/patch-git-05-8699ba234b5a1328f0f30ca739b8f1dbc90ccf5e
>@@ -0,0 +1,32 @@
>+From 8699ba234b5a1328f0f30ca739b8f1dbc90ccf5e Mon Sep 17 00:00:00 2001
>+From: Nick Wellnhofer <wellnhofer@aevum.de>
>+Date: Thu, 18 Jul 2024 01:54:22 +0200
>+Subject: [PATCH] io: Don't call getcwd in xmlParserGetDirectory
>+
>+The "directory" value isn't used internally. Calling getcwd is
>+unnecessary and can cause problems in sandboxed environments.
>+
>+Fixes #770.
>+---
>+ xmlIO.c | 5 +----
>+ 1 file changed, 1 insertion(+), 4 deletions(-)
>+
>+diff --git a/xmlIO.c b/xmlIO.c
>+index 5bac7130d..421e12593 100644
>+--- xmlIO.c
>++++ xmlIO.c
>+@@ -2904,10 +2904,7 @@ xmlParserGetDirectory(const char *filename) {
>+ 	else *cur = 0;
>+ 	ret = xmlMemStrdup(dir);
>+     } else {
>+-        if (getcwd(dir, 1024) != NULL) {
>+-	    dir[1023] = 0;
>+-	    ret = xmlMemStrdup(dir);
>+-	}
>++        ret = xmlMemStrdup(".");
>+     }
>+     return(ret);
>+ #undef IS_XMLPGD_SEP
>+-- 
>+GitLab
>+
>diff --git a/textproc/libxml2/files/patch-git-06-a0330b53c8034bb79220e403e8d4ad8c23ef088f b/textproc/libxml2/files/patch-git-06-a0330b53c8034bb79220e403e8d4ad8c23ef088f
>new file mode 100644
>index 000000000000..d94ccf42e39c
>--- /dev/null
>+++ b/textproc/libxml2/files/patch-git-06-a0330b53c8034bb79220e403e8d4ad8c23ef088f
>@@ -0,0 +1,84 @@
>+From a0330b53c8034bb79220e403e8d4ad8c23ef088f Mon Sep 17 00:00:00 2001
>+From: Nick Wellnhofer <wellnhofer@aevum.de>
>+Date: Thu, 18 Jul 2024 19:27:43 +0200
>+Subject: [PATCH] xinclude: Fix fallback for text includes
>+
>+Fixes #772.
>+---
>+ result/XInclude/fallback8.xml     | 4 ++++
>+ result/XInclude/fallback8.xml.err | 1 +
>+ result/XInclude/fallback8.xml.rdr | 7 +++++++
>+ test/XInclude/docs/fallback8.xml  | 7 +++++++
>+ xinclude.c                        | 7 ++++++-
>+ 5 files changed, 25 insertions(+), 1 deletion(-)
>+ create mode 100644 result/XInclude/fallback8.xml
>+ create mode 100644 result/XInclude/fallback8.xml.err
>+ create mode 100644 result/XInclude/fallback8.xml.rdr
>+ create mode 100644 test/XInclude/docs/fallback8.xml
>+
>+diff --git a/result/XInclude/fallback8.xml b/result/XInclude/fallback8.xml
>+new file mode 100644
>+index 000000000..1b2508f87
>+--- /dev/null
>++++ result/XInclude/fallback8.xml
>+@@ -0,0 +1,4 @@
>++<?xml version="1.0"?>
>++<doc>
>++    text not found
>++</doc>
>+diff --git a/result/XInclude/fallback8.xml.err b/result/XInclude/fallback8.xml.err
>+new file mode 100644
>+index 000000000..4327677f5
>+--- /dev/null
>++++ result/XInclude/fallback8.xml.err
>+@@ -0,0 +1 @@
>++I/O warning : failed to load "test/XInclude/docs/404.txt": No such file or directory
>+diff --git a/result/XInclude/fallback8.xml.rdr b/result/XInclude/fallback8.xml.rdr
>+new file mode 100644
>+index 000000000..f99d17e80
>+--- /dev/null
>++++ result/XInclude/fallback8.xml.rdr
>+@@ -0,0 +1,7 @@
>++0 1 doc 0 0
>++1 14 #text 0 1 
>++    
>++1 3 #text 0 1 text not found
>++1 14 #text 0 1 
>++
>++0 15 doc 0 0
>+diff --git a/test/XInclude/docs/fallback8.xml b/test/XInclude/docs/fallback8.xml
>+new file mode 100644
>+index 000000000..102ccfc0f
>+--- /dev/null
>++++ test/XInclude/docs/fallback8.xml
>+@@ -0,0 +1,7 @@
>++<?xml version="1.0"?>
>++<doc>
>++    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="404.txt" parse="text">
>++        <xi:fallback>text not found</xi:fallback>
>++    </xi:include>
>++</doc>
>++
>+diff --git a/xinclude.c b/xinclude.c
>+index 103fb54da..faf22883b 100644
>+--- xinclude.c
>++++ xinclude.c
>+@@ -1655,9 +1655,14 @@ xmlXIncludeLoadTxt(xmlXIncludeCtxtPtr ctxt, xmlXIncludeRefPtr ref) {
>+     }
>+     inputStream = xmlLoadExternalEntity((const char*)url, NULL, pctxt);
>+     if (inputStream == NULL) {
>++        /*
>++         * ENOENT only produces a warning which isn't reflected in errNo.
>++         */
>+         if (pctxt->errNo == XML_ERR_NO_MEMORY)
>+             xmlXIncludeErrMemory(ctxt);
>+-        else
>++        else if ((pctxt->errNo != XML_ERR_OK) &&
>++                 (pctxt->errNo != XML_IO_ENOENT) &&
>++                 (pctxt->errNo != XML_IO_UNKNOWN))
>+             xmlXIncludeErr(ctxt, NULL, pctxt->errNo, "load error", NULL);
>+ 	goto error;
>+     }
>+-- 
>+GitLab
>+
>diff --git a/textproc/libxml2/files/patch-git-07-ed8b4264f65b1ced1e3b13967dd1cf90102cfa40 b/textproc/libxml2/files/patch-git-07-ed8b4264f65b1ced1e3b13967dd1cf90102cfa40
>new file mode 100644
>index 000000000000..2543ed0eb248
>--- /dev/null
>+++ b/textproc/libxml2/files/patch-git-07-ed8b4264f65b1ced1e3b13967dd1cf90102cfa40
>@@ -0,0 +1,25 @@
>+From ed8b4264f65b1ced1e3b13967dd1cf90102cfa40 Mon Sep 17 00:00:00 2001
>+From: Nick Wellnhofer <wellnhofer@aevum.de>
>+Date: Thu, 18 Jul 2024 20:56:31 +0200
>+Subject: [PATCH] xinclude: Set error handler when parsing text
>+
>+---
>+ xinclude.c | 2 ++
>+ 1 file changed, 2 insertions(+)
>+
>+diff --git a/xinclude.c b/xinclude.c
>+index faf22883b..6c1e3ace6 100644
>+--- xinclude.c
>++++ xinclude.c
>+@@ -1653,6 +1653,8 @@ xmlXIncludeLoadTxt(xmlXIncludeCtxtPtr ctxt, xmlXIncludeRefPtr ref) {
>+         xmlXIncludeErrMemory(ctxt);
>+         goto error;
>+     }
>++    if (ctxt->errorHandler != NULL)
>++        xmlCtxtSetErrorHandler(pctxt, ctxt->errorHandler, ctxt->errorCtxt);
>+     inputStream = xmlLoadExternalEntity((const char*)url, NULL, pctxt);
>+     if (inputStream == NULL) {
>+         /*
>+-- 
>+GitLab
>+
>diff --git a/textproc/libxml2/files/patch-python_libxml.c b/textproc/libxml2/files/patch-python_libxml.c
>index 7bbc98d75033..cede7f2ef32d 100644
>--- a/textproc/libxml2/files/patch-python_libxml.c
>+++ b/textproc/libxml2/files/patch-python_libxml.c
>@@ -1,26 +1,23 @@
>---- python/libxml.c.orig	2023-08-11 20:30:35 UTC
>+--- python/libxml.c.orig	2024-06-12 11:17:43 UTC
> +++ python/libxml.c
>-@@ -1606,12 +1606,19 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
>+@@ -1491,6 +1491,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
>      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);
>+@@ -1502,12 +1503,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
>+ 	    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++;
>++        /* Ensure the error string doesn't start at UTF8 continuation. */
>++        while (*ptr && (*ptr & 0xc0) == 0x80)
>++            ptr++;
> +#endif
>- 
> +
>-     if (libxml_xmlPythonErrorFuncHandler == NULL) {
>-         va_start(ap, msg);
>-         vfprintf(stderr, msg, ap);
>-@@ -1625,9 +1632,11 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
>          list = PyTuple_New(2);
>          PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
>          Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
>diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
>index 8d53acb96cd1..7576a33ee2a3 100644
>--- a/textproc/libxml2/pkg-plist
>+++ b/textproc/libxml2/pkg-plist
>@@ -113,70 +113,5 @@ share/aclocal/libxml.m4
> %%PORTDOCS%%%%DOCSDIR%%/devhelp/right.png
> %%PORTDOCS%%%%DOCSDIR%%/devhelp/style.css
> %%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png
>-%%PORTDOCS%%%%DOCSDIR%%/examples/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/examples/io1.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/io2.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/parse1.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/parse2.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/parse3.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/parse4.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/reader1.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/reader2.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/reader3.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/reader4.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/testWriter.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/tree1.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/tree2.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/xpath1.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/xpath2.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apa.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apb.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apc.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apd.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ape.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apf.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apg.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/aph.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/api.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s02.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s03.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s04.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s05.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s06.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s07.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s08.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s09.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/blank.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/1.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/10.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/2.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/3.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/4.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/5.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/6.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/7.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/8.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/9.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/caution.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/draft.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/home.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/important.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/next.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/note.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/prev.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/tip.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-blank.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-minus.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-plus.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/up.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/warning.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddattribute.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddkeyword.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeconvert.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includegetattribute.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includekeyword.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includexpath.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ix01.html
> %%PORTDOCS%%%%DOCSDIR%%/xmlcatalog.html
> %%PORTDOCS%%%%DOCSDIR%%/xmllint.html
>diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
>index 84796bac21b3..7b94436369d1 100644
>--- a/textproc/py-libxml2/Makefile
>+++ b/textproc/py-libxml2/Makefile
>@@ -1,28 +1,23 @@
>-PORTREVISION=	1
>+PORTREVISION=	0
> CATEGORIES=	textproc gnome python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> COMMENT=	Python interface for XML parser library for GNOME
>+MASTERDIR=	${.CURDIR}/../libxml2
> 
> USES+=		gnome python shebangfix
> USE_GNOME=	libxml2
> USE_PYTHON=	flavors
> SHEBANG_FILES=	*.py doc/*.py python/*.py python/tests/*.py
> 
>-# Help CMake determine the correct version of Python if
>-# multiple versions are installed
>-CMAKE_ARGS=	-DPython_EXECUTABLE=${PYTHON_CMD}
>-
>-MASTERDIR=	${.CURDIR}/../libxml2
>+# Tell master port we're a slave port
>+LIBXML2_SLAVE=	python
> 
> DESCR=		${.CURDIR}/pkg-descr
> PLIST=		${.CURDIR}/pkg-plist
> 
> OPTIONS_EXCLUDE=	${OPTIONS_DEFINE}
> 
>-# Tell master port we're a slave port
>-LIBXML2_SLAVE=	python
>-
> do-install:
> 		${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
> 		${INSTALL_SCRIPT} ${WRKSRC}/python/drv_libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}

Actions: View | Diff

Attachments on bug 279705: 251428 | 251475 | 251491 | 251599 | 251644 | 251885 | 252032 | 252033 | 252189 | 252261 | 253697 | 255146