From b6ee1e828a064880c3b042750143dd926666fd99 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 7 Jul 2025 07:14:20 +0000 Subject: [PATCH] sys-apps/keyutils: Sync with Gentoo It's from Gentoo commit c9645e94e82e399c738168a4423c0969048d1fd2. --- .../files/keyutils-1.6.3-symbols.patch | 30 +++++++++++++++++++ .../keyutils/keyutils-1.6.3-r1.ebuild | 1 + 2 files changed, 31 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/keyutils/files/keyutils-1.6.3-symbols.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/files/keyutils-1.6.3-symbols.patch b/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/files/keyutils-1.6.3-symbols.patch new file mode 100644 index 0000000000..b7be1e71b7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/files/keyutils-1.6.3-symbols.patch @@ -0,0 +1,30 @@ +https://lore.kernel.org/keyrings/85561febfcf0618a9280448d5c53775646f470d6.1703712863.git.nvinson234@gmail.com/raw + +Functions keyctl_restrict() and keyctl_dh_compute_kdf_alloc() are +nodefined. Their inclusion in version.lds causes clang/llvm LTO +optimizations to fail with error messages similar to + + error: version script assignment of KEYUTILS_1.7 to symbol + keyctl_restrict failed: symbol not defined + +This patch fixes the issue by removing the symbol names from +version.lds. + +Fixes Gentoo bug 914637 (https://bugs.gentoo.org/914637) + +Signed-off-by: Nicholas Vinson + +--- a/version.lds ++++ b/version.lds +@@ -76,9 +76,7 @@ KEYUTILS_1.6 { + + KEYUTILS_1.7 { + /* management functions */ +- keyctl_restrict; + keyctl_dh_compute_kdf; +- keyctl_dh_compute_kdf_alloc; + + } KEYUTILS_1.6; + +-- +2.43.0 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild index 691b0f34f6..b825ccd3a1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild @@ -23,6 +23,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050 "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch "${FILESDIR}"/${PN}-1.6.3-fix-rpmspec-check.patch + "${FILESDIR}"/${PN}-1.6.3-symbols.patch "${FILESDIR}"/${P}-tests.patch )