gentoo resync : 29.12.2022

4 files changed, 19 insertions, 71 deletions

diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index e6dbecad5690..3bbec643f4cb 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,4 +1,3 @@
-AUX dbus-broker-30-user-free-assertion.patch 2310 BLAKE2B 593d949c95f70ba97e1e3a7b1d809a0c27f7036d424a54f622b7a0778f41a8651e152ff91d5c93f294d02d829ef7694c5e0ccadb81ac14a9f9234ed87e935811 SHA512 f2a4da8d558c422d2b6f62a9802af233513305625d8d9d1d5902b473da3017dbe9827761a47d7f32f3d26c35f1e785d9eef5ef05226a7ffc2b2991bc0f1eb0e9
 DIST c-dvar-c8ea9712a94186512c22c32f32c421d6a2db6feb.tar.gz 25212 BLAKE2B 37f02df4f0a4c7372826cd9db37de883cf40027b12f72f0d43cf08f08682d90e6c7e8c3756f90a9e6184713c98e331ad2b2c9cd3373a148b05e2a3a2305db413 SHA512 c134892b43a1b572c45f0f24d7c9c7e70b1326c8bc896995b491d86271a000e83707e5d5eeff631b66be31f3980df7146cd18c385263a3a8bd07f30840cf829c
 DIST c-ini-204410a08d3a6c8221f6f0baf0355ce5af0232ed.tar.gz 13952 BLAKE2B 42c34e4ebe17d4c0904c395c72e56b0587c5f6b2cdf422cb800678844cf8516f9645718a04e9a10f6e747d1f56b2f1e563d1fa07db078e745761ae1e40ad395a SHA512 72eeaecbe0b9434b48d2ca9674dd1e722e612a730fd07ef27babb346a10ed7311b11c9d85f2aaf0cd84ddca7f926a78d76d066f453289bcbe849c4cacf72ec58
 DIST c-list-a0970f12f1f406a5578a5dedf3580cd682e55812.tar.gz 10124 BLAKE2B adb0face335aaa8206e597e404dcfea2b9d22035d4297442473918878ff9928ff5d614b20cb96de8a50c1418da83da5a49837c0677fe2a5f3db4e78cf3f2bfdb SHA512 51958b4c35acd84da89e694fc58a045b28d265f77043d302fe98f3507432363d20bfa611948fad37d0e5feb36b6232f742cde80e6243bafa3cd976c8b11cfc4e
@@ -7,8 +6,8 @@ DIST c-shquote-83ccc2893385fcca1424b188f0f6c45a62f2b38d.tar.gz 10622 BLAKE2B 1c7
 DIST c-stdaux-8652c488b8f1c29629a5179d4551d0a691ae5901.tar.gz 13075 BLAKE2B ef08451574ea695151cbfdad2060324423c8abcf46ac8a86b3216b85017c9b4dd8399d0561cb4f2c731e9eb2883481db59292769560cbcbfc3e96823ceb70e9a SHA512 bb669b659955ea62734f401c9745059349b23e6ddbca56e72437929b9527647ff7ac6bba4bb06506e4d8d35f3a1e7c4eacd2d5b1e7cb21098faa144c932f2bb0
 DIST c-utf8-0837214a9780b7d771a3b3ce9a49196ac0a9d52f.tar.gz 9340 BLAKE2B 4bfa39c39aa8db8b7d797d78081b5f3104c659e2ceefef65aa2d3c03ffb5889d772cb78328473e3557c943b2487b7bcb7b68d7dc7f2b95940b0448b3479f1b23 SHA512 2df368af5023fac6c7f2e018c0cbfd73225bf1c4e0d0387931352909323175652bcd3739e9e6b76a099aea5d3f0290198aa70c69ecc5e9ef22df214f8c75da79
 DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
