CVS commit: pkgsrc/graphics/libjpeg-turbo

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Feb  1 12:39:30 UTC 2023

Modified Files:
        pkgsrc/graphics/libjpeg-turbo: Makefile distinfo
        pkgsrc/graphics/libjpeg-turbo/patches: patch-simd_arm__aarch32_jsimd.c
            patch-simd_arm__aarch64_jsimd.c

Log Message:
libjpeg-turbo: updated to 2.1.5

Significant changes relative to 2.1.4

Fixed issues in the build system whereby, when using the Ninja Multi-Config CMake generator, a static build of libjpeg-turbo (a build in which ENABLE_SHARED is 0) could not be installed, a Windows 
installer could not be built, and the Java regression tests failed.

Fixed a regression introduced by 2.0 beta1[15] that caused a buffer overrun in the progressive Huffman encoder when attempting to transform a specially-crafted malformed 12-bit-per-component JPEG 
image into a progressive 12-bit-per-component JPEG image using a 12-bit-per-component build of libjpeg-turbo (-DWITH_12BIT=1.) Given that the buffer overrun was fully contained within the progressive 
Huffman encoder structure and did not cause a segfault or other user-visible errant behavior, given that the lossless transformer (unlike the decompressor) is not generally exposed to arbitrary data 
exploits, and given that 12-bit-per-component builds of libjpeg-turbo are uncommon, this issue did not likely pose a security risk.

Fixed an issue whereby, when using a 12-bit-per-component build of libjpeg-turbo (-DWITH_12BIT=1), passing samples with values greater than 4095 or less than 0 to jpeg_write_scanlines() caused a 
buffer overrun or underrun in the RGB-to-YCbCr color converter.

Fixed a floating point exception that occurred when attempting to use the jpegtran -drop and -trim options to losslessly transform a specially-crafted malformed JPEG image.

Fixed an issue in tjBufSizeYUV2() whereby it returned a bogus result, rather than throwing an error, if the align parameter was not a power of 2. Fixed a similar issue in tjCompressFromYUV() whereby 
it generated a corrupt JPEG image in certain cases, rather than throwing an error, if the align parameter was not a power of 2.

Fixed an issue whereby tjDecompressToYUV2(), which is a wrapper for tjDecompressToYUVPlanes(), used the desired YUV image dimensions rather than the actual scaled image dimensions when computing the 
plane pointers and strides to pass to tjDecompressToYUVPlanes(). This caused a buffer overrun and subsequent segfault if the desired image dimensions exceeded the scaled image dimensions.

Fixed an issue whereby, when decompressing a 12-bit-per-component JPEG image (-DWITH_12BIT=1) using an alpha-enabled output color space such as JCS_EXT_RGBA, the alpha channel was set to 255 rather 
than 4095.

Fixed an issue whereby the Java version of TJBench did not accept a range of quality values.

Fixed an issue whereby, when -progressive was passed to TJBench, the JPEG input image was not transformed into a progressive JPEG image prior to decompression.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/libjpeg-turbo/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/libjpeg-turbo/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch32_jsimd.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch64_jsimd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/libjpeg-turbo/Makefile
diff -u pkgsrc/graphics/libjpeg-turbo/Makefile:1.28 pkgsrc/graphics/libjpeg-turbo/Makefile:1.29
--- pkgsrc/graphics/libjpeg-turbo/Makefile:1.28 Tue Jan 24 18:36:27 2023
+++ pkgsrc/graphics/libjpeg-turbo/Makefile      Wed Feb  1 12:39:30 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2023/01/24 18:36:27 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2023/02/01 12:39:30 adam Exp $
 
-DISTNAME=      libjpeg-turbo-2.1.4
+DISTNAME=      libjpeg-turbo-2.1.5
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
 

Index: pkgsrc/graphics/libjpeg-turbo/distinfo
diff -u pkgsrc/graphics/libjpeg-turbo/distinfo:1.23 pkgsrc/graphics/libjpeg-turbo/distinfo:1.24
--- pkgsrc/graphics/libjpeg-turbo/distinfo:1.23 Sun Aug 14 20:57:40 2022
+++ pkgsrc/graphics/libjpeg-turbo/distinfo      Wed Feb  1 12:39:30 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2022/08/14 20:57:40 adam Exp $
+$NetBSD: distinfo,v 1.24 2023/02/01 12:39:30 adam Exp $
 
-BLAKE2s (libjpeg-turbo-2.1.4.tar.gz) = 2c9813bdf0f93af4a797d674f3080017dd8501793d69ef50b64d9fb627646ef9
-SHA512 (libjpeg-turbo-2.1.4.tar.gz) = 511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70
-Size (libjpeg-turbo-2.1.4.tar.gz) = 2261822 bytes
+BLAKE2s (libjpeg-turbo-2.1.5.tar.gz) = 0bb558238a3e9cbcc91e5a35027e90c2f868ca3e388bad2826403c38269675cb
+SHA512 (libjpeg-turbo-2.1.5.tar.gz) = ceab6d1c3c46d2816b06402e3b912e950d887fc8a6fb32fa6876f4aaa663b4769d8f4c50e1b967addf6704d0760ca14ed723d55e0312d7ca69e7f2a91484c0dc
+Size (libjpeg-turbo-2.1.5.tar.gz) = 2264471 bytes
 SHA1 (patch-jpeglib.h) = 22f69b5fed1882c33f4a8a6e42b8aca5ed195de3
