From 2f817b356e14fd7a22f075f26837e94be706f318 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 3 Sep 2020 18:27:32 +0000 Subject: [PATCH 01/56] buildah-1.15.2-1 Signed-off-by: RH Container Bot --- buildah.spec | 9 ++++++--- sources | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/buildah.spec b/buildah.spec index 1d0eaa3..0422135 100644 --- a/buildah.spec +++ b/buildah.spec @@ -29,13 +29,13 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.14.9 +%define built_tag v1.15.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.15.0 -Release: 0.68.dev.git%{shortcommit0}%{?dist} +Version: 1.15.2 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -146,6 +146,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Sep 3 2020 RH Container Bot - 1.15.2-1 +- autobuilt v1.15.2 + * Mon Jul 27 2020 Fedora Release Engineering - 1.15.0-0.68.dev.git2c46b4b - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index ec77784..fa818c1 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (buildah-2c46b4b.tar.gz) = 1de4a3e775379a9104fe84bac3a8c255f6fae7f2c49971261b5f1a580507921e9d78875581ac0ae117a7b2281b85a35919e5b6285bc87cf8425d9c444a37c2b0 -SHA512 (buildah-843d15d.tar.gz) = ca383aff62f7a26e1bfcc3d7d7592be939c413a49f891a69139166a6c16306f38ea2d618c9e37e9f412fa7735ee4ae933dd3dcab45c06e455882aa8cc4e585b3 From e82b31671cfd327892ac36b68e11d3d167582a3c Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 7 Sep 2020 06:48:17 -0400 Subject: [PATCH 02/56] Bump to next major release --- buildah.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index 0422135..616d67b 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,7 +24,7 @@ # https://github.com/containers/buildah %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global commit0 2c46b4bf2d078fa3f18038fab8467e8c9ffac23c +%global commit0 295b825cdc0795f7e60349b901880e40e9850f5a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag @@ -34,7 +34,7 @@ %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.15.2 +Version: 1.16.0 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -146,6 +146,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Sep 7 2020 Dan Walsh - 1.16.0-1 +- Bump to next major release + * Thu Sep 3 2020 RH Container Bot - 1.15.2-1 - autobuilt v1.15.2 From 44d20dace6c4bf9ee8de40b9c31b42f2a427aeea Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 7 Sep 2020 06:50:48 -0400 Subject: [PATCH 03/56] Bump to next major release --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 98bbd03..77c8586 100644 --- a/.gitignore +++ b/.gitignore @@ -484,3 +484,4 @@ /buildah-0ac2a67.tar.gz /buildah-f7a3515.tar.gz /buildah-2c46b4b.tar.gz +/buildah-295b825.tar.gz diff --git a/sources b/sources index fa818c1..b8fe4ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-2c46b4b.tar.gz) = 1de4a3e775379a9104fe84bac3a8c255f6fae7f2c49971261b5f1a580507921e9d78875581ac0ae117a7b2281b85a35919e5b6285bc87cf8425d9c444a37c2b0 +SHA512 (buildah-295b825.tar.gz) = 671f20f64a36d215a72a1447a6087860c38e85fbb662809b02082885a21757c4fc83c7982a7be8bfcbe86c26d2275a02165b1fbcfc750b4f2f2efdc665004c56 From c342591c67eebed755018422875d0bcc0c4d99f8 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 7 Sep 2020 07:07:23 -0400 Subject: [PATCH 04/56] Bump to next major release --- buildah.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 616d67b..72ee978 100644 --- a/buildah.spec +++ b/buildah.spec @@ -115,7 +115,7 @@ export BUILDTAGS='seccomp selinux' %if 0%{?centos} >= 8 export BUILDTAGS+=' exclude_graphdriver_btrfs' %endif -%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 From de82262ca4cb9e661334857606c447d62ee494f6 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 9 Sep 2020 14:05:56 +0000 Subject: [PATCH 05/56] buildah-1.16.0-1 autobuilt v1.16.0 Signed-off-by: RH Container Bot --- buildah.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 72ee978..6fdaf95 100644 --- a/buildah.spec +++ b/buildah.spec @@ -29,7 +29,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.15.2 +%define built_tag v1.16.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz From 45377421b1fe957613742b9f861190e503afa13e Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 8 Sep 2020 15:02:43 -0600 Subject: [PATCH 06/56] Gating tests: set TMPDIR=/var/tmp Gating tests are failing with ENOSPC. Try explicitly setting TMPDIR to /var/tmp which usually has more free space. Signed-off-by: Ed Santiago (cherry picked from commit 6abb99385412cc5249e41a4907cb83a7ccb51508) --- tests/test_buildah.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_buildah.yml b/tests/test_buildah.yml index be1ce31..4820a9f 100644 --- a/tests/test_buildah.yml +++ b/tests/test_buildah.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + environment: + TMPDIR: /var/tmp roles: - role: standard-test-basic tags: From 6f312a112df9504d799f90496c099b5526345d2f Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 8 Sep 2020 10:39:24 -0600 Subject: [PATCH 07/56] add Subject Alternative Name to local openssl cert Go 1.15 deprecates checking CN; this broke gating tests: Get "https://localhost:5000/v2/": x509: certificate relies on legacy Common Name field, use SANs or temporarily enable Common Name matching with GODEBUG=x509ignoreCN=0 Easy two-line solution in the 'openssl' invocation. Huge thanks to Nalin for tracking down and fixing while I was still getting started: https://github.com/containers/buildah/pull/2595 Signed-off-by: Ed Santiago (cherry picked from commit 53b3ac8e486c9322f0aec7ad6e9ce9a928807413) Signed-off-by: Lokesh Mandvekar --- tests/test_buildah.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh index 860a4ba..13ac761 100755 --- a/tests/test_buildah.sh +++ b/tests/test_buildah.sh @@ -29,7 +29,8 @@ pre_bats_setup() { openssl req -newkey rsa:4096 -nodes -sha256 \ -keyout $AUTHDIR/domain.key -x509 -days 2 \ -out $AUTHDIR/domain.crt \ - -subj "/C=US/ST=Foo/L=Bar/O=Red Hat, Inc./CN=localhost" + -subj "/C=US/ST=Foo/L=Bar/O=Red Hat, Inc./CN=registry host certificate" \ + -addext subjectAltName=DNS:localhost fi if [ ! -e $AUTHDIR/htpasswd ]; then From 74f3b125170927b68d0c1113d8ada29bf5bf9d13 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 3 Sep 2020 14:11:46 -0400 Subject: [PATCH 08/56] tests package requires openssl Signed-off-by: Lokesh Mandvekar (cherry picked from commit 6150164bf033c63876c3c740ce85ca5df9870408) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/buildah.spec b/buildah.spec index 6fdaf95..8248941 100644 --- a/buildah.spec +++ b/buildah.spec @@ -90,6 +90,7 @@ Requires: podman Requires: golang Requires: jq Requires: httpd-tools +Requires: openssl %description tests %{summary} From 2d4f18af45513555e358c538585cf253dc77b819 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Sep 2020 10:42:58 -0400 Subject: [PATCH 09/56] buildah-1.16.0-2 - fix gating tests Signed-off-by: Lokesh Mandvekar --- buildah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 8248941..8329c74 100644 --- a/buildah.spec +++ b/buildah.spec @@ -35,7 +35,7 @@ Name: %{repo} Version: 1.16.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 @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Wed Sep 09 2020 Lokesh Mandvekar - 1.16.0-2 +- fix gating tests + * Mon Sep 7 2020 Dan Walsh - 1.16.0-1 - Bump to next major release From e85bc7bd4023565f71021929e234c63c2528d3f3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 11 Sep 2020 16:13:02 +0000 Subject: [PATCH 10/56] buildah-1.16.1-1 autobuilt v1.16.1 Signed-off-by: RH Container Bot --- buildah.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index 8329c74..f18256a 100644 --- a/buildah.spec +++ b/buildah.spec @@ -29,13 +29,13 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.16.0 +%define built_tag v1.16.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.16.0 -Release: 2%{?dist} +Version: 1.16.1 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Sep 11 2020 RH Container Bot - 1.16.1-1 +- autobuilt v1.16.1 + * Wed Sep 09 2020 Lokesh Mandvekar - 1.16.0-2 - fix gating tests From b085d0b35157dff0abfcba8fbab4d3b1f5b8daf5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 21 Sep 2020 08:10:30 -0400 Subject: [PATCH 11/56] buildah-1.16.1-2 - adjust deps for centos7 Signed-off-by: Lokesh Mandvekar --- buildah.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/buildah.spec b/buildah.spec index f18256a..7407960 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,8 +24,6 @@ # https://github.com/containers/buildah %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global commit0 295b825cdc0795f7e60349b901880e40e9850f5a -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) @@ -35,11 +33,11 @@ Name: %{repo} Version: 1.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io -Source: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Source: %{download_url} BuildRequires: device-mapper-devel BuildRequires: golang BuildRequires: git @@ -49,24 +47,26 @@ BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: make -Requires: crun >= 0.10-1 Requires: containers-common -Requires: libseccomp >= 2.4.1-0 # No ostree for centos 7 -%if 0%{?fedora} || 0%{?centos} >= 8 +%if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?eln} BuildRequires: ostree-devel %endif # No btrfs for centos 8 %if 0%{?fedora} || 0%{?centos} <= 7 BuildRequires: btrfs-progs-devel %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?eln} BuildRequires: libseccomp-static +Requires: crun >= 0.10-1 +Requires: libseccomp >= 2.4.1-0 Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs %else BuildRequires: libseccomp-devel +Requires: runc +Requires: libseccomp Requires: container-selinux Requires: slirp4netns >= 0.3-0 %endif @@ -98,7 +98,7 @@ Requires: openssl This package contains system tests for %{name} %prep -%autosetup -Sgit -n %{name}-%{commit0} +%autosetup -Sgit -n %{name}-%{built_tag_strip} sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile sed -i '/docs install/d' Makefile @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Sep 21 2020 Lokesh Mandvekar - 1.16.1-2 +- adjust deps for centos7 + * Fri Sep 11 2020 RH Container Bot - 1.16.1-1 - autobuilt v1.16.1 From bf9d2c74a45a9fabf014d127ec2e7a1d5c5f1997 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 21 Sep 2020 08:16:10 -0400 Subject: [PATCH 12/56] import source tarball Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 77c8586..42fc654 100644 --- a/.gitignore +++ b/.gitignore @@ -485,3 +485,4 @@ /buildah-f7a3515.tar.gz /buildah-2c46b4b.tar.gz /buildah-295b825.tar.gz +/v1.16.1.tar.gz diff --git a/sources b/sources index b8fe4ef..0ec7dd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-295b825.tar.gz) = 671f20f64a36d215a72a1447a6087860c38e85fbb662809b02082885a21757c4fc83c7982a7be8bfcbe86c26d2275a02165b1fbcfc750b4f2f2efdc665004c56 +SHA512 (v1.16.1.tar.gz) = c17358d71e9102ef5da530df54648eaa13a1384b06cd43fe74094cdbaa2dfda6aa6d1a218fb88e12898ae4b9dca2d8c555643326779c5f09b6a118f0a440d17a From 6b4305a3b87ec8683d125e8d99c78dc3bcd1a29d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 21 Sep 2020 08:30:00 -0400 Subject: [PATCH 13/56] buildah-1.16.1-3 - bump release to not lag f32 Signed-off-by: Lokesh Mandvekar --- buildah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 7407960..718a4c4 100644 --- a/buildah.spec +++ b/buildah.spec @@ -33,7 +33,7 @@ Name: %{repo} Version: 1.16.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Sep 21 2020 Lokesh Mandvekar - 1.16.1-3 +- bump release to not lag f32 + * Mon Sep 21 2020 Lokesh Mandvekar - 1.16.1-2 - adjust deps for centos7 From ef95c98f18fcb6c95d39b7720319b7e2283b8c9d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 22 Sep 2020 15:13:36 +0000 Subject: [PATCH 14/56] buildah-1.16.2-1 autobuilt v1.16.2 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 42fc654..a548dd1 100644 --- a/.gitignore +++ b/.gitignore @@ -486,3 +486,4 @@ /buildah-2c46b4b.tar.gz /buildah-295b825.tar.gz /v1.16.1.tar.gz +/v1.16.2.tar.gz diff --git a/buildah.spec b/buildah.spec index 718a4c4..9cbed17 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,13 +27,13 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.16.1 +%define built_tag v1.16.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.16.1 -Release: 3%{?dist} +Version: 1.16.2 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Tue Sep 22 2020 RH Container Bot - 1.16.2-1 +- autobuilt v1.16.2 + * Mon Sep 21 2020 Lokesh Mandvekar - 1.16.1-3 - bump release to not lag f32 diff --git a/sources b/sources index 0ec7dd5..7dcf027 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.16.1.tar.gz) = c17358d71e9102ef5da530df54648eaa13a1384b06cd43fe74094cdbaa2dfda6aa6d1a218fb88e12898ae4b9dca2d8c555643326779c5f09b6a118f0a440d17a +SHA512 (v1.16.2.tar.gz) = a0ce322d1a1bf9faf12f698403b327ea3c8538e200662f837a38609215cc61a8caf51e1c2845e78c8f377c1461c0aa786d0a882e649c9ac8718e697350b418eb From 5bb313a96d4c36ba1adb8f7728c5f42d33b90100 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 2 Oct 2020 12:32:38 +0000 Subject: [PATCH 15/56] buildah-1.16.4-1 autobuilt v1.16.4 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a548dd1..2997057 100644 --- a/.gitignore +++ b/.gitignore @@ -487,3 +487,4 @@ /buildah-295b825.tar.gz /v1.16.1.tar.gz /v1.16.2.tar.gz +/v1.16.4.tar.gz diff --git a/buildah.spec b/buildah.spec index 9cbed17..f35f6fe 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.16.2 +%define built_tag v1.16.4 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.16.2 +Version: 1.16.4 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Oct 2 2020 RH Container Bot - 1.16.4-1 +- autobuilt v1.16.4 + * Tue Sep 22 2020 RH Container Bot - 1.16.2-1 - autobuilt v1.16.2 diff --git a/sources b/sources index 7dcf027..44c984d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.16.2.tar.gz) = a0ce322d1a1bf9faf12f698403b327ea3c8538e200662f837a38609215cc61a8caf51e1c2845e78c8f377c1461c0aa786d0a882e649c9ac8718e697350b418eb +SHA512 (v1.16.4.tar.gz) = cda3fc433403ccd1f9803f19b2efc570c13bfe2a5c0c31abe17552ce3d38a3388fd680de0125e83c375ad342ed5d39616f688e22d6472e58d4ee7c88c6bd7a03 From 9aaecd8127d8d7700e81e95bb47d934f55e7c936 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 22 Oct 2020 14:33:16 +0000 Subject: [PATCH 16/56] buildah-1.16.5-1 autobuilt v1.16.5 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2997057..49622c9 100644 --- a/.gitignore +++ b/.gitignore @@ -488,3 +488,4 @@ /v1.16.1.tar.gz /v1.16.2.tar.gz /v1.16.4.tar.gz +/v1.16.5.tar.gz diff --git a/buildah.spec b/buildah.spec index f35f6fe..25c8b5a 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.16.4 +%define built_tag v1.16.5 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.16.4 +Version: 1.16.5 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Oct 22 2020 RH Container Bot - 1.16.5-1 +- autobuilt v1.16.5 + * Fri Oct 2 2020 RH Container Bot - 1.16.4-1 - autobuilt v1.16.4 diff --git a/sources b/sources index 44c984d..8b05f7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.16.4.tar.gz) = cda3fc433403ccd1f9803f19b2efc570c13bfe2a5c0c31abe17552ce3d38a3388fd680de0125e83c375ad342ed5d39616f688e22d6472e58d4ee7c88c6bd7a03 +SHA512 (v1.16.5.tar.gz) = 3d4a21360375ce21d1d53d33d47179f5c6b3f0ba8ec9050258cd2fd9a82cd67132c548d3850beda9130cfb09afaca63a4dadce215ff3883ebf8796709e30ae9f From 0897665d41390c27367434402480d0b21411c8f9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 2 Nov 2020 09:51:25 -0500 Subject: [PATCH 17/56] Build 1.17.0 --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 49622c9..04afb37 100644 --- a/.gitignore +++ b/.gitignore @@ -489,3 +489,4 @@ /v1.16.2.tar.gz /v1.16.4.tar.gz /v1.16.5.tar.gz +/v1.17.0.tar.gz diff --git a/buildah.spec b/buildah.spec index 25c8b5a..8cbbb1c 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.16.5 +%define built_tag v1.17.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.16.5 +Version: 1.17.0 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Nov 2 2020 Dan Walsh - 1.17.0-1 +- Build 1.17.0 + * Thu Oct 22 2020 RH Container Bot - 1.16.5-1 - autobuilt v1.16.5 diff --git a/sources b/sources index 8b05f7f..14b3401 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.16.5.tar.gz) = 3d4a21360375ce21d1d53d33d47179f5c6b3f0ba8ec9050258cd2fd9a82cd67132c548d3850beda9130cfb09afaca63a4dadce215ff3883ebf8796709e30ae9f +SHA512 (v1.17.0.tar.gz) = 29116313795f19577fe8c39430ca8960060614172c2544dc42759570386adfedc1d040d226c08ce3267efb8ab4228d5b748c031552da9ca8eb3ebe49f7488868 From e5f7e24922220898022cedc017d0d43d267ee66f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 9 Nov 2020 10:50:59 -0500 Subject: [PATCH 18/56] buildah-1.17.0-2 - rebuild Signed-off-by: Lokesh Mandvekar --- buildah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 8cbbb1c..b100f19 100644 --- a/buildah.spec +++ b/buildah.spec @@ -33,7 +33,7 @@ Name: %{repo} Version: 1.17.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 @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Nov 9 10:50:51 EST 2020 Lokesh Mandvekar - 1.17.0-2 +- rebuild + * Mon Nov 2 2020 Dan Walsh - 1.17.0-1 - Build 1.17.0 From 11a34c65d69cb86e2a9773250e73d633efdc1d34 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 16 Nov 2020 17:32:48 +0000 Subject: [PATCH 19/56] buildah-1.18.0-1 autobuilt v1.18.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 04afb37..d92f487 100644 --- a/.gitignore +++ b/.gitignore @@ -490,3 +490,4 @@ /v1.16.4.tar.gz /v1.16.5.tar.gz /v1.17.0.tar.gz +/v1.18.0.tar.gz diff --git a/buildah.spec b/buildah.spec index b100f19..99d8bde 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,13 +27,13 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.17.0 +%define built_tag v1.18.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.17.0 -Release: 2%{?dist} +Version: 1.18.0 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Nov 16 2020 RH Container Bot - 1.18.0-1 +- autobuilt v1.18.0 + * Mon Nov 9 10:50:51 EST 2020 Lokesh Mandvekar - 1.17.0-2 - rebuild diff --git a/sources b/sources index 14b3401..b6553bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.17.0.tar.gz) = 29116313795f19577fe8c39430ca8960060614172c2544dc42759570386adfedc1d040d226c08ce3267efb8ab4228d5b748c031552da9ca8eb3ebe49f7488868 +SHA512 (v1.18.0.tar.gz) = e8d7bebc61ff724d08a26e6a9ccab572ce9a275ca94ffb50fc6bff4eb97b5840e6a196655a2a0f41b4088382949c84f13a923c1a19367a4746911e026f8f4bac From 880f651fd9903fa13f5f4199d17f292cde50a9e1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 20 Nov 2020 08:54:25 -0500 Subject: [PATCH 20/56] Suggests: cpp for fedora Signed-off-by: Lokesh Mandvekar (cherry picked from commit 2371f5e5228933691dd07958c2b5463b3191afa8) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/buildah.spec b/buildah.spec index 99d8bde..701772f 100644 --- a/buildah.spec +++ b/buildah.spec @@ -63,6 +63,7 @@ Requires: libseccomp >= 2.4.1-0 Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs +Suggests: cpp %else BuildRequires: libseccomp-devel Requires: runc From b138b8fa8d9361241db413716f9c0efb41eb55b5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 14:58:58 -0500 Subject: [PATCH 21/56] Harden cgo based golang binaries Reported-by: Wade Mealing Signed-off-by: Lokesh Mandvekar --- buildah.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/buildah.spec b/buildah.spec index 701772f..b5b5cbb 100644 --- a/buildah.spec +++ b/buildah.spec @@ -112,6 +112,16 @@ popd mv vendor src +export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +%ifarch x86_64 +export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic" +%if 0%{?fedora} || 0%{?centos} >= 8 +export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection" +%endif +%endif +# These extra flags present in %%{optflags} have been skipped for now as they break the build +#export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" + export GOPATH=$(pwd)/_build:$(pwd) export BUILDTAGS='seccomp selinux' %if 0%{?centos} >= 8 From 51e1853c7e1942e26543e2d80d1b54fc54b4c46b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 15:02:19 -0500 Subject: [PATCH 22/56] buildah-1.18.0-2 - harden cgo based golang binaries Reported-by: Wade Mealing Signed-off-by: Lokesh Mandvekar --- buildah.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index b5b5cbb..9051c23 100644 --- a/buildah.spec +++ b/buildah.spec @@ -33,7 +33,7 @@ Name: %{repo} 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 @@ -158,6 +158,10 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Dec 7 2020 Lokesh Mandvekar - 1.18.0-2 +- harden cgo based golang binaries +- Reported-by: Wade Mealing + * Mon Nov 16 2020 RH Container Bot - 1.18.0-1 - autobuilt v1.18.0 From 59540c583f9dea234ed009a35c4c8ad571e58165 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 15:35:02 -0500 Subject: [PATCH 23/56] buildah-1.18.0-3 - bump release tag for centos OBS Signed-off-by: Lokesh Mandvekar (cherry picked from commit b3d360c029029def6d915b6323e7996cdc4ca58e) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index 9051c23..243d8e1 100644 --- a/buildah.spec +++ b/buildah.spec @@ -33,7 +33,7 @@ Name: %{repo} Version: 1.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -158,8 +158,11 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog -* Mon Dec 7 2020 Lokesh Mandvekar - 1.18.0-2 -- harden cgo based golang binaries +* Mon Dec 7 2020 Lokesh Mandvekar - 1.18.0-3 +- bump release tag for centos OBS + +* Mon Dec 07 2020 Lokesh Mandvekar - 1.18.0-2 +- harden cgo based go binaries - Reported-by: Wade Mealing * Mon Nov 16 2020 RH Container Bot - 1.18.0-1 From 16b6fb1680c71343dde5dbf30307525ff84236de Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 9 Jan 2021 17:03:16 +0000 Subject: [PATCH 24/56] buildah-1.19.0-1 autobuilt v1.19.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d92f487..10d5d9c 100644 --- a/.gitignore +++ b/.gitignore @@ -491,3 +491,4 @@ /v1.16.5.tar.gz /v1.17.0.tar.gz /v1.18.0.tar.gz +/v1.19.0.tar.gz diff --git a/buildah.spec b/buildah.spec index 243d8e1..9e29497 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,13 +27,13 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.18.0 +%define built_tag v1.19.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.18.0 -Release: 3%{?dist} +Version: 1.19.0 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -158,6 +158,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Sat Jan 9 2021 RH Container Bot - 1.19.0-1 +- autobuilt v1.19.0 + * Mon Dec 7 2020 Lokesh Mandvekar - 1.18.0-3 - bump release tag for centos OBS diff --git a/sources b/sources index b6553bc..995938e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.18.0.tar.gz) = e8d7bebc61ff724d08a26e6a9ccab572ce9a275ca94ffb50fc6bff4eb97b5840e6a196655a2a0f41b4088382949c84f13a923c1a19367a4746911e026f8f4bac +SHA512 (v1.19.0.tar.gz) = ebf2bbb04b14a1c80d283cb1278def214a154a79b31f43e545ff8ce050d204631a330766e314f9f4467307d7ad1fe1ad028957d941f456550fe1f7d53030c102 From edadb64543b070b5965e1e65dd74b646ca119fc2 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Sat, 9 Jan 2021 14:15:28 -0700 Subject: [PATCH 25/56] buildah gating tests: pull registry from quay ...not from docker.io Signed-off-by: Ed Santiago --- tests/test_buildah.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh index 13ac761..aade91c 100755 --- a/tests/test_buildah.sh +++ b/tests/test_buildah.sh @@ -19,7 +19,7 @@ export IMGTYPE_BINARY=/usr/bin/buildah-imgtype # Start a registry pre_bats_setup() { - REGISTRY_FQIN=docker.io/library/registry:2 + REGISTRY_FQIN=quay.io/libpod/registry:2 AUTHDIR=/tmp/buildah-tests-auth.$$ mkdir -p $AUTHDIR From c69be10993460833506dc582f6da7cc1126b8748 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 14 Jan 2021 22:34:24 +0000 Subject: [PATCH 26/56] buildah-1.19.1-1 autobuilt v1.19.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 10d5d9c..e911f87 100644 --- a/.gitignore +++ b/.gitignore @@ -492,3 +492,4 @@ /v1.17.0.tar.gz /v1.18.0.tar.gz /v1.19.0.tar.gz +/v1.19.1.tar.gz diff --git a/buildah.spec b/buildah.spec index 9e29497..e900a69 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.19.0 +%define built_tag v1.19.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.19.0 +Version: 1.19.1 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -158,6 +158,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Jan 14 2021 RH Container Bot - 1.19.1-1 +- autobuilt v1.19.1 + * Sat Jan 9 2021 RH Container Bot - 1.19.0-1 - autobuilt v1.19.0 diff --git a/sources b/sources index 995938e..cae3fb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.19.0.tar.gz) = ebf2bbb04b14a1c80d283cb1278def214a154a79b31f43e545ff8ce050d204631a330766e314f9f4467307d7ad1fe1ad028957d941f456550fe1f7d53030c102 +SHA512 (v1.19.1.tar.gz) = 09a103b2a8ac544af9914b286bcaccc8dafc0d9a94cfe91c3429fbfc6cdd76215e82779c9763233bc9c617aafe2f3df1ca8abbf5f4204bc3f19d49084ff1b55c From 5a19ffc5f50080aeeba10d7e8fc243b50e8c3834 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 15 Jan 2021 11:03:40 +0000 Subject: [PATCH 27/56] buildah-1.19.2-1 autobuilt v1.19.2 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e911f87..7f2230c 100644 --- a/.gitignore +++ b/.gitignore @@ -493,3 +493,4 @@ /v1.18.0.tar.gz /v1.19.0.tar.gz /v1.19.1.tar.gz +/v1.19.2.tar.gz diff --git a/buildah.spec b/buildah.spec index e900a69..7e783c7 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.19.1 +%define built_tag v1.19.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.19.1 +Version: 1.19.2 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -158,6 +158,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Jan 15 2021 RH Container Bot - 1.19.2-1 +- autobuilt v1.19.2 + * Thu Jan 14 2021 RH Container Bot - 1.19.1-1 - autobuilt v1.19.1 diff --git a/sources b/sources index cae3fb3..f611490 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.19.1.tar.gz) = 09a103b2a8ac544af9914b286bcaccc8dafc0d9a94cfe91c3429fbfc6cdd76215e82779c9763233bc9c617aafe2f3df1ca8abbf5f4204bc3f19d49084ff1b55c +SHA512 (v1.19.2.tar.gz) = edb436ee11795df6cf6b78c2423a23c949dbbe38e8d4bd9b3fdce24a0818b7ad50843df47eb912e4a5194f8f1173fd4c67719f8b524d1fb1b01db852bd6b90fb From d1ab96680f1ff27e4ec8c81d5b896e0ff89f1289 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 29 Jan 2021 16:33:41 +0000 Subject: [PATCH 28/56] buildah-1.19.3-1 autobuilt v1.19.3 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7f2230c..5ed66ef 100644 --- a/.gitignore +++ b/.gitignore @@ -494,3 +494,4 @@ /v1.19.0.tar.gz /v1.19.1.tar.gz /v1.19.2.tar.gz +/v1.19.3.tar.gz diff --git a/buildah.spec b/buildah.spec index 7e783c7..380a080 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.19.2 +%define built_tag v1.19.3 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.19.2 +Version: 1.19.3 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -158,6 +158,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Jan 29 2021 RH Container Bot - 1.19.3-1 +- autobuilt v1.19.3 + * Fri Jan 15 2021 RH Container Bot - 1.19.2-1 - autobuilt v1.19.2 diff --git a/sources b/sources index f611490..9600be6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.19.2.tar.gz) = edb436ee11795df6cf6b78c2423a23c949dbbe38e8d4bd9b3fdce24a0818b7ad50843df47eb912e4a5194f8f1173fd4c67719f8b524d1fb1b01db852bd6b90fb +SHA512 (v1.19.3.tar.gz) = c168a255fdf0dea02c1fb255ecc948a649aae1ddffcfb09ace5d93e886572b69c91735f3ba8c6ccbdbe3ef34a4e2f7f32caedf98146bf91a63ec6da9d2ca4033 From d013e460d0813e0dab3eddf94663d07bde9fa01e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 9 Feb 2021 09:06:09 -0500 Subject: [PATCH 29/56] buildah-1.19.4-1 - Resolves: #1919391, #1926796 - Security fix for CVE-2021-20206 - bump to v1.19.4 - adjust dependencies Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ buildah.spec | 18 ++++++++++++------ sources | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5ed66ef..b2825e5 100644 --- a/.gitignore +++ b/.gitignore @@ -495,3 +495,5 @@ /v1.19.1.tar.gz /v1.19.2.tar.gz /v1.19.3.tar.gz +/buildah-6002877.tar.gz +/v1.19.4.tar.gz diff --git a/buildah.spec b/buildah.spec index 380a080..6733a14 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.19.3 +%define built_tag v1.19.4 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.19.3 +Version: 1.19.4 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -48,9 +48,12 @@ BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: make Requires: containers-common -# No ostree for centos 7 %if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?eln} BuildRequires: ostree-devel +Requires: oci-runtime >= 2 +Recommends: crun >= 0.17-3 +%else +Requires: runc %endif # No btrfs for centos 8 %if 0%{?fedora} || 0%{?centos} <= 7 @@ -58,15 +61,13 @@ BuildRequires: btrfs-progs-devel %endif %if 0%{?fedora} || 0%{?eln} BuildRequires: libseccomp-static -Requires: crun >= 0.10-1 Requires: libseccomp >= 2.4.1-0 Recommends: container-selinux -Recommends: slirp4netns >= 0.3-0 +Recommends: slirp4netns >= 1.1.8-1 Recommends: fuse-overlayfs Suggests: cpp %else BuildRequires: libseccomp-devel -Requires: runc Requires: libseccomp Requires: container-selinux Requires: slirp4netns >= 0.3-0 @@ -158,6 +159,11 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Tue Feb 09 2021 Lokesh Mandvekar - 1.19.4-1 +- Resolves: #1919391, #1926796 - Security fix for CVE-2021-20206 +- bump to v1.19.4 +- adjust dependencies + * Fri Jan 29 2021 RH Container Bot - 1.19.3-1 - autobuilt v1.19.3 diff --git a/sources b/sources index 9600be6..bfe45e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.19.3.tar.gz) = c168a255fdf0dea02c1fb255ecc948a649aae1ddffcfb09ace5d93e886572b69c91735f3ba8c6ccbdbe3ef34a4e2f7f32caedf98146bf91a63ec6da9d2ca4033 +SHA512 (v1.19.4.tar.gz) = 688c96a5f5b4ba821410b6343f879a7d6aaa41ee60821f2ae5b58924c02bf75182d958e6a45995a3fcb61a55b9a7d76b87a9ce40a9461102e0fc9408595a22c2 From 530fdafac439130226393588c6748ea04d37ed24 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 11 Feb 2021 14:48:42 -0500 Subject: [PATCH 30/56] buildah-1.19.4-2 - bump for centos Signed-off-by: Lokesh Mandvekar --- buildah.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index 6733a14..4be3aa8 100644 --- a/buildah.spec +++ b/buildah.spec @@ -33,7 +33,7 @@ Name: %{repo} Version: 1.19.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -159,6 +159,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Feb 11 2021 Lokesh Mandvekar - 1.19.4-2 +- bump for centos + * Tue Feb 09 2021 Lokesh Mandvekar - 1.19.4-1 - Resolves: #1919391, #1926796 - Security fix for CVE-2021-20206 - bump to v1.19.4 @@ -186,7 +189,7 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype * Mon Nov 16 2020 RH Container Bot - 1.18.0-1 - autobuilt v1.18.0 -* Mon Nov 9 10:50:51 EST 2020 Lokesh Mandvekar - 1.17.0-2 +* Mon Nov 9 2020 Lokesh Mandvekar - 1.17.0-2 - rebuild * Mon Nov 2 2020 Dan Walsh - 1.17.0-1 From d9a0463d07102c14942f02bcb8c974b49794615c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 11 Feb 2021 19:38:47 -0500 Subject: [PATCH 31/56] enforce min containers-common dep Signed-off-by: Lokesh Mandvekar --- buildah.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 4be3aa8..855f234 100644 --- a/buildah.spec +++ b/buildah.spec @@ -47,7 +47,7 @@ BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: make -Requires: containers-common +Requires: containers-common >= 4:1-4 %if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?eln} BuildRequires: ostree-devel Requires: oci-runtime >= 2 From f7dec03d24075e8fc9dd55957dd196536cbd1509 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 12 Feb 2021 15:48:11 -0500 Subject: [PATCH 32/56] buildah-1.19.4-3 - adjust buildtags for centos Signed-off-by: Lokesh Mandvekar --- buildah.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index 855f234..9ed97f7 100644 --- a/buildah.spec +++ b/buildah.spec @@ -13,7 +13,7 @@ %global debug_package %{nil} %endif -%if ! 0%{?gobuild:1} +%if ! 0%{?gobuild:1} || 0%{?centos} %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 %{?**}; %endif @@ -33,7 +33,7 @@ Name: %{repo} Version: 1.19.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -159,6 +159,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Feb 12 2021 Lokesh Mandvekar - 1.19.4-3 +- adjust buildtags for centos + * Thu Feb 11 2021 Lokesh Mandvekar - 1.19.4-2 - bump for centos From bf3ab884705155c8a0b4f920d57c6916f60d0855 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 19 Feb 2021 11:17:39 -0500 Subject: [PATCH 33/56] Fix gating test and bum to 1.19.6 --- buildah.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index 9ed97f7..6d4f237 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,13 +27,13 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.19.4 +%define built_tag v1.19.6 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.19.4 -Release: 3%{?dist} +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 @@ -159,6 +159,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Feb 19 2021 Dan Walsh - 1.19.6-1 +- Fix gating test and bum to 1.19.6 + * Fri Feb 12 2021 Lokesh Mandvekar - 1.19.4-3 - adjust buildtags for centos From 3dcbb968851c0fc37270c55172e2b8291ad5e48d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 19 Feb 2021 12:11:02 -0500 Subject: [PATCH 34/56] upload src tarball to lookaside cache Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b2825e5..9accc93 100644 --- a/.gitignore +++ b/.gitignore @@ -497,3 +497,4 @@ /v1.19.3.tar.gz /buildah-6002877.tar.gz /v1.19.4.tar.gz +/v1.19.6.tar.gz diff --git a/sources b/sources index bfe45e2..88ddac1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.19.4.tar.gz) = 688c96a5f5b4ba821410b6343f879a7d6aaa41ee60821f2ae5b58924c02bf75182d958e6a45995a3fcb61a55b9a7d76b87a9ce40a9461102e0fc9408595a22c2 +SHA512 (v1.19.6.tar.gz) = 81a865b795588b86a61fdada40045c06f9f3bbf8bdc3f6e4c70a9e4c7b28bf3fc31dd080c9f7555a8924f8bffac10fad776275619053fee8039176d6d6b69571 From ec1468e1fba4dd6b0cc70f9def9090f36fb73fa1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 22 Feb 2021 13:47:52 -0500 Subject: [PATCH 35/56] buildah-1.19.6-2 - bump timeout for buildah gating tests - Suggested by Ed Santiago Signed-off-by: Lokesh Mandvekar --- buildah.spec | 6 +++++- tests/test_buildah.yml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index 6d4f237..71fbad3 100644 --- a/buildah.spec +++ b/buildah.spec @@ -33,7 +33,7 @@ Name: %{repo} Version: 1.19.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -159,6 +159,10 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Feb 22 2021 Lokesh Mandvekar - 1.19.6-2 +- bump timeout for buildah gating tests +- Suggested by Ed Santiago + * Fri Feb 19 2021 Dan Walsh - 1.19.6-1 - Fix gating test and bum to 1.19.6 diff --git a/tests/test_buildah.yml b/tests/test_buildah.yml index 4820a9f..c8d7f76 100644 --- a/tests/test_buildah.yml +++ b/tests/test_buildah.yml @@ -14,4 +14,4 @@ - root-test: dir: ./ run: ./test_buildah.sh - timeout: 60m + timeout: 90m From e024132e0729342b954fe77c8ea9b3f99b071c5d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 25 Feb 2021 09:58:33 -0500 Subject: [PATCH 36/56] buildah-1.19.6-3 - bump for centos Signed-off-by: Lokesh Mandvekar --- buildah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 71fbad3..01f9ab6 100644 --- a/buildah.spec +++ b/buildah.spec @@ -33,7 +33,7 @@ Name: %{repo} Version: 1.19.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -159,6 +159,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Feb 25 2021 Lokesh Mandvekar - 1.19.6-3 +- bump for centos + * Mon Feb 22 2021 Lokesh Mandvekar - 1.19.6-2 - bump timeout for buildah gating tests - Suggested by Ed Santiago From cc9315cf6625cb1a88f07b4b7b5898e5b935fa65 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 18 Mar 2021 12:15:46 +0000 Subject: [PATCH 37/56] buildah-1.19.8-1 autobuilt v1.19.8 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9accc93..4aad9dd 100644 --- a/.gitignore +++ b/.gitignore @@ -498,3 +498,4 @@ /buildah-6002877.tar.gz /v1.19.4.tar.gz /v1.19.6.tar.gz +/v1.19.8.tar.gz diff --git a/buildah.spec b/buildah.spec index 01f9ab6..26e4b54 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,13 +27,13 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.19.6 +%define built_tag v1.19.8 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.19.6 -Release: 3%{?dist} +Version: 1.19.8 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -159,6 +159,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Mar 18 2021 RH Container Bot - 1.19.8-1 +- autobuilt v1.19.8 + * Thu Feb 25 2021 Lokesh Mandvekar - 1.19.6-3 - bump for centos diff --git a/sources b/sources index 88ddac1..b74f44a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.19.6.tar.gz) = 81a865b795588b86a61fdada40045c06f9f3bbf8bdc3f6e4c70a9e4c7b28bf3fc31dd080c9f7555a8924f8bffac10fad776275619053fee8039176d6d6b69571 +SHA512 (v1.19.8.tar.gz) = 4f64e18ca4ea0fbb13ac45fc5c969c6fb9a0fc214e834dff4d9fb4d5e435d3fb3b1b8a7a031fcb1e5100352f782d3310e5f0be3a60b9596bb51d01e41d8ef81c From ed62570186a5e0275a2adc01034acdddfb30cdab Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 29 Mar 2021 08:32:55 -0400 Subject: [PATCH 38/56] buildah-1.20.0-1 - bump to v1.20.0 Signed-off-by: Lokesh Mandvekar --- buildah.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/buildah.spec b/buildah.spec index 26e4b54..b112113 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.19.8 +%define built_tag v1.20.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%define download_url https://%{import_path}/archive/%{built_tag}.tar.gz +%define download_url %{git0}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.19.8 +Version: 1.20.0 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -159,6 +159,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Mar 29 2021 Lokesh Mandvekar - 1.20.0-1 +- bump to v1.20.0 + * Thu Mar 18 2021 RH Container Bot - 1.19.8-1 - autobuilt v1.19.8 diff --git a/sources b/sources index b74f44a..3a08525 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.19.8.tar.gz) = 4f64e18ca4ea0fbb13ac45fc5c969c6fb9a0fc214e834dff4d9fb4d5e435d3fb3b1b8a7a031fcb1e5100352f782d3310e5f0be3a60b9596bb51d01e41d8ef81c +SHA512 (v1.20.0.tar.gz) = 6490fd44d6595afb486d2433258d5e17d8694d25118b6fb7ac38e8c63f9da84ce71dd56fe1c908ee1667647462260a236f3bf8b3558f1564af3cf18a3485d5e0 From 7fb94727f826a689fd16678ae08a852425f68b5d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 14 Apr 2021 13:49:51 +0000 Subject: [PATCH 39/56] buildah-1.20.1-1 autobuilt v1.20.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4aad9dd..2abf226 100644 --- a/.gitignore +++ b/.gitignore @@ -499,3 +499,4 @@ /v1.19.4.tar.gz /v1.19.6.tar.gz /v1.19.8.tar.gz +/v1.20.1.tar.gz diff --git a/buildah.spec b/buildah.spec index b112113..56ec4b8 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.20.0 +%define built_tag v1.20.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.20.0 +Version: 1.20.1 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -159,6 +159,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Wed Apr 14 2021 RH Container Bot - 1.20.1-1 +- autobuilt v1.20.1 + * Mon Mar 29 2021 Lokesh Mandvekar - 1.20.0-1 - bump to v1.20.0 diff --git a/sources b/sources index 3a08525..1c7a5c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.20.0.tar.gz) = 6490fd44d6595afb486d2433258d5e17d8694d25118b6fb7ac38e8c63f9da84ce71dd56fe1c908ee1667647462260a236f3bf8b3558f1564af3cf18a3485d5e0 +SHA512 (v1.20.1.tar.gz) = 22495d9f0da1d6061ddb41e4cecfdb2108c152262798d6c959fc524870160f15ee486bcc37e262e571c64dc732e852f05e6c4b9331bbdef4150bd56997fefa83 From 61b06adcc4197db513c2aa10bd6e9e62eada2108 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 15 Apr 2021 14:59:20 -0600 Subject: [PATCH 40/56] buildah-tests: require nmap-ncat Signed-off-by: Ed Santiago --- buildah.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/buildah.spec b/buildah.spec index 56ec4b8..8310698 100644 --- a/buildah.spec +++ b/buildah.spec @@ -93,6 +93,7 @@ Requires: golang Requires: jq Requires: httpd-tools Requires: openssl +Requires: nmap-ncat %description tests %{summary} From dadf2b097a170995569640da5ccc96a9be69d84d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Apr 2021 13:51:15 -0400 Subject: [PATCH 41/56] buildah-1.20.1-2 - rebuild for buildah-tests Signed-off-by: Lokesh Mandvekar (cherry picked from commit 27a4cb66969b6789ba4a59774f0d1e57b8a711fc) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 8310698..ddb7a0b 100644 --- a/buildah.spec +++ b/buildah.spec @@ -33,7 +33,7 @@ Name: %{repo} Version: 1.20.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -160,6 +160,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Apr 16 2021 Lokesh Mandvekar - 1.20.1-2 +- rebuild for buildah-tests + * Wed Apr 14 2021 RH Container Bot - 1.20.1-1 - autobuilt v1.20.1 From f9b0fd04e4cc1431077992678577c899c3224325 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 19 Apr 2021 13:09:38 -0400 Subject: [PATCH 42/56] buildah-1.20.1-3 - update containers-common dependency - container-selinux, oci-runtime, slirp4netns and fuse-overlayfs handled in containers-common Signed-off-by: Lokesh Mandvekar --- buildah.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/buildah.spec b/buildah.spec index ddb7a0b..126217a 100644 --- a/buildah.spec +++ b/buildah.spec @@ -33,7 +33,7 @@ Name: %{repo} Version: 1.20.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -47,11 +47,9 @@ BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: make -Requires: containers-common >= 4:1-4 %if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?eln} BuildRequires: ostree-devel -Requires: oci-runtime >= 2 -Recommends: crun >= 0.17-3 +Requires: containers-common >= 4:1-11 %else Requires: runc %endif @@ -62,9 +60,6 @@ BuildRequires: btrfs-progs-devel %if 0%{?fedora} || 0%{?eln} BuildRequires: libseccomp-static Requires: libseccomp >= 2.4.1-0 -Recommends: container-selinux -Recommends: slirp4netns >= 1.1.8-1 -Recommends: fuse-overlayfs Suggests: cpp %else BuildRequires: libseccomp-devel @@ -160,6 +155,11 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Apr 19 2021 Lokesh Mandvekar - 1.20.1-3 +- update containers-common dependency +- container-selinux, oci-runtime, slirp4netns and fuse-overlayfs handled in +containers-common + * Fri Apr 16 2021 Lokesh Mandvekar - 1.20.1-2 - rebuild for buildah-tests From 4cca11f65c0a3fe2e90794b711a1b05d47b37dac Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 22 Apr 2021 08:40:23 -0400 Subject: [PATCH 43/56] buildah-1.20.1-4 - fix gating tests Signed-off-by: Lokesh Mandvekar (cherry picked from commit 78000a1c0dde037c07b493c343529d7614542d15) Signed-off-by: Lokesh Mandvekar --- buildah-gating.patch | 82 ++++++++++++++++++++++++++++++++++++++++++++ buildah.spec | 10 ++++-- 2 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 buildah-gating.patch diff --git a/buildah-gating.patch b/buildah-gating.patch new file mode 100644 index 0000000..51bf393 --- /dev/null +++ b/buildah-gating.patch @@ -0,0 +1,82 @@ +From 4a74ca7d2ba9eac48156a78740f4d5d598dc80d8 Mon Sep 17 00:00:00 2001 +From: Ed Santiago +Date: Tue, 20 Apr 2021 15:55:25 -0600 +Subject: [PATCH] push to docker test: don't get fooled by podman + +Gating tests have failed (at least) twice already because +one of the push.bats tests runs "which docker" and skips +if it's missing. Sadly, some gating-test systems install +podman-docker (possibly when there's a bodhi that combines +podman and buildah). This causes the test to fail. + +Solution: confirm that if docker exists, it isn't podman +in disguise. Since we need to do a similar check in +the pull-from-docker-daemon test in pull.bats, refactor +that into a common skip_if_no_docker helper. + +Signed-off-by: Ed Santiago +--- + tests/helpers.bash | 14 ++++++++++++++ + tests/pull.bats | 9 +-------- + tests/push.bats | 5 +---- + 3 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/tests/helpers.bash b/tests/helpers.bash +index 5e90e7f6eb..4dc3a7dbda 100644 +--- a/tests/helpers.bash ++++ b/tests/helpers.bash +@@ -358,3 +358,17 @@ function skip_if_in_container() { + skip "This test is not working inside a container" + fi + } ++ ++####################### ++# skip_if_no_docker # ++####################### ++function skip_if_no_docker() { ++ which docker || skip "docker is not installed" ++ systemctl -q is-active docker || skip "docker.service is not active" ++ ++ # Confirm that this is really truly docker, not podman. ++ docker_version=$(docker --version) ++ if [[ $docker_version =~ podman ]]; then ++ skip "this test needs actual docker, not podman-docker" ++ fi ++} +diff --git a/tests/pull.bats b/tests/pull.bats +index edf447423c..aae38631c8 100644 +--- a/tests/pull.bats ++++ b/tests/pull.bats +@@ -92,15 +92,8 @@ load helpers + } + + @test "pull-from-docker-daemon" { +- run systemctl status docker +- if [[ ! "$output" =~ "active (running)" ]] +- then +- skip "Skip the test as docker services is not running" +- fi ++ skip_if_no_docker + +- run systemctl start docker +- echo "$output" +- [ "$status" -eq 0 ] + run docker pull alpine + echo "$output" + [ "$status" -eq 0 ] +diff --git a/tests/push.bats b/tests/push.bats +index 91ec4eb145..37966ea228 100644 +--- a/tests/push.bats ++++ b/tests/push.bats +@@ -140,10 +140,7 @@ load helpers + } + + @test "buildah push image to docker and docker registry" { +- run which docker +- if [[ $status -ne 0 ]]; then +- skip "docker is not installed" +- fi ++ skip_if_no_docker + + _prefetch busybox + run_buildah push --signature-policy ${TESTSDIR}/policy.json busybox docker-daemon:buildah/busybox:latest diff --git a/buildah.spec b/buildah.spec index 126217a..38cee38 100644 --- a/buildah.spec +++ b/buildah.spec @@ -33,11 +33,12 @@ Name: %{repo} Version: 1.20.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io -Source: %{download_url} +Source0: %{download_url} +Patch0: buildah-gating.patch BuildRequires: device-mapper-devel BuildRequires: golang BuildRequires: git @@ -49,7 +50,7 @@ BuildRequires: libassuan-devel BuildRequires: make %if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?eln} BuildRequires: ostree-devel -Requires: containers-common >= 4:1-11 +Requires: containers-common >= 4:1-15 %else Requires: runc %endif @@ -155,6 +156,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Apr 22 2021 Lokesh Mandvekar - 1.20.1-4 +- fix gating tests + * Mon Apr 19 2021 Lokesh Mandvekar - 1.20.1-3 - update containers-common dependency - container-selinux, oci-runtime, slirp4netns and fuse-overlayfs handled in From 46b3da22d826d72373431f0ea3395f669d783e65 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 21 May 2021 01:56:14 +0000 Subject: [PATCH 44/56] buildah-1.21.0-1 autobuilt v1.21.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2abf226..f0792fd 100644 --- a/.gitignore +++ b/.gitignore @@ -500,3 +500,4 @@ /v1.19.6.tar.gz /v1.19.8.tar.gz /v1.20.1.tar.gz +/v1.21.0.tar.gz diff --git a/buildah.spec b/buildah.spec index 38cee38..789d560 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,13 +27,13 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.20.1 +%define built_tag v1.21.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.20.1 -Release: 4%{?dist} +Version: 1.21.0 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -156,6 +156,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri May 21 2021 RH Container Bot - 1.21.0-1 +- autobuilt v1.21.0 + * Thu Apr 22 2021 Lokesh Mandvekar - 1.20.1-4 - fix gating tests diff --git a/sources b/sources index 1c7a5c9..4d0fd22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.20.1.tar.gz) = 22495d9f0da1d6061ddb41e4cecfdb2108c152262798d6c959fc524870160f15ee486bcc37e262e571c64dc732e852f05e6c4b9331bbdef4150bd56997fefa83 +SHA512 (v1.21.0.tar.gz) = 2ce6afceadec37f54f7f80562969cc382267dabc4fa5a89a09a211326e403376d209d89162333337af8602cb5c551eb446d3c9fac26f516fb8d354a7b5b77472 From afc3f704fc1c39ecb789df3c1205def5c7ae1b27 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 21 May 2021 09:21:56 -0400 Subject: [PATCH 45/56] remove patch merged upstream Signed-off-by: Lokesh Mandvekar (cherry picked from commit d78823b26c38eec67fa8e47ce85d528c9ffc2e25) Signed-off-by: Lokesh Mandvekar --- buildah-gating.patch | 82 -------------------------------------------- buildah.spec | 1 - 2 files changed, 83 deletions(-) delete mode 100644 buildah-gating.patch diff --git a/buildah-gating.patch b/buildah-gating.patch deleted file mode 100644 index 51bf393..0000000 --- a/buildah-gating.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 4a74ca7d2ba9eac48156a78740f4d5d598dc80d8 Mon Sep 17 00:00:00 2001 -From: Ed Santiago -Date: Tue, 20 Apr 2021 15:55:25 -0600 -Subject: [PATCH] push to docker test: don't get fooled by podman - -Gating tests have failed (at least) twice already because -one of the push.bats tests runs "which docker" and skips -if it's missing. Sadly, some gating-test systems install -podman-docker (possibly when there's a bodhi that combines -podman and buildah). This causes the test to fail. - -Solution: confirm that if docker exists, it isn't podman -in disguise. Since we need to do a similar check in -the pull-from-docker-daemon test in pull.bats, refactor -that into a common skip_if_no_docker helper. - -Signed-off-by: Ed Santiago ---- - tests/helpers.bash | 14 ++++++++++++++ - tests/pull.bats | 9 +-------- - tests/push.bats | 5 +---- - 3 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/tests/helpers.bash b/tests/helpers.bash -index 5e90e7f6eb..4dc3a7dbda 100644 ---- a/tests/helpers.bash -+++ b/tests/helpers.bash -@@ -358,3 +358,17 @@ function skip_if_in_container() { - skip "This test is not working inside a container" - fi - } -+ -+####################### -+# skip_if_no_docker # -+####################### -+function skip_if_no_docker() { -+ which docker || skip "docker is not installed" -+ systemctl -q is-active docker || skip "docker.service is not active" -+ -+ # Confirm that this is really truly docker, not podman. -+ docker_version=$(docker --version) -+ if [[ $docker_version =~ podman ]]; then -+ skip "this test needs actual docker, not podman-docker" -+ fi -+} -diff --git a/tests/pull.bats b/tests/pull.bats -index edf447423c..aae38631c8 100644 ---- a/tests/pull.bats -+++ b/tests/pull.bats -@@ -92,15 +92,8 @@ load helpers - } - - @test "pull-from-docker-daemon" { -- run systemctl status docker -- if [[ ! "$output" =~ "active (running)" ]] -- then -- skip "Skip the test as docker services is not running" -- fi -+ skip_if_no_docker - -- run systemctl start docker -- echo "$output" -- [ "$status" -eq 0 ] - run docker pull alpine - echo "$output" - [ "$status" -eq 0 ] -diff --git a/tests/push.bats b/tests/push.bats -index 91ec4eb145..37966ea228 100644 ---- a/tests/push.bats -+++ b/tests/push.bats -@@ -140,10 +140,7 @@ load helpers - } - - @test "buildah push image to docker and docker registry" { -- run which docker -- if [[ $status -ne 0 ]]; then -- skip "docker is not installed" -- fi -+ skip_if_no_docker - - _prefetch busybox - run_buildah push --signature-policy ${TESTSDIR}/policy.json busybox docker-daemon:buildah/busybox:latest diff --git a/buildah.spec b/buildah.spec index 789d560..a33d5a4 100644 --- a/buildah.spec +++ b/buildah.spec @@ -38,7 +38,6 @@ Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io Source0: %{download_url} -Patch0: buildah-gating.patch BuildRequires: device-mapper-devel BuildRequires: golang BuildRequires: git From cfab84bb67c7494bf9dade1a7a9244fb50f2fec5 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 8 Jun 2021 19:10:07 +0000 Subject: [PATCH 46/56] buildah-1.21.1-1 autobuilt v1.21.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f0792fd..f563391 100644 --- a/.gitignore +++ b/.gitignore @@ -501,3 +501,4 @@ /v1.19.8.tar.gz /v1.20.1.tar.gz /v1.21.0.tar.gz +/v1.21.1.tar.gz diff --git a/buildah.spec b/buildah.spec index a33d5a4..28ab176 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.21.0 +%define built_tag v1.21.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.21.0 +Version: 1.21.1 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -155,6 +155,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Tue Jun 08 2021 RH Container Bot - 1.21.1-1 +- autobuilt v1.21.1 + * Fri May 21 2021 RH Container Bot - 1.21.0-1 - autobuilt v1.21.0 diff --git a/sources b/sources index 4d0fd22..1b171bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.21.0.tar.gz) = 2ce6afceadec37f54f7f80562969cc382267dabc4fa5a89a09a211326e403376d209d89162333337af8602cb5c551eb446d3c9fac26f516fb8d354a7b5b77472 +SHA512 (v1.21.1.tar.gz) = 8fb30ed0948f898aef9a32c34d4b2a2e04a376257a73184ec01b67c770be1c3c87e46987ad001ececf2235cb5e17f9d0ff9e9f34be61ddd0935859c4e5b37d1f From 69e3229c915ce768073e679667764f53429575e7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Jun 2021 09:35:47 -0400 Subject: [PATCH 47/56] buildah-1.21.2-1 - bump to v1.21.2 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + buildah.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f563391..7767cf1 100644 --- a/.gitignore +++ b/.gitignore @@ -502,3 +502,4 @@ /v1.20.1.tar.gz /v1.21.0.tar.gz /v1.21.1.tar.gz +/v1.21.2.tar.gz diff --git a/buildah.spec b/buildah.spec index 28ab176..7fceacd 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.21.1 +%define built_tag v1.21.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.21.1 +Version: 1.21.2 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -49,7 +49,7 @@ BuildRequires: libassuan-devel BuildRequires: make %if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?eln} BuildRequires: ostree-devel -Requires: containers-common >= 4:1-15 +Requires: containers-common >= 4:1-18 %else Requires: runc %endif @@ -155,6 +155,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Wed Jun 30 2021 Lokesh Mandvekar - 1.21.2-1 +- bump to v1.21.2 + * Tue Jun 08 2021 RH Container Bot - 1.21.1-1 - autobuilt v1.21.1 diff --git a/sources b/sources index 1b171bd..39af8bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.21.1.tar.gz) = 8fb30ed0948f898aef9a32c34d4b2a2e04a376257a73184ec01b67c770be1c3c87e46987ad001ececf2235cb5e17f9d0ff9e9f34be61ddd0935859c4e5b37d1f +SHA512 (v1.21.2.tar.gz) = 09b468c4a809c66b8dfd34d3a8a283b3fbf31116fecac61461a043858a692a83642516c50def1328139d710233e99279a3653050e8bb58c363434fab129b4225 From 7e8ae9d5a423bf48f80ac6ebb08c5849ceac84d1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Jul 2021 13:09:53 -0400 Subject: [PATCH 48/56] buildah-1.21.3-1 - Resolves: #1969264, #1982880 - Security fix for CVE-2021-3602 - bump to v1.21.3 (cherry picked from commit 1adb2fbaff6c35d57ec301ebce133aec700bbe0e) Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ buildah.spec | 22 ++++++++++------------ sources | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 7767cf1..62d8004 100644 --- a/.gitignore +++ b/.gitignore @@ -503,3 +503,5 @@ /v1.21.0.tar.gz /v1.21.1.tar.gz /v1.21.2.tar.gz +/buildah-ec35bc4.tar.gz +/v1.21.3.tar.gz diff --git a/buildah.spec b/buildah.spec index 7fceacd..1ef57b0 100644 --- a/buildah.spec +++ b/buildah.spec @@ -25,19 +25,16 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -# Used for comparing with latest upstream tag -# to decide whether to autobuild (non-rawhide only) -%define built_tag v1.21.2 -%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%define download_url %{git0}/archive/%{built_tag}.tar.gz +%global built_tag v1.21.3 +%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: %{repo} -Version: 1.21.2 +Version: 1.21.3 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io -Source0: %{download_url} +Source0: %{git0}/archive/%{built_tag}.tar.gz BuildRequires: device-mapper-devel BuildRequires: golang BuildRequires: git @@ -111,13 +108,10 @@ mv vendor src export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" %ifarch x86_64 -export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic" -%if 0%{?fedora} || 0%{?centos} >= 8 -export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection" -%endif +export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" %endif # These extra flags present in %%{optflags} have been skipped for now as they break the build -#export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" +#export CGO_CFLAGS+=" -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" export GOPATH=$(pwd)/_build:$(pwd) export BUILDTAGS='seccomp selinux' @@ -155,6 +149,10 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Jul 16 2021 Lokesh Mandvekar - 1.21.3-1 +- Resolves: #1969264, #1982880 - Security fix for CVE-2021-3602 +- bump to v1.21.3 + * Wed Jun 30 2021 Lokesh Mandvekar - 1.21.2-1 - bump to v1.21.2 diff --git a/sources b/sources index 39af8bb..eabaff3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.21.2.tar.gz) = 09b468c4a809c66b8dfd34d3a8a283b3fbf31116fecac61461a043858a692a83642516c50def1328139d710233e99279a3653050e8bb58c363434fab129b4225 +SHA512 (v1.21.3.tar.gz) = 36db54522e8564f467eb4f0b3c7c7cfe3bc8b285a47e139d35b3d7952184d78111640ae3b36eb1ddb92e1af68b16c9d4f056884c1bb25941606ec6cfe7347295 From 9df1e3a7f3afc06e512c39d6a81a6b7196d7d95e Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 19 Jul 2021 08:52:33 -0600 Subject: [PATCH 49/56] Try to deal with buildah copy-helper nightmare Signed-off-by: Ed Santiago (cherry picked from commit c2dd6d28a67da0af10a607aa42877aa8962752b6) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 12 +++++++++--- tests/test_buildah.sh | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index 1ef57b0..08c568d 100644 --- a/buildah.spec +++ b/buildah.spec @@ -30,7 +30,7 @@ Name: %{repo} Version: 1.21.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -119,7 +119,8 @@ export BUILDTAGS='seccomp selinux' export BUILDTAGS+=' exclude_graphdriver_btrfs' %endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -%gobuild -o imgtype %{import_path}/tests/imgtype +%gobuild -o bin/imgtype %{import_path}/tests/imgtype +%gobuild -o bin/copy %{import_path}/tests/copy GOMD2MAN=go-md2man %{__make} -C docs %install @@ -129,7 +130,8 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system -cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype +cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype +cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -146,9 +148,13 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %files tests %license LICENSE %{_bindir}/%{name}-imgtype +%{_bindir}/%{name}-copy %{_datadir}/%{name}/test %changelog +* Thu Jul 22 2021 Eduardo Santiago - 1.21.3-2 +- Try to deal with new buildah-copy-helper nightmare + * Fri Jul 16 2021 Lokesh Mandvekar - 1.21.3-1 - Resolves: #1969264, #1982880 - Security fix for CVE-2021-3602 - bump to v1.21.3 diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh index aade91c..663319d 100755 --- a/tests/test_buildah.sh +++ b/tests/test_buildah.sh @@ -13,6 +13,7 @@ env | grep -v LS_COLORS= | sort | sed -e 's/^/ /' export BUILDAH_BINARY=/usr/bin/buildah export IMGTYPE_BINARY=/usr/bin/buildah-imgtype +export COPY_BINARY=/usr/bin/buildah-copy ############################################################################### # BEGIN setup/teardown From 0e7bd6722f08afd64a3905eec5e70d7917e9ebff Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 22 Jul 2021 14:47:37 -0400 Subject: [PATCH 50/56] add changes to build random commits if necessary Signed-off-by: Lokesh Mandvekar (cherry picked from commit 0a80230b9b40092b87e323dea5424427881e1dad) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index 08c568d..574311d 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,17 +24,21 @@ # https://github.com/containers/buildah %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} +# To build random commit +%global commit0 baba8de3ddad18bb6eb7abd6d17972c8403f8f25 %global built_tag v1.21.3 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: %{repo} Version: 1.21.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io -Source0: %{git0}/archive/%{built_tag}.tar.gz +#Source0: %%{git0}/archive/%%{built_tag}.tar.gz +# To build random commit +Source0: %{git0}/archive/%{commit0}.tar.gz BuildRequires: device-mapper-devel BuildRequires: golang BuildRequires: git @@ -93,7 +97,8 @@ Requires: nmap-ncat This package contains system tests for %{name} %prep -%autosetup -Sgit -n %{name}-%{built_tag_strip} +#%%autosetup -Sgit -n %%{name}-%%{built_tag_strip} +%autosetup -Sgit -n %{name}-%{commit0} sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile sed -i '/docs install/d' Makefile @@ -152,6 +157,9 @@ cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy %{_datadir}/%{name}/test %changelog +* Thu Jul 22 2021 Lokesh Mandvekar - 1.21.3-3 +- try fix for copy-release + * Thu Jul 22 2021 Eduardo Santiago - 1.21.3-2 - Try to deal with new buildah-copy-helper nightmare From 07e23a669120fb997ffc6c6a95cb9cba82f7ec0e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 23 Jul 2021 09:15:15 -0400 Subject: [PATCH 51/56] buildah-1.21.4-1 - bump to v1.21.4 - fix gating test issues Signed-off-by: Lokesh Mandvekar (cherry picked from commit 3061f54f730ca8a68b4d3a635d7fb6ec5dad645d) Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + buildah.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 62d8004..9ddc903 100644 --- a/.gitignore +++ b/.gitignore @@ -505,3 +505,4 @@ /v1.21.2.tar.gz /buildah-ec35bc4.tar.gz /v1.21.3.tar.gz +/v1.21.4.tar.gz diff --git a/buildah.spec b/buildah.spec index 574311d..cc50591 100644 --- a/buildah.spec +++ b/buildah.spec @@ -25,20 +25,20 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} # To build random commit -%global commit0 baba8de3ddad18bb6eb7abd6d17972c8403f8f25 +#%%global commit0 baba8de3ddad18bb6eb7abd6d17972c8403f8f25 -%global built_tag v1.21.3 +%global built_tag v1.21.4 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: %{repo} -Version: 1.21.3 +Version: 1.21.4 Release: 3%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io -#Source0: %%{git0}/archive/%%{built_tag}.tar.gz +Source0: %{git0}/archive/%{built_tag}.tar.gz # To build random commit -Source0: %{git0}/archive/%{commit0}.tar.gz +#Source0: %%{git0}/archive/%%{commit0}.tar.gz BuildRequires: device-mapper-devel BuildRequires: golang BuildRequires: git @@ -97,8 +97,8 @@ Requires: nmap-ncat This package contains system tests for %{name} %prep -#%%autosetup -Sgit -n %%{name}-%%{built_tag_strip} -%autosetup -Sgit -n %{name}-%{commit0} +%autosetup -Sgit -n %{name}-%{built_tag_strip} +#%%autosetup -Sgit -n %%{name}-%%{commit0} sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile sed -i '/docs install/d' Makefile @@ -157,6 +157,10 @@ cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy %{_datadir}/%{name}/test %changelog +* Fri Jul 23 2021 Lokesh Mandvekar - 1.21.4-1 +- bump to v1.21.4 +- fix gating test issues + * Thu Jul 22 2021 Lokesh Mandvekar - 1.21.3-3 - try fix for copy-release diff --git a/sources b/sources index eabaff3..5d968f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.21.3.tar.gz) = 36db54522e8564f467eb4f0b3c7c7cfe3bc8b285a47e139d35b3d7952184d78111640ae3b36eb1ddb92e1af68b16c9d4f056884c1bb25941606ec6cfe7347295 +SHA512 (v1.21.4.tar.gz) = 67d0f7211774a91230b22189670767d33c4eeb5115ebd31a7f6256497072542f517860442eaae454f784123a464ce336ca6101cbec684fb2b9432bb9ca693316 From 61d767d684bca86e9cb0a2b7d1f1ddaabcef6fde Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 23 Jul 2021 09:39:10 -0400 Subject: [PATCH 52/56] buildah-1.21.4-4 - ensure consistent version-release and changelog Signed-off-by: Lokesh Mandvekar (cherry picked from commit 2682f88ab2948448e19829ac6d5b6d35ea4c4fc2) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index cc50591..30b62a7 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Name: %{repo} Version: 1.21.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -157,6 +157,9 @@ cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy %{_datadir}/%{name}/test %changelog +* Fri Jul 23 2021 Lokesh Mandvekar - 1.21.4-4 +- ensure consistent version-release and changelog + * Fri Jul 23 2021 Lokesh Mandvekar - 1.21.4-1 - bump to v1.21.4 - fix gating test issues From 69dd792ce4c8555d68994b6c67ca1c86c5feffe3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 2 Aug 2021 15:03:59 -0400 Subject: [PATCH 53/56] buildah-1.21.4-5 - Resolves: #1983596, #1987738 - Security fix for CVE-2021-34558 Signed-off-by: Lokesh Mandvekar --- buildah.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index 30b62a7..62621f5 100644 --- a/buildah.spec +++ b/buildah.spec @@ -32,7 +32,7 @@ Name: %{repo} Version: 1.21.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -40,7 +40,7 @@ Source0: %{git0}/archive/%{built_tag}.tar.gz # To build random commit #Source0: %%{git0}/archive/%%{commit0}.tar.gz BuildRequires: device-mapper-devel -BuildRequires: golang +BuildRequires: golang >= 1.15.14 BuildRequires: git BuildRequires: glib2-devel BuildRequires: glibc-static @@ -157,6 +157,9 @@ cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy %{_datadir}/%{name}/test %changelog +* Mon Aug 02 2021 Lokesh Mandvekar - 1.21.4-5 +- Resolves: #1983596, #1987738 - Security fix for CVE-2021-34558 + * Fri Jul 23 2021 Lokesh Mandvekar - 1.21.4-4 - ensure consistent version-release and changelog From b990584acf94b94f38044643f9c315f04cc442e3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 10 Aug 2021 19:16:56 +0000 Subject: [PATCH 54/56] buildah-1.22.0-1 autobuilt v1.22.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9ddc903..9519b24 100644 --- a/.gitignore +++ b/.gitignore @@ -506,3 +506,4 @@ /buildah-ec35bc4.tar.gz /v1.21.3.tar.gz /v1.21.4.tar.gz +/v1.22.0.tar.gz diff --git a/buildah.spec b/buildah.spec index 62621f5..3b0b4bd 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,12 +27,12 @@ # To build random commit #%%global commit0 baba8de3ddad18bb6eb7abd6d17972c8403f8f25 -%global built_tag v1.21.4 +%global built_tag v1.22.0 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: %{repo} -Version: 1.21.4 -Release: 5%{?dist} +Version: 1.22.0 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -157,6 +157,9 @@ cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy %{_datadir}/%{name}/test %changelog +* Tue Aug 10 2021 RH Container Bot - 1.22.0-1 +- autobuilt v1.22.0 + * Mon Aug 02 2021 Lokesh Mandvekar - 1.21.4-5 - Resolves: #1983596, #1987738 - Security fix for CVE-2021-34558 diff --git a/sources b/sources index 5d968f4..26e82f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.21.4.tar.gz) = 67d0f7211774a91230b22189670767d33c4eeb5115ebd31a7f6256497072542f517860442eaae454f784123a464ce336ca6101cbec684fb2b9432bb9ca693316 +SHA512 (v1.22.0.tar.gz) = 372ba3740f22af82aac07d51b48737168061a25d7d5ab1db63a381833211dd967aefb36f80cc97a4770a04d8b95a7fe9d3a892c091a82f85579e993b403b270b From f03e7ff343b81290d39403c60efcebbfb49853d8 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 25 Aug 2021 15:32:35 +0000 Subject: [PATCH 55/56] buildah-1.22.3-1 autobuilt v1.22.3 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9519b24..a058497 100644 --- a/.gitignore +++ b/.gitignore @@ -507,3 +507,4 @@ /v1.21.3.tar.gz /v1.21.4.tar.gz /v1.22.0.tar.gz +/v1.22.3.tar.gz diff --git a/buildah.spec b/buildah.spec index 3b0b4bd..5aaafb3 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,11 +27,11 @@ # To build random commit #%%global commit0 baba8de3ddad18bb6eb7abd6d17972c8403f8f25 -%global built_tag v1.22.0 +%global built_tag v1.22.3 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: %{repo} -Version: 1.22.0 +Version: 1.22.3 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -157,6 +157,9 @@ cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy %{_datadir}/%{name}/test %changelog +* Wed Aug 25 2021 RH Container Bot - 1.22.3-1 +- autobuilt v1.22.3 + * Tue Aug 10 2021 RH Container Bot - 1.22.0-1 - autobuilt v1.22.0 diff --git a/sources b/sources index 26e82f0..4343216 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.22.0.tar.gz) = 372ba3740f22af82aac07d51b48737168061a25d7d5ab1db63a381833211dd967aefb36f80cc97a4770a04d8b95a7fe9d3a892c091a82f85579e993b403b270b +SHA512 (v1.22.3.tar.gz) = 373901e12c06e5fa5d2d7bf135314d29be658e8a1f449561de582dce835ecf26fc50b964374c6eeafdd7f10936049b2cde63081268f7dcda1dc1d8d540f51faa From 6113c3ec12d20f57f2a56233958fd0b007fcc60a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 14 Sep 2021 14:19:31 +0000 Subject: [PATCH 56/56] buildah-1.23.0-1 autobuilt v1.23.0 Signed-off-by: RH Container Bot (cherry picked from commit 5671e64d81bdad5d74c3c53196c5fd178e9cce6d) --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a058497..6ae7147 100644 --- a/.gitignore +++ b/.gitignore @@ -508,3 +508,4 @@ /v1.21.4.tar.gz /v1.22.0.tar.gz /v1.22.3.tar.gz +/v1.23.0.tar.gz diff --git a/buildah.spec b/buildah.spec index 5aaafb3..e825703 100644 --- a/buildah.spec +++ b/buildah.spec @@ -27,11 +27,11 @@ # To build random commit #%%global commit0 baba8de3ddad18bb6eb7abd6d17972c8403f8f25 -%global built_tag v1.22.3 +%global built_tag v1.23.0 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: %{repo} -Version: 1.22.3 +Version: 1.23.0 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -157,6 +157,9 @@ cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy %{_datadir}/%{name}/test %changelog +* Tue Sep 14 2021 RH Container Bot - 1.23.0-1 +- autobuilt v1.23.0 + * Wed Aug 25 2021 RH Container Bot - 1.22.3-1 - autobuilt v1.22.3 diff --git a/sources b/sources index 4343216..53023ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.22.3.tar.gz) = 373901e12c06e5fa5d2d7bf135314d29be658e8a1f449561de582dce835ecf26fc50b964374c6eeafdd7f10936049b2cde63081268f7dcda1dc1d8d540f51faa +SHA512 (v1.23.0.tar.gz) = 587b9d0a735124afd1f21985ae9d657d513b383bb8b7a5f4ea8911ebaf915c0bdb2bca4359cc9caf4e50cf64550f8f6ee596a0aa10acf6b59370b68b41b809f1