From e26be4e5dbed7dba86fc314c145ede6abf74a1f2 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 19 Jul 2022 14:58:31 -0500 Subject: [PATCH 01/16] Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang From 594f22c9b9331327bb07a1b9526edc89ea47da7a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 3 Aug 2022 07:03:31 +0000 Subject: [PATCH 02/16] auto bump to v1.26.3 (cherry picked from commit 5268ea2ba77d07288161aaf524b8e3b536e0c4ac) --- .gitignore | 1 + buildah.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6e5547f..a00fb78 100644 --- a/.gitignore +++ b/.gitignore @@ -685,3 +685,4 @@ /v1.26.0.tar.gz /v1.26.1.tar.gz /v1.26.2.tar.gz +/v1.26.3.tar.gz diff --git a/buildah.spec b/buildah.spec index 399c583..1150dad 100644 --- a/buildah.spec +++ b/buildah.spec @@ -19,10 +19,10 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global built_tag v1.26.2 +%global built_tag v1.26.3 Name: %{repo} -Version: 1.26.2 +Version: 1.26.3 %if "%{_vendor}" == "debbuild" Maintainer: Lokesh Mandvekar License: ASL-2.0+ diff --git a/sources b/sources index 3bbc28b..a61e793 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.26.2.tar.gz) = f50a7ee787d10a8f8d1a7e0ff9f86990de975df427af894be5bcc84bceafd2eb87dfe75c1b967ae57056299893c942df257aef1e9aaeb712022a8abceeaebba9 +SHA512 (v1.26.3.tar.gz) = 5d8ea60246085ba27795b52152765fc3c85c92c5caf4515c1b2973aec17844eb9da2ffff82f6c503e36f675089c998b9ee51c4b4b899104ccd9fa771308c8048 From 187ef1f3a3be4e600c3e5feb9d926c75e898b7ce Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 3 Aug 2022 19:03:12 +0000 Subject: [PATCH 03/16] auto bump to v1.26.4 (cherry picked from commit 6a103c38f68a7c8c41363ce51c23bffb32edc736) Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + buildah.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a00fb78..5a0e8cb 100644 --- a/.gitignore +++ b/.gitignore @@ -686,3 +686,4 @@ /v1.26.1.tar.gz /v1.26.2.tar.gz /v1.26.3.tar.gz +/v1.26.4.tar.gz diff --git a/buildah.spec b/buildah.spec index 1150dad..093238e 100644 --- a/buildah.spec +++ b/buildah.spec @@ -19,10 +19,10 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global built_tag v1.26.3 +%global built_tag v1.26.4 Name: %{repo} -Version: 1.26.3 +Version: 1.26.4 %if "%{_vendor}" == "debbuild" Maintainer: Lokesh Mandvekar License: ASL-2.0+ diff --git a/sources b/sources index a61e793..1a25ff8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.26.3.tar.gz) = 5d8ea60246085ba27795b52152765fc3c85c92c5caf4515c1b2973aec17844eb9da2ffff82f6c503e36f675089c998b9ee51c4b4b899104ccd9fa771308c8048 +SHA512 (v1.26.4.tar.gz) = 39425ee3f40f1cfd2c76749b43f07efe19c90dff56d9b2024a69e092a328cf526f6bbb23b6f38536e7df11a465219f8f344aa643a82f6511fbb0253e5729d71a From f6fd3bc133cc380718500336ca2cd9acd543dc6b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 8 Aug 2022 09:41:41 -0400 Subject: [PATCH 04/16] add buildah-tutorial binary Signed-off-by: Lokesh Mandvekar (cherry picked from commit 62002a5e06502c1e5e03fd444f649b788e93dd02) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 3 +++ tests/test_buildah.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/buildah.spec b/buildah.spec index 093238e..2de079f 100644 --- a/buildah.spec +++ b/buildah.spec @@ -170,6 +170,7 @@ export BUILDTAGS+=' libsubid selinux' %gobuild -o bin/%{name} %{import_path}/cmd/%{name} %gobuild -o bin/imgtype %{import_path}/tests/imgtype %gobuild -o bin/copy %{import_path}/tests/copy +%gobuild -o bin/tutorial %{import_path}/tests/tutorial GOMD2MAN=go-md2man %{__make} -C docs %install @@ -189,6 +190,7 @@ install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy +cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -206,6 +208,7 @@ cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy %license LICENSE %{_bindir}/%{name}-imgtype %{_bindir}/%{name}-copy +%{_bindir}/%{name}-tutorial %{_datadir}/%{name}/test %changelog diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh index 5974d30..f8776bb 100755 --- a/tests/test_buildah.sh +++ b/tests/test_buildah.sh @@ -16,6 +16,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 +export TUTORIAL_BINARY=/usr/bin/buildah-tutorial ############################################################################### # BEGIN setup/teardown From 96cf0218935051e4f119d600adf9263017cf8269 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 9 Aug 2022 02:03:34 +0000 Subject: [PATCH 05/16] auto bump to v1.27.0 (cherry picked from commit f6702dafee0d8933bb815e878d4ba18e5d93a147) --- .gitignore | 1 + buildah.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5a0e8cb..bd0f4ed 100644 --- a/.gitignore +++ b/.gitignore @@ -687,3 +687,4 @@ /v1.26.2.tar.gz /v1.26.3.tar.gz /v1.26.4.tar.gz +/v1.27.0.tar.gz diff --git a/buildah.spec b/buildah.spec index 2de079f..648414f 100644 --- a/buildah.spec +++ b/buildah.spec @@ -19,10 +19,10 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global built_tag v1.26.4 +%global built_tag v1.27.0 Name: %{repo} -Version: 1.26.4 +Version: 1.27.0 %if "%{_vendor}" == "debbuild" Maintainer: Lokesh Mandvekar License: ASL-2.0+ diff --git a/sources b/sources index 1a25ff8..045d7ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.26.4.tar.gz) = 39425ee3f40f1cfd2c76749b43f07efe19c90dff56d9b2024a69e092a328cf526f6bbb23b6f38536e7df11a465219f8f344aa643a82f6511fbb0253e5729d71a +SHA512 (v1.27.0.tar.gz) = 7324c85b6f5169522f0cde2cbd0d55b61a2e2fc53d7f03f24ecf606fb564ee6da82cadc493520b4105501124c6c8a1e03aa67b56fb32570f303e849630286afe From af5e5049b3e21f20e32f4440c149f4586dc4bc90 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 16 Aug 2022 14:35:56 -0400 Subject: [PATCH 06/16] Fix debbuild maintainer issue Signed-off-by: Lokesh Mandvekar (cherry picked from commit 2a164591d1168870c05e045a7c5f7883068ba152) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 648414f..c59db32 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,7 +24,7 @@ Name: %{repo} Version: 1.27.0 %if "%{_vendor}" == "debbuild" -Maintainer: Lokesh Mandvekar +Packager: Podman Debbuild Maintainers License: ASL-2.0+ Release: 0%{?dist} %else From cf10f42cf33f6c7c16e8bcda19b818e5b95aa55e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 17 Aug 2022 14:15:26 -0400 Subject: [PATCH 07/16] use easier tag macros to make both fedora and debbuild happy Signed-off-by: Lokesh Mandvekar (cherry picked from commit bcf3455ced5f38e00cf6b7ed212a22c53bb2f316) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index c59db32..819fc22 100644 --- a/buildah.spec +++ b/buildah.spec @@ -19,7 +19,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global built_tag v1.27.0 +%global built_tag_strip 1.27.0 Name: %{repo} Version: 1.27.0 @@ -33,7 +33,7 @@ Release: %autorelease %endif Summary: A command line tool used for creating OCI Images URL: https://%{name}.io -Source: %{git0}/archive/%{built_tag}.tar.gz +Source: %{git0}/archive/v%{built_tag_strip}.tar.gz BuildRequires: go-md2man %if "%{_vendor}" == "debbuild" BuildRequires: git From 1bfc289d46d6f1336252febec41d407a106a2204 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 9 Sep 2022 11:04:29 +0000 Subject: [PATCH 08/16] auto bump to v1.27.1 (cherry picked from commit 97fac8727b06f6e0177730d82b3b94ee310a13c6) --- .gitignore | 1 + buildah.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bd0f4ed..9ae751b 100644 --- a/.gitignore +++ b/.gitignore @@ -688,3 +688,4 @@ /v1.26.3.tar.gz /v1.26.4.tar.gz /v1.27.0.tar.gz +/v1.27.1.tar.gz diff --git a/buildah.spec b/buildah.spec index 819fc22..f5bb5de 100644 --- a/buildah.spec +++ b/buildah.spec @@ -19,10 +19,10 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global built_tag_strip 1.27.0 +%global built_tag_strip 1.27.1 Name: %{repo} -Version: 1.27.0 +Version: 1.27.1 %if "%{_vendor}" == "debbuild" Packager: Podman Debbuild Maintainers License: ASL-2.0+ diff --git a/sources b/sources index 045d7ad..3126f81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.27.0.tar.gz) = 7324c85b6f5169522f0cde2cbd0d55b61a2e2fc53d7f03f24ecf606fb564ee6da82cadc493520b4105501124c6c8a1e03aa67b56fb32570f303e849630286afe +SHA512 (v1.27.1.tar.gz) = a5e2ddf837e613554ffe8fe9c15ac9c8f9c2564c403e5544df7fb8802962581fb4e9dd4361c28c93443ede74c20c82f1631990e443c7895a3b4c3b8a659ee05a From 4d044d1437fc97fc603bd5e6ff61b915a5a12883 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 30 Sep 2022 10:06:33 -0400 Subject: [PATCH 09/16] bump to v1.27.2 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 6988bc13c687e87c59c0c6d5cd2b1e1b0515b4b2) Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + buildah.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9ae751b..4eed34a 100644 --- a/.gitignore +++ b/.gitignore @@ -689,3 +689,4 @@ /v1.26.4.tar.gz /v1.27.0.tar.gz /v1.27.1.tar.gz +/v1.27.2.tar.gz diff --git a/buildah.spec b/buildah.spec index f5bb5de..264eb89 100644 --- a/buildah.spec +++ b/buildah.spec @@ -19,10 +19,10 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global built_tag_strip 1.27.1 +%global built_tag_strip 1.27.2 Name: %{repo} -Version: 1.27.1 +Version: 1.27.2 %if "%{_vendor}" == "debbuild" Packager: Podman Debbuild Maintainers License: ASL-2.0+ diff --git a/sources b/sources index 3126f81..dd0a851 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.27.1.tar.gz) = a5e2ddf837e613554ffe8fe9c15ac9c8f9c2564c403e5544df7fb8802962581fb4e9dd4361c28c93443ede74c20c82f1631990e443c7895a3b4c3b8a659ee05a +SHA512 (v1.27.2.tar.gz) = d32852f1a6c5041834b91038c6294baa4480d4b41587204435e4aef1eeffb631dc4cc50df4ab9089e1b1a2d06534272d55b2626e6819b5f45aa0dfe9ec51f6e2 From 91da9dca633d5dfe58376915bd962a65fba72074 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 3 Oct 2022 14:21:04 +0000 Subject: [PATCH 10/16] auto bump to v1.28.0 (cherry picked from commit 0748b124358bf7aab6262715d492e003b52d99e7) --- .gitignore | 1 + buildah.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4eed34a..4431f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -690,3 +690,4 @@ /v1.27.0.tar.gz /v1.27.1.tar.gz /v1.27.2.tar.gz +/v1.28.0.tar.gz diff --git a/buildah.spec b/buildah.spec index 264eb89..4dfdb20 100644 --- a/buildah.spec +++ b/buildah.spec @@ -19,10 +19,10 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global built_tag_strip 1.27.2 +%global built_tag_strip 1.28.0 Name: %{repo} -Version: 1.27.2 +Version: 1.28.0 %if "%{_vendor}" == "debbuild" Packager: Podman Debbuild Maintainers License: ASL-2.0+ diff --git a/sources b/sources index dd0a851..54a66f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.27.2.tar.gz) = d32852f1a6c5041834b91038c6294baa4480d4b41587204435e4aef1eeffb631dc4cc50df4ab9089e1b1a2d06534272d55b2626e6819b5f45aa0dfe9ec51f6e2 +SHA512 (v1.28.0.tar.gz) = f5e82a22648fa0d0ba7f5dcf3b97a2ec1182f31d3e03cd2624e01fe76fcdddf0a5605c59816eeef6401d151864b6b6be493c144b83f5667ab3947eea902f0086 From 1f125d97534de618a797d67934c2e4d720e84636 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 6 Oct 2022 09:53:48 -0400 Subject: [PATCH 11/16] remove debbuild macros to comply with Fedora guidelines Signed-off-by: Lokesh Mandvekar (cherry picked from commit 6dd08dba8abeb9d79ae776462c7366db8c0b5e4d) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 50 +++++++------------------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/buildah.spec b/buildah.spec index 4dfdb20..fba874a 100644 --- a/buildah.spec +++ b/buildah.spec @@ -1,7 +1,3 @@ -%if "%{_vendor}" == "debbuild" -%define gobuild(o:) GO111MODULE=off go build -buildmode pie -tags=" ${BUILDTAGS:-}" -a -v -x %{?**}; -%endif - %global with_debug 1 %if 0%{?with_debug} @@ -19,36 +15,19 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global built_tag_strip 1.28.0 +%global built_tag v1.28.0 +%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) Name: %{repo} -Version: 1.28.0 -%if "%{_vendor}" == "debbuild" -Packager: Podman Debbuild Maintainers -License: ASL-2.0+ -Release: 0%{?dist} -%else +Version: %{gen_version} License: ASL 2.0 and BSD and MIT and MPLv2.0 Release: %autorelease -%endif Summary: A command line tool used for creating OCI Images URL: https://%{name}.io -Source: %{git0}/archive/v%{built_tag_strip}.tar.gz +# Tarball fetched from upstream +Source: %{git0}/archive/%{built_tag}.tar.gz BuildRequires: go-md2man -%if "%{_vendor}" == "debbuild" -BuildRequires: git -BuildRequires: golang -BuildRequires: libassuan-dev -BuildRequires: libbtrfs-dev -BuildRequires: libdevmapper-dev -BuildRequires: libglib2.0-dev -BuildRequires: libgpg-error-dev -BuildRequires: libgpgme-dev -BuildRequires: libseccomp-dev -BuildRequires: libsystemd-dev -BuildRequires: pkg-config -Requires: containers-common >= 4:1 -%else BuildRequires: device-mapper-devel BuildRequires: git-core BuildRequires: golang >= 1.16.6 @@ -103,7 +82,6 @@ Provides: bundled(golang(github.com/spf13/cobra)) = v1.3.0 Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5 Provides: bundled(golang(github.com/stretchr/testify)) = v1.7.0 Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635 -%endif %description The %{name} package provides a command line tool which can be used to @@ -134,10 +112,9 @@ Requires: git-daemon This package contains system tests for %{name} %prep -%autosetup -Sgit +%autosetup -Sgit -n %{name}-%{built_tag_strip} %build -%if "%{_vendor}" != "debbuild" %set_build_flags # These extra flags present in $CFLAGS have been skipped for now as they break the build CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g') @@ -147,7 +124,6 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an %ifarch x86_64 export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" %endif -%endif export GOPATH=$(pwd)/_build:$(pwd) export CGO_CFLAGS=$CFLAGS @@ -164,9 +140,7 @@ export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.tx export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}" export BUILDTAGS='seccomp exclude_graphdriver_devicemapper' -%if "%{_vendor}" != "debbuild" export BUILDTAGS+=' libsubid selinux' -%endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} %gobuild -o bin/imgtype %{import_path}/tests/imgtype %gobuild -o bin/copy %{import_path}/tests/copy @@ -175,16 +149,8 @@ GOMD2MAN=go-md2man %{__make} -C docs %install export GOPATH=$(pwd)/_build:$(pwd) -%if "%{_vendor}" != "debbuild" make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install -%else -install -D -m0755 bin/%{name} %{buildroot}%{_bindir}/%{name} -install -m 644 -D contrib/completions/bash/%{name} %{buildroot}%{_datadir}/bash-completion/completions/%{name} -install -d %{buildroot}/%{_mandir}/man1 -install -m 0644 docs/%{name}*.1 %{buildroot}%{_mandir}/man1 -install -m 0644 docs/links/%{name}*.1 %{buildroot}%{_mandir}/man1 -%endif install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system @@ -212,6 +178,4 @@ cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial %{_datadir}/%{name}/test %changelog -%if "%{_vendor}" != "debbuild" %autochangelog -%endif From df8f0f7ae2b0765e55d6f5bb2b04e48cb4ef3e90 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 6 Oct 2022 15:40:11 -0400 Subject: [PATCH 12/16] depend on containers-common-extra Signed-off-by: Lokesh Mandvekar (cherry picked from commit 64a5677385c84b00250b9e432a44fe94c795ad45) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/buildah.spec b/buildah.spec index fba874a..591a5af 100644 --- a/buildah.spec +++ b/buildah.spec @@ -40,15 +40,18 @@ BuildRequires: make BuildRequires: ostree-devel BuildRequires: btrfs-progs-devel BuildRequires: shadow-utils-subid-devel -Requires: containers-common >= 4:1-46 -Suggests: containernetworking-plugins >= 0.9.1-1 -Requires: netavark -Requires: iptables -Requires: nftables +%if 0%{?fedora} > 37 +Requires: containers-common-extra >= 4:1-78 +%else +%if 0%{?fedora} == 37 +Requires: containers-common-extra >= 4:1-73 +%else +Requires: containers-common-extra >= 4:1-62 +%endif +%endif BuildRequires: libseccomp-static Requires: libseccomp >= 2.4.1-0 Suggests: cpp -Suggests: qemu-user-static # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d' Provides: bundled(golang(github.com/containerd/containerd)) = v1.5.9 Provides: bundled(golang(github.com/containernetworking/cni)) = v1.0.1 From ea1e19d2ca4dd497059eecb8b665a22a0c82d102 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Oct 2022 15:13:55 +0000 Subject: [PATCH 13/16] auto bump to v1.28.0 (cherry picked from commit 40bdab03bf7100a0faed1c58999f258d777f921a) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index 591a5af..75ec4f8 100644 --- a/buildah.spec +++ b/buildah.spec @@ -16,11 +16,11 @@ %global git0 https://%{import_path} %global built_tag v1.28.0 -%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%global built_tag_strip 1.28.0 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) Name: %{repo} -Version: %{gen_version} +Version: 1.28.0 License: ASL 2.0 and BSD and MIT and MPLv2.0 Release: %autorelease Summary: A command line tool used for creating OCI Images From e832453aaead3f2842bdcceb5c4741fabc914cc8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 7 Oct 2022 11:48:31 -0400 Subject: [PATCH 14/16] Revert "auto bump to v1.28.0" This reverts commit 40bdab03bf7100a0faed1c58999f258d777f921a done by autobuilder. (cherry picked from commit 66dfaf0fea9de26b025cf1c94716914a66cb0c26) Signed-off-by: Lokesh Mandvekar --- buildah.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index 75ec4f8..591a5af 100644 --- a/buildah.spec +++ b/buildah.spec @@ -16,11 +16,11 @@ %global git0 https://%{import_path} %global built_tag v1.28.0 -%global built_tag_strip 1.28.0 +%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) Name: %{repo} -Version: 1.28.0 +Version: %{gen_version} License: ASL 2.0 and BSD and MIT and MPLv2.0 Release: %autorelease Summary: A command line tool used for creating OCI Images From 321ea7da84097db468fcc4555d1a0a8e336f69eb Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 28 Nov 2022 14:19:16 +0000 Subject: [PATCH 15/16] auto bump to v1.28.2 (cherry picked from commit 5af76a5e554eaf07f67f995afc9373561922c05a) --- .gitignore | 1 + buildah.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4431f1e..7df5153 100644 --- a/.gitignore +++ b/.gitignore @@ -691,3 +691,4 @@ /v1.27.1.tar.gz /v1.27.2.tar.gz /v1.28.0.tar.gz +/v1.28.2.tar.gz diff --git a/buildah.spec b/buildah.spec index 591a5af..31095de 100644 --- a/buildah.spec +++ b/buildah.spec @@ -15,7 +15,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global built_tag v1.28.0 +%global built_tag v1.28.2 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) diff --git a/sources b/sources index 54a66f4..90e471a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.28.0.tar.gz) = f5e82a22648fa0d0ba7f5dcf3b97a2ec1182f31d3e03cd2624e01fe76fcdddf0a5605c59816eeef6401d151864b6b6be493c144b83f5667ab3947eea902f0086 +SHA512 (v1.28.2.tar.gz) = 2172e6554338e5b6a0ff8d22c343d168b7ea4eed5e691e75c34c84fefebdce3f5719718bd78bb112936a6c3252db743768ed65f5f421b0b9f37265aa074e1c81 From 075fa969f610e9afbbf9b3440bf9fda97f2565d2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 31 Jan 2023 17:26:03 +0530 Subject: [PATCH 16/16] bump to v1.29.0 Signed-off-by: Lokesh Mandvekar (cherry picked from commit c5da87970572224d3f8ca268e23eeb0e627cf4c0) Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + buildah.spec | 131 +++++++++++++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 108 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 7df5153..d977000 100644 --- a/.gitignore +++ b/.gitignore @@ -692,3 +692,4 @@ /v1.27.2.tar.gz /v1.28.0.tar.gz /v1.28.2.tar.gz +/v1.29.0.tar.gz diff --git a/buildah.spec b/buildah.spec index 31095de..6984b4e 100644 --- a/buildah.spec +++ b/buildah.spec @@ -15,7 +15,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} -%global built_tag v1.28.2 +%global built_tag v1.29.0 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) @@ -53,38 +53,119 @@ BuildRequires: libseccomp-static Requires: libseccomp >= 2.4.1-0 Suggests: cpp # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d' -Provides: bundled(golang(github.com/containerd/containerd)) = v1.5.9 -Provides: bundled(golang(github.com/containernetworking/cni)) = v1.0.1 -Provides: bundled(golang(github.com/containers/common)) = v0.47.4 -Provides: bundled(golang(github.com/containers/image/v5)) = v5.19.1 -Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.2 -Provides: bundled(golang(github.com/containers/storage)) = v1.38.2 -Provides: bundled(golang(github.com/docker/distribution)) = v2.8.0+incompatible -Provides: bundled(golang(github.com/docker/docker)) = v20.10.12+incompatible -Provides: bundled(golang(github.com/docker/go_units)) = v0.4.0 -Provides: bundled(golang(github.com/docker/libnetwork)) = v0.8.0_dev.2.0.20190625141545_5a177b73e316 -Provides: bundled(golang(github.com/fsouza/go_dockerclient)) = v1.7.8 +Provides: bundled(golang(github.com/Azure/go_ansiterm)) = v0.0.0_20210617225240_d185dfc1b5a1 +Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.2.1 +Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.6.0 +Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.9.6 +Provides: bundled(golang(github.com/VividCortex/ewma)) = v1.2.0 +Provides: bundled(golang(github.com/acarl005/stripansi)) = v0.0.0_20180116102854_5a71ef0e047d +Provides: bundled(golang(github.com/asaskevich/govalidator)) = v0.0.0_20210307081110_f21760c49a8d +Provides: bundled(golang(github.com/blang/semver/v4)) = v4.0.0 +Provides: bundled(golang(github.com/chzyer/readline)) = v1.5.1 +Provides: bundled(golang(github.com/container_orchestrated_devices/container_device_interface)) = v0.5.3 +Provides: bundled(golang(github.com/containerd/cgroups)) = v1.0.4 +Provides: bundled(golang(github.com/containerd/containerd)) = v1.6.15 +Provides: bundled(golang(github.com/containerd/stargz_snapshotter/estargz)) = v0.13.0 +Provides: bundled(golang(github.com/containernetworking/cni)) = v1.1.2 +Provides: bundled(golang(github.com/containernetworking/plugins)) = v1.2.0 +Provides: bundled(golang(github.com/containers/common)) = v0.51.0 +Provides: bundled(golang(github.com/containers/image/v5)) = v5.24.0 +Provides: bundled(golang(github.com/containers/libtrust)) = v0.0.0_20230121012942_c1716e8a8d01 +Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.7 +Provides: bundled(golang(github.com/containers/storage)) = v1.45.3 +Provides: bundled(golang(github.com/cyberphone/json_canonicalization)) = v0.0.0_20220623050100_57a0ce2678a7 +Provides: bundled(golang(github.com/cyphar/filepath_securejoin)) = v0.2.3 +Provides: bundled(golang(github.com/davecgh/go_spew)) = v1.1.1 +Provides: bundled(golang(github.com/disiqueira/gotree/v3)) = v3.0.2 +Provides: bundled(golang(github.com/docker/distribution)) = v2.8.1+incompatible +Provides: bundled(golang(github.com/docker/docker)) = v20.10.23+incompatible +Provides: bundled(golang(github.com/docker/docker_credential_helpers)) = v0.7.0 +Provides: bundled(golang(github.com/docker/go_connections)) = v0.4.1_0.20210727194412_58542c764a11 +Provides: bundled(golang(github.com/docker/go_units)) = v0.5.0 +Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.6.0 +Provides: bundled(golang(github.com/fsouza/go_dockerclient)) = v1.9.3 Provides: bundled(golang(github.com/ghodss/yaml)) = v1.0.0 +Provides: bundled(golang(github.com/go_openapi/analysis)) = v0.21.4 +Provides: bundled(golang(github.com/go_openapi/errors)) = v0.20.3 +Provides: bundled(golang(github.com/go_openapi/jsonpointer)) = v0.19.5 +Provides: bundled(golang(github.com/go_openapi/jsonreference)) = v0.20.0 +Provides: bundled(golang(github.com/go_openapi/loads)) = v0.21.2 +Provides: bundled(golang(github.com/go_openapi/runtime)) = v0.24.1 +Provides: bundled(golang(github.com/go_openapi/spec)) = v0.20.7 +Provides: bundled(golang(github.com/go_openapi/strfmt)) = v0.21.3 +Provides: bundled(golang(github.com/go_openapi/swag)) = v0.22.3 +Provides: bundled(golang(github.com/go_openapi/validate)) = v0.22.0 +Provides: bundled(golang(github.com/gogo/protobuf)) = v1.3.2 +Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0_20210331224755_41bb18bfe9da +Provides: bundled(golang(github.com/golang/protobuf)) = v1.5.2 +Provides: bundled(golang(github.com/google/go_cmp)) = v0.5.9 +Provides: bundled(golang(github.com/google/go_containerregistry)) = v0.12.1 +Provides: bundled(golang(github.com/google/go_intervals)) = v0.0.2 +Provides: bundled(golang(github.com/google/uuid)) = v1.3.0 +Provides: bundled(golang(github.com/gorilla/mux)) = v1.8.0 +Provides: bundled(golang(github.com/hashicorp/errwrap)) = v1.1.0 Provides: bundled(golang(github.com/hashicorp/go_multierror)) = v1.1.1 -Provides: bundled(golang(github.com/ishidawataru/sctp)) = v0.0.0_20210226210310_f2269e66cdee -Provides: bundled(golang(github.com/konsorten/go_windows_terminal_sequences)) = v1.0.3 +Provides: bundled(golang(github.com/imdario/mergo)) = v0.3.13 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = v1.0.1 +Provides: bundled(golang(github.com/jinzhu/copier)) = v0.3.5 +Provides: bundled(golang(github.com/josharian/intern)) = v1.0.0 +Provides: bundled(golang(github.com/json_iterator/go)) = v1.1.12 +Provides: bundled(golang(github.com/klauspost/compress)) = v1.15.15 +Provides: bundled(golang(github.com/klauspost/pgzip)) = v1.2.6_0.20220930104621_17e8dac29df8 +Provides: bundled(golang(github.com/letsencrypt/boulder)) = v0.0.0_20221109233200_85aa52084eaf +Provides: bundled(golang(github.com/mailru/easyjson)) = v0.7.7 +Provides: bundled(golang(github.com/manifoldco/promptui)) = v0.9.0 +Provides: bundled(golang(github.com/mattn/go_runewidth)) = v0.0.14 Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12 +Provides: bundled(golang(github.com/miekg/pkcs11)) = v1.1.1 +Provides: bundled(golang(github.com/mistifyio/go_zfs/v3)) = v3.0.0 +Provides: bundled(golang(github.com/mitchellh/mapstructure)) = v1.5.0 +Provides: bundled(golang(github.com/moby/sys/mount)) = v0.3.3 +Provides: bundled(golang(github.com/moby/sys/mountinfo)) = v0.6.2 +Provides: bundled(golang(github.com/moby/term)) = v0.0.0_20210619224110_3f7ff695adc6 +Provides: bundled(golang(github.com/modern_go/concurrent)) = v0.0.0_20180306012644_bacd9c7ef1dd +Provides: bundled(golang(github.com/modern_go/reflect2)) = v1.0.2 +Provides: bundled(golang(github.com/morikuni/aec)) = v1.0.0 +Provides: bundled(golang(github.com/nxadm/tail)) = v1.4.8 +Provides: bundled(golang(github.com/oklog/ulid)) = v1.3.1 Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.5 -Provides: bundled(golang(github.com/onsi/gomega)) = v1.18.1 +Provides: bundled(golang(github.com/onsi/gomega)) = v1.26.0 Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0 -Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.0.3_0.20211202193544_a5463b7f9c84 -Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.0 -Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.0.3_0.20210326190908_1c3f411f0417 -Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.0 -Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.10.0 -Provides: bundled(golang(github.com/openshift/imagebuilder)) = v1.2.2 +Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.1.0_rc2 +Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.4 +Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.0.3_0.20220825212826_86290f6a00fb +Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.1_0.20221014010322_58c91d646d86 +Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.10.2 +Provides: bundled(golang(github.com/openshift/imagebuilder)) = v1.2.4_0.20220711175835_4151e43600df +Provides: bundled(golang(github.com/ostreedev/ostree_go)) = v0.0.0_20210805093236_719684c64e4f Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1 -Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.9.2_0.20210429002308_3879420cc921 -Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1 -Provides: bundled(golang(github.com/spf13/cobra)) = v1.3.0 +Provides: bundled(golang(github.com/pmezard/go_difflib)) = v1.0.0 +Provides: bundled(golang(github.com/proglottis/gpgme)) = v0.1.3 +Provides: bundled(golang(github.com/rivo/uniseg)) = v0.4.3 +Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.10.0 +Provides: bundled(golang(github.com/sigstore/fulcio)) = v1.0.0 +Provides: bundled(golang(github.com/sigstore/rekor)) = v1.0.1 +Provides: bundled(golang(github.com/sigstore/sigstore)) = v1.5.1 +Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.9.0 +Provides: bundled(golang(github.com/spf13/cobra)) = v1.6.1 Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5 -Provides: bundled(golang(github.com/stretchr/testify)) = v1.7.0 +Provides: bundled(golang(github.com/stefanberger/go_pkcs11uri)) = v0.0.0_20201008174630_78d3cae3a980 +Provides: bundled(golang(github.com/stretchr/testify)) = v1.8.1 +Provides: bundled(golang(github.com/sylabs/sif/v2)) = v2.9.0 Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635 +Provides: bundled(golang(github.com/tchap/go_patricia)) = v2.3.0+incompatible +Provides: bundled(golang(github.com/theupdateframework/go_tuf)) = v0.5.2_0.20221207161717_9cb61d6e65f5 +Provides: bundled(golang(github.com/titanous/rocacheck)) = v0.0.0_20171023193734_afe73141d399 +Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.11 +Provides: bundled(golang(github.com/vbatts/tar_split)) = v0.11.2 +Provides: bundled(golang(github.com/vbauerster/mpb/v7)) = v7.5.3 +Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.2.1_beta.2 +Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f +Provides: bundled(golang(github.com/xeipuuv/gojsonpointer)) = v0.0.0_20190905194746_02993c407bfb +Provides: bundled(golang(github.com/xeipuuv/gojsonreference)) = v0.0.0_20180127040603_bd5ef7bd5415 +Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = v1.2.0 +Provides: bundled(golang(k8s.io/klog)) = v1.0.0 +Provides: bundled(golang(sigs.k8s.io/yaml)) = v1.3.0 %description The %{name} package provides a command line tool which can be used to diff --git a/sources b/sources index 90e471a..941b455 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.28.2.tar.gz) = 2172e6554338e5b6a0ff8d22c343d168b7ea4eed5e691e75c34c84fefebdce3f5719718bd78bb112936a6c3252db743768ed65f5f421b0b9f37265aa074e1c81 +SHA512 (v1.29.0.tar.gz) = 9d5dfe46007aeb9b7ae80a804b20c45b149156ec5edeb181ec00c021a0b6499394d676a7189389e51c2968fc60680c6d8438c11f46f5b7d523fba00d7cf17894