From ce3159837954ab701cedb2d9609d3c8cc958bf61 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 2 Mar 2026 07:24:38 +0000 Subject: [PATCH] dev-libs/userspace-rcu: Sync with Gentoo It's from Gentoo commit 96f27c21d09dc7148fcf0279f169eb7c9488a8d2. Signed-off-by: Flatcar Buildbot --- .../dev-libs/userspace-rcu/Manifest | 3 ++- ...-replace-assert-by-urcu_posix_assert.patch | 25 ------------------- ...5.3.ebuild => userspace-rcu-0.15.6.ebuild} | 18 ++++++++----- 3 files changed, 14 insertions(+), 32 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/files/userspace-rcu-0.14.1-replace-assert-by-urcu_posix_assert.patch rename sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/{userspace-rcu-0.15.3.ebuild => userspace-rcu-0.15.6.ebuild} (65%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/Manifest index aff40d77f2..8e1292d814 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/Manifest @@ -1,2 +1,3 @@ -DIST userspace-rcu-0.15.3.tar.bz2 684175 BLAKE2B e636b04fe3bac7bb8f4afff0a7b2153e38d396a9c08e8ca19e705fcda81adda5256817db87305382c7adc3630ef5b1d25ff81af818a6b8c70232df11c9bee862 SHA512 9461f5f1ebfcfdb28bc9548738a030d0a29e754ae5340581d057c405c0fa5c17560a251fa15a20cf14d35f1fcc9aceac80841b37a5f348698da52a71ee4d4fe5 DIST userspace-rcu-0.15.5.tar.bz2 685498 BLAKE2B 3e0ad236f77f1146ac3e7fe93ae8f3ea86632af38b78c6648a19c9df33959ff08e42779f6d34b47dfd3f7188efc39f8f4daaba81d702743e357d3bd9327000fc SHA512 48c7e137b986c1a33d91ecd8e5101ed8783b7c4e15b8324660c72bce9879373b80ffd97aca0c3b8015a47dfe2c11b5f4acf9d4a065185d9ba405d4e50a2b58d8 +DIST userspace-rcu-0.15.6.tar.bz2 686061 BLAKE2B 7bc4892f7a322051a1326e7857a14ebdde5867dbccd6a7ceaf1ce0e74668e5ff5f829f6b9d5b6be2163ae000fe2a07bf937fb62b67e7959d7ed8021f67f6ce04 SHA512 53c28821dabfc1e8803c4299f6a9e589c9949d0062dd8aaa4aabb6d77641dfbd2b2c035c50680991d9f228499c12b9b23469044726a6ffce5e84f21f17cabff3 +DIST userspace-rcu-0.15.6.tar.bz2.asc 488 BLAKE2B 86f8a5e22de4ee21c748c3d0e1f1a3f6b3f31a34b072f9a0899d4e9b397fe3563de59b06b23590e82ac80d8f01421c813c58e53aef2991acaaec38cedb85c39a SHA512 cd1b0fac74c01ef82d6e09a909b65026ccccec9b7bf042ec38783631c6a9e99993b570b2200ba814303483c99aaa44dc6ac2e58d7cd24ee5e5027becff724ff0 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/files/userspace-rcu-0.14.1-replace-assert-by-urcu_posix_assert.patch b/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/files/userspace-rcu-0.14.1-replace-assert-by-urcu_posix_assert.patch deleted file mode 100644 index 2ac035a87e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/files/userspace-rcu-0.14.1-replace-assert-by-urcu_posix_assert.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bbff88f8091752ee19dca672bec197e49cc2ef5d Mon Sep 17 00:00:00 2001 -From: "Z. Liu" -Date: Mon, 9 Jun 2025 10:39:54 +0800 -Subject: [PATCH] src/urcu-bp.c: assert => urcu_posix_assert - -otherwise build failed if has -DNDEBUG - -Signed-off-by: Z. Liu - -diff --git a/src/urcu-bp.c b/src/urcu-bp.c -index 8e9afd8..e23ca95 100644 ---- a/src/urcu-bp.c -+++ b/src/urcu-bp.c -@@ -409,7 +409,7 @@ void expand_arena(struct registry_arena *arena) - new_chunk_size_bytes, 0); - if (new_chunk != MAP_FAILED) { - /* Should not have moved. */ -- assert(new_chunk == last_chunk); -+ urcu_posix_assert(new_chunk == last_chunk); - memset((char *) last_chunk + old_chunk_size_bytes, 0, - new_chunk_size_bytes - old_chunk_size_bytes); - last_chunk->capacity = new_capacity; --- -2.45.2 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/userspace-rcu-0.15.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/userspace-rcu-0.15.6.ebuild similarity index 65% rename from sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/userspace-rcu-0.15.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/userspace-rcu-0.15.6.ebuild index ee806704c6..f0a7c6ffe8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/userspace-rcu-0.15.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/userspace-rcu-0.15.6.ebuild @@ -1,25 +1,31 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mathieudesnoyers.asc +inherit autotools verify-sig DESCRIPTION="Userspace RCU (read-copy-update) library" HOMEPAGE="https://liburcu.org/" -SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2" +SRC_URI=" + https://lttng.org/files/urcu/${P}.tar.bz2 + verify-sig? ( https://lttng.org/files/urcu/${P}.tar.bz2.asc ) +" LICENSE="LGPL-2.1" SLOT="0/8" # subslot = soname version -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="static-libs test" RESTRICT="!test? ( test )" -BDEPEND="test? ( sys-process/time )" +BDEPEND=" + test? ( sys-process/time ) + verify-sig? ( sec-keys/openpgp-keys-mathieudesnoyers ) +" PATCHES=( "${FILESDIR}"/${PN}-0.13.1-tests-no-benchmark.patch - "${FILESDIR}"/${PN}-0.14.1-replace-assert-by-urcu_posix_assert.patch ) src_prepare() {