gentoo auto-resync : 07:04:2024 - 12:30:41

6 files changed, 19 insertions, 3 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9f040d03eb58..f37294158099 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index cd80f02d2f08..5454a5a7dd66 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -3,6 +3,7 @@ AUX dropbear-2022.82-tests.patch 820 BLAKE2B 8b8d7bbc80962fd4be56078d54c12097bd6
 AUX dropbear-2024.84-dbscp.patch 440 BLAKE2B e0fd05c59a289e605c6b50e740b1f714bb14fd3c5ec3fb1c9a3d003d52ea28494bb26898e5771aab9af23c686b26601641d1333c5636bcb752e119a0b4af1a17 SHA512 8850dc3fc9e7a36970a9388d06dae1789fccc3b564a33efc75d328d875fff67ecb7f8d4e2b200710137ffcd333f22aa457723b843b1bfe81c613012583a58cd1
 AUX dropbear-2024.84-fix-channels-tests.patch 1233 BLAKE2B e06ebd5b9b6ef3efa2d2c103bb5a54eb9748aeb7ec16a741abac67f232ad6e9a8a9e84ff6dd4cb1818903dbbafdbbc0c3969a24aa5e00b5ecd3c927d669525c3 SHA512 db07cb4dbf504192b53c4f89b7b52def06dc08536f6d00bff5c015e87676890938a44aabfeff518cb4db0517a2464af57f8339b3bfdfb2d9f037c389dc88007b
 AUX dropbear-2024.84-non-interactive-tests.patch 300 BLAKE2B 5055d8abee9234cd9a5325bc6fcd4cea2794a8ebe7660afb30727ca893f8caedf3c73e8d0f9a90f0348d58f6569e0f68d18887c2f6b2ab5b3fcde9566c47f16d SHA512 68949b92339e2421e518595aada28ca4c7eec8f7734087e4753da4f7794a038f1fceae61b505ee8f7ac22890ef0ffebac8b773c7e53a5704d584a89670886127
+AUX dropbear-2024.84-test-bg-sleep.patch 530 BLAKE2B 96836fae965d463eab7fba7f5cf3a358e7fac0281739f9911441d5afdb986495caa0ebb7f6e05978fa1740ae6aa6a009f674e8c071718a64e4cb305b4532ddba SHA512 b5758b3f21b1ddf127d2d95363708c67bbe2b584850c7b693a825093222046ffb6682b700a2ef71245d28d147d1ee4fe6dbc96a0e8132aa85fcbc4229d54db4b
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
 DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422
@@ -10,5 +11,5 @@ DIST dropbear-2022.83.tar.bz2.asc 833 BLAKE2B 7dfcf13804738aed3136c264412f8c2f96
 DIST dropbear-2024.84.tar.bz2 2306278 BLAKE2B ba5a433f2a313aeeabc8e3e3696c4d79e96095dfc5cf045f15e6de5912f2f44bdddee103d86f659ee58fe8013fc9c2fb8c3af9cba089ee415e2f28179a365dca SHA512 254daea819c5aeaa65bb43449386fb964f4aa13e3b3037fe11064120205c6e265925e7ef2d84f7ebe66c6a00cf0a22e6010314c065ed49a3815f47137b7aca44
 DIST dropbear-2024.84.tar.bz2.asc 833 BLAKE2B 0b8c9fdf8c24836b03f36d3e98b6b906a3aaeda9bd283b3d2001b9b1e363a19e02a536febfe19c3c851c378d32a3efb067910a68dd4a7b2174b96fd8faedf1b3 SHA512 69ce84ea8f6ba2c7f7718578befa301c3a0342b7f6acb3ecb5d6ac4b82710fb22d0bc11f5632ae00f222c1cc2b50f48e50d16eee4ebb93bf08069774769ebb13
 EBUILD dropbear-2022.83.ebuild 4439 BLAKE2B 27b205667c703bfaab314fa819c4d2dda5aac112264cf554037a511924fd4f90426491130027edc27e018e24358592a666e290055a9402876344b3eaffd63c23 SHA512 5ca0b6010c1ca1a7c853cacb35e500f5138a4724b7515b775862eb357f85584dde222e035bcb00a3ddb6d55e3a360bc17f6b1a9ba1c133a2fbc636b89d5aaebd
-EBUILD dropbear-2024.84.ebuild 5023 BLAKE2B 5527371fa0970b62074bfc1ff8376950ff7ce6f6ca8c670c5a4d743613a3cce8d471510ae81ea22f1d1dbd8d52cfa440a824567d683885749082957f17664508 SHA512 7a6fcc11da4dc16f766d3b247946966e087efeacf3f054e46dbcb3d0cc5e39547bab5e696ddfd19bd914617c6681866759cddcce1258dc52c892135d3973f029
+EBUILD dropbear-2024.84.ebuild 5072 BLAKE2B 68e5d792af2deae9ff45d9e0d68f53fc8af12133c947155a0a217d76bb1f526d672878d57b183b524f00e1465d13b0c2964721950af27c2dcdec1a3aaba395de SHA512 7c311b71095a748639b287ece6b54e376f605385fb9b14ecf4edd0370a538598f30f81853338d3374450229bff20cd93ab377c24b679493c79f56bd246b0cffd
 MISC metadata.xml 1866 BLAKE2B 820902b27de934f6d7f0edc5d9f8c7bccf5c5f51d0e81ebd13fb53d6ba9e385c924d4fd0a191096fb191c253800227ff6b30f7bd44edfb532307e7076f39df8f SHA512 8e073a34877f230207ef391084b99014db9482aec680a1b292ac95e3bade426ecf362092337b7fcb19091f273085a06ae81cfd7d5e69a46a28067ae68f615cd4
