From 04f8fc9c18bb3e6928b624a02b85cf46daef5dd5 Mon Sep 17 00:00:00 2001 From: ptrcnull Date: Mon, 4 Sep 2023 23:25:26 +0200 Subject: [PATCH] testing/bees: upgrade to 0.10 --- testing/bees/10-pthread_getname1.patch | 32 +++++++++----------------- testing/bees/APKBUILD | 10 ++++---- testing/bees/no-werror.patch | 2 +- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/testing/bees/10-pthread_getname1.patch b/testing/bees/10-pthread_getname1.patch index 2dcc4c63d58..98f7798c109 100644 --- a/testing/bees/10-pthread_getname1.patch +++ b/testing/bees/10-pthread_getname1.patch @@ -1,23 +1,13 @@ +diff --git a/lib/task.cc b/lib/task.cc +index 9604ff2..238a841 100644 --- a/lib/task.cc +++ b/lib/task.cc -@@ -289,7 +289,6 @@ - lock.unlock(); - - char buf[24] = { 0 }; -- DIE_IF_MINUS_ERRNO(pthread_getname_np(pthread_self(), buf, sizeof(buf))); - DIE_IF_MINUS_ERRNO(pthread_setname_np(pthread_self(), m_title.c_str())); - - TaskStatePtr this_task = shared_from_this(); ---- a/src/bees-trace.cc -+++ b/src/bees-trace.cc -@@ -136,10 +136,6 @@ - // OK try the pthread name next. - char buf[24]; - memset(buf, '\0', sizeof(buf)); -- int err = pthread_getname_np(pthread_self(), buf, sizeof(buf)); -- if (err) { -- return string("pthread_getname_np: ") + strerror(err); -- } - buf[sizeof(buf) - 1] = '\0'; - - // thread_getname_np returns process name +@@ -32,8 +32,6 @@ namespace crucible { + pthread_getname() + { + char buf[thread_name_length + 1] = { 0 }; +- // We'll get an empty name if this fails... +- pthread_getname_np(pthread_self(), buf, sizeof(buf)); + // ...or at least null-terminated garbage + buf[thread_name_length] = '\0'; + return buf; diff --git a/testing/bees/APKBUILD b/testing/bees/APKBUILD index ac971b53316..46c77fde152 100644 --- a/testing/bees/APKBUILD +++ b/testing/bees/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Nicolas Lorin # Maintainer: Bradley Saulteaux pkgname=bees -pkgver=0.8 -pkgrel=1 +pkgver=0.10 +pkgrel=0 pkgdesc="Best-Effort Extent-Same, a btrfs dedup agent" url="https://github.com/Zygo/bees" arch="all" @@ -32,8 +32,8 @@ package() { } sha512sums=" -92208ee186de18e764fab42f3de4e518047a21f4ed2429040a706fe7a45e0b2d39d1e468beefc92553659fc4587f4894a33d5a26bfd59278923208db3acc7da0 bees-0.8.tar.gz -1e9de7b991db9614993d734e63649d8d5803b02423bba41370fdcc7094e6384017fe8a3b5d8f3b3beb86ca5dab33c2b05b0acf77e7eb0825944e176d10c5b15b no-werror.patch -877a90b0be60357ba4778f30a89003270b93af8cc5995e2df3fb58147733a39e972129f693ce9239e8987c589f3c43384774c3baecd042e88abdb2b07d1ce2ef 10-pthread_getname1.patch +77a4ae3d66430c2d9dc0351c16c60bad95f21e238fc00f5f5787f55929ba75ee25212ac4bb4a3e4a9419cec27bbcfd2987aa925a54bc2872609b38a698dbedc3 bees-0.10.tar.gz +54dfe7b30ccb75500662001de00a55eca43d813a793f46f2ad062e26826083d593ee7c62ca090eac299285f8d758541754408b657f5d4695d951e08ea2cb8b10 no-werror.patch +3cd163540719b8859e3d9dec0e75284c030f1b9acdd7dfc5cf2ab5f313254f318a16cce254b18dfe928ae5127564d772b850167e89541b83a4f5872ff2835a65 10-pthread_getname1.patch 093bc4c9604a0b28b39069e447d83800c91d0974fe4618ce5e5063e5c816b2d63c1b633710c592d76e8f6367d696283d6fa4a3a9561b09ce62fa28cabf8e55d0 bees.initd " diff --git a/testing/bees/no-werror.patch b/testing/bees/no-werror.patch index a0843992a57..20c087db2cc 100644 --- a/testing/bees/no-werror.patch +++ b/testing/bees/no-werror.patch @@ -1,5 +1,5 @@ diff --git a/makeflags b/makeflags -index c5b6951..0c155eb 100644 +index e008011..a17e9e2 100644 --- a/makeflags +++ b/makeflags @@ -1,5 +1,5 @@