From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7E4EF1581EC for ; Fri, 22 Nov 2024 18:45:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D30BAE087F; Fri, 22 Nov 2024 18:45:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3F97E0872 for ; Fri, 22 Nov 2024 18:45:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D134342FAE for ; Fri, 22 Nov 2024 18:45:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24C56AED for ; Fri, 22 Nov 2024 18:45:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1732301093.1ae04cdfda5f7923c42ddf21e4267b12f7ed6135.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/, sys-fs/lvm2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/lvm2/files/lvm2-2.03.22-basename-musl.patch sys-fs/lvm2/lvm2-2.03.22-r6.ebuild sys-fs/lvm2/lvm2-2.03.22-r7.ebuild X-VCS-Directories: sys-fs/lvm2/ sys-fs/lvm2/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1ae04cdfda5f7923c42ddf21e4267b12f7ed6135 X-VCS-Branch: master Date: Fri, 22 Nov 2024 18:45:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d0c0eb26-1446-4d50-8415-c297ef50b0ef X-Archives-Hash: 00b65e1d86fd7ac46a06d3b38a8919ae commit: 1ae04cdfda5f7923c42ddf21e4267b12f7ed6135 Author: orbea riseup net> AuthorDate: Fri Nov 22 17:28:19 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Nov 22 18:44:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ae04cdf sys-fs/lvm2: fix build with musl Fixes implicit declaration of function basename on musl systems. [sam: Add revbump for modern C fixes.] Closes: https://bugs.gentoo.org/937239 Upstream-Commit: https://github.com/lvmteam/lvm2/commit/f98d2ffe8753895c84160a7abce4223bd127cd9e Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/39416 Signed-off-by: Sam James gentoo.org> sys-fs/lvm2/files/lvm2-2.03.22-basename-musl.patch | 34 ++++++++++++++++++++++ ...m2-2.03.22-r6.ebuild => lvm2-2.03.22-r7.ebuild} | 1 + 2 files changed, 35 insertions(+) diff --git a/sys-fs/lvm2/files/lvm2-2.03.22-basename-musl.patch b/sys-fs/lvm2/files/lvm2-2.03.22-basename-musl.patch new file mode 100644 index 000000000000..2dd9f8ff524c --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.22-basename-musl.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/937239 +https://github.com/lvmteam/lvm2/commit/f98d2ffe8753895c84160a7abce4223bd127cd9e + +From f98d2ffe8753895c84160a7abce4223bd127cd9e Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac +Date: Wed, 27 Mar 2024 00:28:14 +0100 +Subject: [PATCH] device_id: use dm_basename + +Avoid problems for other libc like muslc and use dm_basename. + +Prototype for basename has been removed from string.h from latest musl [1] +compilers e.g. clang-18 flags the absense of prototype as error. therefore +include libgen.h for providing it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Reported-by: Khem Raj +--- + lib/device/device_id.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/device/device_id.c b/lib/device/device_id.c +index 7d67a1cb7..200d39432 100644 +--- a/lib/device/device_id.c ++++ b/lib/device/device_id.c +@@ -740,7 +740,7 @@ static int _dev_read_sys_serial(struct cmd_context *cmd, struct device *dev, + int ret; + + /* /dev/vda to vda */ +- base = basename(devname); ++ base = dm_basename(devname); + + /* vda1 to vda */ + for (i = 0; i < strlen(base); i++) { diff --git a/sys-fs/lvm2/lvm2-2.03.22-r6.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r7.ebuild similarity index 99% rename from sys-fs/lvm2/lvm2-2.03.22-r6.ebuild rename to sys-fs/lvm2/lvm2-2.03.22-r7.ebuild index 28276a453367..ac084f2eed9c 100644 --- a/sys-fs/lvm2/lvm2-2.03.22-r6.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.22-r7.ebuild @@ -74,6 +74,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.03.22-autoconf-2.72-egrep.patch "${FILESDIR}"/${PN}-2.03.22-thin-version-checking.patch "${FILESDIR}"/${PN}-2.03.22-thin-autodetect.patch + "${FILESDIR}"/${PN}-2.03.22-basename-musl.patch ) pkg_setup() {