gentoo resync : 22.01.2021

3 files changed, 28 insertions, 13 deletions

diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index df9bf8d00368..44ebda6ab459 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -3,6 +3,6 @@ AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee753
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
 DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3
 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
-EBUILD dropbear-2020.80-r1.ebuild 2704 BLAKE2B ef2564b6773a91794c4c016fd6f33f75211eb5ade5187cfab0447ee8ff6d421f88983f6b673398ae34d8efdfd8fc24965c91ddb11d351ccae792c8570eccc6fe SHA512 d87869b76746178109a76281b5b52a80ad3662cf7558bc6ef91c7f1de928a8c19db0fff6ed5e01c1c6ecb612fe99b220eef22f9e5d33ebf69d8739b0eccaf691
-EBUILD dropbear-2020.81.ebuild 2746 BLAKE2B 647d12891973e585c6f077e96869659016c462f7c37f4c0a1bf4077805b8668e440bd61c85b70b5cc4c60cc036f5ad50e37605a5b1da6fe7a4a065c107b59356 SHA512 d501d3738f0b3c8a682a19a5f2eb0e430536e94f5b6d13132f0106793f777b44f7010952925beb112aabff8e367fa6496cecce893d86c8304e22b49bf83df2ed
+EBUILD dropbear-2020.80-r2.ebuild 2727 BLAKE2B e85ffcaeb12d7f15a6ca744a643f6a6aa83400ea40fc2c7faf46d9feb3b5df26efb188792b52a5f6ba5a3cf36c0432c970a726be029e0dd82912270cfcaf1f72 SHA512 0042683e8de737d8b8d9fe96c1ed619785ed2dccb19cf8d646d15839a11bd4c8a9ae5417fb98d21aa9031292edd5ac7ea97492deae119a9c9483f42980f645bd
+EBUILD dropbear-2020.81-r2.ebuild 2968 BLAKE2B b545ebc5560efc07ec82bddbfa7da82e8cbe0ac32a81fd27624e63a3865137fea29319472e20cbbb16f64026340d5d353a730911eef4a0da1443f315c4240648 SHA512 81ef82195ae8888a95ff65aed3cfe530a537508443852e34fcf8ce9cd22af014d3ca052e5c67c14bc6ac2b3743b971b4055497f7b5b559db2dc8273be38924ed
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2020.80-r1.ebuild b/net-misc/dropbear/dropbear-2020.80-r2.ebuild
index 88a15ff55baa..8ae9dcf02790 100644
--- a/net-misc/dropbear/dropbear-2020.80-r1.ebuild
+++ b/net-misc/dropbear/dropbear-2020.80-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -106,5 +106,7 @@ src_install() {
 		mv "${ED}"/usr/bin/{,db}scp || die
 	fi
 
-	pamd_mimic system-remote-login dropbear auth account password session
+	if use pam; then
+		pamd_mimic system-remote-login dropbear auth account password session
+	fi
 }
diff --git a/net-misc/dropbear/dropbear-2020.81.ebuild b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
index 1224921683b2..2ff85973af9a 100644
--- a/net-misc/dropbear/dropbear-2020.81.ebuild
+++ b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,12 +17,15 @@ IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 
 LIB_DEPEND="
 	zlib? ( sys-libs/zlib[static-libs(+)] )
-	>=dev-libs/libtommath-1.2.0[static-libs(+)]
 "
 RDEPEND="
 	acct-group/sshd
 	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!static? (
+		>=dev-libs/libtomcrypt-1.18.2-r2
+		>=dev-libs/libtommath-1.2.0
+		${LIB_DEPEND//\[static-libs(+)]}
+	)
 	pam? ( sys-libs/pam )
 "
 DEPEND="
@@ -47,6 +50,12 @@ set_options() {
 	)
 }
 
+pkg_setup() {
+	if use static ; then
+		ewarn "Using bundled copies of libtommath and libtomcrypt"
+	fi
+}
+
 src_prepare() {
 	default
 	sed \
@@ -59,13 +68,14 @@ src_prepare() {
 }
 
 src_configure() {
-	# XXX: Need to add libtomcrypt to the tree and re-enable this.
-	#	--disable-bundled-libtom
-	# We disable the hardening flags as our compiler already enables them
-	# by default as is appropriate for the target.
+	# 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
-		--enable-bundled-libtom
+		$(use_enable static bundled-libtom)
 		$(use_enable zlib)
 		$(use_enable pam)
 		$(use_enable !bsdpty openpty)
@@ -73,6 +83,7 @@ src_configure() {
 		$(use_enable static)
 		$(use_enable syslog)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -107,5 +118,7 @@ src_install() {
 		mv "${ED}"/usr/bin/{,db}scp || die
 	fi
 
-	pamd_mimic system-remote-login dropbear auth account password session
+	if use pam; then
+		pamd_mimic system-remote-login dropbear auth account password session
+	fi
 }