gentoo resync : 22.01.2021

3 files changed, 53 insertions, 2 deletions

diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index b53b37f27d3a..6a3a2daca408 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,5 +1,6 @@
 AUX 0001-HACK-musl-does-not-define-pthread_getname_np.patch 1406 BLAKE2B 92d82eb147a90ca65acfe9b2ff16dd6f514fa1f2a5950b1f6fcdff68963e0f4be4a8b9b2b695a912eb1ac2ffcc0b171749d4c8b38f733451aa48646b2a8653ce SHA512 93bd338ec59fa0601178e3737a4eaeb8af7df83c16b409544ec55bdf7865786785cf6a9a160dd29cb4b8eadc2c6f311f6cd3bbe6e9310ad2356fd69ff5ba35bc
+AUX v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch 1481 BLAKE2B 971b52075858100a0bea860c10af4d6501cc79356730e5510fc4e430695a4f703c7d06c6f651b8403296540570230581f06a7d2fec9426e30ebe99f19ff5df05 SHA512 f36f98eef3ad942ce411331492fc6722201ddf4c9ec46695dbd8af28d87f7188443401e502ce67936d08f3cb6dfa17535264fe30150e4bf2e0652fc2c55378e3
 DIST bees-0.6.4.tar.gz 126064 BLAKE2B 562f0cfd63d15978a26f859548eb36cea0bf1be8e363c7ee5d2294e3c6407b4a93d865ffe2d15fabaeb2b3e136ad2d48cab3210c00e5fe39432985186ad62c55 SHA512 ce0eb66ac0770838e13ba6007fd765c02aea3f5eefc09e2834118d420e71693c37b8aa8511cfc9577ca09ab82d37787a1854edbed090c059759b29c70d834672
 EBUILD bees-0.6.4.ebuild 3097 BLAKE2B ccab0344ebed9ebd7f764ce15c6a1b0c553055e49b1365cf5a612fc12234cc14e4537267fc7502c6c6284e1a4c0e2bd1a3dfa735918922ce181bab709a7cb423 SHA512 2d3852a1a15739dc357987a659ec2cee1f4c2991aa7a2a8a0735484b4ef67cdebc7c972261ec71e78a19191e5a7dd6ed7f5149f61453b5a5b27bebe6769f73da
-EBUILD bees-9999.ebuild 3097 BLAKE2B ccab0344ebed9ebd7f764ce15c6a1b0c553055e49b1365cf5a612fc12234cc14e4537267fc7502c6c6284e1a4c0e2bd1a3dfa735918922ce181bab709a7cb423 SHA512 2d3852a1a15739dc357987a659ec2cee1f4c2991aa7a2a8a0735484b4ef67cdebc7c972261ec71e78a19191e5a7dd6ed7f5149f61453b5a5b27bebe6769f73da
+EBUILD bees-9999.ebuild 3103 BLAKE2B 8aac86dc3e6e5ec9fa947ad70d718438fc7befc991c89db9f696c25d4df85a0c664e75a8e97396d48b1d68318f52d864baae428eb4c47c2ec25dff74d9a91e68 SHA512 4267d9824b1f15535c35dae20c442355ec2c05cd16707579df21f19d6478dbcb034af6103b76c4829b6aa5b21e30bcf0bfc83989f709a0dcb2d21c7bcef933ba
 MISC metadata.xml 591 BLAKE2B 8744c233c9718ce545165c6c8deaa455efe283cfe186aeee9876ad31195891b1255ae20851e5d5f52c19f4bb038558dffd7c2f3bd091af1b0b5c3d6e7a717975 SHA512 333a091d0869955cc3fce76c1d462b44715f8f1b89017c1b240cd5398e53ee1b370f7fc2d76407efa8a045c1088a195786da072d4d6ec30c1f09f42977839b20
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 6c38f7b9c91e..d656c4e6cded 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -29,7 +29,7 @@ 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" )
+PATCHES=( "${FILESDIR}/v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch" )
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
diff --git a/sys-fs/bees/files/v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch b/sys-fs/bees/files/v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch
new file mode 100644
index 000000000000..6b8224a5a56f
--- /dev/null
+++ b/sys-fs/bees/files/v9999-0001-HACK-musl-does-not-define-pthread_getname_np.patch
@@ -0,0 +1,50 @@
+From 02bdb636be5abd15836e5e43e9b53517595686c9 Mon Sep 17 00:00:00 2001
+From: Kai Krakow <kai@kaishome.de>
+Date: Thu, 16 Apr 2020 21:21:57 +0200
+Subject: [PATCH v9999] HACK: musl does not define pthread_getname_np()
+
+The glibc alternative musl does not define this setter function. This
+fix is probably wrong because it resets the thread names used for
+logging internally to empty strings.
+
+Link: https://www.openwall.com/lists/musl/2019/07/17/3
+Signed-off-by: Kai Krakow <kai@kaishome.de>
+---
+ lib/task.cc | 2 ++
+ src/bees.cc | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/lib/task.cc b/lib/task.cc
+index 937a477..85da59b 100644
+--- a/lib/task.cc
++++ b/lib/task.cc
+@@ -194,7 +194,9 @@ namespace crucible {
+ 		lock.unlock();
+ 
+ 		char buf[24] = { 0 };
++#ifdef _GNU_SOURCE
+ 		DIE_IF_MINUS_ERRNO(pthread_getname_np(pthread_self(), buf, sizeof(buf)));
++#endif
+ 		DIE_IF_MINUS_ERRNO(pthread_setname_np(pthread_self(), m_title.c_str()));
+ 
+ 		sched_param param = { .sched_priority = 0 };
+diff --git a/src/bees.cc b/src/bees.cc
+index 03a626c..3db5d73 100644
+--- a/src/bees.cc
++++ b/src/bees.cc
+@@ -152,10 +152,12 @@ BeesNote::get_name()
+ 	// OK try the pthread name next.
+ 	char buf[24];
+ 	memset(buf, '\0', sizeof(buf));
++#ifdef _GNU_SOURCE
+ 	int err = pthread_getname_np(pthread_self(), buf, sizeof(buf));
+ 	if (err) {
+ 		return string("pthread_getname_np: ") + strerror(err);
+ 	}
++#endif
+ 	buf[sizeof(buf) - 1] = '\0';
+ 
+ 	// thread_getname_np returns process name
+-- 
+2.26.2
+