From 0490144c125f7ad6e2b79763082095c7a2798e92 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 29 2022 13:02:40 +0000 Subject: import toolbox-0.0.99.3-1.module+el8.6.0+13744+951885c2 --- diff --git a/.gitignore b/.gitignore index d54aaf9..d744aa9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/toolbox-0.0.99-vendored.tar.xz +SOURCES/toolbox-0.0.99.3-vendored.tar.xz diff --git a/.toolbox.metadata b/.toolbox.metadata index 14085f7..44b3e7d 100644 --- a/.toolbox.metadata +++ b/.toolbox.metadata @@ -1 +1 @@ -2520d76c13573ab6e543793ab8982026bcaf7882 SOURCES/toolbox-0.0.99-vendored.tar.xz +925877d2e970cfbf315174de4ceaa921581abed6 SOURCES/toolbox-0.0.99.3-vendored.tar.xz diff --git a/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch b/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch index 9688a87..19544b1 100644 --- a/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch +++ b/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch @@ -1,4 +1,4 @@ -From eac80eca4f0e54e38459438ba56d6172fda8cd32 Mon Sep 17 00:00:00 2001 +From a245af969792bafcfa86090c856a06cb23061816 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's %{gobuild} for PPC64 @@ -24,7 +24,7 @@ and should be kept updated to match RHEL's Go guidelines. Use 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/go-build-wrapper b/src/go-build-wrapper -index 515e1d8a0670..3bd47ce5ae6f 100755 +index 0d27120da052..ef1a03af750a 100755 --- a/src/go-build-wrapper +++ b/src/go-build-wrapper @@ -27,5 +27,6 @@ if ! cd "$1"; then @@ -36,5 +36,5 @@ index 515e1d8a0670..3bd47ce5ae6f 100755 +go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -Wl,--wrap,pthread_sigmask $4' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$3" -a -v -x -o "$2/toolbox" exit "$?" -- -2.29.2 +2.31.1 diff --git a/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch b/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch index 7d0d717..10db68e 100644 --- a/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch +++ b/SOURCES/toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch @@ -1,4 +1,4 @@ -From 856a7f524b63f9033c47a8169fbf8a1cfdf69683 Mon Sep 17 00:00:00 2001 +From 05722d2861c23554b9741c059e853da9ab38282e 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's %{gobuild} @@ -24,7 +24,7 @@ PPC64, and should be kept updated to match RHEL's Go guidelines. Use 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/go-build-wrapper b/src/go-build-wrapper -index 515e1d8a0670..453b4cfa872b 100755 +index 0d27120da052..f08f3218560a 100755 --- a/src/go-build-wrapper +++ b/src/go-build-wrapper @@ -27,5 +27,6 @@ if ! cd "$1"; then @@ -36,5 +36,5 @@ index 515e1d8a0670..453b4cfa872b 100755 +go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -Wl,--wrap,pthread_sigmask $4' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$3" -a -v -x -o "$2/toolbox" exit "$?" -- -2.29.2 +2.31.1 diff --git a/SOURCES/toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch b/SOURCES/toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch new file mode 100644 index 0000000..258226c --- /dev/null +++ b/SOURCES/toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch @@ -0,0 +1,44 @@ +From 6b47ff61936d2b602d29b229b079bda00dadad7e Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Thu, 2 Sep 2021 14:57:37 +0200 +Subject: [PATCH] cmd/root: Suggest a way forward if coreos/toolbox was used + +github.com/coreos/toolbox bind mounts the entire /run from the host +operating system into the toolbox container. Due to this, when run +rootful, the /run/.containerenv created by Podman inside the container +is also seen on the host. This confuses Toolbox into thinking that it's +running inside a container, even when it's running on the host. + +This is an attempt to differentiate between a toolbox container and +the host by looking at the 'container' environment variable, so that +the user can be presented with a more helpful error message. + +https://bugzilla.redhat.com/show_bug.cgi?id=1998191 +--- + src/cmd/root.go | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/cmd/root.go b/src/cmd/root.go +index 5e6f5874a469..139609592218 100644 +--- a/src/cmd/root.go ++++ b/src/cmd/root.go +@@ -130,6 +130,16 @@ func preRun(cmd *cobra.Command, args []string) error { + + if toolboxPath == "" { + if utils.IsInsideContainer() { ++ if containerType := os.Getenv("container"); containerType == "" { ++ var builder strings.Builder ++ fmt.Fprintf(&builder, "/run/.containerenv found on what looks like the host\n") ++ fmt.Fprintf(&builder, "If this is the host, then remove /run/.containerenv and try again.\n") ++ fmt.Fprintf(&builder, "Otherwise, contact your system administrator or file a bug.") ++ ++ errMsg := builder.String() ++ return errors.New(errMsg) ++ } ++ + return errors.New("TOOLBOX_PATH not set") + } + +-- +2.31.1 + diff --git a/SOURCES/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch b/SOURCES/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch new file mode 100644 index 0000000..84ae242 --- /dev/null +++ b/SOURCES/toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch @@ -0,0 +1,26 @@ +From 786c5065c73703ef46e13905a4672f1b4918310a Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Wed, 18 Aug 2021 17:55:21 +0200 +Subject: [PATCH] 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 e8e96932415e..188f0f2394df 100644 +--- a/src/cmd/run.go ++++ b/src/cmd/run.go +@@ -443,6 +443,7 @@ func constructExecArgs(container string, + execArgs = append(execArgs, detachKeys...) + + execArgs = append(execArgs, []string{ ++ "--env", "HOST=/run/host", + "--interactive", + "--tty", + "--user", currentUser.Username, +-- +2.31.1 + diff --git a/SOURCES/toolbox.conf b/SOURCES/toolbox.conf new file mode 100644 index 0000000..f934f2b --- /dev/null +++ b/SOURCES/toolbox.conf @@ -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/ubi8/toolbox:latest" diff --git a/SPECS/toolbox.spec b/SPECS/toolbox.spec index ccf4e67..4ae3477 100644 --- a/SPECS/toolbox.spec +++ b/SPECS/toolbox.spec @@ -4,7 +4,7 @@ %global _find_debuginfo_dwz_opts %{nil} Name: toolbox -Version: 0.0.99 +Version: 0.0.99.3 %global goipath github.com/containers/%{name} %gometa @@ -20,10 +20,13 @@ URL: https://github.com/containers/%{name} # $ cd src # $ go mod vendor Source0: %{name}-%{version}-vendored.tar.xz +Source1: %{name}.conf # RHEL specific Patch100: toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch Patch101: toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch +Patch102: toolbox-cmd-run-Make-sosreport-work-by-setting-the-HOST-envi.patch +Patch103: toolbox-cmd-root-Suggest-a-way-forward-if-coreos-toolbox-was.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1905383 ExcludeArch: %{ix86} @@ -34,6 +37,7 @@ BuildRequires: meson BuildRequires: pkgconfig(bash-completion) BuildRequires: systemd +Requires: containers-common Requires: podman >= 1.4.0 @@ -61,6 +65,9 @@ The %{name}-tests package contains system tests for %{name}. %patch101 -p1 %endif +%patch102 -p1 +%patch103 -p1 + # %%gomkdir is absent from RHEL 8. GOBUILDDIR="$(pwd)/_build" GOSOURCEDIR="$(pwd)" @@ -88,6 +95,7 @@ ln -s src/vendor vendor %install %meson_install +install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf %files @@ -97,6 +105,7 @@ ln -s src/vendor vendor %{_datadir}/bash-completion %{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}-*.1* +%config(noreplace) %{_sysconfdir}/containers/%{name}.conf %{_sysconfdir}/profile.d/%{name}.sh %{_tmpfilesdir}/%{name}.conf @@ -105,6 +114,10 @@ ln -s src/vendor vendor %changelog +* Thu Dec 23 2021 Jindrich Novy - 0.0.99.3-1 +- Sync toolbox version with rhel8-8.6.0 +- Related: #2034066 + * Tue Jan 12 2021 Jindrich Novy - 0.0.99-1 - Update to 0.0.99 - Related: #1883490