CVS commit: pkgsrc/textproc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jun 17 18:48:25 UTC 2024

Modified Files:
        pkgsrc/textproc/libxml2: Makefile Makefile.common distinfo
        pkgsrc/textproc/libxml2/patches: patch-configure
        pkgsrc/textproc/py-libxml2: Makefile

Log Message:
libxml2 py-libxml2: updated to 2.12.8

v2.12.8: Jun 12 2024

Regressions

- parser: Fix performance regression when parsing namespaces

v2.12.7: May 13 2024

Security

- [CVE-2024-34459] Fix buffer overread with `xmllint --htmlout`

Regressions

- xmllint: Fix --pedantic option
- save: Handle invalid parent pointers in xhtmlNodeDumpOutput

v2.12.6: Mar 15 2024

Regressions

- parser: Fix detection of duplicate attributes in XML namespace
- xmlreader: Fix xmlTextReaderConstEncoding
- html: Fix htmlCreatePushParserCtxt with encoding
- xmllint: Return error code if XPath returns empty nodeset

v2.12.5: Feb 4 2024

Security

- [CVE-2024-25062] xmlreader: Don't expand XIncludes when backtracking

Regressions

- parser: Fix crash in xmlParseInNodeContext with HTML documents


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 pkgsrc/textproc/libxml2/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/libxml2/Makefile.common
cvs rdiff -u -r1.146 -r1.147 pkgsrc/textproc/libxml2/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/libxml2/patches/patch-configure
cvs rdiff -u -r1.96 -r1.97 pkgsrc/textproc/py-libxml2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/libxml2/Makefile
diff -u pkgsrc/textproc/libxml2/Makefile:1.180 pkgsrc/textproc/libxml2/Makefile:1.181
--- pkgsrc/textproc/libxml2/Makefile:1.180      Wed May 29 16:34:37 2024
+++ pkgsrc/textproc/libxml2/Makefile    Mon Jun 17 18:48:24 2024
@@ -1,32 +1,41 @@
-# $NetBSD: Makefile,v 1.180 2024/05/29 16:34:37 adam Exp $
+# $NetBSD: Makefile,v 1.181 2024/06/17 18:48:24 adam Exp $
 
-PKGREVISION= 1
 .include "../../textproc/libxml2/Makefile.common"
 
 COMMENT=       XML parser library from the GNOME project
 LICENSE=       modified-bsd
 
 USE_FEATURES=          glob
+USE_LANGUAGES=         c
+FORCE_C_STD=           c99
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=       --with-lzma=${BUILDLINK_PREFIX.xz}
 CONFIGURE_ARGS+=       --with-ftp
 CONFIGURE_ARGS+=       --with-legacy
 CONFIGURE_ARGS+=       --without-python
+TEST_TARGET=           check
 
-PKGCONFIG_OVERRIDE=    libxml-2.0.pc.in
+# /usr/include might not exist on some platforms, like Darwin.
+# If so, cmake fails with non-existent path.
+.include "../../converters/libiconv/buildlink3.mk"
+CHECK_BUILTIN.iconv:=   yes
+.include "../../converters/libiconv/builtin.mk"
+CHECK_BUILTIN.iconv:=   no
 
-USE_LANGUAGES+=                c
-FORCE_C_STD=           c99
+.if ${USE_BUILTIN.iconv:U:tl} == no
+CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
+.else
+CONFIGURE_ARGS+=       --with-iconv
+.endif
 
-# for struct addrinfo on glibc
-CPPFLAGS.Linux+=       -D_POSIX_C_SOURCE=200112L  
+PKGCONFIG_OVERRIDE=    libxml-2.0.pc.in
 
-TEST_TARGET=   check
+# for struct addrinfo on glibc
+CPPFLAGS.Linux+=       -D_POSIX_C_SOURCE=200112L
 
 SUBST_CLASSES+=                rpath
 SUBST_STAGE.rpath=     pre-configure

Index: pkgsrc/textproc/libxml2/Makefile.common
diff -u pkgsrc/textproc/libxml2/Makefile.common:1.21 pkgsrc/textproc/libxml2/Makefile.common:1.22
--- pkgsrc/textproc/libxml2/Makefile.common:1.21        Sat Jan 27 10:06:41 2024
+++ pkgsrc/textproc/libxml2/Makefile.common     Mon Jun 17 18:48:24 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.21 2024/01/27 10:06:41 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2024/06/17 18:48:24 adam Exp $
 #
 # used by textproc/libxml2/Makefile
 # used by textproc/py-libxml2/Makefile
 
