[rpms/buildah] update-buildah-cve-2026-46597: buildah-1.18.0-2.el9

[Jindrich Novy <jnovy@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/buildah
            Branch : update-buildah-cve-2026-46597
            Commit : d0073c5ec26c4da191452ee4a95beff54045804a
            Author : Jindrich Novy <jnovy@redhat.com>
            Date   : 2020-12-04T19:42:52+01:00
            Stats  : +9/-4 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/buildah/c/d0073c5ec26c4da191452ee4a95beff54045804a?branch=update-buildah-cve-2026-46597

            Log:
            buildah-1.18.0-2.el9

- do not harden binaries for now given bug in golang, e.g.
  error: variable '_cgoexp_ebd00b0772db_StorageDevmapperLogCallback' redeclared as function
- make build log more readable

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

---
diff --git a/buildah.spec b/buildah.spec
index e2a3c27..e7d1fd3 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -10,10 +10,10 @@
 
 %if 0%{?rhel} > 7 && ! 0%{?fedora}
 %define gobuild(o:) \
-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 -x %{?**};
+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 %{?**};
 %else
 %if ! 0%{?gobuild:1}
-%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 -x %{?**};
+%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 %{?**};
 %endif
 %endif
 
@@ -24,7 +24,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 
 Name: buildah
 Version: 1.18.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
@@ -94,7 +94,7 @@ mv vendor src
 export GOPATH=$(pwd)/_build:$(pwd)
 export BUILDTAGS='seccomp selinux btrfs_noversion exclude_graphdriver_btrfs'
 export GO111MODULE=off
-export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+#export CGO_CFLAGS="%%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 rm -f src/github.com/containers/storage/drivers/register/register_btrfs.go
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 %gobuild -o imgtype %{import_path}/tests/imgtype
@@ -126,6 +126,11 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Fri Dec 04 2020 Jindrich Novy <jnovy@redhat.com> - 1.18.0-2
+- do not harden binaries for now given bug in golang, e.g.
+  error: variable '_cgoexp_ebd00b0772db_StorageDevmapperLogCallback' redeclared as function
+- make build log more readable
+
 * Mon Nov 23 2020 Jindrich Novy <jnovy@redhat.com> - 1.18.0-1
 - update to https://github.com/containers/buildah/releases/tag/v1.18.0