gentoo auto-resync : 01:05:2024 - 00:00:04

3 files changed, 47 insertions, 1 deletions

diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 5bdc3d0cfa81..627318f36873 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -4,6 +4,7 @@ AUX mdadm-4.2-in_initrd-collision.patch 785 BLAKE2B 70767e678b08ff656c6b39915282
 AUX mdadm-4.2-mdadm_env.patch 1509 BLAKE2B b236c602cdb0a77ceb963ad401c6334fc3fa8d05494a1793eb97f0b0bc38d338b80cd9329fc81b81d9919e3c19cd0f671edef0e097214d33ac677d0285487a14 SHA512 1454e0fa585afa0e9db60aa37ec5b7ba9a38ed7d544b5870261ddab35d5291085de815c0ec90964d4a46da00c2a53bab28f0026955f2d8b9b5623f99bb8a26ac
 AUX mdadm-4.3-in_initrd-collision.patch 1000 BLAKE2B 23811ea654f4c11ed83a725d1f7e7c7e203cb642c27845e87cff69b38121e24610cfede2d4cf71cf54ecc275bd48e106eebc846339140918ad1925fd1de48faf SHA512 56c5fa51755dbc815833273435599a1be4fbe86f4cd9aaf094af5cc93315f37f5fa4d1da37c8ba4dd59c381125d3e1e315c42fe71f1a947dde0b0ca25f3ce87a
 AUX mdadm-4.3-ldflags.patch 334 BLAKE2B 26a0c8c98ea9e1154e6c1c8d84f022ef2276db3db8bb9dbfeb8f69c0253ea072f901c32d2c5b8e48013f2aabea97b02d14e8c5082fa1570c7c427b1178efa6c0 SHA512 8ff09d2e6652236c58580f95e60d9522ea6a647ef82bc975399f5ee837e531552c5af68602ab127a1d051729f4768ec6a90271d20418a5018ad4847a67aeca39
+AUX mdadm-4.3-musl125-1.patch 1383 BLAKE2B ee094a31f4b9668af93fa57f0f59823bf36fb6382dd4dc38409982992427bb061cb3a1b076f8d2701de94272df26ad8e48f2af2e9a8269603cb2821d21064653 SHA512 45f40a06f562729143dba083471b0e676e2886f80b2a5bee54de8fa20a48610644e6835c35ca7d8c04c154620297d73d049510e86c6e3c28b5033a75fe5e5476
 AUX mdadm-4.3-no-udev.patch 832 BLAKE2B 76f24ebd05f6ba1df8697fadcbfae53efd80b00a1e93e445fd1cd4fd484b84e963b9cf06c60a1bd7efb1adc64313217068d95dc17281275425773a587edbc0e6 SHA512 1b98decf6777182417c86974d6891af59fc8eb83c183d1c50305c3803c6bc4be0414c6770b0aab05f4dafece6f5456bac530427817225cd2e597c5454536a980
 AUX mdadm.confd 205 BLAKE2B 3ce0a158e1b9621a034442cdc7f643ee39a3cc9ea62697b6d1d090ae28c07e1b2ee192a33bdbdc36b95ec1e997f375764cddfde7e247b0a4830121a5216736ac SHA512 7bf66898000b3d02bbf0704a8032b0f4fc045380501dc8d2bbbb31d33b122d9c35879b25714663079eeadd207c9da87c9d9af8464e76146bf5b68594e73fd92c
 AUX mdadm.rc 465 BLAKE2B fef5cc1cc68d7d5e11250b6196cfd1fa45bd39e14d90c723d44d7b6e6ee8c3727056eb7f6cd57646f05646798b246aa0579bc61c11cd79c6559cb1070fff7685 SHA512 01fe98e88466afefd84a52cedc5fcbe18eadf8f80fed12b8a2a6a8f5581e7cabe8ce3f2e99cdc3c1bacc626f5eb4f6bffe3cc888153089ee2a461c465ae05570
