pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/tiff graphics/tiff: Update to 4.4.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/1c066ed8b7a6
branches: trunk
changeset: 380134:1c066ed8b7a6
user: gdt <gdt%pkgsrc.org@localhost>
date: Sun May 29 12:24:16 2022 +0000
description:
graphics/tiff: Update to 4.4.0
Upstream does not provide NEWS. Skimming over 1300 lines of
ChangeLog, this release contains mostly bufixes, speed improvemnents,
and other minor improvements.
This commit drops 5 patches for CVEs. These patches all appear to
have been taken from the upstream repo.
One CVE remains:
https://nvd.nist.gov/vuln/detail/CVE-2018-10126
http://bugzilla.maptools.org/show_bug.cgi?id=2786
https://gitlab.com/libtiff/libtiff/-/issues/128
diffstat:
graphics/tiff/Makefile | 10 +-
graphics/tiff/PLIST | 4 +-
graphics/tiff/distinfo | 15 +-
graphics/tiff/patches/patch-CVE-2022-0561 | 42 ----
graphics/tiff/patches/patch-CVE-2022-0907 | 281 -----------------------------
graphics/tiff/patches/patch-CVE-2022-0909 | 23 --
graphics/tiff/patches/patch-CVE-2022-0924 | 44 ----
graphics/tiff/patches/patch-CVE-2022-22844 | 31 ---
graphics/tiff/patches/patch-Makefile.in | 12 +-
9 files changed, 21 insertions(+), 441 deletions(-)
diffs (truncated from 534 to 300 lines):
diff -r cab22bdb0537 -r 1c066ed8b7a6 graphics/tiff/Makefile
--- a/graphics/tiff/Makefile Sun May 29 09:50:31 2022 +0000
+++ b/graphics/tiff/Makefile Sun May 29 12:24:16 2022 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.152 2022/03/25 09:32:49 nia Exp $
+# $NetBSD: Makefile,v 1.153 2022/05/29 12:24:16 gdt Exp $
-DISTNAME= tiff-4.3.0
-PKGREVISION= 2
+VERSION_BASE= 4.4.0
+# Accomodate testing unreleased versions.
+#VERSION_RC= rc1
+DISTNAME= tiff-${VERSION_BASE}${VERSION_RC}
CATEGORIES= graphics
MASTER_SITES= https://download.osgeo.org/libtiff/
@@ -10,6 +12,8 @@
COMMENT= Library and tools for reading and writing TIFF data files
LICENSE= mit
+WRKSRC= ${WRKDIR}/tiff-${VERSION_BASE}
+
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_LANGUAGES= c c++
diff -r cab22bdb0537 -r 1c066ed8b7a6 graphics/tiff/PLIST
--- a/graphics/tiff/PLIST Sun May 29 09:50:31 2022 +0000
+++ b/graphics/tiff/PLIST Sun May 29 12:24:16 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2021/04/20 13:12:54 gdt Exp $
+@comment $NetBSD: PLIST,v 1.30 2022/05/29 12:24:16 gdt Exp $
bin/fax2ps
bin/fax2tiff
bin/pal2rgb
@@ -237,4 +237,4 @@
share/doc/tiff/html/v4.0.9.html
share/doc/tiff/html/v4.1.0.html
share/doc/tiff/html/v4.2.0.html
-share/doc/tiff/html/v${PKGVERSION}.html
+share/doc/tiff/html/v4.3.0.html
diff -r cab22bdb0537 -r 1c066ed8b7a6 graphics/tiff/distinfo
--- a/graphics/tiff/distinfo Sun May 29 09:50:31 2022 +0000
+++ b/graphics/tiff/distinfo Sun May 29 12:24:16 2022 +0000
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.102 2022/03/25 09:32:49 nia Exp $
+$NetBSD: distinfo,v 1.103 2022/05/29 12:24:16 gdt Exp $
-BLAKE2s (tiff-4.3.0.tar.gz) = 28ba59df6d3d7a967dc168645bfc78f047ac8f7f548050abbbd0560f9dd21c75
-SHA512 (tiff-4.3.0.tar.gz) = e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493
-Size (tiff-4.3.0.tar.gz) = 2808254 bytes
-SHA1 (patch-CVE-2022-0561) = a40f12dc11d431d6373d7799d1d2664ea3eabee1
-SHA1 (patch-CVE-2022-0907) = 92a50bbba3cd0aa6b0bf3b85ce46d3948d4dd19d
-SHA1 (patch-CVE-2022-0909) = 747db983e9dd0b79860eaaf975f698a129bf044d
-SHA1 (patch-CVE-2022-0924) = 82ecc85556f01e6363694c86465bc20723ac3261
-SHA1 (patch-CVE-2022-22844) = 268d67ea1a24c6078006c37bf5c56b00a6a0183f
-SHA1 (patch-Makefile.in) = de93f4a2cea4bffc117482fdc6875adfb9aa67e0
+BLAKE2s (tiff-4.4.0.tar.gz) = 4d7e2a0dcf15c0c69bcf5f7e9e89f9f381207905ea619f4457ffed17c4b659d0
+SHA512 (tiff-4.4.0.tar.gz) = 78ffab7667d0feb8d38571bc482390fc6dd20b93a798ab3a8b5cc7d5ab00b44a37f67eb8f19421e4ab33ad89ab40e382128f8a4bbdf097e0efb6d9fca5ac6f9e
+Size (tiff-4.4.0.tar.gz) = 2841082 bytes
+SHA1 (patch-Makefile.in) = 96101d4c8208346b4e8778e816a0a7f4e0b03450
diff -r cab22bdb0537 -r 1c066ed8b7a6 graphics/tiff/patches/patch-CVE-2022-0561
--- a/graphics/tiff/patches/patch-CVE-2022-0561 Sun May 29 09:50:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-$NetBSD: patch-CVE-2022-0561,v 1.2 2022/03/25 09:32:49 nia Exp $
-
-https://gitlab.com/libtiff/libtiff/-/issues/362
-
-This fixes CVE-2022-0561 and CVE-2022-0562.
-
---- libtiff/tif_dirread.c.orig 2021-03-07 18:37:25.000000000 +0000
-+++ libtiff/tif_dirread.c
-@@ -4173,7 +4173,8 @@ TIFFReadDirectory(TIFF* tif)
- 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);
- }
-@@ -5079,7 +5080,10 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEnt
- _TIFFfree(data);
- return(0);
- }
-- _TIFFmemcpy(o,data,(uint32_t)dp->tdir_count);
-+ if (dp->tdir_count > 0 )
-+ {
-+ _TIFFmemcpy(o,data,(uint32_t)dp->tdir_count);
-+ }
- o[(uint32_t)dp->tdir_count]=0;
- if (data!=0)
- _TIFFfree(data);
-@@ -5765,8 +5769,9 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEn
- _TIFFfree(data);
- return(0);
- }
-- _TIFFmemcpy(resizeddata,data, (uint32_t)dir->tdir_count * sizeof(uint64_t));
-- _TIFFmemset(resizeddata+(uint32_t)dir->tdir_count, 0, (nstrips - (uint32_t)dir->tdir_count) * sizeof(uint64_t));
-+ if( dir->tdir_count )
-+ _TIFFmemcpy(resizeddata,data, (uint32_t)dir->tdir_count * sizeof(uint64_t));
-+ _TIFFmemset(resizeddata+(uint32_t)dir->tdir_count, 0, (nstrips - (uint32_t)dir->tdir_count) * sizeof(uint64_t));
- _TIFFfree(data);
- data=resizeddata;
- }
diff -r cab22bdb0537 -r 1c066ed8b7a6 graphics/tiff/patches/patch-CVE-2022-0907
--- a/graphics/tiff/patches/patch-CVE-2022-0907 Sun May 29 09:50:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,281 +0,0 @@
-$NetBSD: patch-CVE-2022-0907,v 1.1 2022/03/25 09:32:49 nia Exp $
-
-[PATCH] add checks for return value of limitMalloc (CVE-2022-0907)
-https://gitlab.com/libtiff/libtiff/-/merge_requests/314.patch
-
-[PATCH] tiffcrop: fix issue #380 and #382 heap buffer overflow in
- extractImageSection (CVE-2022-0891)
-https://gitlab.com/libtiff/libtiff/-/commit/46dc8fcd4d38c3b6f35ab28e532aee80e6f609d6.patch
-
---- tools/tiffcrop.c.orig 2021-03-07 18:09:46.000000000 +0000
-+++ tools/tiffcrop.c
-@@ -105,8 +105,8 @@
- * of messages to monitor progress without enabling dump logs.
- */
-
--static char tiffcrop_version_id[] = "2.4";
--static char tiffcrop_rev_date[] = "12-13-2010";
-+static char tiffcrop_version_id[] = "2.4.1";
-+static char tiffcrop_rev_date[] = "03-03-2010";
-
- #include "tif_config.h"
- #include "libport.h"
-@@ -6710,10 +6710,10 @@ extractImageSection(struct image_data *i
- #ifdef DEVELMODE
- uint32_t img_length;
- #endif
-- uint32_t j, shift1, shift2, trailing_bits;
-+ uint32_t j, shift1, trailing_bits;
- uint32_t row, first_row, last_row, first_col, last_col;
- uint32_t src_offset, dst_offset, row_offset, col_offset;
-- uint32_t offset1, offset2, full_bytes;
-+ uint32_t offset1, full_bytes;
- uint32_t sect_width;
- #ifdef DEVELMODE
- uint32_t sect_length;
-@@ -6723,7 +6723,6 @@ extractImageSection(struct image_data *i
- #ifdef DEVELMODE
- int k;
- unsigned char bitset;
-- static char *bitarray = NULL;
- #endif
-
- img_width = image->width;
-@@ -6741,17 +6740,12 @@ extractImageSection(struct image_data *i
- dst_offset = 0;
-
- #ifdef DEVELMODE
-- if (bitarray == NULL)
-- {
-- if ((bitarray = (char *)malloc(img_width)) == NULL)
-- {
-- TIFFError ("", "DEBUG: Unable to allocate debugging bitarray");
-- return (-1);
-- }
-- }
-+ char bitarray[39];
- #endif
-
-- /* rows, columns, width, length are expressed in pixels */
-+ /* rows, columns, width, length are expressed in pixels
-+ * first_row, last_row, .. are index into image array starting at 0 to width-1,
-+ * last_col shall be also extracted. */
- first_row = section->y1;
- last_row = section->y2;
- first_col = section->x1;
-@@ -6761,9 +6755,14 @@ extractImageSection(struct image_data *i
- #ifdef DEVELMODE
- sect_length = last_row - first_row + 1;
- #endif
-- img_rowsize = ((img_width * bps + 7) / 8) * spp;
-- full_bytes = (sect_width * spp * bps) / 8; /* number of COMPLETE bytes per row in section */
-- trailing_bits = (sect_width * bps) % 8;
-+ /* The read function loadImage() used copy separate plane data into a buffer as interleaved
-+ * samples rather than separate planes so the same logic works to extract regions
-+ * regardless of the way the data are organized in the input file.
-+ * Furthermore, bytes and bits are arranged in buffer according to COMPRESSION=1 and FILLORDER=1
-+ */
-+ img_rowsize = (((img_width * spp * bps) + 7) / 8); /* row size in full bytes of source image */
-+ full_bytes = (sect_width * spp * bps) / 8; /* number of COMPLETE bytes per row in section */
-+ trailing_bits = (sect_width * spp * bps) % 8; /* trailing bits within the last byte of destination buffer */
-
- #ifdef DEVELMODE
- TIFFError ("", "First row: %"PRIu32", last row: %"PRIu32", First col: %"PRIu32", last col: %"PRIu32"\n",
-@@ -6776,10 +6775,9 @@ extractImageSection(struct image_data *i
-
- if ((bps % 8) == 0)
- {
-- col_offset = first_col * spp * bps / 8;
-+ col_offset = (first_col * spp * bps) / 8;
- for (row = first_row; row <= last_row; row++)
- {
-- /* row_offset = row * img_width * spp * bps / 8; */
- row_offset = row * img_rowsize;
- src_offset = row_offset + col_offset;
-
-@@ -6792,14 +6790,12 @@ extractImageSection(struct image_data *i
- }
- else
- { /* bps != 8 */
-- shift1 = spp * ((first_col * bps) % 8);
-- shift2 = spp * ((last_col * bps) % 8);
-+ shift1 = ((first_col * spp * bps) % 8); /* shift1 = bits to skip in the first byte of source buffer*/
- for (row = first_row; row <= last_row; row++)
- {
- /* pull out the first byte */
- row_offset = row * img_rowsize;
-- offset1 = row_offset + (first_col * bps / 8);
-- offset2 = row_offset + (last_col * bps / 8);
-+ offset1 = row_offset + ((first_col * spp * bps) / 8); /* offset1 = offset into source of byte with first bits to be extracted */
-
- #ifdef DEVELMODE
- for (j = 0, k = 7; j < 8; j++, k--)
-@@ -6811,12 +6807,12 @@ extractImageSection(struct image_data *i
- sprintf(&bitarray[9], " ");
- for (j = 10, k = 7; j < 18; j++, k--)
- {
-- bitset = *(src_buff + offset2) & (((unsigned char)1 << k)) ? 1 : 0;
-+ bitset = *(src_buff + offset1 + full_bytes) & (((unsigned char)1 << k)) ? 1 : 0;
- sprintf(&bitarray[j], (bitset) ? "1" : "0");
- }
- bitarray[18] = '\0';
-- TIFFError ("", "Row: %3d Offset1: %"PRIu32", Shift1: %"PRIu32", Offset2: %"PRIu32", Shift2: %"PRIu32"\n",
-- row, offset1, shift1, offset2, shift2);
-+ TIFFError ("", "Row: %3d Offset1: %"PRIu32", Shift1: %"PRIu32", Offset2: %"PRIu32", Trailing_bits: %"PRIu32"\n",
-+ row, offset1, shift1, offset1+full_bytes, trailing_bits);
- #endif
-
- bytebuff1 = bytebuff2 = 0;
-@@ -6840,11 +6836,12 @@ extractImageSection(struct image_data *i
-
- if (trailing_bits != 0)
- {
-- bytebuff2 = src_buff[offset2] & ((unsigned char)255 << (7 - shift2));
-+ /* Only copy higher bits of samples and mask lower bits of not wanted column samples to zero */
-+ bytebuff2 = src_buff[offset1 + full_bytes] & ((unsigned char)255 << (8 - trailing_bits));
- sect_buff[dst_offset] = bytebuff2;
- #ifdef DEVELMODE
- TIFFError ("", " Trailing bits src offset: %8"PRIu32", Dst offset: %8"PRIu32"\n",
-- offset2, dst_offset);
-+ offset1 + full_bytes, dst_offset);
- for (j = 30, k = 7; j < 38; j++, k--)
- {
- bitset = *(sect_buff + dst_offset) & (((unsigned char)1 << k)) ? 1 : 0;
-@@ -6863,8 +6860,10 @@ extractImageSection(struct image_data *i
- #endif
- for (j = 0; j <= full_bytes; j++)
- {
-- bytebuff1 = src_buff[offset1 + j] & ((unsigned char)255 >> shift1);
-- bytebuff2 = src_buff[offset1 + j + 1] & ((unsigned char)255 << (7 - shift1));
-+ /* Skip the first shift1 bits and shift the source up by shift1 bits before save to destination.*/
-+ /* Attention: src_buff size needs to be some bytes larger than image size, because could read behind image here. */
-+ bytebuff1 = src_buff[offset1 + j] & ((unsigned char)255 >> shift1);
-+ bytebuff2 = src_buff[offset1 + j + 1] & ((unsigned char)255 << (8 - shift1));
- sect_buff[dst_offset + j] = (bytebuff1 << shift1) | (bytebuff2 >> (8 - shift1));
- }
- #ifdef DEVELMODE
-@@ -6880,36 +6879,17 @@ extractImageSection(struct image_data *i
- #endif
- dst_offset += full_bytes;
-
-+ /* Copy the trailing_bits for the last byte in the destination buffer.
-+ Could come from one ore two bytes of the source buffer. */
- if (trailing_bits != 0)
- {
- #ifdef DEVELMODE
-- TIFFError ("", " Trailing bits src offset: %8"PRIu32", Dst offset: %8"PRIu32"\n", offset1 + full_bytes, dst_offset);
--#endif
-- if (shift2 > shift1)
-- {
-- bytebuff1 = src_buff[offset1 + full_bytes] & ((unsigned char)255 << (7 - shift2));
-- bytebuff2 = bytebuff1 & ((unsigned char)255 << shift1);
-- sect_buff[dst_offset] = bytebuff2;
--#ifdef DEVELMODE
-- TIFFError ("", " Shift2 > Shift1\n");
-+ TIFFError("", " Trailing bits %4"PRIu32" src offset: %8"PRIu32", Dst offset: %8"PRIu32"\n", trailing_bits, offset1 + full_bytes, dst_offset);
- #endif
-+ /* More than necessary bits are already copied into last destination buffer,
-+ * only masking of last byte in destination buffer is necessary.*/
-+ sect_buff[dst_offset] &= ((uint8_t)0xFF << (8 - trailing_bits));
- }
-- else
-- {
-- if (shift2 < shift1)
-- {
-- bytebuff2 = ((unsigned char)255 << (shift1 - shift2 - 1));
-- sect_buff[dst_offset] &= bytebuff2;
--#ifdef DEVELMODE
-- TIFFError ("", " Shift2 < Shift1\n");
--#endif
-- }
Home |
Main Index |
Thread Index |
Old Index