Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5d6440fe4a | ||
|
|
42fc7a6d5e | ||
|
|
ed29d96716 |
10 changed files with 30 additions and 37 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -35,3 +35,5 @@
|
|||
/toolbox-0.1.0-vendored.tar.xz
|
||||
/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
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (toolbox-0.1.2-vendored.tar.xz) = 1d1b461b84d0c995c4f793eb154815c1ed68ce3545dfb8e711a0061484efb988e796bca43f7ada3c8d9eb0673c6c1fe9f923226eff6e7bc3de9e4b2e2e44485e
|
||||
SHA512 (toolbox-0.3-vendored.tar.xz) = e464aba1c40b37b0ed027a560a0685e5dc8f07684d33d0e2bac5f0ba8c2b2c2a4c585db8847b23bd0753e33d37e3e88c87ab71d3999c3afedf315717f468c0ba
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@ require:
|
|||
test: |
|
||||
rpm --erase p11-kit-server
|
||||
bash ./rootless-test.sh
|
||||
duration: 150m
|
||||
duration: 3h 30m
|
||||
|
|
|
|||
|
|
@ -1,18 +1 @@
|
|||
TMT_TREE
|
||||
TMT_PLAN_DATA
|
||||
TMT_VERSION
|
||||
TMT_TEST_NAME
|
||||
TMT_TEST_DATA
|
||||
TMT_TEST_SERIAL_NUMBER
|
||||
TMT_TEST_ITERATION_ID
|
||||
TMT_TEST_METADATA
|
||||
TMT_SOURCE_DIR
|
||||
TMT_REBOOT_COUNT
|
||||
TMT_TEST_RESTART_COUNT
|
||||
TMT_TOPOLOGY_BASH
|
||||
TMT_TOPOLOGY_YAML
|
||||
TMT_TEST_PIDFILE
|
||||
TMT_TEST_PIDFILE_LOCK
|
||||
TMT_TEST_PIDFILE_ROOT
|
||||
ROOTLESS_USER
|
||||
TMPDIR
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 401abbfb6f820670bc14ca5c555151a0a657b67b 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 7094c3a4eec9..f6c7acffe76a 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 7094c3a4eec9..f6c7acffe76a 100644
|
|||
"--preserve-fds", preserveFDs,
|
||||
}...)
|
||||
--
|
||||
2.49.0
|
||||
2.51.0
|
||||
|
||||
|
||||
From a5d5fdfe8539af0a23af5a5503197389a0a4d0dd 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
|
||||
|
|
@ -42,10 +42,10 @@ ca899c8a561f357ae32c6ba6813520fd8b682abb and the parts of commit
|
|||
create mode 100644 test/system/100-root.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
|
||||
+++ b/test/system/002-help.bats
|
||||
@@ -34,20 +34,6 @@ teardown_file() {
|
||||
@@ -33,20 +33,6 @@ teardown_file() {
|
||||
cleanup_all
|
||||
}
|
||||
|
||||
|
|
@ -100,5 +100,5 @@ index 000000000000..cf35d60ac25c
|
|||
+ skip "Testing of entering toolboxes is not implemented"
|
||||
+}
|
||||
--
|
||||
2.49.0
|
||||
2.51.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 767c59c40128dda3d29191be8289ff16af888187 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.49.0
|
||||
2.51.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 2090a139dc6b9be6d51fbd7875fda06b6502cda0 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.49.0
|
||||
2.51.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 3603ef5eff9615b7df2bf665fd5edc9434d99f6e 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.49.0
|
||||
2.51.0
|
||||
|
||||
|
|
|
|||
1
toolbox.rpmlintrc
Normal file
1
toolbox.rpmlintrc
Normal file
|
|
@ -0,0 +1 @@
|
|||
addFilter(r'no-%check-section')
|
||||
15
toolbox.spec
15
toolbox.spec
|
|
@ -1,7 +1,7 @@
|
|||
%global __brp_check_rpaths %{nil}
|
||||
|
||||
Name: toolbox
|
||||
Version: 0.1.2
|
||||
Version: 0.3
|
||||
|
||||
%global goipath github.com/containers/%{name}
|
||||
|
||||
|
|
@ -17,10 +17,10 @@ Version: 0.1.2
|
|||
%endif
|
||||
%endif
|
||||
|
||||
%global toolbx_go 1.21
|
||||
%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,7 +29,7 @@ Version: 0.1.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
|
||||
|
||||
|
|
@ -188,6 +188,13 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Sep 17 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.3-1
|
||||
- Update to 0.3
|
||||
|
||||
* Sat Aug 09 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.2-1
|
||||
- Update to 0.2
|
||||
- Fix CVE-2025-23266, CVE-2025-23267, and GHSA-fv92-fjc5-jj9h or GO-2025-3787
|
||||
|
||||
* Tue Jun 03 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.2-1
|
||||
- Update to 0.1.2
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue