guix_mirror_bot pushed a commit to branch kde-team
in repository guix.
commit c17c4774210991f9547fb4a441e3f72cc6ddd399
Author: Sughosha <[email protected]>
AuthorDate: Sun Jul 5 07:34:41 2026 +0530
gnu: libtiff: Update to 4.7.2.
CVE-2022-34526 is fixed upstream.
* gnu/packages/image.scm (libtiff): Update to 4.7.2.
[source]: Switch to git-fetch with the Git url
"https://gitlab.com/libtiff/libtiff.git";.
<patches>: Remove "libtiff-CVE-2022-34526.patch".
[native-inputs]: Add autoconf-2.72, automake, and libtool.
* gnu/packages/patches/libtiff-CVE-2022-34526.patch: Remve file.
* gnu/local.mk: Deregister it.
---
gnu/local.mk | 1 -
gnu/packages/image.scm | 15 +++++++++------
gnu/packages/patches/libtiff-CVE-2022-34526.patch | 22 ----------------------
3 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 471732939d..3600d7bb2d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1828,7 +1828,6 @@ dist_patch_DATA =
\
%D%/packages/patches/libtgvoip-disable-sse2.patch \
%D%/packages/patches/libtgvoip-disable-webrtc.patch \
%D%/packages/patches/libtheora-config-guess.patch \
- %D%/packages/patches/libtiff-CVE-2022-34526.patch \
%D%/packages/patches/libtirpc-CVE-2021-46828.patch \
%D%/packages/patches/libtirpc-hurd.patch \
%D%/packages/patches/libtool-grep-compat.patch \
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index dd493dbadb..50081217a6 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -907,16 +907,17 @@ extracting icontainer icon files.")
(define-public libtiff
(package
(name "libtiff")
- (version "4.4.0")
+ (version "4.7.2")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://download.osgeo.org/libtiff/tiff-";
- version ".tar.xz"))
- (patches (search-patches "libtiff-CVE-2022-34526.patch"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/libtiff/libtiff.git";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1h8xrcpbyf9id2hw2ms0cmpgx0li8gladjzj82ycgk28018pnc29"))))
+ "0q6q1kzam5fki7biip3yhrhfb8p8h87m03pajhrn6zcijn1yjhpb"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.8 MiB of HTML documentation
@@ -926,6 +927,8 @@ extracting icontainer icon files.")
#~(list (string-append "--with-docdir=" #$output:doc "/share/doc/"
#$name "-" #$(package-version this-package))
"--disable-static")))
+ (native-inputs
+ (list autoconf-2.72 automake libtool))
(inputs
(list libjpeg-turbo xz zlib))
(synopsis "Library for handling TIFF files")
diff --git a/gnu/packages/patches/libtiff-CVE-2022-34526.patch
b/gnu/packages/patches/libtiff-CVE-2022-34526.patch
deleted file mode 100644
index a5ad9d79a5..0000000000
--- a/gnu/packages/patches/libtiff-CVE-2022-34526.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix CVE-2022-34526:
-
- https://nvd.nist.gov/vuln/detail/CVE-2022-34526
- https://gitlab.com/libtiff/libtiff/-/issues/433
-
-Patch taken from upstream source repository:
-
-
https://gitlab.com/libtiff/libtiff/-/commit/275735d0354e39c0ac1dc3c0db2120d6f31d1990
-
-diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
---- a/libtiff/tif_dirinfo.c
-+++ b/libtiff/tif_dirinfo.c
-@@ -1191,6 +1191,9 @@ _TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag)
- default:
- return 1;
- }
-+ if( !TIFFIsCODECConfigured(tif->tif_dir.td_compression) ) {
-+ return 0;
-+ }
- /* Check if codec specific tags are allowed for the current
- * compression scheme (codec) */
- switch (tif->tif_dir.td_compression) {
