gentoo auto-resync : 13:02:2023 - 08:16:09

4 files changed, 53 insertions, 31 deletions

diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 96c8802de634..219563803d0c 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,4 +1,4 @@
+AUX libmd-1.0.4-fix-version-script-linker-support-detection.patch 1264 BLAKE2B 56e090a0f764617a8febb646299281c68153cc25d6abc889b3a1db55b67350c1ad381095c31716b2424a72d9a91bf81f7fb1c4c85c5553213ad27671639dbc70 SHA512 2a2771d3d310605f6eae6871ab432395c43f3388c4b96e94d4e62f4407944775dcd85bb80134243977370369d9aa8da350a8691983ef4908b1c3779e53af11a2
 DIST libmd-1.0.4.tar.xz 264472 BLAKE2B ddc2da74635f5cc009c66a58ae82b83e6e0930e18af8a6b0ecec7cbf378246707b493a99fb97d3491d0d626a0d5ef068baea6a3ba2ec311c5a1516ba5b4e2fd5 SHA512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3
-EBUILD libmd-1.0.4.ebuild 650 BLAKE2B cbdc3289f2cad022e2512ee8e669bec998da08534a3beeb6e4bc4c3be8f973b6cb23ebfc5285565348216a285485c7a43e19fba6c643573821eaf756ccc3208b SHA512 2492c2d6a0bdaab6e8d1cb2f93180ddd40d8da9225cc0ee840ce915e27b232103848233a90770c3a68b1c611b2309f0a73f00bbae42f53f8de130633abc09959
-EBUILD libmd-9999.ebuild 567 BLAKE2B c31c8d0780cd63516fae57497f80340712547fe78d17e16ad8d1c1f7320681ef914d0ffefc459593b2de6e0db054860296c72060bea33a4ef47de42dc3da8a14 SHA512 82345337a69a40c8f7199a3be295b18e530be415c712af1259b4e110f7cc80d50705559ad92ce0b7c001c8f6f95ad7d5fae3d09b3ec527a1b860e8577d078ed6
+EBUILD libmd-1.0.4.ebuild 836 BLAKE2B 9609123c6a022d841d7fa929568a23fa7e4da2a28acfb5b4904831ae7995c536484f76b91e968065974439f5dbc994cd8fa761bb792697d338615ec75ccbc857 SHA512 46903edf125fd5c1194c444e04a1ff35e1876eeddb7efd4e405b95527425dac0c296ab57d3752c3f6a700701cc8528a02d758381cbba0e11046754b29a1635b9
 MISC metadata.xml 347 BLAKE2B 957c6097e5f3a419ab0d8f184d13e5059c621e2bd126fac09fe1d96241fe86fb5b86abdcd3ce61c8c1d168a69017f87a9655d15a2c90dbb7c2d465cf5b35eeb0 SHA512 ffa404b86c2846593a46124b7cd3064dc0eddc4b84d74b7a3649fbdf3c38456477623afb1419282e46f16ef7c6718cda05209cf7039440ce8a3d9d929fd51203
diff --git a/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch b/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch
new file mode 100644
index 000000000000..bcee3a06611f
--- /dev/null
+++ b/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch
@@ -0,0 +1,38 @@
+From e408786075b9540f76783f5c3ce87f6d1ece13cf Mon Sep 17 00:00:00 2001
+From: Guillem Jover <guillem@hadrons.org>
+Date: Sun, 12 Feb 2023 23:55:09 +0100
+Subject: [PATCH] build: Fix version script linker support detection
+
+When the linker uses --no-undefined-version either specified by the user
+or as the default behavior (such as with newer clang >= 16 releases), a missing symbol definition will cause a linker error if that symbol is
+listed in the version script.
+
+
+Bug: https://bugs.gentoo.org/894010
+Upstream issue: https://gitlab.freedesktop.org/libbsd/libmd/-/issues/1
+Upstream commit: https://gitlab.freedesktop.org/libbsd/libmd/-/commit/e408786075b9540f76783f5c3ce87f6d1ece13cf
+
+---
+ m4/libmd-linker.m4 | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/m4/libmd-linker.m4 b/m4/libmd-linker.m4
+index 7d1236a..3d6edcd 100644
+--- a/m4/libmd-linker.m4
++++ b/m4/libmd-linker.m4
+@@ -8,7 +8,11 @@ AC_DEFUN([LIBMD_LINKER_VERSION_SCRIPT], [
+     save_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
+     AC_LINK_IFELSE([
+-      AC_LANG_PROGRAM([], [])
++      AC_LANG_PROGRAM([[
++extern int symbol(void);
++int symbol(void) { return 0; }
++]], [[
++]])
+     ], [
+       libmd_cv_version_script=yes
+     ], [
+-- 
+GitLab
+
diff --git a/app-crypt/libmd/libmd-1.0.4.ebuild b/app-crypt/libmd/libmd-1.0.4.ebuild
index 95989a9ac9f9..1cae95fb395f 100644
--- a/app-crypt/libmd/libmd-1.0.4.ebuild
+++ b/app-crypt/libmd/libmd-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Message Digest functions from BSD systems"
 HOMEPAGE="https://www.hadrons.org/software/libmd/"
@@ -13,6 +13,17 @@ LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-version-script-linker-support-detection.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop on next release, only needed for lld patch
+	eautoreconf
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
 }
diff --git a/app-crypt/libmd/libmd-9999.ebuild b/app-crypt/libmd/libmd-9999.ebuild
deleted file mode 100644
index b28c93edaff6..000000000000
--- a/app-crypt/libmd/libmd-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal git-r3
-
-DESCRIPTION="Message Digest functions from BSD systems"
-HOMEPAGE="https://www.hadrons.org/software/libmd/"
-EGIT_REPO_URI="https://git.hadrons.org/git/libmd.git"
-
-LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
-SLOT="0"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-}