From 7c3363c599ba6527840f108d20feab00b130cb35 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 7 Jul 2022 08:52:39 -0400
Subject: [PATCH 01/87] debbuild s/Maintainer/Packager

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 buildah.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildah.spec b/buildah.spec
index 399c583..2192760 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -24,7 +24,7 @@
 Name: %{repo}
 Version: 1.26.2
 %if "%{_vendor}" == "debbuild"
-Maintainer: Lokesh Mandvekar <lsm5@fedoraproject.org>
+Packager: Lokesh Mandvekar <lsm5@fedoraproject.org>
 License: ASL-2.0+
 Release: 0%{?dist}
 %else

From f9d0f9991e7d229220a4c4299838214d5d1c5ac0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 22:21:39 +0000
Subject: [PATCH 02/87] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 5268ea2ba77d07288161aaf524b8e3b536e0c4ac Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Wed, 3 Aug 2022 07:03:31 +0000
Subject: [PATCH 03/87] auto bump to v1.26.3

---
 .gitignore   | 1 +
 buildah.spec | 4 ++--
 sources      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e5547f..a00fb78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -685,3 +685,4 @@
 /v1.26.0.tar.gz
 /v1.26.1.tar.gz
 /v1.26.2.tar.gz
+/v1.26.3.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 2192760..531f0b6 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -19,10 +19,10 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag v1.26.2
+%global built_tag v1.26.3
 
 Name: %{repo}
-Version: 1.26.2
+Version: 1.26.3
 %if "%{_vendor}" == "debbuild"
 Packager: Lokesh Mandvekar <lsm5@fedoraproject.org>
 License: ASL-2.0+
diff --git a/sources b/sources
index 3bbc28b..a61e793 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.26.2.tar.gz) = f50a7ee787d10a8f8d1a7e0ff9f86990de975df427af894be5bcc84bceafd2eb87dfe75c1b967ae57056299893c942df257aef1e9aaeb712022a8abceeaebba9
+SHA512 (v1.26.3.tar.gz) = 5d8ea60246085ba27795b52152765fc3c85c92c5caf4515c1b2973aec17844eb9da2ffff82f6c503e36f675089c998b9ee51c4b4b899104ccd9fa771308c8048

From 6a103c38f68a7c8c41363ce51c23bffb32edc736 Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Wed, 3 Aug 2022 19:03:12 +0000
Subject: [PATCH 04/87] auto bump to v1.26.4

---
 .gitignore   | 1 +
 buildah.spec | 4 ++--
 sources      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a00fb78..5a0e8cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -686,3 +686,4 @@
 /v1.26.1.tar.gz
 /v1.26.2.tar.gz
 /v1.26.3.tar.gz
+/v1.26.4.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 531f0b6..1293b64 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -19,10 +19,10 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag v1.26.3
+%global built_tag v1.26.4
 
 Name: %{repo}
-Version: 1.26.3
+Version: 1.26.4
 %if "%{_vendor}" == "debbuild"
 Packager: Lokesh Mandvekar <lsm5@fedoraproject.org>
 License: ASL-2.0+
diff --git a/sources b/sources
index a61e793..1a25ff8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.26.3.tar.gz) = 5d8ea60246085ba27795b52152765fc3c85c92c5caf4515c1b2973aec17844eb9da2ffff82f6c503e36f675089c998b9ee51c4b4b899104ccd9fa771308c8048
+SHA512 (v1.26.4.tar.gz) = 39425ee3f40f1cfd2c76749b43f07efe19c90dff56d9b2024a69e092a328cf526f6bbb23b6f38536e7df11a465219f8f344aa643a82f6511fbb0253e5729d71a

From 62002a5e06502c1e5e03fd444f649b788e93dd02 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Mon, 8 Aug 2022 09:41:41 -0400
Subject: [PATCH 05/87] add buildah-tutorial binary

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 buildah.spec          | 3 +++
 tests/test_buildah.sh | 1 +
 2 files changed, 4 insertions(+)

diff --git a/buildah.spec b/buildah.spec
index 1293b64..b6dc2ec 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -170,6 +170,7 @@ export BUILDTAGS+=' libsubid selinux'
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 %gobuild -o bin/imgtype %{import_path}/tests/imgtype
 %gobuild -o bin/copy %{import_path}/tests/copy
+%gobuild -o bin/tutorial %{import_path}/tests/tutorial
 GOMD2MAN=go-md2man %{__make} -C docs
 
 %install
@@ -189,6 +190,7 @@ install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
 cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
 cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
+cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -206,6 +208,7 @@ cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
 %license LICENSE
 %{_bindir}/%{name}-imgtype
 %{_bindir}/%{name}-copy
+%{_bindir}/%{name}-tutorial
 %{_datadir}/%{name}/test
 
 %changelog
diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh
index 5974d30..f8776bb 100755
--- a/tests/test_buildah.sh
+++ b/tests/test_buildah.sh
@@ -16,6 +16,7 @@ env | grep -v LS_COLORS= | sort | sed -e 's/^/  /'
 export BUILDAH_BINARY=/usr/bin/buildah
 export IMGTYPE_BINARY=/usr/bin/buildah-imgtype
 export COPY_BINARY=/usr/bin/buildah-copy
+export TUTORIAL_BINARY=/usr/bin/buildah-tutorial
 
 ###############################################################################
 # BEGIN setup/teardown

From f6702dafee0d8933bb815e878d4ba18e5d93a147 Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Tue, 9 Aug 2022 02:03:34 +0000
Subject: [PATCH 06/87] auto bump to v1.27.0

---
 .gitignore   | 1 +
 buildah.spec | 4 ++--
 sources      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5a0e8cb..bd0f4ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -687,3 +687,4 @@
 /v1.26.2.tar.gz
 /v1.26.3.tar.gz
 /v1.26.4.tar.gz
+/v1.27.0.tar.gz
diff --git a/buildah.spec b/buildah.spec
index b6dc2ec..978a6af 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -19,10 +19,10 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag v1.26.4
+%global built_tag v1.27.0
 
 Name: %{repo}
-Version: 1.26.4
+Version: 1.27.0
 %if "%{_vendor}" == "debbuild"
 Packager: Lokesh Mandvekar <lsm5@fedoraproject.org>
 License: ASL-2.0+
diff --git a/sources b/sources
index 1a25ff8..045d7ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.26.4.tar.gz) = 39425ee3f40f1cfd2c76749b43f07efe19c90dff56d9b2024a69e092a328cf526f6bbb23b6f38536e7df11a465219f8f344aa643a82f6511fbb0253e5729d71a
+SHA512 (v1.27.0.tar.gz) = 7324c85b6f5169522f0cde2cbd0d55b61a2e2fc53d7f03f24ecf606fb564ee6da82cadc493520b4105501124c6c8a1e03aa67b56fb32570f303e849630286afe

From 2a164591d1168870c05e045a7c5f7883068ba152 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 16 Aug 2022 14:35:56 -0400
Subject: [PATCH 07/87] Fix debbuild maintainer issue

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 buildah.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildah.spec b/buildah.spec
index 978a6af..c59db32 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -24,7 +24,7 @@
 Name: %{repo}
 Version: 1.27.0
 %if "%{_vendor}" == "debbuild"
-Packager: Lokesh Mandvekar <lsm5@fedoraproject.org>
+Packager: Podman Debbuild Maintainers <https://github.com/orgs/containers/teams/podman-debbuild-maintainers>
 License: ASL-2.0+
 Release: 0%{?dist}
 %else

From bcf3455ced5f38e00cf6b7ed212a22c53bb2f316 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Wed, 17 Aug 2022 14:15:26 -0400
Subject: [PATCH 08/87] use easier tag macros to make both fedora and debbuild
 happy

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 buildah.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildah.spec b/buildah.spec
index c59db32..819fc22 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -19,7 +19,7 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag v1.27.0
+%global built_tag_strip 1.27.0
 
 Name: %{repo}
 Version: 1.27.0
@@ -33,7 +33,7 @@ Release: %autorelease
 %endif
 Summary: A command line tool used for creating OCI Images
 URL: https://%{name}.io
-Source: %{git0}/archive/%{built_tag}.tar.gz
+Source: %{git0}/archive/v%{built_tag_strip}.tar.gz
 BuildRequires: go-md2man
 %if "%{_vendor}" == "debbuild"
 BuildRequires: git

From 97fac8727b06f6e0177730d82b3b94ee310a13c6 Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Fri, 9 Sep 2022 11:04:29 +0000
Subject: [PATCH 09/87] auto bump to v1.27.1

---
 .gitignore   | 1 +
 buildah.spec | 4 ++--
 sources      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bd0f4ed..9ae751b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -688,3 +688,4 @@
 /v1.26.3.tar.gz
 /v1.26.4.tar.gz
 /v1.27.0.tar.gz
+/v1.27.1.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 819fc22..f5bb5de 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -19,10 +19,10 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag_strip 1.27.0
+%global built_tag_strip 1.27.1
 
 Name: %{repo}
-Version: 1.27.0
+Version: 1.27.1
 %if "%{_vendor}" == "debbuild"
 Packager: Podman Debbuild Maintainers <https://github.com/orgs/containers/teams/podman-debbuild-maintainers>
 License: ASL-2.0+
diff --git a/sources b/sources
index 045d7ad..3126f81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.27.0.tar.gz) = 7324c85b6f5169522f0cde2cbd0d55b61a2e2fc53d7f03f24ecf606fb564ee6da82cadc493520b4105501124c6c8a1e03aa67b56fb32570f303e849630286afe
+SHA512 (v1.27.1.tar.gz) = a5e2ddf837e613554ffe8fe9c15ac9c8f9c2564c403e5544df7fb8802962581fb4e9dd4361c28c93443ede74c20c82f1631990e443c7895a3b4c3b8a659ee05a

From 6988bc13c687e87c59c0c6d5cd2b1e1b0515b4b2 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 30 Sep 2022 10:06:33 -0400
Subject: [PATCH 10/87] bump to v1.27.2

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore   | 1 +
 buildah.spec | 4 ++--
 sources      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ae751b..4eed34a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -689,3 +689,4 @@
 /v1.26.4.tar.gz
 /v1.27.0.tar.gz
 /v1.27.1.tar.gz
+/v1.27.2.tar.gz
diff --git a/buildah.spec b/buildah.spec
index f5bb5de..264eb89 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -19,10 +19,10 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag_strip 1.27.1
+%global built_tag_strip 1.27.2
 
 Name: %{repo}
-Version: 1.27.1
+Version: 1.27.2
 %if "%{_vendor}" == "debbuild"
 Packager: Podman Debbuild Maintainers <https://github.com/orgs/containers/teams/podman-debbuild-maintainers>
 License: ASL-2.0+
diff --git a/sources b/sources
index 3126f81..dd0a851 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.27.1.tar.gz) = a5e2ddf837e613554ffe8fe9c15ac9c8f9c2564c403e5544df7fb8802962581fb4e9dd4361c28c93443ede74c20c82f1631990e443c7895a3b4c3b8a659ee05a
+SHA512 (v1.27.2.tar.gz) = d32852f1a6c5041834b91038c6294baa4480d4b41587204435e4aef1eeffb631dc4cc50df4ab9089e1b1a2d06534272d55b2626e6819b5f45aa0dfe9ec51f6e2

From 0748b124358bf7aab6262715d492e003b52d99e7 Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Mon, 3 Oct 2022 14:21:04 +0000
Subject: [PATCH 11/87] auto bump to v1.28.0

---
 .gitignore   | 1 +
 buildah.spec | 4 ++--
 sources      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4eed34a..4431f1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -690,3 +690,4 @@
 /v1.27.0.tar.gz
 /v1.27.1.tar.gz
 /v1.27.2.tar.gz
+/v1.28.0.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 264eb89..4dfdb20 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -19,10 +19,10 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag_strip 1.27.2
+%global built_tag_strip 1.28.0
 
 Name: %{repo}
-Version: 1.27.2
+Version: 1.28.0
 %if "%{_vendor}" == "debbuild"
 Packager: Podman Debbuild Maintainers <https://github.com/orgs/containers/teams/podman-debbuild-maintainers>
 License: ASL-2.0+
diff --git a/sources b/sources
index dd0a851..54a66f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.27.2.tar.gz) = d32852f1a6c5041834b91038c6294baa4480d4b41587204435e4aef1eeffb631dc4cc50df4ab9089e1b1a2d06534272d55b2626e6819b5f45aa0dfe9ec51f6e2
+SHA512 (v1.28.0.tar.gz) = f5e82a22648fa0d0ba7f5dcf3b97a2ec1182f31d3e03cd2624e01fe76fcdddf0a5605c59816eeef6401d151864b6b6be493c144b83f5667ab3947eea902f0086

From 6dd08dba8abeb9d79ae776462c7366db8c0b5e4d Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 6 Oct 2022 09:53:48 -0400
Subject: [PATCH 12/87] remove debbuild macros to comply with Fedora guidelines

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 buildah.spec | 50 +++++++-------------------------------------------
 1 file changed, 7 insertions(+), 43 deletions(-)

diff --git a/buildah.spec b/buildah.spec
index 4dfdb20..fba874a 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -1,7 +1,3 @@
-%if "%{_vendor}" == "debbuild"
-%define gobuild(o:) GO111MODULE=off go build -buildmode pie -tags=" ${BUILDTAGS:-}" -a -v -x %{?**};
-%endif
-
 %global with_debug 1
 
 %if 0%{?with_debug}
@@ -19,36 +15,19 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag_strip 1.28.0
+%global built_tag v1.28.0
+%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
+%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
 Name: %{repo}
-Version: 1.28.0
-%if "%{_vendor}" == "debbuild"
-Packager: Podman Debbuild Maintainers <https://github.com/orgs/containers/teams/podman-debbuild-maintainers>
-License: ASL-2.0+
-Release: 0%{?dist}
-%else
+Version: %{gen_version}
 License: ASL 2.0 and BSD and MIT and MPLv2.0
 Release: %autorelease
-%endif
 Summary: A command line tool used for creating OCI Images
 URL: https://%{name}.io
-Source: %{git0}/archive/v%{built_tag_strip}.tar.gz
+# Tarball fetched from upstream
+Source: %{git0}/archive/%{built_tag}.tar.gz
 BuildRequires: go-md2man
-%if "%{_vendor}" == "debbuild"
-BuildRequires: git
-BuildRequires: golang
-BuildRequires: libassuan-dev
-BuildRequires: libbtrfs-dev
-BuildRequires: libdevmapper-dev
-BuildRequires: libglib2.0-dev
-BuildRequires: libgpg-error-dev
-BuildRequires: libgpgme-dev
-BuildRequires: libseccomp-dev
-BuildRequires: libsystemd-dev
-BuildRequires: pkg-config
-Requires: containers-common >= 4:1
-%else
 BuildRequires: device-mapper-devel
 BuildRequires: git-core
 BuildRequires: golang >= 1.16.6
@@ -103,7 +82,6 @@ Provides: bundled(golang(github.com/spf13/cobra)) = v1.3.0
 Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5
 Provides: bundled(golang(github.com/stretchr/testify)) = v1.7.0
 Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635
-%endif
 
 %description
 The %{name} package provides a command line tool which can be used to
@@ -134,10 +112,9 @@ Requires: git-daemon
 This package contains system tests for %{name}
 
 %prep
-%autosetup -Sgit
+%autosetup -Sgit -n %{name}-%{built_tag_strip}
 
 %build
-%if "%{_vendor}" != "debbuild"
 %set_build_flags
 # These extra flags present in $CFLAGS have been skipped for now as they break the build
 CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
@@ -147,7 +124,6 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an
 %ifarch x86_64
 export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
 %endif
-%endif
 
 export GOPATH=$(pwd)/_build:$(pwd)
 export CGO_CFLAGS=$CFLAGS
@@ -164,9 +140,7 @@ export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.tx
 export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
 
 export BUILDTAGS='seccomp exclude_graphdriver_devicemapper'
-%if "%{_vendor}" != "debbuild"
 export BUILDTAGS+=' libsubid selinux'
-%endif
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 %gobuild -o bin/imgtype %{import_path}/tests/imgtype
 %gobuild -o bin/copy %{import_path}/tests/copy
@@ -175,16 +149,8 @@ GOMD2MAN=go-md2man %{__make} -C docs
 
 %install
 export GOPATH=$(pwd)/_build:$(pwd)
-%if "%{_vendor}" != "debbuild"
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
-%else
-install -D -m0755 bin/%{name} %{buildroot}%{_bindir}/%{name}
-install -m 644 -D contrib/completions/bash/%{name} %{buildroot}%{_datadir}/bash-completion/completions/%{name}
-install -d %{buildroot}/%{_mandir}/man1
-install -m 0644 docs/%{name}*.1 %{buildroot}%{_mandir}/man1
-install -m 0644 docs/links/%{name}*.1 %{buildroot}%{_mandir}/man1
-%endif
 
 install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
 cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
@@ -212,6 +178,4 @@ cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
 %{_datadir}/%{name}/test
 
 %changelog
-%if "%{_vendor}" != "debbuild"
 %autochangelog
-%endif

From 64a5677385c84b00250b9e432a44fe94c795ad45 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 6 Oct 2022 15:40:11 -0400
Subject: [PATCH 13/87] depend on containers-common-extra

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 buildah.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/buildah.spec b/buildah.spec
index fba874a..591a5af 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -40,15 +40,18 @@ BuildRequires: make
 BuildRequires: ostree-devel
 BuildRequires: btrfs-progs-devel
 BuildRequires: shadow-utils-subid-devel
-Requires: containers-common >= 4:1-46
-Suggests: containernetworking-plugins >= 0.9.1-1
-Requires: netavark
-Requires: iptables
-Requires: nftables
+%if 0%{?fedora} > 37
+Requires: containers-common-extra >= 4:1-78
+%else
+%if 0%{?fedora} == 37
+Requires: containers-common-extra >= 4:1-73
+%else
+Requires: containers-common-extra >= 4:1-62
+%endif
+%endif
 BuildRequires: libseccomp-static
 Requires: libseccomp >= 2.4.1-0
 Suggests: cpp
-Suggests: qemu-user-static
 # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d'
 Provides: bundled(golang(github.com/containerd/containerd)) = v1.5.9
 Provides: bundled(golang(github.com/containernetworking/cni)) = v1.0.1

From 40bdab03bf7100a0faed1c58999f258d777f921a Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Fri, 7 Oct 2022 15:13:55 +0000
Subject: [PATCH 14/87] auto bump to v1.28.0

---
 buildah.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildah.spec b/buildah.spec
index 591a5af..75ec4f8 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -16,11 +16,11 @@
 %global git0 https://%{import_path}
 
 %global built_tag v1.28.0
-%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
+%global built_tag_strip 1.28.0
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
 Name: %{repo}
-Version: %{gen_version}
+Version: 1.28.0
 License: ASL 2.0 and BSD and MIT and MPLv2.0
 Release: %autorelease
 Summary: A command line tool used for creating OCI Images

From 66dfaf0fea9de26b025cf1c94716914a66cb0c26 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 7 Oct 2022 11:48:31 -0400
Subject: [PATCH 15/87] Revert "auto bump to v1.28.0"

This reverts commit 40bdab03bf7100a0faed1c58999f258d777f921a done by
autobuilder.
---
 buildah.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildah.spec b/buildah.spec
index 75ec4f8..591a5af 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -16,11 +16,11 @@
 %global git0 https://%{import_path}
 
 %global built_tag v1.28.0
-%global built_tag_strip 1.28.0
+%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
 Name: %{repo}
-Version: 1.28.0
+Version: %{gen_version}
 License: ASL 2.0 and BSD and MIT and MPLv2.0
 Release: %autorelease
 Summary: A command line tool used for creating OCI Images

From 2b8ee68f86dc1e3e6d1843a32cdc228d0a74234f Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 25 Oct 2022 19:38:14 +0530
Subject: [PATCH 16/87] rebuild

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

From 849720672b6acee8b4ba8a3395641a46c3dbb882 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@fedoraproject.org>
Date: Fri, 28 Oct 2022 15:58:39 +0000
Subject: [PATCH 17/87] Add ExclusiveArch

If using golang, then you needs to use ExclusiveArch for those arches that do not have golang.
---
 buildah.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildah.spec b/buildah.spec
index 591a5af..8c54237 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -27,6 +27,7 @@ Summary: A command line tool used for creating OCI Images
 URL: https://%{name}.io
 # Tarball fetched from upstream
 Source: %{git0}/archive/%{built_tag}.tar.gz
+ExclusiveArch: %{golang_arches}
 BuildRequires: go-md2man
 BuildRequires: device-mapper-devel
 BuildRequires: git-core

From 5af76a5e554eaf07f67f995afc9373561922c05a Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Mon, 28 Nov 2022 14:19:16 +0000
Subject: [PATCH 18/87] auto bump to v1.28.2

