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 0E26F138334 for ; Sun, 1 Dec 2019 19:29:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62ECCE0822; Sun, 1 Dec 2019 19:28:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 35BA6E081E for ; Sun, 1 Dec 2019 19:28:59 +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 60FE634D451 for ; Sun, 1 Dec 2019 19:28:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1637A8AD for ; Sun, 1 Dec 2019 19:28:57 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1575228532.9bfaeeddb9aa2667f3f72bce02b8af5a8c5fb43a.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/openssl-1.1.1d-r3.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 9bfaeeddb9aa2667f3f72bce02b8af5a8c5fb43a X-VCS-Branch: master Date: Sun, 1 Dec 2019 19:28:57 +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: 5521ee6a-3a68-432b-9a86-1039f40ad876 X-Archives-Hash: e1bfb890fc667ea4d5c0ed6694230c06 commit: 9bfaeeddb9aa2667f3f72bce02b8af5a8c5fb43a Author: Lars Wendler gentoo org> AuthorDate: Sun Dec 1 19:28:41 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Dec 1 19:28:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bfaeedd dev-libs/openssl: ebuild code simplification Added sys-process/procps to BDEPEND because of sysctl usage Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Lars Wendler gentoo.org> dev-libs/openssl/openssl-1.1.1d-r3.ebuild | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild index 932e1a155f5..774605b4bf1 100644 --- a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild +++ b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild @@ -41,6 +41,7 @@ BDEPEND=" test? ( sys-apps/diffutils sys-devel/bc + sys-process/procps )" PDEPEND="app-misc/ca-certificates" @@ -64,14 +65,12 @@ pkg_setup() { [[ ${MERGE_TYPE} == binary ]] && return # must check in pkg_setup; sysctl don't work with userpriv! - if has test ${FEATURES}; then - if use sctp; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" || ${sctp_auth_status} != 1 ]]; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi + if has test ${FEATURES} && use sctp; then + # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" + # if sctp.auth_enable is not enabled. + local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) + if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then + die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" fi fi } @@ -120,14 +119,10 @@ src_prepare() { eapply_user #332661 - if has test ${FEATURES}; then - if use sctp; then - if has network-sandbox ${FEATURES}; then - ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox" - rm test/recipes/80-test_ssl_new.t || die - eend $? - fi - fi + if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then + ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox" + rm test/recipes/80-test_ssl_new.t || die + eend $? fi # make sure the man pages are suffixed #302165