From fcb6a75ed877b9c4be6b76318e6ab1cdcc716ccc Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 2 Mar 2020 10:05:39 -0500 Subject: [PATCH 01/51] Update to latest version --- buildah.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index 724e71f..40fbb76 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,7 +24,7 @@ # https://github.com/containers/buildah %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} -%define commit0 f1cf92bba2345a555a437dc533d420769ecb66b2 +%define commit0 9ad0d219308ec6714842893bd4c695529804b711 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag @@ -32,8 +32,8 @@ %define built_tag v1.13.2 Name: %{repo} -Version: 1.14.0 -Release: 0.35.dev.git%{shortcommit0}%{?dist} +Version: 1.14.1 +Release: 0.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -135,6 +135,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Mar 02 2020 dwalsh@fedoraproject.org - 1.14.1-0.gitf1cf92b +- Update to latest version + * Wed Feb 05 2020 RH Container Bot - 1.14.0-0.35.dev.gitf1cf92b - autobuilt f1cf92b From c3eeab2d0df1a36330fcdd4848ebab82c299e580 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 2 Mar 2020 10:17:25 -0500 Subject: [PATCH 02/51] Update to latest version --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e81c38c..e4e3059 100644 --- a/.gitignore +++ b/.gitignore @@ -426,3 +426,4 @@ /buildah-3177db5.tar.gz /buildah-f89b081.tar.gz /buildah-f1cf92b.tar.gz +/buildah-9ad0d21.tar.gz diff --git a/sources b/sources index 06b1e00..13cb45f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-f1cf92b.tar.gz) = 1ace9b914d3f12fb80fb03e5fc95453f4f3c830c1a075c1367d8d866b549df43279fa1c01683009b8ea8c374c0551def0522963b9be75622c185c19e62dda770 +SHA512 (buildah-9ad0d21.tar.gz) = 63f91eb9e4a2b6c681fd814ed306b8475922dd9370ad8cfdd4c8a094656d146720d74cac7e47e73c398ccde9c4abe5529daed7f6b5fbbaf45099dba2cdd0225d From 4b5dc8a35bac0992b1b601074f0dced023106663 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 4 Mar 2020 13:25:45 -0500 Subject: [PATCH 03/51] Update to latest version --- buildah.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildah.spec b/buildah.spec index 40fbb76..0a047b8 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,15 +24,15 @@ # https://github.com/containers/buildah %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} -%define commit0 9ad0d219308ec6714842893bd4c695529804b711 +%define commit0 066e446c81005028f1619d237b4d81370b48e93d %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.13.2 +%define built_tag v1.14.2 Name: %{repo} -Version: 1.14.1 +Version: 1.14.2 Release: 0.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -135,7 +135,7 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog -* Mon Mar 02 2020 dwalsh@fedoraproject.org - 1.14.1-0.gitf1cf92b +* Wed Mar 04 2020 dwalsh@fedoraproject.org - 1.14.2-0.git066e446c - Update to latest version * Wed Feb 05 2020 RH Container Bot - 1.14.0-0.35.dev.gitf1cf92b From ba158244dda5621d962b02e896ca4578236d2dfc Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 4 Mar 2020 15:54:58 -0500 Subject: [PATCH 04/51] Update to latest version --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e4e3059..2fa008e 100644 --- a/.gitignore +++ b/.gitignore @@ -427,3 +427,4 @@ /buildah-f89b081.tar.gz /buildah-f1cf92b.tar.gz /buildah-9ad0d21.tar.gz +/buildah-066e446.tar.gz diff --git a/sources b/sources index 13cb45f..cf05df7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-9ad0d21.tar.gz) = 63f91eb9e4a2b6c681fd814ed306b8475922dd9370ad8cfdd4c8a094656d146720d74cac7e47e73c398ccde9c4abe5529daed7f6b5fbbaf45099dba2cdd0225d +SHA512 (buildah-066e446.tar.gz) = 80b9fe586e4f35bf95f5c5c52f2ec9fb23c897eacf4d051b6665026d23af1884fa2e9283bd996e24a7aa225ce1c92ff8088433c8f3647973da148488948035a8 From 88be66a76ba2e01b05e25be2b2ad573f784b70a4 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 12 Mar 2020 10:47:07 -0400 Subject: [PATCH 05/51] buildah-1.14.2-1 - correct upgrade path from f31 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + buildah.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2fa008e..ce657e3 100644 --- a/.gitignore +++ b/.gitignore @@ -428,3 +428,4 @@ /buildah-f1cf92b.tar.gz /buildah-9ad0d21.tar.gz /buildah-066e446.tar.gz +/v1.14.2.tar.gz diff --git a/buildah.spec b/buildah.spec index 0a047b8..195bef3 100644 --- a/buildah.spec +++ b/buildah.spec @@ -30,14 +30,16 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) %define built_tag v1.14.2 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define download_url https://github.com/containers/%{name}/archive/%{built_tag}.tar.gz Name: %{repo} Version: 1.14.2 -Release: 0.git%{shortcommit0}%{?dist} +Release: 1%{?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: golang BuildRequires: git BuildRequires: glib2-devel @@ -89,7 +91,7 @@ Requires: jq 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 @@ -135,6 +137,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Mar 12 2020 Lokesh Mandvekar Date: Wed, 18 Mar 2020 12:15:23 +0000 Subject: [PATCH 06/51] buildah-1.14.3-1 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 ce657e3..4498042 100644 --- a/.gitignore +++ b/.gitignore @@ -429,3 +429,4 @@ /buildah-9ad0d21.tar.gz /buildah-066e446.tar.gz /v1.14.2.tar.gz +/v1.14.3.tar.gz diff --git a/buildah.spec b/buildah.spec index 195bef3..5ec8600 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,17 +24,17 @@ # https://github.com/containers/buildah %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} -%define commit0 066e446c81005028f1619d237b4d81370b48e93d +%define commit0 153ee2f0e973724f935ccb7275ce941fda4f121b %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.14.2 +%define built_tag v1.14.3 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/%{name}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.14.2 +Version: 1.14.3 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -137,6 +137,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Wed Mar 18 2020 RH Container Bot - 1.14.3-1 +- autobuilt v1.14.3 + * Thu Mar 12 2020 Lokesh Mandvekar Date: Wed, 18 Mar 2020 10:23:29 -0400 Subject: [PATCH 07/51] runc for centos Signed-off-by: Lokesh Mandvekar --- buildah.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/buildah.spec b/buildah.spec index 5ec8600..84c1956 100644 --- a/buildah.spec +++ b/buildah.spec @@ -64,6 +64,7 @@ BuildRequires: libseccomp-devel Requires: libseccomp >= 2.4.1-0 Requires: container-selinux Requires: slirp4netns >= 0.3-0 +Requires: runc %endif %description From 3d1e502398feaacec1c9cd016144f46b7d31483e Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 26 Mar 2020 14:08:06 +0000 Subject: [PATCH 08/51] buildah-1.14.4-1 Signed-off-by: RH Container Bot --- .gitignore | 2 ++ buildah.spec | 9 ++++++--- sources | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4498042..96e2c0c 100644 --- a/.gitignore +++ b/.gitignore @@ -430,3 +430,5 @@ /buildah-066e446.tar.gz /v1.14.2.tar.gz /v1.14.3.tar.gz +/buildah-843d15d.tar.gz +/v1.14.4.tar.gz diff --git a/buildah.spec b/buildah.spec index 84c1956..72b1b36 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,17 +24,17 @@ # https://github.com/containers/buildah %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} -%define commit0 153ee2f0e973724f935ccb7275ce941fda4f121b +%define commit0 934ce1e997eeeb0efa39943000797cdab7a09325 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.14.3 +%define built_tag v1.14.4 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/%{name}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.14.3 +Version: 1.14.4 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -138,6 +138,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Mar 26 2020 RH Container Bot - 1.14.4-1 +- autobuilt v1.14.4 + * Wed Mar 18 2020 RH Container Bot - 1.14.3-1 - autobuilt v1.14.3 diff --git a/sources b/sources index ad7066a..9ace64a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (v1.14.3.tar.gz) = 89bc4256b0bea5b74ef71d0918f60d447fc4b0cd069f65995cf7125ed6382574c85db1c6a8101fbcb1c7385b5bc1855ddb1d483f91dce787ebab20ce56fad7e7 +SHA512 (buildah-843d15d.tar.gz) = ca383aff62f7a26e1bfcc3d7d7592be939c413a49f891a69139166a6c16306f38ea2d618c9e37e9f412fa7735ee4ae933dd3dcab45c06e455882aa8cc4e585b3 +SHA512 (v1.14.4.tar.gz) = 74923a552294b5e35361f8446697822850952edcd9b4619e31bad1c3b2fbb0aeb491d598096d2f59cf7bf433a487f056f7229c7fe031cb790cbdc9b8ba12a2cd From 3b75df73666eb62b18099bc1b3be490f82b8d796 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 27 Mar 2020 19:08:22 +0000 Subject: [PATCH 09/51] buildah-1.14.5-1 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 96e2c0c..ec6d271 100644 --- a/.gitignore +++ b/.gitignore @@ -432,3 +432,4 @@ /v1.14.3.tar.gz /buildah-843d15d.tar.gz /v1.14.4.tar.gz +/v1.14.5.tar.gz diff --git a/buildah.spec b/buildah.spec index 72b1b36..2fd18ff 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,17 +24,17 @@ # https://github.com/containers/buildah %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} -%define commit0 934ce1e997eeeb0efa39943000797cdab7a09325 +%define commit0 5247a1f1a3b3ccf3c2ee9b45f67305c517e2d304 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.14.4 +%define built_tag v1.14.5 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/%{name}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.14.4 +Version: 1.14.5 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -138,6 +138,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Mar 27 2020 RH Container Bot - 1.14.5-1 +- autobuilt v1.14.5 + * Thu Mar 26 2020 RH Container Bot - 1.14.4-1 - autobuilt v1.14.4 diff --git a/sources b/sources index 9ace64a..3a9c079 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (buildah-843d15d.tar.gz) = ca383aff62f7a26e1bfcc3d7d7592be939c413a49f891a69139166a6c16306f38ea2d618c9e37e9f412fa7735ee4ae933dd3dcab45c06e455882aa8cc4e585b3 -SHA512 (v1.14.4.tar.gz) = 74923a552294b5e35361f8446697822850952edcd9b4619e31bad1c3b2fbb0aeb491d598096d2f59cf7bf433a487f056f7229c7fe031cb790cbdc9b8ba12a2cd +SHA512 (v1.14.5.tar.gz) = 759d2ba26af43d6ff7ee891f88114a0cde6307439f7837343bfa6edba2473805f0f2e584264e8be01b9f0af07b1fd323243af5feeb9535ada4475ce53a980ff6 From 39234ba0624e517e41f971ddde1e412965249403 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 3 Apr 2020 14:08:47 +0000 Subject: [PATCH 10/51] buildah-1.14.6-1 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 ec6d271..cc72602 100644 --- a/.gitignore +++ b/.gitignore @@ -433,3 +433,4 @@ /buildah-843d15d.tar.gz /v1.14.4.tar.gz /v1.14.5.tar.gz +/v1.14.6.tar.gz diff --git a/buildah.spec b/buildah.spec index 2fd18ff..cee7968 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,17 +24,17 @@ # https://github.com/containers/buildah %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} -%define commit0 5247a1f1a3b3ccf3c2ee9b45f67305c517e2d304 +%define commit0 09cce6292b7f4f6ee16da3e2001f34b1e4126679 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.14.5 +%define built_tag v1.14.6 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/%{name}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.14.5 +Version: 1.14.6 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -138,6 +138,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Apr 03 2020 RH Container Bot - 1.14.6-1 +- autobuilt v1.14.6 + * Fri Mar 27 2020 RH Container Bot - 1.14.5-1 - autobuilt v1.14.5 diff --git a/sources b/sources index 3a9c079..a2bfb63 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (buildah-843d15d.tar.gz) = ca383aff62f7a26e1bfcc3d7d7592be939c413a49f891a69139166a6c16306f38ea2d618c9e37e9f412fa7735ee4ae933dd3dcab45c06e455882aa8cc4e585b3 -SHA512 (v1.14.5.tar.gz) = 759d2ba26af43d6ff7ee891f88114a0cde6307439f7837343bfa6edba2473805f0f2e584264e8be01b9f0af07b1fd323243af5feeb9535ada4475ce53a980ff6 +SHA512 (v1.14.6.tar.gz) = 869addbd41c115ca92eab30133c76cd0d449184e95f3b64fa57ad84f50834e6f6189bd1a7e4871aba270b96bf69192ff00da7f0e086439c811c5093342ac14d2 From 8ffd08cf1eb2c5bc36061d55f481cef3b79ee683 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 7 Apr 2020 21:08:27 +0000 Subject: [PATCH 11/51] buildah-1.14.7-1 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 cc72602..44b276c 100644 --- a/.gitignore +++ b/.gitignore @@ -434,3 +434,4 @@ /v1.14.4.tar.gz /v1.14.5.tar.gz /v1.14.6.tar.gz +/v1.14.7.tar.gz diff --git a/buildah.spec b/buildah.spec index cee7968..7b7d58a 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,17 +24,17 @@ # https://github.com/containers/buildah %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} -%define commit0 09cce6292b7f4f6ee16da3e2001f34b1e4126679 +%define commit0 3812432dc21c32d609aa96474bed44e4f4be6b0b %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.14.6 +%define built_tag v1.14.7 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/%{name}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.14.6 +Version: 1.14.7 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -138,6 +138,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Tue Apr 07 2020 RH Container Bot - 1.14.7-1 +- autobuilt v1.14.7 + * Fri Apr 03 2020 RH Container Bot - 1.14.6-1 - autobuilt v1.14.6 diff --git a/sources b/sources index a2bfb63..e6a07bf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (buildah-843d15d.tar.gz) = ca383aff62f7a26e1bfcc3d7d7592be939c413a49f891a69139166a6c16306f38ea2d618c9e37e9f412fa7735ee4ae933dd3dcab45c06e455882aa8cc4e585b3 -SHA512 (v1.14.6.tar.gz) = 869addbd41c115ca92eab30133c76cd0d449184e95f3b64fa57ad84f50834e6f6189bd1a7e4871aba270b96bf69192ff00da7f0e086439c811c5093342ac14d2 +SHA512 (v1.14.7.tar.gz) = d094fbd9d34313e0507223ea720eef75ff19edde7ce1d9a8db3f9af4fcd81c0970f7736d9854023e4904285af1aca1722d9a86394192000da800620ff52499ce From ce43212926b8d2b127f890b7e05a58e76126caf3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 9 Apr 2020 18:08:44 +0000 Subject: [PATCH 12/51] buildah-1.14.8-1 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 44b276c..8db12dd 100644 --- a/.gitignore +++ b/.gitignore @@ -435,3 +435,4 @@ /v1.14.5.tar.gz /v1.14.6.tar.gz /v1.14.7.tar.gz +/v1.14.8.tar.gz diff --git a/buildah.spec b/buildah.spec index 7b7d58a..685ad29 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,17 +24,17 @@ # https://github.com/containers/buildah %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} -%define commit0 3812432dc21c32d609aa96474bed44e4f4be6b0b +%define commit0 155ce56a2cd2d5608cf43c998f1728af5e7a499b %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.14.7 +%define built_tag v1.14.8 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/%{name}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.14.7 +Version: 1.14.8 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -138,6 +138,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Apr 09 2020 RH Container Bot - 1.14.8-1 +- autobuilt v1.14.8 + * Tue Apr 07 2020 RH Container Bot - 1.14.7-1 - autobuilt v1.14.7 diff --git a/sources b/sources index e6a07bf..7648e5a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (buildah-843d15d.tar.gz) = ca383aff62f7a26e1bfcc3d7d7592be939c413a49f891a69139166a6c16306f38ea2d618c9e37e9f412fa7735ee4ae933dd3dcab45c06e455882aa8cc4e585b3 -SHA512 (v1.14.7.tar.gz) = d094fbd9d34313e0507223ea720eef75ff19edde7ce1d9a8db3f9af4fcd81c0970f7736d9854023e4904285af1aca1722d9a86394192000da800620ff52499ce +SHA512 (v1.14.8.tar.gz) = 8cc64d8262ffe3727f4c32051f4f3456ab0b54f221ce6d144a301b732170eb487dc356f4e056c804ca9806172e60920239b62800a0aac2dc5de83cd656ea97f3 From 9b9f219c7a98933f71202fde9b0c1461da96cbc8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 21 Apr 2020 08:07:21 -0400 Subject: [PATCH 13/51] remove stale tarball info from sources file Signed-off-by: Lokesh Mandvekar --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 7648e5a..b6635bb 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (buildah-843d15d.tar.gz) = ca383aff62f7a26e1bfcc3d7d7592be939c413a49f891a69139166a6c16306f38ea2d618c9e37e9f412fa7735ee4ae933dd3dcab45c06e455882aa8cc4e585b3 SHA512 (v1.14.8.tar.gz) = 8cc64d8262ffe3727f4c32051f4f3456ab0b54f221ce6d144a301b732170eb487dc356f4e056c804ca9806172e60920239b62800a0aac2dc5de83cd656ea97f3 From f21b54624ff7c85cf7c473b4bfc60ec38046171d Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 21 May 2020 05:44:50 -0600 Subject: [PATCH 14/51] gating.yaml : bring up-to-date wrt requirements 1) Update the testcase name. This is a global fedora-wide change instituted May 2020 2) Add a 'subject_type' line. This seems to be a global change instituted Augist 2019, but I never heard about it 3) Revert decision_context from 'stable' to 'testing'. This was an accidental holdover from when we branched master to f32. Steps will be taken to ensure this doesn't happen on f33. Signed-off-by: Ed Santiago --- gating.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gating.yaml b/gating.yaml index 92d738a..0d881de 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,7 @@ --- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_stable +decision_context: bodhi_update_push_testing +subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: org.centos.prod.ci.pipeline.allpackages-build.complete} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From f7a80107116f32cdd5524b042565d7f77334c117 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 26 May 2020 08:52:33 -0400 Subject: [PATCH 15/51] buildah-1.14.9-1 - bump to v1.14.9 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + buildah.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8db12dd..eabbd5e 100644 --- a/.gitignore +++ b/.gitignore @@ -436,3 +436,4 @@ /v1.14.6.tar.gz /v1.14.7.tar.gz /v1.14.8.tar.gz +/v1.14.9.tar.gz diff --git a/buildah.spec b/buildah.spec index 685ad29..f36e9e0 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,17 +24,15 @@ # https://github.com/containers/buildah %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} -%define commit0 155ce56a2cd2d5608cf43c998f1728af5e7a499b -%define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.14.8 +%define built_tag v1.14.9 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/%{name}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.14.8 +Version: 1.14.9 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -138,6 +136,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Tue May 26 2020 Lokesh Mandvekar - 1.14.9-1 +- bump to v1.14.9 + * Thu Apr 09 2020 RH Container Bot - 1.14.8-1 - autobuilt v1.14.8 diff --git a/sources b/sources index b6635bb..f3bbb66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.14.8.tar.gz) = 8cc64d8262ffe3727f4c32051f4f3456ab0b54f221ce6d144a301b732170eb487dc356f4e056c804ca9806172e60920239b62800a0aac2dc5de83cd656ea97f3 +SHA512 (v1.14.9.tar.gz) = 6bd420d4ff15d0c8d8682a23e4d1a45e8b85d59f62697bdab2fe81dba57a913871e8b7670dca20470093c77cb17fe5ca4fb1ff627279cc812aa7efe5b3cab4ab From 4710d89b39e6f44995dfb7b4bed059c287d89c4f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 26 May 2020 15:38:41 -0400 Subject: [PATCH 16/51] update deps for centos Signed-off-by: Lokesh Mandvekar --- buildah.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/buildah.spec b/buildah.spec index f36e9e0..3c995ab 100644 --- a/buildah.spec +++ b/buildah.spec @@ -29,7 +29,7 @@ # to decide whether to autobuild (non-rawhide only) %define built_tag v1.14.9 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%define download_url https://github.com/containers/%{name}/archive/%{built_tag}.tar.gz +%define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Name: %{repo} Version: 1.14.9 @@ -38,6 +38,7 @@ Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io Source: %{download_url} +BuildRequires: device-mapper-devel BuildRequires: golang BuildRequires: git BuildRequires: glib2-devel @@ -46,20 +47,21 @@ BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: make +BuildRequires: ostree-devel Requires: crun >= 0.10-1 Requires: containers-common -%if 0%{?fedora} +Requires: libseccomp >= 2.4.1-0 +# No btrfs for centos 8 +%if 0%{?fedora} || 0%{?centos} <= 7 BuildRequires: btrfs-progs-devel -BuildRequires: device-mapper-devel -BuildRequires: ostree-devel +%endif +%if 0%{?fedora} BuildRequires: libseccomp-static Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs %else -#### DO NOT REMOVE - NEEDED FOR CENTOS BuildRequires: libseccomp-devel -Requires: libseccomp >= 2.4.1-0 Requires: container-selinux Requires: slirp4netns >= 0.3-0 Requires: runc @@ -105,6 +107,9 @@ mv vendor src export GOPATH=$(pwd)/_build:$(pwd) export BUILDTAGS='seccomp selinux' +%if 0%{?centos} >= 8 +export BUILDTAGS+='exclude_graphdriver_btrfs' +%endif %gobuild -o %{name} %{import_path}/cmd/%{name} %gobuild -o imgtype %{import_path}/tests/imgtype GOMD2MAN=go-md2man %{__make} -C docs From d4a5b2600af9ab331eaff0829d52add2a74fbcc4 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 26 May 2020 16:12:39 -0400 Subject: [PATCH 17/51] fix buildtags and ostree dep Signed-off-by: Lokesh Mandvekar --- buildah.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index 3c995ab..3357c43 100644 --- a/buildah.spec +++ b/buildah.spec @@ -47,10 +47,13 @@ BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: make -BuildRequires: ostree-devel 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 +BuildRequires: ostree-devel +%endif # No btrfs for centos 8 %if 0%{?fedora} || 0%{?centos} <= 7 BuildRequires: btrfs-progs-devel @@ -108,7 +111,7 @@ mv vendor src export GOPATH=$(pwd)/_build:$(pwd) export BUILDTAGS='seccomp selinux' %if 0%{?centos} >= 8 -export BUILDTAGS+='exclude_graphdriver_btrfs' +export BUILDTAGS+=' exclude_graphdriver_btrfs' %endif %gobuild -o %{name} %{import_path}/cmd/%{name} %gobuild -o imgtype %{import_path}/tests/imgtype From 14ba6ccf6ad92ca9868ef6332e881b6e62059b99 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 18 Jun 2020 11:18:01 +0000 Subject: [PATCH 18/51] buildah-1.15.0-1 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 7 +++++-- sources | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eabbd5e..49d317d 100644 --- a/.gitignore +++ b/.gitignore @@ -437,3 +437,4 @@ /v1.14.7.tar.gz /v1.14.8.tar.gz /v1.14.9.tar.gz +/v1.15.0.tar.gz diff --git a/buildah.spec b/buildah.spec index 3357c43..4331b42 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.14.9 +%define built_tag v1.15.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.14.9 +Version: 1.15.0 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -144,6 +144,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Jun 18 2020 RH Container Bot - 1.15.0-1 +- autobuilt v1.15.0 + * Tue May 26 2020 Lokesh Mandvekar - 1.14.9-1 - bump to v1.14.9 diff --git a/sources b/sources index f3bbb66..3f1745d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (v1.14.9.tar.gz) = 6bd420d4ff15d0c8d8682a23e4d1a45e8b85d59f62697bdab2fe81dba57a913871e8b7670dca20470093c77cb17fe5ca4fb1ff627279cc812aa7efe5b3cab4ab +SHA512 (buildah-843d15d.tar.gz) = ca383aff62f7a26e1bfcc3d7d7592be939c413a49f891a69139166a6c16306f38ea2d618c9e37e9f412fa7735ee4ae933dd3dcab45c06e455882aa8cc4e585b3 +SHA512 (v1.15.0.tar.gz) = 58c9ea7502d2537b65ff27f5617255f9bd9b63d548c17d3995c0555f30bf32a8bf4d042cbbd0f640ee5a9c22377751fbec24a5d7ff8fe5a5eacbba4f97ea6871 From 8477483f11217a7d750f289dfa1274756c75ec30 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 29 Jun 2020 11:17:02 -0400 Subject: [PATCH 19/51] buildah-1.15.0-2 - adjust dependencies for centos7 Signed-off-by: Lokesh Mandvekar --- buildah.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/buildah.spec b/buildah.spec index 4331b42..a2b006a 100644 --- a/buildah.spec +++ b/buildah.spec @@ -29,11 +29,11 @@ # to decide whether to autobuild (non-rawhide only) %define built_tag v1.15.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.15.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 @@ -47,9 +47,7 @@ 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 BuildRequires: ostree-devel @@ -63,10 +61,13 @@ BuildRequires: libseccomp-static Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs +Requires: crun >= 0.10-1 +Requires: libseccomp >= 2.4.1-0 %else BuildRequires: libseccomp-devel Requires: container-selinux Requires: slirp4netns >= 0.3-0 +Requires: libseccomp Requires: runc %endif @@ -120,7 +121,6 @@ GOMD2MAN=go-md2man %{__make} -C docs %install export GOPATH=$(pwd)/_build:$(pwd):%{gopath} make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions -make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system @@ -144,6 +144,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Jun 29 2020 Lokesh Mandvekar - 1.15.0-2 +- adjust dependencies for centos7 + * Thu Jun 18 2020 RH Container Bot - 1.15.0-1 - autobuilt v1.15.0 From c6484346e21479c7b98a93d58886b9edb14c8cf8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 29 Jun 2020 11:46:15 -0400 Subject: [PATCH 20/51] adjust build steps Signed-off-by: Lokesh Mandvekar --- buildah.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index a2b006a..bafaf22 100644 --- a/buildah.spec +++ b/buildah.spec @@ -97,8 +97,6 @@ This package contains system tests for %{name} %prep %autosetup -Sgit -n %{name}-%{built_tag_strip} -sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile -sed -i '/docs install/d' Makefile %build mkdir _build @@ -124,7 +122,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system -cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype +cp -pav imgtype %{buildroot}/%{_bindir}/%{name}-imgtype #define license tag if not already defined %{!?_licensedir:%global license %doc} From ddc41928e65e60abe85215139469f4f002e6cfeb Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 24 Jun 2020 13:11:01 -0600 Subject: [PATCH 21/51] htpasswd fallout: require httpd-tools The docker.io/registry:2 image broke suddenly and with no warning: https://github.com/docker/distribution-library-image/issues/106 Symptom: running 'htpasswd' from that container no longer works, even though it's been documented for years (at docker.com) and as of this writing still remains documented. Solution: require httpd-tools for buildah-tests, and run htpasswd on the host instead of from registry container. Signed-off-by: Ed Santiago --- buildah.spec | 1 + tests/test_buildah.sh | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index bafaf22..8b8d84f 100644 --- a/buildah.spec +++ b/buildah.spec @@ -89,6 +89,7 @@ Requires: bzip2 Requires: podman Requires: golang Requires: jq +Requires: httpd-tools %description tests %{summary} diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh index 2227107..860a4ba 100755 --- a/tests/test_buildah.sh +++ b/tests/test_buildah.sh @@ -19,6 +19,8 @@ export IMGTYPE_BINARY=/usr/bin/buildah-imgtype # Start a registry pre_bats_setup() { + REGISTRY_FQIN=docker.io/library/registry:2 + AUTHDIR=/tmp/buildah-tests-auth.$$ mkdir -p $AUTHDIR @@ -31,8 +33,7 @@ pre_bats_setup() { fi if [ ! -e $AUTHDIR/htpasswd ]; then - podman run --rm --entrypoint htpasswd registry:2 \ - -Bbn testuser testpassword > $AUTHDIR/htpasswd + htpasswd -Bbn testuser testpassword > $AUTHDIR/htpasswd fi podman rm -f registry || true @@ -44,7 +45,7 @@ pre_bats_setup() { -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \ -e REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt \ -e REGISTRY_HTTP_TLS_KEY=/auth/domain.key \ - registry:2 + $REGISTRY_FQIN } post_bats_teardown() { From 1066c61c688a178fc072d795388ac8b670c91549 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 31 Jul 2020 16:10:43 +0000 Subject: [PATCH 22/51] buildah-1.15.1-1 Signed-off-by: RH Container Bot --- .gitignore | 1 + buildah.spec | 9 ++++++--- sources | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 49d317d..7856fd9 100644 --- a/.gitignore +++ b/.gitignore @@ -438,3 +438,4 @@ /v1.14.8.tar.gz /v1.14.9.tar.gz /v1.15.0.tar.gz +/v1.15.1.tar.gz diff --git a/buildah.spec b/buildah.spec index 8b8d84f..8915cd3 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.15.0 +%define built_tag v1.15.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.15.0 -Release: 2%{?dist} +Version: 1.15.1 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -143,6 +143,9 @@ cp -pav imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Fri Jul 31 16:10:30 GMT 2020 RH Container Bot - 1.15.1-1 +- autobuilt v1.15.1 + * Mon Jun 29 2020 Lokesh Mandvekar - 1.15.0-2 - adjust dependencies for centos7 diff --git a/sources b/sources index 3f1745d..e6c5d90 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (buildah-843d15d.tar.gz) = ca383aff62f7a26e1bfcc3d7d7592be939c413a49f891a69139166a6c16306f38ea2d618c9e37e9f412fa7735ee4ae933dd3dcab45c06e455882aa8cc4e585b3 -SHA512 (v1.15.0.tar.gz) = 58c9ea7502d2537b65ff27f5617255f9bd9b63d548c17d3995c0555f30bf32a8bf4d042cbbd0f640ee5a9c22377751fbec24a5d7ff8fe5a5eacbba4f97ea6871 +SHA512 (v1.15.1.tar.gz) = 61cbe91867dc664a9e76b367e0f99bf5c797c68dda7182ed43c6a6a5a72a0f0519e45db6b2746b26933d829834757cc93bdbd30c62ce6a947ee546dbc1f930be From 2c93945332b7bb7b8be6d8d248d375d89f090b4f Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 3 Sep 2020 18:27:44 +0000 Subject: [PATCH 23/51] buildah-1.15.2-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 7856fd9..c3f5eab 100644 --- a/.gitignore +++ b/.gitignore @@ -439,3 +439,4 @@ /v1.14.9.tar.gz /v1.15.0.tar.gz /v1.15.1.tar.gz +/v1.15.2.tar.gz diff --git a/buildah.spec b/buildah.spec index 8915cd3..974672c 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.15.1 +%define built_tag v1.15.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Name: %{repo} -Version: 1.15.1 +Version: 1.15.2 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -143,6 +143,9 @@ cp -pav imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Sep 3 2020 RH Container Bot - 1.15.2-1 +- autobuilt v1.15.2 + * Fri Jul 31 16:10:30 GMT 2020 RH Container Bot - 1.15.1-1 - autobuilt v1.15.1 diff --git a/sources b/sources index e6c5d90..f5f4dcb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.15.1.tar.gz) = 61cbe91867dc664a9e76b367e0f99bf5c797c68dda7182ed43c6a6a5a72a0f0519e45db6b2746b26933d829834757cc93bdbd30c62ce6a947ee546dbc1f930be +SHA512 (v1.15.2.tar.gz) = 48431d66b4a56605d1538e660591fab05d75956c09acbebc5a515c6f6c8673cf5eeddba4bc0a815f1b214e8f1bd18898d1ed0634578cf3992806df4636c79157 From 2d0286f664eac6653aa2890e9136a7861f1ea7b4 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Aug 2020 13:36:02 -0400 Subject: [PATCH 24/51] remove timestamp from changelog Signed-off-by: Lokesh Mandvekar --- buildah.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 974672c..79c7528 100644 --- a/buildah.spec +++ b/buildah.spec @@ -146,7 +146,7 @@ cp -pav imgtype %{buildroot}/%{_bindir}/%{name}-imgtype * Thu Sep 3 2020 RH Container Bot - 1.15.2-1 - autobuilt v1.15.2 -* Fri Jul 31 16:10:30 GMT 2020 RH Container Bot - 1.15.1-1 +* Fri Jul 31 2020 RH Container Bot - 1.15.1-1 - autobuilt v1.15.1 * Mon Jun 29 2020 Lokesh Mandvekar - 1.15.0-2 From c86eeb612b2cfc4e3ed0875924eddaa1224122b5 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 7 Sep 2020 06:51:17 -0400 Subject: [PATCH 25/51] Bump to next major release --- .gitignore | 71 ++++++++++++--- buildah.spec | 253 +++++++++++++++++++++++++++++++++++++++++++-------- gating.yaml | 7 ++ sources | 2 +- 4 files changed, 280 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index c3f5eab..77c8586 100644 --- a/.gitignore +++ b/.gitignore @@ -426,17 +426,62 @@ /buildah-3177db5.tar.gz /buildah-f89b081.tar.gz /buildah-f1cf92b.tar.gz -/buildah-9ad0d21.tar.gz -/buildah-066e446.tar.gz -/v1.14.2.tar.gz -/v1.14.3.tar.gz /buildah-843d15d.tar.gz -/v1.14.4.tar.gz -/v1.14.5.tar.gz -/v1.14.6.tar.gz -/v1.14.7.tar.gz -/v1.14.8.tar.gz -/v1.14.9.tar.gz -/v1.15.0.tar.gz -/v1.15.1.tar.gz -/v1.15.2.tar.gz +/buildah-665dc2f.tar.gz +/buildah-10542ed.tar.gz +/buildah-3b9c6a3.tar.gz +/buildah-aba0d4d.tar.gz +/buildah-c61925b.tar.gz +/buildah-a5fabab.tar.gz +/buildah-e54da62.tar.gz +/buildah-e48ff81.tar.gz +/buildah-11ad04e.tar.gz +/buildah-d3804fa.tar.gz +/buildah-c18e043.tar.gz +/buildah-17ceb60.tar.gz +/buildah-1db2cde.tar.gz +/buildah-25c294c.tar.gz +/buildah-912ca5a.tar.gz +/buildah-2fc064e.tar.gz +/buildah-e9a6703.tar.gz +/buildah-31a01b4.tar.gz +/buildah-9c031e0.tar.gz +/buildah-20e41b7.tar.gz +/buildah-c3070ba.tar.gz +/buildah-310c02b.tar.gz +/buildah-f5dbfc1.tar.gz +/buildah-c554675.tar.gz +/buildah-e48fa75.tar.gz +/buildah-f7ff4c1.tar.gz +/buildah-7a88d7e.tar.gz +/buildah-c404c89.tar.gz +/buildah-db3ced9.tar.gz +/buildah-81e2659.tar.gz +/buildah-f4970e6.tar.gz +/buildah-0d5ab1d.tar.gz +/buildah-0b9a534.tar.gz +/buildah-bea8692.tar.gz +/buildah-8169acd.tar.gz +/buildah-3af27b4.tar.gz +/buildah-63567cb.tar.gz +/buildah-42a48f9.tar.gz +/buildah-f35e7d4.tar.gz +/buildah-7b0dfb8.tar.gz +/buildah-7610123.tar.gz +/buildah-828035f.tar.gz +/buildah-b438050.tar.gz +/buildah-6a7ace0.tar.gz +/buildah-f80da42.tar.gz +/buildah-0f6c2a9.tar.gz +/buildah-3184920.tar.gz +/buildah-9bd70ac.tar.gz +/buildah-7957c13.tar.gz +/buildah-4fc49ce.tar.gz +/buildah-ab1adf1.tar.gz +/buildah-75e94a2.tar.gz +/buildah-de0f541.tar.gz +/buildah-dbf0777.tar.gz +/buildah-0ac2a67.tar.gz +/buildah-f7a3515.tar.gz +/buildah-2c46b4b.tar.gz +/buildah-295b825.tar.gz diff --git a/buildah.spec b/buildah.spec index 79c7528..616d67b 100644 --- a/buildah.spec +++ b/buildah.spec @@ -17,27 +17,29 @@ %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 -%define provider github -%define provider_tld com -%define project containers -%define repo buildah +%global provider github +%global provider_tld com +%global project containers +%global repo buildah # https://github.com/containers/buildah -%define import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%define git0 https://%{import_path} +%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) %define built_tag v1.15.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%define download_url %{git0}/archive/%{built_tag}.tar.gz +%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 URL: https://%{name}.io -Source: %{download_url} +Source: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz BuildRequires: device-mapper-devel BuildRequires: golang BuildRequires: git @@ -47,7 +49,9 @@ 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 BuildRequires: ostree-devel @@ -61,14 +65,10 @@ BuildRequires: libseccomp-static Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs -Requires: crun >= 0.10-1 -Requires: libseccomp >= 2.4.1-0 %else BuildRequires: libseccomp-devel Requires: container-selinux Requires: slirp4netns >= 0.3-0 -Requires: libseccomp -Requires: runc %endif %description @@ -97,7 +97,9 @@ Requires: httpd-tools This package contains system tests for %{name} %prep -%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 %build mkdir _build @@ -120,10 +122,11 @@ GOMD2MAN=go-md2man %{__make} -C docs %install export GOPATH=$(pwd)/_build:$(pwd):%{gopath} make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions +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 -pav imgtype %{buildroot}/%{_bindir}/%{name}-imgtype +cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -143,44 +146,216 @@ cp -pav 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 -* Fri Jul 31 2020 RH Container Bot - 1.15.1-1 -- autobuilt v1.15.1 +* Mon Jul 27 2020 Fedora Release Engineering - 1.15.0-0.68.dev.git2c46b4b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Mon Jun 29 2020 Lokesh Mandvekar - 1.15.0-2 -- adjust dependencies for centos7 +* Tue May 26 2020 Lokesh Mandvekar - 1.15.0-0.67.dev.git2c46b4b +- update deps for centos -* Thu Jun 18 2020 RH Container Bot - 1.15.0-1 -- autobuilt v1.15.0 +* Tue May 26 2020 RH Container Bot - 1.15.0-0.66.dev.git2c46b4b +- autobuilt 2c46b4b -* Tue May 26 2020 Lokesh Mandvekar - 1.14.9-1 -- bump to v1.14.9 +* Tue May 26 2020 RH Container Bot - 1.15.0-0.65.dev.gitf7a3515 +- autobuilt f7a3515 -* Thu Apr 09 2020 RH Container Bot - 1.14.8-1 -- autobuilt v1.14.8 +* Mon May 25 2020 RH Container Bot - 1.15.0-0.64.dev.git0ac2a67 +- autobuilt 0ac2a67 -* Tue Apr 07 2020 RH Container Bot - 1.14.7-1 -- autobuilt v1.14.7 +* Sun May 24 2020 RH Container Bot - 1.15.0-0.63.dev.gitdbf0777 +- autobuilt dbf0777 -* Fri Apr 03 2020 RH Container Bot - 1.14.6-1 -- autobuilt v1.14.6 +* Sat May 23 2020 RH Container Bot - 1.15.0-0.62.dev.gitde0f541 +- autobuilt de0f541 -* Fri Mar 27 2020 RH Container Bot - 1.14.5-1 -- autobuilt v1.14.5 +* Thu May 21 2020 RH Container Bot - 1.15.0-0.61.dev.git75e94a2 +- autobuilt 75e94a2 -* Thu Mar 26 2020 RH Container Bot - 1.14.4-1 -- autobuilt v1.14.4 +* Thu May 21 2020 RH Container Bot - 1.15.0-0.60.dev.gitab1adf1 +- autobuilt ab1adf1 -* Wed Mar 18 2020 RH Container Bot - 1.14.3-1 -- autobuilt v1.14.3 +* Wed May 20 2020 RH Container Bot - 1.15.0-0.59.dev.git4fc49ce +- autobuilt 4fc49ce -* Thu Mar 12 2020 Lokesh Mandvekar - 1.15.0-0.58.dev.git7957c13 +- autobuilt 7957c13 -* Wed Mar 04 2020 dwalsh@fedoraproject.org - 1.14.2-0.git066e446c -- Update to latest version +* Wed May 13 2020 RH Container Bot - 1.15.0-0.57.dev.git9bd70ac +- autobuilt 9bd70ac + +* Tue May 12 2020 RH Container Bot - 1.15.0-0.56.dev.git3184920 +- autobuilt 3184920 + +* Mon May 11 2020 RH Container Bot - 1.15.0-0.55.dev.git0f6c2a9 +- autobuilt 0f6c2a9 + +* Mon May 11 2020 RH Container Bot - 1.15.0-0.54.dev.gitf80da42 +- autobuilt f80da42 + +* Fri May 08 2020 RH Container Bot - 1.15.0-0.53.dev.git6a7ace0 +- autobuilt 6a7ace0 + +* Tue May 05 2020 RH Container Bot - 1.15.0-0.52.dev.gitb438050 +- autobuilt b438050 + +* Mon May 04 2020 RH Container Bot - 1.15.0-0.51.dev.git828035f +- autobuilt 828035f + +* Mon May 04 2020 RH Container Bot - 1.15.0-0.50.dev.git7610123 +- autobuilt 7610123 + +* Mon May 04 2020 RH Container Bot - 1.15.0-0.49.dev.git7b0dfb8 +- autobuilt 7b0dfb8 + +* Fri May 01 2020 RH Container Bot - 1.15.0-0.48.dev.gitf35e7d4 +- autobuilt f35e7d4 + +* Fri May 01 2020 RH Container Bot - 1.15.0-0.47.dev.git42a48f9 +- autobuilt 42a48f9 + +* Fri May 01 2020 RH Container Bot - 1.15.0-0.46.dev.git63567cb +- autobuilt 63567cb + +* Fri May 01 2020 RH Container Bot - 1.15.0-0.45.dev.git3af27b4 +- autobuilt 3af27b4 + +* Tue Apr 28 2020 RH Container Bot - 1.15.0-0.44.dev.git8169acd +- autobuilt 8169acd + +* Tue Apr 28 2020 RH Container Bot - 1.15.0-0.43.dev.gitbea8692 +- autobuilt bea8692 + +* Fri Apr 24 2020 RH Container Bot - 1.15.0-0.42.dev.git0b9a534 +- autobuilt 0b9a534 + +* Fri Apr 24 2020 RH Container Bot - 1.15.0-0.41.dev.git0d5ab1d +- autobuilt 0d5ab1d + +* Thu Apr 23 2020 Lokesh Mandvekar - 1.15.0-0.40.dev.gitf4970e6 +- use latest commit + +* Thu Apr 23 2020 RH Container Bot - 1.15.0-0.39.dev.git843d15d +- autobuilt 843d15d + +* Mon Apr 20 2020 RH Container Bot - 1.15.0-0.38.dev.gitf4970e6 +- autobuilt f4970e6 + +* Thu Apr 16 2020 RH Container Bot - 1.15.0-0.37.dev.git81e2659 +- autobuilt 81e2659 + +* Tue Apr 14 2020 RH Container Bot - 1.15.0-0.36.dev.gitdb3ced9 +- autobuilt db3ced9 + +* Mon Apr 13 2020 RH Container Bot - 1.15.0-0.35.dev.gitc404c89 +- autobuilt c404c89 + +* Mon Apr 13 2020 RH Container Bot - 1.15.0-0.34.dev.git7a88d7e +- autobuilt 7a88d7e + +* Thu Apr 09 2020 RH Container Bot - 1.15.0-0.33.dev.gitf7ff4c1 +- autobuilt f7ff4c1 + +* Thu Apr 09 2020 RH Container Bot - 1.15.0-0.32.dev.gite48fa75 +- autobuilt e48fa75 + +* Tue Apr 07 2020 RH Container Bot - 1.15.0-0.31.dev.gitc554675 +- autobuilt c554675 + +* Tue Apr 07 2020 RH Container Bot - 1.15.0-0.30.dev.gitf5dbfc1 +- autobuilt f5dbfc1 + +* Tue Apr 07 2020 RH Container Bot - 1.15.0-0.29.dev.git310c02b +- autobuilt 310c02b + +* Tue Apr 07 2020 RH Container Bot - 1.15.0-0.28.dev.gitc3070ba +- autobuilt c3070ba + +* Mon Apr 06 2020 RH Container Bot - 1.15.0-0.27.dev.git20e41b7 +- autobuilt 20e41b7 + +* Mon Apr 06 2020 RH Container Bot - 1.15.0-0.26.dev.git9c031e0 +- autobuilt 9c031e0 + +* Sat Apr 04 2020 RH Container Bot - 1.15.0-0.25.dev.git31a01b4 +- autobuilt 31a01b4 + +* Thu Apr 02 2020 RH Container Bot - 1.15.0-0.24.dev.gite9a6703 +- autobuilt e9a6703 + +* Wed Apr 01 2020 RH Container Bot - 1.15.0-0.23.dev.git2fc064e +- autobuilt 2fc064e + +* Tue Mar 31 2020 RH Container Bot - 1.15.0-0.22.dev.git912ca5a +- autobuilt 912ca5a + +* Tue Mar 31 2020 RH Container Bot - 1.15.0-0.21.dev.git25c294c +- autobuilt 25c294c + +* Mon Mar 30 2020 RH Container Bot - 1.15.0-0.20.dev.git1db2cde +- autobuilt 1db2cde + +* Sat Mar 28 2020 RH Container Bot - 1.15.0-0.19.dev.git17ceb60 +- autobuilt 17ceb60 + +* Fri Mar 27 2020 RH Container Bot - 1.15.0-0.18.dev.gitc18e043 +- autobuilt c18e043 + +* Fri Mar 27 2020 RH Container Bot - 1.15.0-0.17.dev.gitd3804fa +- autobuilt d3804fa + +* Thu Mar 26 2020 RH Container Bot - 1.15.0-0.16.dev.git11ad04e +- autobuilt 11ad04e + +* Thu Mar 26 2020 RH Container Bot - 1.15.0-0.15.dev.gite48ff81 +- autobuilt e48ff81 + +* Thu Mar 26 2020 RH Container Bot - 1.15.0-0.14.dev.gite54da62 +- autobuilt e54da62 + +* Wed Mar 25 2020 RH Container Bot - 1.15.0-0.13.dev.gita5fabab +- autobuilt a5fabab + +* Wed Mar 25 2020 RH Container Bot - 1.15.0-0.12.dev.gitc61925b +- autobuilt c61925b + +* Mon Mar 23 2020 RH Container Bot - 1.15.0-0.11.dev.gitaba0d4d +- autobuilt aba0d4d + +* Mon Mar 23 2020 RH Container Bot - 1.15.0-0.10.dev.git3b9c6a3 +- autobuilt 3b9c6a3 + +* Mon Mar 23 2020 RH Container Bot - 1.15.0-0.9.dev.git10542ed +- autobuilt 10542ed + +* Thu Mar 19 2020 RH Container Bot - 1.15.0-0.8.dev.git665dc2f +- autobuilt 665dc2f + +* Thu Mar 19 2020 Lokesh Mandvekar - 1.15.0-0.7.dev.git843d15d +- use correct commit + +* Thu Mar 19 2020 RH Container Bot - 1.15.0-0.6.dev.gitf1cf92b +- autobuilt 843d15d + +* Thu Mar 19 2020 RH Container Bot - 1.15.0-0.5.dev.gitf1cf92b +- autobuilt a2285ed + +* Wed Mar 18 2020 RH Container Bot - 1.15.0-0.4.dev.gitf1cf92b +- autobuilt a2285ed + +* Wed Mar 18 2020 RH Container Bot - 1.15.0-0.3.dev.gitf1cf92b +- autobuilt a2285ed + +* Tue Mar 17 2020 RH Container Bot - 1.15.0-0.2.dev.gitf1cf92b +- autobuilt 040fb4b + +* Mon Mar 16 2020 RH Container Bot - 1.15.0-0.1.dev.gitf1cf92b +- bump to 1.15.0 +- autobuilt d26f437 * Wed Feb 05 2020 RH Container Bot - 1.14.0-0.35.dev.gitf1cf92b - autobuilt f1cf92b diff --git a/gating.yaml b/gating.yaml index 0d881de..c8a218f 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,4 +1,11 @@ --- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy product_versions: - fedora-* decision_context: bodhi_update_push_testing diff --git a/sources b/sources index f5f4dcb..b8fe4ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.15.2.tar.gz) = 48431d66b4a56605d1538e660591fab05d75956c09acbebc5a515c6f6c8673cf5eeddba4bc0a815f1b214e8f1bd18898d1ed0634578cf3992806df4636c79157 +SHA512 (buildah-295b825.tar.gz) = 671f20f64a36d215a72a1447a6087860c38e85fbb662809b02082885a21757c4fc83c7982a7be8bfcbe86c26d2275a02165b1fbcfc750b4f2f2efdc665004c56 From b54cd14d9c484070f97dfbcdd86084c1301457c0 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 7 Sep 2020 07:07:41 -0400 Subject: [PATCH 26/51] 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 2308bf66d81d682b50666c0f0451460dcde54b03 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 9 Sep 2020 12:57:06 +0000 Subject: [PATCH 27/51] buildah-1.16.0-1 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 a4bcc06819e00309096612c02a421f08e469c7c9 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 8 Sep 2020 15:02:43 -0600 Subject: [PATCH 28/51] 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) Signed-off-by: Lokesh Mandvekar --- 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 0f2892a5b021de3b1cf273f5679fda8298b57c02 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 8 Sep 2020 10:39:24 -0600 Subject: [PATCH 29/51] 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 691a0f2667dadab92bc36abacc6b3634aa1b2823 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 3 Sep 2020 14:11:46 -0400 Subject: [PATCH 30/51] 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 9b558f644816adf466a4366a0002e3cadfc8f103 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Sep 2020 10:54:23 -0400 Subject: [PATCH 31/51] 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 e49a97dbf39879a43b51ae8e2df4c3e7811f1ca5 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 11 Sep 2020 16:13:05 +0000 Subject: [PATCH 32/51] 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 fa5178b76c9a327027cdc0ad4a9c915a3ef559bc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 16 Sep 2020 08:38:54 -0400 Subject: [PATCH 33/51] buildah-1.16.1-2 - fix build issues Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + buildah.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) 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/buildah.spec b/buildah.spec index f18256a..9914d9a 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 @@ -98,7 +96,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 +145,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Wed Sep 16 2020 Lokesh Mandvekar - 1.16.1-2 +- fix build issues + * Fri Sep 11 2020 RH Container Bot - 1.16.1-1 - autobuilt v1.16.1 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 f3d3e922a56d9c689ca9dacefbbf7710ceb9deaf Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 21 Sep 2020 09:32:52 -0400 Subject: [PATCH 34/51] buildah-1.16.1-3 - adjust deps for centos 7 Signed-off-by: Lokesh Mandvekar --- buildah.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/buildah.spec b/buildah.spec index 9914d9a..ca6bfbd 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 @@ -47,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} +Requires: crun >= 0.10-1 BuildRequires: libseccomp-static Recommends: container-selinux +Requires: libseccomp >= 2.4.1-0 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 @@ -145,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Mon Sep 21 2020 Lokesh Mandvekar - 1.16.1-3 +- adjust deps for centos 7 + * Wed Sep 16 2020 Lokesh Mandvekar - 1.16.1-2 - fix build issues From 80c0819b82d340a80397164ccb0ab0a1b070268a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 22 Sep 2020 15:13:38 +0000 Subject: [PATCH 35/51] 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 ca6bfbd..5068520 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 - adjust deps for centos 7 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 f3e9febc7118e02026dcaad96a69d9584127c380 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 2 Oct 2020 12:33:01 +0000 Subject: [PATCH 36/51] 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 5068520..6d39f9b 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 98c4e46f528a1767addf89989f56ff93926c4fb3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 22 Oct 2020 14:33:02 +0000 Subject: [PATCH 37/51] 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 6d39f9b..0bd5f42 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 c1a86de659a73725e6a0c67d985c3d29aa07e7d3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 5 Nov 2020 18:28:15 +0000 Subject: [PATCH 38/51] buildah-1.17.0-1 autobuilt v1.17.0 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 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 0bd5f42..25caf81 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 +* Thu Nov 5 2020 RH Container Bot - 1.17.0-1 +- autobuilt v1.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 c00aae84ed64e3959fd89e68ce00a50da6401fc8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 9 Nov 2020 11:03:57 -0500 Subject: [PATCH 39/51] 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 25caf81..e59c777 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 11:03:47 EST 2020 Lokesh Mandvekar - 1.17.0-2 +- rebuild + * Thu Nov 5 2020 RH Container Bot - 1.17.0-1 - autobuilt v1.17.0 From 0fdb651b212a3bd8291adda33760607d135e9b94 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 16 Nov 2020 17:33:02 +0000 Subject: [PATCH 40/51] 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 e59c777..a8f8fd3 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 11:03:47 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 bd62cdcaeb7220eff7ee53649140aa43dad63655 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 19 Nov 2020 08:42:53 -0500 Subject: [PATCH 41/51] use old-style changelog Signed-off-by: Lokesh Mandvekar --- buildah.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index a8f8fd3..f896096 100644 --- a/buildah.spec +++ b/buildah.spec @@ -150,7 +150,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 11:03:47 EST 2020 Lokesh Mandvekar - 1.17.0-2 +* Mon Nov 9 2020 Lokesh Mandvekar - 1.17.0-2 - rebuild * Thu Nov 5 2020 RH Container Bot - 1.17.0-1 From e7086c9d5a9b71752602918d222d665b109a55b0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 19 Nov 2020 08:43:54 -0500 Subject: [PATCH 42/51] buildah-1.18.0-2 - bump release tag for OBS Signed-off-by: Lokesh Mandvekar --- buildah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index f896096..07d6fc5 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 @@ -147,6 +147,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Thu Nov 19 2020 Lokesh Mandvekar - 1.18.0-2 +- bump release tag for OBS + * Mon Nov 16 2020 RH Container Bot - 1.18.0-1 - autobuilt v1.18.0 From 31433600ac18baf051f55efe9264611b98e11c4f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 20 Nov 2020 08:54:25 -0500 Subject: [PATCH 43/51] 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 07d6fc5..c81a8be 100644 --- a/buildah.spec +++ b/buildah.spec @@ -63,6 +63,7 @@ Recommends: container-selinux Requires: libseccomp >= 2.4.1-0 Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs +Suggests: cpp %else BuildRequires: libseccomp-devel Requires: runc From 199c09e946b1632e786c45df6783661a9c38787d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 15:23:22 -0500 Subject: [PATCH 44/51] buildah-1.18.0-2 - harden cgo based go binaries Reported-by: Wade Mealing Signed-off-by: Lokesh Mandvekar --- buildah.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index c81a8be..496ed8d 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 @@ -148,8 +158,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog -* Thu Nov 19 2020 Lokesh Mandvekar - 1.18.0-2 -- bump release tag for 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 - autobuilt v1.18.0 From b3d360c029029def6d915b6323e7996cdc4ca58e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 15:35:02 -0500 Subject: [PATCH 45/51] buildah-1.18.0-3 - bump release tag for centos OBS Signed-off-by: Lokesh Mandvekar --- buildah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 496ed8d..0c59be8 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,6 +158,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* 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 From 959205c9685679039ba26a6b9c83c4f5392edce6 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 9 Jan 2021 17:04:07 +0000 Subject: [PATCH 46/51] 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 0c59be8..b39dc58 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 b3bce962b605c863e5d00e6d728b778968bd6d0a Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Sat, 9 Jan 2021 14:15:28 -0700 Subject: [PATCH 47/51] 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 3a073f5d83a61bcc9fee2c3743cc61a6804618ce Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 14 Jan 2021 22:34:27 +0000 Subject: [PATCH 48/51] 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 b39dc58..0bc2326 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 c0a80ea2690294a1ed30a8c20f6a52409f5e14ba Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 15 Jan 2021 11:04:07 +0000 Subject: [PATCH 49/51] 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 0bc2326..98a71a6 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 b1c8800a043404f0075e54c7056bb42f1883a17e Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 29 Jan 2021 16:33:43 +0000 Subject: [PATCH 50/51] 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 98a71a6..670e2b8 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 9166a0ad461d588e181f34a8d4c76798a8a75d26 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 9 Feb 2021 09:06:09 -0500 Subject: [PATCH 51/51] buildah-1.19.4-1 - Resolves: #1919391, #1926796 - Security fix for CVE-2021-20206 - bump to v1.19.4 - adjust dependencies (cherry picked from commit d013e460d0813e0dab3eddf94663d07bde9fa01e) Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ buildah.spec | 20 +++++++++++++------- sources | 2 +- 3 files changed, 16 insertions(+), 8 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 670e2b8..25200c2 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,25 +48,26 @@ 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 BuildRequires: btrfs-progs-devel %endif %if 0%{?fedora} || 0%{?eln} -Requires: crun >= 0.10-1 BuildRequires: libseccomp-static -Recommends: container-selinux Requires: libseccomp >= 2.4.1-0 -Recommends: slirp4netns >= 0.3-0 +Recommends: container-selinux +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