commit: 58f1638414f6957ddbc2f2e7a9e3489cab5794fd Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Fri Feb 21 08:52:00 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=58f16384
net-misc/dropbear: drop 2022.83-r1 Bug: https://bugs.gentoo.org/920293 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> net-misc/dropbear/Manifest | 2 - net-misc/dropbear/dropbear-2022.83-r1.ebuild | 166 --------------------- net-misc/dropbear/files/dropbear-0.46-dbscp.patch | 20 --- .../dropbear/files/dropbear-2022.82-tests.patch | 25 ---- 4 files changed, 213 deletions(-) diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index 912b9b39c27d..6d4edabdc209 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -1,4 +1,2 @@ -DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422 -DIST dropbear-2022.83.tar.bz2.asc 833 BLAKE2B 7dfcf13804738aed3136c264412f8c2f96cd3ff71482815af736346c9441c8f00adef26f4e8f89082cbbb4033249501adbc545c08f678e1cac4afc88a8fc9ed0 SHA512 e5cbd01dcbaeabb04dc473bd11933a422fda03ceb5bc02fb5c99abafd0841e3ac1f436cc1798500b33fbbc81923fa03c2a28c971fa26794ed5888d496fb7e2ad DIST dropbear-2024.86.tar.bz2 2306244 BLAKE2B 988e2cc03c123685c93ab8b1148b1844cecc78aa12ad00d48f737e74fdae24f8c0397b91dc343b7fb996ffcf986804f32ffd1b886edf13d158b6f914545c883a SHA512 6be3d2efd79e49e1f9fe13654c26b9c14d1504c9543720e59600f6d689aafae7365b4a0bbfa309f7bf692995672adbbd9e660b2c907ea3d68d9f71023d05f54e DIST dropbear-2024.86.tar.bz2.asc 833 BLAKE2B 5fc35fb4135f099c2204972d3fc365b01b2622eeadf4cf6093496176e5a4010c1fbe36056036fe370e1a1ffb05d86293e212d935a3b4c5d8b0005eae09423edc SHA512 b7dbae281b21d5d1dfbb311f6a94a2c1acd3ab44a3293baffa885194d24721ec8067e907b414ebc0b5d77bb32c511fcd5c31008b6622b946e8d253621012836f diff --git a/net-misc/dropbear/dropbear-2022.83-r1.ebuild b/net-misc/dropbear/dropbear-2022.83-r1.ebuild deleted file mode 100644 index b8904fa6ad31..000000000000 --- a/net-misc/dropbear/dropbear-2022.83-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc -inherit savedconfig pam python-any-r1 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 ) 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? ( - $(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}-0.46-dbscp.patch - "${FILESDIR}"/${PN}-2022.82-tests.patch -) - -set_options() { - progs=( - dropbear dbclient dropbearkey - $(usex 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":' \ - default_options.h > localoptions.h || die - sed \ - -e '/pam_start/s:sshd:dropbear:' \ - -i svr-authpam.c || die - restore_config localoptions.h -} - -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[*]}" -} - -src_install() { - set_options - emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install - doman *.8 - newinitd "${FILESDIR}"/dropbear.init.d dropbear - newconfd "${FILESDIR}"/dropbear.conf.d dropbear - dodoc CHANGES README SMALL MULTI - - # The multi install target does not install the links right. - if use multicall ; then - cd "${ED}"/usr/bin || 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 ../bin/dropbearmulti /usr/sbin/dropbear - cd "${S}" || 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-0.46-dbscp.patch b/net-misc/dropbear/files/dropbear-0.46-dbscp.patch deleted file mode 100644 index ea0d17066d68..000000000000 --- a/net-misc/dropbear/files/dropbear-0.46-dbscp.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/dbmulti.c -+++ b/dbmulti.c -@@ -60,7 +60,7 @@ - } - #endif - #ifdef DBMULTI_scp -- if (strcmp(progname, "scp") == 0) { -+ if ((strcmp(progname, "scp") == 0) || (strcmp(progname, "dbscp") == 0)) { - return scp_main(argc, argv); - } - #endif -@@ -81,7 +81,7 @@ - "'dropbearconvert' - the key converter\n" - #endif - #ifdef DBMULTI_scp -- "'scp' - secure copy\n" -+ "'dbscp' - secure copy\n" - #endif - , - DROPBEAR_VERSION); diff --git a/net-misc/dropbear/files/dropbear-2022.82-tests.patch b/net-misc/dropbear/files/dropbear-2022.82-tests.patch deleted file mode 100644 index 6619e6c07551..000000000000 --- a/net-misc/dropbear/files/dropbear-2022.82-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/test/Makefile.in -+++ b/test/Makefile.in -@@ -4,18 +4,13 @@ SHELL=bash - - all: test - --test: venv/bin/pytest fakekey -- (source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) ) -+test: fakekey -+ pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) - --one: venv/bin/pytest fakekey -- (source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit) -+one: fakekey -+ pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit - - fakekey: - ../dropbearkey -t ecdsa -f $@ - --venv/bin/pytest: $(srcdir)/requirements.txt -- python3 -m venv init venv -- ./venv/bin/pip install --upgrade pip -- ./venv/bin/pip install -r $(srcdir)/requirements.txt -- - .PHONY: test
