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

2024-03-30 Thread Mike Gilbert 
commit: c4fd998c1d4b8f626d97b1b3782b5a25adde90c5
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Mar 30 19:47:13 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Mar 30 19:48:29 2024 +
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  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 ..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 
+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 
+Signed-off-by: Mariusz Tkaczyk 
+---
+ 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  
+ #include  
+ #include  
++
++#ifndef NO_LIBUDEV
+ #include  
++#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/

2022-01-02 Thread Sam James 
commit: 83c7cf6db1a8db6ef050c0d31cd06e2c7d25d252
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  3 06:41:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  3 07:41:20 2022 +
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  korelogic.com> (static linking patch)
Thanks-to: Krzysztof Olędzki  ans.pl> (udev report/fix)
Closes: https://bugs.gentoo.org/830461
Closes: https://bugs.gentoo.org/830485
Signed-off-by: Sam James  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 ..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 ..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

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

2016-04-19 Thread Mike Frysinger 
commit: 874bc61700f87a6c5396dc4225154a60d538ec56
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Apr 19 22:12:41 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Apr 19 22:12:47 2016 +
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 000..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 
+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 
+---
+ 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  
+ #include  
+ #include  
+ #include  
+-- 
+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 \