From d08281a6bb8e16c09c65aa6253956d536fa5ed2a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 18 2021 06:43:05 +0000 Subject: import buildah-1.19.7-1.module+el8.4.0+10607+f4da7515 --- diff --git a/.buildah.metadata b/.buildah.metadata index bf0fd50..31aa976 100644 --- a/.buildah.metadata +++ b/.buildah.metadata @@ -1 +1 @@ -8e153e6a28212f014b825b85359da1237c80acd1 SOURCES/release-1.16-aaed66b.tar.gz +dd4893419d60984f0922ca888b0418b9fa09bd33 SOURCES/release-1.19-a2854ed.tar.gz diff --git a/.gitignore b/.gitignore index 0067bec..e39e388 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/release-1.16-aaed66b.tar.gz +SOURCES/release-1.19-a2854ed.tar.gz diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec index 4c89ad7..9fe6b2d 100644 --- a/SPECS/buildah.spec +++ b/SPECS/buildah.spec @@ -1,35 +1,30 @@ -%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 -x %{?**}; +%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 aaed66b76f01dd0097482afb85731e0c51af5b5b +%global branch release-1.19 +%global commit0 a2854ed5afc198009e44dfd16959865cf1144522 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: buildah -Version: 1.16.7 -Release: 4%{?dist} +Version: 1.19.7 +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} %if 0%{?branch:1} Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz %else @@ -126,45 +121,121 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install %{_datadir}/%{name}/test %changelog -* Wed Feb 03 2021 Jindrich Novy - 1.16.7-4 -- update to the latest content of https://github.com/containers/buildah/tree/release-1.16 - (https://github.com/containers/buildah/commit/aaed66b) -- Related: #1888571 - -* Mon Jan 11 2021 Jindrich Novy - 1.16.7-3 -- revert back to buildah-1.16 for the quarterly release -- Related: #1888571 - -* Sun Jan 10 2021 Jindrich Novy - 1.19.0-2 -- bump version to refrect buildah upgrade -- Related: #1888571 - -* Sat Jan 09 2021 Jindrich Novy - 1.16.7-2 -- bump to release-1.19 branch -- Related: #1888571 - -* Fri Dec 04 2020 Jindrich Novy - 1.16.5-5 -- update to the latest content of https://github.com/containers/buildah/tree/release-1.16 - (https://github.com/containers/buildah/commit/56ed75b) -- Related: #1888571 - -* Thu Nov 05 2020 Jindrich Novy - 1.16.5-4 +* Thu Mar 11 2021 Jindrich Novy - 1.19.7-1 +- update to the latest content of https://github.com/containers/buildah/tree/release-1.19 + (https://github.com/containers/buildah/commit/a2854ed) +- Resolves: #1935376 + +* Fri Feb 19 2021 Jindrich Novy - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 1.19.2-1 +- update to https://github.com/containers/buildah/releases/tag/v1.19.2 +- Related: #1883490 + +* Fri Jan 15 2021 Jindrich Novy - 1.19.1-1 +- update to https://github.com/containers/buildah/releases/tag/v1.19.1 +- Related: #1883490 + +* Wed Jan 13 2021 Jindrich Novy - 1.19.0-2 +- fix gating test issue with openssl cert +- Related: #1914884 + +* Sat Jan 09 2021 Jindrich Novy - 1.19.0-1 +- update to https://github.com/containers/buildah/releases/tag/v1.19.0 +- Related: #1883490 + +* Tue Dec 08 2020 Jindrich Novy - 1.18.0-1 +- make build log more readable +- always build with debuginfo enabled +- Related: #1883490 + +* Thu Nov 05 2020 Jindrich Novy - 1.17.0-2 - simplify spec file - use short commit ID in tarball name -- Related: #1888571 +- Related: #1883490 -* Fri Oct 30 2020 Jindrich Novy - 1.16.5-3 -- update to the latest content of https://github.com/containers/buildah/tree/release-1.16 - (https://github.com/containers/buildah/commit/9e02bf9) -- Related: #1888571 +* Fri Oct 30 2020 Jindrich Novy - 1.17.0-1 +- update to https://github.com/containers/buildah/releases/tag/v1.17.0 +- Related: #1883490 * Fri Oct 23 2020 Jindrich Novy - 1.16.5-2 - use shortcommit ID in branch tarball name -- Related: #1888571 +- Related: #1883490 * Thu Oct 22 2020 Jindrich Novy - 1.16.5-1 -- synchronize with stream-container-tools-rhel8-rhel-8.4.0 -- Related: #1888571 +- synchronize with stream-container-tools-rhel8 +- Related: #1883490 + +* Thu Oct 22 2020 Jindrich Novy - 1.16.4-3 +- update source tarball +- Related: #1883490 + +* Thu Oct 22 2020 Jindrich Novy - 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 - 1.16.4-1 +- synchronize with stream-container-tools-rhel8 +- Related: #1883490 * Tue Aug 11 2020 Jindrich Novy - 1.15.1-2 - propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization