Unbreak sorting and clearly identify copied images in 'list'

Resolves: #2033282

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

@@ -1,4 +1,4 @@
-From 565947a7df6f4d18cb2f2d3a172b79391880288a Mon Sep 17 00:00:00 2001
+From 495760a8e4a193f8403d67e503b4b8156dc859a8 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 5954eac55fad..ca363815d4c9 100644
  		"--tty",
  		"--user", currentUser.Username,
 -- 
-2.31.1
+2.38.1
 
 
-From fecbda4c3ea823eb04ebe392a6e1422e8ce8dd41 Mon Sep 17 00:00:00 2001
+From dc5b363ff4ea53aae11b0582688dc59935539b72 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.31.1
+2.38.1
 

toolbox.spec

@@ -11,7 +11,7 @@ Version:       0.0.99.3
 %global goipath github.com/containers/%{name}
 %gometa
 
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Tool for containerized command line environments on Linux
 
 License:       ASL 2.0
@@ -24,6 +24,9 @@ URL:           https://containertoolbx.org/
 Source0:       %{name}-%{version}-vendored.tar.xz
 Source1:       %{name}.conf
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=2033282
+Patch0:        toolbox-Unbreak-sorting-and-clearly-identify-copied-images-in-list.patch
+
 # RHEL specific
 Patch100:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
 Patch101:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch
@@ -64,6 +67,8 @@ The %{name}-tests package contains system tests for %{name}.
 %prep
 %setup -q
 
+%patch0 -p1
+
 %ifnarch ppc64
 %patch100 -p1
 %else
@@ -124,6 +129,10 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Tue Dec 13 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-7
+- Unbreak sorting and clearly identify copied images in 'list'
+Resolves: #2033282
+
 * Fri Oct 14 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-6
 - Rebuild for CVE-2022-27664 and CVE-2022-32189
 Resolves: #2116786