---
 .gitignore   | 1 +
 buildah.spec | 2 +-
 sources      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4431f1e..7df5153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -691,3 +691,4 @@
 /v1.27.1.tar.gz
 /v1.27.2.tar.gz
 /v1.28.0.tar.gz
+/v1.28.2.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 8c54237..53ab0c1 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -15,7 +15,7 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag v1.28.0
+%global built_tag v1.28.2
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 54a66f4..90e471a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.28.0.tar.gz) = f5e82a22648fa0d0ba7f5dcf3b97a2ec1182f31d3e03cd2624e01fe76fcdddf0a5605c59816eeef6401d151864b6b6be493c144b83f5667ab3947eea902f0086
+SHA512 (v1.28.2.tar.gz) = 2172e6554338e5b6a0ff8d22c343d168b7ea4eed5e691e75c34c84fefebdce3f5719718bd78bb112936a6c3252db743768ed65f5f421b0b9f37265aa074e1c81

From 13dc086e81860501b33998b425e34524de986855 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 23:16:27 +0000
Subject: [PATCH 19/87] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From c5da87970572224d3f8ca268e23eeb0e627cf4c0 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 31 Jan 2023 17:26:03 +0530
Subject: [PATCH 20/87] bump to v1.29.0

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore   |   1 +
 buildah.spec | 131 +++++++++++++++++++++++++++++++++++++++++----------
 sources      |   2 +-
 3 files changed, 108 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7df5153..d977000 100644
--- a/.gitignore
+++ b/.gitignore
@@ -692,3 +692,4 @@
 /v1.27.2.tar.gz
 /v1.28.0.tar.gz
 /v1.28.2.tar.gz
+/v1.29.0.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 53ab0c1..d0ebe52 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -15,7 +15,7 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag v1.28.2
+%global built_tag v1.29.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
@@ -54,38 +54,119 @@ BuildRequires: libseccomp-static
 Requires: libseccomp >= 2.4.1-0
 Suggests: cpp
 # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d'
-Provides: bundled(golang(github.com/containerd/containerd)) = v1.5.9
-Provides: bundled(golang(github.com/containernetworking/cni)) = v1.0.1
-Provides: bundled(golang(github.com/containers/common)) = v0.47.4
-Provides: bundled(golang(github.com/containers/image/v5)) = v5.19.1
-Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.2
-Provides: bundled(golang(github.com/containers/storage)) = v1.38.2
-Provides: bundled(golang(github.com/docker/distribution)) = v2.8.0+incompatible
-Provides: bundled(golang(github.com/docker/docker)) = v20.10.12+incompatible
-Provides: bundled(golang(github.com/docker/go_units)) = v0.4.0
-Provides: bundled(golang(github.com/docker/libnetwork)) = v0.8.0_dev.2.0.20190625141545_5a177b73e316
-Provides: bundled(golang(github.com/fsouza/go_dockerclient)) = v1.7.8
+Provides: bundled(golang(github.com/Azure/go_ansiterm)) = v0.0.0_20210617225240_d185dfc1b5a1
+Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.2.1
+Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.6.0
+Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.9.6
+Provides: bundled(golang(github.com/VividCortex/ewma)) = v1.2.0
+Provides: bundled(golang(github.com/acarl005/stripansi)) = v0.0.0_20180116102854_5a71ef0e047d
+Provides: bundled(golang(github.com/asaskevich/govalidator)) = v0.0.0_20210307081110_f21760c49a8d
+Provides: bundled(golang(github.com/blang/semver/v4)) = v4.0.0
+Provides: bundled(golang(github.com/chzyer/readline)) = v1.5.1
+Provides: bundled(golang(github.com/container_orchestrated_devices/container_device_interface)) = v0.5.3
+Provides: bundled(golang(github.com/containerd/cgroups)) = v1.0.4
+Provides: bundled(golang(github.com/containerd/containerd)) = v1.6.15
+Provides: bundled(golang(github.com/containerd/stargz_snapshotter/estargz)) = v0.13.0
+Provides: bundled(golang(github.com/containernetworking/cni)) = v1.1.2
+Provides: bundled(golang(github.com/containernetworking/plugins)) = v1.2.0
+Provides: bundled(golang(github.com/containers/common)) = v0.51.0
+Provides: bundled(golang(github.com/containers/image/v5)) = v5.24.0
+Provides: bundled(golang(github.com/containers/libtrust)) = v0.0.0_20230121012942_c1716e8a8d01
+Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.7
+Provides: bundled(golang(github.com/containers/storage)) = v1.45.3
+Provides: bundled(golang(github.com/cyberphone/json_canonicalization)) = v0.0.0_20220623050100_57a0ce2678a7
+Provides: bundled(golang(github.com/cyphar/filepath_securejoin)) = v0.2.3
+Provides: bundled(golang(github.com/davecgh/go_spew)) = v1.1.1
+Provides: bundled(golang(github.com/disiqueira/gotree/v3)) = v3.0.2
+Provides: bundled(golang(github.com/docker/distribution)) = v2.8.1+incompatible
+Provides: bundled(golang(github.com/docker/docker)) = v20.10.23+incompatible
+Provides: bundled(golang(github.com/docker/docker_credential_helpers)) = v0.7.0
+Provides: bundled(golang(github.com/docker/go_connections)) = v0.4.1_0.20210727194412_58542c764a11
+Provides: bundled(golang(github.com/docker/go_units)) = v0.5.0
+Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.6.0
+Provides: bundled(golang(github.com/fsouza/go_dockerclient)) = v1.9.3
 Provides: bundled(golang(github.com/ghodss/yaml)) = v1.0.0
+Provides: bundled(golang(github.com/go_openapi/analysis)) = v0.21.4
+Provides: bundled(golang(github.com/go_openapi/errors)) = v0.20.3
+Provides: bundled(golang(github.com/go_openapi/jsonpointer)) = v0.19.5
+Provides: bundled(golang(github.com/go_openapi/jsonreference)) = v0.20.0
+Provides: bundled(golang(github.com/go_openapi/loads)) = v0.21.2
+Provides: bundled(golang(github.com/go_openapi/runtime)) = v0.24.1
+Provides: bundled(golang(github.com/go_openapi/spec)) = v0.20.7
+Provides: bundled(golang(github.com/go_openapi/strfmt)) = v0.21.3
+Provides: bundled(golang(github.com/go_openapi/swag)) = v0.22.3
+Provides: bundled(golang(github.com/go_openapi/validate)) = v0.22.0
+Provides: bundled(golang(github.com/gogo/protobuf)) = v1.3.2
+Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0_20210331224755_41bb18bfe9da
+Provides: bundled(golang(github.com/golang/protobuf)) = v1.5.2
+Provides: bundled(golang(github.com/google/go_cmp)) = v0.5.9
+Provides: bundled(golang(github.com/google/go_containerregistry)) = v0.12.1
+Provides: bundled(golang(github.com/google/go_intervals)) = v0.0.2
+Provides: bundled(golang(github.com/google/uuid)) = v1.3.0
+Provides: bundled(golang(github.com/gorilla/mux)) = v1.8.0
+Provides: bundled(golang(github.com/hashicorp/errwrap)) = v1.1.0
 Provides: bundled(golang(github.com/hashicorp/go_multierror)) = v1.1.1
-Provides: bundled(golang(github.com/ishidawataru/sctp)) = v0.0.0_20210226210310_f2269e66cdee
-Provides: bundled(golang(github.com/konsorten/go_windows_terminal_sequences)) = v1.0.3
+Provides: bundled(golang(github.com/imdario/mergo)) = v0.3.13
+Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = v1.0.1
+Provides: bundled(golang(github.com/jinzhu/copier)) = v0.3.5
+Provides: bundled(golang(github.com/josharian/intern)) = v1.0.0
+Provides: bundled(golang(github.com/json_iterator/go)) = v1.1.12
+Provides: bundled(golang(github.com/klauspost/compress)) = v1.15.15
+Provides: bundled(golang(github.com/klauspost/pgzip)) = v1.2.6_0.20220930104621_17e8dac29df8
+Provides: bundled(golang(github.com/letsencrypt/boulder)) = v0.0.0_20221109233200_85aa52084eaf
+Provides: bundled(golang(github.com/mailru/easyjson)) = v0.7.7
+Provides: bundled(golang(github.com/manifoldco/promptui)) = v0.9.0
+Provides: bundled(golang(github.com/mattn/go_runewidth)) = v0.0.14
 Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12
+Provides: bundled(golang(github.com/miekg/pkcs11)) = v1.1.1
+Provides: bundled(golang(github.com/mistifyio/go_zfs/v3)) = v3.0.0
+Provides: bundled(golang(github.com/mitchellh/mapstructure)) = v1.5.0
+Provides: bundled(golang(github.com/moby/sys/mount)) = v0.3.3
+Provides: bundled(golang(github.com/moby/sys/mountinfo)) = v0.6.2
+Provides: bundled(golang(github.com/moby/term)) = v0.0.0_20210619224110_3f7ff695adc6
+Provides: bundled(golang(github.com/modern_go/concurrent)) = v0.0.0_20180306012644_bacd9c7ef1dd
+Provides: bundled(golang(github.com/modern_go/reflect2)) = v1.0.2
+Provides: bundled(golang(github.com/morikuni/aec)) = v1.0.0
+Provides: bundled(golang(github.com/nxadm/tail)) = v1.4.8
+Provides: bundled(golang(github.com/oklog/ulid)) = v1.3.1
 Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.5
-Provides: bundled(golang(github.com/onsi/gomega)) = v1.18.1
+Provides: bundled(golang(github.com/onsi/gomega)) = v1.26.0
 Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0
-Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.0.3_0.20211202193544_a5463b7f9c84
-Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.0
-Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.0.3_0.20210326190908_1c3f411f0417
-Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.0
-Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.10.0
-Provides: bundled(golang(github.com/openshift/imagebuilder)) = v1.2.2
+Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.1.0_rc2
+Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.4
+Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.0.3_0.20220825212826_86290f6a00fb
+Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.1_0.20221014010322_58c91d646d86
+Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.10.2
+Provides: bundled(golang(github.com/openshift/imagebuilder)) = v1.2.4_0.20220711175835_4151e43600df
+Provides: bundled(golang(github.com/ostreedev/ostree_go)) = v0.0.0_20210805093236_719684c64e4f
 Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1
-Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.9.2_0.20210429002308_3879420cc921
-Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1
-Provides: bundled(golang(github.com/spf13/cobra)) = v1.3.0
+Provides: bundled(golang(github.com/pmezard/go_difflib)) = v1.0.0
+Provides: bundled(golang(github.com/proglottis/gpgme)) = v0.1.3
+Provides: bundled(golang(github.com/rivo/uniseg)) = v0.4.3
+Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.10.0
+Provides: bundled(golang(github.com/sigstore/fulcio)) = v1.0.0
+Provides: bundled(golang(github.com/sigstore/rekor)) = v1.0.1
+Provides: bundled(golang(github.com/sigstore/sigstore)) = v1.5.1
+Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.9.0
+Provides: bundled(golang(github.com/spf13/cobra)) = v1.6.1
 Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5
-Provides: bundled(golang(github.com/stretchr/testify)) = v1.7.0
+Provides: bundled(golang(github.com/stefanberger/go_pkcs11uri)) = v0.0.0_20201008174630_78d3cae3a980
+Provides: bundled(golang(github.com/stretchr/testify)) = v1.8.1
+Provides: bundled(golang(github.com/sylabs/sif/v2)) = v2.9.0
 Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635
+Provides: bundled(golang(github.com/tchap/go_patricia)) = v2.3.0+incompatible
+Provides: bundled(golang(github.com/theupdateframework/go_tuf)) = v0.5.2_0.20221207161717_9cb61d6e65f5
+Provides: bundled(golang(github.com/titanous/rocacheck)) = v0.0.0_20171023193734_afe73141d399
+Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.11
+Provides: bundled(golang(github.com/vbatts/tar_split)) = v0.11.2
+Provides: bundled(golang(github.com/vbauerster/mpb/v7)) = v7.5.3
+Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.2.1_beta.2
+Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f
+Provides: bundled(golang(github.com/xeipuuv/gojsonpointer)) = v0.0.0_20190905194746_02993c407bfb
+Provides: bundled(golang(github.com/xeipuuv/gojsonreference)) = v0.0.0_20180127040603_bd5ef7bd5415
+Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = v1.2.0
+Provides: bundled(golang(k8s.io/klog)) = v1.0.0
+Provides: bundled(golang(sigs.k8s.io/yaml)) = v1.3.0
 
 %description
 The %{name} package provides a command line tool which can be used to
diff --git a/sources b/sources
index 90e471a..941b455 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.28.2.tar.gz) = 2172e6554338e5b6a0ff8d22c343d168b7ea4eed5e691e75c34c84fefebdce3f5719718bd78bb112936a6c3252db743768ed65f5f421b0b9f37265aa074e1c81
+SHA512 (v1.29.0.tar.gz) = 9d5dfe46007aeb9b7ae80a804b20c45b149156ec5edeb181ec00c021a0b6499394d676a7189389e51c2968fc60680c6d8438c11f46f5b7d523fba00d7cf17894

From 0ac3c2ee094145d6c1683f2c00fca6facef75d63 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 9 Feb 2023 17:21:31 +0530
Subject: [PATCH 21/87] exclusivearch: golang_arches_future

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 buildah.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildah.spec b/buildah.spec
index d0ebe52..dc77139 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -23,11 +23,11 @@ Name: %{repo}
 Version: %{gen_version}
 License: ASL 2.0 and BSD and MIT and MPLv2.0
 Release: %autorelease
+ExclusiveArch: %{golang_arches_future}
 Summary: A command line tool used for creating OCI Images
 URL: https://%{name}.io
 # Tarball fetched from upstream
 Source: %{git0}/archive/%{built_tag}.tar.gz
-ExclusiveArch: %{golang_arches}
 BuildRequires: go-md2man
 BuildRequires: device-mapper-devel
 BuildRequires: git-core

From 128d79c87ef10114eb4d0862bf72702d594a063b Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Fri, 17 Feb 2023 09:44:42 +0000
Subject: [PATCH 22/87] auto bump to v1.29.1

---
 .gitignore   | 1 +
 buildah.spec | 2 +-
 sources      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d977000..ce4c09f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -693,3 +693,4 @@
 /v1.28.0.tar.gz
 /v1.28.2.tar.gz
 /v1.29.0.tar.gz
+/v1.29.1.tar.gz
diff --git a/buildah.spec b/buildah.spec
index dc77139..1a8b954 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -15,7 +15,7 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag v1.29.0
+%global built_tag v1.29.1
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 941b455..39c2b34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.29.0.tar.gz) = 9d5dfe46007aeb9b7ae80a804b20c45b149156ec5edeb181ec00c021a0b6499394d676a7189389e51c2968fc60680c6d8438c11f46f5b7d523fba00d7cf17894
+SHA512 (v1.29.1.tar.gz) = ea78aacee9b5cc10e299789d739e7086579e67719ab72b84f6ea5acbaf31d443284387ac92e7c5c1c3da9bd6523f43e2d9c7e2ea5698c251cb5458a384f41b04

From 2b69d274251cdea155a30be705ba4429c1551c91 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Mon, 6 Mar 2023 16:28:40 +0530
Subject: [PATCH 23/87] migrated to SPDX license

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 buildah.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildah.spec b/buildah.spec
index 1a8b954..dc3e15c 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -21,7 +21,7 @@
 
 Name: %{repo}
 Version: %{gen_version}
-License: ASL 2.0 and BSD and MIT and MPLv2.0
+License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0
 Release: %autorelease
 ExclusiveArch: %{golang_arches_future}
 Summary: A command line tool used for creating OCI Images

From c6d2d347ffb969d28826b7933312e99b7864e066 Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot@fedoraproject.org>
Date: Mon, 10 Apr 2023 07:04:15 +0000
Subject: [PATCH 24/87] auto bump to v1.30.0

---
 .gitignore   | 1 +
 buildah.spec | 2 +-
 sources      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce4c09f..739d259 100644
--- a/.gitignore
+++ b/.gitignore
@@ -694,3 +694,4 @@
 /v1.28.2.tar.gz
 /v1.29.0.tar.gz
 /v1.29.1.tar.gz
+/v1.30.0.tar.gz
diff --git a/buildah.spec b/buildah.spec
index dc3e15c..be80dd9 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -15,7 +15,7 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag v1.29.1
+%global built_tag v1.30.0
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
diff --git a/sources b/sources
index 39c2b34..532d3ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.29.1.tar.gz) = ea78aacee9b5cc10e299789d739e7086579e67719ab72b84f6ea5acbaf31d443284387ac92e7c5c1c3da9bd6523f43e2d9c7e2ea5698c251cb5458a384f41b04
+SHA512 (v1.30.0.tar.gz) = 185fd98a59fa8d86fe9f1eadc9b7591e5053674464be10538a7581d8e1f6a25e5032a354c821c32a167e2864acea010243efbbe4f5a4205d8eaa2894f062a25b

From 9eeb0aed958ed81b37b049604704fc0f7c4fe6cc Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mon, 24 Apr 2023 21:08:02 -0400
Subject: [PATCH 25/87] Disable btrfs in RHEL builds

btrfs-progs is not supported on RHEL.
---
 buildah.spec | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/buildah.spec b/buildah.spec
index be80dd9..b7d9a2a 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -7,6 +7,12 @@
 %global debug_package   %{nil}
 %endif
 
+%if 0%{?rhel}
+%bcond_with btrfs
+%else
+%bcond_without btrfs
+%endif
+
 %global provider github
 %global provider_tld com
 %global project containers
@@ -39,7 +45,9 @@ BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: make
 BuildRequires: ostree-devel
+%if %{with btrfs}
 BuildRequires: btrfs-progs-devel
+%endif
 BuildRequires: shadow-utils-subid-devel
 %if 0%{?fedora} > 37
 Requires: containers-common-extra >= 4:1-78
@@ -226,6 +234,9 @@ export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
 
 export BUILDTAGS='seccomp exclude_graphdriver_devicemapper'
 export BUILDTAGS+=' libsubid selinux'
+%if %{without btrfs}
+export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs'
+%endif
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 %gobuild -o bin/imgtype %{import_path}/tests/imgtype
 %gobuild -o bin/copy %{import_path}/tests/copy

From adfea5d872b152e4b63db80fc1e833bc56026eda Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Wed, 5 Jul 2023 08:45:50 -0400
Subject: [PATCH 26/87] bump to v1.31.0

---
 .gitignore   |   1 +
 buildah.spec | 304 ++++++++++++++++++++++++---------------------------
 sources      |   2 +-
 3 files changed, 146 insertions(+), 161 deletions(-)

diff --git a/.gitignore b/.gitignore
index 739d259..11def47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -695,3 +695,4 @@
 /v1.29.0.tar.gz
 /v1.29.1.tar.gz
 /v1.30.0.tar.gz
+/v1.31.0.tar.gz
diff --git a/buildah.spec b/buildah.spec
index b7d9a2a..0eb34f6 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -7,174 +7,159 @@
 %global debug_package   %{nil}
 %endif
 
-%if 0%{?rhel}
-%bcond_with btrfs
-%else
-%bcond_without btrfs
+%if %{defined rhel} && 0%{?rhel} == 8
+# RHEL 8's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
+# set it separately here and do not depend on RHEL 8's go-srpm-macros package.
+%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
 %endif
 
-%global provider github
-%global provider_tld com
-%global project containers
-%global repo buildah
-# https://github.com/containers/buildah
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global git0 https://%{import_path}
+%global gomodulesmode GO111MODULE=on
 
-%global built_tag v1.30.0
-%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
-%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
+%if 0%{defined fedora}
+%define build_with_btrfs 1
+%endif
 
-Name: %{repo}
-Version: %{gen_version}
+%global git0 https://github.com/containers/%{name}
+
+Name: buildah
+# Set different Epoch for copr
+%if %{defined copr_username}
+Epoch: 102
+%endif
+# DO NOT TOUCH the Version string!
+# The TRUE source of this specfile is:
+# https://github.com/containers/skopeo/blob/main/rpm/skopeo.spec
+# If that's what you're reading, Version must be 0, and will be updated by Packit for
+# copr and koji builds.
+# If you're reading this on dist-git, the version is automatically filled in by Packit.
+Version: 1.31.0
 License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0
 Release: %autorelease
+%if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
+%else
+ExclusiveArch: aarch64 ppc64le s390x x86_64
+%endif
 Summary: A command line tool used for creating OCI Images
 URL: https://%{name}.io
 # Tarball fetched from upstream
-Source: %{git0}/archive/%{built_tag}.tar.gz
+Source: %{git0}/archive/v%{version}.tar.gz
 BuildRequires: go-md2man
 BuildRequires: device-mapper-devel
 BuildRequires: git-core
 BuildRequires: golang >= 1.16.6
 BuildRequires: glib2-devel
 BuildRequires: glibc-static
