From 577df93a97f59f6c3fce14beb2a5c78c1ac67793 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Tue, 4 Feb 2025 13:53:54 +0100
Subject: [PATCH] buildah-1.39.0-1.el10

- update to https://github.com/containers/buildah/releases/tag/v1.39.0
- Related: RHEL-58990

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 buildah.spec | 20 +++++++++-----------
 sources      |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/buildah.spec b/buildah.spec
index 2586ffe..a5a6a3c 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -7,15 +7,6 @@
 %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}
@@ -37,7 +28,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: 1%{?dist}
@@ -124,7 +115,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="libtrust_openssl seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
 %if !%{defined build_with_btrfs}
 export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs"
 %endif
@@ -151,6 +142,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
@@ -169,6 +163,10 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 %{_datadir}/%{name}/test
 
 %changelog
+* Tue Feb 04 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.39.0-1
+- update to https://github.com/containers/buildah/releases/tag/v1.39.0
+- Related: RHEL-58990
+
 * Tue Jan 21 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.38.1-1
 - update to https://github.com/containers/buildah/releases/tag/v1.38.1
 - Related: RHEL-58990
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