Attachment #245097 for bug #273210




PORTNAME=	libxml2
DISTVERSION=	2.11.5
PORTREVISION?=	0
CATEGORIES?=	textproc gnome
MASTER_SITES=	GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
DIST_SUBDIR=	gnome


LICENSE=	MIT

# Upstream offers autotools and CMake, but CMake support is incomplete
# on Unix-like systems
# port has many consumers of its core functionality. Some such
# consumers, especially when optioned appropriately (and users have
# a right to do so), may become dependencies of dependencies of CMake.
# Additionally, some consumers rely on symbol versioning that CMake
# does not support (as of Q2 2022) without a hack. Please consider the
# effects of the ecosystem and technical merits before considering
# switching build systems again. Any changes to this end not dogfooded
# thoroughly may be reverted.
USES+=		cpe iconv libtool localbase pathfix pkgconfig tar:xz
CPE_VENDOR=	xmlsoft
USE_LDCONFIG=	yes

Lines 1-3 Link Here

(-)b/textproc/libxml2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1681763197	1	TIMESTAMP = 1695185335
2	SHA256 (gnome/libxml2-2.10.4.tar.xz) = ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45	2	SHA256 (gnome/libxml2-2.11.5.tar.xz) = 3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6
3	SIZE (gnome/libxml2-2.10.4.tar.xz) = 2643600	3	SIZE (gnome/libxml2-2.11.5.tar.xz) = 2628132




--- Makefile.in.orig	2023-08-09 12:39:34 UTC
+++ Makefile.in
@@ -1114,7 +1114,7 @@ am--depfiles: $(am__depfiles_remade)
 am--depfiles: $(am__depfiles_remade)
 runtest_SOURCES = runtest.c
 runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
-runtest_LDFLAGS = 
+runtest_LDFLAGS = -pthread
 runtest_DEPENDENCIES = $(DEPS)
 runtest_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)
 testrecurse_SOURCES = testrecurse.c
@@ -741,7 +741,7 @@ testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
 xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)
 testThreads_SOURCES = testThreads.c
 testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
-testThreads_LDFLAGS = 
+testThreads_LDFLAGS = -pthread
 testThreads_DEPENDENCIES = $(DEPS)
 testThreads_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)
 testAutomata_SOURCES = testAutomata.c
@@ -1146,7 +1146,7 @@ am--depfiles: $(am__depfiles_remade)
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -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)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -1913,7 +1913,7 @@ check: check-recursive
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive




--- config.h.in.orig	2022-08-25 11:16:02 UTC
+++ config.h.in
@@ -3,6 +3,9 @@
 /* A form that will not confuse apibuild.py */
 #undef ATTRIBUTE_DESTRUCTOR
 
+/* XXX */
+#define HAVE_VFSCANF
+
 /* Type cast for the gethostbyname() argument */
 #undef GETHOSTBYNAME_ARG_CAST
 

Removed Link Here

(-)a/textproc/libxml2/files/patch-configure (-11 lines)
1	--- configure.orig 2022-08-25 11:16:02 UTC
2	+++ configure
3	@@ -15204,6 +15204,8 @@ fi
4	fi
5	fi
6	;;
7	+ freebsd) THREAD_LIBS=""
8	+ ;;
9	esac
10	if test "$WITH_THREADS" = "1" ; then
11	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"




# Workaround https://bugzilla.gnome.org/show_bug.cgi?id=789714
# Obtained from openSuse / Fedora

--- python/libxml.c.orig	2023-08-11 20:30:35 UTC
+++ python/libxml.c
@@ -1606,12 +1606,19 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
     PyObject *message;
     PyObject *result;
     char str[1000];

 
 #ifdef DEBUG_ERROR
     printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
 #endif
 	    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
 
+
     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);
-        message = libxml_charPtrConstWrap(str);
+        message = libxml_charPtrConstWrap(ptr);
         PyTuple_SetItem(list, 1, message);
         result = PyObject_CallObject(libxml_xmlPythonErrorFuncHandler, list);
+        /* Forget any errors caused in the error handler. */
+        PyErr_Clear();
         Py_XDECREF(list);
- 

Return to bug 273210

Lines 1-6 Link Here

(-)b/textproc/libxml2/Makefile (-12 / +4 lines)
1	PORTNAME= libxml2	1	PORTNAME= libxml2
2	DISTVERSION= 2.10.4	2	DISTVERSION= 2.11.5
3	PORTREVISION?= 1	3	PORTREVISION?= 0
4	CATEGORIES?= textproc gnome	4	CATEGORIES?= textproc gnome
5	MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/	5	MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
6	DIST_SUBDIR= gnome	6	DIST_SUBDIR= gnome
Lines 11-26 WWW= http://xmlsoft.org/ Link Here
11		11
12	LICENSE= MIT	12	LICENSE= MIT
13		13
14	# Upstream offers CMake in addition to autotools, but we use the latter.	14	# Upstream offers autotools and CMake, but CMake support is incomplete
15	# CMake is a heavy build system, heavier than autotools, and this	15	# on Unix-like systems
16	# port has many consumers of its core functionality. Some such
17	# consumers, especially when optioned appropriately (and users have
18	# a right to do so), may become dependencies of dependencies of CMake.
19	# Additionally, some consumers rely on symbol versioning that CMake
20	# does not support (as of Q2 2022) without a hack. Please consider the
21	# effects of the ecosystem and technical merits before considering
22	# switching build systems again. Any changes to this end not dogfooded
23	# thoroughly may be reverted.
24	USES+= cpe iconv libtool localbase pathfix pkgconfig tar:xz	16	USES+= cpe iconv libtool localbase pathfix pkgconfig tar:xz
25	CPE_VENDOR= xmlsoft	17	CPE_VENDOR= xmlsoft
26	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes

