From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 576FD158012 for ; Sat, 10 Sep 2022 11:28:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AEC0E091D; Sat, 10 Sep 2022 11:28:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A722E091D for ; Sat, 10 Sep 2022 11:28:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 711BD340F3A for ; Sat, 10 Sep 2022 11:28:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1701A5CD for ; Sat, 10 Sep 2022 11:28:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1662809283.f63e433a3db50537ff903195e7e7c90b80d68047.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/features/musl/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/features/musl/package.mask profiles/features/musl/package.use.force profiles/features/musl/package.use.mask X-VCS-Directories: profiles/features/musl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f63e433a3db50537ff903195e7e7c90b80d68047 X-VCS-Branch: master Date: Sat, 10 Sep 2022 11:28:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c03d9445-55b1-417a-8257-234988c06dea X-Archives-Hash: 6f0b0227b9713930abc662ee119d755d commit: f63e433a3db50537ff903195e7e7c90b80d68047 Author: Sam James gentoo org> AuthorDate: Thu Sep 8 03:23:18 2022 +0000 Commit: Sam James gentoo 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 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 (2021-07-14) -# Mask the libxcrypt-based virtual -~virtual/libcrypt-2 --virtual/libcrypt:0/1 - # David Seifert (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 (2022-02-19) @@ -7,7 +7,7 @@ net-im/telegram-desktop -jemalloc # Andreas K. Hüttel (2021-07-14) # Do not force system install for libxcrypt here ->=sys-libs/libxcrypt-4.4.23-r1 -system -compat + # Restore mask here that is gone elsewhere -sys-libs/libxcrypt split-usr system + (2020-05-16) # execinfo.h is required for debug.