Compare commits
No commits in common. "c8-stream-2.0" and "c9-beta" have entirely different histories.
c8-stream-
...
c9-beta
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/0.0.7.tar.gz
|
SOURCES/toolbox-0.3-vendored.tar.xz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
c4f1c5b9391558c4626c7bc5882afa9bbe095a9b SOURCES/0.0.7.tar.gz
|
33dfd6f8af6a5a426b4d66593863a7521f6ff694 SOURCES/toolbox-0.3-vendored.tar.xz
|
||||||
|
|||||||
@ -0,0 +1,104 @@
|
|||||||
|
From 85481653d2fdbb8a23ec7552d1a2f589b5ed4694 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
|
||||||
|
environment variable
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1940037
|
||||||
|
---
|
||||||
|
src/cmd/run.go | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/src/cmd/run.go b/src/cmd/run.go
|
||||||
|
index ceb277a3640a..72b673f506b3 100644
|
||||||
|
--- a/src/cmd/run.go
|
||||||
|
+++ b/src/cmd/run.go
|
||||||
|
@@ -576,6 +576,7 @@ func constructExecArgs(container, preserveFDs string,
|
||||||
|
execArgs = append(execArgs, envOptions...)
|
||||||
|
|
||||||
|
execArgs = append(execArgs, []string{
|
||||||
|
+ "--env", "HOST=/run/host",
|
||||||
|
"--interactive",
|
||||||
|
"--preserve-fds", preserveFDs,
|
||||||
|
}...)
|
||||||
|
--
|
||||||
|
2.53.0
|
||||||
|
|
||||||
|
|
||||||
|
From a1df0b1a13f45f086e66631a87fe94d711e41075 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
|
||||||
|
coreos/toolbox users
|
||||||
|
|
||||||
|
This reverts the changes to the tests made in commit
|
||||||
|
411147988b730dabf8b9e761a5426e12d648f008 by restoring commit
|
||||||
|
ca899c8a561f357ae32c6ba6813520fd8b682abb and the parts of commit
|
||||||
|
3aeb7cf288319e35eb9c5e26ea18d97452462c1e that were removed.
|
||||||
|
---
|
||||||
|
test/system/002-help.bats | 14 --------------
|
||||||
|
test/system/100-root.bats | 27 +++++++++++++++++++++++++++
|
||||||
|
2 files changed, 27 insertions(+), 14 deletions(-)
|
||||||
|
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
|
||||||
|
--- a/test/system/002-help.bats
|
||||||
|
+++ b/test/system/002-help.bats
|
||||||
|
@@ -33,20 +33,6 @@ teardown_file() {
|
||||||
|
cleanup_all
|
||||||
|
}
|
||||||
|
|
||||||
|
-@test "help: Smoke test" {
|
||||||
|
- run --keep-empty-lines --separate-stderr "$TOOLBX"
|
||||||
|
-
|
||||||
|
- assert_failure
|
||||||
|
- assert [ ${#lines[@]} -eq 0 ]
|
||||||
|
- lines=("${stderr_lines[@]}")
|
||||||
|
- assert_line --index 0 "Error: missing command"
|
||||||
|
- assert_line --index 2 "create Create a new Toolbx container"
|
||||||
|
- assert_line --index 3 "enter Enter an existing Toolbx container"
|
||||||
|
- assert_line --index 4 "list List all existing Toolbx containers and images"
|
||||||
|
- assert_line --index 6 "Run 'toolbox --help' for usage."
|
||||||
|
- assert [ ${#stderr_lines[@]} -eq 7 ]
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
@test "help: Command 'help'" {
|
||||||
|
if ! command -v man 2>/dev/null; then
|
||||||
|
skip "not found man(1)"
|
||||||
|
diff --git a/test/system/100-root.bats b/test/system/100-root.bats
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000000..cf35d60ac25c
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/system/100-root.bats
|
||||||
|
@@ -0,0 +1,27 @@
|
||||||
|
+#!/usr/bin/env bats
|
||||||
|
+
|
||||||
|
+load 'libs/bats-support/load'
|
||||||
|
+load 'libs/bats-assert/load'
|
||||||
|
+load 'libs/helpers'
|
||||||
|
+
|
||||||
|
+setup() {
|
||||||
|
+ _setup_environment
|
||||||
|
+ cleanup_all
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+teardown() {
|
||||||
|
+ cleanup_all
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+@test "root: Try to enter the default container with no containers created" {
|
||||||
|
+ run "$TOOLBX" <<< "n"
|
||||||
|
+
|
||||||
|
+ assert_success
|
||||||
|
+ assert_line --index 0 "No toolbox containers found. Create now? [y/N] A container can be created later with the 'create' command."
|
||||||
|
+ assert_line --index 1 "Run 'toolbox --help' for usage."
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+# TODO: Write the test
|
||||||
|
+@test "root: Enter the default container when 1 non-default container is present" {
|
||||||
|
+ skip "Testing of entering toolboxes is not implemented"
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.53.0
|
||||||
|
|
||||||
@ -0,0 +1,297 @@
|
|||||||
|
From 2aef63319f5cb66df492efe8409b8748be22a625 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||||
|
Date: Fri, 6 Mar 2026 21:07:54 +0100
|
||||||
|
Subject: [PATCH 1/2] doc, cmd: Tweak the wording and error messages for
|
||||||
|
consistency
|
||||||
|
|
||||||
|
The useradd(8) and usermod(8) manuals use the term 'login shell', except
|
||||||
|
one instance in useradd(8) where it says 'default login shell' [1,2].
|
||||||
|
The toolbox-init-container(1) manual and the 'init-container' command
|
||||||
|
already use 'login shell', and it's shorter than 'default shell'. So,
|
||||||
|
it wins.
|
||||||
|
|
||||||
|
Fallout from the following:
|
||||||
|
* 6c86cabbe5da6e542b50c5c043b4d213c6279bbc
|
||||||
|
* 59055cf9eb03d69a53b7f59a91b8def171da2fef
|
||||||
|
* 662bd899314d74977f8b973989d2548c1bf80fea
|
||||||
|
* 8f30d718066facb0c3db946db07e9c17f38741b7
|
||||||
|
|
||||||
|
[1] https://man7.org/linux/man-pages/man8/useradd.8.html
|
||||||
|
|
||||||
|
[2] https://man7.org/linux/man-pages/man8/usermod.8.html
|
||||||
|
|
||||||
|
https://github.com/containers/toolbox/pull/1767
|
||||||
|
---
|
||||||
|
doc/toolbox-enter.1.md | 4 ++--
|
||||||
|
src/cmd/create.go | 2 +-
|
||||||
|
src/cmd/enter.go | 2 +-
|
||||||
|
src/cmd/rootMigrationPath.go | 2 +-
|
||||||
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/doc/toolbox-enter.1.md b/doc/toolbox-enter.1.md
|
||||||
|
index 4061ef8233ab..2769a6b968f9 100644
|
||||||
|
--- a/doc/toolbox-enter.1.md
|
||||||
|
+++ b/doc/toolbox-enter.1.md
|
||||||
|
@@ -11,8 +11,8 @@ toolbox\-enter - Enter a Toolbx container for interactive use
|
||||||
|
## DESCRIPTION
|
||||||
|
|
||||||
|
Spawns an interactive shell inside a Toolbx container that was created using
|
||||||
|
-the `toolbox create` command. It tries to spawn the user's default shell, but
|
||||||
|
-if it's not available inside the container then it falls back to `/bin/bash`.
|
||||||
|
+the `toolbox create` command. It tries to spawn the user's login shell, but if
|
||||||
|
+it's not available inside the container then it falls back to `/bin/bash`.
|
||||||
|
|
||||||
|
When invoked without any options, `toolbox enter` will try to enter the default
|
||||||
|
Toolbx container for the host, or if there's only one container available then
|
||||||
|
diff --git a/src/cmd/create.go b/src/cmd/create.go
|
||||||
|
index 531721b60f2d..c0ac138aa8d7 100644
|
||||||
|
--- a/src/cmd/create.go
|
||||||
|
+++ b/src/cmd/create.go
|
||||||
|
@@ -406,7 +406,7 @@ func createContainer(container, image, release, authFile string, showCommandToEn
|
||||||
|
|
||||||
|
userShell := os.Getenv("SHELL")
|
||||||
|
if userShell == "" {
|
||||||
|
- return errors.New("failed to get the current user's default shell")
|
||||||
|
+ return errors.New("failed to get the current user's login shell")
|
||||||
|
}
|
||||||
|
|
||||||
|
entryPoint := []string{
|
||||||
|
diff --git a/src/cmd/enter.go b/src/cmd/enter.go
|
||||||
|
index 8602b744ba35..1fc32e8a65d3 100644
|
||||||
|
--- a/src/cmd/enter.go
|
||||||
|
+++ b/src/cmd/enter.go
|
||||||
|
@@ -116,7 +116,7 @@ func enter(cmd *cobra.Command, args []string) error {
|
||||||
|
|
||||||
|
userShell := os.Getenv("SHELL")
|
||||||
|
if userShell == "" {
|
||||||
|
- return errors.New("failed to get the current user's default shell")
|
||||||
|
+ return errors.New("failed to get the current user's login shell")
|
||||||
|
}
|
||||||
|
|
||||||
|
command := []string{userShell, "-l"}
|
||||||
|
diff --git a/src/cmd/rootMigrationPath.go b/src/cmd/rootMigrationPath.go
|
||||||
|
index 38b5d4956515..1c689c829088 100644
|
||||||
|
--- a/src/cmd/rootMigrationPath.go
|
||||||
|
+++ b/src/cmd/rootMigrationPath.go
|
||||||
|
@@ -63,7 +63,7 @@ func rootRunImpl(cmd *cobra.Command, args []string) error {
|
||||||
|
|
||||||
|
userShell := os.Getenv("SHELL")
|
||||||
|
if userShell == "" {
|
||||||
|
- return errors.New("failed to get the current user's default shell")
|
||||||
|
+ return errors.New("failed to get the current user's login shell")
|
||||||
|
}
|
||||||
|
|
||||||
|
command := []string{userShell, "-l"}
|
||||||
|
--
|
||||||
|
2.53.0
|
||||||
|
|
||||||
|
|
||||||
|
From 92eaafa5cc3e32d90f44d79144c30820f5557799 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rolv-Apneseth <rolv.apneseth@gmail.com>
|
||||||
|
Date: Thu, 19 Feb 2026 16:32:04 +0000
|
||||||
|
Subject: [PATCH 2/2] cmd, test/system: Fall back to 'getent passwd' when SHELL
|
||||||
|
is unset
|
||||||
|
|
||||||
|
The SHELL environment variable is supposed to be set during login, as
|
||||||
|
the case may be, by the GNOME Display Manager (or GDM) [1], OpenSSH [2],
|
||||||
|
login(1) [3], su(1) [4], systemd [5], etc.
|
||||||
|
|
||||||
|
During the GNOME login sequence, GDM and the Pluggable Authentication
|
||||||
|
Modules for Linux (or PAM) creates a session with gnome-session(1) as
|
||||||
|
the session leader, and sets the SHELL environment variable on it. Then
|
||||||
|
the session leader sets it in the 'systemd --user' unit activation
|
||||||
|
environment. Meanwhile, the system-wide user@.service has already set
|
||||||
|
SHELL on 'systemd --user', and this gets propagated into the per-user
|
||||||
|
service manager's unit activation environment. This gets overwritten by
|
||||||
|
the same value by gnome-session(1).
|
||||||
|
|
||||||
|
However, sometimes it's unexpectedly missing. eg., the runtime
|
||||||
|
environment of the GitHub Actions workflow [6]; and it has been reported
|
||||||
|
missing on some occasions in Fedora CoreOS, and in RHEL CoreOS spawned
|
||||||
|
by 'oc debug ...' in Red Hat OpenShift clusters. The reasons for these
|
||||||
|
are unclear.
|
||||||
|
|
||||||
|
Therefore, it's worth falling back to 'getent passwd' in those cases to
|
||||||
|
avoid completely breaking the 'create' and 'enter' commands.
|
||||||
|
|
||||||
|
[1] GDM commit 48dfb0c6fc683eb0
|
||||||
|
https://gitlab.gnome.org/GNOME/gdm/-/commit/48dfb0c6fc683eb0
|
||||||
|
|
||||||
|
[2] OpenSSH commit d4a8b7e34dd619a4
|
||||||
|
https://github.com/openssh/openssh-portable/commit/d4a8b7e34dd619a4
|
||||||
|
|
||||||
|
[3] https://man7.org/linux/man-pages/man1/login.1.html
|
||||||
|
|
||||||
|
[4] https://man7.org/linux/man-pages/man1/su.1.html
|
||||||
|
|
||||||
|
[5] https://www.freedesktop.org/software/systemd/man/run0.html
|
||||||
|
https://www.freedesktop.org/software/systemd/man/systemd.exec.html
|
||||||
|
|
||||||
|
[6] Commit c22b09d095c7a8ac
|
||||||
|
https://github.com/containers/toolbox/commit/c22b09d095c7a8ac
|
||||||
|
https://github.com/containers/toolbox/pull/1507
|
||||||
|
https://github.com/orgs/community/discussions/59413
|
||||||
|
|
||||||
|
https://github.com/containers/toolbox/issues/1615
|
||||||
|
https://issues.redhat.com/browse/OCPBUGS-76557
|
||||||
|
|
||||||
|
Signed-off-by: Rolv-Apneseth <rolv.apneseth@gmail.com>
|
||||||
|
---
|
||||||
|
src/cmd/create.go | 6 +++---
|
||||||
|
src/cmd/enter.go | 6 +++---
|
||||||
|
src/cmd/rootMigrationPath.go | 6 +++---
|
||||||
|
src/cmd/utils.go | 39 ++++++++++++++++++++++++++++++++++++
|
||||||
|
test/system/101-create.bats | 29 +++++++++++++++++++++++++++
|
||||||
|
5 files changed, 77 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/cmd/create.go b/src/cmd/create.go
|
||||||
|
index c0ac138aa8d7..908e8f240fba 100644
|
||||||
|
--- a/src/cmd/create.go
|
||||||
|
+++ b/src/cmd/create.go
|
||||||
|
@@ -404,9 +404,9 @@ func createContainer(container, image, release, authFile string, showCommandToEn
|
||||||
|
|
||||||
|
logLevelString := podman.LogLevel.String()
|
||||||
|
|
||||||
|
- userShell := os.Getenv("SHELL")
|
||||||
|
- if userShell == "" {
|
||||||
|
- return errors.New("failed to get the current user's login shell")
|
||||||
|
+ userShell, err := getCurrentUserShell()
|
||||||
|
+ if err != nil {
|
||||||
|
+ return err
|
||||||
|
}
|
||||||
|
|
||||||
|
entryPoint := []string{
|
||||||
|
diff --git a/src/cmd/enter.go b/src/cmd/enter.go
|
||||||
|
index 1fc32e8a65d3..51be3c4b8daa 100644
|
||||||
|
--- a/src/cmd/enter.go
|
||||||
|
+++ b/src/cmd/enter.go
|
||||||
|
@@ -114,9 +114,9 @@ func enter(cmd *cobra.Command, args []string) error {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
- userShell := os.Getenv("SHELL")
|
||||||
|
- if userShell == "" {
|
||||||
|
- return errors.New("failed to get the current user's login shell")
|
||||||
|
+ userShell, err := getCurrentUserShell()
|
||||||
|
+ if err != nil {
|
||||||
|
+ return err
|
||||||
|
}
|
||||||
|
|
||||||
|
command := []string{userShell, "-l"}
|
||||||
|
diff --git a/src/cmd/rootMigrationPath.go b/src/cmd/rootMigrationPath.go
|
||||||
|
index 1c689c829088..9861320b39a4 100644
|
||||||
|
--- a/src/cmd/rootMigrationPath.go
|
||||||
|
+++ b/src/cmd/rootMigrationPath.go
|
||||||
|
@@ -61,9 +61,9 @@ func rootRunImpl(cmd *cobra.Command, args []string) error {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
- userShell := os.Getenv("SHELL")
|
||||||
|
- if userShell == "" {
|
||||||
|
- return errors.New("failed to get the current user's login shell")
|
||||||
|
+ userShell, err := getCurrentUserShell()
|
||||||
|
+ if err != nil {
|
||||||
|
+ return err
|
||||||
|
}
|
||||||
|
|
||||||
|
command := []string{userShell, "-l"}
|
||||||
|
diff --git a/src/cmd/utils.go b/src/cmd/utils.go
|
||||||
|
index 250184f0c4c9..12a5e87a50b6 100644
|
||||||
|
--- a/src/cmd/utils.go
|
||||||
|
+++ b/src/cmd/utils.go
|
||||||
|
@@ -31,6 +31,7 @@ import (
|
||||||
|
"strings"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
|
+ "github.com/containers/toolbox/pkg/shell"
|
||||||
|
"github.com/containers/toolbox/pkg/utils"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"golang.org/x/sys/unix"
|
||||||
|
@@ -383,6 +384,44 @@ func getCurrentUserHomeDir() string {
|
||||||
|
return currentUser.HomeDir
|
||||||
|
}
|
||||||
|
|
||||||
|
+func getCurrentUserShell() (string, error) {
|
||||||
|
+ if currentUser == nil {
|
||||||
|
+ panic("current user unknown")
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if userShell := os.Getenv("SHELL"); userShell != "" {
|
||||||
|
+ return userShell, nil
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ logrus.Debug("Getting the current user's login shell: failed to read SHELL")
|
||||||
|
+ logrus.Debug("Using 'getent passwd' instead")
|
||||||
|
+
|
||||||
|
+ var stderr strings.Builder
|
||||||
|
+ var stdout strings.Builder
|
||||||
|
+
|
||||||
|
+ if err := shell.Run("getent", nil, &stdout, &stderr, "passwd", currentUser.Uid); err != nil {
|
||||||
|
+ errString := stderr.String()
|
||||||
|
+ logrus.Debugf("Getting the current user's login shell failed: %s", errString)
|
||||||
|
+ return "", fmt.Errorf("failed to get the current user's login shell: %w", err)
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ output := stdout.String()
|
||||||
|
+ passwdLine := strings.TrimSpace(output)
|
||||||
|
+ if len(passwdLine) == 0 {
|
||||||
|
+ return "", errors.New("failed to get the current user's login shell: no getent(1) output")
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ passwdLineParts := strings.Split(passwdLine, ":")
|
||||||
|
+ passwdLinePartsCount := len(passwdLineParts)
|
||||||
|
+ if passwdLinePartsCount != 7 {
|
||||||
|
+ logrus.Debugf("Getting the current user's login shell: failed to parse getent(1) output: %s",
|
||||||
|
+ passwdLine)
|
||||||
|
+ return "", errors.New("failed to get the current user's login shell: invalid getent(1) output")
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return passwdLineParts[passwdLinePartsCount-1], nil
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
func getUsageForCommonCommands() string {
|
||||||
|
var builder strings.Builder
|
||||||
|
builder.WriteString("create Create a new Toolbx container\n")
|
||||||
|
diff --git a/test/system/101-create.bats b/test/system/101-create.bats
|
||||||
|
index 58068e4222a7..a31cb12dfa1f 100644
|
||||||
|
--- a/test/system/101-create.bats
|
||||||
|
+++ b/test/system/101-create.bats
|
||||||
|
@@ -60,6 +60,35 @@ teardown() {
|
||||||
|
assert_output "true"
|
||||||
|
}
|
||||||
|
|
||||||
|
+@test "create: Smoke test with SHELL unset" {
|
||||||
|
+ local default_container
|
||||||
|
+ default_container="$(get_system_id)-toolbox-$(get_system_version)"
|
||||||
|
+
|
||||||
|
+ pull_default_image
|
||||||
|
+ unset SHELL
|
||||||
|
+
|
||||||
|
+ run --keep-empty-lines --separate-stderr "$TOOLBX" create
|
||||||
|
+
|
||||||
|
+ assert_success
|
||||||
|
+ assert_line --index 0 "Created container: $default_container"
|
||||||
|
+ assert_line --index 1 "Enter with: toolbox enter"
|
||||||
|
+ assert [ ${#lines[@]} -eq 2 ]
|
||||||
|
+ assert [ ${#stderr_lines[@]} -eq 0 ]
|
||||||
|
+
|
||||||
|
+ run podman ps --all
|
||||||
|
+
|
||||||
|
+ assert_success
|
||||||
|
+ assert_output --regexp "Created[[:blank:]]+$default_container"
|
||||||
|
+
|
||||||
|
+ run podman inspect \
|
||||||
|
+ --format '{{index .Config.Labels "com.github.containers.toolbox"}}' \
|
||||||
|
+ --type container \
|
||||||
|
+ "$default_container"
|
||||||
|
+
|
||||||
|
+ assert_success
|
||||||
|
+ assert_output "true"
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
@test "create: With a custom name (using option --container)" {
|
||||||
|
pull_default_image
|
||||||
|
|
||||||
|
--
|
||||||
|
2.53.0
|
||||||
|
|
||||||
62
SOURCES/toolbox-Make-the-build-flags-match-Fedora.patch
Normal file
62
SOURCES/toolbox-Make-the-build-flags-match-Fedora.patch
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
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}
|
||||||
|
|
||||||
|
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(-)
|
||||||
|
|
||||||
|
diff --git a/src/go-build-wrapper b/src/go-build-wrapper
|
||||||
|
index a5a1a6a508fb..5978422e9aed 100755
|
||||||
|
--- a/src/go-build-wrapper
|
||||||
|
+++ b/src/go-build-wrapper
|
||||||
|
@@ -33,9 +33,9 @@ if ! cd "$1"; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
-tags=""
|
||||||
|
+tags="-tags rpm_crashtraceback,${GO_BUILDTAGS:-}"
|
||||||
|
if $7; then
|
||||||
|
- tags="-tags migration_path_for_coreos_toolbox"
|
||||||
|
+ tags="$tags,migration_path_for_coreos_toolbox"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! libc_dir=$("$5" --print-file-name=libc.so); then
|
||||||
|
@@ -114,9 +114,14 @@ dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basen
|
||||||
|
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
go build \
|
||||||
|
+ -buildmode pie \
|
||||||
|
+ -compiler gc \
|
||||||
|
$tags \
|
||||||
|
-trimpath \
|
||||||
|
- -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
|
||||||
|
+ -ldflags "${GO_LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -compressdwarf=false -extldflags '-Wl,-z,relro -Wl,--as-needed -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes -Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
|
||||||
|
+ -a \
|
||||||
|
+ -v \
|
||||||
|
+ -x \
|
||||||
|
-o "$2/$3"
|
||||||
|
|
||||||
|
exit "$?"
|
||||||
|
--
|
||||||
|
2.51.0
|
||||||
|
|
||||||
71
SOURCES/toolbox-Make-the-build-flags-match-RHEL-10.patch
Normal file
71
SOURCES/toolbox-Make-the-build-flags-match-RHEL-10.patch
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
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}
|
||||||
|
|
||||||
|
These reflect the defaults for RHEL 10.0 Beta, because RHEL 10.0 is
|
||||||
|
still early in its development cycle and the defaults may be in a state
|
||||||
|
of flux. Some exceptions are mentioned below.
|
||||||
|
|
||||||
|
The '-z pack-relative-relocs' linker flag was left out. It's currently
|
||||||
|
not supported on s390x, so using it would require architecture specific
|
||||||
|
patches, which is a hassle. Support for aarch64 was recently added [1],
|
||||||
|
so hopefully s390x will also be supported soon.
|
||||||
|
|
||||||
|
The change to use the RPM's %{name}, %{version}, %{release} and the
|
||||||
|
SOURCE_DATE_EPOCH environment variable [2], 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 RHEL 10's Go guidelines. Use
|
||||||
|
'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
|
||||||
|
|
||||||
|
[1] CentOS Stream redhat-rpm-config commit 3c5a6b17540b2a0b
|
||||||
|
https://gitlab.com/redhat/centos-stream/rpms/redhat-rpm-config/-/commit/3c5a6b17540b2a0b
|
||||||
|
https://gitlab.com/redhat/centos-stream/rpms/redhat-rpm-config/-/merge_requests/42
|
||||||
|
https://issues.redhat.com/browse/RHEL-40379
|
||||||
|
|
||||||
|
[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(-)
|
||||||
|
|
||||||
|
diff --git a/src/go-build-wrapper b/src/go-build-wrapper
|
||||||
|
index a5a1a6a508fb..5978422e9aed 100755
|
||||||
|
--- a/src/go-build-wrapper
|
||||||
|
+++ b/src/go-build-wrapper
|
||||||
|
@@ -33,9 +33,9 @@ if ! cd "$1"; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
-tags=""
|
||||||
|
+tags="-tags rpm_crashtraceback,${GO_BUILDTAGS:-}"
|
||||||
|
if $7; then
|
||||||
|
- tags="-tags migration_path_for_coreos_toolbox"
|
||||||
|
+ tags="$tags,migration_path_for_coreos_toolbox"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! libc_dir=$("$5" --print-file-name=libc.so); then
|
||||||
|
@@ -114,9 +114,14 @@ dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basen
|
||||||
|
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
go build \
|
||||||
|
+ -buildmode pie \
|
||||||
|
+ -compiler gc \
|
||||||
|
$tags \
|
||||||
|
-trimpath \
|
||||||
|
- -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
|
||||||
|
+ -ldflags "${GO_LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -compressdwarf=false -extldflags '-Wl,-z,relro -Wl,--as-needed -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes -Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
|
||||||
|
+ -a \
|
||||||
|
+ -v \
|
||||||
|
+ -x \
|
||||||
|
-o "$2/$3"
|
||||||
|
|
||||||
|
exit "$?"
|
||||||
|
--
|
||||||
|
2.51.0
|
||||||
|
|
||||||
50
SOURCES/toolbox-Make-the-build-flags-match-RHEL-9.patch
Normal file
50
SOURCES/toolbox-Make-the-build-flags-match-RHEL-9.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
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}
|
||||||
|
|
||||||
|
These reflect the defaults for RHEL 9.5, because RHEL 9.6 is still early
|
||||||
|
in its development cycle and the defaults may be in a state of flux.
|
||||||
|
|
||||||
|
Note that these flags are meant for every CPU architecture other than
|
||||||
|
PPC64, and should be kept updated to match RHEL 9's Go guidelines. Use
|
||||||
|
'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
|
||||||
|
---
|
||||||
|
src/go-build-wrapper | 11 ++++++++---
|
||||||
|
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/go-build-wrapper b/src/go-build-wrapper
|
||||||
|
index a5a1a6a508fb..0a2c7526f210 100755
|
||||||
|
--- a/src/go-build-wrapper
|
||||||
|
+++ b/src/go-build-wrapper
|
||||||
|
@@ -33,9 +33,9 @@ if ! cd "$1"; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
-tags=""
|
||||||
|
+tags="-tags rpm_crashtraceback,${GO_BUILDTAGS:-},libtrust_openssl"
|
||||||
|
if $7; then
|
||||||
|
- tags="-tags migration_path_for_coreos_toolbox"
|
||||||
|
+ tags="$tags,migration_path_for_coreos_toolbox"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! libc_dir=$("$5" --print-file-name=libc.so); then
|
||||||
|
@@ -114,9 +114,14 @@ dynamic_linker="/run/host$dynamic_linker_canonical_dirname/$dynamic_linker_basen
|
||||||
|
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
go build \
|
||||||
|
+ -buildmode pie \
|
||||||
|
+ -compiler gc \
|
||||||
|
$tags \
|
||||||
|
-trimpath \
|
||||||
|
- -ldflags "-extldflags '-Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
|
||||||
|
+ -ldflags "${GO_LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -compressdwarf=false -extldflags '-Wl,-z,relro -Wl,--as-needed -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,-dynamic-linker,$dynamic_linker -Wl,-rpath,/run/host$libc_dir_canonical_dirname -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$4" \
|
||||||
|
+ -a \
|
||||||
|
+ -v \
|
||||||
|
+ -x \
|
||||||
|
-o "$2/$3"
|
||||||
|
|
||||||
|
exit "$?"
|
||||||
|
--
|
||||||
|
2.51.0
|
||||||
|
|
||||||
17
SOURCES/toolbox.conf
Normal file
17
SOURCES/toolbox.conf
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
[general]
|
||||||
|
# Create a toolbox container for a different operating system distro than the
|
||||||
|
# host. Cannot be used with 'image'.
|
||||||
|
## distro = "fedora"
|
||||||
|
|
||||||
|
# Create a toolbox container for a different operating system release than the
|
||||||
|
# host. Cannot be used with 'image'.
|
||||||
|
## release = "33"
|
||||||
|
|
||||||
|
# Change the name of the image used to create the toolbox container. This is
|
||||||
|
# useful for creating containers from custom-built images. Cannot be used with
|
||||||
|
# 'distro' or 'release'.
|
||||||
|
#
|
||||||
|
# If the name does not contain a registry, the local image storage will be
|
||||||
|
# consulted, and if it's not present there then it will be pulled from a
|
||||||
|
# suitable remote registry.
|
||||||
|
image = "registry.access.redhat.com/ubi9/toolbox:latest"
|
||||||
@ -1,54 +0,0 @@
|
|||||||
Name: toolbox
|
|
||||||
Version: 0.0.7
|
|
||||||
Release: 1%{?dist}
|
|
||||||
Summary: Script to launch privileged container with podman
|
|
||||||
|
|
||||||
License: ASL 2.0
|
|
||||||
URL: https://github.com/coreos/toolbox
|
|
||||||
Source0: https://github.com/coreos/%{name}/archive/%{version}.tar.gz
|
|
||||||
Requires: podman
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description
|
|
||||||
toolbox is a small script that launches a container to let
|
|
||||||
you bring in your favorite debugging or admin tools.
|
|
||||||
|
|
||||||
%define debug_package %{nil}
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%autosetup
|
|
||||||
|
|
||||||
%build
|
|
||||||
# No building required
|
|
||||||
|
|
||||||
%install
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
install -d $RPM_BUILD_ROOT/%{_bindir}
|
|
||||||
install -m 755 rhcos-toolbox $RPM_BUILD_ROOT/%{_bindir}/toolbox
|
|
||||||
|
|
||||||
%files
|
|
||||||
%license LICENSE
|
|
||||||
%doc README.md NOTICE
|
|
||||||
%{_bindir}/toolbox
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Tue Mar 24 2020 Jindrich Novy <jnovy@redhat.com> - 0.0.7-1
|
|
||||||
- New upstream release 0.0.7
|
|
||||||
- Resolves: #1816287
|
|
||||||
|
|
||||||
* Fri Jun 14 2019 Yu Qi Zhang <jerzhang@redhat.com> - 0.0.4-1.el8
|
|
||||||
- Update for rhel8.1 container-tools module
|
|
||||||
|
|
||||||
* Tue May 21 2019 Steve Milner <smilner@redhat.com> - 0.0.4-1.rhaos4.2.el8
|
|
||||||
- Add help switch per RHBZ#1684258
|
|
||||||
- Spec fixes found by rpmlint
|
|
||||||
|
|
||||||
* Thu May 2 2019 Micah Abbott <miabbott@redhat.com> - 0.0.3-1.rhaos4.1.el8
|
|
||||||
- Use rhel8/support-tools
|
|
||||||
|
|
||||||
* Sat Jan 26 2019 Yu Qi Zhang <jerzhang@redhat.com> - 0.0.2-1.rhaos4.1.el8
|
|
||||||
- Add runlabel options and fix default image
|
|
||||||
|
|
||||||
* Thu Sep 6 2018 Yu Qi Zhang <jerzhang@redhat.com> - 0.0.1-1.rhaos4.1.el8
|
|
||||||
- Initial Specfile for Red Hat CoreOS Toolbox
|
|
||||||
516
SPECS/toolbox.spec
Normal file
516
SPECS/toolbox.spec
Normal file
@ -0,0 +1,516 @@
|
|||||||
|
%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
|
||||||
|
|
||||||
|
%global goipath github.com/containers/%{name}
|
||||||
|
|
||||||
|
%if 0%{?fedora}
|
||||||
|
%gometa -f
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%if 0%{?rhel} <= 9
|
||||||
|
%gometa
|
||||||
|
%else
|
||||||
|
%gometa -f
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%global toolbx_go 1.22
|
||||||
|
|
||||||
|
%if 0%{?fedora}
|
||||||
|
%global toolbx_go 1.24.7
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%if 0%{?rhel} == 9
|
||||||
|
%global toolbx_go 1.22.5
|
||||||
|
%elif 0%{?rhel} == 10
|
||||||
|
%global toolbx_go 1.22.5
|
||||||
|
%elif 0%{?rhel} > 10
|
||||||
|
%global toolbx_go 1.24.4
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
Release: 3%{?dist}
|
||||||
|
Summary: Tool for interactive command line environments on Linux
|
||||||
|
|
||||||
|
License: ASL 2.0
|
||||||
|
URL: https://containertoolbx.org/
|
||||||
|
Source0: https://github.com/containers/%{name}/releases/download/%{version}/%{name}-%{version}-vendored.tar.xz
|
||||||
|
|
||||||
|
# RHEL specific
|
||||||
|
Source1: %{name}.conf
|
||||||
|
|
||||||
|
# Upstream
|
||||||
|
Patch0: toolbox-Fall-back-to-getent-passwd-when-SHELL-is-unset.patch
|
||||||
|
|
||||||
|
# Fedora specific
|
||||||
|
Patch100: toolbox-Make-the-build-flags-match-Fedora.patch
|
||||||
|
|
||||||
|
# RHEL specific
|
||||||
|
Patch200: toolbox-Make-the-build-flags-match-RHEL-9.patch
|
||||||
|
Patch201: toolbox-Make-the-build-flags-match-RHEL-10.patch
|
||||||
|
Patch202: toolbox-Add-migration-paths-for-coreos-toolbox-users.patch
|
||||||
|
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: go-md2man
|
||||||
|
BuildRequires: golang >= %{toolbx_go}
|
||||||
|
BuildRequires: meson >= 0.58.0
|
||||||
|
BuildRequires: pkgconfig(bash-completion)
|
||||||
|
BuildRequires: shadow-utils-subid-devel
|
||||||
|
BuildRequires: systemd
|
||||||
|
BuildRequires: systemd-rpm-macros
|
||||||
|
%if ! 0%{?rhel}
|
||||||
|
BuildRequires: pkgconfig(fish)
|
||||||
|
# for tests
|
||||||
|
# BuildRequires: codespell
|
||||||
|
# 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}
|
||||||
|
|
||||||
|
|
||||||
|
%description
|
||||||
|
Toolbx is a tool for Linux, which allows the use of interactive command line
|
||||||
|
environments for software development and troubleshooting the host operating
|
||||||
|
system, without having to install software on the host. It is built on top of
|
||||||
|
Podman and other standard container technologies from OCI.
|
||||||
|
|
||||||
|
Toolbx environments have seamless access to the user's home directory, the
|
||||||
|
Wayland and X11 sockets, networking (including Avahi), removable devices (like
|
||||||
|
USB sticks), systemd journal, SSH agent, D-Bus, ulimits, /dev and the udev
|
||||||
|
database, etc..
|
||||||
|
|
||||||
|
|
||||||
|
%package tests
|
||||||
|
Summary: Tests for %{name}
|
||||||
|
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
Requires: coreutils
|
||||||
|
Requires: diffutils
|
||||||
|
# for gdbus(1)
|
||||||
|
Requires: glib2
|
||||||
|
Requires: grep
|
||||||
|
# for htpasswd(1)
|
||||||
|
Requires: httpd-tools
|
||||||
|
Requires: openssl
|
||||||
|
Requires: python3
|
||||||
|
Requires: skopeo
|
||||||
|
%if ! 0%{?rhel}
|
||||||
|
Requires: bats >= 1.10.0
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
%description tests
|
||||||
|
The %{name}-tests package contains system tests for %{name}.
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
%patch -P0 -p1
|
||||||
|
|
||||||
|
%if 0%{?fedora}
|
||||||
|
%patch -P100 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%if 0%{?rhel} == 9
|
||||||
|
%patch -P200 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?rhel} >= 10
|
||||||
|
%patch -P201 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?rhel} <= 9
|
||||||
|
%patch -P202 -p1
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%gomkdir -s %{_builddir}/%{extractdir}/src -k
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
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} \
|
||||||
|
%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}
|
||||||
|
|
||||||
|
%meson_build
|
||||||
|
|
||||||
|
|
||||||
|
# %%check
|
||||||
|
# %%meson_test
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
%meson_install
|
||||||
|
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%if 0%{?rhel} <= 9
|
||||||
|
install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
%doc CODE-OF-CONDUCT.md CONTRIBUTING.md GOALS.md NEWS README.md SECURITY.md
|
||||||
|
%license COPYING src/vendor/modules.txt
|
||||||
|
%{_bindir}/%{name}
|
||||||
|
%{_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
|
||||||
|
%{_datadir}/%{name}
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Mon Mar 16 2026 Debarshi Ray <rishi@fedoraproject.org> - 0.3-3
|
||||||
|
- Fall back to 'getent passwd' when SHELL is unset
|
||||||
|
Resolves: RHEL-152669
|
||||||
|
|
||||||
|
* Tue Oct 07 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.3-1
|
||||||
|
- Update to 0.3
|
||||||
|
Resolves: RHEL-117475
|
||||||
|
|
||||||
|
* 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
|
||||||
|
- Update to 0.1.2
|
||||||
|
Resolves: RHEL-95209
|
||||||
|
|
||||||
|
* Mon Jun 16 2025 Debarshi Ray <rishi@fedoraproject.org> - 0.1.1-2
|
||||||
|
- Add 'Requires: flatpak-session-helper'
|
||||||
|
Resolves: RHEL-97099
|
||||||
|
|
||||||
|
* Mon Nov 04 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.1.1-1
|
||||||
|
- Update to 0.1.1
|
||||||
|
Resolves: RHEL-61907
|
||||||
|
|
||||||
|
* Sun Oct 06 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.6-1
|
||||||
|
- Update to 0.0.99.6
|
||||||
|
Resolves: RHEL-61578
|
||||||
|
|
||||||
|
* Fri Aug 09 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-5
|
||||||
|
- Rebuild for CVE-2024-24791
|
||||||
|
Resolves: RHEL-47194
|
||||||
|
|
||||||
|
* Wed Jun 19 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-4
|
||||||
|
- Rebuild for CVE-2024-24788
|
||||||
|
Resolves: RHEL-35942
|
||||||
|
|
||||||
|
* Thu Apr 25 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-3
|
||||||
|
- Rebuild for CVE-2023-45290 and CVE-2024-24785
|
||||||
|
Resolves: RHEL-28393, RHEL-28485
|
||||||
|
|
||||||
|
* Mon Feb 19 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-2
|
||||||
|
- Rebuild for CVE-2023-39326
|
||||||
|
Resolves: RHEL-21817
|
||||||
|
|
||||||
|
* Mon Jan 15 2024 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.5-1
|
||||||
|
- Update to 0.0.99.5
|
||||||
|
Resolves: RHEL-19772
|
||||||
|
|
||||||
|
* Mon Nov 27 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-7
|
||||||
|
- Rebuild for CVE-2023-39318, CVE-2023-39319, CVE-2023-39325 and
|
||||||
|
CVE-2023-44487
|
||||||
|
Resolves: RHEL-4435, RHEL-4439, RHEL-12694
|
||||||
|
|
||||||
|
* Mon Oct 02 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-6
|
||||||
|
- Simplify removing the user's password
|
||||||
|
Resolves: RHEL-1834
|
||||||
|
|
||||||
|
* Fri Aug 11 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-5
|
||||||
|
- Be aware of security hardened mount points
|
||||||
|
Resolves: #2222789
|
||||||
|
|
||||||
|
* Mon Aug 07 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-4
|
||||||
|
- Rebuild for CVE-2023-24539, CVE-2023-24540 and CVE-2023-29400
|
||||||
|
Resolves: #2221850
|
||||||
|
|
||||||
|
* Tue May 16 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-3
|
||||||
|
- Rebuild for CVE-2022-41723, CVE-2023-24534, CVE-2023-24536 and
|
||||||
|
CVE-2023-24538
|
||||||
|
Resolves: #2187337, #2187385, #2203706
|
||||||
|
|
||||||
|
* Tue May 16 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-2
|
||||||
|
- Rebuild for CVE-2022-41724 and CVE-2022-41725
|
||||||
|
Resolves: #2179968
|
||||||
|
|
||||||
|
* Mon Apr 03 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-1
|
||||||
|
- Update to 0.0.99.4
|
||||||
|
Resolves: #2165742
|
||||||
|
|
||||||
|
* Mon Feb 06 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-9
|
||||||
|
- Rebuild for CVE-2022-41717
|
||||||
|
Resolves: #2164292
|
||||||
|
|
||||||
|
* Mon Jan 30 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-8
|
||||||
|
- Support RHEL 9 Toolbx containers
|
||||||
|
Resolves: #2163752
|
||||||
|
|
||||||
|
* Tue Dec 13 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-7
|
||||||
|
- Unbreak sorting and clearly identify copied images in 'list'
|
||||||
|
Resolves: #2033282
|
||||||
|
|
||||||
|
* Fri Oct 14 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-6
|
||||||
|
- Rebuild for CVE-2022-27664 and CVE-2022-32189
|
||||||
|
Resolves: #2116786
|
||||||
|
|
||||||
|
* Tue Aug 16 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-5
|
||||||
|
- Rebuild for CVE-2022-1705, CVE-2022-30630, CVE-2022-30631 and CVE-2022-30632
|
||||||
|
Resolves: #2111830
|
||||||
|
|
||||||
|
* Tue May 17 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-4
|
||||||
|
- Bump the minimum required golang version for added reassurance
|
||||||
|
Resolves: #2060769, #2089194
|
||||||
|
|
||||||
|
* Mon May 16 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-3
|
||||||
|
- Rebuild for FIPS-mode memory leak in the Go toolchain
|
||||||
|
Resolves: #2060769
|
||||||
|
|
||||||
|
* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 0.0.99.3-2
|
||||||
|
- BuildRequires: /usr/bin/go-md2man
|
||||||
|
- Related: #2061316
|
||||||
|
|
||||||
|
* Fri Dec 10 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-1
|
||||||
|
- Update to 0.0.99.3
|
||||||
|
- BuildRequire only systemd-rpm-macros as recommended by the Fedora packaging
|
||||||
|
guidelines
|
||||||
|
- Update the Summary to match upstream
|
||||||
|
- Update the URL to point to the website
|
||||||
|
Resolves: #2000807
|
||||||
|
|
||||||
|
* Wed Sep 22 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-0.14.git660b6970e998
|
||||||
|
- Suggest a way forward if coreos/toolbox was used
|
||||||
|
Resolves: #2006802
|
||||||
|
|
||||||
|
* Wed Sep 22 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-0.13.git660b6970e998
|
||||||
|
- Switch to using the Toolbox-specific UBI image by default
|
||||||
|
Resolves: #2004563
|
||||||
|
|
||||||
|
* Thu Sep 16 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.12.git660b6970e998
|
||||||
|
- Changed image for tests and tests parameters to fix gating
|
||||||
|
Related: #2000051
|
||||||
|
|
||||||
|
* Thu Sep 16 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.11.git660b6970e998
|
||||||
|
- Changed image for tests and added /etc/containers dir check
|
||||||
|
Related: #2000051
|
||||||
|
|
||||||
|
* Tue Sep 14 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.10.git660b6970e998
|
||||||
|
- Added ability to force test system id and version id
|
||||||
|
Related: #2000051
|
||||||
|
|
||||||
|
* Tue Sep 14 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.9.git660b6970e998
|
||||||
|
- Fixed test roles and changed default image path
|
||||||
|
Related: #2000051
|
||||||
|
|
||||||
|
* Tue Sep 14 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.8.git660b6970e998
|
||||||
|
- Added default container image configuration for tests
|
||||||
|
Related: #2000051
|
||||||
|
|
||||||
|
* Fri Sep 03 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.7.git660b6970e998
|
||||||
|
- Added missing gating tests files and patch for tests
|
||||||
|
Related: #2000051
|
||||||
|
|
||||||
|
* Fri Sep 03 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.3-0.6.git660b6970e998
|
||||||
|
- re-add gating tests
|
||||||
|
- Related: #2000051
|
||||||
|
|
||||||
|
* Fri Sep 03 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.3-0.5.git660b6970e998
|
||||||
|
- Make sosreport work by setting the HOST environment variable
|
||||||
|
- Related: #2000051
|
||||||
|
|
||||||
|
* Mon Aug 30 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.4.git660b6970e998
|
||||||
|
- Fixed gating tests bats version
|
||||||
|
Related: rhbz#1977343
|
||||||
|
|
||||||
|
* Tue Aug 24 2021 Oliver Gutiérrez <ogutierrez@redhat.com> - 0.0.99.3-0.3.git660b6970e998
|
||||||
|
- Rebuilt for gating checks
|
||||||
|
Related: rhbz#1977343
|
||||||
|
|
||||||
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.99.3-0.2.git660b6970e998
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Mon Aug 02 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.3-0.1.git660b6970e998
|
||||||
|
- Fix the build on CentOS Stream
|
||||||
|
Related: #1970747
|
||||||
|
|
||||||
|
* Wed Jul 28 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2^1.git660b6970e998-1
|
||||||
|
- Add support for configuration files
|
||||||
|
- Related: #1970747
|
||||||
|
|
||||||
|
* Sat Jul 10 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2-3
|
||||||
|
- Expose the host's entire / in the container at /run/host
|
||||||
|
- Resolves: #1977343
|
||||||
|
|
||||||
|
* Mon Jul 05 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2-2
|
||||||
|
- Actually apply the patch to make 'toolbox' create or fall back to a
|
||||||
|
container if possible
|
||||||
|
- Support logging into a registry if necessary
|
||||||
|
- Resolves: #1977343
|
||||||
|
|
||||||
|
* Fri Jul 02 2021 Jindrich Novy <jnovy@redhat.com> - 0.0.99.2-1
|
||||||
|
- update to 0.99.2
|
||||||
|
- Resolves: #1977343
|
||||||
|
|
||||||
|
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.99.1-4
|
||||||
|
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||||
|
Related: rhbz#1971065
|
||||||
|
|
||||||
|
* Thu Apr 29 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.1-3
|
||||||
|
- Fix FTBFS
|
||||||
|
Resolves: #1912983
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.99.1-2
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Tue Feb 23 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.1-1
|
||||||
|
- Update to 0.0.99.1
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.99-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 12 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99-1
|
||||||
|
- Update to 0.0.99
|
||||||
|
|
||||||
|
* Mon Jan 11 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.98.1-2
|
||||||
|
- Harden the binary by using the same CGO_CFLAGS as on RHEL 8
|
||||||
|
|
||||||
|
* Thu Jan 07 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.98.1-1
|
||||||
|
- Update to 0.0.98.1
|
||||||
|
|
||||||
|
* Tue Jan 05 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.98-1
|
||||||
|
- Update to 0.0.98
|
||||||
|
|
||||||
|
* Wed Nov 25 2020 Ondřej Míchal <harrymichal@seznam.cz> - 0.0.97-2
|
||||||
|
- Move krb5-libs from -support to -experience, and update the list of packages
|
||||||
|
in -experience
|
||||||
|
|
||||||
|
* Tue Nov 03 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.97-1
|
||||||
|
- Update to 0.0.97
|
||||||
|
|
||||||
|
* Thu Oct 01 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.96-1
|
||||||
|
- Update to 0.0.96
|
||||||
|
|
||||||
|
* Sun Aug 30 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.95-1
|
||||||
|
- Update to 0.0.95
|
||||||
|
|
||||||
|
* Mon Aug 24 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.94-1
|
||||||
|
- Update to 0.0.94
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.93-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jul 25 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.93-1
|
||||||
|
- Update to 0.0.93
|
||||||
|
|
||||||
|
* Fri Jul 03 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.92-1
|
||||||
|
- Update to 0.0.92
|
||||||
|
|
||||||
|
* Fri Jul 03 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.91-2
|
||||||
|
- Fix the 'toolbox --version' output
|
||||||
|
|
||||||
|
* Tue Jun 30 2020 Harry Míchal <harrymichal@seznam.cz> - 0.0.91-1
|
||||||
|
- Update to 0.0.91
|
||||||
|
|
||||||
|
* Sat Jun 27 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.18-5
|
||||||
|
- Remove ExclusiveArch to match Podman
|
||||||
|
|
||||||
|
* Wed Jun 10 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.18-4
|
||||||
|
- Sync the "experience" packages with the current Dockerfile
|
||||||
|
- Make "experience" Require "support"
|
||||||
|
|
||||||
|
* Fri Apr 03 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.18-3
|
||||||
|
- Drop compatibility Obsoletes and Provides for fedora-toolbox
|
||||||
|
|
||||||
|
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.18-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 14 2020 Debarshi Ray <rishi@fedoraproject.org> - 0.0.18-1
|
||||||
|
- Update to 0.0.18
|
||||||
|
|
||||||
|
* Wed Nov 20 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.17-1
|
||||||
|
- Update to 0.0.17
|
||||||
|
|
||||||
|
* Tue Oct 29 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.16-1
|
||||||
|
- Update to 0.0.16
|
||||||
|
|
||||||
|
* Mon Sep 30 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.15-1
|
||||||
|
- Update to 0.0.15
|
||||||
|
|
||||||
|
* Wed Sep 18 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.14-1
|
||||||
|
- Update to 0.0.14
|
||||||
|
|
||||||
|
* Thu Sep 05 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.13-1
|
||||||
|
- Update to 0.0.13
|
||||||
|
|
||||||
|
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 22 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.12-1
|
||||||
|
- Update to 0.0.12
|
||||||
|
|
||||||
|
* Tue Jun 25 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.11-2
|
||||||
|
- Require flatpak-session-helper
|
||||||
|
|
||||||
|
* Fri Jun 21 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.11-1
|
||||||
|
- Update to 0.0.11
|
||||||
|
|
||||||
|
* Tue May 21 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.10-1
|
||||||
|
- Update to 0.0.10
|
||||||
|
|
||||||
|
* Tue Apr 30 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.9-1
|
||||||
|
- Update to 0.0.9
|
||||||
|
|
||||||
|
* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 0.0.8-2
|
||||||
|
- Rebuild with Meson fix for #1699099
|
||||||
|
|
||||||
|
* Fri Apr 12 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.8-1
|
||||||
|
- Update to 0.0.8
|
||||||
|
|
||||||
|
* Thu Mar 14 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.7-1
|
||||||
|
- Update to 0.0.7
|
||||||
|
|
||||||
|
* Fri Feb 22 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.6-1
|
||||||
|
- Initial build after rename from fedora-toolbox
|
||||||
Loading…
Reference in New Issue
Block a user