gentoo auto-resync : 30:01:2024 - 11:49:23

3 files changed, 100 insertions, 1 deletions

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 4d437e5998cc..dfcb12ad38ee 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,7 +1,8 @@
+AUX libpng-1.6.41-png_check_sig-abi.patch 3351 BLAKE2B e82003b3ff543754aabedfea7e1d7911e1918598c1e8bf0c31b937403790d08fe12003281020b93195be8bcd01bf5269b0ec9200ac17a4c5d4e9da621929ac69 SHA512 d613724d09b3780e6afb6b2c34b146bd3c919cedf29619a6faea9cc62d70d5175d649450d10954ddc78c599bffd121eae36ceaf7feb97a603e2d8f7b8e6532c9
 DIST libpng-1.6.40-apng-apng.patch.gz 10330 BLAKE2B e2a5ff10ebaf75019d20edb148ea26fd6b255842aa34e8af31a919ae3c059b28eb827831289f47428e5f55c239f23a600677fde58e74bf0a2db27b5001f9ccb1 SHA512 803c45c2bbaf6c12863a09fb4d307c629680835b11a01c456512c81ef705e4f96c29e98c2486970ff1d86335cb4bd7568a30482c3e69601275d2a31d294058db
 DIST libpng-1.6.40-libpng-apng-apng.patch.gz 10815 BLAKE2B 47b09d730d6be1d481ab48e511068a38fc3448339aaeab1d8ad21f26de6cb79006c64785de2e0514ff820a75101c0010b84cce923d10e8f6198e4e99916d08f2 SHA512 373cc9f0df15f7c77c0a59ddaac22374cfae37174b63a642e68e3a17a6d0bb1015399d771998c7eb6b356b634f157f0009743f4cc659f3b8e480a9533010ef9c
 DIST libpng-1.6.40.tar.xz 1021332 BLAKE2B 4dd2df57791ca68cc31ba966b9176ecb37458572c60eef34e31ff0d3266d25ad6ea9d2e8cae6bfaf7932b5c7bc231047d3ed139b3464304c41cc4d89611f5ba8 SHA512 a2ec37c529bf80f3fee3798191d080d06e14d6a1ffecd3c1a02845cb9693b5e308a1d82598a376101f9312d989d19f1fb6735b225d4b0b9f1b73f9f8a3edb17f
 DIST libpng-1.6.41.tar.xz 1035328 BLAKE2B 43d8d1c563d9df46b663f706dca9563e31e6e47a2809a77a5d059de8cfa348721054df724d08ac24ef4717ffc101989941127df2d026c9537532375d9b432b68 SHA512 046d0328255572ee2ccab7e751ed457b07e0aedc72474c2f4675a8303e628de3ef8afa1a00c60d768eb788546d1cda1e8b800b2497d9c352694faba6dde2c5b4
 EBUILD libpng-1.6.40-r1.ebuild 1911 BLAKE2B e95dd7c1dd841404513628bda79780fd77ffb33f6f08ef138c31f47bc2ecf42bfccbd6f4b678e61af9a0bf2c1269990692affe45c91c93260e1737d17fcf73a3 SHA512 f4a910abd65acd9445e0f393b2c354bbd9539c3860fe311582de19eb43930e23eaff41675676c2a1816d8b4d069852ad84e84eedcf06df2894ea6c3487871388
-EBUILD libpng-1.6.41.ebuild 2019 BLAKE2B f29620569a4a23e3a1e552520e76754c43820f70f31324a0341cf2f9c0f69d192eec221d222d94092d48bcedf14f84ae90f6d850fb87d7cb5381c321310028a3 SHA512 d1a2f30d1f00dba9a21adc5225e659ec62b542dabff39bd987f3dd5f46e70f603d85997c1c7b417e96718f33013ed577c47e45aaccbdd58f47703257c29c4276
+EBUILD libpng-1.6.41-r1.ebuild 2076 BLAKE2B 2341b8d974ea6b42115ef28646788b3d98b91e835d628425e17882063643285246ba92eba01c9894c202ef0af51da8aa4ceb72bdbb4e8c04fa3ffafc2cc22e8e SHA512 e31cda268166830a5919030000b6f56115152eddf067ecc10d01981c6bb52982011c87cda19127f634ad0f9229e10be3309a6a12bc9c99d14f1be7a648fba696
 MISC metadata.xml 958 BLAKE2B 6d7a0f6ea2903876e7df7b07f0a5f116d83b188ca1acba2dd6664ecda03a9695c9e3b76b26649dd5198e49d950d91e31f5aa792b3abd7109b76aedbf43cfc843 SHA512 15269d4c49e08bfd993b4248cbef9ea095f0254c68177bc498ddf622a8fdcda01e6e6f17550c698ab79e896d9f3b4af01ef7966006d4902d9101b39844c1670d
