From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Jul 2021 22:39:47 +0100 Subject: gentoo resync : 03.07.2021 --- net-misc/dropbear/Manifest | 2 +- net-misc/dropbear/dropbear-2020.81-r2.ebuild | 124 -------------------------- net-misc/dropbear/dropbear-2020.81-r3.ebuild | 125 +++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 125 deletions(-) delete mode 100644 net-misc/dropbear/dropbear-2020.81-r2.ebuild create mode 100644 net-misc/dropbear/dropbear-2020.81-r3.ebuild (limited to 'net-misc/dropbear') diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index 754c4e645e1e..133f6933f216 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -2,5 +2,5 @@ AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da -EBUILD dropbear-2020.81-r2.ebuild 2964 BLAKE2B a84ee1a23beb4798760f306d2d5f083f8603822fce6d7b0b37559f7f390d120b939c82f35054bcc29e246c8509dc316fd9ada81b720f3c75e238ee469598a50d SHA512 ad4563e6e32ea22918c7f0d74564c665c14ef3f7a4aad966f79f5bc0008eefac12b52b36a78ba9fcde10ac84b316191f6d656a056f1102a4bfdd9d1baa5abbda +EBUILD dropbear-2020.81-r3.ebuild 2998 BLAKE2B bfddf78a617b0691b8c962438477e6cb2f58ee720d583fb0f850c69f4f35d082eb5abad6de6e2501d21a377ed39f86b817ef86ad33a56541559f6ed00d2e9b39 SHA512 1d0063c27e5bf658259eeb2e0660cf55e769fb83a13f848ca172bb9ec572d2830c1e1097ab6a0013ef55c12f2074578a18b845f586019caa5e181402c131270b MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314 diff --git a/net-misc/dropbear/dropbear-2020.81-r2.ebuild b/net-misc/dropbear/dropbear-2020.81-r2.ebuild deleted file mode 100644 index 06a278f6bece..000000000000 --- a/net-misc/dropbear/dropbear-2020.81-r2.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit savedconfig pam - -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" - -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 zlib" - -LIB_DEPEND=" - zlib? ( sys-libs/zlib[static-libs(+)] ) -" -RDEPEND=" - acct-group/sshd - acct-user/sshd - !static? ( - >=dev-libs/libtomcrypt-1.18.2-r2 - >=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 )" - -REQUIRED_USE="pam? ( !static )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.46-dbscp.patch -) - -set_options() { - progs=( - dropbear dbclient dropbearkey - $(usex minimal "" "dropbearconvert scp") - ) - makeopts=( - MULTI=$(usex multicall 1 0) - ) -} - -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 - $(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/dropbear-2020.81-r3.ebuild b/net-misc/dropbear/dropbear-2020.81-r3.ebuild new file mode 100644 index 000000000000..3de7dd0fef41 --- /dev/null +++ b/net-misc/dropbear/dropbear-2020.81-r3.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit savedconfig pam + +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" + +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 zlib" + +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 + >=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 )" + +REQUIRED_USE="pam? ( !static )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.46-dbscp.patch +) + +set_options() { + progs=( + dropbear dbclient dropbearkey + $(usex minimal "" "dropbearconvert scp") + ) + makeopts=( + MULTI=$(usex multicall 1 0) + ) +} + +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 + $(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 +} -- cgit v1.2.3