import buildah-1.19.6-1.module+el8.4.0+10198+36d1d0e3

This commit is contained in:
CentOS Sources 2021-03-30 13:43:17 -04:00 committed by Stepan Oksanichenko
parent b0d8263168
commit e511d85501
3 changed files with 152 additions and 23 deletions

View File

@ -1 +1 @@
3e581c62c1ee59b9cc1c2892287c65800d25142c SOURCES/v1.15.0.tar.gz
537aa647186c29e7afe8724d086e621d42119c42 SOURCES/release-1.19-7aedb16.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/v1.15.0.tar.gz
SOURCES/release-1.19-7aedb16.tar.gz

View File

@ -1,35 +1,35 @@
%global with_debug 1
%global with_bundled 1
%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:-} -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:-} -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 %{?**};
%endif
%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 import_path github.com/containers/buildah
%global branch release-1.19
%global commit0 7aedb164287ed9c64ab38be2b3490782adadb894
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: %{repo}
Version: 1.15.0
Name: buildah
Version: 1.19.6
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
Source0: %{git0}/archive/v%{version}.tar.gz
# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
ExclusiveArch: %{go_arches}
%if 0%{?branch:1}
Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
%else
Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
%endif
BuildRequires: golang >= 1.12.12-4
BuildRequires: git
BuildRequires: glib2-devel
@ -61,6 +61,7 @@ Requires: %{name} = %{version}-%{release}
Requires: bzip2
Requires: podman
Requires: golang
Requires: httpd-tools
%description tests
%{summary}
@ -68,14 +69,18 @@ Requires: golang
This package contains system tests for %{name}
%prep
%autosetup -Sgit
%if 0%{?branch:1}
%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
%else
%autosetup -Sgit -n %{name}-%{commit0}
%endif
sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
sed -i '/docs install/d' Makefile
%build
mkdir _build
pushd _build
mkdir -p src/%{provider}.%{provider_tld}/%{project}
mkdir -p src/github.com/containers
ln -s $(dirs +1 -l) src/%{import_path}
popd
@ -84,8 +89,9 @@ 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 bin/%{name} %{import_path}/cmd/%{name}
%gobuild -o imgtype %{import_path}/tests/imgtype
GOMD2MAN=go-md2man %{__make} -C docs
@ -115,6 +121,129 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
%{_datadir}/%{name}/test
%changelog
* Fri Feb 19 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.6-1
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/7aedb16)
- Related: #1883490
* Thu Feb 18 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.5-6
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/dcd385e)
- Related: #1883490
* Thu Feb 18 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.5-5
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/016b90d)
- Related: #1883490
* Tue Feb 16 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.5-4
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/e5384ed)
- Related: #1883490
* Mon Feb 15 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.5-3
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/9dd415b)
- Related: #1883490
* Fri Feb 12 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.5-2
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/db783f4)
- Related: #1883490
* Wed Feb 10 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.5-1
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/1fb260f)
- Related: #1883490
* Tue Feb 09 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.4-1
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/76beccc)
- Related: #1883490
* Sun Feb 07 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.3-3
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/a96b716)
- Related: #1883490
* Sat Feb 06 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.3-2
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/17521db)
- Related: #1883490
* Sun Jan 31 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.3-1
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/af31e45)
- Related: #1883490
* Fri Jan 29 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.2-2
- update to the latest content of https://github.com/containers/buildah/tree/release-1.19
(https://github.com/containers/buildah/commit/06e091b)
- Related: #1883490
* Fri Jan 15 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.2-1
- update to https://github.com/containers/buildah/releases/tag/v1.19.2
- Related: #1883490
* Fri Jan 15 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.1-1
- update to https://github.com/containers/buildah/releases/tag/v1.19.1
- Related: #1883490
* Wed Jan 13 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.0-2
- fix gating test issue with openssl cert
- Related: #1914884
* Sat Jan 09 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.0-1
- update to https://github.com/containers/buildah/releases/tag/v1.19.0
- Related: #1883490
* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 1.18.0-1
- make build log more readable
- always build with debuginfo enabled
- Related: #1883490
* Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 1.17.0-2
- simplify spec file
- use short commit ID in tarball name
- Related: #1883490
* Fri Oct 30 2020 Jindrich Novy <jnovy@redhat.com> - 1.17.0-1
- update to https://github.com/containers/buildah/releases/tag/v1.17.0
- Related: #1883490
* Fri Oct 23 2020 Jindrich Novy <jnovy@redhat.com> - 1.16.5-2
- use shortcommit ID in branch tarball name
- Related: #1883490
* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 1.16.5-1
- synchronize with stream-container-tools-rhel8
- Related: #1883490
* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 1.16.4-3
- update source tarball
- Related: #1883490
* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 1.16.4-2
- use the mainline 1.16.4 buildah release as starting point for 8.4.0
not the content from upstream branch yet
- Related: #1883490
* Wed Oct 21 2020 Jindrich Novy <jnovy@redhat.com> - 1.16.4-1
- synchronize with stream-container-tools-rhel8
- Related: #1883490
* 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