| 1 |
commit: 929025d74438f10d7b9d9f79d2002a953eb89aba |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 18 22:47:31 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 18 22:50:12 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929025d7 |
| 7 |
|
| 8 |
profiles: add note to libxcrypt mask(s) to treat with care for non-glibc |
| 9 |
|
| 10 |
We'll need to keep the masks for non-glibc (musl, uclibc{,-ng}, ...) so |
| 11 |
make a note of it to prevent an issue down the line. |
| 12 |
|
| 13 |
Reported-by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com> |
| 14 |
Bug: https://bugs.gentoo.org/699422 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
profiles/base/package.use.force | 4 ++-- |
| 18 |
profiles/base/package.use.mask | 1 + |
| 19 |
profiles/package.mask | 1 + |
| 20 |
3 files changed, 4 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force |
| 23 |
index 2450d788500..eb7bc3a9dd5 100644 |
| 24 |
--- a/profiles/base/package.use.force |
| 25 |
+++ b/profiles/base/package.use.force |
| 26 |
@@ -93,8 +93,8 @@ sys-kernel/vanilla-kernel initramfs |
| 27 |
|
| 28 |
# Sergei Trofimovich <slyfox@g.o> (2019-11-06) |
| 29 |
# Upstream plans to drop libcrypt.so.1/crypt.h from glibc |
| 30 |
-# distribution and rely on external providers lke libxcrypt. |
| 31 |
-# Gentoo will follow the suit but today we are not ready. |
| 32 |
+# distribution and rely on external providers like libxcrypt. |
| 33 |
+# Gentoo will follow suit but today we are not yet ready. |
| 34 |
# Unmask at your risk. Bug #699422 tracks the effort. |
| 35 |
sys-libs/glibc crypt |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 39 |
index 8b41e67b485..e7d99d817a4 100644 |
| 40 |
--- a/profiles/base/package.use.mask |
| 41 |
+++ b/profiles/base/package.use.mask |
| 42 |
@@ -270,6 +270,7 @@ dev-python/statsmodels doc |
| 43 |
|
| 44 |
# Patrick McLean <chutzpah@g.o> (2019-11-07) |
| 45 |
# Collides with sys-libc/glibc[crypt] |
| 46 |
+# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely) |
| 47 |
sys-libs/libxcrypt split-usr system |
| 48 |
|
| 49 |
# Michał Górny <mgorny@g.o> (2019-10-05) |
| 50 |
|
| 51 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 52 |
index e66e79db539..b68e9d648d8 100644 |
| 53 |
--- a/profiles/package.mask |
| 54 |
+++ b/profiles/package.mask |
| 55 |
@@ -510,6 +510,7 @@ dev-lang/spark |
| 56 |
|
| 57 |
# Patrick McLean <chutzpah@g.o> (2020-02-07) |
| 58 |
# Mask until sys-libs/libxcrypt[system] is unmasked |
| 59 |
+# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely) |
| 60 |
>=virtual/libcrypt-2 |
| 61 |
|
| 62 |
# Lars Wendler <polynomial-c@g.o> (2019-11-14) |
Archives