import UBI toolbox-0.2-1.el10_0

2025-08-12 10:59:30 +00:00 · 2025-08-12 10:59:30 +00:00 · 4824e7f783
commit 4824e7f783
parent a02ceea5c3
7 changed files with 57 additions and 51 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-toolbox-0.1.1-vendored.tar.xz
+toolbox-0.2-vendored.tar.xz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (toolbox-0.1.1-vendored.tar.xz) = dc3aa19f504de49addfe85fa800a0e553c65292cf0d48bca60946251fb8d7ba8bc53c9411a7db5f83f1d256ec960b0f22d2d5798f022be5b704c2bf3531f4ba1
+SHA512 (toolbox-0.2-vendored.tar.xz) = 670737a5911d62c0492fcc27cbee51fbfa909ad2f6dbc4ea035048b122857e8c0f37294db0ce29503c7e5c01e12eb90c30f7f6ce7b2e54662f3332c076cd77bd
--- 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 c25ad44b7cb50d470b1533931b7808cc194f0d50 Mon Sep 17 00:00:00 2001
+From b0f4d55b16e59375012ea0ffbfe31086cbef2fef 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 719c0d6abb20..92a097283f38 100644
+index 389ea1615234..2e78a3ba3ecd 100644
 --- a/src/cmd/run.go
 +++ b/src/cmd/run.go
-@@ -566,6 +566,7 @@ func constructExecArgs(container, preserveFDs string,
+@@ -573,6 +573,7 @@ func constructExecArgs(container, preserveFDs string,
 	execArgs = append(execArgs, envOptions...)
 
 	execArgs = append(execArgs, []string{
@ -22,10 +22,10 @@ index 719c0d6abb20..92a097283f38 100644
 		"--preserve-fds", preserveFDs,
 	}...)
 -- 
-2.46.1
+2.50.1


-From e7877a4d1d38dc35aa6da6c012ec9a23397b7aa4 Mon Sep 17 00:00:00 2001
+From d4e03324f5d263fdb7c9b10270dd7ed251d5aa9e 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 a8bfbc2c79d2..5dd14025ea0b 100644
+index f7cd3f5480ab..7ad5f72e792f 100644
 --- a/test/system/002-help.bats
 +++ b/test/system/002-help.bats
-@@ -33,20 +33,6 @@ teardown() {
+@@ -33,20 +33,6 @@ teardown_file() {
   cleanup_all
 }
 
@ -100,5 +100,5 @@ index 000000000000..cf35d60ac25c
 +  skip "Testing of entering toolboxes is not implemented"
 +}
 -- 
-2.46.1
+2.50.1

--- a/toolbox-Make-the-build-flags-match-Fedora.patch
+++ b/toolbox-Make-the-build-flags-match-Fedora.patch
@ -1,11 +1,26 @@
-From 7dc70160c8ff531473004e879dd57ec303789d71 Mon Sep 17 00:00:00 2001
+From 2ad3ed22992dd74c3deb697bdf165bf1e37479ae 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}

+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(-)
@ -43,5 +58,5 @@ index a5a1a6a508fb..5978422e9aed 100755
 
 exit "$?"
 -- 
-2.46.1
+2.50.1

--- 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 f08f64c0d5f2019055381c3c00426fe8545e5e31 Mon Sep 17 00:00:00 2001
+From e39af9ab2105d7d7b49b22d22895b3799efee2ef 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.46.1
+2.50.1

--- 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 ff1320fa869f1e4952836436ab2ad928cbba0987 Mon Sep 17 00:00:00 2001
+From 26bef6542102509a9706bf97122a7ff2130383f8 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.46.1
+2.50.1

--- a/toolbox.spec
+++ b/toolbox.spec
@ -1,7 +1,7 @@
 %global __brp_check_rpaths %{nil}

 Name:          toolbox
-Version:       0.1.1
+Version:       0.2

 %global goipath github.com/containers/%{name}

@ -17,10 +17,10 @@ Version:       0.1.1
 %endif
 %endif

-%global toolbx_go 1.20
+%global toolbx_go 1.22

 %if 0%{?fedora}
-%global toolbx_go 1.22.7
+%global toolbx_go 1.23.9
 %endif

 %if 0%{?rhel}
@ -29,7 +29,7 @@ Version:       0.1.1
 %elif 0%{?rhel} == 10
 %global toolbx_go 1.22.5
 %elif 0%{?rhel} > 10
-%global toolbx_go 1.23.1
+%global toolbx_go 1.24.3
 %endif
 %endif

@ -60,42 +60,22 @@ 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}
-%if ! 0%{?rhel}
-Requires:      flatpak-session-helper
-%endif


 %description
@ -154,24 +134,22 @@ The %{name}-tests package contains system tests for %{name}.
 %endif
 %endif

-%gomkdir -s %{_builddir}/%{extractdir}/src %{?rhel:-k}
+%gomkdir -s %{_builddir}/%{extractdir}/src -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=%{_datadir}/fish/vendor_completions.d \
+    -Dfish_completions_dir=%{fish_completions_dir} \
 %if 0%{?rhel} <= 9
    -Dmigration_path_for_coreos_toolbox=true \
 %endif
 %endif
    -Dprofile_dir=%{_sysconfdir}/profile.d \
    -Dtmpfiles_dir=%{_tmpfilesdir} \
-    -Dzsh_completions_dir=%{_datadir}/zsh/site-functions
+    -Dzsh_completions_dir=%{zsh_completions_dir}

 %meson_build

@ -192,17 +170,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 %{?rhel:src/vendor/modules.txt}
+%license COPYING 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
@ -210,6 +188,19 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf


 %changelog
+* Sun Aug 10 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
+Resolves: RHEL-104451
+
+* Mon Jun 16 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.2-1
+- Update to 0.1.2
+Resolves: RHEL-104451
+
+* Mon Jun 16 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.1-2
+- Add 'Requires: flatpak-session-helper'
+Resolves: RHEL-104451
+
 * Fri Nov 01 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.1.1-1
 - Update to 0.1.1
 Resolves: RHEL-61904