mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-misc/dropbear: remove call to which
Closes: https://bugs.gentoo.org/955111 Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
This commit is contained in:
Viorel Munteanu
215
net-misc/dropbear/dropbear-2025.88-r1.ebuild
Normal file
215
net-misc/dropbear/dropbear-2025.88-r1.ebuild
Normal file
@@ -0,0 +1,215 @@
|
||||
# Copyright 1999-2025 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 autotools 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
|
||||
"${FILESDIR}"/${PN}-2025.88-remove-which.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
|
||||
|
||||
eautoreconf
|
||||
|
||||
# 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
|
||||
}
|
||||
14
net-misc/dropbear/files/dropbear-2025.88-remove-which.patch
Normal file
14
net-misc/dropbear/files/dropbear-2025.88-remove-which.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
https://bugs.gentoo.org/955111
|
||||
https://github.com/mkj/dropbear/pull/364
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -9,7 +9,7 @@ AC_PREREQ([2.59])
|
||||
AC_INIT
|
||||
|
||||
# Record which revision is being built
|
||||
-if test -s "`which hg`" && test -d "$srcdir/.hg"; then
|
||||
+if test -s "`command -v hg`" && test -d "$srcdir/.hg"; then
|
||||
hgrev=`hg id -i -R "$srcdir"`
|
||||
AC_MSG_NOTICE([Source directory Mercurial base revision $hgrev])
|
||||
fi
|
||||
Reference in New Issue
Block a user