diff options
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/Manifest.gz | bin | 22258 -> 22264 bytes | |||
| -rw-r--r-- | sys-fs/bees/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/bees/bees-9999.ebuild | 13 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/Manifest | 3 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 1 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch | 38 |
6 files changed, 54 insertions, 3 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 3ccf49643625..f5d87bb551b7 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest index 8f062277fcd9..89986374540c 100644 --- a/sys-fs/bees/Manifest +++ b/sys-fs/bees/Manifest @@ -4,5 +4,5 @@ AUX 0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch 1445 BLAK DIST bees-0.10.tar.gz 177509 BLAKE2B 269cf65d5250a07297dfaee6c0fd6bc25199d63fe423d63ce39df8bcdb64d6f8110a0e03d0dc7dc1b105a8886f2a9364da8878481546eaa8dbf3dc46abc569ed SHA512 77a4ae3d66430c2d9dc0351c16c60bad95f21e238fc00f5f5787f55929ba75ee25212ac4bb4a3e4a9419cec27bbcfd2987aa925a54bc2872609b38a698dbedc3 EBUILD bees-0.10-r1.ebuild 4151 BLAKE2B d0b2ddea9523905f3a5620aa6e0da3c595a405afd34a9ab5488a20e7b1f5c77130d9b56b3856a236004982d6069f213ddacf28a9234f3498cc805b4f9a980f56 SHA512 35d51de04f606c5fe35bd0dd071c58e435398dc304f0520e307974a2436bc358856580f35f1611a8e45b6e1d16b4b67d050308ac61dfb8ea8c60872c616f47cd EBUILD bees-0.10.ebuild 4076 BLAKE2B dad615a8ad7fada7c1cd31a5cffa6fad2cdcbc1cf241cc6e602d927cd9c182289d944663365cbeaa27a2f14f89cd8150e7c7196c19b5bbd4cb2580dae80bc19c SHA512 53a60088a2e078e1dec4899d77961c51976f941ca3952de32ddacdb6c03b4e6350d977f159b7a845ec45901bb4cb77b19ca9aebeec2ef1cc7867740df74adbbb -EBUILD bees-9999.ebuild 4151 BLAKE2B d0b2ddea9523905f3a5620aa6e0da3c595a405afd34a9ab5488a20e7b1f5c77130d9b56b3856a236004982d6069f213ddacf28a9234f3498cc805b4f9a980f56 SHA512 35d51de04f606c5fe35bd0dd071c58e435398dc304f0520e307974a2436bc358856580f35f1611a8e45b6e1d16b4b67d050308ac61dfb8ea8c60872c616f47cd +EBUILD bees-9999.ebuild 4782 BLAKE2B d191d127ce13f1caff8ec7f36b22dab6a95bab5a1ef368b6f6c4645cd1316110f04abe669a15521ab10b59dc969f86e11550bb34f1f8555c405886f86eb1de47 SHA512 e3503e6cd9cd492c37a8f380201d0bf0cd494b3369a7b67811db98f6929833d17d00753426e64e4ef727ced60797a73c825c1987d9210981034b0a73bac54ede MISC metadata.xml 529 BLAKE2B 69ea069e33d1af7c2c38aa7f8fc61516f23c586ad162d9581859829b084c8da3ef76278173e1ac3afa1ef432355ab14f2ecc01d07f039f8447c20cc27b22d633 SHA512 cb9ba7a32c6a8269f7303ebd41bf0e21f4325560b40bba10aff08a05d07170f9f0e35e687e688f6793c0abf994c9b23f90a47b9d32544636f2d6b5ab51140bd3 diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild index e1d5da90f548..193a07fc4468 100644 --- a/sys-fs/bees/bees-9999.ebuild +++ b/sys-fs/bees/bees-9999.ebuild @@ -30,7 +30,6 @@ ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs" PATCHES=( "${FILESDIR}/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch" - "${FILESDIR}/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch" ) pkg_pretend() { @@ -80,9 +79,21 @@ pkg_pretend() { ewarn fi fi + if kernel_is -lt 5.7; then + ewarn "WARNING: Kernel versions lower than 5.7 are no longer really supported by" + ewarn "bees. While there should be no unexpected data loss, you may experience" + ewarn "severe slowdowns or even system lockups." + ewarn + fi elog "Bees recommends running the latest current kernel for performance and" elog "reliability reasons, see README.md." + elog + elog "NEWS: bees now defaults to a much improved extent-based scanner. It is compatible" + elog "with your existing state database in `\$BEESHOME` but it may start over from the" + elog "beginning. However, it will keep the state of the old scanner, so you can switch" + elog "back and forth. To actually use the new scanner, use scan mode 4 or remove the" + elog "scan mode parameter from your init script. Requires kernel 4.14 or higher!" fi } diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index d0ee0f965713..239ab4cebcdc 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -2,8 +2,9 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e83 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507 AUX e2fsprogs-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch 1140 BLAKE2B bd454a4cf073db6e2e102ad814065e3a0c9a81282db932a2259a615417a9dea5879e53ca6d4bd41537147e7706edc88ecbd06ad71dc57305e8b0b835c2b15ae9 SHA512 90afefd47bbec59537cd646515dc320eac7b6e0f89ce5100b0d518d2386f8f57f84cf182f62130a7530e9a78132fc971e3195f4cef1836a8175261ddb1beaf11 AUX e2fsprogs-1.47.0-parallel-make.patch 3491 BLAKE2B b3848202f038cc86a07e784bfeff266096f241e38cd96eec176aa05423cc1286b30b879b202bec103851c3b59394ea4f894b03e1b4868dd035fb47679f984cc3 SHA512 08764ccb47b8790c390f47440082ce0dcd844bb3bddada647c63cc176d3daab29f8815380ddb65ed8a60b91b6a5af9c0bc32d32029c39b2c2c996a6026992121 +AUX e2fsprogs-1.47.1-c23.patch 1293 BLAKE2B 9c297e1c99c9f3b071286223ecdf20a7d5f40aa3705a4e652a4d725831e7270d3a76aa225fc9b1e76a9573509604eb563ad879a4e249849e31b1324209de09c4 SHA512 2818e1e93295231490fcd18478eb14be80a509de435baeb39c87a6c63ed53593624e0dfdc77ed76a448abaafae0f7f6d51422fcbc5fca2f71c7ad3b376e8a4c3 DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec DIST e2fsprogs-1.47.1.tar.xz 7271444 BLAKE2B 67924c38a6b688e0db5ee77b0e11a8b34ec602a729d48516668e9fdf7f36964c8a9369295f0313bfacdc8e5f3f5a27d79a8d99a1aca3b4fe0ced98a4db4884ea SHA512 2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb EBUILD e2fsprogs-1.47.0-r3.ebuild 4455 BLAKE2B d7e9e8db1092f3fe831694282f768233e53665f7879eb29bf445a1f36e2ca6fc468cbd5e0bb8447ce40ccce7f0bedc5a1fdd49c1b9933395b608bcf496b663b7 SHA512 beeb0dcca050765f805b9f8f53badac4c8a2d32d076581ae8b775195abe33a82c4291384922185060a3d071d670968db8b18de3498299580aed3b08acef28afe -EBUILD e2fsprogs-1.47.1.ebuild 4635 BLAKE2B 170bb1768c39c0de23c10d6a3c2d79512f7fa3dd4b13572ae4eda791733f4d2ab5986c6c558a9b5978e58fc0915ff318b82b3962974cd9040bb232c627325cc9 SHA512 bbc0405e0707f7cc1d1fc64503f111f64602bc03febdf4146498b980bcf107ebde68193d6b766a8cce97d4816d83458578292c6f5607491ebbda686fcdb4d0f2 +EBUILD e2fsprogs-1.47.1.ebuild 4673 BLAKE2B 2c4b56e3067dc5134f2cf5e5af08dc6ae7a0187efc3004a03a040c33f324fa5347f0a75d712cf54a8203a33d7f53aebedee54e487ea43ee721b26de48a9d2ad1 SHA512 e53757aef306901431810284bd08fd1ab4288bd4a8c32bf6edfc7f71e03c83815f26a4981faa0cc891dc38893444436a58a1e1b93dc8fcb51deae689abd63222 MISC metadata.xml 870 BLAKE2B bf57e8f24b302ed91357fb10dbc9b15656002983281fd287ee241a9a097d00e6af56d4a42de4109728dbb826ea58e58eba26ec1840299e43f7728495b1a133f4 SHA512 fa0ea6b3db855719976d3c627dcf88f62cf7fdacc132686ea06bcdfce03bb9ccef035d9aa674fc43844a0a111198c34921016183966be5f887aabed06bf0f369 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild index 216ac564dcfe..d1f1284271fc 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild @@ -46,6 +46,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch # Upstream patches (can usually removed with next version bump) + "${FILESDIR}"/${PN}-1.47.1-c23.patch ) src_prepare() { diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch new file mode 100644 index 000000000000..b39e0a45534c --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/943687 +https://github.com/tytso/e2fsprogs/issues/202 +https://github.com/tytso/e2fsprogs/commit/49fd04d77b3244c6c6990be41142168eef373aef + +From 49fd04d77b3244c6c6990be41142168eef373aef Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <rudi@heitbaum.com> +Date: Fri, 22 Nov 2024 12:36:32 +0000 +Subject: [PATCH] libext2fs: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `e2fsprogs` fails the build so only typedef int bool +for __STDC_VERSION__ <= 201710L (C17) + + ../../../lib/ext2fs/tdb.c:113:13: error: two or more data types in declaration specifiers + ../../../lib/ext2fs/tdb.c:113:1: warning: useless type name in empty declaration + 113 | typedef int bool; + | ^~~~~~~ + +https://github.com/tytso/e2fsprogs/issues/202 + +Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> +Link: https://lore.kernel.org/r/Z0B60JhdvT9bpSQ6@6f91903e89da +Signed-off-by: Theodore Ts'o <tytso@mit.edu> +--- a/lib/ext2fs/tdb.c ++++ b/lib/ext2fs/tdb.c +@@ -110,7 +110,9 @@ static char *rep_strdup(const char *s) + #endif + #endif + ++#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L + typedef int bool; ++#endif + + #include "tdb.h" + |