diff --git a/4200.patch b/4200.patch deleted file mode 100644 index 011a8bc..0000000 --- a/4200.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 9934b17365083ce966b44c5ce3c7e052f516e255 Mon Sep 17 00:00:00 2001 -From: Aditya R -Date: Wed, 24 Aug 2022 08:42:23 +0530 -Subject: [PATCH] run: add container gid to additional groups - -When container is created with specific uid and gid also add container -gid to supplementary/additional group. - -Signed-off-by: Aditya R ---- - run_common.go | 1 + - tests/bud.bats | 16 ++++++++++++++++ - tests/bud/supplemental-groups/Dockerfile | 3 +++ - tests/run.bats | 14 ++++++++++++++ - 4 files changed, 34 insertions(+) - create mode 100644 tests/bud/supplemental-groups/Dockerfile - -diff --git a/run_common.go b/run_common.go -index 2054c56527..f5a5ec8505 100644 ---- a/run_common.go -+++ b/run_common.go -@@ -262,6 +262,7 @@ func (b *Builder) configureUIDGID(g *generate.Generator, mountPoint string, opti - } - g.SetProcessUID(user.UID) - g.SetProcessGID(user.GID) -+ g.AddProcessAdditionalGid(user.GID) - for _, gid := range user.AdditionalGids { - g.AddProcessAdditionalGid(gid) - } -diff --git a/tests/bud.bats b/tests/bud.bats -index a37e418b41..07bdf45cac 100644 ---- a/tests/bud.bats -+++ b/tests/bud.bats -@@ -366,6 +366,22 @@ _EOF - expect_output --substring "invalid response status" - } - -+@test "build test has gid in supplemental groups" { -+ _prefetch alpine -+ run_buildah build $WITH_POLICY_JSON -t source -f $BUDFILES/supplemental-groups/Dockerfile -+ # gid 1000 must be in supplemental groups -+ expect_output --substring "Groups: 1000" -+} -+ -+@test "build test if supplemental groups has gid with --isolation chroot" { -+ test -z "${BUILDAH_ISOLATION}" || skip "BUILDAH_ISOLATION=${BUILDAH_ISOLATION} overrides --isolation" -+ -+ _prefetch alpine -+ run_buildah build --isolation chroot $WITH_POLICY_JSON -t source -f $BUDFILES/supplemental-groups/Dockerfile -+ # gid 1000 must be in supplemental groups -+ expect_output --substring "Groups: 1000" -+} -+ - # Test skipping images with FROM - @test "build-test skipping unwanted stages with FROM" { - mkdir -p ${TEST_SCRATCH_DIR}/bud/platform -diff --git a/tests/bud/supplemental-groups/Dockerfile b/tests/bud/supplemental-groups/Dockerfile -new file mode 100644 -index 0000000000..462d9ea7a4 ---- /dev/null -+++ b/tests/bud/supplemental-groups/Dockerfile -@@ -0,0 +1,3 @@ -+FROM alpine -+USER 1000:1000 -+RUN cat /proc/$$/status -diff --git a/tests/run.bats b/tests/run.bats -index 2e8836c470..e34091fcbe 100644 ---- a/tests/run.bats -+++ b/tests/run.bats -@@ -349,6 +349,20 @@ function configure_and_check_user() { - expect_output "888:888" - } - -+@test "run --user and verify gid in supplemental groups" { -+ skip_if_no_runtime -+ -+ # Create the container. -+ _prefetch alpine -+ run_buildah from $WITH_POLICY_JSON alpine -+ ctr="$output" -+ -+ # Run with uid:gid 1000:1000 and verify if gid is present in additional groups -+ run_buildah run --user 1000:1000 "$ctr" cat /proc/self/status -+ # gid 1000 must be in additional/supplemental groups -+ expect_output --substring "Groups: 1000 " -+} -+ - @test "run --workingdir" { - skip_if_no_runtime - diff --git a/buildah.spec b/buildah.spec index 9891437..62e61d6 100644 --- a/buildah.spec +++ b/buildah.spec @@ -9,13 +9,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global import_path github.com/containers/buildah #%%global branch main -%global commit0 db8d5921a770e7536b34c56d062b47795b548d35 +%global commit0 79f41e3235ecc17d711a9aa06ec769234ec95399 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 Name: buildah -Version: 1.27.0 -Release: 2%{?dist} +Version: 1.28.0 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -26,7 +26,6 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar %else Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif -Patch0: https://patch-diff.githubusercontent.com/raw/containers/buildah/pull/4200.patch BuildRequires: golang >= 1.16.6 BuildRequires: git BuildRequires: glib2-devel @@ -133,6 +132,10 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install %{_datadir}/%{name}/test %changelog +* Tue Nov 01 2022 Jindrich Novy - 1:1.28.0-1 +- update to https://github.com/containers/buildah/releases/tag/v1.28.0 +- Related: #2124478 + * Fri Aug 26 2022 Jindrich Novy - 1:1.27.0-2 - fix CVE-2022-2990 - Related: #2061316 diff --git a/sources b/sources index e6a8fb5..96c6dfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-1.27.0-db8d592.tar.gz) = 5f68f26c6b82217465772b626f521d16b986d1761fe65515b48a75078d2eb7f044cf244d0fc061a0621966c87df8b858e39b620ac483ab99ed2fb418979f9637 +SHA512 (buildah-1.28.0-79f41e3.tar.gz) = 7db7c4e4ae725af885988056d98eff77e58dd39c3f166244c7da3276801d8df150e918fe09e3f8a8036999ac117f28849efa9b8453151c74e33fbe8e2ca43609