From 9a6af4ad764c83e83825843e892a25d22669eb74 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 27 2020 18:42:21 +0000
Subject: import buildah-1.15.1-2.module+el8.3.0+7716+ce654703


---

diff --git a/.buildah.metadata b/.buildah.metadata
index da9da04..139d86f 100644
--- a/.buildah.metadata
+++ b/.buildah.metadata
@@ -1 +1 @@
-3e581c62c1ee59b9cc1c2892287c65800d25142c SOURCES/v1.15.0.tar.gz
+229662de7168fad3abe0ade5161880318105ddd0 SOURCES/v1.15.1.tar.gz
diff --git a/.gitignore b/.gitignore
index d876020..ad6da9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v1.15.0.tar.gz
+SOURCES/v1.15.1.tar.gz
diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec
index 0683f96..db8ed57 100644
--- a/SPECS/buildah.spec
+++ b/SPECS/buildah.spec
@@ -22,8 +22,8 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 %global git0 https://%{import_path}
 
 Name: %{repo}
-Version: 1.15.0
-Release: 1%{?dist}
+Version: 1.15.1
+Release: 2%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
@@ -61,6 +61,7 @@ Requires: %{name} = %{version}-%{release}
 Requires: bzip2
 Requires: podman
 Requires: golang
+Requires: httpd-tools
 
 %description tests
 %{summary}
@@ -84,6 +85,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"
 rm -f src/github.com/containers/storage/drivers/register/register_btrfs.go
 %gobuild -o %{name} %{import_path}/cmd/%{name}
 %gobuild -o imgtype %{import_path}/tests/imgtype
@@ -115,6 +117,18 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 1.15.1-2
+- propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization
+- Related: #1821193
+
+* Mon Aug 10 2020 Jindrich Novy <jnovy@redhat.com> - 1.15.1-1
+- update to https://github.com/containers/buildah/releases/tag/v1.15.1
+- Related: #1821193
+
+* Fri Jul 17 2020 Jindrich Novy <jnovy@redhat.com> - 1.15.0-2
+- fix "CVE-2020-14040 buildah: golang.org/x/text: possibility to trigger an infinite loop in encoding/unicode could lead to crash [rhel-8]"
+- Resolves: #1854717
+
 * Thu Jun 18 2020 Jindrich Novy <jnovy@redhat.com> - 1.15.0-1
 - update to https://github.com/containers/buildah/releases/tag/v1.15.0
 - Related: #1821193