gentoo auto-resync : 01:09:2023 - 16:14:02

3 files changed, 168 insertions, 1 deletions

diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 61c5c63ba670..747cecbbfd2e 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -3,6 +3,7 @@ AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174
 AUX coreutils-9.1-fix-rename-simple-backups.patch 1343 BLAKE2B b284b2b7d33fe7650a4ac8723ca5566e819cd4f4740394cc549562a03fe7ed95d29cfb688a9e5513edcea1f9d5f7b72f1a530f9bf5093ad4dc6534a494e9f91c SHA512 900128c08b096c39302193855fdbb980c54597acf3349b9014ced500e344b7f47438722342e3a7d68f8c4588632769a11165c5c06796993d3b9aca019de8468a
 AUX coreutils-9.3-cp-parents-preserve-permissions.patch 3436 BLAKE2B de9fa1038b34ec2134c39758840e5a619ed5b3e60ebd9ad280e3e1a117f76143ccec852f74ac8da3f29604e8bdc92dcc134a19da756b759fb15d5bc632dda74c SHA512 e19afd35150c188a4ad14844463181f391ab6fbc9b4b812677df693f6181045f3dc63c42f2755e19f03bc2a608d041f3e0943537bc9d783b03819ce9928a962b
 AUX coreutils-9.3-old-kernel-copy_file_range.patch 3009 BLAKE2B 29be489f9544a1434708c73bc886605002e34fe430cbda062396cebb7fcb12bfb6062e1c032bb7ca2e49e2306b35150ca14e49a0a84d9b3a40ce0603dfa14c09 SHA512 5106a85a00aa7781514102e64ea2528221399009e9bfe842b0717bc1746cf9e4875aa00f9a3e56326ce2edc65a4cfc19c140a50a6528cd9131a7e41b4c785514
+AUX coreutils-9.4-gnulib-openssl-1.1.patch 6061 BLAKE2B af816c12ba6867d25d7ffb1d6213ac01e3107f0ae894c0f6452d348bf6d56cf57059fd967ab0ead7c290f7a2cb45494c5add7edace7d75ad9b89eb438b9f1d41 SHA512 9ef9ee4a987fa169dddc358fd51f37011173c9f82d81021d36faaf1dbd425d3e7f718724ad76ac61febdae76d5442a8b9e14a5638bdb52c2d256b104924ea2d0
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f
@@ -17,6 +18,6 @@ EBUILD coreutils-8.32-r1.ebuild 5971 BLAKE2B df0b4420c70792707eac0b612bc8436ce46
 EBUILD coreutils-9.1-r2.ebuild 7117 BLAKE2B 5db5bc551fc63dfdb56044f31ab7e96d240075c2dbb6e062064922d9e31d8de12f87ce713067e06b91963365e7d7809150558dd6626ceb2da1a0708f64b1f770 SHA512 e3269b4dca6f1468f77aaafd0561833dc11a019463b05709f6485548610fd4040ae274258415b56d4e42d86ef3ad4914d4aced8d8a50c6002b6e95ea1f12e6a3
 EBUILD coreutils-9.3-r2.ebuild 7793 BLAKE2B be5554b0d39de8ebce7918295ae8eba0a8132e0e86cb9ab48664671133198d9b3d68d0c6f9865c2e6865b4cb1e4d931cc79239ba216cddd0d06ee3483f600c1a SHA512 0d582fff70ab30368e363eaf41569fe02b7180e734d88ff4d1345cb0889cc37720c0edc3cc3a7caf685e0aef4b42c208c2c8c12eccd4100999383867d3408993
 EBUILD coreutils-9.3-r3.ebuild 7930 BLAKE2B 8e8c83734bab7265d14fac68375e37a2ee8f5c24179487a38c6d25bd65e8fb0dce0182a94c59a1650b19a48bac5dee13e9fba99baa746650874df368f8717b59 SHA512 044d48420ce3efb2ade8c3dbb699b69434cc82e8983fc67bf7c93ab292a1f6b86d68f3bb64098b4fe129d081e159a1915317f8661a83e5f2a5b58b6ef968be8e
