diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 2537d749d3ff..f81197ed93d5 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,66 +1,71 @@ PORTNAME= libxml2 DISTVERSION= 2.11.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= textproc gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/ DIST_SUBDIR= gnome +PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/ +PATCHFILES+= 245b70d7d2768572ae1b05b3668ca858b9ec4ed4.patch:-p1 # CVE-2024-56171 +PATCHFILES+= 858ca26c0689161a6b903a6682cc8a1cc10a0ea8.patch:-p1 # CVE-2025-24928 +PATCHFILES+= d7657811964eac1cb9743bb98649278ad948f0d2.patch:-p1 # CVE-2025-32414 + MAINTAINER= desktop@FreeBSD.org COMMENT?= XML parser library for GNOME WWW= http://xmlsoft.org/ LICENSE= MIT USES+= cmake:testing cpe iconv localbase:ldflags pathfix \ pkgconfig tar:xz CPE_VENDOR= xmlsoft USE_LDCONFIG= yes # Don't build with Python support unless requested CMAKE_${LIBXML2_SLAVE:DON:UOFF}=LIBXML2_WITH_PYTHON # Many symbols in the linker version script libxml2.syms are only defined when # --with-xptr-locs is enabled at configure time. Suppress errors with lld >= 17 # due to these undefined symbols. LDFLAGS+= -Wl,--undefined-version CMAKE_TESTING_ON= LIBXML2_WITH_TESTS CMAKE_ARGS= -DCMAKE_INSTALL_SYSCONFDIR=share CMAKE_OFF+= LIBXML2_WITH_TESTS PLIST_SUB+= LIBVERSION=${DISTVERSION} OPTIONS_DEFINE= DOCS ICU MEM_DEBUG 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 THREAD_ALLOC_CMAKE_BOOL= LIBXML2_WITH_THREAD_ALLOC post-patch: @${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 post-install: .if defined(LIBXML2_SLAVE) ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/site-packages/libxml2mod.so ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -f -d ${PYTHONPREFIX_SITELIBDIR} \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -f -d ${PYTHONPREFIX_SITELIBDIR} \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .endif .include diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index 4ea4340dc6f1..fc9a1ddad574 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,3 +1,9 @@ -TIMESTAMP = 1725749707 +TIMESTAMP = 1750532030 SHA256 (gnome/libxml2-2.11.9.tar.xz) = 780157a1efdb57188ec474dca87acaee67a3a839c2525b2214d318228451809f SIZE (gnome/libxml2-2.11.9.tar.xz) = 2627500 +SHA256 (gnome/245b70d7d2768572ae1b05b3668ca858b9ec4ed4.patch) = 5fb5bed3c40fee5ecb60dbf96fd6c5071f08a54487f534540c54bc9cb6d5b16e +SIZE (gnome/245b70d7d2768572ae1b05b3668ca858b9ec4ed4.patch) = 1273 +SHA256 (gnome/858ca26c0689161a6b903a6682cc8a1cc10a0ea8.patch) = e3585a9e59f3146a53a1091fd00378e81676a824feab037cd8d71807cea73c73 +SIZE (gnome/858ca26c0689161a6b903a6682cc8a1cc10a0ea8.patch) = 1806 +SHA256 (gnome/d7657811964eac1cb9743bb98649278ad948f0d2.patch) = 3d7e10866d8be511da64bee6a998c4f68785326bf0d403af7be6745830d9bca2 +SIZE (gnome/d7657811964eac1cb9743bb98649278ad948f0d2.patch) = 2526 diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile index 7633fdebb4a1..a9ff9bf0a9c7 100644 --- a/textproc/py-libxml2/Makefile +++ b/textproc/py-libxml2/Makefile @@ -1,32 +1,32 @@ -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= Python interface for XML parser library for GNOME 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 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} ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_LIB} ${BUILD_WRKSRC}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR} .include "${MASTERDIR}/Makefile"