From 5ecd530b0b3a6596956151ac2fa7af4c47fc53c6 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Tue, 12 Jan 2021 08:53:42 +0100
Subject: [PATCH] buildah-1.19.0-1.el9

- update to https://github.com/containers/buildah/releases/tag/v1.19.0

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 buildah.spec | 28 +++++++++++++---------------
 gating.yaml  | 14 --------------
 sources      |  2 +-
 3 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 gating.yaml

diff --git a/buildah.spec b/buildah.spec
index ac7083c..46f15f1 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -1,38 +1,33 @@
-%global with_debug 1
 %global with_bundled 1
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1904567
-%global _lto_cflags %%{nil}
-
-%if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
 
 %if 0%{?rhel} > 7 && ! 0%{?fedora}
 %define gobuild(o:) \
-go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**};
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**};
 %else
 %if ! 0%{?gobuild:1}
-%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**};
+%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**};
 %endif
 %endif
 
 %global import_path github.com/containers/buildah
 #%%global branch release-1.16
-%global commit0 d3a01d0041789ab5967acd04f5c4501a0ba78f64
+%global commit0 474febf0dcb3c76c23a88f3b83834c81f20a7e5c
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name: buildah
-Version: 1.18.0
-Release: 3%{?dist}
+Version: 1.19.0
+Release: 1%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
-# Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686
-ExcludeArch: i686
+# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
+#ExclusiveArch: %%{go_arches}
+# still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1905383
+ExcludeArch: %{ix86}
 %if 0%{?branch:1}
 Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
 %else
@@ -129,6 +124,9 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Tue Jan 12 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.0-1
+- update to https://github.com/containers/buildah/releases/tag/v1.19.0
+
 * Sat Dec 05 2020 Jindrich Novy <jnovy@redhat.com> - 1.18.0-3
 - remove any LTO CFLAGS to avoid build failure
 - Related: #1904567
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index c8a218f..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-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
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
diff --git a/sources b/sources
index e3f74d6..d000b45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f920cb81f18671bcb3043ac505e3200  buildah-1.18.0-d3a01d0.tar.gz
+SHA512 (buildah-1.19.0-474febf.tar.gz) = cfd91aad88abc2f7dfd76e39f5c39b2742c50d60f4202593b42c0c2a374d501300b7b98a3099122d8167460944bc6cbeac2055f511fdace4252a403f6e8bf068