+%if !%{defined gobuild}
 BuildRequires: go-rpm-macros
+%endif
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: make
 BuildRequires: ostree-devel
-%if %{with btrfs}
+%if %{defined build_with_btrfs}
 BuildRequires: btrfs-progs-devel
 %endif
 BuildRequires: shadow-utils-subid-devel
-%if 0%{?fedora} > 37
-Requires: containers-common-extra >= 4:1-78
-%else
-%if 0%{?fedora} == 37
-Requires: containers-common-extra >= 4:1-73
-%else
-Requires: containers-common-extra >= 4:1-62
-%endif
-%endif
+Requires: containers-common-extra
+%if %{defined fedora}
 BuildRequires: libseccomp-static
+%else
+BuildRequires: libseccomp-devel
+%endif
 Requires: libseccomp >= 2.4.1-0
 Suggests: cpp
-# awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d'
-Provides: bundled(golang(github.com/Azure/go_ansiterm)) = v0.0.0_20210617225240_d185dfc1b5a1
-Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.2.1
-Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.6.0
-Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.9.6
-Provides: bundled(golang(github.com/VividCortex/ewma)) = v1.2.0
-Provides: bundled(golang(github.com/acarl005/stripansi)) = v0.0.0_20180116102854_5a71ef0e047d
-Provides: bundled(golang(github.com/asaskevich/govalidator)) = v0.0.0_20210307081110_f21760c49a8d
-Provides: bundled(golang(github.com/blang/semver/v4)) = v4.0.0
-Provides: bundled(golang(github.com/chzyer/readline)) = v1.5.1
-Provides: bundled(golang(github.com/container_orchestrated_devices/container_device_interface)) = v0.5.3
-Provides: bundled(golang(github.com/containerd/cgroups)) = v1.0.4
-Provides: bundled(golang(github.com/containerd/containerd)) = v1.6.15
-Provides: bundled(golang(github.com/containerd/stargz_snapshotter/estargz)) = v0.13.0
-Provides: bundled(golang(github.com/containernetworking/cni)) = v1.1.2
-Provides: bundled(golang(github.com/containernetworking/plugins)) = v1.2.0
-Provides: bundled(golang(github.com/containers/common)) = v0.51.0
-Provides: bundled(golang(github.com/containers/image/v5)) = v5.24.0
-Provides: bundled(golang(github.com/containers/libtrust)) = v0.0.0_20230121012942_c1716e8a8d01
-Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.7
-Provides: bundled(golang(github.com/containers/storage)) = v1.45.3
-Provides: bundled(golang(github.com/cyberphone/json_canonicalization)) = v0.0.0_20220623050100_57a0ce2678a7
-Provides: bundled(golang(github.com/cyphar/filepath_securejoin)) = v0.2.3
-Provides: bundled(golang(github.com/davecgh/go_spew)) = v1.1.1
-Provides: bundled(golang(github.com/disiqueira/gotree/v3)) = v3.0.2
-Provides: bundled(golang(github.com/docker/distribution)) = v2.8.1+incompatible
-Provides: bundled(golang(github.com/docker/docker)) = v20.10.23+incompatible
-Provides: bundled(golang(github.com/docker/docker_credential_helpers)) = v0.7.0
-Provides: bundled(golang(github.com/docker/go_connections)) = v0.4.1_0.20210727194412_58542c764a11
-Provides: bundled(golang(github.com/docker/go_units)) = v0.5.0
-Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.6.0
-Provides: bundled(golang(github.com/fsouza/go_dockerclient)) = v1.9.3
-Provides: bundled(golang(github.com/ghodss/yaml)) = v1.0.0
-Provides: bundled(golang(github.com/go_openapi/analysis)) = v0.21.4
-Provides: bundled(golang(github.com/go_openapi/errors)) = v0.20.3
-Provides: bundled(golang(github.com/go_openapi/jsonpointer)) = v0.19.5
-Provides: bundled(golang(github.com/go_openapi/jsonreference)) = v0.20.0
-Provides: bundled(golang(github.com/go_openapi/loads)) = v0.21.2
-Provides: bundled(golang(github.com/go_openapi/runtime)) = v0.24.1
-Provides: bundled(golang(github.com/go_openapi/spec)) = v0.20.7
-Provides: bundled(golang(github.com/go_openapi/strfmt)) = v0.21.3
-Provides: bundled(golang(github.com/go_openapi/swag)) = v0.22.3
-Provides: bundled(golang(github.com/go_openapi/validate)) = v0.22.0
-Provides: bundled(golang(github.com/gogo/protobuf)) = v1.3.2
-Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0_20210331224755_41bb18bfe9da
-Provides: bundled(golang(github.com/golang/protobuf)) = v1.5.2
-Provides: bundled(golang(github.com/google/go_cmp)) = v0.5.9
-Provides: bundled(golang(github.com/google/go_containerregistry)) = v0.12.1
-Provides: bundled(golang(github.com/google/go_intervals)) = v0.0.2
-Provides: bundled(golang(github.com/google/uuid)) = v1.3.0
-Provides: bundled(golang(github.com/gorilla/mux)) = v1.8.0
-Provides: bundled(golang(github.com/hashicorp/errwrap)) = v1.1.0
-Provides: bundled(golang(github.com/hashicorp/go_multierror)) = v1.1.1
-Provides: bundled(golang(github.com/imdario/mergo)) = v0.3.13
-Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = v1.0.1
-Provides: bundled(golang(github.com/jinzhu/copier)) = v0.3.5
-Provides: bundled(golang(github.com/josharian/intern)) = v1.0.0
-Provides: bundled(golang(github.com/json_iterator/go)) = v1.1.12
-Provides: bundled(golang(github.com/klauspost/compress)) = v1.15.15
-Provides: bundled(golang(github.com/klauspost/pgzip)) = v1.2.6_0.20220930104621_17e8dac29df8
-Provides: bundled(golang(github.com/letsencrypt/boulder)) = v0.0.0_20221109233200_85aa52084eaf
-Provides: bundled(golang(github.com/mailru/easyjson)) = v0.7.7
-Provides: bundled(golang(github.com/manifoldco/promptui)) = v0.9.0
-Provides: bundled(golang(github.com/mattn/go_runewidth)) = v0.0.14
-Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12
-Provides: bundled(golang(github.com/miekg/pkcs11)) = v1.1.1
-Provides: bundled(golang(github.com/mistifyio/go_zfs/v3)) = v3.0.0
-Provides: bundled(golang(github.com/mitchellh/mapstructure)) = v1.5.0
-Provides: bundled(golang(github.com/moby/sys/mount)) = v0.3.3
-Provides: bundled(golang(github.com/moby/sys/mountinfo)) = v0.6.2
-Provides: bundled(golang(github.com/moby/term)) = v0.0.0_20210619224110_3f7ff695adc6
-Provides: bundled(golang(github.com/modern_go/concurrent)) = v0.0.0_20180306012644_bacd9c7ef1dd
-Provides: bundled(golang(github.com/modern_go/reflect2)) = v1.0.2
-Provides: bundled(golang(github.com/morikuni/aec)) = v1.0.0
-Provides: bundled(golang(github.com/nxadm/tail)) = v1.4.8
-Provides: bundled(golang(github.com/oklog/ulid)) = v1.3.1
-Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.5
-Provides: bundled(golang(github.com/onsi/gomega)) = v1.26.0
-Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0
-Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.1.0_rc2
-Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.4
-Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.0.3_0.20220825212826_86290f6a00fb
-Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.1_0.20221014010322_58c91d646d86
-Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.10.2
-Provides: bundled(golang(github.com/openshift/imagebuilder)) = v1.2.4_0.20220711175835_4151e43600df
-Provides: bundled(golang(github.com/ostreedev/ostree_go)) = v0.0.0_20210805093236_719684c64e4f
-Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1
-Provides: bundled(golang(github.com/pmezard/go_difflib)) = v1.0.0
-Provides: bundled(golang(github.com/proglottis/gpgme)) = v0.1.3
-Provides: bundled(golang(github.com/rivo/uniseg)) = v0.4.3
-Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.10.0
-Provides: bundled(golang(github.com/sigstore/fulcio)) = v1.0.0
-Provides: bundled(golang(github.com/sigstore/rekor)) = v1.0.1
-Provides: bundled(golang(github.com/sigstore/sigstore)) = v1.5.1
-Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.9.0
-Provides: bundled(golang(github.com/spf13/cobra)) = v1.6.1
-Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5
-Provides: bundled(golang(github.com/stefanberger/go_pkcs11uri)) = v0.0.0_20201008174630_78d3cae3a980
-Provides: bundled(golang(github.com/stretchr/testify)) = v1.8.1
-Provides: bundled(golang(github.com/sylabs/sif/v2)) = v2.9.0
-Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635
-Provides: bundled(golang(github.com/tchap/go_patricia)) = v2.3.0+incompatible
-Provides: bundled(golang(github.com/theupdateframework/go_tuf)) = v0.5.2_0.20221207161717_9cb61d6e65f5
-Provides: bundled(golang(github.com/titanous/rocacheck)) = v0.0.0_20171023193734_afe73141d399
-Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.11
-Provides: bundled(golang(github.com/vbatts/tar_split)) = v0.11.2
-Provides: bundled(golang(github.com/vbauerster/mpb/v7)) = v7.5.3
-Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.2.1_beta.2
-Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f
-Provides: bundled(golang(github.com/xeipuuv/gojsonpointer)) = v0.0.0_20190905194746_02993c407bfb
-Provides: bundled(golang(github.com/xeipuuv/gojsonreference)) = v0.0.0_20180127040603_bd5ef7bd5415
-Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = v1.2.0
-Provides: bundled(golang(k8s.io/klog)) = v1.0.0
-Provides: bundled(golang(sigs.k8s.io/yaml)) = v1.3.0
+# DO NOT DELETE BELOW LINE - used for updating downstream goimports
+# vendored libraries
+Provides: bundled(golang(github.com/containerd/containerd/platforms))
+Provides: bundled(golang(github.com/containernetworking/cni/pkg/version))
+Provides: bundled(golang(github.com/containernetworking/plugins/pkg/ns))
+Provides: bundled(golang(github.com/containers/common/libimage))
+Provides: bundled(golang(github.com/containers/common/libimage/manifests))
+Provides: bundled(golang(github.com/containers/common/libnetwork/etchosts))
+Provides: bundled(golang(github.com/containers/common/libnetwork/network))
+Provides: bundled(golang(github.com/containers/common/libnetwork/pasta))
+Provides: bundled(golang(github.com/containers/common/libnetwork/resolvconf))
+Provides: bundled(golang(github.com/containers/common/libnetwork/slirp4netns))
+Provides: bundled(golang(github.com/containers/common/libnetwork/types))
+Provides: bundled(golang(github.com/containers/common/libnetwork/util))
+Provides: bundled(golang(github.com/containers/common/pkg/auth))
+Provides: bundled(golang(github.com/containers/common/pkg/capabilities))
+Provides: bundled(golang(github.com/containers/common/pkg/chown))
+Provides: bundled(golang(github.com/containers/common/pkg/completion))
+Provides: bundled(golang(github.com/containers/common/pkg/config))
+Provides: bundled(golang(github.com/containers/common/pkg/hooks))
+Provides: bundled(golang(github.com/containers/common/pkg/hooks/exec))
+Provides: bundled(golang(github.com/containers/common/pkg/manifests))
+Provides: bundled(golang(github.com/containers/common/pkg/parse))
+Provides: bundled(golang(github.com/containers/common/pkg/retry))
+Provides: bundled(golang(github.com/containers/common/pkg/subscriptions))
+Provides: bundled(golang(github.com/containers/common/pkg/supplemented))
+Provides: bundled(golang(github.com/containers/common/pkg/umask))
+Provides: bundled(golang(github.com/containers/common/pkg/util))
+Provides: bundled(golang(github.com/containers/image/v5/copy))
+Provides: bundled(golang(github.com/containers/image/v5/docker))
+Provides: bundled(golang(github.com/containers/image/v5/docker/reference))
+Provides: bundled(golang(github.com/containers/image/v5/image))
+Provides: bundled(golang(github.com/containers/image/v5/manifest))
+Provides: bundled(golang(github.com/containers/image/v5/oci/layout))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/blobcache))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/compression))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/shortnames))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/strslice))
+Provides: bundled(golang(github.com/containers/image/v5/pkg/sysregistriesv2))
+Provides: bundled(golang(github.com/containers/image/v5/signature))
+Provides: bundled(golang(github.com/containers/image/v5/storage))
+Provides: bundled(golang(github.com/containers/image/v5/transports))
+Provides: bundled(golang(github.com/containers/image/v5/transports/alltransports))
+Provides: bundled(golang(github.com/containers/image/v5/types))
+Provides: bundled(golang(github.com/containers/image/v5/version))
+Provides: bundled(golang(github.com/containers/ocicrypt/config))
+Provides: bundled(golang(github.com/containers/ocicrypt/helpers))
+Provides: bundled(golang(github.com/containers/storage))
+Provides: bundled(golang(github.com/containers/storage/pkg/archive))
+Provides: bundled(golang(github.com/containers/storage/pkg/chrootarchive))
+Provides: bundled(golang(github.com/containers/storage/pkg/fileutils))
+Provides: bundled(golang(github.com/containers/storage/pkg/idtools))
+Provides: bundled(golang(github.com/containers/storage/pkg/ioutils))
+Provides: bundled(golang(github.com/containers/storage/pkg/lockfile))
+Provides: bundled(golang(github.com/containers/storage/pkg/mount))
+Provides: bundled(golang(github.com/containers/storage/pkg/reexec))
+Provides: bundled(golang(github.com/containers/storage/pkg/stringid))
+Provides: bundled(golang(github.com/containers/storage/pkg/system))
+Provides: bundled(golang(github.com/containers/storage/pkg/unshare))
+Provides: bundled(golang(github.com/containers/storage/types))
+Provides: bundled(golang(github.com/cyphar/filepath-securejoin))
+Provides: bundled(golang(github.com/docker/distribution/registry/api/errcode))
+Provides: bundled(golang(github.com/docker/go-units))
+Provides: bundled(golang(github.com/fsouza/go-dockerclient))
+Provides: bundled(golang(github.com/hashicorp/go-multierror))
+Provides: bundled(golang(github.com/mattn/go-shellwords))
+Provides: bundled(golang(github.com/opencontainers/go-digest))
+Provides: bundled(golang(github.com/opencontainers/image-spec/specs-go))
+Provides: bundled(golang(github.com/opencontainers/image-spec/specs-go/v1))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/apparmor))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/devices))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/userns))
+Provides: bundled(golang(github.com/opencontainers/runtime-spec/specs-go))
+Provides: bundled(golang(github.com/opencontainers/runtime-tools/generate))
+Provides: bundled(golang(github.com/opencontainers/selinux/go-selinux))
+Provides: bundled(golang(github.com/opencontainers/selinux/go-selinux/label))
+Provides: bundled(golang(github.com/openshift/imagebuilder))
+Provides: bundled(golang(github.com/openshift/imagebuilder/dockerfile/command))
+Provides: bundled(golang(github.com/openshift/imagebuilder/dockerfile/parser))
+Provides: bundled(golang(github.com/sirupsen/logrus))
+Provides: bundled(golang(github.com/spf13/cobra))
+Provides: bundled(golang(github.com/spf13/pflag))
+Provides: bundled(golang(github.com/syndtr/gocapability/capability))
+Provides: bundled(golang(go.etcd.io/bbolt))
+Provides: bundled(golang(golang.org/x/crypto/bcrypt))
+Provides: bundled(golang(golang.org/x/crypto/ssh))
+Provides: bundled(golang(golang.org/x/crypto/ssh/agent))
+Provides: bundled(golang(golang.org/x/sync/semaphore))
+Provides: bundled(golang(golang.org/x/sys/unix))
+Provides: bundled(golang(golang.org/x/term))
+Provides: bundled(golang(sigs.k8s.io/yaml))
 
 %description
 The %{name} package provides a command line tool which can be used to
@@ -205,10 +190,12 @@ Requires: git-daemon
 This package contains system tests for %{name}
 
 %prep
-%autosetup -Sgit -n %{name}-%{built_tag_strip}
+%autosetup -Sgit -n %{name}-%{version}
 
 %build
 %set_build_flags
+export CGO_CFLAGS=$CFLAGS
+
 # These extra flags present in $CFLAGS have been skipped for now as they break the build
 CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
 CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g')
@@ -218,29 +205,18 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an
 export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
 %endif
 
-export GOPATH=$(pwd)/_build:$(pwd)
-export CGO_CFLAGS=$CFLAGS
-
-mkdir _build
-cd _build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
-ln -s ../../../../ src/%{import_path}
-cd ..
-
-mv vendor src
-
 export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'`
 export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
 
-export BUILDTAGS='seccomp exclude_graphdriver_devicemapper'
-export BUILDTAGS+=' libsubid selinux'
-%if %{without btrfs}
+export BUILDTAGS='seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $hack/libsubid_tag.sh)'
+%if !%{defined build_with_btrfs}
 export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs'
 %endif
-%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
-%gobuild -o bin/imgtype %{import_path}/tests/imgtype
-%gobuild -o bin/copy %{import_path}/tests/copy
-%gobuild -o bin/tutorial %{import_path}/tests/tutorial
+
+%gobuild -o bin/%{name} ./cmd/%{name}
+%gobuild -o bin/imgtype ./tests/imgtype
+%gobuild -o bin/copy ./tests/copy
+%gobuild -o bin/tutorial ./tests/tutorial
 GOMD2MAN=go-md2man %{__make} -C docs
 
 %install
@@ -274,4 +250,12 @@ cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
 %{_datadir}/%{name}/test
 
 %changelog
+%if %{defined autochangelog}
 %autochangelog
+%else
+# NOTE: This changelog will be visible on CentOS 8 Stream builds
+# Other envs are capable of handling autochangelog
+* Fri Jun 16 2023 RH Container Bot <rhcontainerbot@fedoraproject.org>
+- Placeholder changelog for envs that are not autochangelog-ready.
+- Contact upstream if you need to report an issue with the build.
+%endif
diff --git a/sources b/sources
index 532d3ea..2203b0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.30.0.tar.gz) = 185fd98a59fa8d86fe9f1eadc9b7591e5053674464be10538a7581d8e1f6a25e5032a354c821c32a167e2864acea010243efbbe4f5a4205d8eaa2894f062a25b
+SHA512 (v1.31.0.tar.gz) = 613c8e76f134ce46e9d9c21a747914993214f0cc875a193e972f77784ca8d2f683c08557c7b764e3c48c854ca4104e04d3d6529e28397ec76311cc937168a696

From 970be0dd2cb76f5350170c6b47122082e84dd001 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 15:03:32 +0000
Subject: [PATCH 27/87] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From f441aad839c25450290be2743479621e853fa8bf Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Wed, 9 Aug 2023 16:00:44 -0400
Subject: [PATCH 28/87] bump to v1.31.1

---
 .gitignore   |   1 +
 buildah.spec | 109 +++++----------------------------------------------
 sources      |   2 +-
 3 files changed, 12 insertions(+), 100 deletions(-)

diff --git a/.gitignore b/.gitignore
index 11def47..069b25d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -696,3 +696,4 @@
 /v1.29.1.tar.gz
 /v1.30.0.tar.gz
 /v1.31.0.tar.gz
+/v1.31.1.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 0eb34f6..7eeba61 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -7,9 +7,12 @@
 %global debug_package   %{nil}
 %endif
 
-%if %{defined rhel} && 0%{?rhel} == 8
-# RHEL 8's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
-# set it separately here and do not depend on RHEL 8's go-srpm-macros package.
+# RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
+# set it separately here and do not depend on RHEL's go-[s]rpm-macros package
+# until that's fixed.
+# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328
+# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331
+%if %{defined rhel}
 %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
 %endif
 
@@ -32,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.31.0
+Version: 1.31.1
 License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0
 Release: %autorelease
 %if %{defined golang_arches_future}
@@ -44,7 +47,6 @@ Summary: A command line tool used for creating OCI Images
 URL: https://%{name}.io
 # Tarball fetched from upstream
 Source: %{git0}/archive/v%{version}.tar.gz
-BuildRequires: go-md2man
 BuildRequires: device-mapper-devel
 BuildRequires: git-core
 BuildRequires: golang >= 1.16.6
@@ -69,97 +71,6 @@ BuildRequires: libseccomp-devel
 %endif
 Requires: libseccomp >= 2.4.1-0
 Suggests: cpp
