gentoo auto-resync : 23:02:2025 - 19:24:09

3 files changed, 50 insertions, 1 deletions

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index af814765ba2b..512e7ca3d63e 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,4 +1,5 @@
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
+AUX xfsprogs-6.13.0-32-bit.patch 1649 BLAKE2B e7770a5ec0397826628f6e87d2ea6263a9b3319cd28ab8b7732a440b2627e170f8c7d68dcb9f1e6b9c362432606a75d2d0b584787b5b244972db84b7e7c70732 SHA512 d38323df13ac93a886ea2681903570be01c301a92e128136161e808aede73b9a42a0d3f2196cbb9897f14606ee694bf7f879f99fb8e9beda4ea47aa0851e6955
 DIST xfsprogs-6.10.1.tar.xz 1449932 BLAKE2B e9ed15b2d4a9026e0079adfb38578721e13498290a5d9590edae1fd41c9ee0338f9b823568677394952709d82bdc8ade36905a2266ffe64803901adbadfa5643 SHA512 b9fd7b7eaf038772ee4a9602bf38f714db7077731ec8904e0959d28b0103d443be8ae67720869012b90737c1ff440fbce44b3b23b662939c9a90c6d3be3fab08
 DIST xfsprogs-6.11.0.tar.xz 1457084 BLAKE2B 846b25ad36477d71f8f2091ad16699356416f09befbb4250335081d2a8fd78011e9100fbabfb727acdb65520a38c912d9bb9e33b17c222c97de88fd00ab004a9 SHA512 209b479e510e5d5c558430b523bebd90f34b2effeac46f783aad4ec45a9f39998ca1efc67155c54c22e778859968f4b275b0ca6f225603f17ae4cc5c7596a4ca
 DIST xfsprogs-6.12.0.tar.xz 1471672 BLAKE2B 471832b07bc2cca5bde6e1ac253d151b0889f7b7be75ae322727299a83329899d4c3aac8217b069fee3f7abc6bc964127c35a206b04cb796999497f5ad701f44 SHA512 020810b4a261f4ab4eb94aae813f22b26bb9f17705967198189509e684422361dd80af938e4a77cf326353d5d61d5aeaaee9a34e8a7b8ed1dddd63b7ad1b0510
@@ -7,6 +8,6 @@ DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812dd
 EBUILD xfsprogs-6.10.1.ebuild 2795 BLAKE2B 03fad313fe94ab824066c2d7c3a9d0f02d8cf1833b21fc3f71bb38a0802c145f2ce11e7ac2745ea298a88cf487d0b5d86eeb4cd0a010bf4e4e05029e1f45157a SHA512 ec1698750ee990598979bfb3fd6e662590c546560317043772d564fbb048ec6d11ea8e29b92d1c744b02bf2833c08ce4c59bc445e6d04d03a0b43ad21c407291
 EBUILD xfsprogs-6.11.0.ebuild 2913 BLAKE2B cd505b5b3d6bc37b94ea4fae6b875363621a10b94a9c7c0ad949e27db3515370c9413657406fafe0366907c80ea8f3b6af28e2b42ebb61939bbfd11a3ec4f2f3 SHA512 05789d6fad97041eb1723d1fd615b3f41975413297e62b04559462a6db3dfffb88d515dfd16de398bd927a9c85fd954d8b131f971af18d7ed1170c1d1d65221b
 EBUILD xfsprogs-6.12.0.ebuild 2957 BLAKE2B b2af9e5824482026d38459b86c383b4659958532b71d3450acc2052de625085efdd7862fa662dff89eae910e6850677469912e6588494ac19c9eefc1112c0404 SHA512 c8c7898ec4b02eb9e5b9a0a1ddf3c0d30928a879e9320125113c38aaf27cdd5235c0081bf1b406fed2b610384abf178be372c5441f9d97c864525259f0328713
