diff --git a/libtiff-4.6.0-reintroduce-ignore.patch b/libtiff-4.6.0-reintroduce-ignore.patch new file mode 100644 index 0000000..2ac8bf4 --- /dev/null +++ b/libtiff-4.6.0-reintroduce-ignore.patch @@ -0,0 +1,31 @@ +diff --git a/tools/tiffcp.c b/tools/tiffcp.c +index ebff4721d9fd2fa9cd3b3f209b88f5ae5e8b6f6a..650544e392a6639ccbcbccd4f913b208ca5c704f 100644 +--- a/tools/tiffcp.c ++++ b/tools/tiffcp.c +@@ -221,7 +221,7 @@ int main(int argc, char *argv[]) + + *mp++ = 'w'; + *mp = '\0'; +- while ((c = getopt(argc, argv, "m:,:b:c:f:l:o:p:r:w:astBLMC8xh")) != -1) ++ while ((c = getopt(argc, argv, "m:,:b:c:f:l:o:p:r:w:aistBLMC8xh")) != -1) + switch (c) + { + case 'm': +@@ -273,6 +273,9 @@ int main(int argc, char *argv[]) + else + usage(EXIT_FAILURE); + break; ++ case 'i': /* ignore errors */ ++ ignore = TRUE; ++ break; + case 'l': /* tile length */ + outtiled = TRUE; + deftilelength = atoi(optarg); +@@ -567,6 +570,7 @@ static const char usage_info[] = + " -L write little-endian instead of native byte order\n" + " -M disable use of memory-mapped files\n" + " -C disable strip chopping\n" ++ " -i ignore read errors\n" + " -b file[,#] bias (dark) monochrome image to be subtracted from all " + "others\n" + " -,=% use % rather than , to separate image #'s (per Note " diff --git a/libtiff.spec b/libtiff.spec index 87b3402..6e666b1 100644 --- a/libtiff.spec +++ b/libtiff.spec @@ -1,7 +1,7 @@ Summary: Library of functions for manipulating TIFF format image files Name: libtiff Version: 4.6.0 -Release: 9%{?dist} +Release: 10%{?dist} License: libtiff URL: http://www.simplesystems.org/libtiff/ @@ -24,6 +24,9 @@ Patch4: libtiff-4.6.0-CVE-2026-4775.patch # from upstream, for < 4.7.0, RHEL-179103 # https://gitlab.com/libtiff/libtiff/-/commit/335947359ce2dd3862cd9f7c49f92eba065dfed4 Patch5: libtiff-4.6.0-CVE-2023-52355.patch +# from upstream, for < 4.7.0, RHEL-185330 +# https://gitlab.com/libtiff/libtiff/-/commit/1c3ecce8498f634346a7030b1859faca24e126f5 +Patch6: libtiff-4.6.0-reintroduce-ignore.patch BuildRequires: gcc, gcc-c++ BuildRequires: zlib-devel libjpeg-devel jbigkit-devel libzstd-devel libwebp-devel liblerc-devel @@ -80,6 +83,7 @@ image files using the libtiff library. %patch -P 3 -p1 -b .CVE-2023-52356 %patch -P 4 -p1 -b .CVE-2026-4775 %patch -P 5 -p1 -b .CVE-2023-52355 +%patch -P 6 -p1 -b .reintroduce-ignore # Use build system's libtool.m4, not the one in the package. rm -f libtool.m4 @@ -178,6 +182,9 @@ LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH make check %{_mandir}/man1/* %changelog +* Mon Jun 29 2026 Michal Hlavinka - 4.6.0-10 +- reintroduce ignore option -i as it is required for tests (RHEL-185330) + * Wed Jun 03 2026 Michal Hlavinka - 4.6.0-9 - backport documentation change for CVE-2023-52355 (RHEL-179103) - fix CVE-2026-4775: signed integer overflow in putcontig8bitYCbCr44tile (RHEL-159311)