commit: 5fe92a61a7087e1ee31824e087940b00c6984f06
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 08:45:06 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 08:58:38 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe92a61
net-misc/dropbear: drop 2024.85-r1
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
net-misc/dropbear/dropbear-2024.85-r1.ebuild | 187 ---------------------
.../dropbear-2024.84-fix-channels-tests.patch | 36 ----
2 files changed, 223 deletions(-)
diff --git a/net-misc/dropbear/dropbear-2024.85-r1.ebuild
b/net-misc/dropbear/dropbear-2024.85-r1.ebuild
deleted file mode 100644
index abe2ffa42674..000000000000
--- a/net-misc/dropbear/dropbear-2024.85-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 minimal multicall pam +shadow static +syslog test 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}]
- ')
- )
- verify-sig? ( sec-keys/openpgp-keys-dropbear )
-"
-
-REQUIRED_USE="pam? ( !static )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2024.84-dbscp.patch
- "${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() {
- progs=(
- dropbear dbclient dropbearkey
- $(usev !minimal "dropbearconvert scp")
- )
- makeopts=(
- MULTI=$(usex multicall 1 0)
- )
-}
-
-python_check_deps() {
- 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
- sed \
- -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
- -e '/DROPBEAR_X11FWD/s:0:1:' \
- src/default_options.h > localoptions.h || die
- sed \
- -e '/pam_start/s:sshd:dropbear:' \
- -i src/svr-authpam.c || die
- restore_config localoptions.h
-
- # remove tests that fail
- rm test/test_aslr.py || die
-
- # dropbearconver is not build with USE minimal
- if use minimal; then
- rm test/test_dropbearconvert.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/files/dropbear-2024.84-fix-channels-tests.patch
b/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch
deleted file mode 100644
index 0db292da8332..000000000000
--- a/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-dbclient obeys $HOME, but dropbear (the server) resolves HOME using getpwnam.
-Use sys-libs/nss_wrapper to fake it during tests.
-
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -4,7 +4,15 @@ SHELL=bash
-
- all: test
-
-+uid:=$(shell id -u)
-+gid:=$(shell id -g)
- test: fakekey
-+ mkdir -p ~/.ssh
-+ ../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear
-+ ../dropbearkey -y -f ~/.ssh/id_dropbear | grep ^ecdsa >
~/.ssh/authorized_keys
-+ echo "$(LOGNAME)::$(uid):$(gid):$(USER):$(HOME):/bin/bash" >> ~/passwd
-+ echo "$(LOGNAME)::$(gid):" >> ~/group
-+ chmod 0700 ~ ~/.ssh ~/.ssh/authorized_keys ~/passwd ~/group
- pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear
$(srcdir)
-
- one: fakekey
---- a/test/test_dropbear.py
-+++ b/test/test_dropbear.py
-@@ -27,7 +27,11 @@ def dropbear(request):
- ]
- print("subprocess args: ", args)
-
-- p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True)
-+ env = os.environ
-+ env['LD_PRELOAD'] = 'libnss_wrapper.so'
-+ env['NSS_WRAPPER_PASSWD'] = env['HOME'] + '/passwd'
-+ env['NSS_WRAPPER_GROUP'] = env['HOME'] + '/group'
-+ p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True, env=env)
- # Wait until it has started listening
- for l in p.stderr:
- if "Not backgrounding" in l:
