git: acd6567eecca - main - textproc/libxml2: update to 2.10.14 security release (+)

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=acd6567eeccaba062051ae4571c3d20c355383ac

commit acd6567eeccaba062051ae4571c3d20c355383ac
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2023-04-27 18:07:36 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2023-04-27 18:25:56 +0000

    textproc/libxml2: update to 2.10.14 security release (+)
    
    - [CVE-2023-29469] Hashing of empty dict strings isn't deterministic
    - [CVE-2023-28484] Fix null deref in xmlSchemaFixupComplexType
    - schemas: Fix null-pointer-deref in xmlSchemaCheckCOSSTDerivedOK
    
    - SAX2: Ignore namespaces in HTML documents
    - io: Fix "buffer full" error with certain buffer sizes
    
    PR:             270906
    Security:       0bd7f07b-dc22-11ed-bf28-589cfc0f81b0
    
    Sponsored by:   Serenity Cybersecurity, LLC
---
 textproc/libxml2/Makefile | 22 ++++++++++------------
 textproc/libxml2/distinfo |  6 +++---
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 1bdaeb306977..187274464ef8 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libxml2
-DISTVERSION=	2.10.3
-PORTREVISION?=	2
+DISTVERSION=	2.10.4
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
 DIST_SUBDIR=	gnome
@@ -23,19 +22,18 @@ LICENSE=	MIT
 # 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
@@ -54,21 +52,21 @@ STATIC_CONFIGURE_ENABLE=	static
 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}/${f}
-.endfor
+		${WRKSRC}/doc/xmllint.1
 
-.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>
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index ad8ca4ad9118..58f47a87615f 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665950945
-SHA256 (gnome/libxml2-2.10.3.tar.xz) = 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
-SIZE (gnome/libxml2-2.10.3.tar.xz) = 2639908
+TIMESTAMP = 1681763197
+SHA256 (gnome/libxml2-2.10.4.tar.xz) = ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45
+SIZE (gnome/libxml2-2.10.4.tar.xz) = 2643600