diff options
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/package.use.force | 8 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index eb7bc3a9dd50..aa66e55ed5b5 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -91,12 +91,12 @@ sys-libs/libcxx libcxxabi # the flag. sys-kernel/vanilla-kernel initramfs -# Sergei Trofimovich <slyfox@gentoo.org> (2019-11-06) +# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14) # Upstream plans to drop libcrypt.so.1/crypt.h from glibc # 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 +# Here we are following that path too. +<sys-libs/glibc-2.33-r2 crypt +>=sys-libs/libxcrypt-4.4.23-r1 system compat # Matt Turner <mattst88@gentoo.org> (2019-09-01) # <dev-scheme/guile-2 is package.mask'd, so force USE=guile2 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 3535925e4566..af41a8e0062a 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -286,10 +286,12 @@ dev-python/statsmodels doc # broken static-linking in glibc and maybe others >app-shells/mksh-57-r1 static -# 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 +# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14) +# Upstream plans to drop libcrypt.so.1/crypt.h from glibc +# distribution and rely on external providers like libxcrypt. +# Here we are following that path too. +>=sys-libs/glibc-2.33-r2 crypt +<sys-libs/libxcrypt-4.4.23-r1 split-usr system # Michał Górny <mgorny@gentoo.org> (2019-10-05) # net-libs/openslp is being removed. |