Update to 0.3

Resolves: RHEL-117476
This commit is contained in:
Debarshi Ray 2025-10-03 14:59:08 +02:00
parent ae22702e64
commit 23cb68cdd6
7 changed files with 22 additions and 17 deletions

1
.gitignore vendored
View File

@ -35,3 +35,4 @@
/toolbox-0.1.1-vendored.tar.xz
/toolbox-0.1.2-vendored.tar.xz
/toolbox-0.2-vendored.tar.xz
/toolbox-0.3-vendored.tar.xz

View File

@ -1 +1 @@
SHA512 (toolbox-0.2-vendored.tar.xz) = 670737a5911d62c0492fcc27cbee51fbfa909ad2f6dbc4ea035048b122857e8c0f37294db0ce29503c7e5c01e12eb90c30f7f6ce7b2e54662f3332c076cd77bd
SHA512 (toolbox-0.3-vendored.tar.xz) = e464aba1c40b37b0ed027a560a0685e5dc8f07684d33d0e2bac5f0ba8c2b2c2a4c585db8847b23bd0753e33d37e3e88c87ab71d3999c3afedf315717f468c0ba

View File

@ -1,4 +1,4 @@
From b0f4d55b16e59375012ea0ffbfe31086cbef2fef Mon Sep 17 00:00:00 2001
From 4649e50c28321185cbaa81a37efbd317b84ae840 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 389ea1615234..2e78a3ba3ecd 100644
index ceb277a3640a..72b673f506b3 100644
--- a/src/cmd/run.go
+++ b/src/cmd/run.go
@@ -573,6 +573,7 @@ func constructExecArgs(container, preserveFDs string,
@@ -576,6 +576,7 @@ func constructExecArgs(container, preserveFDs string,
execArgs = append(execArgs, envOptions...)
execArgs = append(execArgs, []string{
@ -22,10 +22,10 @@ index 389ea1615234..2e78a3ba3ecd 100644
"--preserve-fds", preserveFDs,
}...)
--
2.50.1
2.51.0
From d4e03324f5d263fdb7c9b10270dd7ed251d5aa9e Mon Sep 17 00:00:00 2001
From b2ba8445bee988143d546bc15fa3a8a8c019aa2e 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
@ -100,5 +100,5 @@ index 000000000000..cf35d60ac25c
+ skip "Testing of entering toolboxes is not implemented"
+}
--
2.50.1
2.51.0

View File

@ -1,4 +1,4 @@
From 2ad3ed22992dd74c3deb697bdf165bf1e37479ae Mon Sep 17 00:00:00 2001
From a1bb7d53fab70899c991feb9276cf93a12280750 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}
@ -58,5 +58,5 @@ index a5a1a6a508fb..5978422e9aed 100755
exit "$?"
--
2.50.1
2.51.0

View File

@ -1,4 +1,4 @@
From e39af9ab2105d7d7b49b22d22895b3799efee2ef Mon Sep 17 00:00:00 2001
From f79f96fb8f3ec528952b9719f356e871837987df 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}
@ -67,5 +67,5 @@ index a5a1a6a508fb..5978422e9aed 100755
exit "$?"
--
2.50.1
2.51.0

View File

@ -1,4 +1,4 @@
From 26bef6542102509a9706bf97122a7ff2130383f8 Mon Sep 17 00:00:00 2001
From 2d1b4b2492c65abd0d0bf0c71c971f550447412d 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}
@ -46,5 +46,5 @@ index a5a1a6a508fb..0a2c7526f210 100755
exit "$?"
--
2.50.1
2.51.0

View File

@ -1,7 +1,7 @@
%global __brp_check_rpaths %{nil}
Name: toolbox
Version: 0.2
Version: 0.3
%global goipath github.com/containers/%{name}
@ -20,7 +20,7 @@ Version: 0.2
%global toolbx_go 1.22
%if 0%{?fedora}
%global toolbx_go 1.23.9
%global toolbx_go 1.24.7
%endif
%if 0%{?rhel}
@ -29,11 +29,11 @@ Version: 0.2
%elif 0%{?rhel} == 10
%global toolbx_go 1.22.5
%elif 0%{?rhel} > 10
%global toolbx_go 1.24.3
%global toolbx_go 1.24.4
%endif
%endif
Release: 2%{?dist}
Release: 1%{?dist}
Summary: Tool for interactive command line environments on Linux
License: Apache-2.0
@ -188,6 +188,10 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
%changelog
* Fri Oct 03 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.3-1
- Update to 0.3
Resolves: RHEL-117476
* Mon Aug 11 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.2-2
- Update to 0.2
- Fix CVE-2025-23266, CVE-2025-23267, and GHSA-fv92-fjc5-jj9h or GO-2025-3787