-# DO NOT DELETE BELOW LINE - used for updating downstream goimports
-# vendored libraries
-Provides: bundled(golang(github.com/containerd/containerd/platforms))
-Provides: bundled(golang(github.com/containernetworking/cni/pkg/version))
-Provides: bundled(golang(github.com/containernetworking/plugins/pkg/ns))
-Provides: bundled(golang(github.com/containers/common/libimage))
-Provides: bundled(golang(github.com/containers/common/libimage/manifests))
-Provides: bundled(golang(github.com/containers/common/libnetwork/etchosts))
-Provides: bundled(golang(github.com/containers/common/libnetwork/network))
-Provides: bundled(golang(github.com/containers/common/libnetwork/pasta))
-Provides: bundled(golang(github.com/containers/common/libnetwork/resolvconf))
-Provides: bundled(golang(github.com/containers/common/libnetwork/slirp4netns))
-Provides: bundled(golang(github.com/containers/common/libnetwork/types))
-Provides: bundled(golang(github.com/containers/common/libnetwork/util))
-Provides: bundled(golang(github.com/containers/common/pkg/auth))
-Provides: bundled(golang(github.com/containers/common/pkg/capabilities))
-Provides: bundled(golang(github.com/containers/common/pkg/chown))
-Provides: bundled(golang(github.com/containers/common/pkg/completion))
-Provides: bundled(golang(github.com/containers/common/pkg/config))
-Provides: bundled(golang(github.com/containers/common/pkg/hooks))
-Provides: bundled(golang(github.com/containers/common/pkg/hooks/exec))
-Provides: bundled(golang(github.com/containers/common/pkg/manifests))
-Provides: bundled(golang(github.com/containers/common/pkg/parse))
-Provides: bundled(golang(github.com/containers/common/pkg/retry))
-Provides: bundled(golang(github.com/containers/common/pkg/subscriptions))
-Provides: bundled(golang(github.com/containers/common/pkg/supplemented))
-Provides: bundled(golang(github.com/containers/common/pkg/umask))
-Provides: bundled(golang(github.com/containers/common/pkg/util))
-Provides: bundled(golang(github.com/containers/image/v5/copy))
-Provides: bundled(golang(github.com/containers/image/v5/docker))
-Provides: bundled(golang(github.com/containers/image/v5/docker/reference))
-Provides: bundled(golang(github.com/containers/image/v5/image))
-Provides: bundled(golang(github.com/containers/image/v5/manifest))
-Provides: bundled(golang(github.com/containers/image/v5/oci/layout))
-Provides: bundled(golang(github.com/containers/image/v5/pkg/blobcache))
-Provides: bundled(golang(github.com/containers/image/v5/pkg/compression))
-Provides: bundled(golang(github.com/containers/image/v5/pkg/shortnames))
-Provides: bundled(golang(github.com/containers/image/v5/pkg/strslice))
-Provides: bundled(golang(github.com/containers/image/v5/pkg/sysregistriesv2))
-Provides: bundled(golang(github.com/containers/image/v5/signature))
-Provides: bundled(golang(github.com/containers/image/v5/storage))
-Provides: bundled(golang(github.com/containers/image/v5/transports))
-Provides: bundled(golang(github.com/containers/image/v5/transports/alltransports))
-Provides: bundled(golang(github.com/containers/image/v5/types))
-Provides: bundled(golang(github.com/containers/image/v5/version))
-Provides: bundled(golang(github.com/containers/ocicrypt/config))
-Provides: bundled(golang(github.com/containers/ocicrypt/helpers))
-Provides: bundled(golang(github.com/containers/storage))
-Provides: bundled(golang(github.com/containers/storage/pkg/archive))
-Provides: bundled(golang(github.com/containers/storage/pkg/chrootarchive))
-Provides: bundled(golang(github.com/containers/storage/pkg/fileutils))
-Provides: bundled(golang(github.com/containers/storage/pkg/idtools))
-Provides: bundled(golang(github.com/containers/storage/pkg/ioutils))
-Provides: bundled(golang(github.com/containers/storage/pkg/lockfile))
-Provides: bundled(golang(github.com/containers/storage/pkg/mount))
-Provides: bundled(golang(github.com/containers/storage/pkg/reexec))
-Provides: bundled(golang(github.com/containers/storage/pkg/stringid))
-Provides: bundled(golang(github.com/containers/storage/pkg/system))
-Provides: bundled(golang(github.com/containers/storage/pkg/unshare))
-Provides: bundled(golang(github.com/containers/storage/types))
-Provides: bundled(golang(github.com/cyphar/filepath-securejoin))
-Provides: bundled(golang(github.com/docker/distribution/registry/api/errcode))
-Provides: bundled(golang(github.com/docker/go-units))
-Provides: bundled(golang(github.com/fsouza/go-dockerclient))
-Provides: bundled(golang(github.com/hashicorp/go-multierror))
-Provides: bundled(golang(github.com/mattn/go-shellwords))
-Provides: bundled(golang(github.com/opencontainers/go-digest))
-Provides: bundled(golang(github.com/opencontainers/image-spec/specs-go))
-Provides: bundled(golang(github.com/opencontainers/image-spec/specs-go/v1))
-Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/apparmor))
-Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/devices))
-Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/userns))
-Provides: bundled(golang(github.com/opencontainers/runtime-spec/specs-go))
-Provides: bundled(golang(github.com/opencontainers/runtime-tools/generate))
-Provides: bundled(golang(github.com/opencontainers/selinux/go-selinux))
-Provides: bundled(golang(github.com/opencontainers/selinux/go-selinux/label))
-Provides: bundled(golang(github.com/openshift/imagebuilder))
-Provides: bundled(golang(github.com/openshift/imagebuilder/dockerfile/command))
-Provides: bundled(golang(github.com/openshift/imagebuilder/dockerfile/parser))
-Provides: bundled(golang(github.com/sirupsen/logrus))
-Provides: bundled(golang(github.com/spf13/cobra))
-Provides: bundled(golang(github.com/spf13/pflag))
-Provides: bundled(golang(github.com/syndtr/gocapability/capability))
-Provides: bundled(golang(go.etcd.io/bbolt))
-Provides: bundled(golang(golang.org/x/crypto/bcrypt))
-Provides: bundled(golang(golang.org/x/crypto/ssh))
-Provides: bundled(golang(golang.org/x/crypto/ssh/agent))
-Provides: bundled(golang(golang.org/x/sync/semaphore))
-Provides: bundled(golang(golang.org/x/sys/unix))
-Provides: bundled(golang(golang.org/x/term))
-Provides: bundled(golang(sigs.k8s.io/yaml))
 
 %description
 The %{name} package provides a command line tool which can be used to
@@ -217,12 +128,10 @@ export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs'
 %gobuild -o bin/imgtype ./tests/imgtype
 %gobuild -o bin/copy ./tests/copy
 %gobuild -o bin/tutorial ./tests/tutorial
-GOMD2MAN=go-md2man %{__make} -C docs
+%{__make} docs
 
 %install
-export GOPATH=$(pwd)/_build:$(pwd)
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
-make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 
 install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
 cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
@@ -230,6 +139,8 @@ cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
 cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
 
+rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
+
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
diff --git a/sources b/sources
index 2203b0a..1be5825 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.31.0.tar.gz) = 613c8e76f134ce46e9d9c21a747914993214f0cc875a193e972f77784ca8d2f683c08557c7b764e3c48c854ca4104e04d3d6529e28397ec76311cc937168a696
+SHA512 (v1.31.1.tar.gz) = 7375877d964197d0690542e1da0636b0a67cdf01f30ddbdd69cced5cfe4f8bb370b37ec58f2dffd2c2f048b897470d8fb06cd9f70c8e75df2aa6b19f86610f7b

From 315cce6ac5a02e116c568561044c5a8ed0cc0727 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Thu, 10 Aug 2023 17:59:37 +0000
Subject: [PATCH 29/87] [packit] 1.31.2 upstream release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream tag: v1.31.2
Upstream commit: d4d1d751

If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork):
```
git fetch https://src.fedoraproject.org/forks/packit/rpms/buildah.git refs/heads/*:refs/remotes/packit/*
git checkout packit/1.31.2-rawhide-update-propose_downstream
```
---
 .gitignore    |  1 +
 .packit.yaml  | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 README.packit |  3 +++
 buildah.spec  |  2 +-
 sources       |  2 +-
 5 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 .packit.yaml
 create mode 100644 README.packit

diff --git a/.gitignore b/.gitignore
index 069b25d..759ec3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -697,3 +697,4 @@
 /v1.30.0.tar.gz
 /v1.31.0.tar.gz
 /v1.31.1.tar.gz
+/v1.31.2.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
new file mode 100644
index 0000000..80f8a05
--- /dev/null
+++ b/.packit.yaml
@@ -0,0 +1,49 @@
+---
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+specfile_path: rpm/buildah.spec
+upstream_tag_template: v{version}
+
+srpm_build_deps:
+  - make
+
+jobs:
+  - job: copr_build
+    trigger: pull_request
+    # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next
+    enable_net: true
+    targets:
+      - fedora-all-x86_64
+      - fedora-all-aarch64
+      - fedora-eln-x86_64
+      - fedora-eln-aarch64
+      - centos-stream+epel-next-8-x86_64
+      - centos-stream+epel-next-8-aarch64
+      - centos-stream+epel-next-9-x86_64
+      - centos-stream+epel-next-9-aarch64
+    additional_repos:
+      - "copr://rhcontainerbot/podman-next"
+
+  # Run on commit to main branch
+  - job: copr_build
+    trigger: commit
+    owner: rhcontainerbot
+    project: podman-next
+    enable_net: true
+
+  - job: propose_downstream
+    trigger: release
+    update_release: false
+    dist_git_branches:
+      - fedora-all
+
+  - job: koji_build
+    trigger: commit
+    dist_git_branches:
+      - fedora-all
+
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-branched # rawhide updates are created automatically
diff --git a/README.packit b/README.packit
new file mode 100644
index 0000000..d7c433c
--- /dev/null
+++ b/README.packit
@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.78.2.post2+g81828af.
diff --git a/buildah.spec b/buildah.spec
index 7eeba61..72a3ae3 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.31.1
+Version: 1.31.2
 License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0
 Release: %autorelease
 %if %{defined golang_arches_future}
diff --git a/sources b/sources
index 1be5825..2046290 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.31.1.tar.gz) = 7375877d964197d0690542e1da0636b0a67cdf01f30ddbdd69cced5cfe4f8bb370b37ec58f2dffd2c2f048b897470d8fb06cd9f70c8e75df2aa6b19f86610f7b
+SHA512 (v1.31.2.tar.gz) = c8611016448de7e9548ff692d1b352d7234f357440001106276e513df135a28ba0d4413a14f5c30e4b88615267d92f4aea63e1687b84a0638f1f9ab4f348c74a

From 2ded9f0893f850d9fd94578d71c519a02ef6b562 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 11 Aug 2023 10:01:39 -0400
Subject: [PATCH 30/87] fix buildtags

---
 buildah.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildah.spec b/buildah.spec
index 72a3ae3..58265d2 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -119,7 +119,7 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
 export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'`
 export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
 
-export BUILDTAGS='seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $hack/libsubid_tag.sh)'
+export BUILDTAGS='seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)'
 %if !%{defined build_with_btrfs}
 export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs'
 %endif

From 047a9f8cdfc0459065e2c4ef83f137ecb193e54a Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 11 Aug 2023 14:10:23 -0400
Subject: [PATCH 31/87] use double quotes for buildtags

---
 buildah.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildah.spec b/buildah.spec
index 58265d2..b728251 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -119,9 +119,9 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
 export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'`
 export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
 
-export BUILDTAGS='seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)'
+export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
 %if !%{defined build_with_btrfs}
-export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs'
+export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs"
 %endif
 
 %gobuild -o bin/%{name} ./cmd/%{name}

From 1f6d2f7e6aacabfcbc14bfa05c239d5fdcdcaacf Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 22 Aug 2023 09:14:22 -0400
Subject: [PATCH 32/87] spdx compatible license

---
 buildah.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildah.spec b/buildah.spec
index b728251..ac290ed 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -36,7 +36,7 @@ Epoch: 102
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
 Version: 1.31.2
-License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0
+License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
 %if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}

From ab31c80779277c65f9a712bcb564e9facdd2bc9c Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Thu, 24 Aug 2023 20:52:06 +0000
Subject: [PATCH 33/87] [packit] 1.31.3 upstream release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream tag: v1.31.3
Upstream commit: 3ae75d4a

If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork):
```
git fetch https://src.fedoraproject.org/forks/packit/rpms/buildah.git refs/heads/*:refs/remotes/packit/*
git checkout packit/1.31.3-rawhide-update-propose_downstream
```
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 3 ++-
 sources       | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 759ec3a..8c69906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -698,3 +698,4 @@
 /v1.31.0.tar.gz
 /v1.31.1.tar.gz
 /v1.31.2.tar.gz
+/v1.31.3.tar.gz
diff --git a/README.packit b/README.packit
index d7c433c..797aefb 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.78.2.post2+g81828af.
+The file was generated using packit 0.79.0.post2+g93f33d9.
diff --git a/buildah.spec b/buildah.spec
index ac290ed..2208df3 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,8 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.31.2
+Version: 1.31.3
+# The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
 %if %{defined golang_arches_future}
diff --git a/sources b/sources
index 2046290..bd6291e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.31.2.tar.gz) = c8611016448de7e9548ff692d1b352d7234f357440001106276e513df135a28ba0d4413a14f5c30e4b88615267d92f4aea63e1687b84a0638f1f9ab4f348c74a
+SHA512 (v1.31.3.tar.gz) = efa656c818f7b07f903cb5f70b2c50c8d5b85a11ce9093707d051f3d6e67a8dfa5ab6ecb720900c563d879173ebeb3ac0e5175c0090f4608a0dd253f4149af93

From e8e909ce3cb5fd07df75ba1d0aaa64a5a2d94d0c Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Thu, 14 Sep 2023 19:04:57 +0000
Subject: [PATCH 34/87] [packit] 1.32.0 upstream release

Upstream tag: v1.32.0
Upstream commit: 2326d492
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8c69906..f4f3bf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -699,3 +699,4 @@
 /v1.31.1.tar.gz
 /v1.31.2.tar.gz
 /v1.31.3.tar.gz
+/v1.32.0.tar.gz
diff --git a/README.packit b/README.packit
index 797aefb..786c2a0 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.79.0.post2+g93f33d9.
+The file was generated using packit 0.80.0.post8+gf2b5fcbc.
diff --git a/buildah.spec b/buildah.spec
index 2208df3..83fdfc0 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.31.3
+Version: 1.32.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index bd6291e..4983eb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.31.3.tar.gz) = efa656c818f7b07f903cb5f70b2c50c8d5b85a11ce9093707d051f3d6e67a8dfa5ab6ecb720900c563d879173ebeb3ac0e5175c0090f4608a0dd253f4149af93
+SHA512 (v1.32.0.tar.gz) = 7c61141e43ea2f968a50b4c5ae6b69c2b9734a19774c7ca48bc942b900ca55ec381ac93fdf04f08061640a457551a9e03a45a37d22cb94b34cecded192dced8f

From 64c58bf0bac1c07c0ebdc949f6999f2d2ff220e6 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Tue, 24 Oct 2023 14:18:26 +0000
Subject: [PATCH 35/87] [packit] 1.32.1 upstream release

Upstream tag: v1.32.1
Upstream commit: bfd436d1
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f4f3bf4..45a4983 100644
--- a/.gitignore
+++ b/.gitignore
@@ -700,3 +700,4 @@
 /v1.31.2.tar.gz
 /v1.31.3.tar.gz
 /v1.32.0.tar.gz
+/v1.32.1.tar.gz
diff --git a/README.packit b/README.packit
index 786c2a0..2a3acd4 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.80.0.post8+gf2b5fcbc.
+The file was generated using packit 0.84.0.
diff --git a/buildah.spec b/buildah.spec
index 83fdfc0..5679494 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.32.0
+Version: 1.32.1
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 4983eb4..6de0749 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.32.0.tar.gz) = 7c61141e43ea2f968a50b4c5ae6b69c2b9734a19774c7ca48bc942b900ca55ec381ac93fdf04f08061640a457551a9e03a45a37d22cb94b34cecded192dced8f
+SHA512 (v1.32.1.tar.gz) = e5c59f158b786809c89465361a662211bbef6bb4c27c79490604923d924c2030398a0878b122b246b02ae246bd977b7ccffdc6de4f06e80f096c2921c34bf04a

From b8fa4417579c0e20a0bab66f05342065739adc23 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 30 Oct 2023 18:16:35 +0000
Subject: [PATCH 36/87] [packit] 1.32.2 upstream release

Upstream tag: v1.32.2
Upstream commit: 050318f8
---
 .gitignore   | 1 +
 buildah.spec | 2 +-
 sources      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45a4983..b550c51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -701,3 +701,4 @@
 /v1.31.3.tar.gz
 /v1.32.0.tar.gz
 /v1.32.1.tar.gz
+/v1.32.2.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 5679494..44714be 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.32.1
+Version: 1.32.2
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 6de0749..551ddf6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.32.1.tar.gz) = e5c59f158b786809c89465361a662211bbef6bb4c27c79490604923d924c2030398a0878b122b246b02ae246bd977b7ccffdc6de4f06e80f096c2921c34bf04a
+SHA512 (v1.32.2.tar.gz) = 3a50e53e047aa0e23643d8751af1fb51a83fd51e5440111432eb34bdb07e95f24676a917b54409c223df444fe123c8df4aa9af435737cfdd02d0eda0d3f5bba1

From 6f9ee87f9e7bcf8c5e85ab4cdb82e68cac1ab308 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Sun, 26 Nov 2023 22:09:51 +0000
Subject: [PATCH 37/87] [packit] 1.33.2 upstream release

Upstream tag: v1.33.2
Upstream commit: 7fffb336
---
 .gitignore    | 1 +
 .packit.yaml  | 7 ++++++-
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index b550c51..b3703b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -702,3 +702,4 @@
 /v1.32.0.tar.gz
 /v1.32.1.tar.gz
 /v1.32.2.tar.gz
+/v1.33.2.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index 80f8a05..76b297c 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -11,7 +11,9 @@ srpm_build_deps:
 jobs:
   - job: copr_build
     trigger: pull_request
-    # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next
+    notifications:
+      failure_comment:
+        message: "Ephemeral COPR build failed. @containers/packit-build please check."
     enable_net: true
     targets:
       - fedora-all-x86_64
@@ -28,6 +30,9 @@ jobs:
   # Run on commit to main branch
   - job: copr_build
     trigger: commit
+    notifications:
+      failure_comment:
+        message: "podman-next COPR build failed. @containers/packit-build please check."
     owner: rhcontainerbot
     project: podman-next
     enable_net: true
diff --git a/README.packit b/README.packit
index 2a3acd4..d778d97 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.84.0.
+The file was generated using packit 0.86.2.post1.dev2+g209847d1.
diff --git a/buildah.spec b/buildah.spec
index 44714be..d8f6c72 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.32.2
+Version: 1.33.2
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 551ddf6..57d136b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.32.2.tar.gz) = 3a50e53e047aa0e23643d8751af1fb51a83fd51e5440111432eb34bdb07e95f24676a917b54409c223df444fe123c8df4aa9af435737cfdd02d0eda0d3f5bba1
+SHA512 (v1.33.2.tar.gz) = 574c1a249d93edd5f89e106cd192da94235edcff097d9bce841e3b3b3a9588029deddaceb301505114b994e854016c72090cc0016a00ef027b25f3672a3fab32

From 3ace49d3ac92baee8ba0106dd298f582563c2a06 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Wed, 13 Dec 2023 15:29:13 +0000
Subject: [PATCH 38/87] [packit] 1.34.0 upstream release

Upstream tag: v1.34.0
Upstream commit: 21ec7ace
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3703b3..e7874b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -703,3 +703,4 @@
 /v1.32.1.tar.gz
 /v1.32.2.tar.gz
 /v1.33.2.tar.gz
+/v1.34.0.tar.gz
diff --git a/README.packit b/README.packit
index d778d97..14f5afe 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.86.2.post1.dev2+g209847d1.
+The file was generated using packit 0.87.1.post1.dev7+g9f53ebb4.
diff --git a/buildah.spec b/buildah.spec
index d8f6c72..a7d6942 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.33.2
+Version: 1.34.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 57d136b..472b673 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.33.2.tar.gz) = 574c1a249d93edd5f89e106cd192da94235edcff097d9bce841e3b3b3a9588029deddaceb301505114b994e854016c72090cc0016a00ef027b25f3672a3fab32
+SHA512 (v1.34.0.tar.gz) = a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db

From 54d58aa60719a1612f002c86082fe7d54d818130 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 14:49:02 +0000
Subject: [PATCH 39/87] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From c160691abf0b6ab57ef16fc16f8d980527c76691 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 23 Jan 2024 00:56:45 +0000
Subject: [PATCH 40/87] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From 28e33e4e5cbd541131403f971983f9064521ee1a Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Sun, 11 Feb 2024 21:40:49 +0000
Subject: [PATCH 41/87] Rebuild for golang 1.22.0