Lines 1-33 Link Here

(-)b/textproc/libxml2/files/patch-Makefile.in (-26 / +8 lines)
1	--- Makefile.in.orig 2022-08-25 18:24:09 UTC	1	--- Makefile.in.orig 2023-08-09 12:39:34 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -708,7 +708,7 @@ runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)	3	@@ -1114,7 +1114,7 @@ am--depfiles: $(am__depfiles_remade)
4	m4data_DATA = libxml.m4	4	am--depfiles: $(am__depfiles_remade)
5	runtest_SOURCES = runtest.c
6	runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
7	-runtest_LDFLAGS =
8	+runtest_LDFLAGS = -pthread
9	runtest_DEPENDENCIES = $(DEPS)
10	runtest_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)
11	testrecurse_SOURCES = testrecurse.c
12	@@ -741,7 +741,7 @@ testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
13	xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)
14	testThreads_SOURCES = testThreads.c
15	testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
16	-testThreads_LDFLAGS =
17	+testThreads_LDFLAGS = -pthread
18	testThreads_DEPENDENCIES = $(DEPS)
19	testThreads_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)
20	testAutomata_SOURCES = testAutomata.c
21	@@ -1146,7 +1146,7 @@ am--depfiles: $(am__depfiles_remade)
22	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
23		5
24	.c.lo:	6	.c.o:
25	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<	7	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
26	+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<	8	+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
27	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Plo	9	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Po
28	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@	10	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
29	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@	11	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30	@@ -1898,7 +1898,7 @@ check: check-recursive	12	@@ -1913,7 +1913,7 @@ check: check-recursive
31	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)	13	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
32	$(MAKE) $(AM_MAKEFLAGS) check-local	14	$(MAKE) $(AM_MAKEFLAGS) check-local
33	check: check-recursive	15	check: check-recursive

Removed Link Here

(-)a/textproc/libxml2/files/patch-config.h.in (-12 lines)
1	--- config.h.in.orig 2022-08-25 11:16:02 UTC
2	+++ config.h.in
3	@@ -3,6 +3,9 @@
4	/* A form that will not confuse apibuild.py */
5	#undef ATTRIBUTE_DESTRUCTOR
6
7	+/* XXX */
8	+#define HAVE_VFSCANF
9	+
10	/* Type cast for the gethostbyname() argument */
11	#undef GETHOSTBYNAME_ARG_CAST
12

Lines 1-9 Link Here

(-)b/textproc/libxml2/files/patch-python_libxml.c (-10 / +12 lines)
1	# Workaround https://bugzilla.gnome.org/show_bug.cgi?id=789714	1	# Workaround https://bugzilla.gnome.org/show_bug.cgi?id=789714
2	# Obtained from openSuse / Fedora	2	# Obtained from openSuse / Fedora
3		3
4	--- python/libxml.c.orig 2016-06-07 10:04:14 UTC	4	--- python/libxml.c.orig 2023-08-11 20:30:35 UTC
5	+++ python/libxml.c	5	+++ python/libxml.c
6	@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU	6	@@ -1606,12 +1606,19 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
7	PyObject *message;	7	PyObject *message;
8	PyObject *result;	8	PyObject *result;
9	char str[1000];	9	char str[1000];
Lines 11-33 Link Here
11		11
12	#ifdef DEBUG_ERROR	12	#ifdef DEBUG_ERROR
13	printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);	13	printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
14	@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU	14	#endif
15	str[999] = 0;
16	va_end(ap);
17		15
18	+#if PY_MAJOR_VERSION >= 3	16	+#if PY_MAJOR_VERSION >= 3
19	+ /* Ensure the error string doesn't start at UTF8 continuation. */	17	+ /* Ensure the error string doesn't start at UTF8 continuation. */
20	+ while (ptr && (ptr & 0xc0) == 0x80)	18	+ while (ptr && (ptr & 0xc0) == 0x80)
21	+ ptr++;	19	+ ptr++;
22	+#endif	20	+#endif
		21
23	+	22	+
		23	if (libxml_xmlPythonErrorFuncHandler == NULL) {
		24	va_start(ap, msg);
		25	vfprintf(stderr, msg, ap);
		26	@@ -1625,9 +1632,11 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
24	list = PyTuple_New(2);	27	list = PyTuple_New(2);
25	PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);	28	PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
26	Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);	29	Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
27	- message = libxml_charPtrConstWrap(str);	30	- message = libxml_charPtrConstWrap(str);
28	+ message = libxml_charPtrConstWrap(ptr);	31	+ message = libxml_charPtrConstWrap(ptr);
29	PyTuple_SetItem(list, 1, message);	32	PyTuple_SetItem(list, 1, message);
30	result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);	33	result = PyObject_CallObject(libxml_xmlPythonErrorFuncHandler, list);
31	+ /* Forget any errors caused in the error handler. */	34	+ /* Forget any errors caused in the error handler. */
32	+ PyErr_Clear();	35	+ PyErr_Clear();
33	Py_XDECREF(list);	36	Py_XDECREF(list);
34	-