-DISTNAME=      libxml2-2.12.4
+DISTNAME=      libxml2-2.12.8
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libxml2/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/textproc/libxml2/distinfo
diff -u pkgsrc/textproc/libxml2/distinfo:1.146 pkgsrc/textproc/libxml2/distinfo:1.147
--- pkgsrc/textproc/libxml2/distinfo:1.146      Sat Jan 27 10:06:41 2024
+++ pkgsrc/textproc/libxml2/distinfo    Mon Jun 17 18:48:24 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.146 2024/01/27 10:06:41 wiz Exp $
+$NetBSD: distinfo,v 1.147 2024/06/17 18:48:24 adam Exp $
 
-BLAKE2s (libxml2-2.12.4.tar.xz) = 6989be26d16784b1eaefd85516e8e1c436905532b4089ab467efc30a1440fcd5
-SHA512 (libxml2-2.12.4.tar.xz) = 859f95eb659279c73d9fbaf3d84d593bcac075da91adcaf829a5feec034a1d3d03b75941879d972f3f448b5fca2caa043a10130d660b75e18573914ced7c56aa
-Size (libxml2-2.12.4.tar.xz) = 2643516 bytes
-SHA1 (patch-configure) = 5aef0e4ab33d2fe7e5ea85c1ac8b7e0ce11fe80d
+BLAKE2s (libxml2-2.12.8.tar.xz) = 18a1d86e24c48a116bf35dd702529245d73b6fb69b48eba25ae691d078530038
+SHA512 (libxml2-2.12.8.tar.xz) = 59baac9a82a734045112be6da12bbbe80a71575145424c2225e4bd9f8d54e53c674dcbc9576eb55f646632335702e7f0b1928f96a851159ace9b26f677fd3d77
+Size (libxml2-2.12.8.tar.xz) = 2643728 bytes
+SHA1 (patch-configure) = 88b8910f5606eabff74ac3754dfe734e5d8617d7

Index: pkgsrc/textproc/libxml2/patches/patch-configure
diff -u pkgsrc/textproc/libxml2/patches/patch-configure:1.7 pkgsrc/textproc/libxml2/patches/patch-configure:1.8
--- pkgsrc/textproc/libxml2/patches/patch-configure:1.7 Sat Jan 27 10:06:41 2024
+++ pkgsrc/textproc/libxml2/patches/patch-configure     Mon Jun 17 18:48:25 2024
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.7 2024/01/27 10:06:41 wiz Exp $
+$NetBSD: patch-configure,v 1.8 2024/06/17 18:48:25 adam Exp $
 
- * Add run-path to XML_LIBDIR
+Add run-path to XML_LIBDIR.
 
 --- configure.orig     2024-01-15 15:53:40.000000000 +0000
 +++ configure

Index: pkgsrc/textproc/py-libxml2/Makefile
diff -u pkgsrc/textproc/py-libxml2/Makefile:1.96 pkgsrc/textproc/py-libxml2/Makefile:1.97
--- pkgsrc/textproc/py-libxml2/Makefile:1.96    Wed Jun  5 22:44:58 2024
+++ pkgsrc/textproc/py-libxml2/Makefile Mon Jun 17 18:48:25 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2024/06/05 22:44:58 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2024/06/17 18:48:25 adam Exp $
 
 PYTHON_27_ACCEPTED=    yes
 
-PKGREVISION= 1
 .include "../../textproc/libxml2/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +12,7 @@ LICENSE=      modified-bsd
 USE_GCC_RUNTIME=       yes
 
 PYSETUPSUBDIR= python
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= yes
 USE_TOOLS+=    pkg-config
 
 # python/setup.py looks in various places for libxml2 and libiconv,
@@ -50,7 +49,7 @@ post-install: fix-darwin-install-name
 .PHONY: fix-darwin-install-name
 fix-darwin-install-name:
        install_name_tool -id ${PREFIX}/${PYSITELIB}/libxml2mod.so \
-           ${DESTDIR}${PREFIX}/${PYSITELIB}/libxml2mod.so
+               ${DESTDIR}${PREFIX}/${PYSITELIB}/libxml2mod.so
 .endif
 
 EGG_NAME=      ${DISTNAME:S/-/_python-/}