gentoo auto-resync : 13:09:2024 - 12:31:45

4 files changed, 38 insertions, 19 deletions

diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 24bb2b9cd2c7..09b47f6f77bf 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -15,7 +15,7 @@ DIST mdadm-4.2.tar.xz 453624 BLAKE2B de7c4318dc5479de41378233869ab84ca2cd0e8a423
 DIST mdadm-4.3.tar.xz 465820 BLAKE2B 3b6955339adb6c254a69d698e3b807838f8840e37f7f94280f4a1fbffb082ee694309f4b6f9adc8edfa2071fde324bf00ae0493d5b2e6c8d87796783dfa3ee1c SHA512 e44977f2f80d2471cb313803a60c92dafe8282ac06bbbfd41ae90ca493c64a3da94db924538788d045fd7f0667333912dabedb0b070f9abf5c0540b32e0fa08f
 DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35 SHA512 3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6
 DIST mdadm_4.3-1.debian.tar.xz 86972 BLAKE2B 52af9ddacc402d8c3318bac31b4cd5ac3045e564832546146ba0a18d6a43866ae2c21270ac15f48df98c4f76af0eeae41679ea9e0e265dad44914bd58f27d689 SHA512 1c5203523f0c7fe271d850ab4ad376a449e870f8f1549dc4460adede1f59a1a364e741562954297e7848bae19d1cfe273a31f1bfaf739dd37559a0666abd8517
-EBUILD mdadm-4.2-r2.ebuild 2668 BLAKE2B 471dc367e4496b694d29d40752032f94f9769b281baadba798e30056e38d260c06b86e1fcd181441dd14a530314a24bfb4f35cf3301e14f9302d7892d8343214 SHA512 b938baa04dd5c91af215d56248cbabb66fda9d64fad9b3634e6808dc34495e803a8658c2362c80d16ccf465f421462b0dcf069c55aa600660489ad6d1cdcf140
-EBUILD mdadm-4.2-r3.ebuild 2761 BLAKE2B 14e47f85076087214bf312b80a7d9726daa66b6b00f66ec6004e1a3e9a49f12b5b2719c9b3c5183cae63e600357a41c50d8a3d61d2ed21e1b48b4fc93185a0a1 SHA512 bc53ca1dca68270374316a4244c1b97ecca1c5011edc084fe798e0b9a5e3c2a1465a52b722ba4bf1f5aad9013ed3ba889a89a17b729c653b1ef80d262e09147c
-EBUILD mdadm-4.3.ebuild 3474 BLAKE2B bf287bef8d34e7ee1f1623f60ce1bdd019a63270fe07084d6f74c2c876aa8403b7ee732d4aba63c9c2b1e54cbc95cf09f61ce9f5c9a113d6194194021cbb1afc SHA512 c368e98dc77d768e41b23bbb583f6f50c87063b17ebadc560954c7a39863c62aacddfbbcabac0e79fb7ab560d839af55edd8e6fcf121c7edfab28cba84aa372d
+EBUILD mdadm-4.2-r3.ebuild 2755 BLAKE2B 357a4ce0b9984794d58d3166ac86a5bbf12bb6023bca09bf9110679ed98fd2e77023abb958669539248a0cadbedabe24b5df70cd8249163af5775ecb4eb8b337 SHA512 fbd1eee99aabf7f10a8c9487a0e6752bf2c461d48b9ee358b9bd91374a7f3527a1fa14925bcddde68c8ecc644d340246abd6a9e27941feb6f75c1f3b98895d5d
+EBUILD mdadm-4.3-r1.ebuild 3444 BLAKE2B d59d2d7c2bb587760f4a24ff8e80126668e100483120601f729089bb5c3cc5d334c79fbdd9818fdb0b4de7c6110ca1921363d76cadf1413cb74d8dc85f354e9c SHA512 4ffb891f009f735d1e4d460d85839190b8c2343d99a90204ca7037528903e39e0e61e62fb5038a346bbf38ece2c1d01d7210303438a72abbbbfe94870a8a03b7
+EBUILD mdadm-4.3.ebuild 3468 BLAKE2B 74e6729c7e8206417186705de2ea9bd948f9976522a8329aff54cc4575d62f66b32720b6624f4ca1319400fe899a7a49621f2896a83ca1f8dc715c06edf1363d SHA512 6f09c484979142d741e3175b667fdf8512bb4109f9ee0499e71fa61aeec47d5d759ff1a969e71be789c47b87f96ea8f162048576a8da5757ef6636e8c27072b0
 MISC metadata.xml 418 BLAKE2B de9c0675d188ad6ad98f008b9d07967018bc9b97e28f30681693f3003a3b99e46d10af48944034fc5e6c401d0ac662473b20cd369f53ab38b80c2d2839604ff7 SHA512 a3889c19874875d1e511fbf192ef69b870da79e0e1a60026d135c2b45a5f7aa26456bc22a2fd8d4167fc968f08f1c297d4dbbe1cb21c68f61976534675f38c3b
