From 84a9060eb00728f520f41a5950bdccce3aac7190 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Thu, 11 Jan 2024 18:52:10 +0100
Subject: [PATCH 01/22] Drop 'Recommends: subscription-manager'

... because subscription-manager requires python3-dnf, which contains
%{_bindir}/dnf-3 and %{_bindir}/dnf4 [1].   This is a problem on Fedora
Silverblue, because they shouldn't be present on OSTree based variants
of Fedora.

This reverts parts of commit 6682165143201ac7ce7d57a52117e7b76147798f.

[1] https://github.com/fedora-silverblue/issue-tracker/issues/521
---
 toolbox.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/toolbox.spec b/toolbox.spec
index e9fdfc0..f14e4be 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -17,7 +17,7 @@ Version:       0.0.99.5
 %endif
 %endif
 
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -65,7 +65,6 @@ BuildRequires: pkgconfig(fish)
 %endif
 
 Recommends:    skopeo
-Recommends:    subscription-manager
 
 Requires:      containers-common
 Requires:      podman >= 1.6.4
@@ -266,6 +265,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Thu Jan 11 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-2
+- Drop 'Recommends: subscription-manager'
+
 * Tue Dec 19 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-1
 - Update to 0.0.99.5
 

From 12ec8a43ed6f8ff0d9e58dffa7c1cd3cefaae452 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Tue, 13 Feb 2024 23:04:34 +0100
Subject: [PATCH 02/22] Unbreak Podman's downstream Fedora CI

https://bugzilla.redhat.com/show_bug.cgi?id=2263968
---
 ...nbreak-Podman-s-downstream-Fedora-CI.patch | 47 +++++++++++++++++++
 toolbox.spec                                  | 10 +++-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch

diff --git a/toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch b/toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
new file mode 100644
index 0000000..92cebc8
--- /dev/null
+++ b/toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
@@ -0,0 +1,47 @@
+From 6838e9347199e875f9869acd2afa64688161ca11 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Tue, 13 Feb 2024 21:56:06 +0100
+Subject: [PATCH] test/system: Unbreak Podman's downstream Fedora CI
+
+The paths to bats-assert and bats-support are broken, if bats(1) is
+invoked from any other location than the parent directory of the 'tests'
+directory.  eg., Podman's downstream Fedora CI invokes the tests as:
+  $ cd /path/to/toolbox/test/system
+  $ bats .
+
+... and it led to [1]:
+  1..306
+  # test suite: Set up
+  # Missing dependencies
+  # Forgot to run 'git submodule init' and 'git submodule update' ?
+  # test suite: Tear down
+  not ok 1 setup_suite
+  # (from function `setup_suite' in test file ./setup_suite.bash, line 33)
+  #   `return 1' failed
+  # bats warning: Executed 1 instead of expected 306 tests
+
+Fallout from 2c0960660330dc6be6861502988695f9812c475a
+
+[1] https://bugzilla.redhat.com/show_bug.cgi?id=2263968
+
+https://github.com/containers/toolbox/pull/1448
+---
+ test/system/setup_suite.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/system/setup_suite.bash b/test/system/setup_suite.bash
+index 78507d660529..649018f01e96 100644
+--- a/test/system/setup_suite.bash
++++ b/test/system/setup_suite.bash
+@@ -17,7 +17,7 @@
+ 
+ missing_dependencies=false
+ 
+-if [ -f test/system/libs/bats-assert/load.bash ] && [ -f test/system/libs/bats-support/load.bash ]; then
++if [ -f "$BATS_TEST_DIRNAME/libs/bats-assert/load.bash" ] && [ -f "$BATS_TEST_DIRNAME/libs/bats-support/load.bash" ]; then
+   load 'libs/helpers'
+ else
+   missing_dependencies=true
+-- 
+2.43.0
+
diff --git a/toolbox.spec b/toolbox.spec
index f14e4be..853af43 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -17,7 +17,7 @@ Version:       0.0.99.5
 %endif
 %endif
 
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -27,6 +27,9 @@ Source0:       https://github.com/containers/%{name}/releases/download/%{version
 # RHEL specific
 Source1:       %{name}.conf
 
+# Upstream
+Patch0:        toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
+
 # Fedora specific
 Patch100:      toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
 Patch101:      toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch
@@ -182,6 +185,8 @@ The %{name}-tests package contains system tests for %{name}.
 %prep
 %setup -q
 
+%patch0 -p1
+
 %if 0%{?fedora}
 %ifnarch ppc64
 %patch100 -p1
@@ -265,6 +270,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Tue Feb 13 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-3
+- Unbreak Podman's downstream Fedora CI
+
 * Thu Jan 11 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-2
 - Drop 'Recommends: subscription-manager'
 

From feb3e6751a0c511e647016012227e40f34ed2250 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Tue, 27 Feb 2024 16:12:07 +0100
Subject: [PATCH 03/22] Unbreak Podman's downstream Fedora CI (part 2)

... and backport some new upstream tests.

https://bugzilla.redhat.com/show_bug.cgi?id=2263968
---
 ...nbreak-Podman-s-downstream-Fedora-CI.patch | 167 +++-
 toolbox-test-system-new.patch                 | 894 ++++++++++++++++++
 toolbox.spec                                  |  10 +-
 3 files changed, 1066 insertions(+), 5 deletions(-)
 create mode 100644 toolbox-test-system-new.patch

diff --git a/toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch b/toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
index 92cebc8..1956003 100644
--- a/toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
+++ b/toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
@@ -1,7 +1,7 @@
-From 6838e9347199e875f9869acd2afa64688161ca11 Mon Sep 17 00:00:00 2001
+From a859f73d075ec0505994d8ce0f371ec28e466983 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <rishi@fedoraproject.org>
 Date: Tue, 13 Feb 2024 21:56:06 +0100
-Subject: [PATCH] test/system: Unbreak Podman's downstream Fedora CI
+Subject: [PATCH 1/2] test/system: Unbreak Podman's downstream Fedora CI
 
 The paths to bats-assert and bats-support are broken, if bats(1) is
 invoked from any other location than the parent directory of the 'tests'
@@ -30,7 +30,7 @@ https://github.com/containers/toolbox/pull/1448
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/test/system/setup_suite.bash b/test/system/setup_suite.bash
-index 78507d660529..649018f01e96 100644
+index e4edf232bcd8..01985b7f9afc 100644
 --- a/test/system/setup_suite.bash
 +++ b/test/system/setup_suite.bash
 @@ -17,7 +17,7 @@
@@ -45,3 +45,164 @@ index 78507d660529..649018f01e96 100644
 -- 
 2.43.0
 
