commit: f63e433a3db50537ff903195e7e7c90b80d68047 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Sep 8 03:23:18 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 10 11:28:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f63e433a
profiles/features/musl: unmask sys-libs/libxcrypt[system] This brings musl in line with the changes we made for glibc a while ago. The situation with glibc is a bit different because the migration is mandatory there, while we're just strongly recommending it for musl because sys-libs/libxcrypt[-system] causes headaches (see linked PAM bug for an example, but I've also hit a similar issue with Python yesterday). Bug: https://bugs.gentoo.org/867991 Bug: https://bugs.gentoo.org/699422 Signed-off-by: Sam James <sam <AT> gentoo.org> profiles/features/musl/package.mask | 5 ----- profiles/features/musl/package.use.force | 4 ++-- profiles/features/musl/package.use.mask | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask index 372a11cc8cf8..52e3d47eb93c 100644 --- a/profiles/features/musl/package.mask +++ b/profiles/features/musl/package.mask @@ -261,11 +261,6 @@ app-text/po4a # Uses glibc-specific rexec(3) function, bug #715898 net-misc/netkit-rsh -# Andreas K. Hüttel <[email protected]> (2021-07-14) -# Mask the libxcrypt-based virtual -~virtual/libcrypt-2 --virtual/libcrypt:0/1 - # David Seifert <[email protected]> (2021-02-08) # nvidia-drivers only works against glibc. dev-libs/optix diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force index c5f7ed10b1ea..71a3432ba12f 100644 --- a/profiles/features/musl/package.use.force +++ b/profiles/features/musl/package.use.force @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors. +# Copyright 1999-2022 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 # Esteve Varela Colominas <[email protected]> (2022-02-19) @@ -7,7 +7,7 @@ net-im/telegram-desktop -jemalloc # Andreas K. Hüttel <[email protected]> (2021-07-14) # Do not force system install for libxcrypt here ->=sys-libs/libxcrypt-4.4.23-r1 -system -compat +<sys-libs/libxcrypt-4.4.28-r2 -system -compat # Force system-libevent use flag on mozilla packages, since the building of # bundled libevent cannot accomodate a system without sysctl.h diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask index 53a1c21b3025..e33e6d34a9f3 100644 --- a/profiles/features/musl/package.use.mask +++ b/profiles/features/musl/package.use.mask @@ -50,7 +50,7 @@ sys-libs/compiler-rt-sanitizers gwp-asan # Andreas K. Hüttel <[email protected]> # Restore mask here that is gone elsewhere -sys-libs/libxcrypt split-usr system +<sys-libs/libxcrypt-4.4.28-r2 split-usr system # James Le Cuirot <[email protected]> (2020-05-16) # execinfo.h is required for debug.
