gentoo auto-resync : 28:12:2023 - 01:37:43

2 files changed, 0 insertions, 51 deletions

diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 8773607b8be7..0eaa780ce652 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,5 +1,4 @@
 AUX libwebp-1.2.3-libpng-pkg-config.patch 1894 BLAKE2B 80c19e65b1f913fdf0e9dd37ca603bcf89bd7dd71cf81ebd8beab6bcf671b76482b3d6d053f53558463c7f3e139897382c90aad5a5cebbd8c49ce4512e7f048c SHA512 3b80c89eb4643a315af594158ca370b71f38ab285cfaa3d1b8d90b09aa420750dccd46f1222b1b9a983af6e9dc501da2d6c732c05a2a3b097ba0437785cc80c7
-AUX libwebp-1.2.4-CVE-2023-1999.patch 1734 BLAKE2B 087b1bb4be5d3aceb7796ecbf497d6dc5396eab4b944d7c29bd15f939c9d891d5b0463770196cae87fa8bce2561e874e00fdaf1c05eada87258546956ca26c0a SHA512 6b108f30b2aa3326d1f4acf69bc7b01145e9a6922bcdaf01d5bd052418b9789706dd3757341a7eb5847e7ef42146fdd0ba7397b66e0003571008de7d88371d8f
 DIST libwebp-1.3.1-p20230908.tar.gz 3690666 BLAKE2B 895c9d384e0b40403940db093f8022fa81e67ce980711e3958d6614bf6aa9c9bd2cb01c1eba02b72028474f662f2ac996b14f0df5029690881053d55016dd9ab SHA512 4f93ef865dd653254089c9fdc8209a3add9a909002fbb56fc0784856dc50a6349c95ca6a06cb26601cd4233a09122009d61ad24e67258b069748ad9bb4da0c80
 DIST libwebp-1.3.1-p20230912.tar.gz 3690965 BLAKE2B f0d913d0b4516989f60345932e9259af1bfc1af85048a54c0aa25c6fdabd5948fcf59173253f9caa6c4b0ab96724b223ab65dabedd20bc9d6722fa4bfa712b38 SHA512 aa53084668cd5c345f4a73bd6c69c2eb411e73c735e5b6a2f76e935ab0f7519e9064bba9405df18c084686e8b95ba2335e2b534253b113c5a03aa63e259f07a8
 DIST libwebp-1.3.2.tar.gz 4162949 BLAKE2B 12b3ff3aa9952dd32ce13656146556d5efb6a66860249a8676721980aee10253a1b0335685a769d995e9954cd305190a8ed1878ba4fefce9dcaf41a3976f9e3d SHA512 2b624d2ecfbff6b4db2719e38f146722638ae262acd96327073a04451dd05fb27ef70c5681187821d251df728a6be7e89209c861c561a13bfb786495a830bc20
diff --git a/media-libs/libwebp/files/libwebp-1.2.4-CVE-2023-1999.patch b/media-libs/libwebp/files/libwebp-1.2.4-CVE-2023-1999.patch
deleted file mode 100644
index 9c023712a5aa..000000000000
--- a/media-libs/libwebp/files/libwebp-1.2.4-CVE-2023-1999.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit a486d800b60d0af4cc0836bf7ed8f21e12974129
-Author: James Zern <jzern@google.com>
-Date:   Wed Feb 22 22:15:47 2023 -0800
-
-    EncodeAlphaInternal: clear result->bw on error
-    
-    This avoids a double free should the function fail prior to
-    VP8BitWriterInit() and a previous trial result's buffer carried over.
-    Previously in ApplyFiltersAndEncode() trial.bw (with a previous
-    iteration's buffer) would be freed, followed by best.bw pointing to the
-    same buffer.
-    
-    Since:
-    187d379d add a fallback to ALPHA_NO_COMPRESSION
-    
-    In addition, check the return value of VP8BitWriterInit() in this
-    function.
-    
-    Bug: webp:603
-    Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910
-
-diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c
-index f7c02690..7d205586 100644
---- a/src/enc/alpha_enc.c
-+++ b/src/enc/alpha_enc.c
-@@ -13,6 +13,7 @@
- 
- #include <assert.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "src/enc/vp8i_enc.h"
- #include "src/dsp/dsp.h"
-@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
-       }
-     } else {
-       VP8LBitWriterWipeOut(&tmp_bw);
-+      memset(&result->bw, 0, sizeof(result->bw));
-       return 0;
-     }
-   }
-@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
-   header = method | (filter << 2);
-   if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4;
- 
--  VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size);
-+  if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0;
-   ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN);
-   ok = ok && VP8BitWriterAppend(&result->bw, output, output_size);
-