commit: e77fd01734f21ec2e9c985c28ba4eb30c1b2bc9d Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Mon Jun 29 23:34:25 2020 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> 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 <heroxbd <AT> 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.
