6 files changed, 97 insertions, 28 deletions
diff --git a/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt b/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt
index cfff10629da0..7154bc497e2e 100644
--- a/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt
+++ b/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt
@@ -44,7 +44,7 @@ Fixing a broken system is not always straightforward. It is strongly
 recommended to take a backup of your full system before proceeding,
 as well as a copy of /var/db/pkg (the VDB):
 
-1. A tool has been developed [5] to attempt to fix the consistency
+Step 1. A tool has been developed [5] to attempt to fix the consistency
   of the Portage database. Using this tool to modify the VDB is NOT
   mandatory (read the full news item before proceeding) - you can skip
   to Step 2 if you wish, but fixing the integrity of the VDB
@@ -72,23 +72,28 @@ as well as a copy of /var/db/pkg (the VDB):
   # into your real /var/db/pkg/ directory tree.
   ```
 
-2. Attempt to rebuild the affected packages, first upgrading
+Step 2. Attempt to rebuild the affected packages, first upgrading
   app-misc/pax-utils to the latest version:
   ```
   $ emerge --ask --verbose --oneshot ">=app-misc/pax-utils-1.3.3"
   $ emerge --ask --verbose --oneshot --usepkg=n $(grep -v '#' broken_vdb_packages)
   ```
 
-Given that there are possible other side-effects of the corruption/bug,
-it is strongly recommended that if any corruption is detected, all
-packages on the system should be rebuilt, after following the above
-steps:
-```
-$ emerge --ask --emptytree --usepkg=n @world
-```
+  It's possible that the relevant versions have disappeared from the tree, so
+  if the emerge command fails, please attempt a normal world upgrade.
+
+Step 3. Given that there are possible other side-effects of the corruption/bug,
+  it is strongly recommended that if any corruption is detected, all
+  packages on the system should be rebuilt, after following the above
+  steps:
+  ```
+  $ emerge --ask --emptytree --usepkg=n @world
+  ```
+
+  Note that binary packages may need to be discarded given they may
+  contain corrupt metadata.
 
-Note that binary packages may need to be discarded given they may
-contain corrupt metadata.
+  If no libraries were broken, it is likely safe to skip this step.
 
 Please see the wiki [0] for a full description of the background
 of this problem and handling corner cases such as e.g. already
diff --git a/metadata/news/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt b/metadata/news/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt
new file mode 100644
index 000000000000..ccfcdddcff09
--- /dev/null
+++ b/metadata/news/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt
@@ -0,0 +1,64 @@
+Title: migrating from glibc[crypt] to libxcrypt in stable
+Author: Andreas K. Hüttel <dilfridge@gentoo.org>
+Author: Sam James <sam@gentoo.org>
+Posted: 2021-10-18
+Revision: 1
+News-Item-Format: 2.0
+
+The implementation of libcrypt.so within glibc has been deprecated
+for a long time and will be removed in the near future.
+
+For this reason, we are following other distributions (where
+this has been tested for years already) and switching to the 
+external libxcrypt implementation, now also in stable installations.
+
+This will be a regular update, and in nearly all cases you
+will not have to take any action and not observe any problems.
+
+We do recommend, however, that your system is *fully* up
+to date first. This is a standard recommendation but in this
+specific case, it is useful to have a simplified depgraph
+to ensure that Portage is able to smoothly calculate
+an upgrade path.
+
+That is, please take the opportunity to fully upgrade your
+systems now, before the migration occurs, to simplify matters.
+
+This change will occur on 2021-11-01 for stable users.
+~arch users by default should already have switched.
+
+If for whatever reason you do *not* wish to switch now -
+which is only delaying the inevitable - you
+need to take the following steps:
+* unmask and enable the crypt USE flag of sys-libs/glibc
+* mask the system USE flag of sys-libs/libxcrypt
+* mask >=virtual/libcrypt-2
+
+If you wish to manually migrate now, there are a series
+of steps described on the wiki (see below), but the outline is:
+* unforce the crypt USE flag of sys-libs/glibc and disable it
+* unmask the system and split-usr (if applicable) USE flag of sys-libs/libxcrypt
+and enable it
+* unmask ~virtual/libcrypt-2
+
+Please note that if you last changed your password before ~2008,
+it may be using md5crypt or similar other weak mechanisms in /etc/shadow;
+a bug in PAM [0][1] may mean that you were unable to login. We recommend
+using "passwd" to change/refresh your password so it is using modern
+methods. A new version of PAM has been added to the tree to resolve this issue.
+
+In some cases, Portage may schedule a rebuild of certain packages in an
+incorrect order [2]. If building a package fails, please try upgrading
+libcrypt and libxcrypt first:
+
+# emerge -v1 virtual/libcrypt sys-libs/libxcrypt
+
+And then continue the world upgrade with Portage's "--keep-going=y".
+
+For more information or troubleshooting tips, please see:
+* https://wiki.gentoo.org/wiki/Project:Toolchain/libcrypt_implementation
+* https://bugs.gentoo.org/699422
+
+[0] https://bugs.gentoo.org/802267
+[1] https://bugs.gentoo.org/802807
+[2] https://bugs.gentoo.org/802210
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e3d4b556ee85..bd041fc3c49a 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 14971 BLAKE2B 0578b32f5b0537515d3ef03ad7acb73b8f538c7a615cf9e8371b504090d7cc3b904fa94540c3424ad809552b5ac11e96460fad2c549f2af264a2ec3f3b8943ed SHA512 650a45f215d64b5e852661abdd99d8dc8f43eaa4990a133bdf4a91c1434ac36639b30c58a6c4544ed30f70efce92346154faa946356ad9d79c3eb6f26799f408
-TIMESTAMP 2021-10-08T21:09:18Z
+MANIFEST Manifest.files.gz 15146 BLAKE2B 544d56e683470530af65f9eec9a368467f037f5ad498dd07d0325faece25bc763ceae502793dc487d11e392fb1ecf4404ead0971c9ab5745581a3829ffcc76f4 SHA512 4e0fd74724c703bac8a5f0a508b382ac63305cd36d647fc2cf8cc42e25e9073c19f879786bff0124653c75ef975a6dbb8c9625bbaaa830083ddbeda57584927f
+TIMESTAMP 2021-10-20T08:38:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFgs35fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFv1aNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBxZRAAqOxnESfrsRKNTrROz8m9CGJws6NbPEJURbu3c57ioG3Yx+r0jL78e46c
-DjLnqkyr+CZIcyCQYvsCjMdB3XD8nEJusAL5xi15BBrVWnPPU9tGxb//2qE4dqnC
-uDLRHfxwuBw3KmKhzEZmE++cuOzCWiBPCC6S0VkW5rnFClZnWzbaNGgb6JE7mOVu
-oQlF8NTPAdDWczSo5oQk93xd1ut51s49Fk3m1yhn8Q9Gr/FRiwHE23Wo6sCkzagO
-YT8s5DDSA0aeVJikUxFeKweHYlnQtXIMmOfb0LkHKExXgGF2I1xy5NvYNiiuVdJZ
-asvFR+z3y9PchI+LzWsLXFRUyE/IEauHCFuy/4w3CQzSnegzs0aWwV4hjGPkEisJ
-ac16kKby+b51Ma7TB6clvunM34lJ3akadRe8ra1NvJ1ce4KdFPhmqegq/6cOlKY4
-FK06GMCFfhQDlFZD7kB4HAW4ehtRV+CkC37Icjz6GBN2CIMcgAL6Huls8p0b+CDs
-vM1+XHZYO6e2dGnPbDiS9BzW/ZGAM7FpiAtmLTvzc7kZh/RCHIw2sZSADqX06+SD
-1078c9Zad8Z0n8vhN6t1GdZ5tZrZYcwJtaKtXXP5+IIJtsdwRaAR4GtLvCIkYIof
-VqY8NTqGgZSv1Lkb7Kqxcmn6PNvDehWIn7xfauzZeZ9/z2Piw2E=
-=on7i
+klDMiQ//R6iXxAa+W4Fw9+hXhveSLxOXwr8Oq4xCgbTHH+29r7XKJZnFitXmgWDp
+V4zlZafuwsuUMwzzJza4MUYo0SDSDX9lafcoxlVf1VcDfvkbMgIGEwH47Dn+TkAO
+uQ9EZA4+M+/tbCguQG9ZFqgyQyymWpmHf5CXOicO7kzHEaajlHwLoUBYdpHIxQvt
+FO8XqUqkT/wKl6pE4/VACfZrEjyWO0RYTZiuTTN+LHF9FfIfnsiXNtxukbBEtRgq
+aTdo6h9i7NRUIwy52tUWdpzj4XPFtaE70Cg2wEzrhwZxE/zOBG9Ysl7KKsKnYGLI
+U7gKkiztrlgmUmq+p7yftbqd45fsdHUpY3qXSy3DLhdm/GecG3F5RWzs62f3QmEd
+GwtrUfoakouMq/aoAKYFuYmefQ1blvxqMPJjL8wiz38xitcC6SkzIJWs6OUgJ5E6
+pkBEQYf6WjTtb4l9jgNSLqk8U6JaM2v+3mKBUpuCkHuQyWe2SpdpOoH/Z2UU3jyX
+u1+NEF1IBEaCOEc5mlAqfMRszbxMGRDF+NXYB4qPm4Yi3HbMsx1/KhoFgmU2VYgY
+gapOE+biEdSP52qpGlYCxcUbMOZUQ38Z5ePODX1/NYjMGRlmK+/+Xylu66kb5mar
+ZZSZNtgCmf2YuLrNUMkFBJhaHAn4FheZEFkx52LuAva/91kM5Go=
+=Pm63
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 4f6424fa3c93..6aef58828444 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1990ad495263..55124f1121c8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Oct 2021 21:09:13 +0000
+Wed, 20 Oct 2021 08:38:55 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index e79a158b207c..e5ad41e982df 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-8dea6aa24c3ec9ee9a391fb602733c1a803a1ad1 1633714096 2021-10-08T17:28:16+00:00
+232dd42f93031207d628903f6ad4d5c9a96267af 1634589909 2021-10-18T20:45:09+00:00