From b152e156fcf8bc08aa443f49d6bbbca7d61164ae Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Thu, 22 Feb 2024 19:46:39 +0000
Subject: [PATCH 42/87] [packit] 1.34.1 upstream release

Upstream tag: v1.34.1
Upstream commit: a2bab63f
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e7874b3..c8db536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -704,3 +704,4 @@
 /v1.32.2.tar.gz
 /v1.33.2.tar.gz
 /v1.34.0.tar.gz
+/v1.34.1.tar.gz
diff --git a/README.packit b/README.packit
index 14f5afe..7553f6b 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.87.1.post1.dev7+g9f53ebb4.
+The file was generated using packit 0.92.0.
diff --git a/buildah.spec b/buildah.spec
index a7d6942..55f77c0 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.34.0
+Version: 1.34.1
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 472b673..e7039ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.34.0.tar.gz) = a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db
+SHA512 (v1.34.1.tar.gz) = 2d229ead1149b66d1b7d91f596809e97e5316356ab0997ea335eb3e246ed8bc6879e0e260bb478b4d7ec7c42c7dbf33d0e91086a34e89a3b79eb27322da06c1e

From 1a800e73be6a4c3b2f5a06ec92b9dc2711637170 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Thu, 7 Mar 2024 12:45:43 +0000
Subject: [PATCH 43/87] [packit] 1.35.0 upstream release

Upstream tag: v1.35.0
Upstream commit: fedbd796
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c8db536..d446755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -705,3 +705,4 @@
 /v1.33.2.tar.gz
 /v1.34.0.tar.gz
 /v1.34.1.tar.gz
+/v1.35.0.tar.gz
diff --git a/README.packit b/README.packit
index 7553f6b..58aeb5d 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.92.0.
+The file was generated using packit 0.93.0.post1.dev3+ge6195b47.
diff --git a/buildah.spec b/buildah.spec
index 55f77c0..c2dc6bc 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.34.1
+Version: 1.35.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index e7039ae..8dfaef8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.34.1.tar.gz) = 2d229ead1149b66d1b7d91f596809e97e5316356ab0997ea335eb3e246ed8bc6879e0e260bb478b4d7ec7c42c7dbf33d0e91086a34e89a3b79eb27322da06c1e
+SHA512 (v1.35.0.tar.gz) = b4dd30b4d8087bbd0bbfd9a7b9791afc015a0c489041b38d6b6241df27a97286083dcf7b25102ce1fa1080265378442be73313e301c22660f21d8e4f39bb3aa4

From 72edd2e7fe6b8a21cc7d8d94af0bbca81bafa72e Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 18 Mar 2024 23:56:48 +0000
Subject: [PATCH 44/87] [packit] 1.35.1 upstream release

Upstream tag: v1.35.1
Upstream commit: f0141c69
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d446755..b1ef613 100644
--- a/.gitignore
+++ b/.gitignore
@@ -706,3 +706,4 @@
 /v1.34.0.tar.gz
 /v1.34.1.tar.gz
 /v1.35.0.tar.gz
+/v1.35.1.tar.gz
diff --git a/README.packit b/README.packit
index 58aeb5d..4afa99b 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.93.0.post1.dev3+ge6195b47.
+The file was generated using packit 0.94.0.post1.dev2+g7ce7e679.
diff --git a/buildah.spec b/buildah.spec
index c2dc6bc..af363c2 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.35.0
+Version: 1.35.1
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 8dfaef8..3f9ef00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.35.0.tar.gz) = b4dd30b4d8087bbd0bbfd9a7b9791afc015a0c489041b38d6b6241df27a97286083dcf7b25102ce1fa1080265378442be73313e301c22660f21d8e4f39bb3aa4
+SHA512 (v1.35.1.tar.gz) = 3e5af28b3d45e51674d08bef9a92cd64589026d9c6ebee51156738151681395860e372bba2667815e0f90e37984eb9dfdc9b8ad0675b62c8751582b29485d159

From 73cc54f5bb74061b8ced29bf2017dcaa87ccbbbe Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Tue, 26 Mar 2024 23:57:44 +0000
Subject: [PATCH 45/87] [packit] 1.35.2 upstream release

Upstream tag: v1.35.2
Upstream commit: 5070e42c
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b1ef613..7d6fdfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -707,3 +707,4 @@
 /v1.34.1.tar.gz
 /v1.35.0.tar.gz
 /v1.35.1.tar.gz
+/v1.35.2.tar.gz
diff --git a/README.packit b/README.packit
index 4afa99b..d401b46 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.94.0.post1.dev2+g7ce7e679.
+The file was generated using packit 0.94.0.post1.dev8+g4b1f9717.
diff --git a/buildah.spec b/buildah.spec
index af363c2..913619a 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.35.1
+Version: 1.35.2
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 3f9ef00..13122ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.35.1.tar.gz) = 3e5af28b3d45e51674d08bef9a92cd64589026d9c6ebee51156738151681395860e372bba2667815e0f90e37984eb9dfdc9b8ad0675b62c8751582b29485d159
+SHA512 (v1.35.2.tar.gz) = a2f55ce6381bdf155b58b3dbd7090e5a1e27b0d6b9b501835365baed81e52fbc1a30ca4184b9a8a65d31a0af3b9ab13441d4b18983861258bc4be939561d0dee

From 326e78444f694ff062549f1fecdc2ba4c7cecd32 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Wed, 27 Mar 2024 05:49:26 -0600
Subject: [PATCH 46/87] Gating tests: require slirp4netns

As of podman 5.0 slirp4netns is a soft dependency, not
installed by default, but we still need to test it until
it's deprecated.

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 tests/test_buildah.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_buildah.yml b/tests/test_buildah.yml
index 8bb1ed0..dced1f9 100644
--- a/tests/test_buildah.yml
+++ b/tests/test_buildah.yml
@@ -10,6 +10,7 @@
       required_packages:
         - buildah
         - buildah-tests
+        - slirp4netns
       tests:
         - root-test:
             dir: ./

From fe3229cea7d4616481e2f93209410ad3ccc1389b Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Sat, 30 Mar 2024 01:13:50 +0000
Subject: [PATCH 47/87] [packit] 1.35.3 upstream release

Upstream tag: v1.35.3
Upstream commit: 9f0251c1
---
 .gitignore   | 1 +
 buildah.spec | 2 +-
 sources      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7d6fdfb..bb66142 100644
--- a/.gitignore
+++ b/.gitignore
@@ -708,3 +708,4 @@
 /v1.35.0.tar.gz
 /v1.35.1.tar.gz
 /v1.35.2.tar.gz
+/v1.35.3.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 913619a..447944e 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.35.2
+Version: 1.35.3
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 13122ac..c330933 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.35.2.tar.gz) = a2f55ce6381bdf155b58b3dbd7090e5a1e27b0d6b9b501835365baed81e52fbc1a30ca4184b9a8a65d31a0af3b9ab13441d4b18983861258bc4be939561d0dee
+SHA512 (v1.35.3.tar.gz) = ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3

From 37bc79bcdca9b50819518f7ff7f543f4e2700e90 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Fri, 10 May 2024 13:23:46 +0000
Subject: [PATCH 48/87] Update to 1.35.4 upstream release

Upstream tag: v1.35.4
Upstream commit: c2926eaf

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb66142..5c3b8f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -709,3 +709,4 @@
 /v1.35.1.tar.gz
 /v1.35.2.tar.gz
 /v1.35.3.tar.gz
+/v1.35.4.tar.gz
diff --git a/README.packit b/README.packit
index d401b46..97de583 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.94.0.post1.dev8+g4b1f9717.
+The file was generated using packit 0.96.0.post1.dev4+gc5b1ea8e.
diff --git a/buildah.spec b/buildah.spec
index 447944e..958819e 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.35.3
+Version: 1.35.4
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index c330933..7d510b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.35.3.tar.gz) = ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3
+SHA512 (v1.35.4.tar.gz) = 679f2328f675a39f9965128d51a6e8a3f82d64a6d3c3cdcb862cfcb7691eba272d869b6718147da1590aa573534081329ef05e879875024a11aa9ad52b2f292f

From 5d71612b0d07bd9b1175bca24fc8d40b1aea5af0 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Fri, 24 May 2024 00:00:13 +0000
Subject: [PATCH 49/87] Update to 1.36.0 upstream release

Upstream tag: v1.36.0
Upstream commit: 6ceba883

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore   | 1 +
 .packit.yaml | 6 ++----
 buildah.spec | 6 ++++--
 sources      | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5c3b8f9..95911f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -710,3 +710,4 @@
 /v1.35.2.tar.gz
 /v1.35.3.tar.gz
 /v1.35.4.tar.gz
+/v1.36.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index 76b297c..ae0e7cc 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -20,10 +20,8 @@ jobs:
       - fedora-all-aarch64
       - fedora-eln-x86_64
       - fedora-eln-aarch64
-      - centos-stream+epel-next-8-x86_64
-      - centos-stream+epel-next-8-aarch64
-      - centos-stream+epel-next-9-x86_64
-      - centos-stream+epel-next-9-aarch64
+      - epel-9-x86_64
+      - epel-9-aarch64
     additional_repos:
       - "copr://rhcontainerbot/podman-next"
 
diff --git a/buildah.spec b/buildah.spec
index 958819e..81b91d8 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.35.4
+Version: 1.36.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
@@ -86,7 +86,9 @@ or
 Summary: Tests for %{name}
 
 Requires: %{name} = %{version}-%{release}
+%if %{defined fedora}
 Requires: bats
+%endif
 Requires: bzip2
 Requires: podman
 Requires: golang
@@ -146,7 +148,7 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 %{!?_licensedir:%global license %doc}
 
 %files
-%license LICENSE
+%license LICENSE vendor/modules.txt
 %doc README.md
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}*
diff --git a/sources b/sources
index 7d510b6..17815a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.35.4.tar.gz) = 679f2328f675a39f9965128d51a6e8a3f82d64a6d3c3cdcb862cfcb7691eba272d869b6718147da1590aa573534081329ef05e879875024a11aa9ad52b2f292f
+SHA512 (v1.36.0.tar.gz) = feb55b0dfb3cba4e9c6776b0f4730ebb4b9ea416f507e342f3b1cbf23b2bb79d96a58622faac7a980727e6739df7e0ceddf1a9d5ae483a3c7e781f7af75d115f

From 5402218d321d89b1a6c46c6ff8d9a2a575837e34 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 18:43:07 +0000
Subject: [PATCH 50/87] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From eb8ab751461a79f6f09dbc0ff45e6922789556eb Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Fri, 26 Jul 2024 17:53:18 +0000
Subject: [PATCH 51/87] Update to 1.37.0 upstream release

Upstream tag: v1.37.0
Upstream commit: f9de1bbd

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    |  1 +
 .packit.yaml  | 61 +++++++++++++++++++++++++++++++++++++++++++--------
 README.packit |  2 +-
 buildah.spec  |  2 +-
 sources       |  2 +-
 5 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95911f6..48e749c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -711,3 +711,4 @@
 /v1.35.3.tar.gz
 /v1.35.4.tar.gz
 /v1.36.0.tar.gz
+/v1.37.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index ae0e7cc..b465fec 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -2,45 +2,88 @@
 # See the documentation for more information:
 # https://packit.dev/docs/configuration/
 
-specfile_path: rpm/buildah.spec
+downstream_package_name: buildah
 upstream_tag_template: v{version}
 
+packages:
+  buildah-fedora:
+    pkg_tool: fedpkg
+    specfile_path: rpm/buildah.spec
+  buildah-centos:
+    pkg_tool: centpkg
+    specfile_path: rpm/buildah.spec
+  buildah-rhel:
+    specfile_path: rpm/buildah.spec
+
 srpm_build_deps:
   - make
 
 jobs:
   - job: copr_build
     trigger: pull_request
-    notifications:
+    packages: [buildah-fedora]
+    notifications: &copr_build_failure_notification
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
-    enable_net: true
     targets:
-      - fedora-all-x86_64
-      - fedora-all-aarch64
-      - fedora-eln-x86_64
-      - fedora-eln-aarch64
+      fedora-all-x86_64: {}
+      fedora-all-aarch64: {}
+      fedora-eln-x86_64:
+        additional_repos:
+          - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
+      fedora-eln-aarch64:
+        additional_repos:
+          - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/"
+    enable_net: true
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [buildah-centos]
+    notifications: *copr_build_failure_notification
+    targets:
+      - centos-stream-9-x86_64
+      - centos-stream-9-aarch64
+      - centos-stream-10-x86_64
+      - centos-stream-10-aarch64
+    enable_net: true
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [buildah-rhel]
+    notifications: *copr_build_failure_notification
+    targets:
       - epel-9-x86_64
       - epel-9-aarch64
-    additional_repos:
-      - "copr://rhcontainerbot/podman-next"
+    enable_net: true
 
   # Run on commit to main branch
   - job: copr_build
     trigger: commit
+    packages: [buildah-fedora]
     notifications:
       failure_comment:
         message: "podman-next COPR build failed. @containers/packit-build please check."
+    branch: main
     owner: rhcontainerbot
     project: podman-next
     enable_net: true
 
+  # Sync to Fedora
   - job: propose_downstream
     trigger: release
+    packages: [buildah-fedora]
     update_release: false
     dist_git_branches:
       - fedora-all
 
+  # Sync to CentOS Stream
+  - job: propose_downstream
+    trigger: release
+    packages: [buildah-centos]
+    update_release: false
+    dist_git_branches:
+      - c10s
+
   - job: koji_build
     trigger: commit
     dist_git_branches:
diff --git a/README.packit b/README.packit
index 97de583..8d4e245 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.96.0.post1.dev4+gc5b1ea8e.
+The file was generated using packit 0.99.0.post1.dev18+g4850a935.
diff --git a/buildah.spec b/buildah.spec
index 81b91d8..fd6c67b 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.36.0
+Version: 1.37.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 17815a5..9d6a031 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.36.0.tar.gz) = feb55b0dfb3cba4e9c6776b0f4730ebb4b9ea416f507e342f3b1cbf23b2bb79d96a58622faac7a980727e6739df7e0ceddf1a9d5ae483a3c7e781f7af75d115f
+SHA512 (v1.37.0.tar.gz) = 0c4209edce498bd96498d539380517e9641c438aadf3bc90f148abd03b22a8409ec5a23438e9d1534845652eeef283aedd328fc6fe07cc8a7789808d945c41c0

From abe177cf0f3eee0218f22de93583f2478f8ec1f8 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Tue, 13 Aug 2024 15:08:18 +0000
Subject: [PATCH 52/87] Update to 1.37.1 upstream release

Upstream tag: v1.37.1
Upstream commit: 67cc51e9

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 48e749c..c3f5790 100644
--- a/.gitignore
+++ b/.gitignore
@@ -712,3 +712,4 @@
 /v1.35.4.tar.gz
 /v1.36.0.tar.gz
 /v1.37.0.tar.gz
+/v1.37.1.tar.gz
diff --git a/README.packit b/README.packit
index 8d4e245..4df53f3 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.99.0.post1.dev18+g4850a935.
+The file was generated using packit 0.100.1.
diff --git a/buildah.spec b/buildah.spec
index fd6c67b..c5e10b3 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.37.0
+Version: 1.37.1
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 9d6a031..ebe2ecb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.37.0.tar.gz) = 0c4209edce498bd96498d539380517e9641c438aadf3bc90f148abd03b22a8409ec5a23438e9d1534845652eeef283aedd328fc6fe07cc8a7789808d945c41c0
+SHA512 (v1.37.1.tar.gz) = b36dd0c9ccac399550232fe1b7024f8969fa9086efe9cdf8a8ed10ad3c3d3bad4095a7ac17ed41ccb670a781a975dea36f1ad99ba6ae15d7b2b4d728399c5e36

From 014ef23135ac31d91087591f7720f4037e4e96f0 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Wed, 21 Aug 2024 12:21:43 +0000
Subject: [PATCH 53/87] Update to 1.37.2 upstream release

Upstream tag: v1.37.2
Upstream commit: eadda3bc

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c3f5790..73ac845 100644
--- a/.gitignore
+++ b/.gitignore
@@ -713,3 +713,4 @@
 /v1.36.0.tar.gz
 /v1.37.0.tar.gz
 /v1.37.1.tar.gz
+/v1.37.2.tar.gz
diff --git a/README.packit b/README.packit
index 4df53f3..94a5d96 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.100.1.
+The file was generated using packit 0.100.2.post1.dev4+g31a74ebd.
diff --git a/buildah.spec b/buildah.spec
index c5e10b3..f3ab956 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.37.1
+Version: 1.37.2
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index ebe2ecb..34997b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.37.1.tar.gz) = b36dd0c9ccac399550232fe1b7024f8969fa9086efe9cdf8a8ed10ad3c3d3bad4095a7ac17ed41ccb670a781a975dea36f1ad99ba6ae15d7b2b4d728399c5e36
+SHA512 (v1.37.2.tar.gz) = 077f561d54e66782c31426af8b48d96482ee68c3a1bd9f4107750f42de5d793d66e15a7dabcc8441ec0ac13393964525682abedbdb03fbfc65830b6986b70b8d

From 2b187755e33aecbd32b53e6b010f69b5495f32f1 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Wed, 28 Aug 2024 20:32:43 +0530
Subject: [PATCH 54/87] rebuild for shadow-utils bump

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

From bb9ef83dc29ba3bb26559e4271487bd7e7d0f237 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 23 Sep 2024 16:05:13 +0000
Subject: [PATCH 55/87] Update to 1.37.3 upstream release

Upstream tag: v1.37.3
Upstream commit: 956095ee

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    |  1 +
 .packit.yaml  | 36 ++++++++++++++++++++++++++----------
 README.packit |  2 +-
 buildah.spec  |  6 ++++--
 sources       |  2 +-
 5 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 73ac845..a42fd12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -714,3 +714,4 @@
 /v1.37.0.tar.gz
 /v1.37.1.tar.gz
 /v1.37.2.tar.gz
+/v1.37.3.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index b465fec..b96a160 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -14,6 +14,8 @@ packages:
     specfile_path: rpm/buildah.spec
   buildah-rhel:
     specfile_path: rpm/buildah.spec
+  buildah-eln:
+    specfile_path: rpm/buildah.spec
 
 srpm_build_deps:
   - make
@@ -26,8 +28,21 @@ jobs:
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
     targets:
-      fedora-all-x86_64: {}
-      fedora-all-aarch64: {}
+      - fedora-development-x86_64
+      - fedora-development-aarch64
+      - fedora-latest-x86_64
+      - fedora-latest-aarch64
+      - fedora-latest-stable-x86_64
+      - fedora-latest-stable-aarch64
+      - fedora-40-x86_64
+      - fedora-40-aarch64
+    enable_net: true
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [buildah-eln]
+    notifications: *copr_build_failure_notification
+    targets:
       fedora-eln-x86_64:
         additional_repos:
           - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
@@ -73,7 +88,7 @@ jobs:
     trigger: release
     packages: [buildah-fedora]
     update_release: false
-    dist_git_branches:
+    dist_git_branches: &fedora_targets
       - fedora-all
 
   # Sync to CentOS Stream
@@ -84,12 +99,13 @@ jobs:
     dist_git_branches:
       - c10s
 
+  # Fedora Koji build
   - job: koji_build
     trigger: commit
-    dist_git_branches:
-      - fedora-all
-
-  - job: bodhi_update
-    trigger: commit
-    dist_git_branches:
-      - fedora-branched # rawhide updates are created automatically
+    sidetag_group: podman-releases
+    # Dependents are not rpm dependencies, but the package whose bodhi update
+    # should include this package.
+    # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages
+    dependents:
+      - podman
+    dist_git_branches: *fedora_targets
diff --git a/README.packit b/README.packit
index 94a5d96..ab6dd33 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.100.2.post1.dev4+g31a74ebd.
+The file was generated using packit 0.101.1.
diff --git a/buildah.spec b/buildah.spec
index f3ab956..4cc1af9 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -28,6 +28,8 @@ Name: buildah
 # Set different Epoch for copr
 %if %{defined copr_username}
 Epoch: 102
+%else
+Epoch: 2
 %endif
 # DO NOT TOUCH the Version string!
 # The TRUE source of this specfile is:
@@ -35,7 +37,7 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.37.2
+Version: 1.37.3
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
@@ -85,7 +87,7 @@ or
 %package tests
 Summary: Tests for %{name}
 
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 %if %{defined fedora}
 Requires: bats
 %endif
diff --git a/sources b/sources
index 34997b6..766980f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.37.2.tar.gz) = 077f561d54e66782c31426af8b48d96482ee68c3a1bd9f4107750f42de5d793d66e15a7dabcc8441ec0ac13393964525682abedbdb03fbfc65830b6986b70b8d
+SHA512 (v1.37.3.tar.gz) = fd391ed6738526e843282156fcec8262a7da83848cec4e312d9a1628a373c84c88cbeee65856a51a539564a8e019c5e4a79eb005706b1325bc5a0b55b657d873

