Update to 0.2
... and fix CVE-2025-23266, CVE-2025-23267, and GHSA-fv92-fjc5-jj9h or GO-2025-3787. The following rpmlint warning was silenced: toolbox.spec: W: no-%check-section The Release was set to 2, so that this CentOS Stream 9 build (ie., toolbox-0.2-2.el9) is considered newer than the corresponding RHEL 9.6 Z-stream build (ie., toolbox-0.2-1.el9_6): $ rpmdev-vercmp 0.2-1.el9 0.2-1.el9_6 0.2-1.el9 < 0.2-1.el9_6 $ rpmdev-vercmp 0.2-2.el9 0.2-1.el9_6 0.2-2.el9 > 0.2-1.el9_6 Resolves: RHEL-104455
This commit is contained in:
parent
72e3941fc3
commit
ccf6384a66
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (toolbox-0.1.2-vendored.tar.xz) = 1d1b461b84d0c995c4f793eb154815c1ed68ce3545dfb8e711a0061484efb988e796bca43f7ada3c8d9eb0673c6c1fe9f923226eff6e7bc3de9e4b2e2e44485e
|
SHA512 (toolbox-0.2-vendored.tar.xz) = 670737a5911d62c0492fcc27cbee51fbfa909ad2f6dbc4ea035048b122857e8c0f37294db0ce29503c7e5c01e12eb90c30f7f6ce7b2e54662f3332c076cd77bd
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 401abbfb6f820670bc14ca5c555151a0a657b67b Mon Sep 17 00:00:00 2001
|
From b0f4d55b16e59375012ea0ffbfe31086cbef2fef Mon Sep 17 00:00:00 2001
|
||||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||||
Date: Wed, 18 Aug 2021 17:55:21 +0200
|
Date: Wed, 18 Aug 2021 17:55:21 +0200
|
||||||
Subject: [PATCH 1/2] cmd/run: Make sosreport work by setting the HOST
|
Subject: [PATCH 1/2] cmd/run: Make sosreport work by setting the HOST
|
||||||
@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1940037
|
|||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/src/cmd/run.go b/src/cmd/run.go
|
diff --git a/src/cmd/run.go b/src/cmd/run.go
|
||||||
index 7094c3a4eec9..f6c7acffe76a 100644
|
index 389ea1615234..2e78a3ba3ecd 100644
|
||||||
--- a/src/cmd/run.go
|
--- a/src/cmd/run.go
|
||||||
+++ b/src/cmd/run.go
|
+++ b/src/cmd/run.go
|
||||||
@@ -573,6 +573,7 @@ func constructExecArgs(container, preserveFDs string,
|
@@ -573,6 +573,7 @@ func constructExecArgs(container, preserveFDs string,
|
||||||
@ -22,10 +22,10 @@ index 7094c3a4eec9..f6c7acffe76a 100644
|
|||||||
"--preserve-fds", preserveFDs,
|
"--preserve-fds", preserveFDs,
|
||||||
}...)
|
}...)
|
||||||
--
|
--
|
||||||
2.49.0
|
2.50.1
|
||||||
|
|
||||||
|
|
||||||
From a5d5fdfe8539af0a23af5a5503197389a0a4d0dd Mon Sep 17 00:00:00 2001
|
From d4e03324f5d263fdb7c9b10270dd7ed251d5aa9e Mon Sep 17 00:00:00 2001
|
||||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||||
Date: Fri, 10 Dec 2021 13:42:15 +0100
|
Date: Fri, 10 Dec 2021 13:42:15 +0100
|
||||||
Subject: [PATCH 2/2] test/system: Update to test the migration path for
|
Subject: [PATCH 2/2] test/system: Update to test the migration path for
|
||||||
@ -42,10 +42,10 @@ ca899c8a561f357ae32c6ba6813520fd8b682abb and the parts of commit
|
|||||||
create mode 100644 test/system/100-root.bats
|
create mode 100644 test/system/100-root.bats
|
||||||
|
|
||||||
diff --git a/test/system/002-help.bats b/test/system/002-help.bats
|
diff --git a/test/system/002-help.bats b/test/system/002-help.bats
|
||||||
index 921c23b51a44..192603d71aba 100644
|
index f7cd3f5480ab..7ad5f72e792f 100644
|
||||||
--- a/test/system/002-help.bats
|
--- a/test/system/002-help.bats
|
||||||
+++ b/test/system/002-help.bats
|
+++ b/test/system/002-help.bats
|
||||||
@@ -34,20 +34,6 @@ teardown_file() {
|
@@ -33,20 +33,6 @@ teardown_file() {
|
||||||
cleanup_all
|
cleanup_all
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -100,5 +100,5 @@ index 000000000000..cf35d60ac25c
|
|||||||
+ skip "Testing of entering toolboxes is not implemented"
|
+ skip "Testing of entering toolboxes is not implemented"
|
||||||
+}
|
+}
|
||||||
--
|
--
|
||||||
2.49.0
|
2.50.1
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 767c59c40128dda3d29191be8289ff16af888187 Mon Sep 17 00:00:00 2001
|
From 2ad3ed22992dd74c3deb697bdf165bf1e37479ae Mon Sep 17 00:00:00 2001
|
||||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||||
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
||||||
Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
|
Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
|
||||||
@ -58,5 +58,5 @@ index a5a1a6a508fb..5978422e9aed 100755
|
|||||||
|
|
||||||
exit "$?"
|
exit "$?"
|
||||||
--
|
--
|
||||||
2.49.0
|
2.50.1
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 2090a139dc6b9be6d51fbd7875fda06b6502cda0 Mon Sep 17 00:00:00 2001
|
From e39af9ab2105d7d7b49b22d22895b3799efee2ef Mon Sep 17 00:00:00 2001
|
||||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||||
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
||||||
Subject: [PATCH] build: Make the build flags match RHEL 10's %{gobuildflags}
|
Subject: [PATCH] build: Make the build flags match RHEL 10's %{gobuildflags}
|
||||||
@ -67,5 +67,5 @@ index a5a1a6a508fb..5978422e9aed 100755
|
|||||||
|
|
||||||
exit "$?"
|
exit "$?"
|
||||||
--
|
--
|
||||||
2.49.0
|
2.50.1
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 3603ef5eff9615b7df2bf665fd5edc9434d99f6e Mon Sep 17 00:00:00 2001
|
From 26bef6542102509a9706bf97122a7ff2130383f8 Mon Sep 17 00:00:00 2001
|
||||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||||
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
||||||
Subject: [PATCH] build: Make the build flags match RHEL 9's %{gobuildflags}
|
Subject: [PATCH] build: Make the build flags match RHEL 9's %{gobuildflags}
|
||||||
@ -46,5 +46,5 @@ index a5a1a6a508fb..0a2c7526f210 100755
|
|||||||
|
|
||||||
exit "$?"
|
exit "$?"
|
||||||
--
|
--
|
||||||
2.49.0
|
2.50.1
|
||||||
|
|
||||||
|
1
toolbox.rpmlintrc
Normal file
1
toolbox.rpmlintrc
Normal file
@ -0,0 +1 @@
|
|||||||
|
addFilter(r'no-%check-section')
|
11
toolbox.spec
11
toolbox.spec
@ -1,7 +1,7 @@
|
|||||||
%global __brp_check_rpaths %{nil}
|
%global __brp_check_rpaths %{nil}
|
||||||
|
|
||||||
Name: toolbox
|
Name: toolbox
|
||||||
Version: 0.1.2
|
Version: 0.2
|
||||||
|
|
||||||
%global goipath github.com/containers/%{name}
|
%global goipath github.com/containers/%{name}
|
||||||
|
|
||||||
@ -17,7 +17,7 @@ Version: 0.1.2
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global toolbx_go 1.21
|
%global toolbx_go 1.22
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%global toolbx_go 1.23.9
|
%global toolbx_go 1.23.9
|
||||||
@ -33,7 +33,7 @@ Version: 0.1.2
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Tool for interactive command line environments on Linux
|
Summary: Tool for interactive command line environments on Linux
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
@ -188,6 +188,11 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
||||||
|
Resolves: RHEL-104455
|
||||||
|
|
||||||
* Mon Jun 16 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.2-1
|
* Mon Jun 16 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.2-1
|
||||||
- Update to 0.1.2
|
- Update to 0.1.2
|
||||||
Resolves: RHEL-95209
|
Resolves: RHEL-95209
|
||||||
|
Loading…
Reference in New Issue
Block a user