+
+From a183876eae2bb4ffd84bca4303fc28be6725ebc2 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Fri, 23 Feb 2024 10:38:16 +0100
+Subject: [PATCH 2/2] test/system: Unbreak Podman's downstream Fedora CI (part
+ 2)
+
+The working directory from which bats(1) is invoked might not be part of
+the Toolbx container.  eg., Podman's downstream Fedora CI invokes the
+tests as:
+  $ cd /path/to/toolbox/test/system
+  $ bats .
+
+... and it led to [1]:
+  not ok 110 run: Smoke test with true(1)
+  # (from function `assert_output' in file
+      ./libs/bats-assert/src/assert.bash, line 255,
+  #  in test file ./104-run.bats, line 38)
+  #   `assert_output ""' failed
+  #
+  # -- output differs --
+  # expected (0 lines):
+  #
+  # actual (3 lines):
+  #   Error: crun: chdir to `/usr/share/toolbox/test/system`: No such
+      file or directory: OCI runtime attempted to invoke a command that
+      was not found
+  #   Error: directory /usr/share/toolbox/test/system not found in
+      container fedora-toolbox-41
+  #   Using /home/testuser instead.
+  # --
+  #
+
+[1] https://bugzilla.redhat.com/show_bug.cgi?id=2263968
+
+https://github.com/containers/toolbox/pull/1457
+---
+ test/system/104-run.bats                   | 2 ++
+ test/system/201-ipc.bats                   | 2 ++
+ test/system/203-network.bats               | 2 ++
+ test/system/206-user.bats                  | 2 ++
+ test/system/210-ulimit.bats                | 2 ++
+ test/system/211-dbus.bats                  | 2 ++
+ test/system/220-environment-variables.bats | 2 ++
+ 7 files changed, 14 insertions(+)
+
+diff --git a/test/system/104-run.bats b/test/system/104-run.bats
+index ff11a8477062..a0cb89fdeeca 100644
+--- a/test/system/104-run.bats
++++ b/test/system/104-run.bats
+@@ -23,9 +23,11 @@ setup() {
+   bats_require_minimum_version 1.7.0
+   _setup_environment
+   cleanup_containers
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_containers
+ }
+ 
+diff --git a/test/system/201-ipc.bats b/test/system/201-ipc.bats
+index 15c791dec86d..09200b41d06c 100644
+--- a/test/system/201-ipc.bats
++++ b/test/system/201-ipc.bats
+@@ -23,9 +23,11 @@ setup() {
+   bats_require_minimum_version 1.7.0
+   _setup_environment
+   cleanup_containers
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_containers
+ }
+ 
+diff --git a/test/system/203-network.bats b/test/system/203-network.bats
+index db1ba561f314..012374e3317f 100644
+--- a/test/system/203-network.bats
++++ b/test/system/203-network.bats
+@@ -35,9 +35,11 @@ setup() {
+   bats_require_minimum_version 1.7.0
+   _setup_environment
+   cleanup_containers
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_containers
+ }
+ 
+diff --git a/test/system/206-user.bats b/test/system/206-user.bats
+index 2df7862f259e..473a6b40905a 100644
+--- a/test/system/206-user.bats
++++ b/test/system/206-user.bats
+@@ -23,9 +23,11 @@ setup() {
+   bats_require_minimum_version 1.7.0
+   _setup_environment
+   cleanup_containers
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_containers
+ }
+ 
+diff --git a/test/system/210-ulimit.bats b/test/system/210-ulimit.bats
+index ea0c46685df1..ea08feea1513 100644
+--- a/test/system/210-ulimit.bats
++++ b/test/system/210-ulimit.bats
+@@ -23,9 +23,11 @@ setup() {
+   bats_require_minimum_version 1.7.0
+   _setup_environment
+   cleanup_containers
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_containers
+ }
+ 
+diff --git a/test/system/211-dbus.bats b/test/system/211-dbus.bats
+index 295bb71b2789..61c543a56005 100644
+--- a/test/system/211-dbus.bats
++++ b/test/system/211-dbus.bats
+@@ -23,9 +23,11 @@ setup() {
+   bats_require_minimum_version 1.7.0
+   _setup_environment
+   cleanup_containers
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_containers
+ }
+ 
+diff --git a/test/system/220-environment-variables.bats b/test/system/220-environment-variables.bats
+index 5b51d17dee55..c24e07d146ee 100644
+--- a/test/system/220-environment-variables.bats
++++ b/test/system/220-environment-variables.bats
+@@ -23,9 +23,11 @@ setup() {
+   bats_require_minimum_version 1.7.0
+   _setup_environment
+   cleanup_containers
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_containers
+ }
+ 
+-- 
+2.43.0
+
diff --git a/toolbox-test-system-new.patch b/toolbox-test-system-new.patch
new file mode 100644
index 0000000..9800b15
--- /dev/null
+++ b/toolbox-test-system-new.patch
@@ -0,0 +1,894 @@
+From f51c4a4cd8ff1c51a68073a10eaddab8f16fdaf6 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Thu, 8 Feb 2024 22:18:33 +0100
+Subject: [PATCH 1/4] test/system: Ensure that the user is part of a group with
+ the same name
+
+https://github.com/containers/toolbox/pull/1447
+---
+ test/system/206-user.bats | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/test/system/206-user.bats b/test/system/206-user.bats
+index c295d8a61f39..cdd38c146024 100644
+--- a/test/system/206-user.bats
++++ b/test/system/206-user.bats
+@@ -434,6 +434,7 @@ teardown() {
+   run --keep-empty-lines --separate-stderr "$TOOLBOX" run cat /etc/group
+ 
+   assert_success
++  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
+   assert_line --regexp "^(sudo|wheel):x:[[:digit:]]+:$USER$"
+   assert [ ${#lines[@]} -gt 1 ]
+ 
+@@ -447,6 +448,7 @@ teardown() {
+   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch cat /etc/group
+ 
+   assert_success
++  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
+   assert_line --regexp "^wheel:x:[[:digit:]]+:$USER$"
+   assert [ ${#lines[@]} -gt 1 ]
+ 
+@@ -460,6 +462,7 @@ teardown() {
+   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 cat /etc/group
+ 
+   assert_success
++  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
+   assert_line --regexp "^wheel:x:[[:digit:]]+:$USER$"
+   assert [ ${#lines[@]} -gt 1 ]
+ 
+@@ -473,6 +476,7 @@ teardown() {
+   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 cat /etc/group
+ 
+   assert_success
++  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
+   assert_line --regexp "^wheel:x:[[:digit:]]+:$USER$"
+   assert [ ${#lines[@]} -gt 1 ]
+ 
+@@ -486,6 +490,7 @@ teardown() {
+   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 cat /etc/group
+ 
+   assert_success
++  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
+   assert_line --regexp "^sudo:x:[[:digit:]]+:$USER$"
+   assert [ ${#lines[@]} -gt 1 ]
+ 
+@@ -499,6 +504,7 @@ teardown() {
+   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 cat /etc/group
+ 
+   assert_success
++  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
+   assert_line --regexp "^sudo:x:[[:digit:]]+:$USER$"
+   assert [ ${#lines[@]} -gt 1 ]
+ 
+@@ -512,6 +518,7 @@ teardown() {
+   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 cat /etc/group
+ 
+   assert_success
++  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
+   assert_line --regexp "^sudo:x:[[:digit:]]+:$USER$"
+   assert [ ${#lines[@]} -gt 1 ]
+ 
+-- 
+2.43.0
+
+
+From b2d64fad1a23a07919efdb70de9247645e44f973 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Thu, 8 Feb 2024 22:51:43 +0100
+Subject: [PATCH 2/4] test/system: Ensure that process started by 'podman exec'
+ has all groups
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 15173f8c25c81244 exposed a bug in crun(1) [1] where the process
+started directly by 'podman exec --user ...' inside the Toolbx container
+would not have the supplementary groups attached to the user by the
+entry point.
+
+This could be observed by differences in id(1):
+  ⬢$ id
+  uid=1000(user) gid=1000(user) groups=1000(user)
+  ⬢$ id user
+  uid=1000(user) gid=1000(user) groups=1000(user),10(wheel)
+
+... and could be worked around by starting a new session with sudo(8).
+
+[1] crun commit 9effaebb429a1aed
+    https://github.com/containers/crun/commit/9effaebb429a1aed
+    https://github.com/containers/crun/issues/644
+    https://github.com/containers/podman/issues/9986
+
+https://github.com/containers/toolbox/issues/608
+---
+ test/system/206-user.bats | 231 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 231 insertions(+)
+
+diff --git a/test/system/206-user.bats b/test/system/206-user.bats
+index cdd38c146024..2df7862f259e 100644
+--- a/test/system/206-user.bats
++++ b/test/system/206-user.bats
+@@ -525,3 +525,234 @@ teardown() {
+   # shellcheck disable=SC2154
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
++
++@test "user: id(1) for $USER inside the default container" {
++  create_default_container
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run id
++
++  assert_success
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  local output_id="${lines[0]}"
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run id "$USER"
++
++  assert_success
++  assert_line --index 0 "$output_id"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "user: id(1) for $USER inside Arch Linux" {
++  create_distro_container arch latest arch-toolbox-latest
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch id
++
++  assert_success
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  local output_id="${lines[0]}"
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch id "$USER"
++
++  assert_success
++  assert_line --index 0 "$output_id"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "user: id(1) for $USER inside Fedora 34" {
++  create_distro_container fedora 34 fedora-toolbox-34
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 id
++
++  assert_success
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  local output_id="${lines[0]}"
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 id "$USER"
++
++  assert_success
++  assert_line --index 0 "$output_id"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "user: id(1) for $USER inside RHEL 8.7" {
++  create_distro_container rhel 8.7 rhel-toolbox-8.7
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 id
++
++  assert_success
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  local output_id="${lines[0]}"
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 id "$USER"
++
++  assert_success
++  assert_line --index 0 "$output_id"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "user: id(1) for $USER inside Ubuntu 16.04" {
++  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 id
++
++  assert_success
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  local output_id="${lines[0]}"
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 id "$USER"
++
++  assert_success
++  assert_line --index 0 "$output_id"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "user: id(1) for $USER inside Ubuntu 18.04" {
++  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 id
++
++  assert_success
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  local output_id="${lines[0]}"
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 id "$USER"
++
++  assert_success
++  assert_line --index 0 "$output_id"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "user: id(1) for $USER inside Ubuntu 20.04" {
++  create_distro_container ubuntu 20.04 ubuntu-toolbox-20.04
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 id
++
++  assert_success
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  local output_id="${lines[0]}"
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 id "$USER"
++
++  assert_success
++  assert_line --index 0 "$output_id"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  # shellcheck disable=SC2154
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
+-- 
+2.43.0
+
+
+From da2555d04f9ff677b3f2033ff36390f75c3a509d Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Thu, 18 Jan 2024 19:53:02 +0100
+Subject: [PATCH 3/4] test/system: Group by higher-level objective, not
+ distribution
+
+Fallout from 51ffd2793d882ffab45ace44c03edfdaeb3f138c
+
+https://github.com/containers/toolbox/pull/1436
+---
+ test/system/220-environment-variables.bats | 152 ++++++++++-----------
+ 1 file changed, 76 insertions(+), 76 deletions(-)
+
+diff --git a/test/system/220-environment-variables.bats b/test/system/220-environment-variables.bats
+index 0e1356654468..dd74b1dc5142 100644
+--- a/test/system/220-environment-variables.bats
++++ b/test/system/220-environment-variables.bats
+@@ -1,6 +1,6 @@
+ # shellcheck shell=bats
+ #
+-# Copyright © 2023 Red Hat, Inc.
++# Copyright © 2023 – 2024 Red Hat, Inc.
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+@@ -57,25 +57,24 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTSIZE inside the default container" {
+-  skip "https://pagure.io/setup/pull-request/48"
+-
+-  create_default_container
++@test "environment variables: HISTFILESIZE inside Arch Linux" {
++  create_distro_container arch latest arch-toolbox-latest
+ 
+-  if [ "$HISTSIZE" = "" ]; then
++  # shellcheck disable=SC2031
++  if [ "$HISTFILESIZE" = "" ]; then
+     # shellcheck disable=SC2030
+-    HISTSIZE=1001
++    HISTFILESIZE=1001
+   else
+-    ((HISTSIZE++))
++    ((HISTFILESIZE++))
+   fi
+ 
+-  export HISTSIZE
++  export HISTFILESIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run bash -c 'echo "$HISTSIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch bash -c 'echo "$HISTFILESIZE"'
+ 
+   assert_success
+-  assert_line --index 0 "$HISTSIZE"
++  assert_line --index 0 "$HISTFILESIZE"
+ 
+   if check_bats_version 1.10.0; then
+     assert [ ${#lines[@]} -eq 1 ]
+@@ -87,8 +86,8 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTFILESIZE inside Arch Linux" {
+-  create_distro_container arch latest arch-toolbox-latest
++@test "environment variables: HISTFILESIZE inside Fedora 34" {
++  create_distro_container fedora 34 fedora-toolbox-34
+ 
+   # shellcheck disable=SC2031
+   if [ "$HISTFILESIZE" = "" ]; then
+@@ -101,7 +100,7 @@ teardown() {
+   export HISTFILESIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch bash -c 'echo "$HISTFILESIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 bash -c 'echo "$HISTFILESIZE"'
+ 
+   assert_success
+   assert_line --index 0 "$HISTFILESIZE"
+@@ -116,24 +115,24 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTSIZE inside Arch Linux" {
+-  create_distro_container arch latest arch-toolbox-latest
++@test "environment variables: HISTFILESIZE inside RHEL 8.7" {
++  create_distro_container rhel 8.7 rhel-toolbox-8.7
+ 
+   # shellcheck disable=SC2031
+-  if [ "$HISTSIZE" = "" ]; then
++  if [ "$HISTFILESIZE" = "" ]; then
+     # shellcheck disable=SC2030
+-    HISTSIZE=1001
++    HISTFILESIZE=1001
+   else
+-    ((HISTSIZE++))
++    ((HISTFILESIZE++))
+   fi
+ 
+-  export HISTSIZE
++  export HISTFILESIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch bash -c 'echo "$HISTSIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 bash -c 'echo "$HISTFILESIZE"'
+ 
+   assert_success
+-  assert_line --index 0 "$HISTSIZE"
++  assert_line --index 0 "$HISTFILESIZE"
+ 
+   if check_bats_version 1.10.0; then
+     assert [ ${#lines[@]} -eq 1 ]
+@@ -145,8 +144,8 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTFILESIZE inside Fedora 34" {
+-  create_distro_container fedora 34 fedora-toolbox-34
++@test "environment variables: HISTFILESIZE inside Ubuntu 16.04" {
++  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
+ 
+   # shellcheck disable=SC2031
+   if [ "$HISTFILESIZE" = "" ]; then
+@@ -159,7 +158,8 @@ teardown() {
+   export HISTFILESIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 bash -c 'echo "$HISTFILESIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 \
++                                             bash -c 'echo "$HISTFILESIZE"'
+ 
+   assert_success
+   assert_line --index 0 "$HISTFILESIZE"
+@@ -174,26 +174,25 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTSIZE inside Fedora 34" {
+-  skip "https://pagure.io/setup/pull-request/48"
+-
+-  create_distro_container fedora 34 fedora-toolbox-34
++@test "environment variables: HISTFILESIZE inside Ubuntu 18.04" {
++  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
+ 
+   # shellcheck disable=SC2031
+-  if [ "$HISTSIZE" = "" ]; then
++  if [ "$HISTFILESIZE" = "" ]; then
+     # shellcheck disable=SC2030
+-    HISTSIZE=1001
++    HISTFILESIZE=1001
+   else
+-    ((HISTSIZE++))
++    ((HISTFILESIZE++))
+   fi
+ 
+-  export HISTSIZE
++  export HISTFILESIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 bash -c 'echo "$HISTSIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 \
++                                             bash -c 'echo "$HISTFILESIZE"'
+ 
+   assert_success
+-  assert_line --index 0 "$HISTSIZE"
++  assert_line --index 0 "$HISTFILESIZE"
+ 
+   if check_bats_version 1.10.0; then
+     assert [ ${#lines[@]} -eq 1 ]
+@@ -205,12 +204,11 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTFILESIZE inside RHEL 8.7" {
+-  create_distro_container rhel 8.7 rhel-toolbox-8.7
++@test "environment variables: HISTFILESIZE inside Ubuntu 20.04" {
++  create_distro_container ubuntu 20.04 ubuntu-toolbox-20.04
+ 
+   # shellcheck disable=SC2031
+   if [ "$HISTFILESIZE" = "" ]; then
+-    # shellcheck disable=SC2030
+     HISTFILESIZE=1001
+   else
+     ((HISTFILESIZE++))
+@@ -219,7 +217,8 @@ teardown() {
+   export HISTFILESIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 bash -c 'echo "$HISTFILESIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 \
++                                             bash -c 'echo "$HISTFILESIZE"'
+ 
+   assert_success
+   assert_line --index 0 "$HISTFILESIZE"
+@@ -234,12 +233,11 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTSIZE inside RHEL 8.7" {
++@test "environment variables: HISTSIZE inside the default container" {
+   skip "https://pagure.io/setup/pull-request/48"
+ 
+-  create_distro_container rhel 8.7 rhel-toolbox-8.7
++  create_default_container
+ 
+-  # shellcheck disable=SC2031
+   if [ "$HISTSIZE" = "" ]; then
+     # shellcheck disable=SC2030
+     HISTSIZE=1001
+@@ -250,7 +248,7 @@ teardown() {
+   export HISTSIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 bash -c 'echo "$HISTSIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run bash -c 'echo "$HISTSIZE"'
+ 
+   assert_success
+   assert_line --index 0 "$HISTSIZE"
+@@ -265,25 +263,24 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTFILESIZE inside Ubuntu 16.04" {
+-  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
++@test "environment variables: HISTSIZE inside Arch Linux" {
++  create_distro_container arch latest arch-toolbox-latest
+ 
+   # shellcheck disable=SC2031
+-  if [ "$HISTFILESIZE" = "" ]; then
++  if [ "$HISTSIZE" = "" ]; then
+     # shellcheck disable=SC2030
+-    HISTFILESIZE=1001
++    HISTSIZE=1001
+   else
+-    ((HISTFILESIZE++))
++    ((HISTSIZE++))
+   fi
+ 
+-  export HISTFILESIZE
++  export HISTSIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 \
+-                                             bash -c 'echo "$HISTFILESIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch bash -c 'echo "$HISTSIZE"'
+ 
+   assert_success
+-  assert_line --index 0 "$HISTFILESIZE"
++  assert_line --index 0 "$HISTSIZE"
+ 
+   if check_bats_version 1.10.0; then
+     assert [ ${#lines[@]} -eq 1 ]
+@@ -295,8 +292,10 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTSIZE inside Ubuntu 16.04" {
+-  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
++@test "environment variables: HISTSIZE inside Fedora 34" {
++  skip "https://pagure.io/setup/pull-request/48"
++
++  create_distro_container fedora 34 fedora-toolbox-34
+ 
+   # shellcheck disable=SC2031
+   if [ "$HISTSIZE" = "" ]; then
+@@ -309,7 +308,7 @@ teardown() {
+   export HISTSIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 bash -c 'echo "$HISTSIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 bash -c 'echo "$HISTSIZE"'
+ 
+   assert_success
+   assert_line --index 0 "$HISTSIZE"
+@@ -324,25 +323,26 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTFILESIZE inside Ubuntu 18.04" {
+-  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
++@test "environment variables: HISTSIZE inside RHEL 8.7" {
++  skip "https://pagure.io/setup/pull-request/48"
++
++  create_distro_container rhel 8.7 rhel-toolbox-8.7
+ 
+   # shellcheck disable=SC2031
+-  if [ "$HISTFILESIZE" = "" ]; then
++  if [ "$HISTSIZE" = "" ]; then
+     # shellcheck disable=SC2030
+-    HISTFILESIZE=1001
++    HISTSIZE=1001
+   else
+-    ((HISTFILESIZE++))
++    ((HISTSIZE++))
+   fi
+ 
+-  export HISTFILESIZE
++  export HISTSIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 \
+-                                             bash -c 'echo "$HISTFILESIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 bash -c 'echo "$HISTSIZE"'
+ 
+   assert_success
+-  assert_line --index 0 "$HISTFILESIZE"
++  assert_line --index 0 "$HISTSIZE"
+ 
+   if check_bats_version 1.10.0; then
+     assert [ ${#lines[@]} -eq 1 ]
+@@ -354,8 +354,8 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTSIZE inside Ubuntu 18.04" {
+-  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
++@test "environment variables: HISTSIZE inside Ubuntu 16.04" {
++  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
+ 
+   # shellcheck disable=SC2031
+   if [ "$HISTSIZE" = "" ]; then
+@@ -368,7 +368,7 @@ teardown() {
+   export HISTSIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 bash -c 'echo "$HISTSIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 bash -c 'echo "$HISTSIZE"'
+ 
+   assert_success
+   assert_line --index 0 "$HISTSIZE"
+@@ -383,24 +383,24 @@ teardown() {
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
+ 
+-@test "environment variables: HISTFILESIZE inside Ubuntu 20.04" {
+-  create_distro_container ubuntu 20.04 ubuntu-toolbox-20.04
++@test "environment variables: HISTSIZE inside Ubuntu 18.04" {
++  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
+ 
+   # shellcheck disable=SC2031
+-  if [ "$HISTFILESIZE" = "" ]; then
+-    HISTFILESIZE=1001
++  if [ "$HISTSIZE" = "" ]; then
++    # shellcheck disable=SC2030
++    HISTSIZE=1001
+   else
+-    ((HISTFILESIZE++))
++    ((HISTSIZE++))
+   fi
+ 
+-  export HISTFILESIZE
++  export HISTSIZE
+ 
+   # shellcheck disable=SC2016
+-  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 \
+-                                             bash -c 'echo "$HISTFILESIZE"'
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 bash -c 'echo "$HISTSIZE"'
+ 
+   assert_success
+-  assert_line --index 0 "$HISTFILESIZE"
++  assert_line --index 0 "$HISTSIZE"
+ 
+   if check_bats_version 1.10.0; then
+     assert [ ${#lines[@]} -eq 1 ]
+-- 
+2.43.0
+
+
+From ee2c92299d5488bab4e54cb04d9a120e0b9ed405 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Thu, 18 Jan 2024 20:17:50 +0100
+Subject: [PATCH 4/4] test/system: Test that the HOSTNAME environment variable
+ is set
+
+Bash automatically sets the HOSTNAME environment variable to the name of
+the current host [1] as returned by gethostname(2), which is the same as
+hostname(1).
+
+However, on Fedora, from Fedora 33 onwards, /etc/profile sets the
+HOSTNAME environment variable to 'hostnamectl --transient' [2], and,
+from Fedora 35 onwards, it has a fallback to hostname(1) [3].  These two
+approaches return different values when used inside a Toolbx container.
+The former picks up the hostname of the host operating system, while the
+fallback gets the name that was set when creating the container with
+'podman create --hostname toolbox ...'.
+
+Hence, the value of HOSTNAME inside a Toolbx container for Fedora
+depends on whether the corresponding version of the fedora-toolbox image
+contained hostnamectl(1) or not.
+
+[1] https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html
+
+[2] setup commit eb9cc4dce89be24f
+    https://pagure.io/setup/c/eb9cc4dce89be24f
+    https://bugzilla.redhat.com/show_bug.cgi?id=1745245
+
+[3] setup commit ddd74b5d971a734c
+    https://pagure.io/setup/c/ddd74b5d971a734c
+    https://pagure.io/setup/pull-request/28
+    https://bugzilla.redhat.com/show_bug.cgi?id=1938223
+
+https://github.com/containers/toolbox/issues/558
+---
+ test/system/220-environment-variables.bats | 126 +++++++++++++++++++++
+ 1 file changed, 126 insertions(+)
+
+diff --git a/test/system/220-environment-variables.bats b/test/system/220-environment-variables.bats
+index dd74b1dc5142..5b51d17dee55 100644
+--- a/test/system/220-environment-variables.bats
++++ b/test/system/220-environment-variables.bats
+@@ -439,3 +439,129 @@ teardown() {
+   # shellcheck disable=SC2154
+   assert [ ${#stderr_lines[@]} -eq 0 ]
+ }
++
++@test "environment variables: HOSTNAME inside the default container" {
++  create_default_container
++
++  # shellcheck disable=SC2016
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run bash -c 'echo "$HOSTNAME"'
++
++  assert_success
++  assert_line --index 0 --regexp "^(toolbox|$HOSTNAME)$"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "environment variables: HOSTNAME inside Arch Linux" {
++  create_distro_container arch latest arch-toolbox-latest
++
++  # shellcheck disable=SC2016
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch bash -c 'echo "$HOSTNAME"'
++
++  assert_success
++  assert_line --index 0 "toolbox"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "environment variables: HOSTNAME inside Fedora 34" {
++  create_distro_container fedora 34 fedora-toolbox-34
++
++  # shellcheck disable=SC2016
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 bash -c 'echo "$HOSTNAME"'
++
++  assert_success
++  assert_line --index 0 "$HOSTNAME"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "environment variables: HOSTNAME inside RHEL 8.7" {
++  create_distro_container rhel 8.7 rhel-toolbox-8.7
++
++  # shellcheck disable=SC2016
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 bash -c 'echo "$HOSTNAME"'
++
++  assert_success
++  assert_line --index 0 "toolbox"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "environment variables: HOSTNAME inside Ubuntu 16.04" {
++  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
++
++  # shellcheck disable=SC2016
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 bash -c 'echo "$HOSTNAME"'
++
++  assert_success
++  assert_line --index 0 "toolbox"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "environment variables: HOSTNAME inside Ubuntu 18.04" {
++  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
++
++  # shellcheck disable=SC2016
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 bash -c 'echo "$HOSTNAME"'
++
++  assert_success
++  assert_line --index 0 "toolbox"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
++
++@test "environment variables: HOSTNAME inside Ubuntu 20.04" {
++  create_distro_container ubuntu 20.04 ubuntu-toolbox-20.04
++
++  # shellcheck disable=SC2016
++  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 bash -c 'echo "$HOSTNAME"'
++
++  assert_success
++  assert_line --index 0 "toolbox"
++
++  if check_bats_version 1.10.0; then
++    assert [ ${#lines[@]} -eq 1 ]
++  else
++    assert [ ${#lines[@]} -eq 2 ]
++  fi
++
++  assert [ ${#stderr_lines[@]} -eq 0 ]
++}
+-- 
+2.43.0
+
diff --git a/toolbox.spec b/toolbox.spec
index 853af43..b403a74 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -17,7 +17,7 @@ Version:       0.0.99.5
 %endif
 %endif
 
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -28,7 +28,8 @@ Source0:       https://github.com/containers/%{name}/releases/download/%{version
 Source1:       %{name}.conf
 
 # Upstream
-Patch0:        toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
+Patch0:        toolbox-test-system-new.patch
+Patch1:        toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
 
 # Fedora specific
 Patch100:      toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
@@ -186,6 +187,7 @@ The %{name}-tests package contains system tests for %{name}.
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 %if 0%{?fedora}
 %ifnarch ppc64
@@ -270,6 +272,10 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Tue Feb 27 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-4
+- Unbreak Podman's downstream Fedora CI (part 2)
+- Backport some new upstream tests
+
 * Tue Feb 13 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-3
 - Unbreak Podman's downstream Fedora CI
 

From fcbff7757186284c9316753fc971ba02bc55a86d Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Tue, 5 Mar 2024 19:19:26 +0100
Subject: [PATCH 04/22] Conditionalize the BuildRequires on golang

The OpenSSL FIPS patches in Fedora ELN's golang makes it lag behind its
Fedora counterpart at times.

Spotted by Yaakov Selkowitz.

https://src.fedoraproject.org/rpms/toolbox/pull-request/18
---
 toolbox.spec | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/toolbox.spec b/toolbox.spec
index b403a74..93ae76c 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -17,7 +17,13 @@ Version:       0.0.99.5
 %endif
 %endif
 
-Release:       4%{?dist}
+%global toolbx_go 1.20
+
+%if 0%{?fedora}
+%global toolbx_go 1.20
+%endif
+
+Release:       5%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -42,7 +48,7 @@ Patch202:      toolbox-Add-migration-paths-for-coreos-toolbox-users.patch
 
 BuildRequires: gcc
 BuildRequires: go-md2man
-BuildRequires: golang >= 1.20
+BuildRequires: golang >= %{toolbx_go}
 BuildRequires: meson >= 0.58.0
 BuildRequires: pkgconfig(bash-completion)
 BuildRequires: shadow-utils-subid-devel
@@ -272,6 +278,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Tue Mar 05 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-5
+- Conditionalize the BuildRequires on golang
+
 * Tue Feb 27 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-4
 - Unbreak Podman's downstream Fedora CI (part 2)
 - Backport some new upstream tests

From a51b5aa3597ac2b2d1befb48acb7adf63bdb990d Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Tue, 26 Mar 2024 18:06:02 +0100
Subject: [PATCH 05/22] Specify the golang versions for RHEL 9 and 10

---
 toolbox.spec | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/toolbox.spec b/toolbox.spec
index 93ae76c..8bd877b 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -23,7 +23,15 @@ Version:       0.0.99.5
 %global toolbx_go 1.20
 %endif
 
-Release:       5%{?dist}
+%if 0%{?rhel}
+%if 0%{?rhel} == 9
+%global toolbx_go 1.21.7
+%elif 0%{?rhel} == 10
+%global toolbx_go 1.21.3
+%endif
+%endif
+
+Release:       6%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -278,6 +286,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Tue Mar 26 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-6
+- Specify the golang versions for RHEL 9 and 10
+
 * Tue Mar 05 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-5
 - Conditionalize the BuildRequires on golang
 

From caf8efb8ce9601e8e9c9016ff4247b6e461c5765 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Thu, 30 Nov 2023 22:17:17 +0100
Subject: [PATCH 06/22] Silence 'rpminspect --tests=annocheck' (part 2)

In recent times, 'rpminspect --tests=annocheck', run by the Fedora CI,
has been failing because of the intentional DT_RPATH or DT_RUNPATH value
of /run/host%{_libdir} that's present in %{_bindir}/toolbox [1].  It's
not clear if they started failing again only recently due to changes in
rpminspect(1), or if the previous attempt at silencing it was broken and
never actually worked [2].

[1] Upstream commit 6063eb27b9893994
    https://github.com/containers/toolbox/commit/6063eb27b9893994
    https://github.com/containers/toolbox/issues/821

[2] Commit 12fabacd032f5c58

https://github.com/rpminspect/rpminspect/issues/1296
---
 rpminspect.yaml | 3 ++-
 toolbox.spec    | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rpminspect.yaml b/rpminspect.yaml
index 924e431..c7177c4 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -4,7 +4,8 @@
 ---
 
 annocheck:
-    - hardened: --ignore-unknown --verbose --skip-run-path
+    extra_opts:
+        hardened: --skip-run-path
 
 runpath:
     allowed_paths:
diff --git a/toolbox.spec b/toolbox.spec
index 8bd877b..176a848 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -31,7 +31,7 @@ Version:       0.0.99.5
 %endif
 %endif
 
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -286,6 +286,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Thu Jul 11 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-7
+- Silence 'rpminspect --tests=annocheck' (part 2)
+
 * Tue Mar 26 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-6
 - Specify the golang versions for RHEL 9 and 10
 

From cf17ca0efd04444aab4099df46a613606a0f69a8 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Thu, 11 Jul 2024 10:42:44 +0200
Subject: [PATCH 07/22] Silence 'rpminspect --tests=stack-prot'

The stack-prot test [1] currently fails with:
  Hardened: /usr/bin/toolbox: FAIL: stack-prot test because stack
      protection not enabled (lto:_cgo_6f668e16310a_Cfunc_mygetgrnam_r)

According to the documentation [1], the test is supposed to pass if the
C compiler is GCC and it was used with the -fstack-protector-strong
option.  That's definitely the case, since Fedora uses GCC by default,
and its default build flags (including %optflags) include
-fstack-protector-strong.

There's also no function called mygetgrnam() in neither Toolbx nor its
chain of dependencies.

Therefore, temporarily disable the stack-prot test to prevent the Fedora
CI from failing.

[1] https://sourceware.org/annobin/annobin.html/Test-stack-prot.html
---
 rpminspect.yaml | 2 +-
 toolbox.spec    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/rpminspect.yaml b/rpminspect.yaml
index c7177c4..ab3e59b 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -5,7 +5,7 @@
 
 annocheck:
     extra_opts:
-        hardened: --skip-run-path
+        hardened: --skip-run-path --skip-stack-prot
 
 runpath:
     allowed_paths:
diff --git a/toolbox.spec b/toolbox.spec
index 176a848..3047ac0 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -31,7 +31,7 @@ Version:       0.0.99.5
 %endif
 %endif
 
-Release:       7%{?dist}
+Release:       8%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -286,6 +286,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Thu Jul 11 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-8
+- Silence 'rpminspect --tests=stack-prot'
+
 * Thu Jul 11 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-7
 - Silence 'rpminspect --tests=annocheck' (part 2)
 

From 7745c27d4cbd5f51ba6bcb7ab9d5ef8563be58fc Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 26 Jul 2024 13:05:47 -0700
Subject: [PATCH 08/22] tests: Don't use undefined variable

The test.environment variable was removed from the variables defined in
tests.yml in commit 1b207227f3981193, but it's still used, which causes
Ansible to break:
  The task includes an option with an undefined variable. The error was:
  'dict object' has no attribute 'environment'. 'dict object' has no
  attribute 'environment'

https://src.fedoraproject.org/rpms/toolbox/pull-request/19
---
 tests/roles/run_bats_tests/tasks/run_one_test.yml | 3 +--
 toolbox.spec                                      | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/roles/run_bats_tests/tasks/run_one_test.yml b/tests/roles/run_bats_tests/tasks/run_one_test.yml
index b44ed42..a58477d 100644
--- a/tests/roles/run_bats_tests/tasks/run_one_test.yml
+++ b/tests/roles/run_bats_tests/tasks/run_one_test.yml
@@ -15,7 +15,6 @@
     local_environment:
       TEST_NAME:    "{{ test.name }}"
       TEST_PACKAGE: "{{ test.package }}"
-      TEST_ENV:     "{{ test.environment }}"
 
 - name: "{{ test.name }} | setup/teardown helper | see if exists"
   local_action: stat path={{ role_path }}/files/helper.{{ test_name_oneword }}.sh
@@ -31,7 +30,7 @@
     chdir: /usr/share/{{ test.package }}/test/system
   become: "{{ true if test.become is defined else false }}"
   become_user: testuser
-  environment: "{{ local_environment | combine(test.environment) }}"
+  environment: "{{ local_environment }}"
 
 - name: "{{ test.name }} | pull logs"
   fetch:
diff --git a/toolbox.spec b/toolbox.spec
index 3047ac0..f3003bc 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -31,7 +31,7 @@ Version:       0.0.99.5
 %endif
 %endif
 
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -286,6 +286,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Fri Jul 26 2024 Adam Williamson <awilliam@redhat.com> - 0.0.99.5-9
+- Fix CI test (hopefully)
+
 * Thu Jul 11 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-8
 - Silence 'rpminspect --tests=stack-prot'
 

From 8d5ce9d5d3d3edc77c1fd7dd40064b5c2bed403c Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 29 Jul 2024 14:38:34 -0700
Subject: [PATCH 09/22] tests: Avoid running out of storage space

Toolbx's system tests download several images when setting up the test
suite, and cache them for later use by the tests [1].  This saves time
and avoids hitting rate limits imposed by OCI registries by not
downloading the same images repeatedly for several tests, but at the
cost of increased use of storage space to cache the images.

The images are cached under BATS_TMPDIR.  It defaults to the TMPDIR
environment variable, and if that's not set then to /tmp [2].  Normally,
TMPDIR isn't set, and the images end up getting cached under /tmp.  Now,
/tmp is typically on tmpfs backed by RAM or swap, which means that it
should be used for smaller size-bounded files only, and /var/tmp should
be used for everything else [3].

The images are big enough that a collection of them can't be described
as smaller and size-bounded, and it led to:
  1..306
  # test suite: Set up
  # test suite: Tear down
  not ok 1 setup_suite
  # (from function `setup_suite' in test file ./setup_suite.bash, line
      55)
  #   `_pull_and_cache_distro_image fedora "$((system_version-1))" ||
      false' failed
  # Failed to cache image registry.fedoraproject.org/fedora-toolbox:40
      to /tmp/bats-run-IPz4Cn/image-cache/fedora-toolbox-40
  # time="2024-02-19T11:41:43Z" level=fatal msg="copying system image
      from manifest list: writing blob: write
      /tmp/bats-run-IPz4Cn/image-cache/fedora-toolbox-40/dir-put-blob607392514:
      no space left on device"
  # bats warning: Executed 1 instead of expected 306 tests

So, change the default location of the BATS_TMPDIR environment variable
to /var/tmp by setting TMPDIR.

[1] Toolbx commit 50683c9d9a78adc9
    https://github.com/containers/toolbox/commit/50683c9d9a78adc9
    https://github.com/containers/toolbox/pull/375

[2] https://bats-core.readthedocs.io/en/stable/writing-tests.html

[3] https://systemd.io/TEMPORARY_DIRECTORIES/

https://src.fedoraproject.org/rpms/toolbox/pull-request/20

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 tests/roles/run_bats_tests/tasks/run_one_test.yml | 1 +
 toolbox.spec                                      | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/roles/run_bats_tests/tasks/run_one_test.yml b/tests/roles/run_bats_tests/tasks/run_one_test.yml
index a58477d..bf45754 100644
--- a/tests/roles/run_bats_tests/tasks/run_one_test.yml
+++ b/tests/roles/run_bats_tests/tasks/run_one_test.yml
@@ -15,6 +15,7 @@
     local_environment:
       TEST_NAME:    "{{ test.name }}"
       TEST_PACKAGE: "{{ test.package }}"
+      TMPDIR:       "/var/tmp"
 
 - name: "{{ test.name }} | setup/teardown helper | see if exists"
   local_action: stat path={{ role_path }}/files/helper.{{ test_name_oneword }}.sh
diff --git a/toolbox.spec b/toolbox.spec
index f3003bc..6f15e6a 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -31,7 +31,7 @@ Version:       0.0.99.5
 %endif
 %endif
 
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -286,6 +286,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Wed Jul 31 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-10
+- Avoid running out of storage space when running the tests
+
 * Fri Jul 26 2024 Adam Williamson <awilliam@redhat.com> - 0.0.99.5-9
 - Fix CI test (hopefully)
 

From 8a767d27aee23cee4d9a93a2b7247e25ef84e82d Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Thu, 8 Aug 2024 17:45:54 +0200
Subject: [PATCH 10/22] tests: Silence deprecation warning

Otherwise, Ansible in Fedora CI would complain:
  # STDERR:
  ---v---v---v---v---v---
  [DEPRECATION WARNING]: "include" is deprecated, use
  include_tasks/import_tasks instead.  See
  https://docs.ansible.com/ansible-core/2.14/user_guide/playbooks_reuse_includes.html
  for details.  This feature will be removed in version 2.16.
  Deprecation warnings can be disabled by setting
  deprecation_warnings=False in ansible.cfg.

https://src.fedoraproject.org/rpms/toolbox/pull-request/21
---
 tests/roles/run_bats_tests/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/roles/run_bats_tests/tasks/main.yml b/tests/roles/run_bats_tests/tasks/main.yml
index da79a4c..adc72f2 100644
--- a/tests/roles/run_bats_tests/tasks/main.yml
+++ b/tests/roles/run_bats_tests/tasks/main.yml
@@ -4,7 +4,7 @@
   copy: dest=/tmp/test.log content='' force=yes mode=0666
 
 - name: execute tests
-  include: run_one_test.yml
+  include_tasks: run_one_test.yml
   with_items: "{{ tests }}"
   loop_control:
     loop_var: test

From 894d0b7b6ddb7dff59c5ec2979964dc000ca4154 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Fri, 9 Aug 2024 18:46:57 +0200
Subject: [PATCH 11/22] Unify the build with RHEL

There's no need to do a build just for this.
---
 toolbox.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolbox.spec b/toolbox.spec
index 6f15e6a..cf18cf8 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -25,9 +25,9 @@ Version:       0.0.99.5
 
 %if 0%{?rhel}
 %if 0%{?rhel} == 9
-%global toolbx_go 1.21.7
+%global toolbx_go 1.22.5
 %elif 0%{?rhel} == 10
-%global toolbx_go 1.21.3
+%global toolbx_go 1.22.5
 %endif
 %endif
 

From 2c1d60d3358a8e0b747caebe6954d7c28fbe9e98 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Mon, 30 Sep 2024 15:37:33 +0200
Subject: [PATCH 12/22] Update to 0.0.99.6

Start using the golang-ipath(...) virtual Provides for BuildRequires
because they use the top-level import paths and are closer to what is
listed in the upstream go.mod.  The golang(...) virtual Provides mention
each individual Go package within a Go module, and bigger modules can
have several packages in them.  It is noisy and tedious to keep up with
the list of packages that are currently in use, by looking at all the Go
source files, and then to list them as BuildRequires.

Update the compiler and linker flags for Fedora by incorporating some of
the changes to the distribution's defaults up to Fedora 39, which is the
oldest supported Fedora.  Switch to using the GO_BUILDTAGS and
GO_LDFLAGS environment variables, because their unprefixed counterparts
have been deprecated [1], and start annotating the toolbox(1) binary
with an ELF note that identifies the RPM for which it was built [2].

However, the change to use the RPM's %{name}, %{version}, %{release} and
the SOURCE_DATE_EPOCH environment variable [3], instead of /dev/urandom,
to generate the build ID annotation for the toolbox(1) binary [4] was
left out.  It will need more work to propagate the RPM's %{name},
%{version} and %{release} to Meson.

Stop carrying the downstream patch for the compiler and linker flags for
PPC64.  The architecture was already discontinued from Fedora 29 [5],
even before the patch was added [6].  It was added purely for the sake
of completeness, and in the last four years since it was introduced, it
hasn't been tested or used.  At this point it's becoming too much of a
maintenance burden, and removing it silences the %ifarch-applied-patch
warning from rpmlint.

Fill in some of the missing Requires for the toolbox-tests sub-package.

[1] go-rpm-macros commit bc7e5cc55c4709e8
    https://pagure.io/go-rpm-macros/c/bc7e5cc55c4709e8

[2] Fedora redhat-rpm-config commit 57edf0cad7b089ed
    https://src.fedoraproject.org/rpms/redhat-rpm-config/c/57edf0cad7b089ed
    https://fedoraproject.org/wiki/Changes/Package_information_on_ELF_objects

[3] https://reproducible-builds.org/docs/source-date-epoch/

[4] go-rpm-macros commit 1980932bf3a21890
    https://pagure.io/go-rpm-macros/c/1980932bf3a21890
    https://fedoraproject.org/wiki/Changes/ReproduciblePackageBuilds

[5] https://fedoraproject.org/wiki/Changes/DiscontinuePPC64

[6] Commit ba60453d216a9226

https://src.fedoraproject.org/rpms/toolbox/pull-request/22
---
 .gitignore                                    |   1 +
 sources                                       |   2 +-
 ...ags-match-Fedora-s-gobuild-for-PPC64.patch |  54 --
 ...e-build-flags-match-Fedora-s-gobuild.patch |  27 +-
 ...nbreak-Podman-s-downstream-Fedora-CI.patch | 208 ----
 toolbox-test-system-new.patch                 | 894 ------------------
 toolbox.spec                                  |  53 +-
 7 files changed, 39 insertions(+), 1200 deletions(-)
 delete mode 100644 toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch
 delete mode 100644 toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
 delete mode 100644 toolbox-test-system-new.patch

diff --git a/.gitignore b/.gitignore
index 6787941..8751077 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /toolbox-0.0.99.3-vendor.tar.xz
 /toolbox-0.0.99.4-vendored.tar.xz
 /toolbox-0.0.99.5-vendored.tar.xz
+/toolbox-0.0.99.6-vendored.tar.xz
diff --git a/sources b/sources
index df91c99..a7670e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (toolbox-0.0.99.5-vendored.tar.xz) = d82666e9abcbac2d01de440dfb8d57801bb97ec0854a9859c64689c47c6a1344b846fb151ffa9371d0a9a2c85c8f61c96cf8f546449ec63c9a44d85ef328b745
+SHA512 (toolbox-0.0.99.6-vendored.tar.xz) = 9ecec200069e8e2536e5ece43d411f9025dba6f60573e7939a0fc26deef29f0297d405a44fd409e978879b0579ab0a79ace97228a199584854c638213fa219d7
diff --git a/toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch b/toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch
deleted file mode 100644
index 35ecc83..0000000
--- a/toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 4f8b443ab925c84d059d894ddcfcf4dcf66a747e Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@fedoraproject.org>
-Date: Mon, 29 Jun 2020 17:57:47 +0200
-Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
- for PPC64
-
-The Go toolchain also doesn't like the LDFLAGS environment variable as
-exported by Fedora's %{meson} RPM macro.
-
-Note that these flags are only meant for the "ppc64" CPU architecture,
-and should be kept updated to match Fedora's Go guidelines. Use
-'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
----
- src/go-build-wrapper | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/go-build-wrapper b/src/go-build-wrapper
-index c572d6dfb02b..cae2de426a96 100755
---- a/src/go-build-wrapper
-+++ b/src/go-build-wrapper
-@@ -33,9 +33,9 @@ if ! cd "$1"; then
-     exit 1
- fi
- 
--tags=""
-+tags="-tags rpm_crashtraceback,${BUILDTAGS:-}"
- if $7; then
--    tags="-tags migration_path_for_coreos_toolbox"
-+    tags="$tags,migration_path_for_coreos_toolbox"
- fi
- 
- if ! libc_dir=$("$5" --print-file-name=libc.so); then
-@@ -70,11 +70,16 @@ fi
- 
- dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basename"
- 
-+unset LDFLAGS
-+
- # shellcheck disable=SC2086
- go build \
-+        -compiler gc \
-         $tags \
--        -trimpath \
--        -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
-+        -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -compressdwarf=false -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
-+        -a \
-+        -v \
-+        -x \
-         -o "$2/$3"
- 
- exit "$?"
--- 
-2.43.0
-
diff --git a/toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch b/toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
index c290d36..27fd99d 100644
--- a/toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
+++ b/toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
@@ -1,20 +1,17 @@
-From 3175ef2fab1f61f5784361070ac338dabda3c04e Mon Sep 17 00:00:00 2001
+From 7dc70160c8ff531473004e879dd57ec303789d71 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <rishi@fedoraproject.org>
 Date: Mon, 29 Jun 2020 17:57:47 +0200
 Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
 
-The Go toolchain doesn't like the LDFLAGS environment variable as
-exported by Fedora's %{meson} RPM macro.
-
 Note that these flags are meant for every CPU architecture other than
 PPC64, and should be kept updated to match Fedora's Go guidelines. Use
 'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
 ---
- src/go-build-wrapper | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
+ src/go-build-wrapper | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/src/go-build-wrapper b/src/go-build-wrapper
-index c572d6dfb02b..0e6a2efa6853 100755
+index a5a1a6a508fb..5978422e9aed 100755
 --- a/src/go-build-wrapper
 +++ b/src/go-build-wrapper
 @@ -33,9 +33,9 @@ if ! cd "$1"; then
@@ -22,27 +19,23 @@ index c572d6dfb02b..0e6a2efa6853 100755
  fi
  
 -tags=""
-+tags="-tags rpm_crashtraceback,${BUILDTAGS:-}"
++tags="-tags rpm_crashtraceback,${GO_BUILDTAGS:-}"
  if $7; then
 -    tags="-tags migration_path_for_coreos_toolbox"
 +    tags="$tags,migration_path_for_coreos_toolbox"
  fi
  
  if ! libc_dir=$("$5" --print-file-name=libc.so); then
-@@ -70,11 +70,17 @@ fi
+@@ -114,9 +114,14 @@ dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basen
  
- dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basename"
- 
-+unset LDFLAGS
-+
  # shellcheck disable=SC2086
  go build \
 +        -buildmode pie \
 +        -compiler gc \
          $tags \
--        -trimpath \
--        -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
-+        -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -compressdwarf=false -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
+         -trimpath \
+-        -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
++        -ldflags "${GO_LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -compressdwarf=false -extldflags '-Wl,-z,relro -Wl,--as-needed -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes -Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
 +        -a \
 +        -v \
 +        -x \
@@ -50,5 +43,5 @@ index c572d6dfb02b..0e6a2efa6853 100755
  
  exit "$?"
 -- 
-2.43.0
+2.46.1
 
diff --git a/toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch b/toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
deleted file mode 100644
index 1956003..0000000
--- a/toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From a859f73d075ec0505994d8ce0f371ec28e466983 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@fedoraproject.org>
-Date: Tue, 13 Feb 2024 21:56:06 +0100
-Subject: [PATCH 1/2] test/system: Unbreak Podman's downstream Fedora CI
-
-The paths to bats-assert and bats-support are broken, if bats(1) is
-invoked from any other location than the parent directory of the 'tests'
-directory.  eg., Podman's downstream Fedora CI invokes the tests as:
-  $ cd /path/to/toolbox/test/system
-  $ bats .
-
-... and it led to [1]:
-  1..306
-  # test suite: Set up
-  # Missing dependencies
-  # Forgot to run 'git submodule init' and 'git submodule update' ?
-  # test suite: Tear down
-  not ok 1 setup_suite
-  # (from function `setup_suite' in test file ./setup_suite.bash, line 33)
-  #   `return 1' failed
-  # bats warning: Executed 1 instead of expected 306 tests
-
-Fallout from 2c0960660330dc6be6861502988695f9812c475a
-
-[1] https://bugzilla.redhat.com/show_bug.cgi?id=2263968
-
-https://github.com/containers/toolbox/pull/1448
----
- test/system/setup_suite.bash | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/system/setup_suite.bash b/test/system/setup_suite.bash
-index e4edf232bcd8..01985b7f9afc 100644
---- a/test/system/setup_suite.bash
-+++ b/test/system/setup_suite.bash
-@@ -17,7 +17,7 @@
- 
- missing_dependencies=false
- 
--if [ -f test/system/libs/bats-assert/load.bash ] && [ -f test/system/libs/bats-support/load.bash ]; then
-+if [ -f "$BATS_TEST_DIRNAME/libs/bats-assert/load.bash" ] && [ -f "$BATS_TEST_DIRNAME/libs/bats-support/load.bash" ]; then
-   load 'libs/helpers'
- else
-   missing_dependencies=true
--- 
-2.43.0
-
-
-From a183876eae2bb4ffd84bca4303fc28be6725ebc2 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@fedoraproject.org>
-Date: Fri, 23 Feb 2024 10:38:16 +0100
-Subject: [PATCH 2/2] test/system: Unbreak Podman's downstream Fedora CI (part
- 2)
-
-The working directory from which bats(1) is invoked might not be part of
-the Toolbx container.  eg., Podman's downstream Fedora CI invokes the
-tests as:
-  $ cd /path/to/toolbox/test/system
-  $ bats .
-
-... and it led to [1]:
-  not ok 110 run: Smoke test with true(1)
-  # (from function `assert_output' in file
-      ./libs/bats-assert/src/assert.bash, line 255,
-  #  in test file ./104-run.bats, line 38)
-  #   `assert_output ""' failed
-  #
-  # -- output differs --
-  # expected (0 lines):
-  #
-  # actual (3 lines):
-  #   Error: crun: chdir to `/usr/share/toolbox/test/system`: No such
-      file or directory: OCI runtime attempted to invoke a command that
-      was not found
-  #   Error: directory /usr/share/toolbox/test/system not found in
-      container fedora-toolbox-41
-  #   Using /home/testuser instead.
-  # --
-  #
-
-[1] https://bugzilla.redhat.com/show_bug.cgi?id=2263968
-
-https://github.com/containers/toolbox/pull/1457
----
- test/system/104-run.bats                   | 2 ++
- test/system/201-ipc.bats                   | 2 ++
- test/system/203-network.bats               | 2 ++
- test/system/206-user.bats                  | 2 ++
- test/system/210-ulimit.bats                | 2 ++
- test/system/211-dbus.bats                  | 2 ++
- test/system/220-environment-variables.bats | 2 ++
- 7 files changed, 14 insertions(+)
-
-diff --git a/test/system/104-run.bats b/test/system/104-run.bats
-index ff11a8477062..a0cb89fdeeca 100644
---- a/test/system/104-run.bats
-+++ b/test/system/104-run.bats
-@@ -23,9 +23,11 @@ setup() {
-   bats_require_minimum_version 1.7.0
-   _setup_environment
-   cleanup_containers
-+  pushd "$HOME" || return 1
- }
- 
- teardown() {
-+  popd || return 1
-   cleanup_containers
- }
- 
-diff --git a/test/system/201-ipc.bats b/test/system/201-ipc.bats
-index 15c791dec86d..09200b41d06c 100644
---- a/test/system/201-ipc.bats
-+++ b/test/system/201-ipc.bats
-@@ -23,9 +23,11 @@ setup() {
-   bats_require_minimum_version 1.7.0
-   _setup_environment
-   cleanup_containers
-+  pushd "$HOME" || return 1
- }
- 
- teardown() {
-+  popd || return 1
-   cleanup_containers
- }
- 
-diff --git a/test/system/203-network.bats b/test/system/203-network.bats
-index db1ba561f314..012374e3317f 100644
---- a/test/system/203-network.bats
-+++ b/test/system/203-network.bats
-@@ -35,9 +35,11 @@ setup() {
-   bats_require_minimum_version 1.7.0
-   _setup_environment
-   cleanup_containers
-+  pushd "$HOME" || return 1
- }
- 
- teardown() {
-+  popd || return 1
-   cleanup_containers
- }
- 
-diff --git a/test/system/206-user.bats b/test/system/206-user.bats
-index 2df7862f259e..473a6b40905a 100644
---- a/test/system/206-user.bats
-+++ b/test/system/206-user.bats
-@@ -23,9 +23,11 @@ setup() {
-   bats_require_minimum_version 1.7.0
-   _setup_environment
-   cleanup_containers
-+  pushd "$HOME" || return 1
- }
- 
- teardown() {
-+  popd || return 1
-   cleanup_containers
- }
- 
-diff --git a/test/system/210-ulimit.bats b/test/system/210-ulimit.bats
-index ea0c46685df1..ea08feea1513 100644
---- a/test/system/210-ulimit.bats
-+++ b/test/system/210-ulimit.bats
-@@ -23,9 +23,11 @@ setup() {
-   bats_require_minimum_version 1.7.0
-   _setup_environment
-   cleanup_containers
-+  pushd "$HOME" || return 1
- }
- 
- teardown() {
-+  popd || return 1
-   cleanup_containers
- }
- 
-diff --git a/test/system/211-dbus.bats b/test/system/211-dbus.bats
-index 295bb71b2789..61c543a56005 100644
---- a/test/system/211-dbus.bats
-+++ b/test/system/211-dbus.bats
-@@ -23,9 +23,11 @@ setup() {
-   bats_require_minimum_version 1.7.0
-   _setup_environment
-   cleanup_containers
-+  pushd "$HOME" || return 1
- }
- 
- teardown() {
-+  popd || return 1
-   cleanup_containers
- }
- 
-diff --git a/test/system/220-environment-variables.bats b/test/system/220-environment-variables.bats
-index 5b51d17dee55..c24e07d146ee 100644
---- a/test/system/220-environment-variables.bats
-+++ b/test/system/220-environment-variables.bats
-@@ -23,9 +23,11 @@ setup() {
-   bats_require_minimum_version 1.7.0
-   _setup_environment
-   cleanup_containers
-+  pushd "$HOME" || return 1
- }
- 
- teardown() {
-+  popd || return 1
-   cleanup_containers
- }
- 
--- 
-2.43.0
-
diff --git a/toolbox-test-system-new.patch b/toolbox-test-system-new.patch
deleted file mode 100644
index 9800b15..0000000
--- a/toolbox-test-system-new.patch
+++ /dev/null
@@ -1,894 +0,0 @@
-From f51c4a4cd8ff1c51a68073a10eaddab8f16fdaf6 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@fedoraproject.org>
-Date: Thu, 8 Feb 2024 22:18:33 +0100
-Subject: [PATCH 1/4] test/system: Ensure that the user is part of a group with
- the same name
-
-https://github.com/containers/toolbox/pull/1447
----
- test/system/206-user.bats | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/test/system/206-user.bats b/test/system/206-user.bats
-index c295d8a61f39..cdd38c146024 100644
---- a/test/system/206-user.bats
-+++ b/test/system/206-user.bats
-@@ -434,6 +434,7 @@ teardown() {
-   run --keep-empty-lines --separate-stderr "$TOOLBOX" run cat /etc/group
- 
-   assert_success
-+  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
-   assert_line --regexp "^(sudo|wheel):x:[[:digit:]]+:$USER$"
-   assert [ ${#lines[@]} -gt 1 ]
- 
-@@ -447,6 +448,7 @@ teardown() {
-   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch cat /etc/group
- 
-   assert_success
-+  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
-   assert_line --regexp "^wheel:x:[[:digit:]]+:$USER$"
-   assert [ ${#lines[@]} -gt 1 ]
- 
-@@ -460,6 +462,7 @@ teardown() {
-   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 cat /etc/group
- 
-   assert_success
-+  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
-   assert_line --regexp "^wheel:x:[[:digit:]]+:$USER$"
-   assert [ ${#lines[@]} -gt 1 ]
- 
-@@ -473,6 +476,7 @@ teardown() {
-   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 cat /etc/group
- 
-   assert_success
-+  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
-   assert_line --regexp "^wheel:x:[[:digit:]]+:$USER$"
-   assert [ ${#lines[@]} -gt 1 ]
- 
-@@ -486,6 +490,7 @@ teardown() {
-   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 cat /etc/group
- 
-   assert_success
-+  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
-   assert_line --regexp "^sudo:x:[[:digit:]]+:$USER$"
-   assert [ ${#lines[@]} -gt 1 ]
- 
-@@ -499,6 +504,7 @@ teardown() {
-   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 cat /etc/group
- 
-   assert_success
-+  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
-   assert_line --regexp "^sudo:x:[[:digit:]]+:$USER$"
-   assert [ ${#lines[@]} -gt 1 ]
- 
-@@ -512,6 +518,7 @@ teardown() {
-   run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 cat /etc/group
- 
-   assert_success
-+  assert_line --regexp "^$USER:x:[[:digit:]]+:$USER$"
-   assert_line --regexp "^sudo:x:[[:digit:]]+:$USER$"
-   assert [ ${#lines[@]} -gt 1 ]
- 
--- 
-2.43.0
-
-
-From b2d64fad1a23a07919efdb70de9247645e44f973 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@fedoraproject.org>
-Date: Thu, 8 Feb 2024 22:51:43 +0100
-Subject: [PATCH 2/4] test/system: Ensure that process started by 'podman exec'
- has all groups
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 15173f8c25c81244 exposed a bug in crun(1) [1] where the process
-started directly by 'podman exec --user ...' inside the Toolbx container
-would not have the supplementary groups attached to the user by the
-entry point.
-
-This could be observed by differences in id(1):
-  ⬢$ id
-  uid=1000(user) gid=1000(user) groups=1000(user)
-  ⬢$ id user
-  uid=1000(user) gid=1000(user) groups=1000(user),10(wheel)
-
-... and could be worked around by starting a new session with sudo(8).
-
-[1] crun commit 9effaebb429a1aed
-    https://github.com/containers/crun/commit/9effaebb429a1aed
-    https://github.com/containers/crun/issues/644
-    https://github.com/containers/podman/issues/9986
-
-https://github.com/containers/toolbox/issues/608
----
- test/system/206-user.bats | 231 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 231 insertions(+)
-
-diff --git a/test/system/206-user.bats b/test/system/206-user.bats
-index cdd38c146024..2df7862f259e 100644
---- a/test/system/206-user.bats
-+++ b/test/system/206-user.bats
-@@ -525,3 +525,234 @@ teardown() {
-   # shellcheck disable=SC2154
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
-+
-+@test "user: id(1) for $USER inside the default container" {
-+  create_default_container
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run id
-+
-+  assert_success
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  local output_id="${lines[0]}"
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run id "$USER"
-+
-+  assert_success
-+  assert_line --index 0 "$output_id"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "user: id(1) for $USER inside Arch Linux" {
-+  create_distro_container arch latest arch-toolbox-latest
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch id
-+
-+  assert_success
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  local output_id="${lines[0]}"
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch id "$USER"
-+
-+  assert_success
-+  assert_line --index 0 "$output_id"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "user: id(1) for $USER inside Fedora 34" {
-+  create_distro_container fedora 34 fedora-toolbox-34
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 id
-+
-+  assert_success
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  local output_id="${lines[0]}"
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 id "$USER"
-+
-+  assert_success
-+  assert_line --index 0 "$output_id"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "user: id(1) for $USER inside RHEL 8.7" {
-+  create_distro_container rhel 8.7 rhel-toolbox-8.7
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 id
-+
-+  assert_success
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  local output_id="${lines[0]}"
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 id "$USER"
-+
-+  assert_success
-+  assert_line --index 0 "$output_id"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "user: id(1) for $USER inside Ubuntu 16.04" {
-+  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 id
-+
-+  assert_success
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  local output_id="${lines[0]}"
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 id "$USER"
-+
-+  assert_success
-+  assert_line --index 0 "$output_id"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "user: id(1) for $USER inside Ubuntu 18.04" {
-+  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 id
-+
-+  assert_success
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  local output_id="${lines[0]}"
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 id "$USER"
-+
-+  assert_success
-+  assert_line --index 0 "$output_id"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "user: id(1) for $USER inside Ubuntu 20.04" {
-+  create_distro_container ubuntu 20.04 ubuntu-toolbox-20.04
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 id
-+
-+  assert_success
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  local output_id="${lines[0]}"
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 id "$USER"
-+
-+  assert_success
-+  assert_line --index 0 "$output_id"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  # shellcheck disable=SC2154
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
--- 
-2.43.0
-
-
-From da2555d04f9ff677b3f2033ff36390f75c3a509d Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@fedoraproject.org>
-Date: Thu, 18 Jan 2024 19:53:02 +0100
-Subject: [PATCH 3/4] test/system: Group by higher-level objective, not
- distribution
-
-Fallout from 51ffd2793d882ffab45ace44c03edfdaeb3f138c
-
-https://github.com/containers/toolbox/pull/1436
----
- test/system/220-environment-variables.bats | 152 ++++++++++-----------
- 1 file changed, 76 insertions(+), 76 deletions(-)
-
-diff --git a/test/system/220-environment-variables.bats b/test/system/220-environment-variables.bats
-index 0e1356654468..dd74b1dc5142 100644
---- a/test/system/220-environment-variables.bats
-+++ b/test/system/220-environment-variables.bats
-@@ -1,6 +1,6 @@
- # shellcheck shell=bats
- #
--# Copyright © 2023 Red Hat, Inc.
-+# Copyright © 2023 – 2024 Red Hat, Inc.
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
-@@ -57,25 +57,24 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTSIZE inside the default container" {
--  skip "https://pagure.io/setup/pull-request/48"
--
--  create_default_container
-+@test "environment variables: HISTFILESIZE inside Arch Linux" {
-+  create_distro_container arch latest arch-toolbox-latest
- 
--  if [ "$HISTSIZE" = "" ]; then
-+  # shellcheck disable=SC2031
-+  if [ "$HISTFILESIZE" = "" ]; then
-     # shellcheck disable=SC2030
--    HISTSIZE=1001
-+    HISTFILESIZE=1001
-   else
--    ((HISTSIZE++))
-+    ((HISTFILESIZE++))
-   fi
- 
--  export HISTSIZE
-+  export HISTFILESIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run bash -c 'echo "$HISTSIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch bash -c 'echo "$HISTFILESIZE"'
- 
-   assert_success
--  assert_line --index 0 "$HISTSIZE"
-+  assert_line --index 0 "$HISTFILESIZE"
- 
-   if check_bats_version 1.10.0; then
-     assert [ ${#lines[@]} -eq 1 ]
-@@ -87,8 +86,8 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTFILESIZE inside Arch Linux" {
--  create_distro_container arch latest arch-toolbox-latest
-+@test "environment variables: HISTFILESIZE inside Fedora 34" {
-+  create_distro_container fedora 34 fedora-toolbox-34
- 
-   # shellcheck disable=SC2031
-   if [ "$HISTFILESIZE" = "" ]; then
-@@ -101,7 +100,7 @@ teardown() {
-   export HISTFILESIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch bash -c 'echo "$HISTFILESIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 bash -c 'echo "$HISTFILESIZE"'
- 
-   assert_success
-   assert_line --index 0 "$HISTFILESIZE"
-@@ -116,24 +115,24 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTSIZE inside Arch Linux" {
--  create_distro_container arch latest arch-toolbox-latest
-+@test "environment variables: HISTFILESIZE inside RHEL 8.7" {
-+  create_distro_container rhel 8.7 rhel-toolbox-8.7
- 
-   # shellcheck disable=SC2031
--  if [ "$HISTSIZE" = "" ]; then
-+  if [ "$HISTFILESIZE" = "" ]; then
-     # shellcheck disable=SC2030
--    HISTSIZE=1001
-+    HISTFILESIZE=1001
-   else
--    ((HISTSIZE++))
-+    ((HISTFILESIZE++))
-   fi
- 
--  export HISTSIZE
-+  export HISTFILESIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch bash -c 'echo "$HISTSIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 bash -c 'echo "$HISTFILESIZE"'
- 
-   assert_success
--  assert_line --index 0 "$HISTSIZE"
-+  assert_line --index 0 "$HISTFILESIZE"
- 
-   if check_bats_version 1.10.0; then
-     assert [ ${#lines[@]} -eq 1 ]
-@@ -145,8 +144,8 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTFILESIZE inside Fedora 34" {
--  create_distro_container fedora 34 fedora-toolbox-34
-+@test "environment variables: HISTFILESIZE inside Ubuntu 16.04" {
-+  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
- 
-   # shellcheck disable=SC2031
-   if [ "$HISTFILESIZE" = "" ]; then
-@@ -159,7 +158,8 @@ teardown() {
-   export HISTFILESIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 bash -c 'echo "$HISTFILESIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 \
-+                                             bash -c 'echo "$HISTFILESIZE"'
- 
-   assert_success
-   assert_line --index 0 "$HISTFILESIZE"
-@@ -174,26 +174,25 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTSIZE inside Fedora 34" {
--  skip "https://pagure.io/setup/pull-request/48"
--
--  create_distro_container fedora 34 fedora-toolbox-34
-+@test "environment variables: HISTFILESIZE inside Ubuntu 18.04" {
-+  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
- 
-   # shellcheck disable=SC2031
--  if [ "$HISTSIZE" = "" ]; then
-+  if [ "$HISTFILESIZE" = "" ]; then
-     # shellcheck disable=SC2030
--    HISTSIZE=1001
-+    HISTFILESIZE=1001
-   else
--    ((HISTSIZE++))
-+    ((HISTFILESIZE++))
-   fi
- 
--  export HISTSIZE
-+  export HISTFILESIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 bash -c 'echo "$HISTSIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 \
-+                                             bash -c 'echo "$HISTFILESIZE"'
- 
-   assert_success
--  assert_line --index 0 "$HISTSIZE"
-+  assert_line --index 0 "$HISTFILESIZE"
- 
-   if check_bats_version 1.10.0; then
-     assert [ ${#lines[@]} -eq 1 ]
-@@ -205,12 +204,11 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTFILESIZE inside RHEL 8.7" {
--  create_distro_container rhel 8.7 rhel-toolbox-8.7
-+@test "environment variables: HISTFILESIZE inside Ubuntu 20.04" {
-+  create_distro_container ubuntu 20.04 ubuntu-toolbox-20.04
- 
-   # shellcheck disable=SC2031
-   if [ "$HISTFILESIZE" = "" ]; then
--    # shellcheck disable=SC2030
-     HISTFILESIZE=1001
-   else
-     ((HISTFILESIZE++))
-@@ -219,7 +217,8 @@ teardown() {
-   export HISTFILESIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 bash -c 'echo "$HISTFILESIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 \
-+                                             bash -c 'echo "$HISTFILESIZE"'
- 
-   assert_success
-   assert_line --index 0 "$HISTFILESIZE"
-@@ -234,12 +233,11 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTSIZE inside RHEL 8.7" {
-+@test "environment variables: HISTSIZE inside the default container" {
-   skip "https://pagure.io/setup/pull-request/48"
- 
--  create_distro_container rhel 8.7 rhel-toolbox-8.7
-+  create_default_container
- 
--  # shellcheck disable=SC2031
-   if [ "$HISTSIZE" = "" ]; then
-     # shellcheck disable=SC2030
-     HISTSIZE=1001
-@@ -250,7 +248,7 @@ teardown() {
-   export HISTSIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 bash -c 'echo "$HISTSIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run bash -c 'echo "$HISTSIZE"'
- 
-   assert_success
-   assert_line --index 0 "$HISTSIZE"
-@@ -265,25 +263,24 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTFILESIZE inside Ubuntu 16.04" {
--  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
-+@test "environment variables: HISTSIZE inside Arch Linux" {
-+  create_distro_container arch latest arch-toolbox-latest
- 
-   # shellcheck disable=SC2031
--  if [ "$HISTFILESIZE" = "" ]; then
-+  if [ "$HISTSIZE" = "" ]; then
-     # shellcheck disable=SC2030
--    HISTFILESIZE=1001
-+    HISTSIZE=1001
-   else
--    ((HISTFILESIZE++))
-+    ((HISTSIZE++))
-   fi
- 
--  export HISTFILESIZE
-+  export HISTSIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 \
--                                             bash -c 'echo "$HISTFILESIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch bash -c 'echo "$HISTSIZE"'
- 
-   assert_success
--  assert_line --index 0 "$HISTFILESIZE"
-+  assert_line --index 0 "$HISTSIZE"
- 
-   if check_bats_version 1.10.0; then
-     assert [ ${#lines[@]} -eq 1 ]
-@@ -295,8 +292,10 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTSIZE inside Ubuntu 16.04" {
--  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
-+@test "environment variables: HISTSIZE inside Fedora 34" {
-+  skip "https://pagure.io/setup/pull-request/48"
-+
-+  create_distro_container fedora 34 fedora-toolbox-34
- 
-   # shellcheck disable=SC2031
-   if [ "$HISTSIZE" = "" ]; then
-@@ -309,7 +308,7 @@ teardown() {
-   export HISTSIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 bash -c 'echo "$HISTSIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 bash -c 'echo "$HISTSIZE"'
- 
-   assert_success
-   assert_line --index 0 "$HISTSIZE"
-@@ -324,25 +323,26 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTFILESIZE inside Ubuntu 18.04" {
--  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
-+@test "environment variables: HISTSIZE inside RHEL 8.7" {
-+  skip "https://pagure.io/setup/pull-request/48"
-+
-+  create_distro_container rhel 8.7 rhel-toolbox-8.7
- 
-   # shellcheck disable=SC2031
--  if [ "$HISTFILESIZE" = "" ]; then
-+  if [ "$HISTSIZE" = "" ]; then
-     # shellcheck disable=SC2030
--    HISTFILESIZE=1001
-+    HISTSIZE=1001
-   else
--    ((HISTFILESIZE++))
-+    ((HISTSIZE++))
-   fi
- 
--  export HISTFILESIZE
-+  export HISTSIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 \
--                                             bash -c 'echo "$HISTFILESIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 bash -c 'echo "$HISTSIZE"'
- 
-   assert_success
--  assert_line --index 0 "$HISTFILESIZE"
-+  assert_line --index 0 "$HISTSIZE"
- 
-   if check_bats_version 1.10.0; then
-     assert [ ${#lines[@]} -eq 1 ]
-@@ -354,8 +354,8 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTSIZE inside Ubuntu 18.04" {
--  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
-+@test "environment variables: HISTSIZE inside Ubuntu 16.04" {
-+  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
- 
-   # shellcheck disable=SC2031
-   if [ "$HISTSIZE" = "" ]; then
-@@ -368,7 +368,7 @@ teardown() {
-   export HISTSIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 bash -c 'echo "$HISTSIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 bash -c 'echo "$HISTSIZE"'
- 
-   assert_success
-   assert_line --index 0 "$HISTSIZE"
-@@ -383,24 +383,24 @@ teardown() {
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
- 
--@test "environment variables: HISTFILESIZE inside Ubuntu 20.04" {
--  create_distro_container ubuntu 20.04 ubuntu-toolbox-20.04
-+@test "environment variables: HISTSIZE inside Ubuntu 18.04" {
-+  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
- 
-   # shellcheck disable=SC2031
--  if [ "$HISTFILESIZE" = "" ]; then
--    HISTFILESIZE=1001
-+  if [ "$HISTSIZE" = "" ]; then
-+    # shellcheck disable=SC2030
-+    HISTSIZE=1001
-   else
--    ((HISTFILESIZE++))
-+    ((HISTSIZE++))
-   fi
- 
--  export HISTFILESIZE
-+  export HISTSIZE
- 
-   # shellcheck disable=SC2016
--  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 \
--                                             bash -c 'echo "$HISTFILESIZE"'
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 bash -c 'echo "$HISTSIZE"'
- 
-   assert_success
--  assert_line --index 0 "$HISTFILESIZE"
-+  assert_line --index 0 "$HISTSIZE"
- 
-   if check_bats_version 1.10.0; then
-     assert [ ${#lines[@]} -eq 1 ]
--- 
-2.43.0
-
-
-From ee2c92299d5488bab4e54cb04d9a120e0b9ed405 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@fedoraproject.org>
-Date: Thu, 18 Jan 2024 20:17:50 +0100
-Subject: [PATCH 4/4] test/system: Test that the HOSTNAME environment variable
- is set
-
-Bash automatically sets the HOSTNAME environment variable to the name of
-the current host [1] as returned by gethostname(2), which is the same as
-hostname(1).
-
-However, on Fedora, from Fedora 33 onwards, /etc/profile sets the
-HOSTNAME environment variable to 'hostnamectl --transient' [2], and,
-from Fedora 35 onwards, it has a fallback to hostname(1) [3].  These two
-approaches return different values when used inside a Toolbx container.
-The former picks up the hostname of the host operating system, while the
-fallback gets the name that was set when creating the container with
-'podman create --hostname toolbox ...'.
-
-Hence, the value of HOSTNAME inside a Toolbx container for Fedora
-depends on whether the corresponding version of the fedora-toolbox image
-contained hostnamectl(1) or not.
-
-[1] https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html
-
-[2] setup commit eb9cc4dce89be24f
-    https://pagure.io/setup/c/eb9cc4dce89be24f
-    https://bugzilla.redhat.com/show_bug.cgi?id=1745245
-
-[3] setup commit ddd74b5d971a734c
-    https://pagure.io/setup/c/ddd74b5d971a734c
-    https://pagure.io/setup/pull-request/28
-    https://bugzilla.redhat.com/show_bug.cgi?id=1938223
-
-https://github.com/containers/toolbox/issues/558
----
- test/system/220-environment-variables.bats | 126 +++++++++++++++++++++
- 1 file changed, 126 insertions(+)
-
-diff --git a/test/system/220-environment-variables.bats b/test/system/220-environment-variables.bats
-index dd74b1dc5142..5b51d17dee55 100644
---- a/test/system/220-environment-variables.bats
-+++ b/test/system/220-environment-variables.bats
-@@ -439,3 +439,129 @@ teardown() {
-   # shellcheck disable=SC2154
-   assert [ ${#stderr_lines[@]} -eq 0 ]
- }
-+
-+@test "environment variables: HOSTNAME inside the default container" {
-+  create_default_container
-+
-+  # shellcheck disable=SC2016
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run bash -c 'echo "$HOSTNAME"'
-+
-+  assert_success
-+  assert_line --index 0 --regexp "^(toolbox|$HOSTNAME)$"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "environment variables: HOSTNAME inside Arch Linux" {
-+  create_distro_container arch latest arch-toolbox-latest
-+
-+  # shellcheck disable=SC2016
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro arch bash -c 'echo "$HOSTNAME"'
-+
-+  assert_success
-+  assert_line --index 0 "toolbox"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "environment variables: HOSTNAME inside Fedora 34" {
-+  create_distro_container fedora 34 fedora-toolbox-34
-+
-+  # shellcheck disable=SC2016
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro fedora --release 34 bash -c 'echo "$HOSTNAME"'
-+
-+  assert_success
-+  assert_line --index 0 "$HOSTNAME"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "environment variables: HOSTNAME inside RHEL 8.7" {
-+  create_distro_container rhel 8.7 rhel-toolbox-8.7
-+
-+  # shellcheck disable=SC2016
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 bash -c 'echo "$HOSTNAME"'
-+
-+  assert_success
-+  assert_line --index 0 "toolbox"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "environment variables: HOSTNAME inside Ubuntu 16.04" {
-+  create_distro_container ubuntu 16.04 ubuntu-toolbox-16.04
-+
-+  # shellcheck disable=SC2016
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 16.04 bash -c 'echo "$HOSTNAME"'
-+
-+  assert_success
-+  assert_line --index 0 "toolbox"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "environment variables: HOSTNAME inside Ubuntu 18.04" {
-+  create_distro_container ubuntu 18.04 ubuntu-toolbox-18.04
-+
-+  # shellcheck disable=SC2016
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 18.04 bash -c 'echo "$HOSTNAME"'
-+
-+  assert_success
-+  assert_line --index 0 "toolbox"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
-+
-+@test "environment variables: HOSTNAME inside Ubuntu 20.04" {
-+  create_distro_container ubuntu 20.04 ubuntu-toolbox-20.04
-+
-+  # shellcheck disable=SC2016
-+  run --keep-empty-lines --separate-stderr "$TOOLBOX" run --distro ubuntu --release 20.04 bash -c 'echo "$HOSTNAME"'
-+
-+  assert_success
-+  assert_line --index 0 "toolbox"
-+
-+  if check_bats_version 1.10.0; then
-+    assert [ ${#lines[@]} -eq 1 ]
-+  else
-+    assert [ ${#lines[@]} -eq 2 ]
-+  fi
-+
-+  assert [ ${#stderr_lines[@]} -eq 0 ]
-+}
--- 
-2.43.0
-
diff --git a/toolbox.spec b/toolbox.spec
index cf18cf8..1b83ebc 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -1,7 +1,7 @@
 %global __brp_check_rpaths %{nil}
 
 Name:          toolbox
-Version:       0.0.99.5
+Version:       0.0.99.6
 
 %global goipath github.com/containers/%{name}
 
@@ -31,7 +31,7 @@ Version:       0.0.99.5
 %endif
 %endif
 
-Release:       10%{?dist}
+Release:       1%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -41,13 +41,8 @@ Source0:       https://github.com/containers/%{name}/releases/download/%{version
 # RHEL specific
 Source1:       %{name}.conf
 
-# Upstream
-Patch0:        toolbox-test-system-new.patch
-Patch1:        toolbox-test-system-Unbreak-Podman-s-downstream-Fedora-CI.patch
-
 # Fedora specific
 Patch100:      toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
-Patch101:      toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch
 
 # RHEL specific
 Patch200:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
@@ -64,21 +59,27 @@ BuildRequires: systemd
 BuildRequires: systemd-rpm-macros
 %if ! 0%{?rhel}
 BuildRequires: golang(github.com/HarryMichal/go-version) >= 1.0.1
+BuildRequires: golang-ipath(github.com/NVIDIA/go-nvlib) >= 0.6.1
+BuildRequires: golang-ipath(github.com/NVIDIA/go-nvml) >= 0.12.4.0
+BuildRequires: golang-ipath(github.com/NVIDIA/nvidia-container-toolkit) >= 1.16.1
 BuildRequires: golang(github.com/acobaugh/osrelease) >= 0.1.0
-BuildRequires: golang(github.com/briandowns/spinner) >= 1.17.0
+BuildRequires: golang(github.com/briandowns/spinner) >= 1.18.0
 BuildRequires: golang(github.com/docker/go-units) >= 0.5.0
-BuildRequires: golang(github.com/fsnotify/fsnotify) >= 1.5.1
+BuildRequires: golang(github.com/fsnotify/fsnotify) >= 1.7.0
+BuildRequires: golang(github.com/go-logfmt/logfmt) >= 0.5.0
 BuildRequires: golang(github.com/godbus/dbus) >= 5.0.6
-BuildRequires: golang(github.com/sirupsen/logrus) >= 1.8.1
+BuildRequires: golang(github.com/google/renameio/v2) >= 2.0.0
+BuildRequires: golang(github.com/sirupsen/logrus) >= 1.9.3
 BuildRequires: golang(github.com/spf13/cobra) >= 1.3.0
 BuildRequires: golang(github.com/spf13/viper) >= 1.10.1
-BuildRequires: golang(golang.org/x/sys/unix) >= 0.1.0
+BuildRequires: golang-ipath(golang.org/x/sys) >= 0.22.0
 BuildRequires: golang(golang.org/x/text) >= 0.3.8
-BuildRequires: golang(gopkg.in/yaml.v3) >= 3.0.0
+BuildRequires: golang-ipath(gopkg.in/yaml.v3) >= 3.0.1
+BuildRequires: golang-ipath(tags.cncf.io/container-device-interface) >= 0.8.0
 BuildRequires: pkgconfig(fish)
 # for tests
 # BuildRequires: codespell
-# BuildRequires: golang(github.com/stretchr/testify) >= 1.7.0
+# BuildRequires: golang(github.com/stretchr/testify) >= 1.9.0
 # BuildRequires: ShellCheck
 %endif
 
@@ -93,9 +94,9 @@ Requires:      flatpak-session-helper
 
 %description
 Toolbx is a tool for Linux, which allows the use of interactive command line
-environments for development and troubleshooting the host operating system,
-without having to install software on the host. It is built on top of Podman
-and other standard container technologies from OCI.
+environments for software development and troubleshooting the host operating
+system, without having to install software on the host. It is built on top of
+Podman and other standard container technologies from OCI.
 
 Toolbx environments have seamless access to the user's home directory, the
 Wayland and X11 sockets, networking (including Avahi), removable devices (like
@@ -184,13 +185,17 @@ Summary:       Tests for %{name}
 
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Requires:      coreutils
+Requires:      diffutils
+# for gdbus(1)
+Requires:      glib2
 Requires:      grep
-# for htpasswd
+# for htpasswd(1)
 Requires:      httpd-tools
 Requires:      openssl
+Requires:      python3
 Requires:      skopeo
 %if ! 0%{?rhel}
-Requires:      bats >= 1.7.0
+Requires:      bats >= 1.10.0
 %endif
 
 %description   tests
@@ -200,15 +205,8 @@ The %{name}-tests package contains system tests for %{name}.
 %prep
 %setup -q
 
-%patch0 -p1
-%patch1 -p1
-
 %if 0%{?fedora}
-%ifnarch ppc64
 %patch100 -p1
-%else
-%patch101 -p1
-%endif
 %endif
 
 %if 0%{?rhel}
@@ -260,7 +258,7 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %files
-%doc CODE-OF-CONDUCT.md NEWS README.md SECURITY.md
+%doc CODE-OF-CONDUCT.md CONTRIBUTING.md GOALS.md NEWS README.md SECURITY.md
 %license COPYING %{?rhel:src/vendor/modules.txt}
 %{_bindir}/%{name}
 %{_datadir}/bash-completion
@@ -286,6 +284,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Mon Sep 30 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-1
+- Update to 0.0.99.6
+
 * Wed Jul 31 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-10
 - Avoid running out of storage space when running the tests
 

From cc9fa7c9d640e045aa4cc45744554b79c99a2588 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Wed, 2 Oct 2024 21:22:34 +0200
Subject: [PATCH 13/22] Silence 'rpminspect --tests=elf'

With Toolbx 0.0.99.6, 'rpminspect --tests=elf', run by the Fedora CI,
fails with:
  /usr/bin/toolbox lost full GNU_RELRO security protection

This is because from version 0.0.99.6 onwards, toolbox(1) is only built
with the '-z relro' linker flag, but not '-z now' [1].

Fallout from 2c1d60d3358a8e0b747caebe6954d7c28fbe9e98

[1] Upstream commit 83f28c52e47c2d44
    https://github.com/containers/toolbox/commit/83f28c52e47c2d44
    https://github.com/containers/toolbox/pull/1548
---
 rpminspect.yaml | 3 +++
 toolbox.spec    | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rpminspect.yaml b/rpminspect.yaml
index ab3e59b..f0d9c5c 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -7,6 +7,9 @@ annocheck:
     extra_opts:
         hardened: --skip-run-path --skip-stack-prot
 
+elf:
+    exclude_path: /usr/bin/toolbox
+
 runpath:
     allowed_paths:
         - /run/host/usr/lib
diff --git a/toolbox.spec b/toolbox.spec
index 1b83ebc..25b5d41 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -31,7 +31,7 @@ Version:       0.0.99.6
 %endif
 %endif
 
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -284,6 +284,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Wed Oct 02 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-2
+- Silence 'rpminspect --tests=elf'
+
 * Mon Sep 30 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-1
 - Update to 0.0.99.6
 

From d12a223099a0b6c7ddd82163a3ad45ba35713041 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Tue, 22 Oct 2024 21:25:09 +0200
Subject: [PATCH 14/22] Remove deprecated %patchN syntax

There's no need to do a build just for this.

Relates: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/5YUJWTUJK4JA26YP2VD46HOCQ6UZXMQD/
---
 toolbox.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolbox.spec b/toolbox.spec
index 25b5d41..b3189f5 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -206,18 +206,18 @@ The %{name}-tests package contains system tests for %{name}.
 %setup -q
 
 %if 0%{?fedora}
-%patch100 -p1
+%patch -P100 -p1
 %endif
 
 %if 0%{?rhel}
 %ifnarch ppc64
-%patch200 -p1
+%patch -P200 -p1
 %else
-%patch201 -p1
+%patch -P201 -p1
 %endif
 
 %if 0%{?rhel} <= 9
-%patch202 -p1
+%patch -P202 -p1
 %endif
 %endif
 

From 27959e473a886b72c6d2e37a48075641b97ad74f Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Thu, 3 Oct 2024 14:56:46 +0200
Subject: [PATCH 15/22] Unbreak the downstream Fedora CI

Fallout from 2c1d60d3358a8e0b747caebe6954d7c28fbe9e98
---
 ...-system-Unbreak-downstream-Fedora-CI.patch | 104 ++++++++++++++++++
 toolbox.spec                                  |   9 +-
 2 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 toolbox-test-system-Unbreak-downstream-Fedora-CI.patch

diff --git a/toolbox-test-system-Unbreak-downstream-Fedora-CI.patch b/toolbox-test-system-Unbreak-downstream-Fedora-CI.patch
new file mode 100644
index 0000000..b743f2d
--- /dev/null
+++ b/toolbox-test-system-Unbreak-downstream-Fedora-CI.patch
@@ -0,0 +1,104 @@
+From 1e90c721858b3119702b93445f535f9c23af88e6 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Wed, 2 Oct 2024 22:43:37 +0200
+Subject: [PATCH] test/system: Unbreak the downstream Fedora CI
+
+The working directory from which bats(1) is invoked might not be part of
+the Toolbx container.  eg., the downstream Fedora CI invokes the tests
+as:
+  $ cd /path/to/toolbox/test/system
+  $ bats .
+
+... and it led to:
+  not ok 8 help: Try unknown command (forwarded to host)
+  # tags: commands-options
+  # (from function `assert_line' in file
+      ./libs/bats-assert/src/assert.bash, line 488,
+  #  in test file ./002-help.bats, line 135)
+  #   `assert_line --index 0
+        "Error: unknown command \"foo\" for \"toolbox\""' failed
+  #
+  # -- line differs --
+  # index    : 0
+  # expected : Error: unknown command "foo" for "toolbox"
+  # actual   : Error: crun: chdir to `/usr/share/toolbox/test/system`:
+      No such file or directory: OCI runtime attempted to invoke a
+      command that was not found
+  # --
+  #
+
+https://github.com/containers/toolbox/pull/1560
+---
+ test/system/002-help.bats   | 2 ++
+ test/system/501-create.bats | 2 ++
+ test/system/504-run.bats    | 2 ++
+ test/system/505-enter.bats  | 2 ++
+ 4 files changed, 8 insertions(+)
+
+diff --git a/test/system/002-help.bats b/test/system/002-help.bats
+index 57e918a04d22..a8bfbc2c79d2 100644
+--- a/test/system/002-help.bats
++++ b/test/system/002-help.bats
+@@ -25,9 +25,11 @@ setup() {
+   bats_require_minimum_version 1.10.0
+   _setup_environment
+   cleanup_all
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_all
+ }
+ 
+diff --git a/test/system/501-create.bats b/test/system/501-create.bats
+index 3f50f98e6bf3..cfb676b7001b 100644
+--- a/test/system/501-create.bats
++++ b/test/system/501-create.bats
+@@ -25,9 +25,11 @@ setup() {
+   bats_require_minimum_version 1.8.0
+   _setup_environment
+   cleanup_all
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_all
+ }
+ 
+diff --git a/test/system/504-run.bats b/test/system/504-run.bats
+index cc5f6fa8bb09..6ee3e86af1ff 100644
+--- a/test/system/504-run.bats
++++ b/test/system/504-run.bats
+@@ -25,9 +25,11 @@ setup() {
+   bats_require_minimum_version 1.8.0
+   _setup_environment
+   cleanup_all
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_all
+ }
+ 
+diff --git a/test/system/505-enter.bats b/test/system/505-enter.bats
+index 405d184f145e..57e58651623d 100644
+--- a/test/system/505-enter.bats
++++ b/test/system/505-enter.bats
+@@ -25,9 +25,11 @@ setup() {
+   bats_require_minimum_version 1.8.0
+   _setup_environment
+   cleanup_all
++  pushd "$HOME" || return 1
+ }
+ 
+ teardown() {
++  popd || return 1
+   cleanup_all
+ }
+ 
+-- 
+2.46.1
+
diff --git a/toolbox.spec b/toolbox.spec
index b3189f5..66a633c 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -31,7 +31,7 @@ Version:       0.0.99.6
 %endif
 %endif
 
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -41,6 +41,9 @@ Source0:       https://github.com/containers/%{name}/releases/download/%{version
 # RHEL specific
 Source1:       %{name}.conf
 
+# Upstream
+Patch0:        toolbox-test-system-Unbreak-downstream-Fedora-CI.patch
+
 # Fedora specific
 Patch100:      toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
 
@@ -204,6 +207,7 @@ The %{name}-tests package contains system tests for %{name}.
 
 %prep
 %setup -q
+%patch -P0 -p1
 
 %if 0%{?fedora}
 %patch -P100 -p1
@@ -284,6 +288,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Thu Oct 03 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-3
+- Unbreak the downstream Fedora CI
+
 * Wed Oct 02 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-2
 - Silence 'rpminspect --tests=elf'
 

From cce7fffd9443f64ed196f66155b15a52bffc2c8f Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Fri, 4 Oct 2024 15:08:39 +0200
Subject: [PATCH 16/22] Use the fedora-toolbox:40 image for Fedora Asahi Remix
 hosts

https://bugzilla.redhat.com/show_bug.cgi?id=2316312
---
 ...-fallback-release-to-40-for-non-fedo.patch | 30 +++++++++++++++++++
 toolbox.spec                                  |  7 ++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 toolbox-Update-fallback-release-to-40-for-non-fedo.patch

diff --git a/toolbox-Update-fallback-release-to-40-for-non-fedo.patch b/toolbox-Update-fallback-release-to-40-for-non-fedo.patch
new file mode 100644
index 0000000..7bad62f
--- /dev/null
+++ b/toolbox-Update-fallback-release-to-40-for-non-fedo.patch
@@ -0,0 +1,30 @@
+From b524f4cebd8c65746089f898e14a99c7cfded306 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Thu, 3 Oct 2024 22:08:04 +0200
+Subject: [PATCH] pkg/utils: Update fallback release to 40 for non-fedora hosts
+
+Fedora 38 reached End of Life on 21st May 2024:
+https://docs.fedoraproject.org/en-US/releases/eol/
+
+https://bugzilla.redhat.com/show_bug.cgi?id=2316312
+https://github.com/containers/toolbox/pull/1561
+---
+ src/pkg/utils/utils.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go
+index eefcd1eeb2cc..37a49fedf772 100644
+--- a/src/pkg/utils/utils.go
++++ b/src/pkg/utils/utils.go
+@@ -64,7 +64,7 @@ const (
+ 	containerNamePrefixFallback = "fedora-toolbox"
+ 	distroFallback              = "fedora"
+ 	idTruncLength               = 12
+-	releaseFallback             = "38"
++	releaseFallback             = "40"
+ )
+ 
+ const (
+-- 
+2.46.1
+
diff --git a/toolbox.spec b/toolbox.spec
index 66a633c..9304da9 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -31,7 +31,7 @@ Version:       0.0.99.6
 %endif
 %endif
 
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -43,6 +43,7 @@ Source1:       %{name}.conf
 
 # Upstream
 Patch0:        toolbox-test-system-Unbreak-downstream-Fedora-CI.patch
+Patch1:        toolbox-Update-fallback-release-to-40-for-non-fedo.patch
 
 # Fedora specific
 Patch100:      toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
@@ -208,6 +209,7 @@ The %{name}-tests package contains system tests for %{name}.
 %prep
 %setup -q
 %patch -P0 -p1
+%patch -P1 -p1
 
 %if 0%{?fedora}
 %patch -P100 -p1
@@ -288,6 +290,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Fri Oct 04 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-4
+- Use the fedora-toolbox:40 image for Fedora Asahi Remix hosts
+
 * Thu Oct 03 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-3
 - Unbreak the downstream Fedora CI
 

From bb820b3e3e3233cd5562958b5bb5739fe1b7dabc Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Tue, 8 Oct 2024 16:37:32 +0200
Subject: [PATCH 17/22] Add 'Requires: shadow-utils-subid%{?_isa}'

The runtime dependency on shadow-utils-subid should have already been
part of commit 95d6ea86892b903b to ensure that Toolbx >= 0.0.99.4 would
be able to dlopen(3) the library.  It only worked in practice because
the podman RPM also required it.

There's no need to do a build just for this.
---
 toolbox.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolbox.spec b/toolbox.spec
index 9304da9..9edbc38 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -91,6 +91,7 @@ Recommends:    skopeo
 
 Requires:      containers-common
 Requires:      podman >= 1.6.4
+Requires:      shadow-utils-subid%{?_isa}
 %if ! 0%{?rhel}
 Requires:      flatpak-session-helper
 %endif

From 7b9d1c3589cf4b0ac2ef26c12497ade8e883c569 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Mon, 7 Oct 2024 16:02:21 +0200
Subject: [PATCH 18/22] Unify the build with RHEL 9

There's no need to do a build just for this.
---
 ...ation-paths-for-coreos-toolbox-users.patch | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/toolbox-Add-migration-paths-for-coreos-toolbox-users.patch b/toolbox-Add-migration-paths-for-coreos-toolbox-users.patch
index 88003a3..9f470cd 100644
--- a/toolbox-Add-migration-paths-for-coreos-toolbox-users.patch
+++ b/toolbox-Add-migration-paths-for-coreos-toolbox-users.patch
@@ -1,4 +1,4 @@
-From d461caa5b1a278124d039df93140d2d5bf4eabe7 Mon Sep 17 00:00:00 2001
+From c25ad44b7cb50d470b1533931b7808cc194f0d50 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
@@ -10,10 +10,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1940037
  1 file changed, 1 insertion(+)
 
 diff --git a/src/cmd/run.go b/src/cmd/run.go
-index 7657ffa50821..23d422623b14 100644
+index 719c0d6abb20..92a097283f38 100644
 --- a/src/cmd/run.go
 +++ b/src/cmd/run.go
-@@ -501,6 +501,7 @@ func constructExecArgs(container, preserveFDs string,
+@@ -566,6 +566,7 @@ func constructExecArgs(container, preserveFDs string,
  	execArgs = append(execArgs, envOptions...)
  
  	execArgs = append(execArgs, []string{
@@ -22,10 +22,10 @@ index 7657ffa50821..23d422623b14 100644
  		"--preserve-fds", preserveFDs,
  	}...)
 -- 
-2.39.2
+2.46.1
 
 
-From 3c2c67752e8f88f72058799cbce3612fc937b230 Mon Sep 17 00:00:00 2001
+From e7877a4d1d38dc35aa6da6c012ec9a23397b7aa4 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
@@ -36,36 +36,39 @@ This reverts the changes to the tests made in commit
 ca899c8a561f357ae32c6ba6813520fd8b682abb and the parts of commit
 3aeb7cf288319e35eb9c5e26ea18d97452462c1e that were removed.
 ---
- test/system/002-help.bats | 11 -----------
+ test/system/002-help.bats | 14 --------------
  test/system/100-root.bats | 27 +++++++++++++++++++++++++++
- 2 files changed, 27 insertions(+), 11 deletions(-)
+ 2 files changed, 27 insertions(+), 14 deletions(-)
  create mode 100644 test/system/100-root.bats
 
 diff --git a/test/system/002-help.bats b/test/system/002-help.bats
-index 7e4565e9d23d..58a4c2c87ece 100644
+index a8bfbc2c79d2..5dd14025ea0b 100644
 --- a/test/system/002-help.bats
 +++ b/test/system/002-help.bats
-@@ -23,17 +23,6 @@ setup() {
-   _setup_environment
+@@ -33,20 +33,6 @@ teardown() {
+   cleanup_all
  }
  
--@test "help: Try to run toolbox with no command" {
--  run $TOOLBOX
+-@test "help: Smoke test" {
+-  run --keep-empty-lines --separate-stderr "$TOOLBX"
 -
 -  assert_failure
+-  assert [ ${#lines[@]} -eq 0 ]
+-  lines=("${stderr_lines[@]}")
 -  assert_line --index 0 "Error: missing command"
--  assert_line --index 1 "create    Create a new toolbox container"
--  assert_line --index 2 "enter     Enter an existing toolbox container"
--  assert_line --index 3 "list      List all existing toolbox containers and images"
--  assert_line --index 4 "Run 'toolbox --help' for usage."
+-  assert_line --index 2 "create    Create a new Toolbx container"
+-  assert_line --index 3 "enter     Enter an existing Toolbx container"
+-  assert_line --index 4 "list      List all existing Toolbx containers and images"
+-  assert_line --index 6 "Run 'toolbox --help' for usage."
+-  assert [ ${#stderr_lines[@]} -eq 7 ]
 -}
 -
- @test "help: Run command 'help'" {
+ @test "help: Command 'help'" {
    if ! command -v man 2>/dev/null; then
-     skip "Test works only if man is in PATH"
+     skip "not found man(1)"
 diff --git a/test/system/100-root.bats b/test/system/100-root.bats
 new file mode 100644
-index 000000000000..32d87904213e
+index 000000000000..cf35d60ac25c
 --- /dev/null
 +++ b/test/system/100-root.bats
 @@ -0,0 +1,27 @@
@@ -77,15 +80,15 @@ index 000000000000..32d87904213e
 +
 +setup() {
 +  _setup_environment
-+  cleanup_containers
++  cleanup_all
 +}
 +
 +teardown() {
-+  cleanup_containers
++  cleanup_all
 +}
 +
 +@test "root: Try to enter the default container with no containers created" {
-+  run $TOOLBOX <<< "n"
++  run "$TOOLBX" <<< "n"
 +
 +  assert_success
 +  assert_line --index 0 "No toolbox containers found. Create now? [y/N] A container can be created later with the 'create' command."
@@ -97,5 +100,5 @@ index 000000000000..32d87904213e
 +  skip "Testing of entering toolboxes is not implemented"
 +}
 -- 
-2.39.2
+2.46.1
 

From 3c6dbed5148faf414c852480a6db59dc835b8ee7 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Mon, 7 Oct 2024 16:06:55 +0200
Subject: [PATCH 19/22] Unify the build with RHEL

There's no need to do a build just for this.
---
 ...d.patch => toolbox-Make-the-build-flags-match-Fedora.patch | 0
 ...ora-CI.patch => toolbox-Unbreak-downstream-Fedora-CI.patch | 0
 toolbox.spec                                                  | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch => toolbox-Make-the-build-flags-match-Fedora.patch (100%)
 rename toolbox-test-system-Unbreak-downstream-Fedora-CI.patch => toolbox-Unbreak-downstream-Fedora-CI.patch (100%)

diff --git a/toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch b/toolbox-Make-the-build-flags-match-Fedora.patch
similarity index 100%
rename from toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
rename to toolbox-Make-the-build-flags-match-Fedora.patch
diff --git a/toolbox-test-system-Unbreak-downstream-Fedora-CI.patch b/toolbox-Unbreak-downstream-Fedora-CI.patch
similarity index 100%
rename from toolbox-test-system-Unbreak-downstream-Fedora-CI.patch
rename to toolbox-Unbreak-downstream-Fedora-CI.patch
diff --git a/toolbox.spec b/toolbox.spec
index 9edbc38..917c63d 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -42,11 +42,11 @@ Source0:       https://github.com/containers/%{name}/releases/download/%{version
 Source1:       %{name}.conf
 
 # Upstream
-Patch0:        toolbox-test-system-Unbreak-downstream-Fedora-CI.patch
+Patch0:        toolbox-Unbreak-downstream-Fedora-CI.patch
 Patch1:        toolbox-Update-fallback-release-to-40-for-non-fedo.patch
 
 # Fedora specific
-Patch100:      toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
+Patch100:      toolbox-Make-the-build-flags-match-Fedora.patch
 
 # RHEL specific
 Patch200:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch

From af6c86de0c856f95e3f3d4cd34209c160103b5fb Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Mon, 7 Oct 2024 16:19:11 +0200
Subject: [PATCH 20/22] Unify the build with RHEL

There's no need to do a build just for this.
---
 ...x-Make-the-build-flags-match-RHEL-10.patch | 71 +++++++++++++++++++
 ...ox-Make-the-build-flags-match-RHEL-9.patch | 50 +++++++++++++
 ...flags-match-RHEL-s-gobuild-for-PPC64.patch | 55 --------------
 ...the-build-flags-match-RHEL-s-gobuild.patch | 55 --------------
 toolbox.spec                                  | 10 +--
 5 files changed, 127 insertions(+), 114 deletions(-)
 create mode 100644 toolbox-Make-the-build-flags-match-RHEL-10.patch
 create mode 100644 toolbox-Make-the-build-flags-match-RHEL-9.patch
 delete mode 100644 toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch
 delete mode 100644 toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch

diff --git a/toolbox-Make-the-build-flags-match-RHEL-10.patch b/toolbox-Make-the-build-flags-match-RHEL-10.patch
new file mode 100644
index 0000000..e43e0eb
--- /dev/null
+++ b/toolbox-Make-the-build-flags-match-RHEL-10.patch
@@ -0,0 +1,71 @@
+From f08f64c0d5f2019055381c3c00426fe8545e5e31 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Mon, 29 Jun 2020 17:57:47 +0200
+Subject: [PATCH] build: Make the build flags match RHEL 10's %{gobuildflags}
+
+These reflect the defaults for RHEL 10.0 Beta, because RHEL 10.0 is
+still early in its development cycle and the defaults may be in a state
+of flux.  Some exceptions are mentioned below.
+
+The '-z pack-relative-relocs' linker flag was left out.  It's currently
+not supported on s390x, so using it would require architecture specific
+patches, which is a hassle.  Support for aarch64 was recently added [1],
+so hopefully s390x will also be supported soon.
+
+The change to use the RPM's %{name}, %{version}, %{release} and the
+SOURCE_DATE_EPOCH environment variable [2], instead of /dev/urandom, to
+generate the build ID annotation for the toolbox(1) binary [2] was left
+out.  It will need more work to propagate the RPM's %{name}, %{version}
+and %{release} to Meson.
+
+Note that these flags are meant for every CPU architecture other than
+PPC64, and should be kept updated to match RHEL 10's Go guidelines. Use
+'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
+
+[1] CentOS Stream redhat-rpm-config commit 3c5a6b17540b2a0b
+    https://gitlab.com/redhat/centos-stream/rpms/redhat-rpm-config/-/commit/3c5a6b17540b2a0b
+    https://gitlab.com/redhat/centos-stream/rpms/redhat-rpm-config/-/merge_requests/42
+    https://issues.redhat.com/browse/RHEL-40379
+
+[2] go-rpm-macros commit 1980932bf3a21890
+    https://pagure.io/go-rpm-macros/c/1980932bf3a21890
+    https://fedoraproject.org/wiki/Changes/ReproduciblePackageBuilds
+---
+ src/go-build-wrapper | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/go-build-wrapper b/src/go-build-wrapper
+index a5a1a6a508fb..5978422e9aed 100755
+--- a/src/go-build-wrapper
++++ b/src/go-build-wrapper
+@@ -33,9 +33,9 @@ if ! cd "$1"; then
+     exit 1
+ fi
+ 
+-tags=""
++tags="-tags rpm_crashtraceback,${GO_BUILDTAGS:-}"
+ if $7; then
+-    tags="-tags migration_path_for_coreos_toolbox"
++    tags="$tags,migration_path_for_coreos_toolbox"
+ fi
+ 
+ if ! libc_dir=$("$5" --print-file-name=libc.so); then
+@@ -114,9 +114,14 @@ dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basen
+ 
+ # shellcheck disable=SC2086
+ go build \
++        -buildmode pie \
++        -compiler gc \
+         $tags \
+         -trimpath \
+-        -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
++        -ldflags "${GO_LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -compressdwarf=false -extldflags '-Wl,-z,relro -Wl,--as-needed -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes -Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
++        -a \
++        -v \
++        -x \
+         -o "$2/$3"
+ 
+ exit "$?"
+-- 
+2.46.1
+
diff --git a/toolbox-Make-the-build-flags-match-RHEL-9.patch b/toolbox-Make-the-build-flags-match-RHEL-9.patch
new file mode 100644
index 0000000..2c15142
--- /dev/null
+++ b/toolbox-Make-the-build-flags-match-RHEL-9.patch
@@ -0,0 +1,50 @@
+From ff1320fa869f1e4952836436ab2ad928cbba0987 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Mon, 29 Jun 2020 17:57:47 +0200
+Subject: [PATCH] build: Make the build flags match RHEL 9's %{gobuildflags}
+
+These reflect the defaults for RHEL 9.5, because RHEL 9.6 is still early
+in its development cycle and the defaults may be in a state of flux.
+
+Note that these flags are meant for every CPU architecture other than
+PPC64, and should be kept updated to match RHEL 9's Go guidelines. Use
+'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
+---
+ src/go-build-wrapper | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/go-build-wrapper b/src/go-build-wrapper
+index a5a1a6a508fb..0a2c7526f210 100755
+--- a/src/go-build-wrapper
++++ b/src/go-build-wrapper
+@@ -33,9 +33,9 @@ if ! cd "$1"; then
+     exit 1
+ fi
+ 
+-tags=""
++tags="-tags rpm_crashtraceback,${GO_BUILDTAGS:-},libtrust_openssl"
+ if $7; then
+-    tags="-tags migration_path_for_coreos_toolbox"
++    tags="$tags,migration_path_for_coreos_toolbox"
+ fi
+ 
+ if ! libc_dir=$("$5" --print-file-name=libc.so); then
+@@ -114,9 +114,14 @@ dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basen
+ 
+ # shellcheck disable=SC2086
+ go build \
++        -buildmode pie \
++        -compiler gc \
+         $tags \
+         -trimpath \
+-        -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
++        -ldflags "${GO_LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -compressdwarf=false -extldflags '-Wl,-z,relro -Wl,--as-needed -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
++        -a \
++        -v \
++        -x \
+         -o "$2/$3"
+ 
+ exit "$?"
+-- 
+2.46.1
+
diff --git a/toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch b/toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch
deleted file mode 100644
index 15b52a8..0000000
--- a/toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 973600219168f3c4efeb627c103085555327eaa5 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@fedoraproject.org>
-Date: Mon, 29 Jun 2020 17:57:47 +0200
-Subject: [PATCH] build: Make the build flags match RHEL's %{gobuildflags} for
- PPC64
-
-The Go toolchain also doesn't like the LDFLAGS environment variable as
-exported by RHEL's %{meson} RPM macro, and RHEL's RPM toolchain doesn't
-like the compressed DWARF data generated by the Go toolchain.
-
-Note that these flags are only meant for the "ppc64" CPU architecture,
-and should be kept updated to match RHEL's Go guidelines. Use
-'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
----
- src/go-build-wrapper | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/go-build-wrapper b/src/go-build-wrapper
-index c572d6dfb02b..86f174716608 100755
---- a/src/go-build-wrapper
-+++ b/src/go-build-wrapper
-@@ -33,9 +33,9 @@ if ! cd "$1"; then
-     exit 1
- fi
- 
--tags=""
-+tags="-tags rpm_crashtraceback,${BUILDTAGS:-},libtrust_openssl"
- if $7; then
--    tags="-tags migration_path_for_coreos_toolbox"
-+    tags="$tags,migration_path_for_coreos_toolbox"
- fi
- 
- if ! libc_dir=$("$5" --print-file-name=libc.so); then
-@@ -70,11 +70,16 @@ fi
- 
- dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basename"
- 
-+unset LDFLAGS
-+
- # shellcheck disable=SC2086
- go build \
-+        -compiler gc \
-         $tags \
--        -trimpath \
--        -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
-+        -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -compressdwarf=false -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
-+        -a \
-+        -v \
-+        -x \
-         -o "$2/$3"
- 
- exit "$?"
--- 
-2.39.2
-
diff --git a/toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch b/toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
deleted file mode 100644
index 1fed4da..0000000
--- a/toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From aeaa8cd30a8c5ad33ee1fe6b9e84ecbb28f7264c Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@fedoraproject.org>
-Date: Mon, 29 Jun 2020 17:57:47 +0200
-Subject: [PATCH] build: Make the build flags match RHEL's %{gobuildflags}
-
-The Go toolchain doesn't like the LDFLAGS environment variable as
-exported by RHEL's %{meson} RPM macro, and RHEL's RPM toolchain doesn't
-like the compressed DWARF data generated by the Go toolchain.
-
-Note that these flags are meant for every CPU architecture other than
-PPC64, and should be kept updated to match RHEL's Go guidelines. Use
-'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
----
- src/go-build-wrapper | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/go-build-wrapper b/src/go-build-wrapper
-index c572d6dfb02b..d39764fda0c1 100755
---- a/src/go-build-wrapper
-+++ b/src/go-build-wrapper
-@@ -33,9 +33,9 @@ if ! cd "$1"; then
-     exit 1
- fi
- 
--tags=""
-+tags="-tags rpm_crashtraceback,${BUILDTAGS:-},libtrust_openssl"
- if $7; then
--    tags="-tags migration_path_for_coreos_toolbox"
-+    tags="$tags,migration_path_for_coreos_toolbox"
- fi
- 
- if ! libc_dir=$("$5" --print-file-name=libc.so); then
-@@ -70,11 +70,17 @@ fi
- 
- dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basename"
- 
-+unset LDFLAGS
-+
- # shellcheck disable=SC2086
- go build \
-+        -buildmode pie \
-+        -compiler gc \
-         $tags \
--        -trimpath \
--        -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
-+        -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -compressdwarf=false -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
-+        -a \
-+        -v \
-+        -x \
-         -o "$2/$3"
- 
- exit "$?"
--- 
-2.39.2
-
diff --git a/toolbox.spec b/toolbox.spec
index 917c63d..36e3d1c 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -49,8 +49,8 @@ Patch1:        toolbox-Update-fallback-release-to-40-for-non-fedo.patch
 Patch100:      toolbox-Make-the-build-flags-match-Fedora.patch
 
 # RHEL specific
-Patch200:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
-Patch201:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch
+Patch200:      toolbox-Make-the-build-flags-match-RHEL-9.patch
+Patch201:      toolbox-Make-the-build-flags-match-RHEL-10.patch
 Patch202:      toolbox-Add-migration-paths-for-coreos-toolbox-users.patch
 
 BuildRequires: gcc
@@ -217,9 +217,11 @@ The %{name}-tests package contains system tests for %{name}.
 %endif
 
 %if 0%{?rhel}
-%ifnarch ppc64
+%if 0%{?rhel} == 9
 %patch -P200 -p1
-%else
+%endif
+
+%if 0%{?rhel} == 10
 %patch -P201 -p1
 %endif
 

From 396be8f54768330ed55694f1db55df1f078f0b2e Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Mon, 7 Oct 2024 16:39:14 +0200
Subject: [PATCH 21/22] Don't use slirp4netns(1) in tests to work around bug in
 pasta(1)

---
 toolbox-Revert-Work-around-bug-in-past.patch | 81 ++++++++++++++++++++
 toolbox.spec                                 |  7 +-
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 toolbox-Revert-Work-around-bug-in-past.patch

diff --git a/toolbox-Revert-Work-around-bug-in-past.patch b/toolbox-Revert-Work-around-bug-in-past.patch
new file mode 100644
index 0000000..5597a9f
--- /dev/null
+++ b/toolbox-Revert-Work-around-bug-in-past.patch
@@ -0,0 +1,81 @@
+From ed14cd483ae45c5f4cf5596b11c384f4b42bb53b Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <rishi@fedoraproject.org>
+Date: Fri, 4 Oct 2024 22:09:03 +0200
+Subject: [PATCH] Revert "playbooks, test/system: Work around bug in pasta(1)
+ networks"
+
+The bug in pasta(1) that necessitated this workaround has since been
+fixed in passt 2024_05_10.7288448 [1].  Some host operating systems like
+CentOS Stream 10 no longer have slirp4netns(1), and it's generally
+better to test the defaults.
+
+This reverts commit b58f9a51088afbfc22edb0b25776cfa2c4d8cc40.
+
+[1] https://github.com/containers/podman/issues/22575
+    https://archives.passt.top/passt-dev/20240508090338.2735208-1-sbrivio@redhat.com/
+    https://archives.passt.top/passt-user/20240510225714.6aa8e6c0@elisabeth/
+
+https://github.com/containers/toolbox/pull/1562
+---
+ playbooks/dependencies-centos-9-stream.yaml | 3 +--
+ playbooks/dependencies-fedora.yaml          | 3 +--
+ test/system/libs/helpers.bash               | 1 -
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/playbooks/dependencies-centos-9-stream.yaml b/playbooks/dependencies-centos-9-stream.yaml
+index 5c1194c03583..d058d314b7b3 100644
+--- a/playbooks/dependencies-centos-9-stream.yaml
++++ b/playbooks/dependencies-centos-9-stream.yaml
+@@ -13,7 +13,6 @@
+       - podman
+       - shadow-utils-subid-devel
+       - skopeo
+-      - slirp4netns
+       - systemd
+       - udisks2
+ 
+@@ -55,7 +54,7 @@
+     chdir: '{{ zuul.project.src_dir }}'
+ 
+ - name: Check versions of crucial packages
+-  command: rpm -qa ShellCheck bats codespell *kernel* gcc *glibc* golang golang-github-cpuguy83-md2man shadow-utils-subid-devel podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo slirp4netns
++  command: rpm -qa ShellCheck bats codespell *kernel* gcc *glibc* golang golang-github-cpuguy83-md2man shadow-utils-subid-devel podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
+ 
+ - name: Show podman versions
+   command: podman version
+diff --git a/playbooks/dependencies-fedora.yaml b/playbooks/dependencies-fedora.yaml
+index ea605135a4c2..8007ce958ddb 100644
+--- a/playbooks/dependencies-fedora.yaml
++++ b/playbooks/dependencies-fedora.yaml
+@@ -35,7 +35,6 @@
+       - podman
+       - shadow-utils-subid-devel
+       - skopeo
+-      - slirp4netns
+       - systemd
+       - udisks2
+     use: "{{ 'dnf' if zuul.attempts > 1 else 'auto' }}"
+@@ -56,7 +55,7 @@
+     chdir: '{{ zuul.project.src_dir }}'
+ 
+ - name: Check versions of crucial packages
+-  command: rpm -qa ShellCheck bash bats codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo slirp4netns
++  command: rpm -qa ShellCheck bash bats codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
+ 
+ - name: Show podman versions
+   command: podman version
+diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash
+index dfd6236c2943..2d05641f5d0a 100644
+--- a/test/system/libs/helpers.bash
++++ b/test/system/libs/helpers.bash
+@@ -195,7 +195,6 @@ function _setup_docker_registry() {
+     --env REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt \
+     --env REGISTRY_HTTP_TLS_KEY=/certs/domain.key \
+     --name "${DOCKER_REG_NAME}" \
+-    --network slirp4netns \
+     --privileged \
+     --publish 50000:5000 \
+     --rm \
+-- 
+2.46.1
+
diff --git a/toolbox.spec b/toolbox.spec
index 36e3d1c..2ac5e73 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -31,7 +31,7 @@ Version:       0.0.99.6
 %endif
 %endif
 
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Tool for interactive command line environments on Linux
 
 License:       ASL 2.0
@@ -44,6 +44,7 @@ Source1:       %{name}.conf
 # Upstream
 Patch0:        toolbox-Unbreak-downstream-Fedora-CI.patch
 Patch1:        toolbox-Update-fallback-release-to-40-for-non-fedo.patch
+Patch2:        toolbox-Revert-Work-around-bug-in-past.patch
 
 # Fedora specific
 Patch100:      toolbox-Make-the-build-flags-match-Fedora.patch
@@ -211,6 +212,7 @@ The %{name}-tests package contains system tests for %{name}.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
+%patch -P2 -p1
 
 %if 0%{?fedora}
 %patch -P100 -p1
@@ -293,6 +295,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
 
 
 %changelog
+* Mon Oct 07 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-5
+- Don't use slirp4netns(1) in tests to work around bug in pasta(1)
+
 * Fri Oct 04 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-4
 - Use the fedora-toolbox:40 image for Fedora Asahi Remix hosts
 

From 50858dfbf5ea753b632464b80c268deb8e4fc996 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mon, 7 Oct 2024 17:43:14 -0400
Subject: [PATCH 22/22] Fix ELN build

Otherwise, it fails with:
  Processing files: toolbox-debugsource-0.0.99.6-5.eln143.x86_64
  RPM build errors:
  error: Empty %files file
    /builddir/build/BUILD/toolbox-0.0.99.6-build/toolbox-0.0.99.6/debugsourcefiles.list
      Empty %files file
        /builddir/build/BUILD/toolbox-0.0.99.6-build/toolbox-0.0.99.6/debugsourcefiles.list
  Child return code was: 1

https://src.fedoraproject.org/rpms/toolbox/pull-request/23
---
 toolbox.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/toolbox.spec b/toolbox.spec
index 2ac5e73..a58d522 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -28,6 +28,8 @@ Version:       0.0.99.6
 %global toolbx_go 1.22.5
 %elif 0%{?rhel} == 10
 %global toolbx_go 1.22.5
+%elif 0%{?rhel} > 10
+%global toolbx_go 1.23.1
 %endif
 %endif
 
@@ -223,7 +225,7 @@ The %{name}-tests package contains system tests for %{name}.
 %patch -P200 -p1
 %endif
 
-%if 0%{?rhel} == 10
+%if 0%{?rhel} >= 10
 %patch -P201 -p1
 %endif