diff --git a/sys-fs/mdadm/mdadm-4.2-r3.ebuild b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
index 8efe2e754382..55ff5a471b66 100644
--- a/sys-fs/mdadm/mdadm-4.2-r3.ebuild
+++ b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="static systemd +udev"
 
 REQUIRED_USE="static? ( !udev )"
diff --git a/sys-fs/mdadm/mdadm-4.2-r2.ebuild b/sys-fs/mdadm/mdadm-4.3-r1.ebuild
index d98a9156fbcb..65917537ec28 100644
--- a/sys-fs/mdadm/mdadm-4.2-r2.ebuild
+++ b/sys-fs/mdadm/mdadm-4.3-r1.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 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"
+DEB_PF="4.3-1"
 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 ppc ppc64 ~riscv sparc x86"
-IUSE="static systemd +udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static systemd +udev corosync"
 
 REQUIRED_USE="static? ( !udev )"
 
-BDEPEND="app-arch/xz-utils
-	virtual/pkgconfig"
-DEPEND="udev? ( virtual/libudev:= )"
+BDEPEND="virtual/pkgconfig"
+DEPEND="udev? ( virtual/libudev:= )
+	corosync? ( sys-cluster/corosync )"
 RDEPEND="${DEPEND}
 	>=sys-apps/util-linux-2.16"
 
@@ -30,20 +30,29 @@ RDEPEND="${DEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/${PN}"-3.4-sysmacros.patch #580188
-	"${FILESDIR}/${PN}"-4.2-in_initrd-collision.patch #830461
+	#"${FILESDIR}/${PN}"-3.4-sysmacros.patch #580188 # upstream has it later in the list of includes as of 4.3.
+	"${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
+	"${FILESDIR}/${PN}"-4.3-musl125-1.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"
+	"${WORKDIR}/debian/patches/debian/0007-no-Werror.patch"
 )
 
 mdadm_emake() {
-	# We should probably make corosync & libdlm into USE flags. #573782
+	# We should probably make libdlm into USE flags. #573782
 	local args=(
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
 		CC="$(tc-getCC)"
-		CWFLAGS="-Wall"
+		CWFLAGS="-Wall -fPIE"
 		CXFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
 		UDEVDIR="$(get_udevdir)"
 		SYSTEMD_DIR="$(systemd_get_systemunitdir)"
-		COROSYNC="-DNO_COROSYNC"
+		COROSYNC="$(usex corosync '' -DNO_COROSYNC)"
 		DLM="-DNO_DLM"
 
 		# https://bugs.gentoo.org/732276
@@ -76,6 +85,11 @@ src_install() {
 	mdadm_emake DESTDIR="${D}" install install-systemd
 	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-*
 
+	# install mdcheck_start.service
+	# needed for systemd units https://bugs.gentoo.org/833000
+	exeinto /usr/share/mdadm/
+	doexe misc/mdcheck
+
 	insinto /etc
 	newins mdadm.conf-example mdadm.conf
 	newinitd "${FILESDIR}"/mdadm.rc mdadm
@@ -85,8 +99,8 @@ src_install() {
 
 	# From the Debian patchset
 	into /usr
-	dodoc "${WORKDIR}"/debian/README.checkarray
-	dosbin "${WORKDIR}"/debian/checkarray
+	dodoc "${WORKDIR}"/debian/local/doc/README.checkarray
+	dosbin "${WORKDIR}"/debian/local/bin/checkarray
 	insinto /etc/default
 	newins "${FILESDIR}"/etc-default-mdadm mdadm
 
@@ -95,6 +109,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
 	if ! systemd_is_booted; then
 		if [[ -z ${REPLACING_VERSIONS} ]] ; then
 			# Only inform people the first time they install.
@@ -104,3 +119,7 @@ pkg_postinst() {
 		fi
 	fi
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-fs/mdadm/mdadm-4.3.ebuild b/sys-fs/mdadm/mdadm-4.3.ebuild
index 5f6bc13bd8d3..e503b5875f57 100644
--- a/sys-fs/mdadm/mdadm-4.3.ebuild
+++ b/sys-fs/mdadm/mdadm-4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="static systemd +udev corosync"
 
 REQUIRED_USE="static? ( !udev )"