[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/

["Sam James" <sam@gentoo.org>]

commit:     929025d74438f10d7b9d9f79d2002a953eb89aba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 22:47:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 22:50:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929025d7

profiles: add note to libxcrypt mask(s) to treat with care for non-glibc

We'll need to keep the masks for non-glibc (musl, uclibc{,-ng}, ...) so
make a note of it to prevent an issue down the line.

Reported-by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com>
Bug: https://bugs.gentoo.org/699422
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/base/package.use.force | 4 ++--
 profiles/base/package.use.mask  | 1 +
 profiles/package.mask           | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 2450d788500..eb7bc3a9dd5 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -93,8 +93,8 @@ sys-kernel/vanilla-kernel initramfs
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-11-06)
 # Upstream plans to drop libcrypt.so.1/crypt.h from glibc
-# distribution and rely on external providers lke libxcrypt.
-# Gentoo will follow the suit but today we are not ready.
+# distribution and rely on external providers like libxcrypt.
+# Gentoo will follow suit but today we are not yet ready.
 # Unmask at your risk. Bug #699422 tracks the effort.
 sys-libs/glibc crypt
 

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 8b41e67b485..e7d99d817a4 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -270,6 +270,7 @@ dev-python/statsmodels doc
 
 # Patrick McLean <chutzpah@gentoo.org> (2019-11-07)
 # Collides with sys-libc/glibc[crypt]
+# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely)
 sys-libs/libxcrypt split-usr system
 
 # Michał Górny <mgorny@gentoo.org> (2019-10-05)

diff --git a/profiles/package.mask b/profiles/package.mask
index e66e79db539..b68e9d648d8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -510,6 +510,7 @@ dev-lang/spark
 
 # Patrick McLean <chutzpah@gentoo.org> (2020-02-07)
 # Mask until sys-libs/libxcrypt[system] is unmasked
+# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely)
 >=virtual/libcrypt-2
 
 # Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)