From 6243676c91946098c06d42bc87b5eb99aac40bf0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 25 Apr 2024 23:59:45 +0100 Subject: gentoo auto-resync : 25:04:2024 - 23:59:45 --- net-misc/dropbear/Manifest | 6 +- net-misc/dropbear/dropbear-2024.84.ebuild | 187 ------------------------------ net-misc/dropbear/dropbear-2024.85.ebuild | 187 ++++++++++++++++++++++++++++++ 3 files changed, 190 insertions(+), 190 deletions(-) delete mode 100644 net-misc/dropbear/dropbear-2024.84.ebuild create mode 100644 net-misc/dropbear/dropbear-2024.85.ebuild (limited to 'net-misc/dropbear') diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index 5454a5a7dd66..6ee5fcc9902f 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -8,8 +8,8 @@ AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee753 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8 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.84.tar.bz2 2306278 BLAKE2B ba5a433f2a313aeeabc8e3e3696c4d79e96095dfc5cf045f15e6de5912f2f44bdddee103d86f659ee58fe8013fc9c2fb8c3af9cba089ee415e2f28179a365dca SHA512 254daea819c5aeaa65bb43449386fb964f4aa13e3b3037fe11064120205c6e265925e7ef2d84f7ebe66c6a00cf0a22e6010314c065ed49a3815f47137b7aca44 -DIST dropbear-2024.84.tar.bz2.asc 833 BLAKE2B 0b8c9fdf8c24836b03f36d3e98b6b906a3aaeda9bd283b3d2001b9b1e363a19e02a536febfe19c3c851c378d32a3efb067910a68dd4a7b2174b96fd8faedf1b3 SHA512 69ce84ea8f6ba2c7f7718578befa301c3a0342b7f6acb3ecb5d6ac4b82710fb22d0bc11f5632ae00f222c1cc2b50f48e50d16eee4ebb93bf08069774769ebb13 +DIST dropbear-2024.85.tar.bz2 2304594 BLAKE2B 631b71733437a256267057a1c4846afa4d520fa9e29d9c14dfa7df09109c30cc2d649ada990a15c615567f7a1d6ff02340799216b7fa41327d72cb43dd9096e0 SHA512 09619e9874172658b7fc284823e0a619b6a4346a5db41487d1628768b46c1f8eac962bfd8ef73e2a59e466fc4022395f7a194b4309195c954b0d7e0d13254f67 +DIST dropbear-2024.85.tar.bz2.asc 833 BLAKE2B 1d0cc37fb1c528c6f7f6e064d3ec3d7c63617b568d8889592ca162171a325a46e84a23f24c16069b5396c806b2270434552833138ba95c7f34c8b5e6e425fcc7 SHA512 d2ad10b60f53d8d598a7a57337fe890c26c60bea115fb919f6135a01fe3f8f7e5863b0a7ed6c7eacbd5a3b810169b600c0004251a8d748d4b40584933c2c7383 EBUILD dropbear-2022.83.ebuild 4439 BLAKE2B 27b205667c703bfaab314fa819c4d2dda5aac112264cf554037a511924fd4f90426491130027edc27e018e24358592a666e290055a9402876344b3eaffd63c23 SHA512 5ca0b6010c1ca1a7c853cacb35e500f5138a4724b7515b775862eb357f85584dde222e035bcb00a3ddb6d55e3a360bc17f6b1a9ba1c133a2fbc636b89d5aaebd -EBUILD dropbear-2024.84.ebuild 5072 BLAKE2B 68e5d792af2deae9ff45d9e0d68f53fc8af12133c947155a0a217d76bb1f526d672878d57b183b524f00e1465d13b0c2964721950af27c2dcdec1a3aaba395de SHA512 7c311b71095a748639b287ece6b54e376f605385fb9b14ecf4edd0370a538598f30f81853338d3374450229bff20cd93ab377c24b679493c79f56bd246b0cffd +EBUILD dropbear-2024.85.ebuild 5072 BLAKE2B 68e5d792af2deae9ff45d9e0d68f53fc8af12133c947155a0a217d76bb1f526d672878d57b183b524f00e1465d13b0c2964721950af27c2dcdec1a3aaba395de SHA512 7c311b71095a748639b287ece6b54e376f605385fb9b14ecf4edd0370a538598f30f81853338d3374450229bff20cd93ab377c24b679493c79f56bd246b0cffd MISC metadata.xml 1866 BLAKE2B 820902b27de934f6d7f0edc5d9f8c7bccf5c5f51d0e81ebd13fb53d6ba9e385c924d4fd0a191096fb191c253800227ff6b30f7bd44edfb532307e7076f39df8f SHA512 8e073a34877f230207ef391084b99014db9482aec680a1b292ac95e3bade426ecf362092337b7fcb19091f273085a06ae81cfd7d5e69a46a28067ae68f615cd4 diff --git a/net-misc/dropbear/dropbear-2024.84.ebuild b/net-misc/dropbear/dropbear-2024.84.ebuild deleted file mode 100644 index 85944fe6b816..000000000000 --- a/net-misc/dropbear/dropbear-2024.84.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 ~ia64 ~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/dropbear-2024.85.ebuild b/net-misc/dropbear/dropbear-2024.85.ebuild new file mode 100644 index 000000000000..85944fe6b816 --- /dev/null +++ b/net-misc/dropbear/dropbear-2024.85.ebuild @@ -0,0 +1,187 @@ +# 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 ~ia64 ~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 +} -- cgit v1.2.3