| 1 |
commit: e77fd01734f21ec2e9c985c28ba4eb30c1b2bc9d |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 29 23:34:25 2020 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 29 23:52:25 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e77fd017 |
| 7 |
|
| 8 |
scripts/bootstrap-prefix.sh: do not skip USE=ssl in stage3. |
| 9 |
|
| 10 |
USE=-ssl has been introduced in d830d32f64280bb 10 years ago to |
| 11 |
simplify bootstrap logic, when cryptography was not crucial. |
| 12 |
|
| 13 |
Now the assumptions do not hold anymore and USE=-ssl causes more |
| 14 |
cursed situations than it cures. |
| 15 |
|
| 16 |
This results in cleaner and more correct code. As a by-product, it |
| 17 |
fixes Bug 728986. |
| 18 |
|
| 19 |
This has been tested on prefix-standalone, call for more tests. |
| 20 |
|
| 21 |
Reported-By: Sammy Pfeiffer, devourer, anb |
| 22 |
Closes: https://bugs.gentoo.org/728986 |
| 23 |
|
| 24 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 25 |
|
| 26 |
scripts/bootstrap-prefix.sh | 4 ---- |
| 27 |
1 file changed, 4 deletions(-) |
| 28 |
|
| 29 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 30 |
index d72d868a4e..3a9dd3cb87 100755 |
| 31 |
--- a/scripts/bootstrap-prefix.sh |
| 32 |
+++ b/scripts/bootstrap-prefix.sh |
| 33 |
@@ -1525,7 +1525,6 @@ do_emerge_pkgs() { |
| 34 |
-libcxx |
| 35 |
-nls |
| 36 |
-pcre |
| 37 |
- -ssl |
| 38 |
-python |
| 39 |
-qmanifest -qtegrity |
| 40 |
bootstrap |
| 41 |
@@ -2028,15 +2027,12 @@ bootstrap_stage3() { |
| 42 |
chmod +x "${ROOT}"/sbin/openrc-run |
| 43 |
fi |
| 44 |
|
| 45 |
- # gettext pulls in portage, which since 2.2.28 needs ssl enabled, so |
| 46 |
- # we need to lift our mask for that. (USE=ssl) |
| 47 |
pkgs=( |
| 48 |
virtual/os-headers |
| 49 |
sys-devel/gettext |
| 50 |
sys-apps/portage |
| 51 |
) |
| 52 |
|
| 53 |
- USE="ssl" \ |
| 54 |
without_stack_emerge_pkgs "" "${pkgs[@]}" || return 1 |
| 55 |
|
| 56 |
# Switch to the proper portage. |
Archives