gentoo auto-resync : 01:12:2024 - 02:06:42

3 files changed, 23 insertions, 6 deletions

diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 0d32926c8740..ee07484256f8 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -19,5 +19,5 @@ DIST dropbear-2024.86.tar.bz2.asc 833 BLAKE2B 5fc35fb4135f099c2204972d3fc365b01b
 EBUILD dropbear-2022.83-r1.ebuild 4433 BLAKE2B 6cd0edb8789dcabbfaaed58db535ee6bca645ea687eb2e2d5f15d0fd16b370cdd1075d99960315492182065219b11823101db489233b8ea26392f0c4e9e41776 SHA512 61ab7e9ea1856586e8e15e4089be296a2d2730fe236ea3d07ddf2652ec3cf123d07ec782d0d7bb51e96ef537c09b4421f83a6ef04fa5253e4536740aa66f3854
 EBUILD dropbear-2024.85-r1.ebuild 5062 BLAKE2B d6c63a168ef0e040794cca2cdbc4b77ad386bf34f3c6d3073d5d7fd30ebec8af213f709958e0832fc626e2c18bd38f5fcf1bca4b7573ffe28fa2c79555720af5 SHA512 033e4d740310b0ab6efd00ab1df08239058b613f31843aa679015755c25c75c8dfa248efe46ced583eb52fbe6f9c9d817936a9f4cbfb2f4de4e1ad6cfbd49ab3
 EBUILD dropbear-2024.85-r2.ebuild 5403 BLAKE2B 65dbe02b17c3712815fc35c7d9a586585effd447d1dccc4251fa312ec467649289096c809a0255bf1af967b937e8eefe85a12e3d27f5065822cb92924357425f SHA512 6a096bc2b06b8dfe34e907fa9dcd8e06cd0309c8c6397ebc8cbfa38bc2aca6d928a65c673815903db537dadf79b520e89e87644304239487ba4822e9d44d1ab1
-EBUILD dropbear-2024.86.ebuild 5558 BLAKE2B bab3a449dbdecc68138de6e0c40e0b1b4becdcfd9a805ce9cd2fcc42aef8970afb282147480b58f9eb11156dbfe09be02de7563238c2c53bd7ce52644145cd00 SHA512 b3a560c5f3d5edf7c63739940e058e9da37df3e5509bd38f0cc59977688b8007bed87773fa61d1fb27a90849ab27a46a6f7e0f9371b2776e4f6c4fa208fc3693
-MISC metadata.xml 1866 BLAKE2B 820902b27de934f6d7f0edc5d9f8c7bccf5c5f51d0e81ebd13fb53d6ba9e385c924d4fd0a191096fb191c253800227ff6b30f7bd44edfb532307e7076f39df8f SHA512 8e073a34877f230207ef391084b99014db9482aec680a1b292ac95e3bade426ecf362092337b7fcb19091f273085a06ae81cfd7d5e69a46a28067ae68f615cd4
+EBUILD dropbear-2024.86-r1.ebuild 5864 BLAKE2B 97b6d8275016dd25d618957deac7f5035617cbfe6fe4b613bdb29879adadcf7f5951e260324488dee120cac30748e9f7b200a70f5654593cb4930291ea1535b6 SHA512 db37abe03347bb71f97b7b4b7e2367797fea44bb97b95577a51421acf84e0e437d1e3f0891bdfe85bacf87bd4f0a21e10fc38a1634a4530c6f8f030a928b2dd3
+MISC metadata.xml 2144 BLAKE2B 44954b29ea4dfb4008a9411303c502ef2fffee30f16df24a7f6fc7e1969c24209bf88f59a67e32ef422544ae51d46a846a819a8004efad825da702fff7f3af91 SHA512 ff59f6d316473fa41905ff92112f2b57b929668e04730fa88f7af405ee6a1e308a82119b896a5612120cd1cd2bdbea0e8dc8b0d419b7f472b22fa66a89638fe5
diff --git a/net-misc/dropbear/dropbear-2024.86.ebuild b/net-misc/dropbear/dropbear-2024.86-r1.ebuild
index 7e1d6f159e8b..c5f61a79f77c 100644
--- a/net-misc/dropbear/dropbear-2024.86.ebuild
+++ b/net-misc/dropbear/dropbear-2024.86-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? (
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
+IUSE="bsdpty legacy-ciphers minimal multicall pam +shadow static +syslog test +test-async zlib"
 RESTRICT="!test? ( test )"
 
 LIB_DEPEND="
@@ -45,7 +45,6 @@ BDEPEND="
 	test? (
 		sys-libs/nss_wrapper
 		$(python_gen_any_dep '
-			dev-python/asyncssh[${PYTHON_USEDEP}]
 			dev-python/attrs[${PYTHON_USEDEP}]
 			dev-python/iniconfig[${PYTHON_USEDEP}]
 			dev-python/packaging[${PYTHON_USEDEP}]
@@ -55,6 +54,11 @@ BDEPEND="
 			dev-python/pytest[${PYTHON_USEDEP}]
 			dev-python/psutil[${PYTHON_USEDEP}]
 		')
+		test-async? (
+			$(python_gen_any_dep '
+				dev-python/asyncssh[${PYTHON_USEDEP}]
+			')
+		)
 	)
 	verify-sig? ( sec-keys/openpgp-keys-dropbear )
 "
@@ -78,8 +82,11 @@ set_options() {
 }
 
 python_check_deps() {
-	python_has_version "dev-python/asyncssh[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \
+	if use test-async; then
+		 python_has_version "dev-python/asyncssh[${PYTHON_USEDEP}]"
+	fi
+
+	python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \
 		python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \
 		python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \
 		python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \
@@ -110,6 +117,7 @@ src_prepare() {
 	sed \
 		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
 		-e '/DROPBEAR_X11FWD/s:0:1:' \
+		-e "/DROPBEAR_DSS/s:0: "$(usex legacy-ciphers 1 0)":" \
 		src/default_options.h > localoptions.h || die
 	sed \
 		-e '/pam_start/s:sshd:dropbear:' \
@@ -122,6 +130,9 @@ src_prepare() {
 	# test_concurrent needs dropbearconvert to convert the key before running
 	if use minimal; then
 		rm test/test_dropbearconvert.py test/test_concurrent.py || die
+	elif ! use test-async; then
+		# remove this test on platforms where dev-python/asyncssh is not available
+		rm test/test_concurrent.py || die
 	fi
 
 	# bsdpty requires CONFIG_LEGACY_PTYS in kernel; disable tests.
diff --git a/net-misc/dropbear/metadata.xml b/net-misc/dropbear/metadata.xml
index 80473cbd3d8f..65e554e7cd8b 100644
--- a/net-misc/dropbear/metadata.xml
+++ b/net-misc/dropbear/metadata.xml
@@ -22,8 +22,14 @@
   </longdescription>
   <use>
     <flag name="bsdpty">Add support for legacy BSD pty's rather than dynamic UNIX pty's -- do not use this flag unless you are absolutely sure you actually want it</flag>
+    <flag name="legacy-ciphers">
+        Enable support for deprecated, soon-to-be-dropped DSA keys.
+
+        See https://marc.info/?l=openssh-unix-dev&gt;m=170494903207436&gt;w=2.
+    </flag>
     <flag name="multicall">Build all the programs as one little binary (to save space)</flag>
     <flag name="shadow">Enable shadow password support</flag>
+    <flag name="test-async">Enable tests using <pkg>dev-python/asyncssh</pkg></flag>
   </use>
 <upstream>
   <remote-id type="cpe">cpe:/a:matt_johnston:dropbear_ssh_server</remote-id>