From 5b64defa9839375e13b31b35d142a149f08dc6f6 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 6 Mar 2024 15:26:22 +0100
Subject: [PATCH] overlay profiles: Migrate from glibc crypt to libxcrypt

It's long overdue and glibc 2.39 will drop crypt stuff altogether. Or
so I heard. Whatever happens, the crypt library in glibc is deprecated
for a long time already.
---
 .../coreos-overlay/profiles/coreos/base/package.mask       | 6 ------
 .../coreos-overlay/profiles/coreos/base/package.unmask     | 6 ------
 .../coreos-overlay/profiles/coreos/base/package.use.force  | 4 ----
 .../coreos-overlay/profiles/coreos/base/package.use.mask   | 7 -------
 4 files changed, 23 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask
index 97238158c1..b4bb4d583f 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask
@@ -11,12 +11,6 @@
 # certificate store provided in NSS rather than the Gentoo/Debian package.
 >=app-misc/ca-certificates-20000000
 
-# Overwrite portage-stable mask. We are delaying the transition to
-# libxcrypt, because we need to figure out how to solve the dep loop
-# that results from the migration (python -> virtual/libcrypt ->
-# libxcrypt -> glibc -> python).
->=virtual/libcrypt-2
-
 # Python 3.12 is in portage-stable (currently testing), so avoid picking it
 # up. Update this to mask later versions when we switch to 3.11.
 >=dev-lang/python-3.12
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask
index 75ed309ec1..a1a22a0cc4 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask
@@ -1,9 +1,3 @@
-# Overwrite portage-stable mask. We are delaying the transition to
-# libxcrypt, because we need to figure out how to solve the dep loop
-# that results from the migration (python -> virtual/libcrypt ->
-# libxcrypt -> glibc -> python).
-<virtual/libcrypt-2
-
 # Overwrite portage-stable mask. We haven't seen LLVM related problems
 # with rust so far, so keep using 1.70.0.
 ~dev-lang/rust-1.78.0
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force
index 6d0323d116..c538b7f58c 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force
@@ -14,10 +14,6 @@ app-alternatives/sh bash
 app-alternatives/tar gnu
 app-alternatives/yacc bison
 
-# Force libcrypt so it's included in stage-1 of the SDK build.
-# +crypt was introduced in glibc-2.30 and above.
-sys-libs/glibc crypt
-
 # Do not force this flag, we don't need XATTR_PAX
 sys-apps/portage -xattr
 
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask
index ab7f1c9a9e..b25c16a12d 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask
@@ -17,13 +17,6 @@ sys-libs/ncurses cxx
 # which is defined in portage-stable.
 app-editors/nano unicode
 
-# Overwrite portage-stable mask. We are delaying the transition to
-# libxcrypt, because we need to figure out how to solve the dep loop
-# that results from the migration (python -> virtual/libcrypt ->
-# libxcrypt -> glibc -> python), and also we need to update gcc to
-# version 10 or later.
-sys-libs/glibc -crypt
-
 # We don't use pip.
 dev-lang/python ensurepip