From 5efa2de0c715957a8ea92a23bccdfe665ca06edd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 26 2022 13:53:31 +0000 Subject: import buildah-1.11.6-10.module+el8.5.0+14796+e4386a39 --- diff --git a/.buildah.metadata b/.buildah.metadata index dd7f189..8d897e3 100644 --- a/.buildah.metadata +++ b/.buildah.metadata @@ -1 +1 @@ -c3f43583c7affe6ffb1d4e812fcd11faf91d8cab SOURCES/release-1.11-rhel-6a746dc.tar.gz +80d289a0e9aaf8feb827df7aec25897ffec47bdc SOURCES/release-1.11-rhel-9a4764a.tar.gz diff --git a/.gitignore b/.gitignore index ec186c0..30c1433 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/release-1.11-rhel-6a746dc.tar.gz +SOURCES/release-1.11-rhel-9a4764a.tar.gz diff --git a/SOURCES/1996.patch b/SOURCES/1996.patch index fd565dd..efd4490 100644 --- a/SOURCES/1996.patch +++ b/SOURCES/1996.patch @@ -13,7 +13,7 @@ Signed-off-by: Nalin Dahyabhai 1 file changed, 4 insertions(+) diff --git a/bind/mount.go b/bind/mount.go -index e1ae323b9..adde901fd 100644 +index e1ae323b9f..adde901fd1 100644 --- a/bind/mount.go +++ b/bind/mount.go @@ -264,6 +264,10 @@ func UnmountMountpoints(mountpoint string, mountpointsToRemove []string) error { @@ -44,7 +44,7 @@ Signed-off-by: Nalin Dahyabhai 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/chroot/run.go b/chroot/run.go -index fbccbcdb0..76ac78d1f 100644 +index fbccbcdb0d..76ac78d1ff 100644 --- a/chroot/run.go +++ b/chroot/run.go @@ -15,6 +15,7 @@ import ( @@ -131,7 +131,7 @@ Signed-off-by: Nalin Dahyabhai 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/overlay.bats b/tests/overlay.bats -index 04056f680..7cc2d0c62 100644 +index 04056f6804..7cc2d0c622 100644 --- a/tests/overlay.bats +++ b/tests/overlay.bats @@ -3,14 +3,14 @@ diff --git a/SOURCES/2031.patch b/SOURCES/2031.patch index b674e80..2f432d9 100644 --- a/SOURCES/2031.patch +++ b/SOURCES/2031.patch @@ -15,7 +15,7 @@ Signed-off-by: Daniel J Walsh 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/pkg/secrets/secrets.go b/pkg/secrets/secrets.go -index 80ca05016..ee2e9a7c8 100644 +index 80ca050165..ee2e9a7c84 100644 --- a/pkg/secrets/secrets.go +++ b/pkg/secrets/secrets.go @@ -148,12 +148,21 @@ func getMountsMap(path string) (string, string, error) { @@ -133,7 +133,7 @@ index 80ca05016..ee2e9a7c8 100644 } diff --git a/run_linux.go b/run_linux.go -index 4c2d73edd..c8e75eada 100644 +index 4c2d73edde..c8e75eada6 100644 --- a/run_linux.go +++ b/run_linux.go @@ -460,7 +460,7 @@ func (b *Builder) setupMounts(mountPoint string, spec *specs.Spec, bundlePath st diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec index dd9cd7d..347bb60 100644 --- a/SPECS/buildah.spec +++ b/SPECS/buildah.spec @@ -14,12 +14,12 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global import_path github.com/containers/buildah %global branch release-1.11-rhel -%global commit0 6a746dc0ee433f54f9842ba49cf5aa5c08a65967 +%global commit0 9a4764a02bc6b877a52337a15dfe899a3a694e18 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: buildah Version: 1.11.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -121,6 +121,12 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install %{_datadir}/%{name}/test %changelog +* Mon Apr 11 2022 Jindrich Novy - 1.11.6-10 +- update to the latest content of https://github.com/containers/buildah/tree/release-1.11-rhel + (https://github.com/containers/buildah/commit/9a4764a) +- fixes CVE-2022-27649 +- Resolves: #2067545 + * Tue Aug 17 2021 Jindrich Novy - 1.11.6-9 - update to the latest content of https://github.com/containers/buildah/tree/release-1.11-rhel (https://github.com/containers/buildah/commit/6a746dc)