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 97F091382C5 for ; Mon, 29 Jun 2020 23:53:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A3CBE08BF; Mon, 29 Jun 2020 23:53:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 48F22E08BF for ; Mon, 29 Jun 2020 23:53:07 +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 C427C34F366 for ; Mon, 29 Jun 2020 23:53:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4323E21D for ; Mon, 29 Jun 2020 23:53:04 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1593474745.e77fd01734f21ec2e9c985c28ba4eb30c1b2bc9d.heroxbd@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: e77fd01734f21ec2e9c985c28ba4eb30c1b2bc9d X-VCS-Branch: master Date: Mon, 29 Jun 2020 23:53:04 +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: eb835f70-aa51-499d-a699-d12f9c250c91 X-Archives-Hash: c28026840cc17f219cc457bfc26ba47d commit: e77fd01734f21ec2e9c985c28ba4eb30c1b2bc9d Author: Benda Xu gentoo org> AuthorDate: Mon Jun 29 23:34:25 2020 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Jun 29 23:52:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e77fd017 scripts/bootstrap-prefix.sh: do not skip USE=ssl in stage3. USE=-ssl has been introduced in d830d32f64280bb 10 years ago to simplify bootstrap logic, when cryptography was not crucial. Now the assumptions do not hold anymore and USE=-ssl causes more cursed situations than it cures. This results in cleaner and more correct code. As a by-product, it fixes Bug 728986. This has been tested on prefix-standalone, call for more tests. Reported-By: Sammy Pfeiffer, devourer, anb Closes: https://bugs.gentoo.org/728986 Signed-off-by: Benda Xu gentoo.org> scripts/bootstrap-prefix.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index d72d868a4e..3a9dd3cb87 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1525,7 +1525,6 @@ do_emerge_pkgs() { -libcxx -nls -pcre - -ssl -python -qmanifest -qtegrity bootstrap @@ -2028,15 +2027,12 @@ bootstrap_stage3() { chmod +x "${ROOT}"/sbin/openrc-run fi - # gettext pulls in portage, which since 2.2.28 needs ssl enabled, so - # we need to lift our mask for that. (USE=ssl) pkgs=( virtual/os-headers sys-devel/gettext sys-apps/portage ) - USE="ssl" \ without_stack_emerge_pkgs "" "${pkgs[@]}" || return 1 # Switch to the proper portage.