From cc5ddec0bbae3bf2151f62ef22d19b5e85cb8f35 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 19 Feb 2024 23:39:38 +0000
Subject: gentoo auto-resync : 19:02:2024 - 23:39:38
---
sys-fs/mdadm/Manifest | 5 +-
sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch | 36 +++++++++
sys-fs/mdadm/mdadm-4.1.ebuild | 94 -----------------------
sys-fs/mdadm/mdadm-4.2-r3.ebuild | 109 +++++++++++++++++++++++++++
4 files changed, 147 insertions(+), 97 deletions(-)
create mode 100644 sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch
delete mode 100644 sys-fs/mdadm/mdadm-4.1.ebuild
create mode 100644 sys-fs/mdadm/mdadm-4.2-r3.ebuild
(limited to 'sys-fs/mdadm')
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index ef4b61231d7e..1acec881da51 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,15 +1,14 @@
AUX etc-default-mdadm 320 BLAKE2B 9da106687798a145b523bad7a696b2aa83b16b74f66bd583f9715c78fe3fd8aac9736d4a709128b8ad15660bae514b1a55eccab04e54d869a11cd091cb4dca87 SHA512 2258f6321e447c05e3da88a41c7a2c4a031973744125d00ee0cdb249170b02ff99b58f3883ef6892c882c313fe929404551234c12917a9d7222e497af1cfa48c
AUX mdadm-3.4-sysmacros.patch 859 BLAKE2B 7ad91f1bb06ef6ddba5f3d1a4f7c2a542e57c10d0e28d619bd858ea74afdbd1c2f1dc59657f5ceb206c6a9ab93989c29d9b33e7c7394571204786c96ccd16f31 SHA512 47564bba9d45dfb39d63df9e6cd96ad03b37b314e794af180911481feb4e038035aa1ea6d3de2061982f46b51d1a205168f98e6f0a092f55f6f8e760dbabdae6
AUX mdadm-4.2-in_initrd-collision.patch 785 BLAKE2B 70767e678b08ff656c6b39915282c0723a0c99ab0712c9ba042d431c38f88158f1b1a064ce6879748cb0088d099a4596ce58bbf8211e0580b7170026a9902e60 SHA512 f891d357f64b9d3c12f6a88174b9889dfbef500920bcaf5a54826aaf507b3824b8b2ac56a7e4870ea73536890e173bb3642c96963a8b3776692552fce14468a8
+AUX mdadm-4.2-mdadm_env.patch 1509 BLAKE2B b236c602cdb0a77ceb963ad401c6334fc3fa8d05494a1793eb97f0b0bc38d338b80cd9329fc81b81d9919e3c19cd0f671edef0e097214d33ac677d0285487a14 SHA512 1454e0fa585afa0e9db60aa37ec5b7ba9a38ed7d544b5870261ddab35d5291085de815c0ec90964d4a46da00c2a53bab28f0026955f2d8b9b5623f99bb8a26ac
AUX mdadm.confd 205 BLAKE2B 3ce0a158e1b9621a034442cdc7f643ee39a3cc9ea62697b6d1d090ae28c07e1b2ee192a33bdbdc36b95ec1e997f375764cddfde7e247b0a4830121a5216736ac SHA512 7bf66898000b3d02bbf0704a8032b0f4fc045380501dc8d2bbbb31d33b122d9c35879b25714663079eeadd207c9da87c9d9af8464e76146bf5b68594e73fd92c
AUX mdadm.rc 465 BLAKE2B fef5cc1cc68d7d5e11250b6196cfd1fa45bd39e14d90c723d44d7b6e6ee8c3727056eb7f6cd57646f05646798b246aa0579bc61c11cd79c6559cb1070fff7685 SHA512 01fe98e88466afefd84a52cedc5fcbe18eadf8f80fed12b8a2a6a8f5581e7cabe8ce3f2e99cdc3c1bacc626f5eb4f6bffe3cc888153089ee2a461c465ae05570
AUX mdadm.weekly 187 BLAKE2B 50048d84cd57b384b98fcdb6b2a4a18380aab6e76877ee9edd460e65ef9f35981c05b12f32e96dc0b6a8247e628ff162b0a1171fe00fa55aa3f4dfb47e2fc91a SHA512 3bc7bf8c9593f06e42ae657e2bce416758090d1f999a447986df17b97e1494b261f02155b83932295f2f3bbab7d8933cf647c834bfb1d7def879cbedfaa6d7c2
AUX mdraid.confd 383 BLAKE2B c61fd2c072a0d12ca21ad4f8a60a55101b4e452f9acc8cdcdf9a6069060b11bf90387830f516b69d266fef061112ba41f903b9371fff91c94c9332b12e436145 SHA512 37fe70f5df0fb2b68be01ee774e3a943cfb280322f2db0c5d6892e701fb58be26a225b78448814294bf68f154cca697278fcf9572a47b6201920d95ad05189d6
AUX mdraid.rc 759 BLAKE2B 41f1b4cb9dd29411d56bea656dddc2cb2fd3cc14b183d05c502fb5e29407d1d816de9595e13349ef7e03240308cf4395578be31149f59d1960d1feee0165506d SHA512 d76190646b393d1480607b0d89d08ce4196738295fbb7790fa1035c53a041b5cb88fe857bb2070920a9c3ae21b9fb8f7838dde240fa0e275e5915add9c113021
-DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
DIST mdadm-4.2.tar.xz 453624 BLAKE2B de7c4318dc5479de41378233869ab84ca2cd0e8a42310157b1acb969e7152af61556fbbe6f17bf6af4dfaf5543e49b1c982d2baeedf1c39b000032f4db7f5502 SHA512 57897a2b7fb8b0b88bece50501099872bb45ddb076cfc323d563588096d2b66b1ecba3724534943f651ace2bfe591482570700616500dc3398552e4f9ff0c37d
-DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698 SHA512 e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63
DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35 SHA512 3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6
-EBUILD mdadm-4.1.ebuild 2390 BLAKE2B f087e92607145b9e9235a4da6571d2a691a5f69072cfd40b183422411f4b1c8a41049b8350ff0761c79527afef6ca759e7dcdde42cd7c7bb6620795aef69da7d SHA512 b80d6eec601955155730be28e81fe8b260eeedb3eedc20edd677d5c56fd416ac5b8fac93ecad7047e3e28441437bd3f3b0359de0735933dc9454c31e961d56ea
EBUILD mdadm-4.2-r2.ebuild 2602 BLAKE2B 903dea02a5e4a49465b1be7fac0cbc9ecc5409b3300b4fb7a0427175c6642cc5bc90496a5d2d21955493821514803a3a8fe7d4caf424128b401a6ce054c5ecb0 SHA512 76cc8fa6251420d28e5895769ce5f940f5399c306831e0f7102766ec4ed57584de495d092b32c64eda49188b8629cc921efbf5e2c3d64f285c9eab4c9b6e8f58
+EBUILD mdadm-4.2-r3.ebuild 2703 BLAKE2B 89f471003ff8b27ac2a7616e9792b048be48698d37f41dec14627d908101bbbc1c1f65b22113ad8a99b74cade6ecb85c0ab76fb8a490c34dc90095f3436c723a SHA512 82e8d15b88846d543e6c7867315d76a0c36c75d8d71c09441589865f841e625231421c54f4e777692a8d68f59bf2b516fbf93cdb28bd8361d1ec20957a8c55c2
MISC metadata.xml 339 BLAKE2B 68b5c6f497a2396786b76d8cb10a076933ebff54b319ccaba2d8c5af18fb62a56519c5a42b248d7a92624514f3de635be5ff1180ef0b0a7deb8d391324680560 SHA512 3aba8c92057ff5dc92e2a9455f986bea0fcfb84d4c7ecbca2782d983cbd6ca11c1ee4443a217cbaea87d2903659390b04b26adc156782a2672d249254925071b
diff --git a/sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch b/sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch
new file mode 100644
index 000000000000..bd09da553820
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch
@@ -0,0 +1,36 @@
+--- mdadm-4.2/systemd/SUSE-mdadm_env.sh 2021-12-30 11:43:35.000000000 -0800
++++ mdadm-4.2/systemd/SUSE-mdadm_env.sh 2024-02-19 12:20:56.509632098 -0800
+@@ -6,6 +7,12 @@
+
+ MDADM_SCAN="yes"
+
++# Gentoo: source conf.d
++mdadmd_CONFIG=/etc/conf.d/mdadm
++if test -r $mdadmd_CONFIG; then
++ . $mdadmd_CONFIG
++fi
++
+ # Following adapted from /etc/init.d/mdadmd on openSUSE
+
+ mdadmd_CONFIG=/etc/sysconfig/mdadm
+@@ -42,7 +49,8 @@
+ fi
+
+ mkdir -p /run/sysconfig
+-echo "MDADM_MONITOR_ARGS=$MDADM_RAIDDEVICES $MDADM_DELAY $MDADM_MAIL $MDADM_PROGRAM $MDADM_SCAN $MDADM_SEND_MAIL $MDADM_CONFIG" > /run/sysconfig/mdadm
++# Gentoo: added $MDADM_OPTS to the end.
++echo "MDADM_MONITOR_ARGS=$MDADM_RAIDDEVICES $MDADM_DELAY $MDADM_MAIL $MDADM_PROGRAM $MDADM_SCAN $MDADM_SEND_MAIL $MDADM_CONFIG $MDADM_OPTS" > /run/sysconfig/mdadm
+ if [ -n "$MDADM_CHECK_DURATION" ]; then
+ echo "MDADM_CHECK_DURATION=$MDADM_CHECK_DURATION" >> /run/sysconfig/mdadm
+ fi
+--- mdadm-4.2.orig/Makefile 2024-02-19 12:27:19.512400849 -0800
++++ mdadm-4.2/Makefile 2024-02-19 12:27:39.517338433 -0800
+@@ -298,7 +298,7 @@
+ $(INSTALL) -D -m 755 .install.tmp.3 $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \
+ rm -f .install.tmp.3; \
+ done
+- if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(LIB_DIR)/mdadm_env.sh ;fi
++ $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(LIB_DIR)/mdadm_env.sh
+
+ install-bin: mdadm mdmon
+ $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
deleted file mode 100644
index 21649c23547f..000000000000
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic multilib 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.1-3"
-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"
-
-BDEPEND="virtual/pkgconfig
- app-arch/xz-utils"
-RDEPEND=">=sys-apps/util-linux-2.16"
-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
-)
-
-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
- 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
-}
diff --git a/sys-fs/mdadm/mdadm-4.2-r3.ebuild b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
new file mode 100644
index 000000000000..176f5e80c06c
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static systemd +udev"
+
+REQUIRED_USE="static? ( !udev )"
+
+BDEPEND="app-arch/xz-utils
+ virtual/pkgconfig"
+DEPEND="udev? ( virtual/libudev:= )"
+RDEPEND="${DEPEND}
+ >=sys-apps/util-linux-2.16"
+
+# 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
+ "${FILESDIR}/${PN}"-4.2-mdadm_env.patch #628968
+)
+
+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() {
+ udev_reload
+ 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
+}
+
+pkg_postrm() {
+ udev_reload
+}
--
cgit v1.2.3