Attachment #241722 for bug #270906




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

# thoroughly may be reverted.
USES+=		cpe iconv libtool localbase pathfix pkgconfig tar:xz
CPE_VENDOR=	xmlsoft
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
# Don't build with Python support unless requested
CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/share/ \
		--with-lzma=/usr \
		--${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U}

INSTALL_TARGET=	install-strip
TEST_TARGET=	check

PLIST_SUB+=	LIBVERSION=${DISTVERSION}

# Don't build with Python support unless requested
CONFIGURE_ARGS=		--sysconfdir=${PREFIX}/share/ \
			--with-lzma=/usr \
			--${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U}

OPTIONS_DEFINE=	DOCS ICU MEM_DEBUG READLINE STATIC THREAD_ALLOC
OPTIONS_DEFAULT=	READLINE STATIC
OPTIONS_SUB=		yes

THREAD_ALLOC_CONFIGURE_WITH=	thread-alloc

post-patch:
.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}/doc/xmllint.1
.endfor

.if !defined(LIBXML2_SLAVE)
post-install:
.if !defined(LIBXML2_SLAVE)
# Documentation should be in DOCSDIR
	@${MV} ${STAGEDIR}${PREFIX}/share/gtk-doc/html/libxml2 \
		${STAGEDIR}${DOCSDIR}/devhelp
	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
# Install remaining documentation that's not connected to autotools
	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
.else
	${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/site-packages/libxml2mod${PYTHON_EXT_SUFFIX}.so
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1665950945	1	TIMESTAMP = 1681769965
2	SHA256 (gnome/libxml2-2.10.3.tar.xz) = 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c	2	SHA256 (gnome/libxml2-2.10.4.tar.xz) = ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45
3	SIZE (gnome/libxml2-2.10.3.tar.xz) = 2639908	3	SIZE (gnome/libxml2-2.10.4.tar.xz) = 2643600




--- Makefile.in.orig	2023-04-17 23:41:26 UTC
+++ Makefile.in
@@ -711,7 +711,7 @@ m4datadir = $(datadir)/aclocal
 m4data_DATA = libxml.m4
 runtest_SOURCES = runtest.c
 runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)

 runtest_DEPENDENCIES = $(DEPS)
 runtest_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)
 testrecurse_SOURCES = testrecurse.c
@@ -744,7 +744,7 @@ xmlcatalog_DEPENDENCIES = $(DEPS)
 xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)
 testThreads_SOURCES = testThreads.c
 testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)

 testThreads_DEPENDENCIES = $(DEPS)
 testThreads_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)
 testAutomata_SOURCES = testAutomata.c
@@ -1149,7 +1149,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_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@
@@ -1906,7 +1906,7 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive

Lines 1-6 Link Here

(-)./files/patch-configure (-2 / +2 lines)
1	--- configure.orig 2022-08-25 11:16:02 UTC	1	--- configure.orig 2023-04-11 11:28:12 UTC
2	+++ configure	2	+++ configure
3	@@ -15204,6 +15204,8 @@ fi	3	@@ -16008,6 +16008,8 @@ fi
4	fi	4	fi
5	fi	5	fi
6	;;	6	;;




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

--- python/libxml.c.orig	2023-04-11 10:36:35 UTC
+++ python/libxml.c
@@ -1621,6 +1621,7 @@ 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);
@@ -1637,12 +1638,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
 	    str[999] = 0;
         va_end(ap);
 

Lines 12-20 bogus values when called with URIs that have rootless Link Here

(-)./files/patch-uri.c (-2 / +2 lines)
12	(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be	12	(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be
13	correct)	13	correct)
14		14
15	--- uri.c.orig 2019-10-22 18:46:01 UTC	15	--- uri.c.orig 2023-04-11 10:36:35 UTC
16	+++ uri.c	16	+++ uri.c
17	@@ -1201,6 +1201,8 @@ xmlSaveUri(xmlURIPtr uri) {	17	@@ -1207,6 +1207,8 @@ xmlSaveUri(xmlURIPtr uri) {
18	if (temp == NULL) goto mem_error;	18	if (temp == NULL) goto mem_error;
19	ret = temp;	19	ret = temp;
20	}	20	}

Return to bug 270906

Lines 1-6 Link Here

(-)./Makefile (-12 / +10 lines)
1	PORTNAME= libxml2	1	PORTNAME= libxml2
2	DISTVERSION= 2.10.3	2	DISTVERSION= 2.10.4
3	PORTREVISION?= 2
4	CATEGORIES?= textproc gnome	3	CATEGORIES?= textproc gnome
5	MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/	4	MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
6	DIST_SUBDIR= gnome	5	DIST_SUBDIR= gnome
Lines 23-41 LICENSE= MIT Link Here
23	# thoroughly may be reverted.	22	# thoroughly may be reverted.
24	USES+= cpe iconv libtool localbase pathfix pkgconfig tar:xz	23	USES+= cpe iconv libtool localbase pathfix pkgconfig tar:xz
25	CPE_VENDOR= xmlsoft	24	CPE_VENDOR= xmlsoft
26	GNU_CONFIGURE= yes
27	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
		26	GNU_CONFIGURE= yes
		27	# Don't build with Python support unless requested
		28	CONFIGURE_ARGS= --sysconfdir=${PREFIX}/share/ \
		29	--with-lzma=/usr \
		30	--${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U}
