gentoo auto-resync : 04:08:2022 - 20:05:57

4 files changed, 36 insertions, 1 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 57112595dafc..82245ac4180f 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 10c44087f501..a6fd2a84f133 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,3 +1,4 @@
+AUX btrfs-progs-5.18.1-glibc-2.36.patch 984 BLAKE2B d7aefe6434a4719d1b98ce1842e340f8eb322b95adb4037cac10a7824fa94ad7c8a86e01967d99e1e9ede9cda4f6e55b53c440e9d37b94018e31388b7214c5d4 SHA512 cad4314966c634f44252173ff23f09822d2448ac9346d1e9d5c0a193ada1606ed6c7515a3283b2560d68ffb7a004c4c25549f1cd5c87330a1aa49e1a3d722719
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
 DIST btrfs-progs-v5.16.2.tar.xz 2334464 BLAKE2B a21809a840107c370f1598e19f8b07d8bdd704e8ff3ce4cb78431000e7560802e1047d8200c523a45a761d59a311f1ec384946bd585826a129b05a1a5fd0250e SHA512 c89a763e8b099e0e9d04ff239dfee156a15fc783c515bbd48597f5645f720c377dbb4f2dfe9065971a65d3ade9d8fcb24cf37d527811bf4204153a06f7c8c3a7
@@ -7,6 +8,6 @@ EBUILD btrfs-progs-5.10.1-r1.ebuild 3052 BLAKE2B 11e654a2bf6fa0256e844c6bde5b3b0
 EBUILD btrfs-progs-5.15.1.ebuild 3090 BLAKE2B 206bd5d48607139125e423fa8d7d88dd961c87f2ecc8b1fde2cea01c683b9000d8e9b1bd41bc1ae96870edef1bd55cf45411136b652f5b63895d84a4f5768b22 SHA512 438c8d7bc27ea19dcc6698d5b6cab82742b11c9918506ed79d40c0c3553a2725aa29c74a00bf520d17295e6d81eb66877a0795382b831291679232ba31c78f78
 EBUILD btrfs-progs-5.16.2.ebuild 3145 BLAKE2B 6c3553cc850c61c0661712c648013c78e46e9151ba825f194e35566334dff5a18a1e0270e17a938fef669abf750fb01db7972c7dcdf7e12636d3a7d615279a45 SHA512 d5bca8a96f59eea41c9cf8ee1060f7a3a0b4ca30aae4fb399eb09e5f9ac05bb0710b37c6501c59733fe2a9afaaf73a0c16b6f82d6b3d9e7b316425901aea3ec6
 EBUILD btrfs-progs-5.17.ebuild 3114 BLAKE2B acecdd2560d5fd72f013e3604a23818608bf2cd87613f8fa4f282be2c6dfaaa5e0e3f7a8617610f11ff9a08dd9dce0fbf97b6c0941c6cf3ad476c4c37246fcaa SHA512 5ae0124a9f8ae4c448fa058c003be65225dc0281a50178bc1fb5cda5feccb684d85e10a86577b62c40341f07da13f06d72386eb876a14a7efce5277439d44818
-EBUILD btrfs-progs-5.18.1-r1.ebuild 3316 BLAKE2B 47162d7502cdcc51a5238d4138b5b84332054e73bb9ea60aa606a8a4019ad334d4e8760c6e639a942224f9c77fb2d311480b3d55a0e9eb940a6c4a1276b2a5fd SHA512 2a5a9821b0030515c1d16a621066457d242898e20077720186933747e7328c10aacaad1aee65254309d57929948b3ffd238f857b980d656c8a963563cff1a8ce
+EBUILD btrfs-progs-5.18.1-r1.ebuild 3388 BLAKE2B 9abed0b3cf61e0ea8ce61270e53751fd6cefbe2907bd498543237e8653e52f9fc4bee773139c136a14a6b99cda5e46af903169eb547a8637050981281fe74a9d SHA512 8cca2d5536600c1193594fe15447051fc2d8b653bba077c7e0e3b63f08c53ed689f3ecc8fd465020fa5bc13e36e38deab48cdf5b61e47a50818d1a8c62d66664
 EBUILD btrfs-progs-9999.ebuild 3316 BLAKE2B 47162d7502cdcc51a5238d4138b5b84332054e73bb9ea60aa606a8a4019ad334d4e8760c6e639a942224f9c77fb2d311480b3d55a0e9eb940a6c4a1276b2a5fd SHA512 2a5a9821b0030515c1d16a621066457d242898e20077720186933747e7328c10aacaad1aee65254309d57929948b3ffd238f857b980d656c8a963563cff1a8ce
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
index 76f2afe1fe01..0ba3477e685f 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
@@ -87,6 +87,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/btrfs-progs-5.18.1-glibc-2.36.patch"
+	)
 	default
 	if [[ ${PV} == 9999 ]]; then
 		AT_M4DIR="m4" eautoreconf
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
new file mode 100644
index 000000000000..52671ea6c357
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
@@ -0,0 +1,31 @@
+https://github.com/kdave/btrfs-progs/commit/46eb32a019834b0a49ae9744db1a921aaa6a3d63
+
+From 46eb32a019834b0a49ae9744db1a921aaa6a3d63 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 25 Jul 2022 11:58:35 -0700
+Subject: [PATCH] btrfs-progs: use linux mount.h instead of sys/mount.h
+
+This file includes linux/fs.h which includes linux/mount.h and with
+glibc 2.36 linux/mount.h and glibc mount.h are not compatible [1]
+therefore try to avoid including both headers
+
+[1] https://sourceware.org/glibc/wiki/Release/2.36
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ common/device-utils.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/common/device-utils.c b/common/device-utils.c
+index 617b67462..25a4fb8c4 100644
+--- a/common/device-utils.c
++++ b/common/device-utils.c
+@@ -15,7 +15,6 @@
+  */
+ 
+ #include <sys/ioctl.h>
+-#include <sys/mount.h>
+ #include <sys/statfs.h>
+ #include <sys/types.h>
+ #include <stdio.h>