From bcbad08e521a14aacfde389bcc2ed096f60c3e25 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Thu, 28 Mar 2024 16:54:45 +0300
Subject: [PATCH] import buildah-1.33.5-1.el9

---
 .buildah.metadata  |  2 +-
 .gitignore         |  2 +-
 SPECS/buildah.spec | 52 +++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/.buildah.metadata b/.buildah.metadata
index fdf196d..6e09710 100644
--- a/.buildah.metadata
+++ b/.buildah.metadata
@@ -1 +1 @@
-f419a358fc2ebedf19faf3a732b06eb5152ea789 SOURCES/buildah-1.31.3-3ae75d4.tar.gz
+52fc5cbf135d7b065aef6c86ec16e9ec01d4ad02 SOURCES/release-1.33-70b792d.tar.gz
diff --git a/.gitignore b/.gitignore
index e5eb5d9..3790de1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/buildah-1.31.3-3ae75d4.tar.gz
+SOURCES/release-1.33-70b792d.tar.gz
diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec
index ce9e44b..166de4c 100644
--- a/SPECS/buildah.spec
+++ b/SPECS/buildah.spec
@@ -8,13 +8,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %endif
 
 %global import_path github.com/containers/buildah
-#%%global branch main
-%global commit0 3ae75d4a4a72228e2eb2f90b29441728bc8af87e
+%global branch release-1.33
+%global commit0 70b792d5682d4e39e02d185310af2898287c9047
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
-Epoch: 1
+Epoch: 2
 Name: buildah
-Version: 1.31.3
+Version: 1.33.5
 Release: 1%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
@@ -26,7 +26,7 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar
 %else
 Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
 %endif
-BuildRequires: golang >= 1.16.6
+BuildRequires: golang >= 1.20.10
 BuildRequires: git-core
 BuildRequires: glib2-devel
 BuildRequires: libseccomp-devel
@@ -134,6 +134,48 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Fri Feb 02 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.33.5-1
+- update to the latest content of https://github.com/containers/buildah/tree/release-1.33
+  (https://github.com/containers/buildah/commit/70b792d)
+- Related: RHEL-2112
+
+* Wed Jan 31 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.33.4-1
+- revert back to 1.33.4
+- Related: Jira:RHEL-2112
+
+* Tue Jan 02 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.34.0-1
+- update to https://github.com/containers/buildah/releases/tag/v1.34.0
+- Related: RHEL-2112
+
+* Wed Dec 06 2023 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.33.2-1
+- Bump to v1.33.2
+- Related: Jira:RHEL-2112
+
+* Sat Dec 02 2023 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.33.1-3
+- Rebuild for CVEs:
+  CVE-2023-39318 CVE-2023-39319 CVE-2023-39321 CVE-2023-39322
+- Related: Jira:RHEL-2779
+
+* Tue Nov 28 2023 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.33.1-2
+- Fix gating issues in tests/tests.yml
+- Related: RHEL-2112
+
+* Sun Nov 19 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.33.1-1
+- update to https://github.com/containers/buildah/releases/tag/v1.33.1
+- Related: RHEL-2112
+
+* Tue Oct 31 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.32.2-1
+- update to https://github.com/containers/buildah/releases/tag/v1.32.2
+- Related: RHEL-2112
+
+* Mon Oct 30 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.32.1-1
+- update to https://github.com/containers/buildah/releases/tag/v1.32.1
+- Related: RHEL-2112
+
+* Tue Sep 19 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.32.0-1
+- update to https://github.com/containers/buildah/releases/tag/v1.32.0
+- Related: Jira:RHEL-2112
+
 * Fri Aug 25 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.31.3-1
 - update to https://github.com/containers/buildah/releases/tag/v1.31.3
 - Related: #2176063