Revert "Simplify removing the user's password"

This wasn't meant for RHEL 8.10.

This reverts commit ccb85304e3.

Resolves: RHEL-2038

toolbox-Add-migration-paths-for-coreos-toolbox-users.patch

@@ -1,4 +1,4 @@
-From 4b60bfc74678f8d5fb779be5c0fc0bc8e892d247 Mon Sep 17 00:00:00 2001
+From d461caa5b1a278124d039df93140d2d5bf4eabe7 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <rishi@fedoraproject.org>
 Date: Wed, 18 Aug 2021 17:55:21 +0200
 Subject: [PATCH 1/2] cmd/run: Make sosreport work by setting the HOST
@@ -22,10 +22,10 @@ index 7657ffa50821..23d422623b14 100644
  		"--preserve-fds", preserveFDs,
  	}...)
 -- 
-2.41.0
+2.39.2
 
 
-From 4ae3f7afc777dce2fe3b03198e0987507c049258 Mon Sep 17 00:00:00 2001
+From 3c2c67752e8f88f72058799cbce3612fc937b230 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <rishi@fedoraproject.org>
 Date: Fri, 10 Dec 2021 13:42:15 +0100
 Subject: [PATCH 2/2] test/system: Update to test the migration path for
@@ -97,5 +97,5 @@ index 000000000000..32d87904213e
 +  skip "Testing of entering toolboxes is not implemented"
 +}
 -- 
-2.41.0
+2.39.2
 

toolbox-cmd-initContainer-Be-aware-of-security-hardened-moun.patch

@@ -1,4 +1,4 @@
-From 1fde98456652ddbcb750ade2121c5ceec93fbfae Mon Sep 17 00:00:00 2001
+From 1cc9e07b7c36fe9f9784b40b58f0a2a3694dd328 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <rishi@fedoraproject.org>
 Date: Thu, 13 Jul 2023 13:08:40 +0200
 Subject: [PATCH] cmd/initContainer: Be aware of security hardened mount points
@@ -54,7 +54,7 @@ https://github.com/containers/toolbox/issues/911
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/cmd/initContainer.go b/src/cmd/initContainer.go
-index 465ac063b210..c4cd1b02d298 100644
+index 222aa42e1036..41b825b33f58 100644
 --- a/src/cmd/initContainer.go
 +++ b/src/cmd/initContainer.go
 @@ -62,10 +62,10 @@ var (

toolbox.spec

@@ -6,7 +6,7 @@ Version:       0.0.99.4
 %global goipath github.com/containers/%{name}
 %gometa
 
-Release:       6%{?dist}
+Release:       5%{?dist}
 Summary:       Tool for containerized command line environments on Linux
 
 License:       ASL 2.0
@@ -18,7 +18,6 @@ Source1:       %{name}.conf
 # Upstream
 Patch0:        toolbox-Build-fixes.patch
 Patch1:        toolbox-cmd-initContainer-Be-aware-of-security-hardened-moun.patch
-Patch2:        toolbox-Simplify-removing-the-user-s-password.patch
 
 # RHEL specific
 Patch100:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
@@ -61,7 +60,6 @@ The %{name}-tests package contains system tests for %{name}.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %ifnarch ppc64
 %patch100 -p1
@@ -127,10 +125,6 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
-* Mon Oct 02 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-6
-- Simplify removing the user's password
-Resolves: RHEL-2038
-
 * Fri Aug 11 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-5
 - Be aware of security hardened mount points
 Resolves: #2144541