-EBUILD xfsprogs-6.13.0.ebuild 2957 BLAKE2B b2af9e5824482026d38459b86c383b4659958532b71d3450acc2052de625085efdd7862fa662dff89eae910e6850677469912e6588494ac19c9eefc1112c0404 SHA512 c8c7898ec4b02eb9e5b9a0a1ddf3c0d30928a879e9320125113c38aaf27cdd5235c0081bf1b406fed2b610384abf178be372c5441f9d97c864525259f0328713
+EBUILD xfsprogs-6.13.0-r1.ebuild 3011 BLAKE2B a1509e934fb0f8eb79df99bdb77c7366788c9dbc1ffea2e831f336d24a13f7600a55058de4802d966d5a346c0c4e42514c38d9e464aa4d14f2b5794679951bd0 SHA512 28ba42a294b9bcba34258b4e711af6b355f5a1ce098e979f1b7f5943903a346563568ef8987160d2f5b77c131703523dfde30e3a4b7a5bb6d685a26294c57b72
 EBUILD xfsprogs-6.8.0.ebuild 2589 BLAKE2B 724a51c203639b6ef3a1e60e04705ca46084acf58c59bed0ae8615fdfe60b8ba473092eb33b72b1276ca86b81a9dcdfcbda613a4c0643b061e1877ea139600d8 SHA512 9c2a1aadc1a5122e48768cbe60d6179c1e172960a92218767fcdf03adcf5a64b694798591c620e5045d131da61058a8651333607abe6ae237b607bddf8d1a5e7
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.13.0-32-bit.patch b/sys-fs/xfsprogs/files/xfsprogs-6.13.0-32-bit.patch
new file mode 100644
index 000000000000..e5bb09425f7e
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-6.13.0-32-bit.patch
@@ -0,0 +1,44 @@
+https://lore.kernel.org/linux-xfs/20250221185757.79333-1-preichl@redhat.com/
+
+From: Pavel Reichl <preichl@redhat.com>
+To: aalbersh@redhat.com
+Cc: linux-xfs@vger.kernel.org
+Subject: [PATCH v2] xfsprogs: Fix mismatched return type of filesize()
+Date: Fri, 21 Feb 2025 19:57:57 +0100
+Message-ID: <20250221185757.79333-1-preichl@redhat.com>
+X-Mailer: git-send-email 2.48.1
+In-Reply-To: <20250217155043.78452-1-preichl@redhat.com>
+References: <20250217155043.78452-1-preichl@redhat.com>
+Precedence: bulk
+X-Mailing-List: linux-xfs@vger.kernel.org
+List-Id: <linux-xfs.vger.kernel.org>
+List-Subscribe: <mailto:linux-xfs+subscribe@vger.kernel.org>
+List-Unsubscribe: <mailto:linux-xfs+unsubscribe@vger.kernel.org>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+The function filesize() was declared with a return type of 'long' but
+defined with 'off_t'. This mismatch caused build issues due to type
+incompatibility.
+
+This commit updates the declaration to match the definition, ensuring
+consistency and preventing potential compilation errors.
+
+Fixes: 73fb78e5ee8 ("mkfs: support copying in large or sparse files")
+
+Signed-off-by: Pavel Reichl <preichl@redhat.com>
+Reviewed-by: Darrick J. Wong <djwong@kernel.org>
+Reviewed-by: Carlos Maiolino <cem@kernel.org>
+--- a/mkfs/proto.c
++++ b/mkfs/proto.c
+@@ -20,7 +20,7 @@ static struct xfs_trans * getres(struct xfs_mount *mp, uint blocks);
+ static void rsvfile(xfs_mount_t *mp, xfs_inode_t *ip, long long len);
+ static int newregfile(char **pp, char **fname);
+ static void rtinit(xfs_mount_t *mp);
+-static long filesize(int fd);
++static off_t filesize(int fd);
+ static int slashes_are_spaces;
+ 
+ /*
+-- 
+2.48.1
diff --git a/sys-fs/xfsprogs/xfsprogs-6.13.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild
index d7ac475a1d1f..f2dfa068fb68 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.13.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild
@@ -28,6 +28,10 @@ DEPEND="
 BDEPEND="nls? ( sys-devel/gettext )"
 RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.13.0-32-bit.patch
+)
+
 src_prepare() {
 	default