diff --git a/net-misc/dropbear/dropbear-2024.84.ebuild b/net-misc/dropbear/dropbear-2024.84.ebuild
index 83d23fbcf782..85944fe6b816 100644
--- a/net-misc/dropbear/dropbear-2024.84.ebuild
+++ b/net-misc/dropbear/dropbear-2024.84.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2022.82-tests.patch
 	"${FILESDIR}"/${PN}-2024.84-non-interactive-tests.patch
 	"${FILESDIR}"/${PN}-2024.84-fix-channels-tests.patch
+	"${FILESDIR}"/${PN}-2024.84-test-bg-sleep.patch
 )
 
 set_options() {
diff --git a/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch b/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch
new file mode 100644
index 000000000000..a078eb2e68b6
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch
@@ -0,0 +1,14 @@
+One test passes when run with ebuild ... test, but fails when run by portage.
+Mark it as xfail.
+
+--- a/test/test_channels.py
++++ b/test/test_channels.py
+@@ -45,7 +45,7 @@
+ 	r.check_returncode()
+ 	assert r.stdout.decode() == dat
+ 
+-@pytest.mark.parametrize("fd", [1, 2])
++@pytest.mark.parametrize("fd", [1, pytest.param(2, marks=pytest.mark.xfail(reason="Fails sometimes"))])
+ def test_bg_sleep(request, fd, dropbear):
+ 	# https://lists.ucc.asn.au/pipermail/dropbear/2006q1/000362.html
+ 	# Rob Landley "Is this a bug?" 24 Mar 2006
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index fe804719f070..b12233e775ae 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -10,5 +10,5 @@ DIST networkmanager-ppp-2.5.0.patch 45845 BLAKE2B afcf1410f89db950a7e7c2c0af3aae
 EBUILD networkmanager-1.42.6-r2.ebuild 11947 BLAKE2B 20ffa1a873ebd171c47d2fa5feeb65647656c5239c716b4969a82722674dae3fcdeef3ecf1bb30cbf5ea85d0412b3677df5bd40ad83994c4c42c9c359c664e54 SHA512 19f0896a05be639186da85f5d46d07d02a467d3d5c559a5b3ecab41acaa073ffcd70359b76af1cd95d31ba4c0b881e0460b5b5f4c2cf60613d0f7586e2b9cdfe
 EBUILD networkmanager-1.44.0-r1.ebuild 11693 BLAKE2B e87be9fbf57bdd519339c6bd4750c508731cf88e5baa251b257c2e9c142a212676b08cf752cecdd5a75397b7ad6972421c2cf54bb903e478de4668ab9093b690 SHA512 5f8619be794991ae8ba31c26f8505d477ddd9833c55eac75ebd22e76702641ebfc2a15d5e313d61b467fb3e5957d7b5dfd22ee101fb7f66bf50b8685885d8517
 EBUILD networkmanager-1.44.2.ebuild 11693 BLAKE2B e87be9fbf57bdd519339c6bd4750c508731cf88e5baa251b257c2e9c142a212676b08cf752cecdd5a75397b7ad6972421c2cf54bb903e478de4668ab9093b690 SHA512 5f8619be794991ae8ba31c26f8505d477ddd9833c55eac75ebd22e76702641ebfc2a15d5e313d61b467fb3e5957d7b5dfd22ee101fb7f66bf50b8685885d8517
-EBUILD networkmanager-1.46.0-r1.ebuild 11873 BLAKE2B 93e1314556a9bff1739ad79b0e289b6d45d15f43f56cf085acf2f5963a4a87e73c0f25cae59e004b089c18dfe73baa2a95d8322920fb48b3901773110aed3714 SHA512 0044e19d77d2b97e1bac916afbb15eb6d245f54d888668027f211b8b4455b4581087d407ad70b561f68cc2e3552f9ec40a9df471aa3e2edc96cf67ea1c5f5986
+EBUILD networkmanager-1.46.0-r1.ebuild 11870 BLAKE2B 4f54c0fac9e239f223f55b06ad2f97bcfb38d48a3d58a6e858f27414e73a6fbe7450ccf496e27f1e0dae8ee2787a426062e970f526e7024791b920dfbf7ee3b0 SHA512 ed40f2ebd39c4dd90a607900ee2cfa3da806f1cecffa22af1c709d08833a18c293ef27b9f28c9b0f2f5d2e2f0b207ed395789aa33917283f81bd73c3f9160767
 MISC metadata.xml 2360 BLAKE2B 0d95733c3909e35ef555ad32c44e706d48347e6b8a5f7f915831edf7a43376e973fa32c7704325818704b59082fbbb2e4610e075848f09ac7c818d8fdbb94830 SHA512 c4478c41989eca2b777bb59767ce7660d70b261f61bc42673bc61e7e4db528c45f921c384de5454e7f901f4cfdb3cf1303e183397671606ed43c1fdaa59762c7
diff --git a/net-misc/networkmanager/networkmanager-1.46.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.46.0-r1.ebuild
index 1bc89e1e14e6..94c40bf95300 100644
--- a/net-misc/networkmanager/networkmanager-1.46.0-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.46.0-r1.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]