From e5016399a09aee9745464ae889e694ece3104608 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 14 2021 08:19:47 +0000 Subject: import buildah-1.19.0-2.module+el8.4.0+9425+98db097b --- diff --git a/.buildah.metadata b/.buildah.metadata index e2ec242..5df9d09 100644 --- a/.buildah.metadata +++ b/.buildah.metadata @@ -1 +1 @@ -723c5304f03efb50ea024cd6b4eec4054bfcb2c1 SOURCES/release-1.16-56ed75b.tar.gz +1b18b1fddfa2307a3ac74b2025926474273803aa SOURCES/buildah-1.19.0-474febf.tar.gz diff --git a/.gitignore b/.gitignore index fc76f3d..75db7eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/release-1.16-56ed75b.tar.gz +SOURCES/buildah-1.19.0-474febf.tar.gz diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec index 5578678..169d5f4 100644 --- a/SPECS/buildah.spec +++ b/SPECS/buildah.spec @@ -1,35 +1,33 @@ -%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 56ed75b4b8266affb45f5ffa971f5c83f1b96eaa +#%%global branch release-1.16 +%global commit0 474febf0dcb3c76c23a88f3b83834c81f20a7e5c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: buildah -Version: 1.16.7 -Release: 3%{?dist} +Version: 1.19.0 +Release: 2%{?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} +# still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4: +# https://bugzilla.redhat.com/show_bug.cgi?id=1905383 +ExcludeArch: %{ix86} %if 0%{?branch:1} Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz %else @@ -126,40 +124,48 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install %{_datadir}/%{name}/test %changelog -* 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 +* 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.16.7-2 -- bump to release-1.19 branch -- Related: #1888571 +* Sat Jan 09 2021 Jindrich Novy - 1.19.0-1 +- update to https://github.com/containers/buildah/releases/tag/v1.19.0 +- Related: #1883490 -* 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 +* 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.16.5-4 +* 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