sys-apps/coreutils: Sync with Gentoo

It's from Gentoo commit a3a11cfe962d506e6e6e5c96cdab2376c8167110.

sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest

@@ -5,3 +5,6 @@ DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af
 DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
 DIST coreutils-9.3.tar.xz 5808696 BLAKE2B 11502cd2dbeef150d0d4cece2546bf6b835941b94456c258f6058338f0477f22e68e88934d075b08fe51ee4d1c0c50cb23d8084ac06a457d6e8975f01643b1cd SHA512 242271f212a6860bdc6c8d7e5c4f85ce66c1b48ef781aca9daa56e0fe7c2b7809ef72b4392120219fe5b687637c83ce89ceef8bb35f6274f43f8f968a6901694
 DIST coreutils-9.3.tar.xz.sig 833 BLAKE2B c45ae10ff706907ae65d31228e432f7d6f34acbdb733bf521437d9e2fc75828a59da9d432d894a1ed8b7341f7e15d0e8d4e816e209c799b75c14d0ec055bfdf2 SHA512 522a2072f8ef940228ccdd856a4041c3c16b98e309168ccf2066fe7c1013685ba6cdea8a7317dfa1f4507b37ca016ecedaf54438d4a5007927b0e1a8fd223eb5
+DIST coreutils-9.4-patches.tar.xz 6756 BLAKE2B 677454409ccb629fd0efde1e15d8f9c13f208391e63a17816011e84d4ca3fb2a42c2a60853f213ade2a53c821d76fd8924c59388d160c6e7c7fa5755e1db4c68 SHA512 2025c80b5ada92bafb479c678917862be208534becd8b347d335032c6b4cc23c7b7630f15ca7dd3b5d691567cb70f3491753e29441cc54d8700cc3d966a5e743
+DIST coreutils-9.4.tar.xz 5979200 BLAKE2B 83d41c48804c1d470c0e5eed38e692bb6875436dda3f6e2c29784ad6ef563d86e8e066a050e222621b400f78ea4630b1e127d20fc9b76f12096528c42677e35d SHA512 7c55ee23b685a0462bbbd118b04d25278c902604a0dcf3bf4f8bf81faa0500dee5a7813cba6f586d676c98e520cafd420f16479619305e94ea6798d8437561f5
+DIST coreutils-9.4.tar.xz.sig 833 BLAKE2B 870f7eb28e8851f41954820c7f4f4b43a965e6650b303b79541dfdf98ca0cd52fe964d7eec72bea68066452d7ad21a01df5e4db9e5bc4c20bf26d8b416856446 SHA512 9674f783f592c4f3e5c708ff31426ac009bf132fd0005019571bf39c8a1627efb5351c6cecc7faecb1eff8fa2970318666593bffc0eda9c750159e174ef42524

sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4.ebuild

