From e40f843b25757b1fb1cd96679fbef54e32a27828 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 22 Dec 2022 14:32:47 +0100 Subject: [PATCH] package/tiff: security bump to version 4.5.0 Fix CVE-2022-2056, CVE-2022-2057, CVE-2022-2058, CVE-2022-2519, CVE-2022-2520, CVE-2022-2521, CVE-2022-2953, CVE-2022-34526, CVE-2022-3570, CVE-2022-3597, CVE-2022-3598, CVE-2022-3599, CVE-2022-3626, CVE-2022-3627 and CVE-2022-3970 - COPYRIGHT renamed to LICENSE.md and year updated with https://gitlab.com/libtiff/libtiff/-/commit/fa1d6d787fc67a1eeb3abccb790b5bee969d424b - Use new --{en,dis}able options added by https://gitlab.com/libtiff/libtiff/-/commit/1ab0e2696a368a556b793a0941b5365e4d9f56ef http://www.simplesystems.org/libtiff/releases/v4.5.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5b62ea01369b11f5a4320bb2c909168b21c2642c) Signed-off-by: Peter Korsgaard --- package/tiff/tiff.hash | 4 ++-- package/tiff/tiff.mk | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 6bd28a0f59..73732892a5 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed tiff-4.4.0.tar.gz -sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT +sha256 c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 tiff-4.5.0.tar.gz +sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 525712c9e9..7981bdf2c9 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,16 +4,18 @@ # ################################################################################ -TIFF_VERSION = 4.4.0 +TIFF_VERSION = 4.5.0 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license -TIFF_LICENSE_FILES = COPYRIGHT +TIFF_LICENSE_FILES = LICENSE.md TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ + --disable-contrib \ --disable-cxx \ + --disable-tests \ --without-x TIFF_DEPENDENCIES = host-pkgconf @@ -23,7 +25,8 @@ HOST_TIFF_CONF_OPTS = \ --without-x \ --disable-zlib \ --disable-lzma \ - --disable-jpeg + --disable-jpeg \ + --disable-tests HOST_TIFF_DEPENDENCIES = host-pkgconf ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) @@ -84,12 +87,11 @@ ifneq ($(BR2_PACKAGE_TIFF_JBIG),y) TIFF_CONF_OPTS += --disable-jbig endif -TIFF_SUBDIRS = port libtiff ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y) -TIFF_SUBDIRS += tools +TIFF_CONF_OPTS += --enable-tools +else +TIFF_CONF_OPTS += --disable-tools endif -TIFF_MAKE = $(MAKE) SUBDIRS="$(TIFF_SUBDIRS)" - $(eval $(autotools-package)) $(eval $(host-autotools-package))