diff --git a/.buildah.metadata b/.buildah.metadata index 3c52fa1..22e5cdf 100644 --- a/.buildah.metadata +++ b/.buildah.metadata @@ -1 +1 @@ -f662869af4e99ceb498c7cd3e70b1e5bf8509267 SOURCES/buildah-1.24.1-28f7884.tar.gz +09993f8aad3024403e1e2aa76aa3d11d1023cceb SOURCES/release-1.24-7b559a3.tar.gz diff --git a/.gitignore b/.gitignore index 4facc31..e05dea5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/buildah-1.24.1-28f7884.tar.gz +SOURCES/release-1.24-7b559a3.tar.gz diff --git a/SOURCES/fix-bash-syntax.patch b/SOURCES/fix-bash-syntax.patch new file mode 100644 index 0000000..e508848 --- /dev/null +++ b/SOURCES/fix-bash-syntax.patch @@ -0,0 +1,45 @@ +From eedab4fd872c3be8ab15af767897f92c78a71fde Mon Sep 17 00:00:00 2001 +From: Lokesh Mandvekar +Date: Mon, 21 Feb 2022 14:58:40 -0500 +Subject: [PATCH] helpers.bash: Use correct syntax + +Fixes gating test failure: +``` + /usr/share/buildah/test/system/./helpers.bash: line 474: !is_cgroupsv2: command not found + ``` + +Co-authored-by: Yiqiao Pu + +I'm just the committer. + +Signed-off-by: Lokesh Mandvekar +--- + tests/helpers.bash | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/helpers.bash b/tests/helpers.bash +index bd2794c974..3e72108bec 100644 +--- a/tests/helpers.bash ++++ b/tests/helpers.bash +@@ -433,9 +433,9 @@ function skip_if_rootless() { + ################################## + function skip_if_rootless_and_cgroupv1() { + if test "$BUILDAH_ISOLATION" = "rootless"; then +- if !is_cgroupsv2; then +- skip "${1:-test does not work when \$BUILDAH_ISOLATION = rootless} and not cgroupv2" +- fi ++ if ! is_cgroupsv2; then ++ skip "${1:-test does not work when \$BUILDAH_ISOLATION = rootless} and not cgroupv2" ++ fi + fi + } + +@@ -471,7 +471,7 @@ function skip_if_cgroupsv2() { + # skip_if_cgroupsv1 # Some tests don't work with cgroupsv1 + ####################### + function skip_if_cgroupsv1() { +- if !is_cgroupsv2; then ++ if ! is_cgroupsv2; then + skip "${1:-test does not work with cgroups v1}" + fi + } diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec index 92783e1..5a10eeb 100644 --- a/SPECS/buildah.spec +++ b/SPECS/buildah.spec @@ -14,14 +14,14 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %endif %global import_path github.com/containers/buildah -#%%global branch main -%global commit0 28f7884b7b8082546f1bde014f7e437af9c9c870 +%global branch release-1.24 +%global commit0 7b559a3e7cff23f2207a36140178174d6e130a56 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 Name: buildah -Version: 1.24.1 -Release: 1%{?dist} +Version: 1.24.2 +Release: 4%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -32,6 +32,7 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar %else Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif +Patch0: fix-bash-syntax.patch BuildRequires: golang >= 1.16.6 BuildRequires: git BuildRequires: glib2-devel @@ -131,6 +132,24 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install %{_datadir}/%{name}/test %changelog +* Fri Mar 25 2022 Jindrich Novy - 1:1.24.2-4 +- update to the latest content of https://github.com/containers/buildah/tree/release-1.24 + (https://github.com/containers/buildah/commit/7b559a3) +- Related: #2067533 + +* Fri Mar 25 2022 Jindrich Novy - 1:1.24.2-3 +- switch to RHEL maintenance branch which fixes CVE-2022-27651 +- Resolves: #2067533 + +* Mon Feb 21 2022 Lokesh Mandvekar - 1:1.24.2-2 +- Add patch to fix bash symtax for gating tests +- Upstream PR: https://github.com/containers/buildah/pull/3792 +- Related: #2000051 + +* Thu Feb 17 2022 Jindrich Novy - 1:1.24.2-1 +- update to https://github.com/containers/buildah/releases/tag/v1.24.2 +- Related: #2000051 + * Fri Feb 04 2022 Jindrich Novy - 1:1.24.1-1 - update to https://github.com/containers/buildah/releases/tag/v1.24.1 - Related: #2000051