| 1 |
commit: 01fd1ed53bffbcb11aa1734eb0ca42d3597318f5 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 22 06:08:11 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 22 06:28:17 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01fd1ed5 |
| 7 |
|
| 8 |
profiles: mask (older) virtual/libcrypt:0/1 for glibc to ease upgrades |
| 9 |
|
| 10 |
Mask the older virtual/libcrypt subslot (which permits glibc[crypt] instead |
| 11 |
of libxcrypt) to ease upgrades. |
| 12 |
|
| 13 |
Not yet doing this for musl (need to figure that out still) or uclibc (which |
| 14 |
is going away, see news). |
| 15 |
|
| 16 |
Was on the fence about doing this given it makes it slightly more |
| 17 |
awkward to put off the upgrade if desired, but that's really discouraged |
| 18 |
at this point, and I think it's worth it to make upgrades easier |
| 19 |
for more people. |
| 20 |
|
| 21 |
This helps Portage realise it can/should upgrade to virtual/libcrypt:0/2 |
| 22 |
rather than giving very confusing blocker errors (which it often, but not |
| 23 |
always, gets past). |
| 24 |
|
| 25 |
Final push to do this was a forum post: https://forums.gentoo.org/viewtopic-t-1145602.html |
| 26 |
|
| 27 |
Bug: https://bugs.gentoo.org/699422 |
| 28 |
Bug: https://bugs.gentoo.org/809410 |
| 29 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 30 |
|
| 31 |
profiles/base/package.mask | 9 +++++++++ |
| 32 |
profiles/features/musl/package.mask | 1 + |
| 33 |
profiles/features/uclibc/package.mask | 1 + |
| 34 |
3 files changed, 11 insertions(+) |
| 35 |
|
| 36 |
diff --git a/profiles/base/package.mask b/profiles/base/package.mask |
| 37 |
index c617fe47edc1..596abf9f4086 100644 |
| 38 |
--- a/profiles/base/package.mask |
| 39 |
+++ b/profiles/base/package.mask |
| 40 |
@@ -1,6 +1,15 @@ |
| 41 |
# Copyright 1999-2021 Gentoo Authors |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
+# Sam James <sam@g.o> (2021-11-22) |
| 45 |
+# Mask the older libcrypt virtual (which accepted glibc[crypt]) to ease |
| 46 |
+# dependency resolution. In a fair number of cases, this has helped |
| 47 |
+# upgrades go through cleanly. |
| 48 |
+# (This mask is undone in musl profiles where the transition is not yet being |
| 49 |
+# made.) |
| 50 |
+# bug #699422. |
| 51 |
+virtual/libcrypt:0/1 |
| 52 |
+ |
| 53 |
# Andreas K. Hüttel <dilfridge@g.o> (2021-07-06) |
| 54 |
# No longer maintained upstream; please see the 2021-07-15-opentmpfiles-deprecation |
| 55 |
# news item. |
| 56 |
|
| 57 |
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask |
| 58 |
index 8868bd6108ae..8bf8e5b3342e 100644 |
| 59 |
--- a/profiles/features/musl/package.mask |
| 60 |
+++ b/profiles/features/musl/package.mask |
| 61 |
@@ -21,6 +21,7 @@ net-misc/netkit-rsh |
| 62 |
# Andreas K. Hüttel <dilfridge@g.o> (2021-07-14) |
| 63 |
# Mask the libxcrypt-based virtual |
| 64 |
~virtual/libcrypt-2 |
| 65 |
+-virtual/libcrypt:0/1 |
| 66 |
|
| 67 |
# David Seifert <soap@g.o> (2021-02-08) |
| 68 |
# nvidia-drivers only works against glibc. |
| 69 |
|
| 70 |
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask |
| 71 |
index 8aa72890043e..39a81a82d33a 100644 |
| 72 |
--- a/profiles/features/uclibc/package.mask |
| 73 |
+++ b/profiles/features/uclibc/package.mask |
| 74 |
@@ -8,6 +8,7 @@ sys-libs/pam |
| 75 |
# Andreas K. Hüttel <dilfridge@g.o> (2021-07-14) |
| 76 |
# Mask the libxcrypt-based virtual |
| 77 |
~virtual/libcrypt-2 |
| 78 |
+-virtual/libcrypt:0/1 |
| 79 |
|
| 80 |
# Ionen Wolkens <ionen@g.o> (2021-07-09) |
| 81 |
# Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106) |
Archives