28		31
29	INSTALL_TARGET= install-strip	32	INSTALL_TARGET= install-strip
30	TEST_TARGET= check	33	TEST_TARGET= check
31		34
32	PLIST_SUB+= LIBVERSION=${DISTVERSION}	35	PLIST_SUB+= LIBVERSION=${DISTVERSION}
33		36
34	# Don't build with Python support unless requested
35	CONFIGURE_ARGS= --sysconfdir=${PREFIX}/share/ \
36	--with-lzma=/usr \
37	--${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U}
38
39	OPTIONS_DEFINE= DOCS ICU MEM_DEBUG READLINE STATIC THREAD_ALLOC	37	OPTIONS_DEFINE= DOCS ICU MEM_DEBUG READLINE STATIC THREAD_ALLOC
40	OPTIONS_DEFAULT= READLINE STATIC	38	OPTIONS_DEFAULT= READLINE STATIC
41	OPTIONS_SUB= yes	39	OPTIONS_SUB= yes
Lines 54-74 STATIC_CONFIGURE_ENABLE= static Link Here
54	THREAD_ALLOC_CONFIGURE_WITH= thread-alloc	52	THREAD_ALLOC_CONFIGURE_WITH= thread-alloc
55		53
56	post-patch:	54	post-patch:
57	.for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1
58	@${REINPLACE_CMD} -e \	55	@${REINPLACE_CMD} -e \
59	's\|/etc/xml/catalog\|${LOCALBASE}/share/xml/catalog\|g; \	56	's\|/etc/xml/catalog\|${LOCALBASE}/share/xml/catalog\|g; \
60	s\|/etc/sgml/catalog\|${LOCALBASE}/share/sgml/catalog\|g' \	57	s\|/etc/sgml/catalog\|${LOCALBASE}/share/sgml/catalog\|g' \
61	${WRKSRC}/${f}	58	${WRKSRC}/doc/xmllint.1
62	.endfor
63		59
64	.if !defined(LIBXML2_SLAVE)
65	post-install:	60	post-install:
		61	.if !defined(LIBXML2_SLAVE)
66	# Documentation should be in DOCSDIR	62	# Documentation should be in DOCSDIR
67	@${MV} ${STAGEDIR}${PREFIX}/share/gtk-doc/html/libxml2 \	63	@${MV} ${STAGEDIR}${PREFIX}/share/gtk-doc/html/libxml2 \
68	${STAGEDIR}${DOCSDIR}/devhelp	64	${STAGEDIR}${DOCSDIR}/devhelp
69	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc	65	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
70	# Install remaining documentation that's not connected to autotools	66	# Install remaining documentation that's not connected to autotools
71	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}	67	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
		68	.else
		69	${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/site-packages/libxml2mod${PYTHON_EXT_SUFFIX}.so
72	.endif	70	.endif
73		71
74	.include <bsd.port.mk>	72	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)./files/patch-Makefile.in (-5 / +5 lines)
1	--- Makefile.in.orig 2022-08-25 18:24:09 UTC	1	--- Makefile.in.orig 2023-04-17 23:41:26 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -708,7 +708,7 @@ runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)	3	@@ -711,7 +711,7 @@ m4datadir = $(datadir)/aclocal
4	m4data_DATA = libxml.m4	4	m4data_DATA = libxml.m4
5	runtest_SOURCES = runtest.c	5	runtest_SOURCES = runtest.c
6	runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)	6	runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
Lines 9-15 Link Here
9	runtest_DEPENDENCIES = $(DEPS)	9	runtest_DEPENDENCIES = $(DEPS)
10	runtest_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)	10	runtest_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)
11	testrecurse_SOURCES = testrecurse.c	11	testrecurse_SOURCES = testrecurse.c
12	@@ -741,7 +741,7 @@ testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)	12	@@ -744,7 +744,7 @@ xmlcatalog_DEPENDENCIES = $(DEPS)
13	xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)	13	xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)
14	testThreads_SOURCES = testThreads.c	14	testThreads_SOURCES = testThreads.c
15	testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)	15	testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
Lines 18-24 Link Here
18	testThreads_DEPENDENCIES = $(DEPS)	18	testThreads_DEPENDENCIES = $(DEPS)
19	testThreads_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)	19	testThreads_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)
20	testAutomata_SOURCES = testAutomata.c	20	testAutomata_SOURCES = testAutomata.c
21	@@ -1146,7 +1146,7 @@ am--depfiles: $(am__depfiles_remade)	21	@@ -1149,7 +1149,7 @@ am--depfiles: $(am__depfiles_remade)
22	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`	22	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
23		23
24	.c.lo:	24	.c.lo:
Lines 27-33 Link Here
27	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Plo	27	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Plo
28	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@	28	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
29	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@	29	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30	@@ -1898,7 +1898,7 @@ check: check-recursive	30	@@ -1906,7 +1906,7 @@ check-am: all-am
31	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)	31	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
32	$(MAKE) $(AM_MAKEFLAGS) check-local	32	$(MAKE) $(AM_MAKEFLAGS) check-local
33	check: check-recursive	33	check: check-recursive

Lines 1-9 Link Here

(-)./files/patch-python_libxml.c (-3 / +3 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-04-11 10:36:35 UTC
5	+++ python/libxml.c	5	+++ python/libxml.c
6	@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU	6	@@ -1621,6 +1621,7 @@ 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-17 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	@@ -1637,12 +1638,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
15	str[999] = 0;	15	str[999] = 0;
16	va_end(ap);	16	va_end(ap);
17		17