From fe8c4143f77b1037a2391963cd379d2eea906444 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 17 Jan 2023 21:07:07 +0100 Subject: [PATCH] package/x11r7/xlib_libXpm: security bump version to 3.5.15 Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003313.html Fixes CVE-2022-4883, CVE-2022-44617 & CVE-2022-46285: https://lists.x.org/archives/xorg-announce/2023-January/003312.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/501494c6c68a84114fdd0b44d4b67ef9cde776c9 Added configure option to disable compressed pixmaps support: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4841039e5385f264d12757903894f47c64f59361 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit a0dfd717f3ff888b4ab6d8c40bb6a01a939370cb) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 ++++---- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 9ccfb4c8de..733c404543 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html -sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz -sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-January/003313.html +sha256 60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1 libXpm-3.5.15.tar.xz +sha512 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f libXpm-3.5.15.tar.xz # Locally calculated -sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING +sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 417dcfec38..970ec93407 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_VERSION = 3.5.15 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT @@ -16,6 +16,7 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) XLIB_LIBXPM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +XLIB_LIBXPM_CONF_OPTS = --disable-open-zfile ifeq ($(BR2_SYSTEM_ENABLE_NLS),) XLIB_LIBXPM_CONF_ENV += ac_cv_search_gettext=no