gentoo auto-resync : 17:12:2022 - 21:40:16

4 files changed, 56 insertions, 20 deletions

diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index 3095ebdb853d..171baf16d549 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,7 +1,7 @@
 AUX 0001-HACK-musl-does-not-define-pthread_getname_np.patch 1406 BLAKE2B 92d82eb147a90ca65acfe9b2ff16dd6f514fa1f2a5950b1f6fcdff68963e0f4be4a8b9b2b695a912eb1ac2ffcc0b171749d4c8b38f733451aa48646b2a8653ce SHA512 93bd338ec59fa0601178e3737a4eaeb8af7df83c16b409544ec55bdf7865786785cf6a9a160dd29cb4b8eadc2c6f311f6cd3bbe6e9310ad2356fd69ff5ba35bc
-DIST bees-0.6.5.tar.gz 125987 BLAKE2B 459cec5f3c706045ee12a6efe2e32315d71ca16c966bbdb4d6c813f726a7cc411cf4bd272c082ba0bbfc33e9ec4c715a6be773ba929c2b5b31f1731e10ad137c SHA512 db4cf6bc8c7709ee9aa1e2faa2ac1c6323fb8c7407470cec0c370a0f910ec4a1f3cf6ebe695d16383aaec00b62b3de77aa5bbdd47502bdb564e247b3b8879e0b
 DIST bees-0.7.tar.gz 164311 BLAKE2B b0b7f1bc24257e385b6201f473bf9377021d542a257b341c5c8ba5372fa604697e717bb65329d57abf2d2ac4311325e3242c481430629c911fcee3e42e1ea55e SHA512 beee7563ae0ea43247465941ef15f7bab2d86d5d164ccb280c378678b0bf61a67a4718881b94a5f3a72d4d0296eda92bfd7464dae0faeaa72b0e2a4ebef39a53
-EBUILD bees-0.6.5-r1.ebuild 3403 BLAKE2B 751cfa80fbe49cab4eab2b3071c936ad589c93cbf373d82458375a2995a1d9e64be72bd1b1ca1bc17325778753ac8455d3d33eb7d40fd709fe5860b96af18bc6 SHA512 49bcf89cd12b0d11617c8d4f88287fa318afeed13ad92408908b6e019513e4403a69e434b72fd0955363eb85d001d0ef8dfee199e2803f2a9977cb52e5977465
-EBUILD bees-0.7.ebuild 3217 BLAKE2B 077a8c4697ef966cef8f6d0c6c47fed0495a2f9efd600308884b86390796af3ae46f96c46831752e326073c4c68e896fae192863083bf33be728f403475d57a6 SHA512 8835095a1acb44d75ac5e4d1e93117fe1ec61a682058ca488f6b2a09901a914d0beb805561d9aa8dbc8d935262e1df507adf243b6ae794dc488266180149b7a5
-EBUILD bees-9999.ebuild 3217 BLAKE2B f91c2f9529d2afb81a1b1f5634d8975bc54f75e27a13b86cd03888be6c9deb573d98d5cabff450c9faf385e1c04e4b9e4c4b92f0f4f398e6927633b61f48e1a5 SHA512 67096a3444e35be517e9001698466c763fb8668f56532edc2340bc1175c7259ec1eb7c5acbca941214dadd74cb865efe0280cc06c601ddab714206f7c8046dc3
+DIST bees-0.8.tar.gz 166890 BLAKE2B 26c7563ed1433526371d45e5f2f9e4f2a749e18f0d97e7a2ee445ef9d4cdf49210c8a96f756c04d19337497d12eacde28430f9ad64df198ff44c901b1bfc36c2 SHA512 92208ee186de18e764fab42f3de4e518047a21f4ed2429040a706fe7a45e0b2d39d1e468beefc92553659fc4587f4894a33d5a26bfd59278923208db3acc7da0
+EBUILD bees-0.7.ebuild 4042 BLAKE2B 9f3e824533069623fd0dad5020527d0b39ca54d650f5b0cbcc0db4733e700d4388602af88d88c6f38798ff0d62cd224a69728ae166bbe46892c206be1743671b SHA512 1fcf12cb482333977fec6896b486e4434fc663ecb492ff26c4c9941c1cf049d8cd4741388640cc3d3245f61247898df30857ddb1a8c41279f170320f500ce054
+EBUILD bees-0.8.ebuild 4042 BLAKE2B 9f3e824533069623fd0dad5020527d0b39ca54d650f5b0cbcc0db4733e700d4388602af88d88c6f38798ff0d62cd224a69728ae166bbe46892c206be1743671b SHA512 1fcf12cb482333977fec6896b486e4434fc663ecb492ff26c4c9941c1cf049d8cd4741388640cc3d3245f61247898df30857ddb1a8c41279f170320f500ce054
+EBUILD bees-9999.ebuild 4042 BLAKE2B 9f3e824533069623fd0dad5020527d0b39ca54d650f5b0cbcc0db4733e700d4388602af88d88c6f38798ff0d62cd224a69728ae166bbe46892c206be1743671b SHA512 1fcf12cb482333977fec6896b486e4434fc663ecb492ff26c4c9941c1cf049d8cd4741388640cc3d3245f61247898df30857ddb1a8c41279f170320f500ce054
 MISC metadata.xml 622 BLAKE2B fc27438101691a12742484547df8b94fc3d22822cc3aefe81468e435a917373c25c5736506bfa2cf637bc265a3686c7f03d7431eaf54e5405f7ad2738390e872 SHA512 382ea31887a310f375bed14aa88d433831964b080faf3c7fb209a0d73b1d0d3da38a8e222ceda267b4ada4e81fa36cad94d4ddf180e7a2f39dfe3e9439b60321
