gentoo resync : 20.10.2021

4 files changed, 0 insertions, 144 deletions

diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
deleted file mode 100644
index 523eed7557d5..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/420239
-
-https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160
-
---- a/configure
-+++ b/configure
-@@ -33,7 +33,11 @@ case "$host_os" in
-   linux*)
-     case "$host_cpu" in
-       x86_64)
--        objfmt='ELF64'
-+        if echo __ILP32__ | $CC $CFLAGS -E - | grep __ILP32__ > /dev/null; then
-+          objfmt='ELF64'
-+        else
-+          objfmt='ELFX32'
-+        fi
-         ;;
-       *)
-         objfmt='ELF'
-@@ -94,6 +98,7 @@ case "$objfmt" in
-   a.out)      NAFLAGS='-faout -DAOUT';;
-   BSD-a.out)  NAFLAGS='-faoutb -DAOUT';;
-   ELF)        NAFLAGS='-felf -DELF';;
-+  ELFX32)     NAFLAGS='-felfx32 -DELF -D__x86_64__';;
-   ELF64)      NAFLAGS='-felf64 -DELF -D__x86_64__';;
-   RDF)        NAFLAGS='-frdf -DRDF';;
-   Mach-O)     NAFLAGS='-fmacho -DMACHO';;
---- a/simd/nasm_lt.sh
-+++ b/simd/nasm_lt.sh
-@@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do
-                 pic=yes
-             fi
-             ;;
--        -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \
-+        -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-felfx32|-fas86| \
-         -fobj|-fwin32|-fwin64|-frdf|-fieee|-fmacho|-fmacho64)
-             # it's a file format specifier for nasm.
-             command="$command $1"
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch
deleted file mode 100644
index 8a9fcbd79724..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1bfb0b5247f4fc8f6677639781ce468543490216 Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 2 Jun 2020 14:15:37 -0500
-Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM
-
-This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to
-include binary PPM files with maximum values < 255, thus preventing a
-malformed binary PPM input file with those specifications from
-triggering an overrun of the rescale array and potentially crashing
-cjpeg, TJBench, or any program that uses the tjLoadImage() function.
-
-Fixes #433
-diff --git a/rdppm.c b/rdppm.c
-index c0c096218..899436eec 100644
---- a/rdppm.c
-+++ b/rdppm.c
-@@ -5,7 +5,7 @@
-  * Copyright (C) 1991-1997, Thomas G. Lane.
-  * Modified 2009 by Bill Allombert, Guido Vollbeding.
-  * libjpeg-turbo Modifications:
-- * Copyright (C) 2015, 2016, D. R. Commander.
-+ * Copyright (C) 2015, 2016, 2020, D. R. Commander.
-  * For conditions of distribution and use, see the accompanying README.ijg
-  * file.
-  *
-@@ -22,6 +22,7 @@
-  * the file is indeed PPM format).
-  */
- 
-+#define JPEG_INTERNALS
- #include "cdjpeg.h"             /* Common decls for cjpeg/djpeg applications */
- 
- #ifdef PPM_SUPPORTED
-@@ -425,7 +426,7 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
-     /* On 16-bit-int machines we have to be careful of maxval = 65535 */
-     source->rescale = (JSAMPLE *)
-       (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
--                                  (size_t) (((long) maxval + 1L) *
-+                                  (size_t) (((long) MAX(maxval, 255) + 1L) *
-                                             sizeof(JSAMPLE)));
-     half_maxval = maxval / 2;
-     for (val = 0; val <= (long) maxval; val++) {
-
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch
deleted file mode 100644
index f99a1ab27f97..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 909a8cfc7bca9b2e6707425bdb74da997e8fa499 Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 12 Jun 2018 16:08:26 -0500
-Subject: [PATCH] Fix CVE-2018-11813
-
-Refer to change log for details.
-
-Fixes #242
----
- ChangeLog.md | 14 ++++++++++++++
- rdtarga.c    |  6 ++----
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
---- libjpeg-turbo-1.5.3/rdtarga.c
-+++ libjpeg-turbo-1.5.3/rdtarga.c
-@@ -125,11 +125,10 @@
- read_non_rle_pixel (tga_source_ptr sinfo)
- /* Read one Targa pixel from the input file; no RLE expansion */
- {
--  register FILE *infile = sinfo->pub.input_file;
-   register int i;
- 
-   for (i = 0; i < sinfo->pixel_size; i++) {
--    sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
-+    sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo);
-   }
- }
- 
-@@ -138,7 +137,6 @@
- read_rle_pixel (tga_source_ptr sinfo)
- /* Read one Targa pixel from the input file, expanding RLE data as needed */
- {
--  register FILE *infile = sinfo->pub.input_file;
-   register int i;
- 
-   /* Duplicate previously read pixel? */
-@@ -160,7 +158,7 @@
- 
-   /* Read next pixel */
-   for (i = 0; i < sinfo->pixel_size; i++) {
--    sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
-+    sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo);
-   }
- }
- 
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch
deleted file mode 100644
index c7e6d1056769..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Backported from
-https://github.com/libjpeg-turbo/libjpeg-turbo/commit/43e84cff1bb2bd8293066f6ac4eb0df61ddddbc6
-
---- libjpeg-turbo-1.5.3/rdbmp.c
-+++ libjpeg-turbo-1.5.3/rdbmp.c
-@@ -434,6 +434,12 @@
-     progress->total_extra_passes++; /* count file input as separate pass */
-   }
- 
-+  /* Ensure that biWidth * cinfo->input_components doesn't exceed the maximum
-+     value of the JDIMENSION type.  This is only a danger with BMP files, since
-+     their width and height fields are 32-bit integers. */
-+  if ((unsigned long long)biWidth *
-+      (unsigned long long)cinfo->input_components > 0xFFFFFFFFULL)
-+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
-   /* Allocate one-row buffer for returned data */
-   source->pub.buffer = (*cinfo->mem->alloc_sarray)
-     ((j_common_ptr) cinfo, JPOOL_IMAGE,