-EBUILD coreutils-9.4.ebuild 7829 BLAKE2B e6d50cb5a297b2d01b08c308bd22542b283c75cff8e5a8132c4adfd428f98da84c3163a1dc45fbfc56696d17b119b50c9ec5ef67926abae53c437a4beedc2ed4 SHA512 53bd35ef8328510f494b559e806f794e1aabfaad0c6aed0d3791eb05bc975ae9617248ed2b26fbc4c15c408aa7df6a350d5eef962357f0fbd1d67a4c36c7c778
+EBUILD coreutils-9.4.ebuild 7875 BLAKE2B 4bd3ab9febde69444b7fdab8eecc5db1e0fb1038842f1f1c4e7adfc138e584b3b2ee95202e657cb17a1e41e6bf13dfe769875d695b1063ee1ee5823a46ac2bac SHA512 9b6c4a1ff5d3b03f88e2acc31582bbc97672847673dc794b88146ee819b5c180646eebc8aace17ffa3b98c957b5e04cf2a9d8d16c978805718c52dfb80d91c06
 EBUILD coreutils-9999.ebuild 7829 BLAKE2B e6d50cb5a297b2d01b08c308bd22542b283c75cff8e5a8132c4adfd428f98da84c3163a1dc45fbfc56696d17b119b50c9ec5ef67926abae53c437a4beedc2ed4 SHA512 53bd35ef8328510f494b559e806f794e1aabfaad0c6aed0d3791eb05bc975ae9617248ed2b26fbc4c15c408aa7df6a350d5eef962357f0fbd1d67a4c36c7c778
 MISC metadata.xml 1093 BLAKE2B 68a653fe54fc668c7f2c7c01904cfca5a071192de4370dcbba427e673f8e9ec33b5104a868a5493117ef24e277446181383140c621b105689797aec4e077b86e SHA512 bf8f2653a1a81edb6e4090b127c5660e0c5ab41a33c985dea1b5cb05c6656b04f42084ce4e561f4550c3e54630893314d3084011c673e7d5aded022be1c065d1
