From: RISCi_ATOM <bob@bobcall.me>
Date: Tue, 4 Jun 2024 15:58:46 +0000 (-0400)
Subject: libxml2: update to 2.12.5
X-Git-Tag: v6.1-20240701~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=21a1bd37e4c65d0286247e5f4f329d00ca400621;p=librecmc%2Flibrecmc.git

libxml2: update to 2.12.5

Release Notes:
https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.5

Remove patch:
- 010-iconv.patch

Fixes: CVE-2024-25062
---

diff --git a/package/libs/libxml2/Makefile b/package/libs/libxml2/Makefile
index ed1965c019..86fa370771 100644
--- a/package/libs/libxml2/Makefile
+++ b/package/libs/libxml2/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxml2
-PKG_VERSION:=2.11.4
+PKG_VERSION:=2.12.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/libxml2/$(basename $(PKG_VERSION))
-PKG_HASH:=737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7
+PKG_HASH:=a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
diff --git a/package/libs/libxml2/patches/010-iconv.patch b/package/libs/libxml2/patches/010-iconv.patch
deleted file mode 100644
index 92b09685c5..0000000000
--- a/package/libs/libxml2/patches/010-iconv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -469,6 +469,9 @@ if(LIBXML2_WITH_PROGRAMS)
- 		add_executable(LibXml2::${PROGRAM} ALIAS ${PROGRAM})
- 		target_compile_definitions(${PROGRAM} PRIVATE SYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
- 		target_link_libraries(${PROGRAM} LibXml2)
-+		if(LIBXML2_WITH_ICONV AND NOT Iconv_IS_BUILT_IN)
-+			target_link_libraries(${PROGRAM} iconv)
-+		endif()
- 		if(HAVE_LIBHISTORY)
- 			target_link_libraries(${PROGRAM} history)
- 		endif()