diff --git a/.gitignore b/.gitignore index 2625054..2d91b82 100644 --- a/.gitignore +++ b/.gitignore @@ -32,8 +32,4 @@ /toolbox-0.0.99.4-vendored.tar.xz /toolbox-0.0.99.5-vendored.tar.xz /toolbox-0.0.99.6-vendored.tar.xz -/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 diff --git a/sources b/sources index f30b3d7..a197a89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (toolbox-0.3-vendored.tar.xz) = e464aba1c40b37b0ed027a560a0685e5dc8f07684d33d0e2bac5f0ba8c2b2c2a4c585db8847b23bd0753e33d37e3e88c87ab71d3999c3afedf315717f468c0ba +SHA512 (toolbox-0.1.1-vendored.tar.xz) = dc3aa19f504de49addfe85fa800a0e553c65292cf0d48bca60946251fb8d7ba8bc53c9411a7db5f83f1d256ec960b0f22d2d5798f022be5b704c2bf3531f4ba1 diff --git a/tests/main.fmf b/tests/main.fmf index 25a6fe7..c489385 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -6,7 +6,5 @@ require: /rootless: summary: rootless test - test: | - rpm --erase p11-kit-server - bash ./rootless-test.sh - duration: 4h + test: bash ./rootless-test.sh + duration: 120m diff --git a/tests/tmt-envvars b/tests/tmt-envvars index 6f3176e..6b4b747 100644 --- a/tests/tmt-envvars +++ b/tests/tmt-envvars @@ -1 +1,18 @@ +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 diff --git a/toolbox-Add-migration-paths-for-coreos-toolbox-users.patch b/toolbox-Add-migration-paths-for-coreos-toolbox-users.patch index aec1779..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 4649e50c28321185cbaa81a37efbd317b84ae840 Mon Sep 17 00:00:00 2001 +From c25ad44b7cb50d470b1533931b7808cc194f0d50 Mon Sep 17 00:00:00 2001 From: Debarshi Ray 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 ceb277a3640a..72b673f506b3 100644 +index 719c0d6abb20..92a097283f38 100644 --- a/src/cmd/run.go +++ b/src/cmd/run.go -@@ -576,6 +576,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 ceb277a3640a..72b673f506b3 100644 "--preserve-fds", preserveFDs, }...) -- -2.51.0 +2.46.1 -From b2ba8445bee988143d546bc15fa3a8a8c019aa2e Mon Sep 17 00:00:00 2001 +From e7877a4d1d38dc35aa6da6c012ec9a23397b7aa4 Mon Sep 17 00:00:00 2001 From: Debarshi Ray 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 f7cd3f5480ab..7ad5f72e792f 100644 +index a8bfbc2c79d2..5dd14025ea0b 100644 --- a/test/system/002-help.bats +++ b/test/system/002-help.bats -@@ -33,20 +33,6 @@ teardown_file() { +@@ -33,20 +33,6 @@ teardown() { cleanup_all } @@ -100,5 +100,5 @@ index 000000000000..cf35d60ac25c + skip "Testing of entering toolboxes is not implemented" +} -- -2.51.0 +2.46.1 diff --git a/toolbox-Make-the-build-flags-match-Fedora.patch b/toolbox-Make-the-build-flags-match-Fedora.patch index 5ee5fd4..27fd99d 100644 --- a/toolbox-Make-the-build-flags-match-Fedora.patch +++ b/toolbox-Make-the-build-flags-match-Fedora.patch @@ -1,26 +1,11 @@ -From a1bb7d53fab70899c991feb9276cf93a12280750 Mon Sep 17 00:00:00 2001 +From 7dc70160c8ff531473004e879dd57ec303789d71 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 29 Jun 2020 17:57:47 +0200 Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags} -These reflect the defaults for Fedora 39, which is the oldest supported -Fedora, barring some exceptions mentioned below. - -The change to use the RPM's %{name}, %{version}, %{release} and the -SOURCE_DATE_EPOCH environment variable [1], 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 Fedora's Go guidelines. Use 'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro. - -[1] https://reproducible-builds.org/docs/source-date-epoch/ - -[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(-) @@ -58,5 +43,5 @@ index a5a1a6a508fb..5978422e9aed 100755 exit "$?" -- -2.51.0 +2.46.1 diff --git a/toolbox-Make-the-build-flags-match-RHEL-10.patch b/toolbox-Make-the-build-flags-match-RHEL-10.patch index 9528088..e43e0eb 100644 --- a/toolbox-Make-the-build-flags-match-RHEL-10.patch +++ b/toolbox-Make-the-build-flags-match-RHEL-10.patch @@ -1,4 +1,4 @@ -From f79f96fb8f3ec528952b9719f356e871837987df Mon Sep 17 00:00:00 2001 +From f08f64c0d5f2019055381c3c00426fe8545e5e31 Mon Sep 17 00:00:00 2001 From: Debarshi Ray 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.51.0 +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 index 492268a..2c15142 100644 --- a/toolbox-Make-the-build-flags-match-RHEL-9.patch +++ b/toolbox-Make-the-build-flags-match-RHEL-9.patch @@ -1,4 +1,4 @@ -From 2d1b4b2492c65abd0d0bf0c71c971f550447412d Mon Sep 17 00:00:00 2001 +From ff1320fa869f1e4952836436ab2ad928cbba0987 Mon Sep 17 00:00:00 2001 From: Debarshi Ray 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.51.0 +2.46.1 diff --git a/toolbox.rpmlintrc b/toolbox.rpmlintrc deleted file mode 100644 index 150b710..0000000 --- a/toolbox.rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter(r'no-%check-section') diff --git a/toolbox.spec b/toolbox.spec index 09e3785..9e49e69 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -1,16 +1,7 @@ %global __brp_check_rpaths %{nil} -%if 0%{?rhel} -%if 0%{?rhel} <= 9 -%{!?bash_completions_dir: %global bash_completions_dir %{_datadir}/bash-completion/completions} -%{!?fish_completions_dir: %global fish_completions_dir %{_datadir}/fish/vendor_completions.d} -%{!?zsh_completions_dir: %global zsh_completions_dir %{_datadir}/zsh/site-functions} -%endif -%endif - - Name: toolbox -Version: 0.3 +Version: 0.1.1 %global goipath github.com/containers/%{name} @@ -26,10 +17,10 @@ Version: 0.3 %endif %endif -%global toolbx_go 1.22 +%global toolbx_go 1.20 %if 0%{?fedora} -%global toolbx_go 1.24.7 +%global toolbx_go 1.22.7 %endif %if 0%{?rhel} @@ -38,11 +29,11 @@ Version: 0.3 %elif 0%{?rhel} == 10 %global toolbx_go 1.22.5 %elif 0%{?rhel} > 10 -%global toolbx_go 1.24.4 +%global toolbx_go 1.23.1 %endif %endif -Release: 2%{?dist} +Release: 1%{?dist} Summary: Tool for interactive command line environments on Linux License: Apache-2.0 @@ -65,26 +56,43 @@ BuildRequires: go-md2man BuildRequires: golang >= %{toolbx_go} BuildRequires: meson >= 0.58.0 BuildRequires: pkgconfig(bash-completion) -BuildRequires: shadow-utils-subid-devel >= 4.16.0 +BuildRequires: shadow-utils-subid-devel 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.2 +BuildRequires: golang(github.com/acobaugh/osrelease) >= 0.1.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.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/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-ipath(golang.org/x/sys) >= 0.24.0 +BuildRequires: golang(golang.org/x/text) >= 0.3.8 +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.9.0 # BuildRequires: ShellCheck %endif -Recommends: p11-kit-server Recommends: skopeo -%if ! 0%{?rhel} -Recommends: fuse-overlayfs -%endif Requires: containers-common -Requires: flatpak-session-helper Requires: podman >= 1.6.4 -Requires: shadow-utils-subid%{?_isa} >= 4.16.0 +Requires: shadow-utils-subid%{?_isa} +%if ! 0%{?rhel} +Requires: flatpak-session-helper +%endif %description @@ -143,22 +151,24 @@ The %{name}-tests package contains system tests for %{name}. %endif %endif -%gomkdir -s %{_builddir}/%{extractdir}/src -k +%gomkdir -s %{_builddir}/%{extractdir}/src %{?rhel:-k} %build +export %{gomodulesmode} +export GOPATH=%{gobuilddir}:%{gopath} export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" %meson \ %if 0%{?rhel} - -Dfish_completions_dir=%{fish_completions_dir} \ + -Dfish_completions_dir=%{_datadir}/fish/vendor_completions.d \ %if 0%{?rhel} <= 9 -Dmigration_path_for_coreos_toolbox=true \ %endif %endif -Dprofile_dir=%{_sysconfdir}/profile.d \ -Dtmpfiles_dir=%{_tmpfilesdir} \ - -Dzsh_completions_dir=%{zsh_completions_dir} + -Dzsh_completions_dir=%{_datadir}/zsh/site-functions %meson_build @@ -179,17 +189,17 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf %files %doc CODE-OF-CONDUCT.md CONTRIBUTING.md GOALS.md NEWS README.md SECURITY.md -%license COPYING src/vendor/modules.txt +%license COPYING %{?rhel:src/vendor/modules.txt} %{_bindir}/%{name} +%{_datadir}/bash-completion +%{_datadir}/fish +%{_datadir}/zsh %{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}-*.1* %{_mandir}/man5/%{name}.conf.5* %config(noreplace) %{_sysconfdir}/containers/%{name}.conf %{_sysconfdir}/profile.d/%{name}.sh %{_tmpfilesdir}/%{name}.conf -%{bash_completions_dir}/%{name}.bash -%{fish_completions_dir}/%{name}.fish -%{zsh_completions_dir}/_%{name} %files tests @@ -197,40 +207,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf %changelog -* Fri Oct 10 2025 Alejandro Sáez - 0.3-2 -- rebuild - -* Wed Sep 17 2025 Debarshi Ray - 0.3-1 -- Update to 0.3 - -* Fri Aug 15 2025 Maxwell G - 0.2-2 -- Rebuild for golang-1.25.0 - -* Sat Aug 09 2025 Debarshi Ray - 0.2-1 -- Update to 0.2 -- Fix CVE-2025-23266, CVE-2025-23267, and GHSA-fv92-fjc5-jj9h or GO-2025-3787 - -* Fri Jul 25 2025 Fedora Release Engineering - 0.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 03 2025 Debarshi Ray - 0.1.2-1 -- Update to 0.1.2 - -* Wed Jan 22 2025 Debarshi Ray - 0.1.1-3 -- Use RPM macros for shell completions and clean up directory ownership - -* Sun Jan 19 2025 Fedora Release Engineering - 0.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Mon Nov 04 2024 Debarshi Ray - 0.1.1-1 - Update to 0.1.1 -* Tue Oct 22 2024 Debarshi Ray - 0.1.0-1 -- Update to 0.1.0 - -* Wed Oct 16 2024 Debarshi Ray - 0.0.99.6-6 -- Recommend fuse-overlayfs because old containers created with it need it - * Mon Oct 07 2024 Debarshi Ray - 0.0.99.6-5 - Don't use slirp4netns(1) in tests to work around bug in pasta(1) @@ -246,21 +225,15 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf * Mon Sep 30 2024 Debarshi Ray - 0.0.99.6-1 - Update to 0.0.99.6 -* Thu Sep 12 2024 Debarshi Ray - 0.0.99.5-18 -- Rebuild against shadow-utils-subid ABI version 5.0.0 - -* Thu Aug 08 2024 Debarshi Ray - 0.0.99.5-17 +* Thu Aug 08 2024 Debarshi Ray - 0.0.99.5-16 - Ensure slirp4netns(1) is installed -* Wed Jul 31 2024 Debarshi Ray - 0.0.99.5-16 +* Wed Jul 31 2024 Debarshi Ray - 0.0.99.5-15 - Avoid running out of storage space when running the tests -* Fri Jul 26 2024 Adam Williamson - 0.0.99.5-15 +* Fri Jul 26 2024 Adam Williamson - 0.0.99.5-14 - Fix CI test (hopefully) -* Sat Jul 20 2024 Fedora Release Engineering - 0.0.99.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Thu Jul 11 2024 Debarshi Ray - 0.0.99.5-13 - Silence 'rpminspect --tests=stack-prot'