-DIST dbus-broker-30.tar.xz 238688 BLAKE2B 716bdeac726e0168e09a5893f1906888c0dc63e4c5f377f2d5ba100f1a07da17bb0379053ac079e7c55e7af09c3d382368dd317df52e04eb0fe96af03aba7441 SHA512 8b7f614e18d15baa558de2c77fc65526011e75f9592d06ddb3cafa211ec9a1c45aa42a0e32122cb16bdfce8bc34407241080f37891fe5ccb6c4577f1cd4bc66c
+DIST dbus-broker-31.tar.xz 239520 BLAKE2B ba34308de7c598e72ac3874894fb90ebc6970840eb2fc193a2b3294033759b39d7d712695ddbc88c3b947842b0131e0a068ffe3cef616ce431d9a8c021f30593 SHA512 22fd53cff84e48ae1c11303b5340e16dc9b7124c9e562174c1f0af465c55d69bb8b2768063de281f6f791442126a29ab864ad6b8acf110247a500f6425eae5d9
 EBUILD dbus-broker-29.ebuild 1847 BLAKE2B 8d6fb46de8ff8d95c3ea0ec5e08ac4958cff7862d2db7db767d4e722fc5c3f736607b01dfdbb1f567701a38f9d20b33a8fd44684967bce8bac57fc5d63c9dc89 SHA512 779128c4987833c4773bf37d5c0d3716c2cd4e2d7c3933883b87d198155b29145485bba2ebc21dcd3fb25562613e6b577e2001a15b8c3b84711395e2b4bc26c1
-EBUILD dbus-broker-30.ebuild 968 BLAKE2B 7665df74eb518cf4463af1a595da22127a4c02630b189341c903bf819b690938e5208758ecc8c10ccc65dcc47a87a17228d4b87f73c604b9b57b572ffbeaddf0 SHA512 973d7eb03e9c77712e9da9381f8afa023ebfc13830abe42a21f90144c03f4d309f43f62b82418143d89038701759283bc289213a66b922063d0445658cdfcf89
-EBUILD dbus-broker-9999.ebuild 1067 BLAKE2B d11477ac58576aca16f896134433666e20fa3d7f53324c9fba4e6f700ce5b9046324d72eb38e500807c36ac36e72ffbe8553eaeba18d80914c18e2f70f302699 SHA512 25181a668d2cc8114041dd1fdbfef5d17eff13c7f0e212b47b25dcedf4f26cf67dcc2a630c272698cf9ca203967105ca8142ed47a0c07136c45cf001043054b6
+EBUILD dbus-broker-31.ebuild 1142 BLAKE2B 8ad73709c37e5c7e6aa134cdafb5f9226114af6378fb90c32d2f8e509b2529377cbb3f51d3e49ddaef9bca544f5b1a368495059688d6c86a7d55d50b18f89f54 SHA512 07fdd1101c415cfbc43d9aa1ed51a9ff72db52ef1f5e8044d43af922f1d82e6c6c48c2b1eddbf6db85ae8266a25cdd4c897755d7711ab4e5ef7b9be16f511c5f
+EBUILD dbus-broker-9999.ebuild 1145 BLAKE2B 1921b4cd7bda537fecc3336c39e21378bf73ef2fa3820774bfa49ee9ca0a5a3895f2a538f00ef8a3f7c7ce35e00663887970a583443f69463fdd575896c0f3b7 SHA512 cfd7c4ebc82b1e70d56a9f1138c56115688bfe3e8d19d48f3089fb6c829037629d9b7f891a19554b1f5e5e541dd9f576257bbb7443ddb98a0496a7c29d3a19a9
 MISC metadata.xml 328 BLAKE2B 8d8eea6a3d5e3309106ec3e6f248c4b5cad557ccd5095794bd153cd270c5f43de508363646afce491d5e6cc3bff1dca1ca024c2e87e656401432ac2d833cca90 SHA512 971b4214d0a9f9a68ca12a309096b7345014d2e0f57e85e6e10ff0a09b533d5cafe153fa8082ac01609e3417a31afc319cb285a822194c9c672a57ce316340c4