diff --git a/sys-apps/coreutils/coreutils-9.4.ebuild b/sys-apps/coreutils/coreutils-9.4.ebuild
index 1eeb24a0282e..65deec47eb27 100644
--- a/sys-apps/coreutils/coreutils-9.4.ebuild
+++ b/sys-apps/coreutils/coreutils-9.4.ebuild
@@ -111,6 +111,7 @@ src_prepare() {
 	# TODO: past 2025, we may need to add our own hack for bug #907474.
 	local PATCHES=(
 		# Upstream patches
+		"${FILESDIR}"/${P}-gnulib-openssl-1.1.patch
 	)
 
 	if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
diff --git a/sys-apps/coreutils/files/coreutils-9.4-gnulib-openssl-1.1.patch b/sys-apps/coreutils/files/coreutils-9.4-gnulib-openssl-1.1.patch
new file mode 100644
index 000000000000..3576c7d0d1eb
--- /dev/null
+++ b/sys-apps/coreutils/files/coreutils-9.4-gnulib-openssl-1.1.patch
@@ -0,0 +1,165 @@
+https://bugs.gentoo.org/913368
+https://debbugs.gnu.org/65674
+https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=ce20e238f0b4448a098bd7c076c131edbc759764
+
+From ce20e238f0b4448a098bd7c076c131edbc759764 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Fri, 1 Sep 2023 12:55:30 +0200
+Subject: crypto/{sha*,md5,sm3}-buffer: Fix --with-openssl (regr. 2023-08-26).
+
+Reported by Agostino Sarubbo via Sam James <sam@gentoo.org> in
+<https://lists.gnu.org/archive/html/bug-gnulib/2023-09/msg00000.html>.
+
+* lib/sha1.h: Test the OpenSSL major version before attempting to
+include <openssl/configuration.h>.
+* lib/sha256.h: Likewise.
+* lib/sha512.h: Likewise.
+* lib/md5.h: Likewise.
+* lib/sm3.h: Likewise.
+--- a/lib/md5.h
++++ b/lib/md5.h
+@@ -33,14 +33,18 @@
+ #   define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API.  */
+ #  endif
+ /* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL.  */
+-#  include <openssl/configuration.h>
+-#  if (OPENSSL_CONFIGURED_API \
+-       < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
+-          ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
+-          + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-          + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
+-#   undef HAVE_OPENSSL_MD5
+-#  else
++#  include <openssl/opensslv.h>
++#  if OPENSSL_VERSION_MAJOR >= 3
++#   include <openssl/configuration.h>
++#   if (OPENSSL_CONFIGURED_API \
++        < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
++           ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
++           + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
++           + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
++#    undef HAVE_OPENSSL_MD5
++#   endif
++#  endif
++#  if HAVE_OPENSSL_MD5
+ #   include <openssl/md5.h>
+ #  endif
+ # endif
+--- a/lib/sha1.h
++++ b/lib/sha1.h
+@@ -32,14 +32,18 @@
+ #   define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API.  */
+ #  endif
+ /* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL.  */
+-#  include <openssl/configuration.h>
+-#  if (OPENSSL_CONFIGURED_API \
+-       < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
+-          ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
+-          + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-          + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
+-#   undef HAVE_OPENSSL_SHA1
+-#  else
++#  include <openssl/opensslv.h>
++#  if OPENSSL_VERSION_MAJOR >= 3
++#   include <openssl/configuration.h>
++#   if (OPENSSL_CONFIGURED_API \
++        < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
++           ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
++           + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
++           + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
++#    undef HAVE_OPENSSL_SHA1
++#   endif
++#  endif
++#  if HAVE_OPENSSL_SHA1
+ #   include <openssl/sha.h>
+ #  endif
+ # endif
+--- a/lib/sha256.h
++++ b/lib/sha256.h
+@@ -31,14 +31,18 @@
+ #   define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API.  */
+ #  endif
+ /* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL.  */
+-#  include <openssl/configuration.h>
+-#  if (OPENSSL_CONFIGURED_API \
+-       < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
+-          ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
+-          + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-          + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
+-#   undef HAVE_OPENSSL_SHA256
+-#  else
++#  include <openssl/opensslv.h>
++#  if OPENSSL_VERSION_MAJOR >= 3
++#   include <openssl/configuration.h>
++#   if (OPENSSL_CONFIGURED_API \
++        < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
++           ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
++           + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
++           + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
++#    undef HAVE_OPENSSL_SHA256
++#   endif
++#  endif
++#  if HAVE_OPENSSL_SHA256
+ #   include <openssl/sha.h>
+ #  endif
+ # endif
+--- a/lib/sha512.h
++++ b/lib/sha512.h
+@@ -31,14 +31,18 @@
+ #   define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API.  */
+ #  endif
+ /* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL.  */
+-#  include <openssl/configuration.h>
+-#  if (OPENSSL_CONFIGURED_API \
+-       < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
+-          ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
+-          + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-          + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
+-#   undef HAVE_OPENSSL_SHA512
+-#  else
++#  include <openssl/opensslv.h>
++#  if OPENSSL_VERSION_MAJOR >= 3
++#   include <openssl/configuration.h>
++#   if (OPENSSL_CONFIGURED_API \
++        < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
++           ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
++           + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
++           + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
++#    undef HAVE_OPENSSL_SHA512
++#   endif
++#  endif
++#  if HAVE_OPENSSL_SHA512
+ #   include <openssl/sha.h>
+ #  endif
+ # endif
+--- a/lib/sm3.h
++++ b/lib/sm3.h
+@@ -40,14 +40,18 @@
+ #   define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API.  */
+ #  endif
+ /* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL.  */
+-#  include <openssl/configuration.h>
+-#  if (OPENSSL_CONFIGURED_API \
+-       < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
+-          ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
+-          + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-          + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
+-#   undef HAVE_OPENSSL_SM3
+-#  else
++#  include <openssl/opensslv.h>
++#  if OPENSSL_VERSION_MAJOR >= 3
++#   include <openssl/configuration.h>
++#   if (OPENSSL_CONFIGURED_API \
++        < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
++           ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
++           + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
++           + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
++#    undef HAVE_OPENSSL_SM3
++#   endif
++#  endif
++#  if HAVE_OPENSSL_SM3
+ #   include <openssl/sm3.h>
+ #  endif
+ # endif
+-- 
+cgit v1.1