From 68cf6e550f4555a3a3077e8a0273d0869b4cb322 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 26 Sep 2024 16:09:15 +0530
Subject: [PATCH 56/87] rebuild

---
 README.packit | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.packit b/README.packit
index ab6dd33..6d6c8bd 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,6 @@
 This repository is maintained by packit.
 https://packit.dev/
 The file was generated using packit 0.101.1.
+
+https://bodhi.fedoraproject.org/updates/FEDORA-2024-00126b6886 is stuck in
+pending. Edit README.packit to create dist-git PR for rebuild.

From 2b30cd161d603d1abe0e712e61225e892eee8ae3 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 7 Oct 2024 13:29:11 +0000
Subject: [PATCH 57/87] Update to 1.37.4 upstream release

Upstream tag: v1.37.4
Upstream commit: df9247c5

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 5 +----
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index a42fd12..aa3e17d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -715,3 +715,4 @@
 /v1.37.1.tar.gz
 /v1.37.2.tar.gz
 /v1.37.3.tar.gz
+/v1.37.4.tar.gz
diff --git a/README.packit b/README.packit
index 6d6c8bd..766e300 100644
--- a/README.packit
+++ b/README.packit
@@ -1,6 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.101.1.
-
-https://bodhi.fedoraproject.org/updates/FEDORA-2024-00126b6886 is stuck in
-pending. Edit README.packit to create dist-git PR for rebuild.
+The file was generated using packit 0.101.1.post1.dev8+ge78e9e3b.
diff --git a/buildah.spec b/buildah.spec
index 4cc1af9..0562def 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -37,7 +37,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.37.3
+Version: 1.37.4
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 766980f..65db753 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.37.3.tar.gz) = fd391ed6738526e843282156fcec8262a7da83848cec4e312d9a1628a373c84c88cbeee65856a51a539564a8e019c5e4a79eb005706b1325bc5a0b55b657d873
+SHA512 (v1.37.4.tar.gz) = 12f3155054acfcdded3e69b06ced38415cd0a7be125f03dd2de851e0ca056d8a7b71e372ac602ff767f25ccfdce08d8a087c529639fa9172021ad11435dcff20

From 149ed1c0a80d9f41d273169e42b7113712f5d40c Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Fri, 18 Oct 2024 14:35:42 +0000
Subject: [PATCH 58/87] Update to 1.37.5 upstream release

Upstream tag: v1.37.5
Upstream commit: 5fd40b98

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 .packit.yaml  | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa3e17d..36879e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -716,3 +716,4 @@
 /v1.37.2.tar.gz
 /v1.37.3.tar.gz
 /v1.37.4.tar.gz
+/v1.37.5.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index b96a160..ab7681c 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -102,6 +102,7 @@ jobs:
   # Fedora Koji build
   - job: koji_build
     trigger: commit
+    packages: [buildah-fedora]
     sidetag_group: podman-releases
     # Dependents are not rpm dependencies, but the package whose bodhi update
     # should include this package.
diff --git a/README.packit b/README.packit
index 766e300..2bd3f40 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.101.1.post1.dev8+ge78e9e3b.
+The file was generated using packit 0.102.1.post1.dev6+g64f7460b.
diff --git a/buildah.spec b/buildah.spec
index 0562def..a256a93 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -37,7 +37,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.37.4
+Version: 1.37.5
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 65db753..8277dab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.37.4.tar.gz) = 12f3155054acfcdded3e69b06ced38415cd0a7be125f03dd2de851e0ca056d8a7b71e372ac602ff767f25ccfdce08d8a087c529639fa9172021ad11435dcff20
+SHA512 (v1.37.5.tar.gz) = ee33d85ea3aa9ec423b4e48e19db69359e3fc480a61abd511fa473257aa326e9a9c4dafc985afb83f7caa9a7a5ba6a89b2a1c028fe6ef7bd4ef382ec8591331d

From 045d9ed54dbdef109259b460a059c87349cb6eda Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 11 Nov 2024 15:44:34 +0000
Subject: [PATCH 59/87] Update to 1.38.0 upstream release

Upstream tag: v1.38.0
Upstream commit: 7aa3b5ee

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    |  1 +
 .packit.yaml  | 17 +++++++++--------
 README.packit |  2 +-
 buildah.spec  |  5 ++++-
 sources       |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 36879e7..f7b28f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -717,3 +717,4 @@
 /v1.37.3.tar.gz
 /v1.37.4.tar.gz
 /v1.37.5.tar.gz
+/v1.38.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index ab7681c..df57645 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -62,14 +62,15 @@ jobs:
       - centos-stream-10-aarch64
     enable_net: true
 
-  - job: copr_build
-    trigger: pull_request
-    packages: [buildah-rhel]
-    notifications: *copr_build_failure_notification
-    targets:
-      - epel-9-x86_64
-      - epel-9-aarch64
-    enable_net: true
+  # Disabled until there is go 1.22 in epel-9
+  # - job: copr_build
+  #   trigger: pull_request
+  #   packages: [buildah-rhel]
+  #   notifications: *copr_build_failure_notification
+  #   targets:
+  #     - epel-9-x86_64
+  #     - epel-9-aarch64
+  #   enable_net: true
 
   # Run on commit to main branch
   - job: copr_build
diff --git a/README.packit b/README.packit
index 2bd3f40..c18262a 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.102.1.post1.dev6+g64f7460b.
+The file was generated using packit 0.103.0.
diff --git a/buildah.spec b/buildah.spec
index a256a93..84fabca 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -37,7 +37,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.37.5
+Version: 1.38.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
@@ -133,6 +133,7 @@ export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs"
 %gobuild -o bin/imgtype ./tests/imgtype
 %gobuild -o bin/copy ./tests/copy
 %gobuild -o bin/tutorial ./tests/tutorial
+%gobuild -o bin/inet ./tests/inet
 %{__make} docs
 
 %install
@@ -143,6 +144,7 @@ cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
 cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
 cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
+cp bin/inet     %{buildroot}/%{_bindir}/%{name}-inet
 
 rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 
@@ -163,6 +165,7 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 %{_bindir}/%{name}-imgtype
 %{_bindir}/%{name}-copy
 %{_bindir}/%{name}-tutorial
+%{_bindir}/%{name}-inet
 %{_datadir}/%{name}/test
 
 %changelog
diff --git a/sources b/sources
index 8277dab..637d8bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.37.5.tar.gz) = ee33d85ea3aa9ec423b4e48e19db69359e3fc480a61abd511fa473257aa326e9a9c4dafc985afb83f7caa9a7a5ba6a89b2a1c028fe6ef7bd4ef382ec8591331d
+SHA512 (v1.38.0.tar.gz) = c9f31693043e348c2bee6219f5a42738d93aa690a81f6bb283bd4d93ea6fe0cbde50754f7ee1a7e690853b7cfb934ce60e35ceb029180f41a95192773023c243

From a40979722c92b7a4f465e33567cf6350ef4b2900 Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Tue, 12 Nov 2024 15:52:51 +0100
Subject: [PATCH 60/87] tests: set new inet helper path

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
---
 tests/test_buildah.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh
index f8776bb..ea8eea3 100755
--- a/tests/test_buildah.sh
+++ b/tests/test_buildah.sh
@@ -17,6 +17,7 @@ export BUILDAH_BINARY=/usr/bin/buildah
 export IMGTYPE_BINARY=/usr/bin/buildah-imgtype
 export COPY_BINARY=/usr/bin/buildah-copy
 export TUTORIAL_BINARY=/usr/bin/buildah-tutorial
+export INET_BINARY=/usr/bin/buildah-inet
 
 ###############################################################################
 # BEGIN setup/teardown

From 6bf3dfee55f4dfd0fdfcd533dc0b9d8510e37901 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 13:01:13 +0000
Subject: [PATCH 61/87] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From e95e0c0da3ec39c18d99b4dc1dcbff71fddb0ba7 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Tue, 21 Jan 2025 14:55:44 +0000
Subject: [PATCH 62/87] Update to 1.38.1 upstream release

Upstream tag: v1.38.1
Upstream commit: a07dde1b

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7b28f2..30834e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -718,3 +718,4 @@
 /v1.37.4.tar.gz
 /v1.37.5.tar.gz
 /v1.38.0.tar.gz
+/v1.38.1.tar.gz
diff --git a/README.packit b/README.packit
index c18262a..8c905b9 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.103.0.
+The file was generated using packit 0.106.0.post1.dev8+g521f1e1d.
diff --git a/buildah.spec b/buildah.spec
index 84fabca..bf7ce71 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -37,7 +37,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.38.0
+Version: 1.38.1
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 637d8bd..2beb0bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.38.0.tar.gz) = c9f31693043e348c2bee6219f5a42738d93aa690a81f6bb283bd4d93ea6fe0cbde50754f7ee1a7e690853b7cfb934ce60e35ceb029180f41a95192773023c243
+SHA512 (v1.38.1.tar.gz) = 3c4738c4d30bece590da1de3ec8879e75d197bb18a1377264cf74f034574f46e27109842503aab0b98b1fd69f8762a13e80b1bd8522c5e3782ac0c451a07c3d8

From ce852ef3eedf9dbf4ff613b4218341620de15244 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 3 Feb 2025 16:30:19 +0000
Subject: [PATCH 63/87] Update to 1.39.0 upstream release

Upstream tag: v1.39.0
Upstream commit: c15ab104

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    |  1 +
 .packit.yaml  | 22 ++--------------------
 README.packit |  2 +-
 buildah.spec  | 26 ++++++++++++++------------
 sources       |  2 +-
 5 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 30834e2..4169ea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -719,3 +719,4 @@
 /v1.37.5.tar.gz
 /v1.38.0.tar.gz
 /v1.38.1.tar.gz
+/v1.39.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index df57645..1c751af 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -12,8 +12,6 @@ packages:
   buildah-centos:
     pkg_tool: centpkg
     specfile_path: rpm/buildah.spec
-  buildah-rhel:
-    specfile_path: rpm/buildah.spec
   buildah-eln:
     specfile_path: rpm/buildah.spec
 
@@ -28,14 +26,8 @@ jobs:
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
     targets:
-      - fedora-development-x86_64
-      - fedora-development-aarch64
-      - fedora-latest-x86_64
-      - fedora-latest-aarch64
-      - fedora-latest-stable-x86_64
-      - fedora-latest-stable-aarch64
-      - fedora-40-x86_64
-      - fedora-40-aarch64
+      - fedora-all-x86_64
+      - fedora-all-aarch64
     enable_net: true
 
   - job: copr_build
@@ -62,16 +54,6 @@ jobs:
       - centos-stream-10-aarch64
     enable_net: true
 
-  # Disabled until there is go 1.22 in epel-9
-  # - job: copr_build
-  #   trigger: pull_request
-  #   packages: [buildah-rhel]
-  #   notifications: *copr_build_failure_notification
-  #   targets:
-  #     - epel-9-x86_64
-  #     - epel-9-aarch64
-  #   enable_net: true
-
   # Run on commit to main branch
   - job: copr_build
     trigger: commit
diff --git a/README.packit b/README.packit
index 8c905b9..c1b4159 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.106.0.post1.dev8+g521f1e1d.
+The file was generated using packit 1.1.0.
diff --git a/buildah.spec b/buildah.spec
index bf7ce71..87bca7d 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -7,21 +7,16 @@
 %global debug_package   %{nil}
 %endif
 
-# RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
-# set it separately here and do not depend on RHEL's go-[s]rpm-macros package
-# until that's fixed.
-# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328
-# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331
-%if %{defined rhel}
-%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
-%endif
-
 %global gomodulesmode GO111MODULE=on
 
-%if 0%{defined fedora}
+%if %{defined fedora}
 %define build_with_btrfs 1
 %endif
 
+%if %{defined rhel}
+%define fips 1
+%endif
+
 %global git0 https://github.com/containers/%{name}
 
 Name: buildah
@@ -37,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.38.1
+Version: 1.39.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
@@ -124,11 +119,15 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
 export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'`
 export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
 
-export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
+export BUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
 %if !%{defined build_with_btrfs}
 export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs"
 %endif
 
+%if %{defined fips}
+export BUILDTAGS+=" libtrust_openssl"
+%endif
+
 %gobuild -o bin/%{name} ./cmd/%{name}
 %gobuild -o bin/imgtype ./tests/imgtype
 %gobuild -o bin/copy ./tests/copy
@@ -151,6 +150,9 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
+# Include check to silence rpmlint.
+%check
+
 %files
 %license LICENSE vendor/modules.txt
 %doc README.md
diff --git a/sources b/sources
index 2beb0bb..07fdd95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.38.1.tar.gz) = 3c4738c4d30bece590da1de3ec8879e75d197bb18a1377264cf74f034574f46e27109842503aab0b98b1fd69f8762a13e80b1bd8522c5e3782ac0c451a07c3d8
+SHA512 (v1.39.0.tar.gz) = 05b16bd00360551f02ad25d88fb24296c91ecc5f9bd930943e4f1e4aef803d8aa632dfda4bd43b36978e7a682d4bf6602611e5ec3feb0301240be47b7dd7f6e3

From 3a31f6dc4203370816b61295b286ee5e2b01a35c Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 24 Dec 2024 15:38:14 +0530
Subject: [PATCH 64/87] TMT: initial enablement

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .fmf/version           |  1 +
 .packit.yaml           | 78 +++++++++++++++++++++++++++++++++++++++---
 gating.yaml            | 12 ++++---
 plans/main.fmf         | 32 +++++++++++++++++
 tests/test_buildah.sh  | 70 -------------------------------------
 tests/test_buildah.yml | 18 ----------
 tests/tests.yml        |  1 -
 tests/tmt/system.fmf   | 17 +++++++++
 tests/tmt/test.sh      | 19 ++++++++++
 9 files changed, 150 insertions(+), 98 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/main.fmf
 delete mode 100755 tests/test_buildah.sh
 delete mode 100644 tests/test_buildah.yml
 delete mode 100644 tests/tests.yml
 create mode 100644 tests/tmt/system.fmf
 create mode 100644 tests/tmt/test.sh

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.packit.yaml b/.packit.yaml
index 1c751af..e164dab 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -5,6 +5,27 @@
 downstream_package_name: buildah
 upstream_tag_template: v{version}
 
+# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every
+# propose-downstream job. This is done so tests maintained upstream can be run
+# downstream in Zuul CI and Bodhi.
+# Ref: https://packit.dev/docs/configuration#files_to_sync
+files_to_sync:
+  - src: rpm/gating.yaml
+    dest: gating.yaml
+    delete: true
+  - src: plans/
+    dest: plans/
+    delete: true
+    mkpath: true
+  - src: tests/tmt/
+    dest: tests/tmt/
+    delete: true
+    mkpath: true
+  - src: .fmf/
+    dest: .fmf/
+    delete: true
+  - .packit.yaml
+
 packages:
   buildah-fedora:
     pkg_tool: fedpkg
@@ -25,13 +46,13 @@ jobs:
     notifications: &copr_build_failure_notification
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
-    targets:
+    targets: &fedora_copr_targets
       - fedora-all-x86_64
       - fedora-all-aarch64
     enable_net: true
 
   - job: copr_build
-    trigger: pull_request
+    trigger: ignore
     packages: [buildah-eln]
     notifications: *copr_build_failure_notification
     targets:
@@ -44,10 +65,10 @@ jobs:
     enable_net: true
 
   - job: copr_build
-    trigger: pull_request
+    trigger: ignore
     packages: [buildah-centos]
     notifications: *copr_build_failure_notification
-    targets:
+    targets: &centos_copr_targets
       - centos-stream-9-x86_64
       - centos-stream-9-aarch64
       - centos-stream-10-x86_64
@@ -66,6 +87,55 @@ jobs:
     project: podman-next
     enable_net: true
 
+  - job: tests
+    trigger: pull_request
+    packages: [buildah-fedora]
+    targets: *fedora_copr_targets
+    require: &dev_tests
+      label:
+        absent:
+          - release
+    tf_extra_params:
+      environments:
+        - artifacts:
+          - type: repository-file
+            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
+    identifier: "dev"
+
+  - job: tests
+    trigger: pull_request
+    packages: [buildah-fedora]
+    targets: *fedora_copr_targets
+    require: &release_tests
+      label:
+        present:
+          - release
+    preserve_project: true
+    identifier: "release"
+
+  # FIXME: Enable centos stream tests after containers-common is fixed
+  # FIXME: centos stream 10 currently also lacks bats
+  # https://bugzilla.redhat.com/show_bug.cgi?id=2329315
+  - job: tests
+    trigger: ignore
+    packages: [buildah-centos]
+    targets: *centos_copr_targets
+    require: *dev_tests
+    tf_extra_params:
+      environments:
+        - artifacts:
+          - type: repository-file
+            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo
+    identifier: "dev"
+
+  - job: tests
+    trigger: ignore
+    packages: [buildah-centos]
+    targets: *centos_copr_targets
+    require: *release_tests
+    preserve_project: true
+    identifier: "release"
+
   # Sync to Fedora
   - job: propose_downstream
     trigger: release
diff --git a/gating.yaml b/gating.yaml
index c8a218f..1fb3172 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,14 +1,16 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_context: bodhi_update_push_stable
+decision_contexts:
+  - bodhi_update_push_stable
+  - bodhi_update_push_testing
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
 --- !Policy
 product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
+  - rhel-*
+decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/plans/main.fmf b/plans/main.fmf
new file mode 100644
index 0000000..99de783
--- /dev/null
+++ b/plans/main.fmf
@@ -0,0 +1,32 @@
+discover:
+    how: fmf
+
+execute:
+    how: tmt
+
+prepare:
+    - when: distro == centos-stream or distro == rhel
+      how: shell
+      script: |
+        dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
+        dnf -y config-manager --set-enabled epel
+      order: 10
+    - when: initiator == packit
+      how: shell
+      script: |
+        COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
+        if compgen -G $COPR_REPO_FILE > /dev/null; then
+            sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE
+        fi
+        dnf -y upgrade --allowerasing
+      order: 20
+
+provision:
+    how: artemis
+    hardware:
+        memory: ">= 16 GB"
+        cpu:
+            cores: ">= 4"
+            threads: ">=8"
+        disk:
+            - size: ">= 512 GB"
diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh
deleted file mode 100755
index ea8eea3..0000000
--- a/tests/test_buildah.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash -e
-
-# Log program and kernel versions
-echo "Important package versions:"
-(
-    uname -r
-    rpm -qa |\
-        egrep 'buildah|podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux' |\
-        sort
-) | sed -e 's/^/  /'
-
-# Log environment; or at least the useful bits
-echo "Environment:"
-env | grep -v LS_COLORS= | sort | sed -e 's/^/  /'
-
-export BUILDAH_BINARY=/usr/bin/buildah
-export IMGTYPE_BINARY=/usr/bin/buildah-imgtype
-export COPY_BINARY=/usr/bin/buildah-copy
-export TUTORIAL_BINARY=/usr/bin/buildah-tutorial
-export INET_BINARY=/usr/bin/buildah-inet
-
-###############################################################################
-# BEGIN setup/teardown
-
-# Start a registry
-pre_bats_setup() {
-    REGISTRY_FQIN=quay.io/libpod/registry:2
-
-    AUTHDIR=/tmp/buildah-tests-auth.$$
-    mkdir -p $AUTHDIR
-
-    CERT=$AUTHDIR/domain.crt
-    if [ ! -e $CERT ]; then
-        openssl req -newkey rsa:4096 -nodes -sha256 \
-                -keyout $AUTHDIR/domain.key -x509 -days 2 \
-                -out $AUTHDIR/domain.crt \
-                -subj "/C=US/ST=Foo/L=Bar/O=Red Hat, Inc./CN=registry host certificate" \
-                -addext subjectAltName=DNS:localhost
-    fi
-
-    if [ ! -e $AUTHDIR/htpasswd ]; then
-        htpasswd -Bbn testuser testpassword > $AUTHDIR/htpasswd
-    fi
-
-    podman rm -f registry || true
-    podman run -d -p 5000:5000 \
-           --name registry \
-           -v $AUTHDIR:/auth:Z \
-           -e "REGISTRY_AUTH=htpasswd" \
-           -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \
-           -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \
-           -e REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt \
-           -e REGISTRY_HTTP_TLS_KEY=/auth/domain.key \
-           $REGISTRY_FQIN
-}
-
-post_bats_teardown() {
-    podman rm -f registry
-}
-
-# END   setup/teardown
-###############################################################################
-# BEGIN actual test
-
-pre_bats_setup
-bats /usr/share/buildah/test/system
-rc=$?
-post_bats_teardown
-
-exit $rc
diff --git a/tests/test_buildah.yml b/tests/test_buildah.yml
deleted file mode 100644
index dced1f9..0000000
--- a/tests/test_buildah.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- hosts: localhost
-  environment:
-    TMPDIR: /var/tmp
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-        - container
-      required_packages:
-        - buildah
-        - buildah-tests
-        - slirp4netns
-      tests:
-        - root-test:
-            dir: ./
-            run: ./test_buildah.sh
-            timeout: 80m
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 596f735..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1 +0,0 @@
-- import_playbook: test_buildah.yml
diff --git a/tests/tmt/system.fmf b/tests/tmt/system.fmf
new file mode 100644
index 0000000..7626d20
--- /dev/null
+++ b/tests/tmt/system.fmf
@@ -0,0 +1,17 @@
+require:
+    - buildah-tests
+    - git-daemon
+    - slirp4netns
+
+environment:
+    BUILDAH_BINARY: /usr/bin/buildah
+    IMGTYPE_BINARY: /usr/bin/buildah-imgtype
+    INET_BINARY: /usr/bin/buildah-inet
+    COPY_BINARY: /usr/bin/buildah-copy
+    TUTORIAL_BINARY: /usr/bin/buildah-tutorial
+    TMPDIR: /var/tmp
+
+/local-root:
+    summary: System tests
+    test: bash ./test.sh
+    duration: 60m
diff --git a/tests/tmt/test.sh b/tests/tmt/test.sh
new file mode 100644
index 0000000..387fd85
--- /dev/null
+++ b/tests/tmt/test.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -exo pipefail
+
+uname -r
+
+rpm -q \
+    aardvark-dns \
+    buildah \
+    buildah-tests \
+    conmon \
+    container-selinux \
+    containers-common \
+    containers-common-extra \
+    crun \
+    netavark \
+    systemd
+
+bats /usr/share/buildah/test/system