@@ -0,0 +1,273 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
+# The upstream coreutils maintainers also maintain the package in Fedora and may
+# backport fixes which we want to pick up.
+#
+# Also recommend subscribing to the coreutils and bug-coreutils MLs.
+
+PYTHON_COMPAT=( python3_{10..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
+inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
+
+MY_PATCH="${PN}-9.4-patches"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/coreutils.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Note: could put this in devspace, but if it's gone, we don't want
+	# it in tree anyway. It's just for testing.
+	MY_SNAPSHOT="$(ver_cut 1-2).156-b3afb"
+	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
+	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
+else
+	SRC_URI="
+		mirror://gnu/${PN}/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+fi
+
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="
+	acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	openssl? ( dev-libs/openssl:=[static-libs] )
+	xattr? ( sys-apps/attr[static-libs] )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+	test? (
+		dev-lang/perl
+		dev-perl/Expect
+		dev-util/strace
+		${PYTHON_DEPS}
+	)
+	verify-sig? ( sec-keys/openpgp-keys-coreutils )
+"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!app-misc/realpath
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+
+		sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
+	elif use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+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
+		PATCHES+=( "${WORKDIR}"/${MY_PATCH} )
+	fi
+
+	default
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	#
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1} || die
+
+	# Avoid perl dep for compiled in dircolors default (bug #348642)
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h || die
+		touch ${@/%x/1} || die
+	fi
+}
+
+src_configure() {
+	# TODO: in future (>9.4?), we may want to wire up USE=systemd:
+	# still experimental at the moment, but:
+	# https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=85edb4afbd119fb69a0d53e1beb71f46c9525dd0
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		# kill/uptime - procps
+		# groups/su   - shadow
+		# hostname    - net-tools
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		$(usev !caps --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp libgmp)
+		$(use_with openssl)
+	)
+
+	if use gmp ; then
+		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
+	fi
+
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		# bug #311569
+		export fu_cv_sys_stat_statfs2_bsize=yes
+		# bug #416629
+		export gl_cv_func_realpath_works=yes
+	fi
+
+	# bug #409919
+	export gl_cv_func_mknod_works=yes
+
+	if use static ; then
+		append-ldflags -static
+		# bug #321821
+		sed -i '/elf_sys=yes/s:yes:no:' configure || die
+	fi
+
+	if ! use selinux ; then
+		# bug #301782
+		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #439574):
+	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
+	#   -  tests/rm/deep-2.sh (bug #413621)
+	#   -  tests/dd/no-allocate.sh (bug #629660)
+	if has usersandbox ${FEATURES} ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}" || die
+	chmod a+rx "${WORKDIR}" || die
+
+	# coreutils tests like to do `mount` and such with temp dirs,
+	# so make sure:
+	# - /etc/mtab is writable (bug #265725)
+	# - /dev/loop* can be mounted (bug #269758)
+	mkdir -p "${T}"/mount-wrappers || die
+	mkwrap() {
+		local w ww
+		for w in "${@}" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
+			EOF
+			chmod a+rx "${ww}" || die
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export COREUTILS_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
+		emake -k check VERBOSE=yes
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if use split-usr ; then
+		cd "${ED}"/usr/bin || die
+		dodir /bin
+
+		# Move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
+
+		if use hostname ; then
+			mv hostname ../../bin/ || die
+		fi
+
+		if use kill ; then
+			mv kill ../../bin/ || die
+		fi
+
+		# Move critical binaries into /bin (common scripts)
+		# (Why are these required for booting?)
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "Could not move common bins!"
+
+		# Create a symlink for uname in /usr/bin/ since autotools require it.
+		# (Other than uname, we need to figure out why we are
+		# creating symlinks for these in /usr/bin instead of leaving
+		# the files there in the first place...)
+		local x
+		for x in ${com} uname ; do
+			dosym ../../bin/${x} /usr/bin/${x}
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+}

sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9999.ebuild

@@ -9,11 +9,11 @@ EAPI=8
 #
 # Also recommend subscribing to the coreutils and bug-coreutils MLs.
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
 inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
 
-MY_PATCH="${PN}-9.0_p20220409-patches-01"
+MY_PATCH="${PN}-9.4-patches"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
 HOMEPAGE="https://www.gnu.org/software/coreutils/"
 
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 elif [[ ${PV} == *_p* ]] ; then
 	# Note: could put this in devspace, but if it's gone, we don't want
 	# it in tree anyway. It's just for testing.
-	MY_SNAPSHOT="$(ver_cut 1-2).18-ffd62"
+	MY_SNAPSHOT="$(ver_cut 1-2).156-b3afb"
 	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
 	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
@@ -108,12 +108,13 @@ src_unpack() {
 }
 
 src_prepare() {
+	# TODO: past 2025, we may need to add our own hack for bug #907474.
 	local PATCHES=(
 		# Upstream patches
 	)
 
-	if ! use vanilla && [[ -d "${WORKDIR}"/patch ]] ; then
+	if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
-		PATCHES+=( "${WORKDIR}"/patch )
+		PATCHES+=( "${WORKDIR}"/${MY_PATCH} )
 	fi
 
 	default
@@ -135,10 +136,9 @@ src_prepare() {
 }
 
 src_configure() {
-	# On alpha at least, gnulib (as of 9.3) can't seem to figure out we need
+	# TODO: in future (>9.4?), we may want to wire up USE=systemd:
-	# _F_O_B=64: https://debbugs.gnu.org/64123
+	# still experimental at the moment, but:
-	append-lfs-flags
+	# https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=85edb4afbd119fb69a0d53e1beb71f46c9525dd0
-
 	local myconf=(
 		--with-packager="Gentoo"
 		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
@@ -148,7 +148,7 @@ src_configure() {
 		# hostname    - net-tools
 		--enable-install-program="arch,$(usev hostname),$(usev kill)"
 		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		$(usex caps '' --disable-libcap)
+		$(usev !caps --disable-libcap)
 		$(use_enable nls)
 		$(use_enable acl)
 		$(use_enable multicall single-binary)

sdk_container/src/third_party/portage-stable/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