From 17cbd977a20897d0a56f473e1cee6ba311f4f08d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 11 2022 21:01:02 +0000
Subject: import buildah-1.24.2-2.module+el8.6.0+14379+4ec2a99a


---

diff --git a/.buildah.metadata b/.buildah.metadata
index c5a60fe..d2e14b7 100644
--- a/.buildah.metadata
+++ b/.buildah.metadata
@@ -1 +1 @@
-c92982bd8195174d24c0f80638be5375dff2babc SOURCES/release-1.23-87a0565.tar.gz
+bfaa7b5c8d8169ed7a175c1edea673bca9dc184c SOURCES/buildah-1.24.2-ce608bc.tar.gz
diff --git a/.gitignore b/.gitignore
index 597cba0..2caaf69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/release-1.23-87a0565.tar.gz
+SOURCES/buildah-1.24.2-ce608bc.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 <lsm5@fedoraproject.org>
+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 <ypu@redhat.com>
+
+I'm just the committer.
+
+Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
+---
+ 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 c8119e7..ec853ba 100644
--- a/SPECS/buildah.spec
+++ b/SPECS/buildah.spec
@@ -11,13 +11,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 %endif
 
 %global import_path github.com/containers/buildah
-%global branch release-1.23
-%global commit0 87a05652193fe2ba7011ef400a1bea5a5cf092c4
+#%%global branch main
+%global commit0 ce608bcecdeb077daab846c83b026c508cff9688
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Epoch: 1
 Name: buildah
-Version: 1.23.1
+Version: 1.24.2
 Release: 2%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
@@ -29,6 +29,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
@@ -128,6 +129,33 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.24.2-2
+- Add patch to fix bash symtax for gating tests
+- Upstream PR: https://github.com/containers/buildah/pull/3792
+- Related: #2001445
+
+* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.24.2-1
+- update to https://github.com/containers/buildah/releases/tag/v1.24.2
+- Related: #2001445
+
+* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.24.1-1
+- update to https://github.com/containers/buildah/releases/tag/v1.24.1
+- Related: #2001445
+
+* Wed Feb 02 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.24.0-1
+- update to https://github.com/containers/buildah/releases/tag/v1.24.0
+- Related: #2001445
+
+* Tue Jan 25 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.23.2-1
+- update to the latest content of https://github.com/containers/buildah/tree/release-1.23
+  (https://github.com/containers/buildah/commit/83a66a7)
+- Related: #2001445
+
+* Mon Nov 22 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.23.1-3
+- update to the latest content of https://github.com/containers/buildah/tree/release-1.23
+  (https://github.com/containers/buildah/commit/867c1bc)
+- Related: #2001445
+
 * Mon Oct 18 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.23.1-2
 - respect Epoch in subpackage dependencies
 - Related: #2001445