From 8743ff42b9d266e1db0a81c9a72e8948a7b1d54b Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Wed, 26 Feb 2025 23:46:22 +0000
Subject: [PATCH 65/87] Update to 1.39.1 upstream release

Upstream tag: v1.39.1
Upstream commit: 9347a39c

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    |  1 +
 .packit.yaml  | 78 +++------------------------------------------------
 README.packit |  2 +-
 buildah.spec  |  2 +-
 sources       |  2 +-
 5 files changed, 8 insertions(+), 77 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4169ea7..3d4cc6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -720,3 +720,4 @@
 /v1.38.0.tar.gz
 /v1.38.1.tar.gz
 /v1.39.0.tar.gz
+/v1.39.1.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index e164dab..1c751af 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -5,27 +5,6 @@
 downstream_package_name: buildah
 upstream_tag_template: v{version}
 
-# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every
-# propose-downstream job. This is done so tests maintained upstream can be run
-# downstream in Zuul CI and Bodhi.
-# Ref: https://packit.dev/docs/configuration#files_to_sync
-files_to_sync:
-  - src: rpm/gating.yaml
-    dest: gating.yaml
-    delete: true
-  - src: plans/
-    dest: plans/
-    delete: true
-    mkpath: true
-  - src: tests/tmt/
-    dest: tests/tmt/
-    delete: true
-    mkpath: true
-  - src: .fmf/
-    dest: .fmf/
-    delete: true
-  - .packit.yaml
-
 packages:
   buildah-fedora:
     pkg_tool: fedpkg
@@ -46,13 +25,13 @@ jobs:
     notifications: &copr_build_failure_notification
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
-    targets: &fedora_copr_targets
+    targets:
       - fedora-all-x86_64
       - fedora-all-aarch64
     enable_net: true
 
   - job: copr_build
-    trigger: ignore
+    trigger: pull_request
     packages: [buildah-eln]
     notifications: *copr_build_failure_notification
     targets:
@@ -65,10 +44,10 @@ jobs:
     enable_net: true
 
   - job: copr_build
-    trigger: ignore
+    trigger: pull_request
     packages: [buildah-centos]
     notifications: *copr_build_failure_notification
-    targets: &centos_copr_targets
+    targets:
       - centos-stream-9-x86_64
       - centos-stream-9-aarch64
       - centos-stream-10-x86_64
@@ -87,55 +66,6 @@ jobs:
     project: podman-next
     enable_net: true
 
-  - job: tests
-    trigger: pull_request
-    packages: [buildah-fedora]
-    targets: *fedora_copr_targets
-    require: &dev_tests
-      label:
-        absent:
-          - release
-    tf_extra_params:
-      environments:
-        - artifacts:
-          - type: repository-file
-            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
-    identifier: "dev"
-
-  - job: tests
-    trigger: pull_request
-    packages: [buildah-fedora]
-    targets: *fedora_copr_targets
-    require: &release_tests
-      label:
-        present:
-          - release
-    preserve_project: true
-    identifier: "release"
-
-  # FIXME: Enable centos stream tests after containers-common is fixed
-  # FIXME: centos stream 10 currently also lacks bats
-  # https://bugzilla.redhat.com/show_bug.cgi?id=2329315
-  - job: tests
-    trigger: ignore
-    packages: [buildah-centos]
-    targets: *centos_copr_targets
-    require: *dev_tests
-    tf_extra_params:
-      environments:
-        - artifacts:
-          - type: repository-file
-            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo
-    identifier: "dev"
-
-  - job: tests
-    trigger: ignore
-    packages: [buildah-centos]
-    targets: *centos_copr_targets
-    require: *release_tests
-    preserve_project: true
-    identifier: "release"
-
   # Sync to Fedora
   - job: propose_downstream
     trigger: release
diff --git a/README.packit b/README.packit
index c1b4159..2cdc258 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.1.0.
+The file was generated using packit 1.1.1.post1.dev1+g7c5e02df.
diff --git a/buildah.spec b/buildah.spec
index 87bca7d..e2a1825 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.39.0
+Version: 1.39.1
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 07fdd95..11f7106 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.39.0.tar.gz) = 05b16bd00360551f02ad25d88fb24296c91ecc5f9bd930943e4f1e4aef803d8aa632dfda4bd43b36978e7a682d4bf6602611e5ec3feb0301240be47b7dd7f6e3
+SHA512 (v1.39.1.tar.gz) = aacbdf0962e55c1c6f107cf4184c951a72c68678e1940e81ecfdd7b40778a0af39cabaf842dbee8c9a4aa6b370f82b19d0f1abac41027304fd426360ddcf5a7b

From a54dfc47ef5e08a5f3306f9672bd758bfba7710c Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Tue, 4 Mar 2025 23:31:44 +0000
Subject: [PATCH 66/87] Update to 1.39.2 upstream release

Upstream tag: v1.39.2
Upstream commit: d5d9d35f

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d4cc6d..8b4a2a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -721,3 +721,4 @@
 /v1.38.1.tar.gz
 /v1.39.0.tar.gz
 /v1.39.1.tar.gz
+/v1.39.2.tar.gz
diff --git a/README.packit b/README.packit
index 2cdc258..87210c5 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.1.1.post1.dev1+g7c5e02df.
+The file was generated using packit 1.2.0.post1.dev3+g3adf9afe.
diff --git a/buildah.spec b/buildah.spec
index e2a1825..60d68cc 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.39.1
+Version: 1.39.2
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 11f7106..dad870d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.39.1.tar.gz) = aacbdf0962e55c1c6f107cf4184c951a72c68678e1940e81ecfdd7b40778a0af39cabaf842dbee8c9a4aa6b370f82b19d0f1abac41027304fd426360ddcf5a7b
+SHA512 (v1.39.2.tar.gz) = 4a95093894cc82a68b4e98003fd89c97b0e16f282b21d38d4425cc06fc8fd27c92352cf59d5e9c97c54492b773d15f9a1708a0597aa82675f8a1d30193b06167

From c09e532cefff83a360107ab851642ee856adc036 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Fri, 14 Mar 2025 19:50:38 +0000
Subject: [PATCH 67/87] Update to 1.39.3 upstream release

Upstream tag: v1.39.3
Upstream commit: 0a5cebb3

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b4a2a4..6d12f85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -722,3 +722,4 @@
 /v1.39.0.tar.gz
 /v1.39.1.tar.gz
 /v1.39.2.tar.gz
+/v1.39.3.tar.gz
diff --git a/README.packit b/README.packit
index 87210c5..f5cc99f 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.2.0.post1.dev3+g3adf9afe.
+The file was generated using packit 1.2.0.post1.dev13+g55ed4527.
diff --git a/buildah.spec b/buildah.spec
index 60d68cc..058fadb 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.39.2
+Version: 1.39.3
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index dad870d..71d40b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.39.2.tar.gz) = 4a95093894cc82a68b4e98003fd89c97b0e16f282b21d38d4425cc06fc8fd27c92352cf59d5e9c97c54492b773d15f9a1708a0597aa82675f8a1d30193b06167
+SHA512 (v1.39.3.tar.gz) = 95b7e30e8e3b112ac0cc2f2378d0532bf37d1a38a1bc94e246f46408a3169ff46ac3cca587f80acdcfeea3cbfbaebaf01467329fad979b3790106bdab7da5814

From bc8689debf42bfe4f25cbbe48cb63a3b4b358fb9 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Fri, 28 Mar 2025 14:38:33 +0000
Subject: [PATCH 68/87] Update to 1.39.4 upstream release

Upstream tag: v1.39.4
Upstream commit: 5b7b7ca3

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6d12f85..c512b16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -723,3 +723,4 @@
 /v1.39.1.tar.gz
 /v1.39.2.tar.gz
 /v1.39.3.tar.gz
+/v1.39.4.tar.gz
diff --git a/README.packit b/README.packit
index f5cc99f..ad2b8e5 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.2.0.post1.dev13+g55ed4527.
+The file was generated using packit 1.3.0.post1.dev4+gb85da743.
diff --git a/buildah.spec b/buildah.spec
index 058fadb..3c42c82 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.39.3
+Version: 1.39.4
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 71d40b8..6def8f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.39.3.tar.gz) = 95b7e30e8e3b112ac0cc2f2378d0532bf37d1a38a1bc94e246f46408a3169ff46ac3cca587f80acdcfeea3cbfbaebaf01467329fad979b3790106bdab7da5814
+SHA512 (v1.39.4.tar.gz) = c721660f94010a0dc8b01502db565b486c53962ee1933e03dd2297cf5d30ac9edef6c92491f41c8c61bee946302e7a39ecff55b2ad3e34ed649222c9655262c2

From f38d0e1c259eaa641c7c3788f7e303f27bfa3fe3 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 21 Apr 2025 17:45:16 +0000
Subject: [PATCH 69/87] Update to 1.40.0 upstream release

Upstream tag: v1.40.0
Upstream commit: ff62e3e8

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore                       |  1 +
 .packit.yaml                     | 60 +++++++++++++++++++++++++++++---
 README.packit                    |  2 +-
 buildah.spec                     |  8 +++--
 plans/main.fmf                   |  2 ++
 sources                          |  2 +-
 tests/tmt/system.fmf             |  6 ++--
 tests/tmt/{test.sh => system.sh} |  1 -
 8 files changed, 70 insertions(+), 12 deletions(-)
 rename tests/tmt/{test.sh => system.sh} (89%)

diff --git a/.gitignore b/.gitignore
index c512b16..bf00b2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -724,3 +724,4 @@
 /v1.39.2.tar.gz
 /v1.39.3.tar.gz
 /v1.39.4.tar.gz
+/v1.40.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index 1c751af..314813c 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -5,6 +5,27 @@
 downstream_package_name: buildah
 upstream_tag_template: v{version}
 
+# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every
+# propose-downstream job. This is done so tests maintained upstream can be run
+# downstream in Zuul CI and Bodhi.
+# Ref: https://packit.dev/docs/configuration#files_to_sync
+files_to_sync:
+  - src: rpm/gating.yaml
+    dest: gating.yaml
+    delete: true
+  - src: plans/
+    dest: plans/
+    delete: true
+    mkpath: true
+  - src: tests/tmt/
+    dest: tests/tmt/
+    delete: true
+    mkpath: true
+  - src: .fmf/
+    dest: .fmf/
+    delete: true
+  - .packit.yaml
+
 packages:
   buildah-fedora:
     pkg_tool: fedpkg
@@ -25,9 +46,13 @@ jobs:
     notifications: &copr_build_failure_notification
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
-    targets:
-      - fedora-all-x86_64
-      - fedora-all-aarch64
+    targets: &fedora_copr_targets
+    # f40 ships go 1.22 and we require go 1.23 now. This should be revert to fedora-all
+    # once either f40 is rebased to go 1.23 or f42 is released and f40 EOL.
+      - fedora-latest-stable-x86_64
+      - fedora-latest-stable-aarch64
+      - fedora-development-x86_64
+      - fedora-development-aarch64
     enable_net: true
 
   - job: copr_build
@@ -47,7 +72,7 @@ jobs:
     trigger: pull_request
     packages: [buildah-centos]
     notifications: *copr_build_failure_notification
-    targets:
+    targets: &centos_copr_targets
       - centos-stream-9-x86_64
       - centos-stream-9-aarch64
       - centos-stream-10-x86_64
@@ -66,6 +91,33 @@ jobs:
     project: podman-next
     enable_net: true
 
+  # Tests on Fedora for main branch PRs
+  - job: tests
+    trigger: pull_request
+    packages: [buildah-fedora]
+    targets: &fedora_copr_test_targets
+    # See the other comment above, this should be reverted to fedora-all when possible.
+      - fedora-latest-stable-x86_64
+      - fedora-development-x86_64
+    tf_extra_params:
+      environments:
+        - artifacts:
+          - type: repository-file
+            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
+
+  # Tests on CentOS Stream for main branch PRs
+  - job: tests
+    trigger: pull_request
+    packages: [buildah-centos]
+    targets: &centos_copr_test_targets
+      - centos-stream-9-x86_64
+      - centos-stream-10-x86_64
+    tf_extra_params:
+      environments:
+        - artifacts:
+          - type: repository-file
+            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo
+
   # Sync to Fedora
   - job: propose_downstream
     trigger: release
diff --git a/README.packit b/README.packit
index ad2b8e5..807ffc6 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.3.0.post1.dev4+gb85da743.
+The file was generated using packit 1.6.0.post1.dev2+gd5a7662a.
diff --git a/buildah.spec b/buildah.spec
index 3c42c82..7b7c62f 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.39.4
+Version: 1.40.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
@@ -79,12 +79,16 @@ or
 * save container's root file system layer to create a new image
 * delete a working container or an image
 
+# This subpackage is only intended for CI testing.
+# Not meant for end user/customer usage.
 %package tests
 Summary: Tests for %{name}
 
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%if %{defined fedora}
+%if %{defined bats_epel}
 Requires: bats
+%else
+Recommends: bats
 %endif
 Requires: bzip2
 Requires: podman
diff --git a/plans/main.fmf b/plans/main.fmf
index 99de783..b982e76 100644
--- a/plans/main.fmf
+++ b/plans/main.fmf
@@ -30,3 +30,5 @@ provision:
             threads: ">=8"
         disk:
             - size: ">= 512 GB"
+
+
diff --git a/sources b/sources
index 6def8f9..67483b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.39.4.tar.gz) = c721660f94010a0dc8b01502db565b486c53962ee1933e03dd2297cf5d30ac9edef6c92491f41c8c61bee946302e7a39ecff55b2ad3e34ed649222c9655262c2
+SHA512 (v1.40.0.tar.gz) = bb96d04a17ab5a77e5d984dca369e3890131044c505ae3b030d95ffd66378df22da33315a50c9e500e783345ded23ebacdfa0965002a18e1d929c5fa3ce39311
diff --git a/tests/tmt/system.fmf b/tests/tmt/system.fmf
index 7626d20..f34f4d9 100644
--- a/tests/tmt/system.fmf
+++ b/tests/tmt/system.fmf
@@ -11,7 +11,7 @@ environment:
     TUTORIAL_BINARY: /usr/bin/buildah-tutorial
     TMPDIR: /var/tmp
 
-/local-root:
-    summary: System tests
-    test: bash ./test.sh
+/local/root:
+    summary: System test
+    test: bash ./system.sh
     duration: 60m
diff --git a/tests/tmt/test.sh b/tests/tmt/system.sh
similarity index 89%
rename from tests/tmt/test.sh
rename to tests/tmt/system.sh
index 387fd85..73553aa 100644
--- a/tests/tmt/test.sh
+++ b/tests/tmt/system.sh
@@ -11,7 +11,6 @@ rpm -q \
     conmon \
     container-selinux \
     containers-common \
-    containers-common-extra \
     crun \
     netavark \
     systemd

From 000cb986c47f75c15a638295dbad7502b6932133 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Wed, 4 Jun 2025 12:42:00 +0000
Subject: [PATCH 70/87] Update to 1.40.1 upstream release

Upstream tag: v1.40.1
Upstream commit: b013f347

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore           | 1 +
 README.packit        | 2 +-
 buildah.spec         | 5 ++++-
 sources              | 2 +-
 tests/tmt/system.fmf | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf00b2b..713f474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -725,3 +725,4 @@
 /v1.39.3.tar.gz
 /v1.39.4.tar.gz
 /v1.40.0.tar.gz
+/v1.40.1.tar.gz
diff --git a/README.packit b/README.packit
index 807ffc6..6beb40f 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.6.0.post1.dev2+gd5a7662a.
+The file was generated using packit 1.8.0.post1.dev31+g9980e597.
diff --git a/buildah.spec b/buildah.spec
index 7b7c62f..c67c445 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.40.0
+Version: 1.40.1
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
@@ -137,6 +137,7 @@ export BUILDTAGS+=" libtrust_openssl"
 %gobuild -o bin/copy ./tests/copy
 %gobuild -o bin/tutorial ./tests/tutorial
 %gobuild -o bin/inet ./tests/inet
+%gobuild -o bin/dumpspec ./tests/dumpspec
 %{__make} docs
 
 %install
@@ -148,6 +149,7 @@ cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
 cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
 cp bin/inet     %{buildroot}/%{_bindir}/%{name}-inet
+cp bin/dumpspec %{buildroot}/%{_bindir}/%{name}-dumpspec
 
 rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 
@@ -172,6 +174,7 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 %{_bindir}/%{name}-copy
 %{_bindir}/%{name}-tutorial
 %{_bindir}/%{name}-inet
+%{_bindir}/%{name}-dumpspec
 %{_datadir}/%{name}/test
 
 %changelog
diff --git a/sources b/sources
index 67483b7..64f4c4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.40.0.tar.gz) = bb96d04a17ab5a77e5d984dca369e3890131044c505ae3b030d95ffd66378df22da33315a50c9e500e783345ded23ebacdfa0965002a18e1d929c5fa3ce39311
+SHA512 (v1.40.1.tar.gz) = 6b37b6cc5fa3d7972800cfaef5919df8ee6c9220e8635850ee9d8356645b08afa4252d688f4316b3265e5f6aef6fa0647fb4f7602b7add292fc8b56a74c4fa1f
diff --git a/tests/tmt/system.fmf b/tests/tmt/system.fmf
index f34f4d9..49b3619 100644
--- a/tests/tmt/system.fmf
+++ b/tests/tmt/system.fmf
@@ -9,6 +9,7 @@ environment:
     INET_BINARY: /usr/bin/buildah-inet
     COPY_BINARY: /usr/bin/buildah-copy
     TUTORIAL_BINARY: /usr/bin/buildah-tutorial
+    DUMPSPEC_BINARY: /usr/bin/buildah-dumpspec
     TMPDIR: /var/tmp
 
 /local/root:

From b6e01ac0fe9226019551174b06228ead0bc11000 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 21 Jul 2025 13:48:42 +0000
Subject: [PATCH 71/87] Update to 1.41.0 upstream release

Upstream tag: v1.41.0
Upstream commit: 9f185b77

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore           |  1 +
 .packit.yaml         | 30 ++++++++++++++++--------------
 README.packit        |  2 +-
 buildah.spec         | 11 +++++++----
 sources              |  2 +-
 tests/tmt/system.fmf |  6 ++++++
 6 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 713f474..1f70052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -726,3 +726,4 @@
 /v1.39.4.tar.gz
 /v1.40.0.tar.gz
 /v1.40.1.tar.gz
+/v1.41.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index 314813c..032e9e1 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -46,17 +46,19 @@ jobs:
     notifications: &copr_build_failure_notification
       failure_comment:
         message: "Ephemeral COPR build failed. @containers/packit-build please check."
+    # Fedora aliases documentation: https://packit.dev/docs/configuration#aliases
+    # python3-fedora-distro-aliases provides `resolve-fedora-aliases` command
     targets: &fedora_copr_targets