diff --git a/media-libs/libpng/files/libpng-1.6.41-png_check_sig-abi.patch b/media-libs/libpng/files/libpng-1.6.41-png_check_sig-abi.patch
new file mode 100644
index 000000000000..d2913b062f26
--- /dev/null
+++ b/media-libs/libpng/files/libpng-1.6.41-png_check_sig-abi.patch
@@ -0,0 +1,94 @@
+https://bugs.gentoo.org/923298
+https://github.com/pnggroup/libpng/commit/ac944e2b364cff96e8458110c2ad06a63f8543b3
+
+From ac944e2b364cff96e8458110c2ad06a63f8543b3 Mon Sep 17 00:00:00 2001
+From: Cosmin Truta <ctruta@gmail.com>
+Date: Mon, 29 Jan 2024 15:30:10 +0200
+Subject: [PATCH] Fix a regression introduced in "chore: Clean up the return
+ statements"
+
+This fixes commit 27e548af2518ff8d278b45c40d11ad1bdd68eaa0.
+
+The macro `png_check_sig` has been deprecated and remained untested
+for decades. And yet, somehow it escaped from all past API cleanups.
+
+Also update the libpng manual.
+
+Reported-by: Matthieu Darbois
+--- a/libpng-manual.txt
++++ b/libpng-manual.txt
+@@ -357,7 +357,7 @@ Customizing libpng.
+        return ERROR;
+     }
+ 
+-    is_png = !png_sig_cmp(header, 0, number);
++    is_png = (png_sig_cmp(header, 0, number) == 0);
+     if (!is_png)
+     {
+        return NOT_PNG;
+@@ -4692,7 +4692,7 @@ deprecated since libpng-1.0.16 and libpng-1.2.6.
+ The function
+     png_check_sig(sig, num)
+ was replaced with
+-    !png_sig_cmp(sig, 0, num)
++    png_sig_cmp(sig, 0, num) == 0
+ It has been deprecated since libpng-0.90.
+ 
+ The function
+@@ -4756,8 +4756,8 @@ png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),
+ png_set_asm_flags(), and png_mmx_supported()
+ 
+ We removed the obsolete png_check_sig(), png_memcpy_check(), and
+-png_memset_check() functions.  Instead use !png_sig_cmp(), memcpy(),
+-and memset(), respectively.
++png_memset_check() functions.  Instead use png_sig_cmp() == 0,
++memcpy(), and memset(), respectively.
+ 
+ The function png_set_gray_1_2_4_to_8() was removed. It has been
+ deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
+--- a/libpng.3
++++ b/libpng.3
+@@ -876,7 +876,7 @@ Customizing libpng.
+        return ERROR;
+     }
+ 
+-    is_png = !png_sig_cmp(header, 0, number);
++    is_png = (png_sig_cmp(header, 0, number) == 0);
+     if (!is_png)
+     {
+        return NOT_PNG;
+@@ -5211,7 +5211,7 @@ deprecated since libpng-1.0.16 and libpng-1.2.6.
+ The function
+     png_check_sig(sig, num)
+ was replaced with
+-    !png_sig_cmp(sig, 0, num)
++    png_sig_cmp(sig, 0, num) == 0
+ It has been deprecated since libpng-0.90.
+ 
+ The function
+@@ -5275,8 +5275,8 @@ png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),
+ png_set_asm_flags(), and png_mmx_supported()
+ 
+ We removed the obsolete png_check_sig(), png_memcpy_check(), and
+-png_memset_check() functions.  Instead use !png_sig_cmp(), memcpy(),
+-and memset(), respectively.
++png_memset_check() functions.  Instead use png_sig_cmp() == 0,
++memcpy(), and memset(), respectively.
+ 
+ The function png_set_gray_1_2_4_to_8() was removed. It has been
+ deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
+--- a/png.h
++++ b/png.h
+@@ -914,9 +914,9 @@ PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, size_t start,
+     size_t num_to_check));
+ 
+ /* Simple signature checking function.  This is the same as calling
+- * png_check_sig(sig, n) := (png_sig_cmp(sig, 0, n) != 0).
++ * png_check_sig(sig, n) := (png_sig_cmp(sig, 0, n) == 0).
+  */
+-#define png_check_sig(sig, n) (png_sig_cmp((sig), 0, (n)) != 0)
++#define png_check_sig(sig, n) (png_sig_cmp((sig), 0, (n)) == 0) /* DEPRECATED */
+ 
+ /* Allocate and initialize png_ptr struct for reading, and any other memory. */
+ PNG_EXPORTA(4, png_structp, png_create_read_struct,
+
diff --git a/media-libs/libpng/libpng-1.6.41.ebuild b/media-libs/libpng/libpng-1.6.41-r1.ebuild
index b198fcd653b4..e82599595cdf 100644
--- a/media-libs/libpng/libpng-1.6.41.ebuild
+++ b/media-libs/libpng/libpng-1.6.41-r1.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-png_check_sig-abi.patch
+)
+
 src_prepare() {
 	default