diff --git a/sys-apps/dbus-broker/dbus-broker-30.ebuild b/sys-apps/dbus-broker/dbus-broker-31.ebuild
index 6f7873290392..e3ddd690c43e 100644
--- a/sys-apps/dbus-broker/dbus-broker-30.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-31.ebuild
@@ -5,10 +5,16 @@ EAPI=8
 
 inherit meson
 
-SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
+else
+	SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 arm64 ppc64 ~riscv"
+fi
+
 DESCRIPTION="Linux D-Bus Message Broker"
 HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -32,7 +38,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${P}-user-free-assertion.patch )
+if [[ ${PV} == 9999 ]]; then
+src_unpack() {
+	git-r3_src_unpack
+	cd "${P}" || die
+	meson subprojects download || die
+}
+fi
 
 src_configure() {
 	local emesonargs=(
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index 073a8c8c8388..cf73e0592faf 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -9,6 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
+	SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 fi
 
diff --git a/sys-apps/dbus-broker/files/dbus-broker-30-user-free-assertion.patch b/sys-apps/dbus-broker/files/dbus-broker-30-user-free-assertion.patch
deleted file mode 100644
index 278de1821b87..000000000000
--- a/sys-apps/dbus-broker/files/dbus-broker-30-user-free-assertion.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 608b259e25ef1348b9e4a8e022c35b5c68d3df98 Mon Sep 17 00:00:00 2001
-From: David Rheinsberg <david.rheinsberg@gmail.com>
-Date: Wed, 11 May 2022 08:41:48 +0200
-Subject: [PATCH] util/user: keep reference to user in each usage table
-
-Keep a reference to an owning user in each usage table. We want to allow
-callers to hold charges without holding on to any user references.
-
-Also fix the peer-deinitialization to be ordered correctly and free the
-user references last (in particular, after the charges). This is not
-strictly necessary, but now follows our coding style and would have
-avoided possible failures.
-
-This fixes an assertion failure when disconnecting entire groups of
-peers of the same user, due to the recent fix that actually made
-peer-accounting do something.
-
-Reported-by: Torge Matthies
-Reported-by: Mel34
-Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com>
----
- src/bus/peer.c  | 2 +-
- src/util/user.c | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/bus/peer.c b/src/bus/peer.c
-index 18bd1947..69ed0fde 100644
---- a/src/bus/peer.c
-+++ b/src/bus/peer.c
-@@ -358,12 +358,12 @@ Peer *peer_free(Peer *peer) {
-         name_owner_deinit(&peer->owned_names);
-         policy_snapshot_free(peer->policy);
-         connection_deinit(&peer->connection);
--        user_unref(peer->user);
-         user_charge_deinit(&peer->charges[2]);
-         user_charge_deinit(&peer->charges[1]);
-         user_charge_deinit(&peer->charges[0]);
-         free(peer->seclabel);
-         free(peer->gids);
-+        user_unref(peer->user);
-         free(peer);
- 
-         close(fd);
-diff --git a/src/util/user.c b/src/util/user.c
-index 7856b768..d0edb5e8 100644
---- a/src/util/user.c
-+++ b/src/util/user.c
-@@ -48,7 +48,7 @@ static int user_usage_new(UserUsage **usagep, User *user, uid_t uid) {
-                 return error_origin(-ENOMEM);
- 
-         usage->n_refs = REF_INIT;
--        usage->user = user;
-+        usage->user = user_ref(user);
-         usage->uid = uid;
-         usage->user_node = (CRBNode)C_RBNODE_INIT(usage->user_node);
- 
-@@ -64,6 +64,7 @@ static void user_usage_free(_Atomic unsigned long *n_refs, void *userdata) {
-                 c_assert(!usage->slots[i]);
- 
-         user_usage_unlink(usage);
-+        user_unref(usage->user);
-         free(usage);
- }
-