-SHA1 (patch-simd_arm__aarch32_jsimd.c) = 1176982b19289e7f664d078a31f7c470e453ed51
-SHA1 (patch-simd_arm__aarch64_jsimd.c) = 0e8fac36a9abc70e8526370237c7cdd28be519ef
+SHA1 (patch-simd_arm__aarch32_jsimd.c) = 0d35d6f0727709d4e894202a3a297fc66383c377
+SHA1 (patch-simd_arm__aarch64_jsimd.c) = 76c5e81403f70a8ea8bca8ae2266066fff5ec6f9

Index: pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch32_jsimd.c
diff -u pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch32_jsimd.c:1.2 pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch32_jsimd.c:1.3
--- pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch32_jsimd.c:1.2   Sun Aug 14 20:57:40 2022
+++ pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch32_jsimd.c       Wed Feb  1 12:39:30 2023
@@ -1,19 +1,20 @@
-$NetBSD: patch-simd_arm__aarch32_jsimd.c,v 1.2 2022/08/14 20:57:40 adam Exp $
+$NetBSD: patch-simd_arm__aarch32_jsimd.c,v 1.3 2023/02/01 12:39:30 adam Exp $
 
---- simd/arm/aarch32/jsimd.c.orig      2022-08-08 21:03:55.000000000 +0000
+NetBSD support.
+
+--- simd/arm/aarch32/jsimd.c.orig      2023-01-28 00:24:41.000000000 +0000
 +++ simd/arm/aarch32/jsimd.c
-@@ -27,6 +27,10 @@
+@@ -26,6 +26,9 @@
+ #include "../../jsimd.h"
  
  #include <ctype.h>
- 
 +#if defined(__NetBSD__)
 +#include <sys/sysctl.h>
 +#endif
-+
- static unsigned int simd_support = ~0;
- static unsigned int simd_huffman = 1;
  
-@@ -107,6 +111,9 @@ init_simd(void)
+ static THREAD_LOCAL unsigned int simd_support = ~0;
+ static THREAD_LOCAL unsigned int simd_huffman = 1;
+@@ -105,6 +108,9 @@ init_simd(void)
  #endif
  #if !defined(__ARM_NEON__) && (defined(__linux__) || defined(ANDROID) || defined(__ANDROID__))
    int bufsize = 1024; /* an initial guess for the line buffer size limit */
@@ -23,7 +24,7 @@ $NetBSD: patch-simd_arm__aarch32_jsimd.c
  #endif
  
    if (simd_support != ~0U)
-@@ -125,6 +132,10 @@ init_simd(void)
+@@ -123,6 +129,10 @@ init_simd(void)
      if (bufsize > SOMEWHAT_SANE_PROC_CPUINFO_SIZE_LIMIT)
        break;
    }

Index: pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch64_jsimd.c
diff -u pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch64_jsimd.c:1.1 pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch64_jsimd.c:1.2
--- pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch64_jsimd.c:1.1   Mon Apr 26 08:18:48 2021
+++ pkgsrc/graphics/libjpeg-turbo/patches/patch-simd_arm__aarch64_jsimd.c       Wed Feb  1 12:39:30 2023
@@ -1,19 +1,20 @@
-$NetBSD: patch-simd_arm__aarch64_jsimd.c,v 1.1 2021/04/26 08:18:48 adam Exp $
+$NetBSD: patch-simd_arm__aarch64_jsimd.c,v 1.2 2023/02/01 12:39:30 adam Exp $
 
---- simd/arm/aarch64/jsimd.c.orig      2021-04-23 16:42:40.000000000 +0000
+NetBSD support.
+
+--- simd/arm/aarch64/jsimd.c.orig      2023-01-28 00:24:41.000000000 +0000
 +++ simd/arm/aarch64/jsimd.c
-@@ -33,6 +33,10 @@
- #define JSIMD_FASTST3  2
- #define JSIMD_FASTTBL  4
+@@ -25,6 +25,9 @@
+ #include "../../jsimd.h"
  
+ #include <ctype.h>
 +#if defined(__NetBSD__)
 +#include <sys/sysctl.h>
 +#endif
-+
- static unsigned int simd_support = ~0;
- static unsigned int simd_huffman = 1;
- static unsigned int simd_features = JSIMD_FASTLD3 | JSIMD_FASTST3 |
-@@ -129,6 +133,9 @@ init_simd(void)
+ 
+ #define JSIMD_FASTLD3  1
+ #define JSIMD_FASTST3  2
+@@ -124,6 +127,9 @@ init_simd(void)
  #endif
  #if defined(__linux__) || defined(ANDROID) || defined(__ANDROID__)
    int bufsize = 1024; /* an initial guess for the line buffer size limit */
@@ -23,7 +24,7 @@ $NetBSD: patch-simd_arm__aarch64_jsimd.c
  #endif
  
    if (simd_support != ~0U)
-@@ -143,6 +150,10 @@ init_simd(void)
+@@ -138,6 +144,10 @@ init_simd(void)
      if (bufsize > SOMEWHAT_SANE_PROC_CPUINFO_SIZE_LIMIT)
        break;
    }