From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6F5911382C5 for ; Sun, 17 Jan 2021 21:26:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABAE8E0823; Sun, 17 Jan 2021 21:26:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97924E0823 for ; Sun, 17 Jan 2021 21:26:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA611335D95 for ; Sun, 17 Jan 2021 21:26:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86A9292 for ; Sun, 17 Jan 2021 21:26:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1610918770.d46416cf0096fe3ff8ec3939234363ed51380ed6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dropbear/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dropbear/dropbear-2020.81-r1.ebuild X-VCS-Directories: net-misc/dropbear/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d46416cf0096fe3ff8ec3939234363ed51380ed6 X-VCS-Branch: master Date: Sun, 17 Jan 2021 21:26:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4d9f1682-5adf-47cb-84dc-f76466475767 X-Archives-Hash: 50109dcb7d80f5e5cdfc7110917e4383 commit: d46416cf0096fe3ff8ec3939234363ed51380ed6 Author: Sam James gentoo org> AuthorDate: Sun Jan 17 21:26:05 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 17 21:26:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46416cf net-misc/dropbear: fix static case (use bundled) We don't really want to expose static libs for libtomcrypt, so let's use the bundled sources instead. Closes: https://bugs.gentoo.org/765808 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> net-misc/dropbear/dropbear-2020.81-r1.ebuild | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/net-misc/dropbear/dropbear-2020.81-r1.ebuild b/net-misc/dropbear/dropbear-2020.81-r1.ebuild index fc989e06172..b52672266a0 100644 --- a/net-misc/dropbear/dropbear-2020.81-r1.ebuild +++ b/net-misc/dropbear/dropbear-2020.81-r1.ebuild @@ -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 - --disable-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[@]}" }