commit: f6094f7aa9eb7ee8312b466cf538dd51a2889bb5
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 14:26:58 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 15:08:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6094f7a
net-misc/dropbear: add `legacy-ciphers` USE flag
Add `legacy-ciphers` USE flag for enabling deprecated DSS. Also add a
new `test-async` USE flag to enable tests that require
`dev-python/asyncssh`, which is not available on all platforms. This
allows the rest of the tests to stay enabled.
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
net-misc/dropbear/dropbear-2024.86-r1.ebuild | 212 +++++++++++++++++++++++++++
net-misc/dropbear/metadata.xml | 6 +
2 files changed, 218 insertions(+)
diff --git a/net-misc/dropbear/dropbear-2024.86-r1.ebuild
b/net-misc/dropbear/dropbear-2024.86-r1.ebuild
new file mode 100644
index 000000000000..c5f61a79f77c
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2024.86-r1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc
+inherit pam python-any-r1 savedconfig verify-sig
+
+DESCRIPTION="Small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html";
+SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+ https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2";
+SRC_URI+=" verify-sig? (
+ https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc
+ https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc
+ )"
+
+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 legacy-ciphers minimal multicall pam +shadow static +syslog test
+test-async zlib"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="
+ virtual/libcrypt[static-libs(+)]
+ zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="
+ acct-group/sshd
+ acct-user/sshd
+ !static? (
+ >=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
+ >=dev-libs/libtommath-1.2.0
+ ${LIB_DEPEND//\[static-libs(+)]}
+ )
+ pam? ( sys-libs/pam )
+"
+DEPEND="
+ ${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+BDEPEND="
+ test? (
+ sys-libs/nss_wrapper
+ $(python_gen_any_dep '
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/iniconfig[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/pluggy[${PYTHON_USEDEP}]
+ dev-python/py[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ 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 )
+"
+
+REQUIRED_USE="pam? ( !static )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2024.84-dbscp.patch
+ "${FILESDIR}"/${PN}-2024.86-tests.patch
+ "${FILESDIR}"/${PN}-2024.84-test-bg-sleep.patch
+)
+
+set_options() {
+ progs=(
+ dropbear dbclient dropbearkey
+ $(usev !minimal "dropbearconvert scp")
+ )
+ makeopts=(
+ MULTI=$(usex multicall 1 0)
+ )
+}
+
+python_check_deps() {
+ 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}]" && \
+ python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+ python_has_version "dev-python/psutil[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+
+ if use static ; then
+ ewarn "Using bundled copies of libtommath and libtomcrypt"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # dropbear does not accept -E if built w/o syslog support and fails the
tests
+ if use syslog; then
+ eapply "${FILESDIR}"/${PN}-2024.84-non-interactive-tests.patch
+ else
+ eapply
"${FILESDIR}"/${PN}-2024.84-non-interactive-tests-no-syslog.patch
+ fi
+
+ 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:' \
+ -i src/svr-authpam.c || die
+ restore_config localoptions.h
+
+ use test && python_fix_shebang test/parent_dropbear_map.py
+
+ # dropbearconvert is not built with USE minimal
+ # 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.
+ # bug #939601
+ if use bsdpty; then
+ rm test/test_channels.py || die
+ fi
+}
+
+src_configure() {
+ # Notes:
+ # 1) We use bundled libtom* when static build is enabled because
+ # libtomcrypt lacks it and we don't particularly want to add it.
+ # 2) We disable the hardening flags as our compiler already enables them
+ # by default as is appropriate for the target.
+ local myeconfargs=(
+ --disable-harden
+
+ # bug #836900
+ $(use_enable !elibc_musl lastlog)
+ $(use_enable !elibc_musl wtmp)
+
+ $(use_enable static bundled-libtom)
+ $(use_enable zlib)
+ $(use_enable pam)
+ $(use_enable !bsdpty openpty)
+ $(use_enable shadow)
+ $(use_enable static)
+ $(use_enable syslog)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ set_options
+ emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+
+ # need symlinks for tests
+ if use multicall && use test; then
+ local x
+ for x in "${progs[@]}" ; do
+ ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti
to ${x} failed"
+ done
+ fi
+}
+
+src_install() {
+ set_options
+ emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+ doman manpages/*.8
+ newinitd "${FILESDIR}"/dropbear.init.d dropbear
+ newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+ dodoc CHANGES README.md SMALL.md MULTI.md
+
+ # The multi install target does not install the links right.
+ if use multicall ; then
+ pushd "${ED}"/usr/bin &> /dev/null || die
+ local x
+ for x in "${progs[@]}" ; do
+ ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti
to ${x} failed"
+ done
+ rm -f dropbear
+ dodir /usr/sbin
+ dosym -r /usr/bin/dropbearmulti /usr/sbin/dropbear
+ popd &> /dev/null || die
+ fi
+ save_config localoptions.h
+
+ if ! use minimal ; then
+ mv "${ED}"/usr/bin/{,db}scp || die
+ fi
+
+ if use pam; then
+ pamd_mimic system-remote-login dropbear auth account password
session
+ fi
+}
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>m=170494903207436>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>
