[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/, sys-fs/mdadm/files/

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/, sys-fs/mdadm/files/

[Mike Frysinger]

commit:     874bc61700f87a6c5396dc4225154a60d538ec56
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 22:12:41 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 22:12:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874bc617

sys-fs/mdadm: fix build w/newer glibc #580188

 sys-fs/mdadm/files/mdadm-3.4-sysmacros.patch | 31 ++++++++++++++++++++++++++++
 sys-fs/mdadm/mdadm-3.4.ebuild                |  4 ++++
 2 files changed, 35 insertions(+)

diff --git a/sys-fs/mdadm/files/mdadm-3.4-sysmacros.patch b/sys-fs/mdadm/files/mdadm-3.4-sysmacros.patch
new file mode 100644
index 0000000..22a3934
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.4-sysmacros.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/580188
+
+From 5c97e465b33bf8fefb17da7f553a1c3812e508d5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 19 Apr 2016 18:10:54 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev prototypes
+
+These funcs are defined in sys/sysmacros.h, so include it for them.
+It works today due to an implicit include by sys/types.h, but the
+various Linux C libraries are moving away from that.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ mdadm.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mdadm.h b/mdadm.h
+index d209488..b8767a7 100755
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -33,6 +33,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ # endif
+ #endif
+ 
++#include	<sys/sysmacros.h>
+ #include	<sys/types.h>
+ #include	<sys/stat.h>
+ #include	<stdint.h>
+-- 
+2.7.4
+

diff --git a/sys-fs/mdadm/mdadm-3.4.ebuild b/sys-fs/mdadm/mdadm-3.4.ebuild
index a4aff3e..559b74e 100644
--- a/sys-fs/mdadm/mdadm-3.4.ebuild
+++ b/sys-fs/mdadm/mdadm-3.4.ebuild
@@ -24,6 +24,10 @@ RDEPEND=">=sys-apps/util-linux-2.16"
 # Thus, they shouldn't be run on systems with active software RAID devices.
 RESTRICT="test"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
+}
+
 mdadm_emake() {
 	# We should probably make corosync & libdlm into USE flags. #573782
 	emake \

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/, sys-fs/mdadm/files/

[Sam James]

commit:     83c7cf6db1a8db6ef050c0d31cd06e2c7d25d252
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 06:41:04 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  3 07:41:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c7cf6d

sys-fs/mdadm: various build fixes

- Fix udev automagic dependency (add USE=udev);

- ... and fix building without udev too.

- Add patch to fix static linking against udev (only option is
  sys-fs/eudev though, as we dropped static-libs from sys-fs/udev
  and sys-apps/systemd due to issues like this and upstream not
  supporting it).

Thanks-to: Hank Leininger <hlein <AT> korelogic.com> (static linking patch)
Thanks-to: Krzysztof Olędzki <ole+gentoo <AT> ans.pl> (udev report/fix)
Closes: https://bugs.gentoo.org/830461
Closes: https://bugs.gentoo.org/830485
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/mdadm-4.2-in_initrd-collision.patch      |  36 +++++++
 sys-fs/mdadm/mdadm-4.2-r1.ebuild                   | 105 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-fs/mdadm/files/mdadm-4.2-in_initrd-collision.patch b/sys-fs/mdadm/files/mdadm-4.2-in_initrd-collision.patch
new file mode 100644
index 000000000000..689e7d698788
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.2-in_initrd-collision.patch
@@ -0,0 +1,36 @@
+Fix collision with libudev symbols when statically linking.
+
+https://bugs.gentoo.org/830485
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -1665,7 +1665,7 @@
+ extern void udev_block(char *devnm);
+ extern void udev_unblock(void);
+ 
+-extern int in_initrd(void);
++extern int mdadm_in_initrd(void);
+ 
+ struct cmap_hooks {
+ 	void *cmap_handle;      /* corosync lib related */
+--- a/mdmon.c
++++ b/mdmon.c
+@@ -309,7 +309,7 @@
+ 		{NULL, 0, NULL, 0}
+ 	};
+ 
+-	if (in_initrd()) {
++	if (mdadm_in_initrd()) {
+ 		/*
+ 		 * set first char of argv[0] to @. This is used by
+ 		 * systemd to signal that the task was launched from
+--- a/util.c
++++ b/util.c
+@@ -2219,7 +2219,7 @@
+ 	return 0;
+ }
+ 
+-int in_initrd(void)
++int mdadm_in_initrd(void)
+ {
+ 	/* This is based on similar function in systemd. */
+ 	struct statfs s;

diff --git a/sys-fs/mdadm/mdadm-4.2-r1.ebuild b/sys-fs/mdadm/mdadm-4.2-r1.ebuild
new file mode 100644
index 000000000000..0a79356c4210
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-4.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev
+
+DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
+DEB_PF="4.2~rc2-7"
+SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
+		mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static +udev"
+
+BDEPEND="app-arch/xz-utils
+	virtual/pkgconfig"
+DEPEND="udev? (
+		static? ( sys-fs/eudev[static-libs] )
+		!static? ( virtual/libudev:= )
+	)"
+RDEPEND=">=sys-apps/util-linux-2.16
+	udev? ( !static? ( virtual/libudev:= ) )"
+DEPEND="${RDEPEND}"
+
+# The tests edit values in /proc and run tests on software raid devices.
+# Thus, they shouldn't be run on systems with active software RAID devices.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-3.4-sysmacros.patch #580188
+	"${FILESDIR}/${PN}"-4.2-in_initrd-collision.patch #830461
+)
+
+mdadm_emake() {
+	# We should probably make corosync & libdlm into USE flags. #573782
+	local args=(
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		CC="$(tc-getCC)"
+		CWFLAGS="-Wall"
+		CXFLAGS="${CFLAGS}"
+		UDEVDIR="$(get_udevdir)"
+		SYSTEMD_DIR="$(systemd_get_systemunitdir)"
+		COROSYNC="-DNO_COROSYNC"
+		DLM="-DNO_DLM"
+
+		# https://bugs.gentoo.org/732276
+		STRIP=
+
+		"$@"
+	)
+	emake "${args[@]}"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+
+	# CPPFLAGS won't work for this
+	use udev || append-cflags -DNO_LIBUDEV
+
+	mdadm_emake all
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	mdadm_emake DESTDIR="${D}" install install-systemd
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-*
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm
+	newconfd "${FILESDIR}"/mdadm.confd mdadm
+	newinitd "${FILESDIR}"/mdraid.rc mdraid
+	newconfd "${FILESDIR}"/mdraid.confd mdraid
+
+	# From the Debian patchset
+	into /usr
+	dodoc "${WORKDIR}"/debian/README.checkarray
+	dosbin "${WORKDIR}"/debian/checkarray
+	insinto /etc/default
+	newins "${FILESDIR}"/etc-default-mdadm mdadm
+
+	exeinto /etc/cron.weekly
+	newexe "${FILESDIR}"/mdadm.weekly mdadm
+}
+
+pkg_postinst() {
+	if ! systemd_is_booted; then
+		if [[ -z ${REPLACING_VERSIONS} ]] ; then
+			# Only inform people the first time they install.
+			elog "If you're not relying on kernel auto-detect of your RAID"
+			elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
+			elog "	rc-update add mdraid boot"
+		fi
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/, sys-fs/mdadm/files/

[Mike Gilbert]

commit:     c4fd998c1d4b8f626d97b1b3782b5a25adde90c5
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 19:47:13 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 19:48:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4fd998c

sys-fs/mdadm: fix build with USE=-udev

Closes: https://bugs.gentoo.org/928228
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-fs/mdadm/files/mdadm-4.3-no-udev.patch | 31 ++++++++++++++++++++++++++++++
 sys-fs/mdadm/mdadm-4.3.ebuild              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/sys-fs/mdadm/files/mdadm-4.3-no-udev.patch b/sys-fs/mdadm/files/mdadm-4.3-no-udev.patch
new file mode 100644
index 000000000000..dd7ef696acfb
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.3-no-udev.patch
@@ -0,0 +1,31 @@
+https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/patch/?id=1750758c7ff526e3560433f6235e5cfa35cf646a
+https://bugs.gentoo.org/928228
+
+From 1750758c7ff526e3560433f6235e5cfa35cf646a Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+Date: Wed, 6 Mar 2024 15:50:55 +0100
+Subject: udev.c: Do not require libudev.h if DNO_LIBUDEV
+
+libudev may not be presented at all, do not require it.
+
+Reported-by: Boian Bonev <bbonev@ipacct.com>
+Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+---
+ udev.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/udev.c b/udev.c
+index bc4722b0..066e6ab1 100644
+--- a/udev.c
++++ b/udev.c
+@@ -26,7 +26,10 @@
+ #include	<signal.h>
+ #include	<limits.h>
+ #include	<syslog.h>
++
++#ifndef NO_LIBUDEV
+ #include	<libudev.h>
++#endif
+ 
+ static char *unblock_path;
+ 

diff --git a/sys-fs/mdadm/mdadm-4.3.ebuild b/sys-fs/mdadm/mdadm-4.3.ebuild
index c78553aa7558..4e84a51e91b3 100644
--- a/sys-fs/mdadm/mdadm-4.3.ebuild
+++ b/sys-fs/mdadm/mdadm-4.3.ebuild
@@ -35,6 +35,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-4.3-in_initrd-collision.patch #830461
 	"${FILESDIR}/${PN}"-4.2-mdadm_env.patch #628968
 	"${FILESDIR}/${PN}"-4.3-ldflags.patch
+	"${FILESDIR}/${PN}"-4.3-no-udev.patch
 	"${WORKDIR}/debian/patches/debian/0001-fix-manpages.patch"
 	"${WORKDIR}/debian/patches/debian/0003-host-name-in-default-mailfrom.patch"
 	"${WORKDIR}/debian/patches/debian/0004-exit-gracefully-when-md-device-not-found.patch"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/, sys-fs/mdadm/files/

[Sam James]

commit:     edc702aee9685668ec277444e123613fbb1eb232
Author:     Gwendal Grignou <gwendal <AT> chromium <DOT> org>
AuthorDate: Wed May 15 21:49:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 11:31:08 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc702ae

sys-fs/mdadm: Do not call gcc directly

When gcc is not used (clang is used on Chromeos), emerge will fails.

Closes: https://bugs.gentoo.org/931972
Signed-off-by: Gwendal Grignou <gwendal <AT> chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/36691
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/mdadm-4.3-do-not-call-gcc-directly.patch | 50 ++++++++++++++++++++++
 sys-fs/mdadm/mdadm-4.3-r1.ebuild                   |  1 +
 2 files changed, 51 insertions(+)

diff --git a/sys-fs/mdadm/files/mdadm-4.3-do-not-call-gcc-directly.patch b/sys-fs/mdadm/files/mdadm-4.3-do-not-call-gcc-directly.patch
new file mode 100644
index 000000000000..e7cccda166e7
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.3-do-not-call-gcc-directly.patch
@@ -0,0 +1,50 @@
+From b7028334f2dfbb0b11cf1fa34ecb89d5287c367b Mon Sep 17 00:00:00 2001
+From: Gwendal Grignou <gwendal@chromium.org>
+Date: Wed, 15 May 2024 14:30:59 -0700
+Subject: [PATCH] Makefile: Do not call gcc directly
+
+When mdadm is compiled with clang, direct gcc will fail.
+Make sure to use $(CC) variable instead.
+
+Note that Clang does not support --help=warnings --
+-print-diagnostic-options should be used instead.
+So with Clang, the compilation will go through, but the
+extra warning flags will never be added.
+
+Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index adac7905..ec8c4226 100644
+--- a/Makefile
++++ b/Makefile
+@@ -56,21 +56,21 @@ CWFLAGS += -Wp -O3
+ endif
+ 
+ ifeq ($(origin FALLTHROUGH), undefined)
+-	FALLTHROUGH := $(shell gcc -Q --help=warnings 2>&1 | grep "implicit-fallthrough" | wc -l)
++	FALLTHROUGH := $(shell $(CC) $(CFLAGS) -Q --help=warnings 2>&1 | grep "implicit-fallthrough" | wc -l)
+ 	ifneq "$(FALLTHROUGH)"  "0"
+ 	CWFLAGS += -Wimplicit-fallthrough=0
+ 	endif
+ endif
+ 
+ ifeq ($(origin FORMATOVERFLOW), undefined)
+-	FORMATOVERFLOW := $(shell gcc -Q --help=warnings 2>&1 | grep "format-overflow" | wc -l)
++	FORMATOVERFLOW := $(shell $(CC) $(CFLAGS) -Q --help=warnings 2>&1 | grep "format-overflow" | wc -l)
+ 	ifneq "$(FORMATOVERFLOW)"  "0"
+ 	CWFLAGS += -Wformat-overflow
+ 	endif
+ endif
+ 
+ ifeq ($(origin STRINGOPOVERFLOW), undefined)
+-	STRINGOPOVERFLOW := $(shell gcc -Q --help=warnings 2>&1 | grep "stringop-overflow" | wc -l)
++	STRINGOPOVERFLOW := $(shell $(CC) $(CFLAGS) -Q --help=warnings 2>&1 | grep "stringop-overflow" | wc -l)
+ 	ifneq "$(STRINGOPOVERFLOW)"  "0"
+ 	CWFLAGS += -Wstringop-overflow
+ 	endif
+-- 
+2.45.0.215.g3402c0e53f-goog
+

diff --git a/sys-fs/mdadm/mdadm-4.3-r1.ebuild b/sys-fs/mdadm/mdadm-4.3-r1.ebuild
index 65917537ec28..d6498733b2e0 100644
--- a/sys-fs/mdadm/mdadm-4.3-r1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.3-r1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-4.3-ldflags.patch
 	"${FILESDIR}/${PN}"-4.3-no-udev.patch
 	"${FILESDIR}/${PN}"-4.3-musl125-1.patch
+	"${FILESDIR}/${PN}"-4.3-do-not-call-gcc-directly.patch # 931972
 	"${WORKDIR}/debian/patches/debian/0001-fix-manpages.patch"
 	"${WORKDIR}/debian/patches/debian/0003-host-name-in-default-mailfrom.patch"
 	"${WORKDIR}/debian/patches/debian/0004-exit-gracefully-when-md-device-not-found.patch"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/, sys-fs/mdadm/files/

[Sam James]

commit:     2637faef70821b8cfa25cd5ca4d340fa3ddf70bd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 11:58:30 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 11:58:30 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2637faef

sys-fs/mdadm: backport musl build fixes to 4.3-r1

Closes: https://bugs.gentoo.org/926289
Thanks-to: ernsteiswuerfel <erhard_f <AT> mailbox.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/mdadm/files/mdadm-4.3-musl-basename.patch | 19 +++++++++++++++++++
 sys-fs/mdadm/files/mdadm-4.3-musl-include.patch  | 14 ++++++++++++++
 sys-fs/mdadm/mdadm-4.3-r1.ebuild                 |  2 ++
 3 files changed, 35 insertions(+)

diff --git a/sys-fs/mdadm/files/mdadm-4.3-musl-basename.patch b/sys-fs/mdadm/files/mdadm-4.3-musl-basename.patch
new file mode 100644
index 000000000000..b8d0c3a7ca5c
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.3-musl-basename.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/926289#c6
+https://github.com/md-raid-utilities/mdadm/commit/9dbd11e091f84eb0bf9d717283774816c4c4453d
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -223,6 +223,14 @@ struct dlm_lksb {
+ struct __una_u16 { __u16 x; } __attribute__ ((packed));
+ struct __una_u32 { __u32 x; } __attribute__ ((packed));
+ 
++/*
++ * Ensure GNU basename behavior on GLIBC less systems.
++ */
++#ifndef __GLIBC__
++#define basename(path) \
++       (strrchr((path), '/') ? strrchr((path),'/') + 1 : (path))
++#endif
++
+ static inline __u16 __get_unaligned16(const void *p)
+ {
+ 	const struct __una_u16 *ptr = (const struct __una_u16 *)p;

diff --git a/sys-fs/mdadm/files/mdadm-4.3-musl-include.patch b/sys-fs/mdadm/files/mdadm-4.3-musl-include.patch
new file mode 100644
index 000000000000..da9efc9a0171
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.3-musl-include.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/926289#c7
+https://github.com/md-raid-utilities/mdadm/commit/8bda86099089b44129ef6206764f9de47a45f0db
+--- a/util.c
++++ b/util.c
+@@ -36,7 +36,7 @@
+ #include	<ctype.h>
+ #include	<dirent.h>
+ #include	<dlfcn.h>
+-
++#include	<limits.h>
+ 
+ /*
+  * following taken from linux/blkpg.h because they aren't
+

diff --git a/sys-fs/mdadm/mdadm-4.3-r1.ebuild b/sys-fs/mdadm/mdadm-4.3-r1.ebuild
index a7b58ea2ef44..140f5323f71f 100644
--- a/sys-fs/mdadm/mdadm-4.3-r1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.3-r1.ebuild
@@ -37,6 +37,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-4.3-no-udev.patch
 	"${FILESDIR}/${PN}"-4.3-musl125-1.patch
 	"${FILESDIR}/${PN}"-4.3-do-not-call-gcc-directly.patch # 931972
+	"${FILESDIR}/${PN}"-4.3-musl-basename.patch
+	"${FILESDIR}/${PN}"-4.3-musl-include.patch
 	"${WORKDIR}/debian/patches/debian/0001-fix-manpages.patch"
 	"${WORKDIR}/debian/patches/debian/0003-host-name-in-default-mailfrom.patch"
 	"${WORKDIR}/debian/patches/debian/0004-exit-gracefully-when-md-device-not-found.patch"