| 1 |
commit: 4ced298fd259cbd089f994e084b30a58718b37fe |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 14 18:47:12 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 14 20:45:54 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ced298f |
| 7 |
|
| 8 |
package.use.{mask,force}: adapt for libxcrypt transition, except musl/uclibc |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/699422 |
| 11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 12 |
|
| 13 |
profiles/base/package.use.force | 8 ++++---- |
| 14 |
profiles/base/package.use.mask | 10 ++++++---- |
| 15 |
profiles/features/musl/package.use.force | 4 ++++ |
| 16 |
profiles/features/musl/package.use.mask | 4 ++++ |
| 17 |
profiles/features/uclibc/package.use.force | 6 ++++++ |
| 18 |
profiles/features/uclibc/package.use.mask | 4 ++++ |
| 19 |
6 files changed, 28 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force |
| 22 |
index eb7bc3a9dd5..aa66e55ed5b 100644 |
| 23 |
--- a/profiles/base/package.use.force |
| 24 |
+++ b/profiles/base/package.use.force |
| 25 |
@@ -91,12 +91,12 @@ sys-libs/libcxx libcxxabi |
| 26 |
# the flag. |
| 27 |
sys-kernel/vanilla-kernel initramfs |
| 28 |
|
| 29 |
-# Sergei Trofimovich <slyfox@g.o> (2019-11-06) |
| 30 |
+# Andreas K. Hüttel <dilfridge@g.o> (2021-07-14) |
| 31 |
# Upstream plans to drop libcrypt.so.1/crypt.h from glibc |
| 32 |
# distribution and rely on external providers like libxcrypt. |
| 33 |
-# Gentoo will follow suit but today we are not yet ready. |
| 34 |
-# Unmask at your risk. Bug #699422 tracks the effort. |
| 35 |
-sys-libs/glibc crypt |
| 36 |
+# Here we are following that path too. |
| 37 |
+<sys-libs/glibc-2.33-r2 crypt |
| 38 |
+>=sys-libs/libxcrypt-4.4.23-r1 system compat |
| 39 |
|
| 40 |
# Matt Turner <mattst88@g.o> (2019-09-01) |
| 41 |
# <dev-scheme/guile-2 is package.mask'd, so force USE=guile2 |
| 42 |
|
| 43 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 44 |
index 3535925e456..af41a8e0062 100644 |
| 45 |
--- a/profiles/base/package.use.mask |
| 46 |
+++ b/profiles/base/package.use.mask |
| 47 |
@@ -286,10 +286,12 @@ dev-python/statsmodels doc |
| 48 |
# broken static-linking in glibc and maybe others |
| 49 |
>app-shells/mksh-57-r1 static |
| 50 |
|
| 51 |
-# Patrick McLean <chutzpah@g.o> (2019-11-07) |
| 52 |
-# Collides with sys-libc/glibc[crypt] |
| 53 |
-# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely) |
| 54 |
-sys-libs/libxcrypt split-usr system |
| 55 |
+# Andreas K. Hüttel <dilfridge@g.o> (2021-07-14) |
| 56 |
+# Upstream plans to drop libcrypt.so.1/crypt.h from glibc |
| 57 |
+# distribution and rely on external providers like libxcrypt. |
| 58 |
+# Here we are following that path too. |
| 59 |
+>=sys-libs/glibc-2.33-r2 crypt |
| 60 |
+<sys-libs/libxcrypt-4.4.23-r1 split-usr system |
| 61 |
|
| 62 |
# Michał Górny <mgorny@g.o> (2019-10-05) |
| 63 |
# net-libs/openslp is being removed. |
| 64 |
|
| 65 |
diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force |
| 66 |
index c26a7ba83f2..da728fcc47a 100644 |
| 67 |
--- a/profiles/features/musl/package.use.force |
| 68 |
+++ b/profiles/features/musl/package.use.force |
| 69 |
@@ -1,6 +1,10 @@ |
| 70 |
# Copyright 1999-2018 Gentoo Foundation. |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
|
| 73 |
+# Andreas K. Hüttel <dilfridge@g.o> (2021-07-14) |
| 74 |
+# Do not force system install for libxcrypt here |
| 75 |
+>=sys-libs/libxcrypt-4.4.23-r1 -system -compat |
| 76 |
+ |
| 77 |
# Force system-libevent use flag on mozilla packages, since the building of |
| 78 |
# bundled libevent cannot accomodate a system without sysctl.h |
| 79 |
# See bug 574830 for more info. |
| 80 |
|
| 81 |
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask |
| 82 |
index afdd59ca5f5..58cd6477116 100644 |
| 83 |
--- a/profiles/features/musl/package.use.mask |
| 84 |
+++ b/profiles/features/musl/package.use.mask |
| 85 |
@@ -1,6 +1,10 @@ |
| 86 |
# Copyright 1999-2020 Gentoo Authors. |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
|
| 89 |
+# Andreas K. Hüttel <dilfridge@g.o> |
| 90 |
+# Restore mask here that is gone elsewhere |
| 91 |
+sys-libs/libxcrypt split-usr system |
| 92 |
+ |
| 93 |
# James Le Cuirot <chewi@g.o> (2020-05-16) |
| 94 |
# execinfo.h is required for debug. |
| 95 |
dev-games/cegui debug |
| 96 |
|
| 97 |
diff --git a/profiles/features/uclibc/package.use.force b/profiles/features/uclibc/package.use.force |
| 98 |
new file mode 100644 |
| 99 |
index 00000000000..82ca48bfea6 |
| 100 |
--- /dev/null |
| 101 |
+++ b/profiles/features/uclibc/package.use.force |
| 102 |
@@ -0,0 +1,6 @@ |
| 103 |
+# Copyright 2021 Gentoo Foundation. |
| 104 |
+# Distributed under the terms of the GNU General Public License v2 |
| 105 |
+ |
| 106 |
+# Andreas K. Hüttel <dilfridge@g.o> (2021-07-14) |
| 107 |
+# Do not force system install for libxcrypt here |
| 108 |
+>=sys-libs/libxcrypt-4.4.23-r1 -system -compat |
| 109 |
|
| 110 |
diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask |
| 111 |
index 1c6069c30db..b3f8a9ebe24 100644 |
| 112 |
--- a/profiles/features/uclibc/package.use.mask |
| 113 |
+++ b/profiles/features/uclibc/package.use.mask |
| 114 |
@@ -1,6 +1,10 @@ |
| 115 |
# Copyright 1999-2019 Gentoo Authors |
| 116 |
# Distributed under the terms of the GNU General Public License v2 |
| 117 |
|
| 118 |
+# Andreas K. Hüttel <dilfridge@g.o> |
| 119 |
+# Restore mask here that is gone elsewhere |
| 120 |
+sys-libs/libxcrypt split-usr system |
| 121 |
+ |
| 122 |
# Anthony G. Basile <blueness@g.o> |
| 123 |
# sanitize is broken on at least all hardened uclibc |
| 124 |
sys-devel/gcc sanitize |
Archives