diff --git a/sys-fs/bees/bees-0.7.ebuild b/sys-fs/bees/bees-0.7.ebuild
index a37916aa1764..5ceba33ee963 100644
--- a/sys-fs/bees/bees-0.7.ebuild
+++ b/sys-fs/bees/bees-0.7.ebuild
@@ -42,6 +42,12 @@ pkg_pretend() {
 			ewarn "with more recent kernels:"
 			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
 			ewarn
+		elif kernel_is -lt 5 7 0; then
+			ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system"
+			ewarn "locks for a long time while at the same time CPU usage increases when bees is"
+			ewarn "operating. bees tries to avoid this behavior by excluding very common extents"
+			ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness."
+			ewarn
 		fi
 		if kernel_is -lt 5 1 0; then
 			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
@@ -51,8 +57,8 @@ pkg_pretend() {
 			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
 			ewarn
 		fi
-		if kernel_is -lt 5 3 4; then
-			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
+		if kernel_is -lt 5 4 19; then
+			ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running"
 			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
 			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
 			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
@@ -60,6 +66,14 @@ pkg_pretend() {
 			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
 			ewarn
 		fi
+		if kernel_is -ge 5 4 0; then
+			ewarn "With kernel version 5.4 or later, the kernel may hang when multiple threads"
+			ewarn "are running LOGICAL_INO and dedupe ioctl. This is not exclusively triggered"
+			ewarn "by bees but also other software running such operations, bees will just more"
+			ewarn "likely to trigger the bug. You can work around this issue by reducing the"
+			ewarn "thread count of bees to 1."
+			ewarn
+		fi
 
 		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."
diff --git a/sys-fs/bees/bees-0.6.5-r1.ebuild b/sys-fs/bees/bees-0.8.ebuild
index ee339e86c5d3..5ceba33ee963 100644
--- a/sys-fs/bees/bees-0.6.5-r1.ebuild
+++ b/sys-fs/bees/bees-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,8 +29,6 @@ RDEPEND="${DEPEND}"
 CONFIG_CHECK="~BTRFS_FS"
 ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
 
-PATCHES=( "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" )
-
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if kernel_is -lt 4 11; then
@@ -44,6 +42,12 @@ pkg_pretend() {
 			ewarn "with more recent kernels:"
 			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
 			ewarn
+		elif kernel_is -lt 5 7 0; then
+			ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system"
+			ewarn "locks for a long time while at the same time CPU usage increases when bees is"
+			ewarn "operating. bees tries to avoid this behavior by excluding very common extents"
+			ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness."
+			ewarn
 		fi
 		if kernel_is -lt 5 1 0; then
 			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
@@ -53,8 +57,8 @@ pkg_pretend() {
 			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
 			ewarn
 		fi
-		if kernel_is -lt 5 3 4; then
-			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
+		if kernel_is -lt 5 4 19; then
+			ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running"
 			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
 			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
 			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
@@ -62,6 +66,14 @@ pkg_pretend() {
 			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
 			ewarn
 		fi
+		if kernel_is -ge 5 4 0; then
+			ewarn "With kernel version 5.4 or later, the kernel may hang when multiple threads"
+			ewarn "are running LOGICAL_INO and dedupe ioctl. This is not exclusively triggered"
+			ewarn "by bees but also other software running such operations, bees will just more"
+			ewarn "likely to trigger the bug. You can work around this issue by reducing the"
+			ewarn "thread count of bees to 1."
+			ewarn
+		fi
 
 		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."
@@ -71,23 +83,19 @@ pkg_pretend() {
 src_prepare() {
 	default
 	sed -i 's/ -Werror//' makeflags || die
-	sed -i '/^LDFLAGS/s/=/+=/' {src,test}/Makefile || die
 }
 
 src_configure() {
-	tc-export CC CXX
+	tc-export CC CXX AR
 	cat >localconf <<-EOF || die
 		ETC_PREFIX="${EPREFIX}/etc"
 		LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
 		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/$(get_libdir)"
 		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
 		DEFAULT_MAKE_TARGET=all
 	EOF
 	if [[ ${PV} != "9999" ]] ; then
-		cat >>localconf <<-EOF || die
-			BEES_VERSION=v${PV}
-		EOF
+		echo BEES_VERSION=v${PV} >>localconf || die
 	fi
 	if use tools; then
 		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 7fffe63931c2..5ceba33ee963 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,12 @@ pkg_pretend() {
 			ewarn "with more recent kernels:"
 			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
 			ewarn
+		elif kernel_is -lt 5 7 0; then
+			ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system"
+			ewarn "locks for a long time while at the same time CPU usage increases when bees is"
+			ewarn "operating. bees tries to avoid this behavior by excluding very common extents"
+			ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness."
+			ewarn
 		fi
 		if kernel_is -lt 5 1 0; then
 			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
@@ -51,8 +57,8 @@ pkg_pretend() {
 			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
 			ewarn
 		fi
-		if kernel_is -lt 5 3 4; then
-			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
+		if kernel_is -lt 5 4 19; then
+			ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running"
 			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
 			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
 			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
@@ -60,6 +66,14 @@ pkg_pretend() {
 			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
 			ewarn
 		fi
+		if kernel_is -ge 5 4 0; then
+			ewarn "With kernel version 5.4 or later, the kernel may hang when multiple threads"
+			ewarn "are running LOGICAL_INO and dedupe ioctl. This is not exclusively triggered"
+			ewarn "by bees but also other software running such operations, bees will just more"
+			ewarn "likely to trigger the bug. You can work around this issue by reducing the"
+			ewarn "thread count of bees to 1."
+			ewarn
+		fi
 
 		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."