diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-06-03 14:09:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-06-03 18:03:12 +0200 |
| commit | 4c3b44fd1e4473ba3e4bd02042849bd0cd876915 (patch) | |
| tree | 750d9659f258804328b595d6f0293833731211c4 | |
| parent | 6079bf6879c4baf144b68ef459d825412ecea697 (diff) | |
upgrade libtiff to 4.4.0
dropping ubsan.patch which was fixed upstream in this release
Change-Id: Ic2e35b24f7a9c7c3e2a00da8bc5b5b7d500746fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135359
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libtiff/UnpackedTarball_libtiff.mk | 1 | ||||
| -rw-r--r-- | external/libtiff/ubsan.patch | 11 |
3 files changed, 2 insertions, 14 deletions
diff --git a/download.lst b/download.lst index c1a76e0cb0ad..257c1248bd0e 100644 --- a/download.lst +++ b/download.lst @@ -208,8 +208,8 @@ export PIXMAN_SHA256SUM := 6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f export PIXMAN_TARBALL := pixman-0.40.0.tar.gz export LIBPNG_SHA256SUM := 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca export LIBPNG_TARBALL := libpng-1.6.37.tar.xz -export LIBTIFF_SHA256SUM := 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 -export LIBTIFF_TARBALL := tiff-4.3.0.tar.gz +export LIBTIFF_SHA256SUM := 49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1 +export LIBTIFF_TARBALL := tiff-4.4.0.tar.xz export POPPLER_SHA256SUM := 7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e export POPPLER_TARBALL := poppler-22.01.0.tar.xz export POPPLER_DATA_SHA256SUM := 2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c diff --git a/external/libtiff/UnpackedTarball_libtiff.mk b/external/libtiff/UnpackedTarball_libtiff.mk index f874d6d61743..ee3d4ab6cb27 100644 --- a/external/libtiff/UnpackedTarball_libtiff.mk +++ b/external/libtiff/UnpackedTarball_libtiff.mk @@ -16,7 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libtiff,0)) $(eval $(call gb_UnpackedTarball_add_patches,libtiff,\ external/libtiff/libtiff.linknolibs.patch \ external/libtiff/libtiff.16bitcielab.patch \ - external/libtiff/ubsan.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libtiff/ubsan.patch b/external/libtiff/ubsan.patch deleted file mode 100644 index 853d069ad795..000000000000 --- a/external/libtiff/ubsan.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libtiff/tif_dirread.c -+++ libtiff/tif_dirread.c -@@ -4173,7 +4173,7 @@ - goto bad; - } - -- memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16_t)); -+ if (old_extrasamples != 0) memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16_t)); - _TIFFsetShortArray(&tif->tif_dir.td_sampleinfo, new_sampleinfo, tif->tif_dir.td_extrasamples); - _TIFFfree(new_sampleinfo); - } |