@@ -16,5 +17,5 @@ DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B dd04f2dd044d0bca85920eaf5c79a28
 DIST mdadm_4.3-1.debian.tar.xz 86972 BLAKE2B 52af9ddacc402d8c3318bac31b4cd5ac3045e564832546146ba0a18d6a43866ae2c21270ac15f48df98c4f76af0eeae41679ea9e0e265dad44914bd58f27d689 SHA512 1c5203523f0c7fe271d850ab4ad376a449e870f8f1549dc4460adede1f59a1a364e741562954297e7848bae19d1cfe273a31f1bfaf739dd37559a0666abd8517
 EBUILD mdadm-4.2-r2.ebuild 2674 BLAKE2B f44db51fb6c836fbb71b3c8f892d5c9ed26b64b0a150a7c9c1b5b0073daa3353d9be0927fcbf90185af03963a105a37e2d08a302c2e83d12cba4dc5ee5603008 SHA512 1034d0120646bab24cea2d7d44c67871f19324a59af9396534a2bace2634e125b933e592f0a8898b2ebc4faf2101ad1cbd944878b85e4b6753fcc87f840f091a
 EBUILD mdadm-4.2-r3.ebuild 2767 BLAKE2B 5bed65dc0965d392f4859d5323ffa7189855df3ce2d8c4eb012a02ebf42652a9a02459a442e668f14161557b50a75787b4f3cdd7a40553318dc3112475426aff SHA512 4579962cf63df282d5e9d941f848a323011de4177e942924c107a26a091957cd55f9c5fe2fa6bd037083bc3e149906c873b119f1bfb33bdbca6abf594c89e3ed
-EBUILD mdadm-4.3.ebuild 3439 BLAKE2B a17841f77f7b994571ad3082a8eaafe018643c3a8e818c05f25268091ed7a36a3c3ee1a0fdb44920592628ac07dad3e806c8559e6394da766802ea4ca9a57421 SHA512 0a0bc96250060ae8abca424bba3963a4b607d35bbeafaee821487eaec39ce77a7059b2e5397862471ffcae07efdca0b01f2f72b526c8e2661520e6140abc0a73
+EBUILD mdadm-4.3.ebuild 3480 BLAKE2B e09ce77690acaeb3dbefc5f8c1246c02ccffd611bb22c784f7bdefbf2e1296ed0312bdf36aae0ddf68fda33ef92e93dfd143ee3aff9e513dbaaae3f38589dbd2 SHA512 0a3d1b4b55b166d2c1da461f9b5b3526704e91ac660a81d72c2a2d1c9e63e070bee5584003addd78dc43f090a6f7b25411e400a4b4d13e3cbf657efbfbf8877e
 MISC metadata.xml 418 BLAKE2B de9c0675d188ad6ad98f008b9d07967018bc9b97e28f30681693f3003a3b99e46d10af48944034fc5e6c401d0ac662473b20cd369f53ab38b80c2d2839604ff7 SHA512 a3889c19874875d1e511fbf192ef69b870da79e0e1a60026d135c2b45a5f7aa26456bc22a2fd8d4167fc968f08f1c297d4dbbe1cb21c68f61976534675f38c3b
diff --git a/sys-fs/mdadm/files/mdadm-4.3-musl125-1.patch b/sys-fs/mdadm/files/mdadm-4.3-musl125-1.patch
new file mode 100644
index 000000000000..a10b56b67b94
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.3-musl125-1.patch
@@ -0,0 +1,44 @@
+
+Note- This is also needed for musl-1.2.5 (aside other fixes)- dilfridge
+
+From 52bead95d2957437c691891fcdc49bd6afccdd49 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 12 Apr 2024 18:45:13 +0200
+Subject: Create.c: fix uclibc build
+
+Define FALLOC_FL_ZERO_RANGE if needed as FALLOC_FL_ZERO_RANGE is only
+defined for aarch64 on uclibc-ng resulting in the following or1k build
+failure since commit 577fd10486d8d1472a6b559066f344ac30a3a391:
+
+Create.c: In function 'write_zeroes_fork':
+Create.c:155:35: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function)
+  155 |                 if (fallocate(fd, FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE,
+      |                                   ^~~~~~~~~~~~~~~~~~~~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/0e04bcdb591ca5642053e1f7e31384f06581e989
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+---
+ Create.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Create.c b/Create.c
+index 4397ff49..d94253b1 100644
+--- a/Create.c
++++ b/Create.c
+@@ -32,6 +32,10 @@
+ #include	<sys/signalfd.h>
+ #include	<sys/wait.h>
+ 
++#ifndef FALLOC_FL_ZERO_RANGE
++#define FALLOC_FL_ZERO_RANGE 16
++#endif
++
+ static int round_size_and_verify(unsigned long long *size, int chunk)
+ {
+ 	if (*size == 0)
+-- 
+cgit 1.2.3-korg
+
diff --git a/sys-fs/mdadm/mdadm-4.3.ebuild b/sys-fs/mdadm/mdadm-4.3.ebuild
index 4e84a51e91b3..f132d354e746 100644
--- a/sys-fs/mdadm/mdadm-4.3.ebuild
+++ b/sys-fs/mdadm/mdadm-4.3.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${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"