-    # f40 ships go 1.22 and we require go 1.23 now. This should be revert to fedora-all
-    # once either f40 is rebased to go 1.23 or f42 is released and f40 EOL.
-      - fedora-latest-stable-x86_64
-      - fedora-latest-stable-aarch64
-      - fedora-development-x86_64
-      - fedora-development-aarch64
+      - fedora-all-x86_64
+      - fedora-all-aarch64
     enable_net: true
+    # Disable osh diff scan until Go support is available
+    # Ref: https://github.com/openscanhub/known-false-positives/pull/30#issuecomment-2858698495
+    osh_diff_scan_after_copr_build: false
 
+  # Ignore until golang is updated in distro buildroot to 1.23.3+
   - job: copr_build
-    trigger: pull_request
+    trigger: ignore
     packages: [buildah-eln]
     notifications: *copr_build_failure_notification
     targets:
@@ -68,8 +70,9 @@ jobs:
           - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/"
     enable_net: true
 
+  # Ignore until golang is updated in distro buildroot to 1.23.3+
   - job: copr_build
-    trigger: pull_request
+    trigger: ignore
     packages: [buildah-centos]
     notifications: *copr_build_failure_notification
     targets: &centos_copr_targets
@@ -95,21 +98,20 @@ jobs:
   - job: tests
     trigger: pull_request
     packages: [buildah-fedora]
-    targets: &fedora_copr_test_targets
-    # See the other comment above, this should be reverted to fedora-all when possible.
-      - fedora-latest-stable-x86_64
-      - fedora-development-x86_64
+    targets:
+      - fedora-all-x86_64
     tf_extra_params:
       environments:
         - artifacts:
           - type: repository-file
             id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
 
+  # Ignore until golang is updated in distro buildroot to 1.23.3+
   # Tests on CentOS Stream for main branch PRs
   - job: tests
-    trigger: pull_request
+    trigger: ignore
     packages: [buildah-centos]
-    targets: &centos_copr_test_targets
+    targets:
       - centos-stream-9-x86_64
       - centos-stream-10-x86_64
     tf_extra_params:
diff --git a/README.packit b/README.packit
index 6beb40f..dde2a46 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.8.0.post1.dev31+g9980e597.
+The file was generated using packit 1.9.0.post1.dev4+g48b4c222.
diff --git a/buildah.spec b/buildah.spec
index c67c445..6e1c446 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.40.1
+Version: 1.41.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
@@ -56,11 +56,11 @@ BuildRequires: go-rpm-macros
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: make
-BuildRequires: ostree-devel
 %if %{defined build_with_btrfs}
 BuildRequires: btrfs-progs-devel
 %endif
 BuildRequires: shadow-utils-subid-devel
+BuildRequires: sqlite-devel
 Requires: containers-common-extra
 %if %{defined fedora}
 BuildRequires: libseccomp-static
@@ -123,9 +123,9 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
 export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'`
 export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
 
-export BUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
+export BUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh) libsqlite3"
 %if !%{defined build_with_btrfs}
-export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs"
+export BUILDTAGS+=" exclude_graphdriver_btrfs"
 %endif
 
 %if %{defined fips}
@@ -138,6 +138,7 @@ export BUILDTAGS+=" libtrust_openssl"
 %gobuild -o bin/tutorial ./tests/tutorial
 %gobuild -o bin/inet ./tests/inet
 %gobuild -o bin/dumpspec ./tests/dumpspec
+%gobuild -o bin/passwd ./tests/passwd
 %{__make} docs
 
 %install
@@ -150,6 +151,7 @@ cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
 cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
 cp bin/inet     %{buildroot}/%{_bindir}/%{name}-inet
 cp bin/dumpspec %{buildroot}/%{_bindir}/%{name}-dumpspec
+cp bin/passwd %{buildroot}/%{_bindir}/%{name}-passwd
 
 rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 
@@ -175,6 +177,7 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 %{_bindir}/%{name}-tutorial
 %{_bindir}/%{name}-inet
 %{_bindir}/%{name}-dumpspec
+%{_bindir}/%{name}-passwd
 %{_datadir}/%{name}/test
 
 %changelog
diff --git a/sources b/sources
index 64f4c4b..be6b0b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.40.1.tar.gz) = 6b37b6cc5fa3d7972800cfaef5919df8ee6c9220e8635850ee9d8356645b08afa4252d688f4316b3265e5f6aef6fa0647fb4f7602b7add292fc8b56a74c4fa1f
+SHA512 (v1.41.0.tar.gz) = 50be5c400a5063c12d5b97dc285d4969e50e88fa21de537f1c2317df36a1ccabf26ba70ece9e3e5c891e76ee8d85ab946029dc240de40ec88c86ad678e963823
diff --git a/tests/tmt/system.fmf b/tests/tmt/system.fmf
index 49b3619..eb6b766 100644
--- a/tests/tmt/system.fmf
+++ b/tests/tmt/system.fmf
@@ -10,8 +10,14 @@ environment:
     COPY_BINARY: /usr/bin/buildah-copy
     TUTORIAL_BINARY: /usr/bin/buildah-tutorial
     DUMPSPEC_BINARY: /usr/bin/buildah-dumpspec
+    PASSWD_BINARY: /usr/bin/buildah-passwd
     TMPDIR: /var/tmp
 
+adjust:
+    - when: initiator != "packit"
+      environment+:
+        RELEASE_TESTING: true
+
 /local/root:
     summary: System test
     test: bash ./system.sh

From 4939c53015158db064eb159bc69bf200a9184017 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 17:57:10 +0000
Subject: [PATCH 72/87] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 932bf4d26212316488f9ab30e842e62ef652e791 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Thu, 7 Aug 2025 13:25:20 +0000
Subject: [PATCH 73/87] Update to 1.41.1 upstream release

Upstream tag: v1.41.1
Upstream commit: 2de767f3

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1f70052..573a4dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -727,3 +727,4 @@
 /v1.40.0.tar.gz
 /v1.40.1.tar.gz
 /v1.41.0.tar.gz
+/v1.41.1.tar.gz
diff --git a/README.packit b/README.packit
index dde2a46..3ad54d6 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.9.0.post1.dev4+g48b4c222.
+The file was generated using packit 1.11.0.
diff --git a/buildah.spec b/buildah.spec
index 6e1c446..99a096f 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.41.0
+Version: 1.41.1
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index be6b0b7..3b55b0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.41.0.tar.gz) = 50be5c400a5063c12d5b97dc285d4969e50e88fa21de537f1c2317df36a1ccabf26ba70ece9e3e5c891e76ee8d85ab946029dc240de40ec88c86ad678e963823
+SHA512 (v1.41.1.tar.gz) = 0b953fb8bc2d6b9c83919d1a12ce2757e18c1df4a230be506a3a207727a2390fd78de9e2fd919e99f764d7166765354f056f84f07852ec1b114c44d637370816

From 9679193c218370ec4d65a9161653bd6d3c196f35 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Wed, 13 Aug 2025 18:57:12 +0000
Subject: [PATCH 74/87] Update to 1.41.2 upstream release

Upstream tag: v1.41.2
Upstream commit: 5442721d

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore   | 1 +
 buildah.spec | 2 +-
 sources      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 573a4dd..383e353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -728,3 +728,4 @@
 /v1.40.1.tar.gz
 /v1.41.0.tar.gz
 /v1.41.1.tar.gz
+/v1.41.2.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 99a096f..68ac9ca 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.41.1
+Version: 1.41.2
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 3b55b0e..148d707 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.41.1.tar.gz) = 0b953fb8bc2d6b9c83919d1a12ce2757e18c1df4a230be506a3a207727a2390fd78de9e2fd919e99f764d7166765354f056f84f07852ec1b114c44d637370816
+SHA512 (v1.41.2.tar.gz) = fd8884e9d0e3f18cabc73eadf0cb24ee642aebb4dca5b1d172839c32ff36196a213f6cddbd7109390e5af99e22afbc584e0f3a6a4dd7b98c5b2402388f976744

From 1b8d00975027576249c3d2e4a55b7b43b67a9720 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Thu, 14 Aug 2025 18:56:32 +0000
Subject: [PATCH 75/87] Update to 1.41.3 upstream release

Upstream tag: v1.41.3
Upstream commit: b60c59c7

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore   | 1 +
 buildah.spec | 2 +-
 sources      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 383e353..f80be95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -729,3 +729,4 @@
 /v1.41.0.tar.gz
 /v1.41.1.tar.gz
 /v1.41.2.tar.gz
+/v1.41.3.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 68ac9ca..297ab1a 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.41.2
+Version: 1.41.3
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 148d707..69ec871 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.41.2.tar.gz) = fd8884e9d0e3f18cabc73eadf0cb24ee642aebb4dca5b1d172839c32ff36196a213f6cddbd7109390e5af99e22afbc584e0f3a6a4dd7b98c5b2402388f976744
+SHA512 (v1.41.3.tar.gz) = b106f74a1eea63a38bc28218ad71bb0073c15ae879e657111373b61175d81591ee7c9b4579b2135759f73f3512001237ae56fa6463cade57b8adb0d847b4f840

From d76916f38663dbed6e1732e3716923c8f2edc443 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 15 Aug 2025 14:23:03 -0500
Subject: [PATCH 76/87] Rebuild for golang-1.25.0

---
 buildah.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/buildah.spec b/buildah.spec
index 297ab1a..4613329 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 2
 Version: 1.41.3
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
-Release: %autorelease
+Release: %autorelease.1
 %if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
 %else
@@ -181,6 +181,9 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 %{_datadir}/%{name}/test
 
 %changelog
+* Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 2:1.41.3-1.1
+- Rebuild for golang-1.25.0
+
 %if %{defined autochangelog}
 %autochangelog
 %else

From 6d07ec6d35bf167199dbfcd8dca100508f14e5c5 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 15 Aug 2025 15:25:55 -0500
Subject: [PATCH 77/87] Revert "Rebuild for golang-1.25.0"

This reverts commit d76916f38663dbed6e1732e3716923c8f2edc443.
---
 buildah.spec | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/buildah.spec b/buildah.spec
index 4613329..297ab1a 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 2
 Version: 1.41.3
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
-Release: %autorelease.1
+Release: %autorelease
 %if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
 %else
@@ -181,9 +181,6 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 %{_datadir}/%{name}/test
 
 %changelog
-* Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 2:1.41.3-1.1
-- Rebuild for golang-1.25.0
-
 %if %{defined autochangelog}
 %autochangelog
 %else

From fb16241361cac409acae8053287142059ca0eae3 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 15 Aug 2025 16:02:45 -0500
Subject: [PATCH 78/87] Rebuild for golang-1.25.0


From 561d0ac58e934c0c08c76fbf9d742977373849cc Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Thu, 4 Sep 2025 15:29:33 +0000
Subject: [PATCH 79/87] Update to 1.41.4 upstream release

Upstream tag: v1.41.4
Upstream commit: 4094f92e

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f80be95..5082082 100644
--- a/.gitignore
+++ b/.gitignore
@@ -730,3 +730,4 @@
 /v1.41.1.tar.gz
 /v1.41.2.tar.gz
 /v1.41.3.tar.gz
+/v1.41.4.tar.gz
diff --git a/README.packit b/README.packit
index 3ad54d6..fb341a1 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.11.0.
+The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32.
diff --git a/buildah.spec b/buildah.spec
index 297ab1a..5f95bd8 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.41.3
+Version: 1.41.4
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 69ec871..3db3d7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.41.3.tar.gz) = b106f74a1eea63a38bc28218ad71bb0073c15ae879e657111373b61175d81591ee7c9b4579b2135759f73f3512001237ae56fa6463cade57b8adb0d847b4f840
+SHA512 (v1.41.4.tar.gz) = a2f4d7654293baf4267293b33f9a559f9e027bcde816d6a0690f8b9df4256f4989f27331fe6fede98a6e676e3d34a706ef0fb468085afc728aea4c0ea968636c

From 7d0ac054b59131d6b9a2b05220685e355e1254f6 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 29 Sep 2025 19:13:03 +0000
Subject: [PATCH 80/87] Update to 1.41.5 upstream release

Upstream tag: v1.41.5
Upstream commit: 7d95c695

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore   | 1 +
 buildah.spec | 2 +-
 sources      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5082082..484d568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -731,3 +731,4 @@
 /v1.41.2.tar.gz
 /v1.41.3.tar.gz
 /v1.41.4.tar.gz
+/v1.41.5.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 5f95bd8..431df24 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.41.4
+Version: 1.41.5
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 3db3d7e..0dfba83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.41.4.tar.gz) = a2f4d7654293baf4267293b33f9a559f9e027bcde816d6a0690f8b9df4256f4989f27331fe6fede98a6e676e3d34a706ef0fb468085afc728aea4c0ea968636c
+SHA512 (v1.41.5.tar.gz) = 11067b5e80a3f4d5b9544dcaa29231023e6aa7f144ef463b6823ad65e11af34f61571bd6ab1d63046042fa80f7c4a68b4b1f43c145f35f474144b3c7d3b04b3d

From 5fedcf4ec65dfe22189bce47d37c13e56f9dbb47 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 10 Oct 2025 10:53:24 -0500
Subject: [PATCH 81/87] Rebuild for golang 1.25.2


From 6fc353cd85e2798f639185b9f82f6d58713eca2c Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Wed, 22 Oct 2025 15:20:59 +0000
Subject: [PATCH 82/87] Update to 1.42.0 upstream release

Upstream tag: v1.42.0
Upstream commit: 1ba41f03

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 8 +++++++-
 sources       | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 484d568..c806723 100644
--- a/.gitignore
+++ b/.gitignore
@@ -732,3 +732,4 @@
 /v1.41.3.tar.gz
 /v1.41.4.tar.gz
 /v1.41.5.tar.gz
+/v1.42.0.tar.gz
diff --git a/README.packit b/README.packit
index fb341a1..2511bf4 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32.
+The file was generated using packit 1.12.0.
diff --git a/buildah.spec b/buildah.spec
index 431df24..2ff2112 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -32,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.41.5
+Version: 1.42.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
@@ -139,6 +139,8 @@ export BUILDTAGS+=" libtrust_openssl"
 %gobuild -o bin/inet ./tests/inet
 %gobuild -o bin/dumpspec ./tests/dumpspec
 %gobuild -o bin/passwd ./tests/passwd
+%gobuild -o bin/crash ./tests/crash
+%gobuild -o bin/wait ./tests/wait
 %{__make} docs
 
 %install
@@ -152,6 +154,8 @@ cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
 cp bin/inet     %{buildroot}/%{_bindir}/%{name}-inet
 cp bin/dumpspec %{buildroot}/%{_bindir}/%{name}-dumpspec
 cp bin/passwd %{buildroot}/%{_bindir}/%{name}-passwd
+cp bin/crash %{buildroot}/%{_bindir}/%{name}-crash
+cp bin/wait %{buildroot}/%{_bindir}/%{name}-wait
 
 rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 
@@ -178,6 +182,8 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 %{_bindir}/%{name}-inet
 %{_bindir}/%{name}-dumpspec
 %{_bindir}/%{name}-passwd
+%{_bindir}/%{name}-crash
+%{_bindir}/%{name}-wait
 %{_datadir}/%{name}/test
 
 %changelog
diff --git a/sources b/sources
index 0dfba83..0f8bdfa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.41.5.tar.gz) = 11067b5e80a3f4d5b9544dcaa29231023e6aa7f144ef463b6823ad65e11af34f61571bd6ab1d63046042fa80f7c4a68b4b1f43c145f35f474144b3c7d3b04b3d
+SHA512 (v1.42.0.tar.gz) = becea994798624b1bdc815bb74aeaabc90af6f90a16332f771d56d5d619ec73affff1671b835772064a0c5a4a317da08d6deba737aa4cf9111382888d4770649

From a884e54cb01af2296c0b2226fb284cb9c7598118 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@redhat.com>
Date: Thu, 23 Oct 2025 08:41:34 -0400
Subject: [PATCH 83/87] build with sequoia on f43+

---
 buildah.spec | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/buildah.spec b/buildah.spec
index 2ff2112..36684f7 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -11,6 +11,9 @@
 
 %if %{defined fedora}
 %define build_with_btrfs 1
+%if 0%{?fedora} >= 43
+%define sequoia 1
+%endif
 %endif
 
 %if %{defined rhel}
@@ -69,6 +72,9 @@ BuildRequires: libseccomp-devel
 %endif
 Requires: libseccomp >= 2.4.1-0
 Suggests: cpp
+%if %{defined sequoia}
+Requires: podman-sequoia
+%endif
 
 %description
 The %{name} package provides a command line tool which can be used to
@@ -132,6 +138,10 @@ export BUILDTAGS+=" exclude_graphdriver_btrfs"
 export BUILDTAGS+=" libtrust_openssl"
 %endif
 
+%if %{defined sequoia}
+export BUILDTAGS+=" containers_image_sequoia"
+%endif
+
 %gobuild -o bin/%{name} ./cmd/%{name}
 %gobuild -o bin/imgtype ./tests/imgtype
 %gobuild -o bin/copy ./tests/copy

From 90ad4c354ac777cfef2a16b79c39bc22ea085ec2 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@redhat.com>
Date: Thu, 23 Oct 2025 08:44:05 -0400
Subject: [PATCH 84/87] cleanup changelog

---
 buildah.spec | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/buildah.spec b/buildah.spec
index 36684f7..e3e9102 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -197,12 +197,4 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 %{_datadir}/%{name}/test
 
 %changelog
-%if %{defined autochangelog}
 %autochangelog
-%else
-# NOTE: This changelog will be visible on CentOS 8 Stream builds
-# Other envs are capable of handling autochangelog
-* Fri Jun 16 2023 RH Container Bot <rhcontainerbot@fedoraproject.org>
-- Placeholder changelog for envs that are not autochangelog-ready.
-- Contact upstream if you need to report an issue with the build.
-%endif

From 7c141b863e69837aa781b50ebc859b4d287a6793 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@redhat.com>
Date: Mon, 3 Nov 2025 11:14:16 -0500
Subject: [PATCH 85/87] Rebuild for CVE fixes

Resolves: CVE-2025-58185, CVE-2025-58188, CVE-2025-61723

From c0cc68f3e147374f221ef67d07749282b10c931d Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Tue, 11 Nov 2025 14:26:58 +0000
Subject: [PATCH 86/87] Update to 1.42.1 upstream release

Upstream tag: v1.42.1
Upstream commit: de21106b

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c806723..fbd3660 100644
--- a/.gitignore
+++ b/.gitignore
@@ -733,3 +733,4 @@
 /v1.41.4.tar.gz
 /v1.41.5.tar.gz
 /v1.42.0.tar.gz
+/v1.42.1.tar.gz
diff --git a/README.packit b/README.packit
index 2511bf4..e03362b 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.12.0.
+The file was generated using packit 1.12.0.post1.dev13+gd51655c23.
diff --git a/buildah.spec b/buildah.spec
index e3e9102..9fdce1b 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.42.0
+Version: 1.42.1
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index 0f8bdfa..cf48c42 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.42.0.tar.gz) = becea994798624b1bdc815bb74aeaabc90af6f90a16332f771d56d5d619ec73affff1671b835772064a0c5a4a317da08d6deba737aa4cf9111382888d4770649
+SHA512 (v1.42.1.tar.gz) = 87c512fe81b76767a84663f2b03edb3408c42286c540c51c5497ac5e7d05887fba5fdac9114547dbe6781f033710e2d3a96a7312d750f9232378bb865d0574bf

From d4d527c371df509cd216fee8c1d8d90f0bdbf5df Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Wed, 3 Dec 2025 09:14:25 +0000
Subject: [PATCH 87/87] Update to 1.42.2 upstream release

Upstream tag: v1.42.2
Upstream commit: c0cc9725

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    | 1 +
 README.packit | 2 +-
 buildah.spec  | 2 +-
 sources       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fbd3660..ae2c48c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -734,3 +734,4 @@
 /v1.41.5.tar.gz
 /v1.42.0.tar.gz
 /v1.42.1.tar.gz
+/v1.42.2.tar.gz
diff --git a/README.packit b/README.packit
index e03362b..b4b46e3 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.12.0.post1.dev13+gd51655c23.
+The file was generated using packit 1.12.0.post1.dev20+g7d30dac21.
diff --git a/buildah.spec b/buildah.spec
index 9fdce1b..9751b59 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -35,7 +35,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.42.1
+Version: 1.42.2
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
diff --git a/sources b/sources
index cf48c42..c210586 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.42.1.tar.gz) = 87c512fe81b76767a84663f2b03edb3408c42286c540c51c5497ac5e7d05887fba5fdac9114547dbe6781f033710e2d3a96a7312d750f9232378bb865d0574bf
+SHA512 (v1.42.2.tar.gz) = adb1de700db9b589639f6fd02cad95d9bedacb9d0363838315f33c978a8c900570d55af95073992ff69cff4f2a9d18776c5d786af294aaa1604144580c957414