| 1 |
commit: 880798b419fcfff3e37ff1509257fb986483f4a5 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 2 02:45:43 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 2 02:48:24 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880798b4 |
| 7 |
|
| 8 |
profiles: cleanup obsolete libxcrypt masks |
| 9 |
|
| 10 |
We no longer have older libxcrypt in tree. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
profiles/arch/loong/package.use.mask | 2 +- |
| 15 |
profiles/base/package.use.force | 2 +- |
| 16 |
profiles/base/package.use.mask | 1 - |
| 17 |
profiles/features/musl/package.use.force | 8 ++++---- |
| 18 |
4 files changed, 6 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask |
| 21 |
index 466175442007..55d0cb78a907 100644 |
| 22 |
--- a/profiles/arch/loong/package.use.mask |
| 23 |
+++ b/profiles/arch/loong/package.use.mask |
| 24 |
@@ -36,7 +36,7 @@ sys-block/fio -io-uring -zbc |
| 25 |
# WANG Xuerui <xen0n@g.o> (2022-04-18) |
| 26 |
# We never had non-deprecated libcrypt support from glibc, so disable compat |
| 27 |
# from libxcrypt for a world without libcrypt.so.1 |
| 28 |
->=sys-libs/libxcrypt-4.4.23-r1 compat |
| 29 |
+sys-libs/libxcrypt compat |
| 30 |
|
| 31 |
# WANG Xuerui <xen0n@g.o> (2022-04-18) |
| 32 |
# Catalyst has support for assembling bootloader on this arch |
| 33 |
|
| 34 |
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force |
| 35 |
index f19dbdaf80c5..76b5768c656b 100644 |
| 36 |
--- a/profiles/base/package.use.force |
| 37 |
+++ b/profiles/base/package.use.force |
| 38 |
@@ -130,7 +130,7 @@ sys-kernel/vanilla-kernel initramfs |
| 39 |
# distribution and rely on external providers like libxcrypt. |
| 40 |
# Here we are following that path too. |
| 41 |
<sys-libs/glibc-2.33-r2 crypt |
| 42 |
->=sys-libs/libxcrypt-4.4.23-r1 system compat |
| 43 |
+sys-libs/libxcrypt system compat |
| 44 |
|
| 45 |
# Matt Turner <mattst88@g.o> (2019-09-01) |
| 46 |
# <dev-scheme/guile-2 is package.mask'd, so force USE=guile2 |
| 47 |
|
| 48 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 49 |
index 5dd77f442ac0..389658bab392 100644 |
| 50 |
--- a/profiles/base/package.use.mask |
| 51 |
+++ b/profiles/base/package.use.mask |
| 52 |
@@ -486,7 +486,6 @@ dev-python/statsmodels doc |
| 53 |
# distribution and rely on external providers like libxcrypt. |
| 54 |
# Here we are following that path too. |
| 55 |
>=sys-libs/glibc-2.33-r2 crypt |
| 56 |
-<sys-libs/libxcrypt-4.4.23-r1 split-usr system |
| 57 |
|
| 58 |
# Craig Andrews <candrews@g.o> (2019-09-12) |
| 59 |
# OpenSSL (as of version 1.1.1) doesn't have APIs for QUIC support |
| 60 |
|
| 61 |
diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force |
| 62 |
index e74bebd7fe25..369d1774b6dc 100644 |
| 63 |
--- a/profiles/features/musl/package.use.force |
| 64 |
+++ b/profiles/features/musl/package.use.force |
| 65 |
@@ -1,6 +1,10 @@ |
| 66 |
# Copyright 1999-2022 Gentoo Authors. |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
+# Sam James <sam@g.o> (2022-11-02) |
| 70 |
+# The libxcrypt migration is optional for musl. |
| 71 |
+sys-libs/libxcrypt -system -compat |
| 72 |
+ |
| 73 |
# Sam James <sam@g.o> (2022-10-04) |
| 74 |
# net-misc/netkit-rsh is masked on musl and USE=-crypt depends on it |
| 75 |
sys-cluster/torque crypt |
| 76 |
@@ -9,10 +13,6 @@ sys-cluster/torque crypt |
| 77 |
# The musl allocator works well with telegram |
| 78 |
net-im/telegram-desktop -jemalloc |
| 79 |
|
| 80 |
-# Andreas K. Hüttel <dilfridge@g.o> (2021-07-14) |
| 81 |
-# Do not force system install for libxcrypt here |
| 82 |
-<sys-libs/libxcrypt-4.4.28-r2 -system -compat |
| 83 |
- |
| 84 |
# Force system-libevent use flag on mozilla packages, since the building of |
| 85 |
# bundled libevent cannot accomodate a system without sysctl.h |
| 86 |
# See bug 574830 for more info. |
Archives