diff options
Diffstat (limited to 'net-misc/dropbear')
| -rw-r--r-- | net-misc/dropbear/Manifest | 10 | ||||
| -rw-r--r-- | net-misc/dropbear/dropbear-2025.87.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/dropbear/dropbear-2025.88-r1.ebuild (renamed from net-misc/dropbear/dropbear-2024.86-r1.ebuild) | 13 | ||||
| -rw-r--r-- | net-misc/dropbear/files/dropbear-2025.88-remove-which.patch | 14 | ||||
| -rw-r--r-- | net-misc/dropbear/files/dropbear.init.d-r1 | 41 |
5 files changed, 70 insertions, 10 deletions
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index 075d1f796652..8a7a03ea521b 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -3,12 +3,14 @@ AUX dropbear-2024.84-non-interactive-tests-no-syslog.patch 294 BLAKE2B 66658bb83 AUX dropbear-2024.84-non-interactive-tests.patch 300 BLAKE2B 5055d8abee9234cd9a5325bc6fcd4cea2794a8ebe7660afb30727ca893f8caedf3c73e8d0f9a90f0348d58f6569e0f68d18887c2f6b2ab5b3fcde9566c47f16d SHA512 68949b92339e2421e518595aada28ca4c7eec8f7734087e4753da4f7794a038f1fceae61b505ee8f7ac22890ef0ffebac8b773c7e53a5704d584a89670886127 AUX dropbear-2024.84-test-bg-sleep.patch 530 BLAKE2B 96836fae965d463eab7fba7f5cf3a358e7fac0281739f9911441d5afdb986495caa0ebb7f6e05978fa1740ae6aa6a009f674e8c071718a64e4cb305b4532ddba SHA512 b5758b3f21b1ddf127d2d95363708c67bbe2b584850c7b693a825093222046ffb6682b700a2ef71245d28d147d1ee4fe6dbc96a0e8132aa85fcbc4229d54db4b AUX dropbear-2024.86-tests.patch 2438 BLAKE2B 70a1d1067255d38ec13920998310638a237dcc6cdb8af56f91439b327d687dee039cde626d6f3a17a676d8f700aed5e4c4a9294dbac4cb2d146e684574b05a29 SHA512 2d6e3b4aa78ce8fbcdbb74adc83d87f81ffb1d1bcce5fe12c9a4b3115f7ede3095823c59f6b5bac0fa7f393d8482a85c14012038bab02831bdbaa8191e077303 +AUX dropbear-2025.88-remove-which.patch 416 BLAKE2B c3558b2d1151dbdee6d7d3d638163d170520492b4a668abaa1140a8615d8a0aa0d7a026e23340c5008af0f62d2c16ba299e16c063759fa7849b5e0da41815cea SHA512 853a01a3c22d0ae23dfebc7e38608390e7072804a59d18f7ae1f1ba68e6d49f8e8d055b3ca247a9dfe6edc8599d5ec3a631821dc6d4423afbe655ed5a539dd70 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f AUX dropbear.init.d 735 BLAKE2B e3d3c388033934da2e8ea684b9f380cb92147ae359434fd9a03523f683ab553a50dbb8cb879f4bdd12d59b40ddc8d8bede19be7fe9904298a1e273a14a4603ca SHA512 5b8dd52125360967c43d0a3a4ae8748eb33be2fe23b4d54d81cddfb0ef7e6a78b011e3028f41adab7706f83a292bbc8f07711a02c29e6a89488db72aa3ff259d -DIST dropbear-2024.86.tar.bz2 2306244 BLAKE2B 988e2cc03c123685c93ab8b1148b1844cecc78aa12ad00d48f737e74fdae24f8c0397b91dc343b7fb996ffcf986804f32ffd1b886edf13d158b6f914545c883a SHA512 6be3d2efd79e49e1f9fe13654c26b9c14d1504c9543720e59600f6d689aafae7365b4a0bbfa309f7bf692995672adbbd9e660b2c907ea3d68d9f71023d05f54e -DIST dropbear-2024.86.tar.bz2.asc 833 BLAKE2B 5fc35fb4135f099c2204972d3fc365b01b2622eeadf4cf6093496176e5a4010c1fbe36056036fe370e1a1ffb05d86293e212d935a3b4c5d8b0005eae09423edc SHA512 b7dbae281b21d5d1dfbb311f6a94a2c1acd3ab44a3293baffa885194d24721ec8067e907b414ebc0b5d77bb32c511fcd5c31008b6622b946e8d253621012836f +AUX dropbear.init.d-r1 888 BLAKE2B fadbe0544cbfeec00d44ee2e7c2473e636e53c8d388f4dc38deaf97028e39748970b155e8f3c6d6a2c12f1a8f6d7b2dda0ff8db963e1aebc76b7c68e81bce57a SHA512 0ae302c1719cbf3983e014f343e71f58b7dfbb272e60b93f3768ba10e4785bce65d2512a2ad8bcdb0c2516c850a94dc75a120b1782d1195ef61668c76613443d DIST dropbear-2025.87.tar.bz2 2368085 BLAKE2B 14c47f8311502a821a1b67e4bcedcdc80cc7cd830abf432822acb7f9854a900ffd5fc5c5e2d55bc5fc273f53250e168c1d08c7fc840bf42721362befcc3615b0 SHA512 afe30b2c795c21ba76d0e4f7b95d9f61ca0ce31510c5fd5183feef2984b49122ccb600c5eae8ac05d9c3cf6bb6237f760cfcf4f7c546656f555e46e992d1efeb DIST dropbear-2025.87.tar.bz2.asc 833 BLAKE2B 86f1ac7bd968eddad2d43bca21864db44c21e5875b7fec54fcc0ddce5bc748462d2639bc2394ca682b84527d49b3b0ef46cfbf07c244ded0b86812b1c6aa7894 SHA512 a5b1dcfb0bd5f5de12959f4b47e526cf3844ad8b7ef26fa0692fac6c2a77d36d5171d37fc405f7d4a2e4e70a6d8cc30366cac9046745a5126593c45b54998a7c -EBUILD dropbear-2024.86-r1.ebuild 5859 BLAKE2B ae93f5140b0e01a7081413919c1dff211db448cd1410c5ee75641124f8eaa203833aa23181f9b43cd529098f6fd8c71b7e700ccfe3feb7d2c652cd3131385944 SHA512 da93b8436f00d14218b0a33b6076a9d502981752e1bb899c539520501c8e1b756a6d2cc34fd698d7be56ddd1981dbd08ee8cef46641cff4a893acc06864e0352 -EBUILD dropbear-2025.87.ebuild 5866 BLAKE2B 3f73760dd51602f743e0eb23625cd384670fbece054b97be9324254c7e0a6b963b8fdaaebac015c20c964c837ecdc8eb75f6270a7c0eb1ed9b13bf7a8545026b SHA512 3d7b38d0db17d9a22e4950ad51ace9200c1dead495b122d032c05f6d35a9494417876aca3b0b8ade3e413247d7ffe85fb039e5f1aa5958b263c9f3d62158c0a3 +DIST dropbear-2025.88.tar.bz2 2370480 BLAKE2B d64f51227a19c77218a32815f75538df96961008c9fd9effec133e457bed0aa3c0837ca1cfdd877101ff09014e5fdd3a1500135887799eaeb0f2207d74799585 SHA512 71194f4792287b9e56e07cfa9a3e97d23b7fda82c858e0219d0d54aee48e77892997330ad1af5654a738b970965a92a79468bbf5c8ba0358b046fd053dfc87ed +DIST dropbear-2025.88.tar.bz2.asc 833 BLAKE2B 2399086027e07d186e1199f2a4442d8eb8cbc14476acb004c6879e782c263d760ffb03623dd062e7f3fd381041c503cdc589d6ab4a47db652018a0db6b641d31 SHA512 ac7e5c94668bccdeeeb2bb85722107df7216dc605769ed82638227e7922c85bda9d2b76d219a87d49f276a1c9f18bccfbf7950a009410cb49b958b2f7d9eec04 +EBUILD dropbear-2025.87.ebuild 5861 BLAKE2B 30f7d4128750e645a1920c815feebf4a042538548d129e4453eb58ad9b7829982d2a0db018e39d0b2bc1d4143ec27a5f0f4761bc79eb457a7660f0d422fd97fa SHA512 2d24f63615b17f72b47ca3ac2755a837977abc1e1a4b3b5aa4dcc6ae37c34b5d3022c1db91e0497e80c6d315f7438b2f61a644e602af7b0230c831a67fd3bd23 +EBUILD dropbear-2025.88-r1.ebuild 5941 BLAKE2B 573df7cc00a7b44a099f28c1eeb7465e834446ce60b9ec903d57aee74c4b06528fd068630e5f68c5ad0736f3cd3e2bcee70a6533143572db485d1174632b7898 SHA512 8368dd9da4cfdbf2ce4cb5abef611738df42bbe7c90d832259b8273e0de855db13f169979bd2665c545c10f71dc25cafe4311ae3ef9c867b138396629529f179 MISC metadata.xml 2144 BLAKE2B 44954b29ea4dfb4008a9411303c502ef2fffee30f16df24a7f6fc7e1969c24209bf88f59a67e32ef422544ae51d46a846a819a8004efad825da702fff7f3af91 SHA512 ff59f6d316473fa41905ff92112f2b57b929668e04730fa88f7af405ee6a1e308a82119b896a5612120cd1cd2bdbea0e8dc8b0d419b7f472b22fa66a89638fe5 diff --git a/net-misc/dropbear/dropbear-2025.87.ebuild b/net-misc/dropbear/dropbear-2025.87.ebuild index 78da4952b98c..c1b3e59d76c0 100644 --- a/net-misc/dropbear/dropbear-2025.87.ebuild +++ b/net-misc/dropbear/dropbear-2025.87.ebuild @@ -18,7 +18,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" +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 )" diff --git a/net-misc/dropbear/dropbear-2024.86-r1.ebuild b/net-misc/dropbear/dropbear-2025.88-r1.ebuild index b8238c8ac945..762cb3830a85 100644 --- a/net-misc/dropbear/dropbear-2024.86-r1.ebuild +++ b/net-misc/dropbear/dropbear-2025.88-r1.ebuild @@ -3,9 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc -inherit pam python-any-r1 savedconfig verify-sig +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" @@ -18,12 +18,12 @@ 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" +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(+)] + virtual/libcrypt:=[static-libs(+)] zlib? ( sys-libs/zlib[static-libs(+)] ) " RDEPEND=" @@ -69,6 +69,7 @@ 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() { @@ -107,6 +108,8 @@ pkg_setup() { 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 @@ -184,7 +187,7 @@ src_install() { set_options emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install doman manpages/*.8 - newinitd "${FILESDIR}"/dropbear.init.d dropbear + newinitd "${FILESDIR}"/dropbear.init.d-r1 dropbear newconfd "${FILESDIR}"/dropbear.conf.d dropbear dodoc CHANGES README.md SMALL.md MULTI.md diff --git a/net-misc/dropbear/files/dropbear-2025.88-remove-which.patch b/net-misc/dropbear/files/dropbear-2025.88-remove-which.patch new file mode 100644 index 000000000000..9f4ea53b51b5 --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2025.88-remove-which.patch @@ -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 diff --git a/net-misc/dropbear/files/dropbear.init.d-r1 b/net-misc/dropbear/files/dropbear.init.d-r1 new file mode 100644 index 000000000000..25f7f259b12f --- /dev/null +++ b/net-misc/dropbear/files/dropbear.init.d-r1 @@ -0,0 +1,41 @@ +#!/sbin/openrc-run +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use logger dns + need net +} + +check_config() { + # bug #947598 - don't generate keys if DROPBEAR_OPTS contains option `-r` + echo "${DROPBEAR_OPTS}" | grep -E '(^-r)|(\s-r)' > /dev/null 2>&1 && return + + mkdir -p /etc/dropbear + + local t k + for t in rsa ecdsa ed25519; do + k="/etc/dropbear/dropbear_${t}_host_key" + if [ ! -e ${k} ] ; then + # See if support is enabled for this key type. + if dropbearkey -h 2>&1 | grep -q " ${t}$" ; then + einfo "Generating ${k} ..." + dropbearkey -t ${t} -f ${k} >/dev/null + fi + fi & + done + wait +} + +start() { + check_config || return 1 + ebegin "Starting dropbear" + dropbear ${DROPBEAR_OPTS} + eend $? +} + +stop() { + ebegin "Stopping dropbear" + start-stop-daemon --stop --pidfile /var/run/dropbear.pid + eend $? +} |