From 49ace2f01dc76c116a85d607c37ea78ca6839e90 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 12 Feb 2021 09:13:16 -0500 Subject: [PATCH 01/72] podman-2:3.0.0-1 - bump to v3.0.0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 16 +++++++++------- sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2ceb0ee..fee3856 100644 --- a/.gitignore +++ b/.gitignore @@ -1628,3 +1628,4 @@ /podman-9da4169.tar.gz /podman-f98605e.tar.gz /podman-763d522.tar.gz +/v3.0.0.tar.gz diff --git a/podman.spec b/podman.spec index 0d6f456..1c0933a 100644 --- a/podman.spec +++ b/podman.spec @@ -31,8 +31,6 @@ # To build a random user's fork/commit, comment out above line, # uncomment below line and replace the placeholders and commit0 below with the right info #%%global git0 https://github.com/$GITHUB_USER/$GITHUB_USER_REPO -%global commit0 763d522983b819ecd38689c9c0840069d1e2b530 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global repo_plugins dnsname # https://github.com/containers/dnsname @@ -43,7 +41,9 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.0.0-rc3 +%define built_tag v3.0.0 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define download_url %{git0}/archive/%{built_tag}.tar.gz Name: podman %if 0%{?fedora} @@ -56,11 +56,11 @@ Version: 3.0.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.208.dev.git%{shortcommit0}%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ -Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Source0: %{download_url} Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} @@ -409,8 +409,7 @@ is removed from the network, it will remove the entry from the hosts file. Each CNI network will have its own dnsmasq instance. %prep -%autosetup -Sgit -n %{name}-%{commit0} -rm -f docs/source/markdown/containers-mounts.conf.5.md +%autosetup -Sgit -n %{name}-%{built_tag_strip} # untar dnsname tar zxf %{SOURCE1} @@ -633,6 +632,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Feb 12 2021 Lokesh Mandvekar - 2:3.0.0-1 +- bump to v3.0.0 + * Tue Feb 09 2021 RH Container Bot - 2:3.0.0-0.208.dev.git763d522 - autobuilt 763d522 diff --git a/sources b/sources index c392d3a..605c6c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (podman-763d522.tar.gz) = fe0df1b62d2a844fb1478d47232f2b2b09cd0b73bea6509e323dc8306aeef92337980af017b2034eec7ad5b3ba73acfcc5c5137ff48b5008098345c993a47f17 +SHA512 (v3.0.0.tar.gz) = 2dca54b6836a612c71d1d6dfa67b93909852df42c2d15f8000f1ac02e218cf80a966f6a5b350d44fbdfb7606ebb6af0e12183313ff7f94e574d02faf2e9d93f3 From 00fe9b99977d0561e7abc30d411ef18e56291c94 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 22 Feb 2021 09:04:14 -0500 Subject: [PATCH 02/72] podman-2:3.0.1-1 - bump to v3.0.1 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fee3856..a42ddca 100644 --- a/.gitignore +++ b/.gitignore @@ -1629,3 +1629,4 @@ /podman-f98605e.tar.gz /podman-763d522.tar.gz /v3.0.0.tar.gz +/v3.0.1.tar.gz diff --git a/podman.spec b/podman.spec index 1c0933a..dc9561a 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v3.0.0 +%define built_tag v3.0.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,7 +51,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.0.0 +Version: 3.0.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, @@ -632,6 +632,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Feb 22 2021 Lokesh Mandvekar - 2:3.0.1-1 +- bump to v3.0.1 + * Fri Feb 12 2021 Lokesh Mandvekar - 2:3.0.0-1 - bump to v3.0.0 diff --git a/sources b/sources index 605c6c0..577481e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v3.0.0.tar.gz) = 2dca54b6836a612c71d1d6dfa67b93909852df42c2d15f8000f1ac02e218cf80a966f6a5b350d44fbdfb7606ebb6af0e12183313ff7f94e574d02faf2e9d93f3 +SHA512 (v3.0.1.tar.gz) = 4addc986ad94b512d90b675a5a1988eeef365fff02c3449fd310582245a91d4ee96ff9fd3c56ce333a972dca627aa28fbd468a4a363c5c8963524bb67bc26754 From b0c0d9f5d0c00da6fad7d262bad140a98a2bc897 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 1 Mar 2021 13:17:54 -0500 Subject: [PATCH 03/72] podman-2:3.0.1-2 - bump min deps Signed-off-by: Lokesh Mandvekar --- podman.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/podman.spec b/podman.spec index dc9561a..2302ca1 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.0.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -81,8 +81,8 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common -Requires: containernetworking-plugins >= 0.8.6-1 +Requires: containers-common >= 4:1-11 +Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.16-1 @@ -95,13 +95,14 @@ BuildRequires: btrfs-progs-devel %if 0%{?fedora} || 0%{?rhel} BuildRequires: ostree-devel Recommends: fuse-overlayfs >= 0.3-8 -Recommends: crun >= 0.14-2 %endif -%if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?rhel} +%if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: catatonit Requires: (container-selinux if selinux-policy) -Recommends: runc -Recommends: slirp4netns >= 0.3.0-2 +Requires: oci-runtime >= 2 +Recommends: crun >= 0.17-3 +Recommends: slirp4netns >= 1.1.8-1 +Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} %else Requires: catatonit Requires: container-selinux @@ -632,6 +633,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Mar 01 2021 Lokesh Mandvekar - 2:3.0.1-2 +- bump min deps + * Mon Feb 22 2021 Lokesh Mandvekar - 2:3.0.1-1 - bump to v3.0.1 From d0a3273daf99384e5d634a525edf3469c0090e1e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 4 Mar 2021 15:35:45 -0500 Subject: [PATCH 04/72] update comment Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 2302ca1..286af18 100644 --- a/podman.spec +++ b/podman.spec @@ -40,7 +40,7 @@ %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # Used for comparing with latest upstream tag -# to decide whether to autobuild (non-rawhide only) +# to decide whether to autobuild and set download_url (non-rawhide only) %define built_tag v3.0.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz From 75c7c8ca1492e2c110db1ba6fc4475218377c739 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 8 Mar 2021 22:02:09 +0000 Subject: [PATCH 05/72] podman-2:3.1.0-0.1.rc1 autobuilt v3.1.0-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a42ddca..08bc535 100644 --- a/.gitignore +++ b/.gitignore @@ -1630,3 +1630,4 @@ /podman-763d522.tar.gz /v3.0.0.tar.gz /v3.0.1.tar.gz +/v3.1.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 286af18..82af261 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.0.1 +%define built_tag v3.1.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.0.1 +Version: 3.1.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -633,6 +633,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Mar 08 2021 RH Container Bot - 2:3.1.0-0.1.rc1 +- autobuilt v3.1.0-rc1 + * Mon Mar 01 2021 Lokesh Mandvekar - 2:3.0.1-2 - bump min deps diff --git a/sources b/sources index 577481e..2168a7b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v3.0.1.tar.gz) = 4addc986ad94b512d90b675a5a1988eeef365fff02c3449fd310582245a91d4ee96ff9fd3c56ce333a972dca627aa28fbd468a4a363c5c8963524bb67bc26754 +SHA512 (v3.1.0-rc1.tar.gz) = 549d4999bf687eb8e48a8e3bf6c7bb094432816f05f54e29427d54308051824641e75f608996dc130f9f096544d5383d5d22fe3c1557e37f25e77d7faa240378 From 5be5a47b5967995583c25734a9e084337096b188 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 9 Mar 2021 11:57:14 -0500 Subject: [PATCH 06/72] fix build issues Signed-off-by: Lokesh Mandvekar --- podman.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 82af261..6d809d2 100644 --- a/podman.spec +++ b/podman.spec @@ -461,7 +461,7 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname popd -%{__make} docs +%{__make} docs docker-docs %install install -dp %{buildroot}%{_unitdir} @@ -472,6 +472,7 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build install.systemd \ install.completions \ install.docker \ + install.docker-docs-nobuild \ %if 0%{?fedora} || 0%{?rhel} install.remote-nobuild \ %endif From 96f08cac353dc24f9cdc7bcd41b1b7ace7486de3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 23 Mar 2021 22:27:42 +0000 Subject: [PATCH 07/72] podman-2:3.1.0-0.2.rc2 autobuilt v3.1.0-rc2 Signed-off-by: RH Container Bot --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 6d809d2..30bac02 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.1.0-rc1 +%define built_tag v3.1.0-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 0.2.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -634,6 +634,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Mar 23 2021 RH Container Bot - 2:3.1.0-0.2.rc2 +- autobuilt v3.1.0-rc2 + * Mon Mar 08 2021 RH Container Bot - 2:3.1.0-0.1.rc1 - autobuilt v3.1.0-rc1 From d859d5df1933bf6ce1c81ba8b94c2afcd269e041 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 23 Mar 2021 18:44:56 -0400 Subject: [PATCH 08/72] upload sources to lookaside cache Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 08bc535..c7a651e 100644 --- a/.gitignore +++ b/.gitignore @@ -1631,3 +1631,4 @@ /v3.0.0.tar.gz /v3.0.1.tar.gz /v3.1.0-rc1.tar.gz +/v3.1.0-rc2.tar.gz diff --git a/sources b/sources index 2168a7b..65ed12d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v3.1.0-rc1.tar.gz) = 549d4999bf687eb8e48a8e3bf6c7bb094432816f05f54e29427d54308051824641e75f608996dc130f9f096544d5383d5d22fe3c1557e37f25e77d7faa240378 +SHA512 (v3.1.0-rc2.tar.gz) = 4f16f6ba83717b252038aa330f59dd64707323a9bfefb442860a8cc3f7e0263f8aebd613902c6c282c7fdd8c9e402e0162306900d25a591b8f0767e74ff589ad From 1e1651a3ef847ee58221162ea79ce8c45a397fd2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 23 Mar 2021 21:41:07 -0400 Subject: [PATCH 09/72] fix build issues on 32-bit Signed-off-by: Lokesh Mandvekar --- podman.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/podman.spec b/podman.spec index 30bac02..b008fc0 100644 --- a/podman.spec +++ b/podman.spec @@ -411,6 +411,9 @@ file. Each CNI network will have its own dnsmasq instance. %prep %autosetup -Sgit -n %{name}-%{built_tag_strip} +%ifarch %{ix86} armv7hl +sed -i 's/id128StringMax := C.ulong/id128StringMax := C.uint/' vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go +%endif # untar dnsname tar zxf %{SOURCE1} From 54c0e54a1c016c7fd7d71a68f466c24ab483c7d8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 25 Mar 2021 11:43:24 -0400 Subject: [PATCH 10/72] podman-2:3.1.0-0.3.rc2 - bump dnsname and crun dep Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 34 ++++++++++++++-------------------- sources | 2 +- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index c7a651e..178268c 100644 --- a/.gitignore +++ b/.gitignore @@ -1632,3 +1632,4 @@ /v3.0.1.tar.gz /v3.1.0-rc1.tar.gz /v3.1.0-rc2.tar.gz +/dnsname-3b29247.tar.gz diff --git a/podman.spec b/podman.spec index b008fc0..7031af6 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ # https://github.com/containers/dnsname %global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} -%global commit_plugins c654c95366ac5f309ca3e5727c9b858864247328 +%global commit_plugins 3b29247c46d2811610ad57dd9fdae61157532a5b %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # Used for comparing with latest upstream tag @@ -56,7 +56,7 @@ Version: 3.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc2%{?dist} +Release: 0.3.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -79,6 +79,7 @@ BuildRequires: libseccomp-devel BuildRequires: libselinux-devel BuildRequires: pkgconfig BuildRequires: make +BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel Requires: containers-common >= 4:1-11 @@ -86,29 +87,19 @@ Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.16-1 -Requires: oci-runtime +Requires: oci-runtime >= 2 +Requires: (container-selinux if selinux-policy) +Requires: oci-runtime >= 2 +Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} +Recommends: fuse-overlayfs >= 0.3-8 +Recommends: catatonit +Recommends: crun >= 0.18-4 +Recommends: slirp4netns >= 1.1.8-1 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} && ! 0%{?rhel} BuildRequires: btrfs-progs-devel %endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: ostree-devel -Recommends: fuse-overlayfs >= 0.3-8 -%endif -%if 0%{?fedora} || 0%{?rhel} >= 8 -Recommends: catatonit -Requires: (container-selinux if selinux-policy) -Requires: oci-runtime >= 2 -Recommends: crun >= 0.17-3 -Recommends: slirp4netns >= 1.1.8-1 -Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} -%else -Requires: catatonit -Requires: container-selinux -Requires: runc -Requires: slirp4netns >= 0.3.0-2 -%endif # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort @@ -637,6 +628,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Mar 25 2021 Lokesh Mandvekar - 2:3.1.0-0.3.rc2 +- bump dnsname and crun dep + * Tue Mar 23 2021 RH Container Bot - 2:3.1.0-0.2.rc2 - autobuilt v3.1.0-rc2 diff --git a/sources b/sources index 65ed12d..35378bb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 +SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d SHA512 (v3.1.0-rc2.tar.gz) = 4f16f6ba83717b252038aa330f59dd64707323a9bfefb442860a8cc3f7e0263f8aebd613902c6c282c7fdd8c9e402e0162306900d25a591b8f0767e74ff589ad From 4ff20902d50dd427b6226e4355f9d53690848b6a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 30 Mar 2021 13:25:27 +0000 Subject: [PATCH 11/72] podman-2:3.1.0-1 autobuilt v3.1.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 178268c..a8ef17f 100644 --- a/.gitignore +++ b/.gitignore @@ -1633,3 +1633,4 @@ /v3.1.0-rc1.tar.gz /v3.1.0-rc2.tar.gz /dnsname-3b29247.tar.gz +/v3.1.0.tar.gz diff --git a/podman.spec b/podman.spec index 7031af6..642ca14 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.1.0-rc2 +%define built_tag v3.1.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.3.rc2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -628,6 +628,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Mar 30 2021 RH Container Bot - 2:3.1.0-1 +- autobuilt v3.1.0 + * Thu Mar 25 2021 Lokesh Mandvekar - 2:3.1.0-0.3.rc2 - bump dnsname and crun dep diff --git a/sources b/sources index 35378bb..8347d73 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.0-rc2.tar.gz) = 4f16f6ba83717b252038aa330f59dd64707323a9bfefb442860a8cc3f7e0263f8aebd613902c6c282c7fdd8c9e402e0162306900d25a591b8f0767e74ff589ad +SHA512 (v3.1.0.tar.gz) = 534a16acbfc75c515c1abaf603ecb6af636039cd8208ce415979f577895174404bcf5e75c8fe6646f0f9f3032e4a3da9b0927d36f0e7fb525e19800cf8bc610e From 4d65d602b91dcefa99b48255a8b65980bebbe6a6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 5 Apr 2021 10:32:58 -0400 Subject: [PATCH 12/72] podman- 2:3.1.0-2 - requires crun instead of recommends Signed-off-by: Lokesh Mandvekar --- podman.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 642ca14..e4ce1a3 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -87,13 +87,11 @@ Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.16-1 -Requires: oci-runtime >= 2 Requires: (container-selinux if selinux-policy) -Requires: oci-runtime >= 2 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit -Recommends: crun >= 0.18-4 +Requires: crun >= 0.18-4 Recommends: slirp4netns >= 1.1.8-1 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 @@ -628,6 +626,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Apr 05 2021 Lokesh Mandvekar - 2:3.1.0-2 +- requires crun instead of recommends + * Tue Mar 30 2021 RH Container Bot - 2:3.1.0-1 - autobuilt v3.1.0 From 894d8aa4f62ae04a5ce549b52860839ebad8fa6b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 12 Apr 2021 10:08:14 -0400 Subject: [PATCH 13/72] podman-2:3.1.0-3 - bump dependencies Signed-off-by: Lokesh Mandvekar --- podman.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index e4ce1a3..451c34f 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.1.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -82,16 +82,18 @@ BuildRequires: make BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common >= 4:1-11 +Requires: containers-common >= 4:1-14 Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.16-1 -Requires: (container-selinux if selinux-policy) +Requires: (container-selinux >= 2:2.160.0-1 if selinux-policy) Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit -Requires: crun >= 0.18-4 +Requires: oci-runtime >= 2 +Recommends: crun >= 0.19-1 +Requires: crun < 0.19-1 Recommends: slirp4netns >= 1.1.8-1 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 @@ -626,6 +628,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Apr 12 2021 Lokesh Mandvekar - 2:3.1.0-3 +- bump dependencies + * Mon Apr 05 2021 Lokesh Mandvekar - 2:3.1.0-2 - requires crun instead of recommends From 8bc25b5d1dce8fcfde0b517ba6674feb3dac4b25 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 19 Apr 2021 13:17:53 +0000 Subject: [PATCH 14/72] podman-2:3.1.1-1 autobuilt v3.1.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a8ef17f..cbec556 100644 --- a/.gitignore +++ b/.gitignore @@ -1634,3 +1634,4 @@ /v3.1.0-rc2.tar.gz /dnsname-3b29247.tar.gz /v3.1.0.tar.gz +/v3.1.1.tar.gz diff --git a/podman.spec b/podman.spec index 451c34f..03c268a 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.1.0 +%define built_tag v3.1.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.1.0 +Version: 3.1.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 3%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -628,6 +628,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Apr 19 2021 RH Container Bot - 2:3.1.1-1 +- autobuilt v3.1.1 + * Mon Apr 12 2021 Lokesh Mandvekar - 2:3.1.0-3 - bump dependencies diff --git a/sources b/sources index 8347d73..b2e7baa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.0.tar.gz) = 534a16acbfc75c515c1abaf603ecb6af636039cd8208ce415979f577895174404bcf5e75c8fe6646f0f9f3032e4a3da9b0927d36f0e7fb525e19800cf8bc610e +SHA512 (v3.1.1.tar.gz) = 2348b06c81352a86f51ac9c5ab7fe21e1ce577dfd0164c043baa2fb8a89928e3fdcc13fa75dd731572175ba4232fa27a2e31a3715a2b1596a38a64de919da1b7 From 6508688847032d591a24246fb1382d598b0018bb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 19 Apr 2021 09:30:59 -0400 Subject: [PATCH 15/72] podman-2:3.1.1-2 - update containers-common and related deps Signed-off-by: Lokesh Mandvekar --- podman.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/podman.spec b/podman.spec index 03c268a..29bd8f8 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Version: 3.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -82,18 +82,14 @@ BuildRequires: make BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common >= 4:1-14 +Requires: containers-common >= 4:1-15 Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.16-1 -Requires: (container-selinux >= 2:2.160.0-1 if selinux-policy) Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit -Requires: oci-runtime >= 2 -Recommends: crun >= 0.19-1 -Requires: crun < 0.19-1 Recommends: slirp4netns >= 1.1.8-1 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 @@ -628,6 +624,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Apr 19 2021 Lokesh Mandvekar - 2:3.1.1-2 +- update containers-common and related deps + * Mon Apr 19 2021 RH Container Bot - 2:3.1.1-1 - autobuilt v3.1.1 From 8454f8897081c4a21895b669af391f98b257257d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 22 Apr 2021 09:07:46 -0400 Subject: [PATCH 16/72] buildah-2:3.1.2-1 - bump to v3.1.2 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cbec556..38f946f 100644 --- a/.gitignore +++ b/.gitignore @@ -1635,3 +1635,4 @@ /dnsname-3b29247.tar.gz /v3.1.0.tar.gz /v3.1.1.tar.gz +/v3.1.2.tar.gz diff --git a/podman.spec b/podman.spec index 29bd8f8..65e64ae 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.1.1 +%define built_tag v3.1.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.1.1 +Version: 3.1.2 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -86,7 +86,7 @@ Requires: containers-common >= 4:1-15 Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables -Requires: conmon >= 2:2.0.16-1 +Requires: conmon >= 2:2.0.27-2 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit @@ -624,6 +624,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Apr 22 2021 Lokesh Mandvekar - 2:3.1.2-1 +- bump to v3.1.2 + * Mon Apr 19 2021 Lokesh Mandvekar - 2:3.1.1-2 - update containers-common and related deps diff --git a/sources b/sources index b2e7baa..8d469a2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.1.tar.gz) = 2348b06c81352a86f51ac9c5ab7fe21e1ce577dfd0164c043baa2fb8a89928e3fdcc13fa75dd731572175ba4232fa27a2e31a3715a2b1596a38a64de919da1b7 +SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d From b328962129f2a8853916c9e8cdded51ede013e8e Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 5 May 2021 21:00:24 +0000 Subject: [PATCH 17/72] podman-2:3.2.0-0.1.rc1 autobuilt v3.2.0-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 38f946f..e4103b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1636,3 +1636,4 @@ /v3.1.0.tar.gz /v3.1.1.tar.gz /v3.1.2.tar.gz +/v3.2.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 65e64ae..134931f 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.1.2 +%define built_tag v3.2.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.1.2 +Version: 3.2.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -624,6 +624,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed May 05 2021 RH Container Bot - 2:3.2.0-0.1.rc1 +- autobuilt v3.2.0-rc1 + * Thu Apr 22 2021 Lokesh Mandvekar - 2:3.1.2-1 - bump to v3.1.2 diff --git a/sources b/sources index 8d469a2..a411208 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d +SHA512 (v3.2.0-rc1.tar.gz) = f916a5fed3b62c93a25983631f4fbfb5593eb2315b0b8ec7065dd6500b41415165d9f42ca6dc8ec3727387974380533b3b6bec97fa5ca658334f54ecb97468e1 From 08d06c735e2fdd51da01932ea969892ff3570704 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 11 May 2021 09:45:24 -0400 Subject: [PATCH 18/72] podman-3:3.1.2-2 - revert to v3.1.2 with Epoch bump to 3 to account for bad v3.2.0-rc1 in stable Signed-off-by: Lokesh Mandvekar --- podman.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/podman.spec b/podman.spec index 134931f..a92b046 100644 --- a/podman.spec +++ b/podman.spec @@ -41,22 +41,22 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.0-rc1 +%define built_tag v3.1.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Name: podman %if 0%{?fedora} -Epoch: 2 +Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.0 +Version: 3.1.2 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -624,6 +624,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue May 11 2021 Lokesh Mandvekar - 3:3.1.2-2 +- revert to v3.1.2 with Epoch bump to 3 to account for bad v3.2.0-rc1 in stable + * Wed May 05 2021 RH Container Bot - 2:3.2.0-0.1.rc1 - autobuilt v3.2.0-rc1 diff --git a/sources b/sources index a411208..8d469a2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.2.0-rc1.tar.gz) = f916a5fed3b62c93a25983631f4fbfb5593eb2315b0b8ec7065dd6500b41415165d9f42ca6dc8ec3727387974380533b3b6bec97fa5ca658334f54ecb97468e1 +SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d From b81a99de7125d8bef2477b6a8d83abe3fa45d878 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 11 May 2021 14:49:58 +0000 Subject: [PATCH 19/72] podman-3:3.2.0-0.1.rc1 autobuilt v3.2.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index a92b046..9385d77 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.1.2 +%define built_tag v3.2.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.1.2 +Version: 3.2.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -624,6 +624,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue May 11 2021 RH Container Bot - 3:3.2.0-0.1.rc1 +- autobuilt v3.2.0-rc1 + * Tue May 11 2021 Lokesh Mandvekar - 3:3.1.2-2 - revert to v3.1.2 with Epoch bump to 3 to account for bad v3.2.0-rc1 in stable diff --git a/sources b/sources index 8d469a2..a411208 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d +SHA512 (v3.2.0-rc1.tar.gz) = f916a5fed3b62c93a25983631f4fbfb5593eb2315b0b8ec7065dd6500b41415165d9f42ca6dc8ec3727387974380533b3b6bec97fa5ca658334f54ecb97468e1 From 2dd32ed7fb50eeb0d69420447ea717b62c674dd6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 12 May 2021 14:29:58 -0400 Subject: [PATCH 20/72] Revert "podman-3:3.2.0-0.1.rc1" looks like there was an active gitlab pipeline which pushed this commit This reverts commit b81a99de7125d8bef2477b6a8d83abe3fa45d878. --- podman.spec | 9 +++------ sources | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/podman.spec b/podman.spec index 9385d77..a92b046 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.0-rc1 +%define built_tag v3.1.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.0 +Version: 3.1.2 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -624,9 +624,6 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog -* Tue May 11 2021 RH Container Bot - 3:3.2.0-0.1.rc1 -- autobuilt v3.2.0-rc1 - * Tue May 11 2021 Lokesh Mandvekar - 3:3.1.2-2 - revert to v3.1.2 with Epoch bump to 3 to account for bad v3.2.0-rc1 in stable diff --git a/sources b/sources index a411208..8d469a2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.2.0-rc1.tar.gz) = f916a5fed3b62c93a25983631f4fbfb5593eb2315b0b8ec7065dd6500b41415165d9f42ca6dc8ec3727387974380533b3b6bec97fa5ca658334f54ecb97468e1 +SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d From 6f0c0340943152c27977b46b871fa513fb4103f9 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 12 May 2021 14:37:00 -0400 Subject: [PATCH 21/72] Backport upstream bugfix: https://github.com/containers/podman/pull/10253 This fixes relabeling when running podman in --privileged mode. --- ...ch-to-relabel-if-selinux-not-enabled.patch | 82 +++++++++++++++++++ podman.spec | 6 +- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch diff --git a/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch b/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch new file mode 100644 index 0000000..0364149 --- /dev/null +++ b/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch @@ -0,0 +1,82 @@ +From f528511bf6c7630408dc630d05197a49d39479c4 Mon Sep 17 00:00:00 2001 +From: Daniel J Walsh +Date: Thu, 6 May 2021 17:41:04 -0400 +Subject: [PATCH] Revert Patch to relabel if selinux not enabled + +Revert : https://github.com/containers/podman/pull/9895 + +Turns out that if Docker is in --selinux-enabeled, it still relabels if +the user tells the system to, even if running a --privileged container +or if the selinux separation is disabled --security-opt label=disable. + +Signed-off-by: Daniel J Walsh +--- + libpod/container_internal_linux.go | 10 ++-------- + test/system/410-selinux.bats | 13 ++++++++----- + 2 files changed, 10 insertions(+), 13 deletions(-) + +diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go +index f0608e2b2..14816f6aa 100644 +--- a/libpod/container_internal_linux.go ++++ b/libpod/container_internal_linux.go +@@ -377,14 +377,8 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { + case "z": + fallthrough + case "Z": +- if c.MountLabel() != "" { +- if c.ProcessLabel() != "" { +- if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil { +- return nil, err +- } +- } else { +- logrus.Infof("Not relabeling volume %q in container %s as SELinux is disabled", m.Source, c.ID()) +- } ++ if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil { ++ return nil, err + } + + default: +diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats +index 95233c1e6..f8cee0e59 100644 +--- a/test/system/410-selinux.bats ++++ b/test/system/410-selinux.bats +@@ -198,20 +198,23 @@ function check_label() { + skip_if_no_selinux + + LABEL="system_u:object_r:tmp_t:s0" ++ RELABEL="system_u:object_r:container_file_t:s0" + tmpdir=$PODMAN_TMPDIR/vol + touch $tmpdir + chcon -vR ${LABEL} $tmpdir + ls -Z $tmpdir + + run_podman run -v $tmpdir:/test $IMAGE cat /proc/self/attr/current +- level=$(secon -l $output) + run ls -dZ ${tmpdir} + is "$output" ${LABEL} "No Relabel Correctly" + +- run_podman run -v $tmpdir:/test:Z --security-opt label=disable $IMAGE cat /proc/self/attr/current +- level=$(secon -l $output) ++ run_podman run -v $tmpdir:/test:z --security-opt label=disable $IMAGE cat /proc/self/attr/current ++ run ls -dZ $tmpdir ++ is "$output" ${RELABEL} "Privileged Relabel Correctly" ++ ++ run_podman run -v $tmpdir:/test:z --privileged $IMAGE cat /proc/self/attr/current + run ls -dZ $tmpdir +- is "$output" ${LABEL} "No Privileged Relabel Correctly" ++ is "$output" ${RELABEL} "Privileged Relabel Correctly" + + run_podman run -v $tmpdir:/test:Z $IMAGE cat /proc/self/attr/current + level=$(secon -l $output) +@@ -220,7 +223,7 @@ function check_label() { + + run_podman run -v $tmpdir:/test:z $IMAGE cat /proc/self/attr/current + run ls -dZ $tmpdir +- is "$output" "system_u:object_r:container_file_t:s0" "Shared Relabel Correctly" ++ is "$output" ${RELABEL} "Shared Relabel Correctly" + } + + # vim: filetype=sh +-- +2.30.2 + diff --git a/podman.spec b/podman.spec index a92b046..37b95c6 100644 --- a/podman.spec +++ b/podman.spec @@ -56,12 +56,13 @@ Version: 3.1.2 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{download_url} Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz +Patch: 0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -624,6 +625,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed May 12 2021 Dusty Mabe - 3:3.1.2-3 +- Backport upstream bugfix: https://github.com/containers/podman/pull/10253 + * Tue May 11 2021 Lokesh Mandvekar - 3:3.1.2-2 - revert to v3.1.2 with Epoch bump to 3 to account for bad v3.2.0-rc1 in stable From 54e7ba886bffdc532310f9221d7b77f8dd3a0662 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 21 May 2021 01:56:12 +0000 Subject: [PATCH 22/72] podman-3:3.2.0-0.1.rc2 autobuilt v3.2.0-rc2 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e4103b8..b71e758 100644 --- a/.gitignore +++ b/.gitignore @@ -1637,3 +1637,4 @@ /v3.1.1.tar.gz /v3.1.2.tar.gz /v3.2.0-rc1.tar.gz +/v3.2.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 37b95c6..1d050b1 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.1.2 +%define built_tag v3.2.0-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -51,12 +51,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.1.2 +Version: 3.2.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 3%{?dist} +Release: 0.1.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -625,6 +625,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri May 21 2021 RH Container Bot - 3:3.2.0-0.1.rc2 +- autobuilt v3.2.0-rc2 + * Wed May 12 2021 Dusty Mabe - 3:3.1.2-3 - Backport upstream bugfix: https://github.com/containers/podman/pull/10253 diff --git a/sources b/sources index 8d469a2..a6309a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.1.2.tar.gz) = fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d +SHA512 (v3.2.0-rc2.tar.gz) = 6baf5e7c01e9780dd9a9c590c92c896aebb8e17bde2cba7eb5f2046cd9b0906d98b1f9bd83039868c29a8358a6d8003e53d1909d3c0d158a781ac123e5e8d456 From c56edc6b676309a82bfd07361b64435fdb809372 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 20 May 2021 22:26:33 -0400 Subject: [PATCH 23/72] remove patch merged upstream Signed-off-by: Lokesh Mandvekar --- ...ch-to-relabel-if-selinux-not-enabled.patch | 82 ------------------- podman.spec | 1 - 2 files changed, 83 deletions(-) delete mode 100644 0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch diff --git a/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch b/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch deleted file mode 100644 index 0364149..0000000 --- a/0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch +++ /dev/null @@ -1,82 +0,0 @@ -From f528511bf6c7630408dc630d05197a49d39479c4 Mon Sep 17 00:00:00 2001 -From: Daniel J Walsh -Date: Thu, 6 May 2021 17:41:04 -0400 -Subject: [PATCH] Revert Patch to relabel if selinux not enabled - -Revert : https://github.com/containers/podman/pull/9895 - -Turns out that if Docker is in --selinux-enabeled, it still relabels if -the user tells the system to, even if running a --privileged container -or if the selinux separation is disabled --security-opt label=disable. - -Signed-off-by: Daniel J Walsh ---- - libpod/container_internal_linux.go | 10 ++-------- - test/system/410-selinux.bats | 13 ++++++++----- - 2 files changed, 10 insertions(+), 13 deletions(-) - -diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go -index f0608e2b2..14816f6aa 100644 ---- a/libpod/container_internal_linux.go -+++ b/libpod/container_internal_linux.go -@@ -377,14 +377,8 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { - case "z": - fallthrough - case "Z": -- if c.MountLabel() != "" { -- if c.ProcessLabel() != "" { -- if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil { -- return nil, err -- } -- } else { -- logrus.Infof("Not relabeling volume %q in container %s as SELinux is disabled", m.Source, c.ID()) -- } -+ if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil { -+ return nil, err - } - - default: -diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats -index 95233c1e6..f8cee0e59 100644 ---- a/test/system/410-selinux.bats -+++ b/test/system/410-selinux.bats -@@ -198,20 +198,23 @@ function check_label() { - skip_if_no_selinux - - LABEL="system_u:object_r:tmp_t:s0" -+ RELABEL="system_u:object_r:container_file_t:s0" - tmpdir=$PODMAN_TMPDIR/vol - touch $tmpdir - chcon -vR ${LABEL} $tmpdir - ls -Z $tmpdir - - run_podman run -v $tmpdir:/test $IMAGE cat /proc/self/attr/current -- level=$(secon -l $output) - run ls -dZ ${tmpdir} - is "$output" ${LABEL} "No Relabel Correctly" - -- run_podman run -v $tmpdir:/test:Z --security-opt label=disable $IMAGE cat /proc/self/attr/current -- level=$(secon -l $output) -+ run_podman run -v $tmpdir:/test:z --security-opt label=disable $IMAGE cat /proc/self/attr/current -+ run ls -dZ $tmpdir -+ is "$output" ${RELABEL} "Privileged Relabel Correctly" -+ -+ run_podman run -v $tmpdir:/test:z --privileged $IMAGE cat /proc/self/attr/current - run ls -dZ $tmpdir -- is "$output" ${LABEL} "No Privileged Relabel Correctly" -+ is "$output" ${RELABEL} "Privileged Relabel Correctly" - - run_podman run -v $tmpdir:/test:Z $IMAGE cat /proc/self/attr/current - level=$(secon -l $output) -@@ -220,7 +223,7 @@ function check_label() { - - run_podman run -v $tmpdir:/test:z $IMAGE cat /proc/self/attr/current - run ls -dZ $tmpdir -- is "$output" "system_u:object_r:container_file_t:s0" "Shared Relabel Correctly" -+ is "$output" ${RELABEL} "Shared Relabel Correctly" - } - - # vim: filetype=sh --- -2.30.2 - diff --git a/podman.spec b/podman.spec index 1d050b1..fb27b2f 100644 --- a/podman.spec +++ b/podman.spec @@ -62,7 +62,6 @@ License: ASL 2.0 URL: https://%{name}.io/ Source0: %{download_url} Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz -Patch: 0001-Revert-Patch-to-relabel-if-selinux-not-enabled.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. From 8a4834b70eef054c5bc52735ae3a8fc6ec6a5eb9 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 26 May 2021 18:33:45 +0000 Subject: [PATCH 24/72] podman-3:3.2.0-0.2.rc3 autobuilt v3.2.0-rc3 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b71e758..f807e93 100644 --- a/.gitignore +++ b/.gitignore @@ -1638,3 +1638,4 @@ /v3.1.2.tar.gz /v3.2.0-rc1.tar.gz /v3.2.0-rc2.tar.gz +/v3.2.0-rc3.tar.gz diff --git a/podman.spec b/podman.spec index fb27b2f..4f8660b 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.0-rc2 +%define built_tag v3.2.0-rc3 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc2%{?dist} +Release: 0.2.rc3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -624,6 +624,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed May 26 2021 RH Container Bot - 3:3.2.0-0.2.rc3 +- autobuilt v3.2.0-rc3 + * Fri May 21 2021 RH Container Bot - 3:3.2.0-0.1.rc2 - autobuilt v3.2.0-rc2 diff --git a/sources b/sources index a6309a3..b69b462 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.2.0-rc2.tar.gz) = 6baf5e7c01e9780dd9a9c590c92c896aebb8e17bde2cba7eb5f2046cd9b0906d98b1f9bd83039868c29a8358a6d8003e53d1909d3c0d158a781ac123e5e8d456 +SHA512 (v3.2.0-rc3.tar.gz) = cf513d6edc3623ae51908bcad14bc2bbcc873ac7f5b671d578e437878ac51d96b001e085a213b6390c339908064e8ed1518e902df531fd96d977a96993a15c58 From 7c0e4206b6dad5a83a03f34c5bf5a50cae23a82c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 4 Jun 2021 19:09:18 +0000 Subject: [PATCH 25/72] podman-3:3.2.0-1 autobuilt v3.2.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f807e93..ca99d30 100644 --- a/.gitignore +++ b/.gitignore @@ -1639,3 +1639,4 @@ /v3.2.0-rc1.tar.gz /v3.2.0-rc2.tar.gz /v3.2.0-rc3.tar.gz +/v3.2.0.tar.gz diff --git a/podman.spec b/podman.spec index 4f8660b..107b94c 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.0-rc3 +%define built_tag v3.2.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc3%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -624,6 +624,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Jun 04 2021 RH Container Bot - 3:3.2.0-1 +- autobuilt v3.2.0 + * Wed May 26 2021 RH Container Bot - 3:3.2.0-0.2.rc3 - autobuilt v3.2.0-rc3 diff --git a/sources b/sources index b69b462..87725b1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d -SHA512 (v3.2.0-rc3.tar.gz) = cf513d6edc3623ae51908bcad14bc2bbcc873ac7f5b671d578e437878ac51d96b001e085a213b6390c339908064e8ed1518e902df531fd96d977a96993a15c58 +SHA512 (v3.2.0.tar.gz) = 7db6145e5b303b29b600e9393d0d872931bbe39c385c4e9904b59b1b9a9b87f0191374cc8a13e021d4446c31e461f7be3765c2d18bcb8461df732c89fc848c96 From 8cd0a2dd63362dfb23eebdfdb09937f34f1a8296 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 8 Jun 2021 10:30:35 -0400 Subject: [PATCH 26/72] podman-3:3.2.0-2 - include podman-machine-cni in podman-plugins subpackage Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 43 ++++++++++++++++++++++++++++++++++++++----- sources | 1 + 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ca99d30..533f4c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1640,3 +1640,4 @@ /v3.2.0-rc2.tar.gz /v3.2.0-rc3.tar.gz /v3.2.0.tar.gz +/podman-machine-cni-afab2d8.tar.gz diff --git a/podman.spec b/podman.spec index 107b94c..e10cf0f 100644 --- a/podman.spec +++ b/podman.spec @@ -32,13 +32,22 @@ # uncomment below line and replace the placeholders and commit0 below with the right info #%%global git0 https://github.com/$GITHUB_USER/$GITHUB_USER_REPO +# dnsname %global repo_plugins dnsname # https://github.com/containers/dnsname -%global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} +%global import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} %global commit_plugins 3b29247c46d2811610ad57dd9fdae61157532a5b %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) +# podman-machine-cni +%global repo_mcni %{name}-machine-cni +# https://github.com/containers/podman-machine-cni +%global import_path_mcni %{provider}.%{provider_tld}/%{project}/%{repo_mcni} +%global git_mcni https://%{import_path_mcni} +%global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396 +%global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) + # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) %define built_tag v3.2.0 @@ -56,12 +65,13 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{download_url} Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz +Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -82,8 +92,8 @@ BuildRequires: make BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common >= 4:1-15 -Requires: containernetworking-plugins >= 0.9.1-1 +Requires: containers-common >= 4:1-16 +Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.27-2 @@ -405,6 +415,9 @@ sed -i 's/id128StringMax := C.ulong/id128StringMax := C.uint/' vendor/github.com # untar dnsname tar zxf %{SOURCE1} +# untar %%{name}-machine-cni +tar zxf %{SOURCE2} + %build export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) @@ -451,6 +464,17 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname popd +pushd %{name}-machine-cni-%{commit_mcni} +mkdir _build +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../../ src/%{import_path_mcni} +popd +ln -s vendor src +export GOPATH=$(pwd)/_build:$(pwd) +%gobuild -o bin/%{name}-machine %{import_path_mcni}/plugins/meta/%{name}-machine +popd + %{__make} docs docker-docs %install @@ -469,11 +493,16 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build mv pkg/hooks/README.md pkg/hooks/README-hooks.md -# install plugins +# install dnsname plugin pushd dnsname-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd +# install machine-cni plugin +pushd %{name}-machine-cni-%{commit_mcni} +%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install +popd + # do not include docker and podman-remote man pages in main package for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do echo "$file*" >> podman.file-list @@ -621,9 +650,13 @@ exit 0 %license dnsname-%{commit_plugins}/LICENSE %doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md} %{_libexecdir}/cni/dnsname +%{_libexecdir}/cni/%{name}-machine # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Jun 08 2021 Lokesh Mandvekar - 3:3.2.0-2 +- include podman-machine-cni in podman-plugins subpackage + * Fri Jun 04 2021 RH Container Bot - 3:3.2.0-1 - autobuilt v3.2.0 diff --git a/sources b/sources index 87725b1..b6959c1 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d +SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 SHA512 (v3.2.0.tar.gz) = 7db6145e5b303b29b600e9393d0d872931bbe39c385c4e9904b59b1b9a9b87f0191374cc8a13e021d4446c31e461f7be3765c2d18bcb8461df732c89fc848c96 From 9f1960ebbb2759d57b6b918b6ecb639cdfdf655d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 8 Jun 2021 16:52:04 -0400 Subject: [PATCH 27/72] podman-3:3.2.0-3 - keep crun on 0.19.1-3 Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index e10cf0f..99a2efc 100644 --- a/podman.spec +++ b/podman.spec @@ -65,7 +65,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -97,6 +97,7 @@ Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.27-2 +Requires: crun < 0.20-1 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit @@ -654,6 +655,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Jun 08 2021 Lokesh Mandvekar - 3:3.2.0-3 +- keep crun on 0.19.1-3 + * Tue Jun 08 2021 Lokesh Mandvekar - 3:3.2.0-2 - include podman-machine-cni in podman-plugins subpackage From e37f7a3596d1793c95420c98c33b6230383ad274 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Jun 2021 09:53:26 -0400 Subject: [PATCH 28/72] podman-3:3.2.0-4 - remove max crun dep requirement - fixed in crun 0.20.1-1 Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 99a2efc..94fb55d 100644 --- a/podman.spec +++ b/podman.spec @@ -65,7 +65,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -97,7 +97,6 @@ Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.27-2 -Requires: crun < 0.20-1 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit @@ -655,6 +654,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Jun 09 2021 Lokesh Mandvekar - 3:3.2.0-4 +- remove max crun dep requirement - fixed in crun 0.20.1-1 + * Tue Jun 08 2021 Lokesh Mandvekar - 3:3.2.0-3 - keep crun on 0.19.1-3 From 58dac75c58e71a4ed0fbc4950cb8e459009fc252 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Jun 2021 10:16:38 -0400 Subject: [PATCH 29/72] podman-3:3.2.0-5 - use latest containers-common Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 94fb55d..3df8a8a 100644 --- a/podman.spec +++ b/podman.spec @@ -65,7 +65,7 @@ Version: 3.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 4%{?dist} +Release: 5%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -92,7 +92,7 @@ BuildRequires: make BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common >= 4:1-16 +Requires: containers-common >= 4:1-19 Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables @@ -654,6 +654,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Jun 09 2021 Lokesh Mandvekar - 3:3.2.0-5 +- use latest containers-common + * Wed Jun 09 2021 Lokesh Mandvekar - 3:3.2.0-4 - remove max crun dep requirement - fixed in crun 0.20.1-1 From 5971499bec727cc207493e791c9428c653543720 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 14 Jun 2021 19:09:03 +0000 Subject: [PATCH 30/72] podman-3:3.2.1-1 autobuilt v3.2.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 533f4c1..bc049d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1641,3 +1641,4 @@ /v3.2.0-rc3.tar.gz /v3.2.0.tar.gz /podman-machine-cni-afab2d8.tar.gz +/v3.2.1.tar.gz diff --git a/podman.spec b/podman.spec index 3df8a8a..6da8df4 100644 --- a/podman.spec +++ b/podman.spec @@ -50,7 +50,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.0 +%define built_tag v3.2.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -60,12 +60,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.0 +Version: 3.2.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 5%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -654,6 +654,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Jun 14 2021 RH Container Bot - 3:3.2.1-1 +- autobuilt v3.2.1 + * Wed Jun 09 2021 Lokesh Mandvekar - 3:3.2.0-5 - use latest containers-common diff --git a/sources b/sources index b6959c1..7633756 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.2.0.tar.gz) = 7db6145e5b303b29b600e9393d0d872931bbe39c385c4e9904b59b1b9a9b87f0191374cc8a13e021d4446c31e461f7be3765c2d18bcb8461df732c89fc848c96 +SHA512 (v3.2.1.tar.gz) = 8fa4e2a72d1e655c600fa4dc7ad2366975314a154ff9fa7496622da6042e54c6fe93aca0344e6615e2ce3d400c1bc5de7d8462df45f950a119c3303b3ae520e4 From 24b88181b5877f886d9edcbb2e7e16fd63ce0169 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 24 Jun 2021 09:11:33 -0400 Subject: [PATCH 31/72] update min containers-common Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 6da8df4..4ec4106 100644 --- a/podman.spec +++ b/podman.spec @@ -92,7 +92,7 @@ BuildRequires: make BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common >= 4:1-19 +Requires: containers-common >= 4:1-20 Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables From 6423fbc98e7e1737eeb463f1b82118588753bbbb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 25 Jun 2021 19:45:31 -0400 Subject: [PATCH 32/72] podman-3:3.2.2-1 - bump to v3.2.2 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bc049d5..cfe2594 100644 --- a/.gitignore +++ b/.gitignore @@ -1642,3 +1642,4 @@ /v3.2.0.tar.gz /podman-machine-cni-afab2d8.tar.gz /v3.2.1.tar.gz +/v3.2.2.tar.gz diff --git a/podman.spec b/podman.spec index 4ec4106..fbfe6d5 100644 --- a/podman.spec +++ b/podman.spec @@ -50,7 +50,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.1 +%define built_tag v3.2.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -60,7 +60,7 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.1 +Version: 3.2.2 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, @@ -654,6 +654,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Jun 25 2021 Lokesh Mandvekar - 3:3.2.2-1 +- bump to v3.2.2 + * Mon Jun 14 2021 RH Container Bot - 3:3.2.1-1 - autobuilt v3.2.1 diff --git a/sources b/sources index 7633756..62ee778 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.2.1.tar.gz) = 8fa4e2a72d1e655c600fa4dc7ad2366975314a154ff9fa7496622da6042e54c6fe93aca0344e6615e2ce3d400c1bc5de7d8462df45f950a119c3303b3ae520e4 +SHA512 (v3.2.2.tar.gz) = 00f20459feb72126cf8b87918dfeabe95844b7b15ef891f4c5baa850ad21b5694ec75e477c3ab3a9da08427a307fdc4421533037e72bda26392c0d42d3635e39 From 317e1cc820e88692a4b49bb502c9ac028a18d991 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Jul 2021 16:27:03 -0400 Subject: [PATCH 33/72] podman-3:3.2.3-1 - Resolves: #1969264, #1982881 - Security fix for CVE-2021-3602 - bump to v3.2.3 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index cfe2594..f76ba62 100644 --- a/.gitignore +++ b/.gitignore @@ -1643,3 +1643,4 @@ /podman-machine-cni-afab2d8.tar.gz /v3.2.1.tar.gz /v3.2.2.tar.gz +/v3.2.3.tar.gz diff --git a/podman.spec b/podman.spec index fbfe6d5..f7775bc 100644 --- a/podman.spec +++ b/podman.spec @@ -49,8 +49,8 @@ %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) # Used for comparing with latest upstream tag -# to decide whether to autobuild and set download_url (non-rawhide only) -%define built_tag v3.2.2 +# to decide whether to autobuild +%define built_tag v3.2.3 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -60,7 +60,7 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.2 +Version: 3.2.3 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, @@ -69,7 +69,7 @@ Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ -Source0: %{download_url} +Source0: %{git0}/archive/%{built_tag}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -652,8 +652,11 @@ exit 0 %{_libexecdir}/cni/dnsname %{_libexecdir}/cni/%{name}-machine -# rhcontainerbot account currently managed by lsm5 %changelog +* Fri Jul 16 2021 Lokesh Mandvekar - 3:3.2.3-1 +- Resolves: #1969264, #1982881 - Security fix for CVE-2021-3602 +- bump to v3.2.3 + * Fri Jun 25 2021 Lokesh Mandvekar - 3:3.2.2-1 - bump to v3.2.2 diff --git a/sources b/sources index 62ee778..e565286 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.2.2.tar.gz) = 00f20459feb72126cf8b87918dfeabe95844b7b15ef891f4c5baa850ad21b5694ec75e477c3ab3a9da08427a307fdc4421533037e72bda26392c0d42d3635e39 +SHA512 (v3.2.3.tar.gz) = e9df45b0f6afbcdce1f5ef0b2fa7dfc0f374699d0a080b4989c47bbff54d2e5a85d6eb899e17726948e8d233393454b4441d83c2be5a8068fa75c40e1dc1c2bf From 337e5dfcf569e133ef38916be9126f5690c1ccdd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 2 Aug 2021 15:28:50 -0400 Subject: [PATCH 34/72] podman-3:3.2.3-2 - Resolves: #1983596, #1987739 - Security fix for CVE-2021-34558 Signed-off-by: Lokesh Mandvekar --- podman.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/podman.spec b/podman.spec index f7775bc..404915c 100644 --- a/podman.spec +++ b/podman.spec @@ -50,9 +50,8 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%define built_tag v3.2.3 -%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%define download_url %{git0}/archive/%{built_tag}.tar.gz +%global built_tag v3.2.3 +%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman %if 0%{?fedora} @@ -65,7 +64,7 @@ Version: 3.2.3 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -76,7 +75,8 @@ Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: gcc -BuildRequires: golang +BuildRequires: golang >= 1.16.6 +BuildRequires: go-rpm-macros BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Mon Aug 02 2021 Lokesh Mandvekar - 3:3.2.3-2 +- Resolves: #1983596, #1987739 - Security fix for CVE-2021-34558 + * Fri Jul 16 2021 Lokesh Mandvekar - 3:3.2.3-1 - Resolves: #1969264, #1982881 - Security fix for CVE-2021-3602 - bump to v3.2.3 From b42fa8cb495b767c5600f4239c496b1ab07c28ce Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 3 Aug 2021 20:00:12 +0000 Subject: [PATCH 35/72] podman-3:3.3.0-0.1.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f76ba62..0dc73a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1644,3 +1644,4 @@ /v3.2.1.tar.gz /v3.2.2.tar.gz /v3.2.3.tar.gz +/v3.3.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 404915c..d7b63b2 100644 --- a/podman.spec +++ b/podman.spec @@ -50,7 +50,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.2.3 +%global built_tag v3.3.0-rc1 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -59,12 +59,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.2.3 +Version: 3.3.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Tue Aug 03 2021 RH Container Bot - 3:3.3.0-0.1.rc1 +- autobuilt v3.3.0-rc1 + * Mon Aug 02 2021 Lokesh Mandvekar - 3:3.2.3-2 - Resolves: #1983596, #1987739 - Security fix for CVE-2021-34558 diff --git a/sources b/sources index e565286..3e270bf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.2.3.tar.gz) = e9df45b0f6afbcdce1f5ef0b2fa7dfc0f374699d0a080b4989c47bbff54d2e5a85d6eb899e17726948e8d233393454b4441d83c2be5a8068fa75c40e1dc1c2bf +SHA512 (v3.3.0-rc1.tar.gz) = 3ceda8c658856f1e53e509e0b895e0fbc8a49d0afbcafffd70246615c69e1fba02e87cee27153a6b45f0acd987b7a8d239018cb1a88c063d91b310a0f83ae96e From 36ab28f9c1fded6665c78d99d14b9359cf436954 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 4 Aug 2021 19:24:37 +0000 Subject: [PATCH 36/72] podman-3:3.3.0-0.2.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index d7b63b2..249ecd8 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Wed Aug 04 2021 RH Container Bot - 3:3.3.0-0.2.rc1 +- autobuilt v3.3.0-rc1 + * Tue Aug 03 2021 RH Container Bot - 3:3.3.0-0.1.rc1 - autobuilt v3.3.0-rc1 From 8d8762e727cd01f5b68caa34adeeaf219696b3ba Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Aug 2021 09:12:10 -0400 Subject: [PATCH 37/72] remove install.cni Makefile target, include podman-restart unitfiles Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 249ecd8..bff54ec 100644 --- a/podman.spec +++ b/podman.spec @@ -482,7 +482,6 @@ install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin-nobuild \ install.man-nobuild \ - install.cni \ install.systemd \ install.completions \ install.docker \ @@ -599,15 +598,16 @@ exit 0 %{_datadir}/zsh/site-functions/_%{name} %dir %{_datadir}/fish/vendor_completions.d %{_datadir}/fish/vendor_completions.d/%{name}.fish -%config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_unitdir}/%{name}-auto-update.service %{_unitdir}/%{name}-auto-update.timer %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket +%{_unitdir}/%{name}-restart.service %{_userunitdir}/%{name}-auto-update.service %{_userunitdir}/%{name}-auto-update.timer %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket +%{_userunitdir}/%{name}-restart.service %{_usr}/lib/tmpfiles.d/%{name}.conf %files docker From 2f0a3f5ac6f24311527062de25c436beb90db310 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 5 Aug 2021 14:04:25 +0000 Subject: [PATCH 38/72] podman-3:3.3.0-0.3.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index bff54ec..2e47b2c 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.3.rc1 +- autobuilt v3.3.0-rc1 + * Wed Aug 04 2021 RH Container Bot - 3:3.3.0-0.2.rc1 - autobuilt v3.3.0-rc1 From 74d9c90c62a63ac578bf7518eddae661d490726b Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 5 Aug 2021 15:05:08 +0000 Subject: [PATCH 39/72] podman-3:3.3.0-0.4.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 2e47b2c..e51dfdb 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.3.rc1%{?dist} +Release: 0.4.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.4.rc1 +- autobuilt v3.3.0-rc1 + * Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.3.rc1 - autobuilt v3.3.0-rc1 From 9b1147eb353892422caf30ea83e4b2435ede2fb5 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 5 Aug 2021 16:04:35 +0000 Subject: [PATCH 40/72] podman-3:3.3.0-0.5.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index e51dfdb..f7af97f 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.4.rc1%{?dist} +Release: 0.5.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.5.rc1 +- autobuilt v3.3.0-rc1 + * Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.4.rc1 - autobuilt v3.3.0-rc1 From 5c7289bef7a51eb4655d3be1c89d608133c7d060 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 5 Aug 2021 17:05:58 +0000 Subject: [PATCH 41/72] podman-3:3.3.0-0.6.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index f7af97f..3f3d016 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.5.rc1%{?dist} +Release: 0.6.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.6.rc1 +- autobuilt v3.3.0-rc1 + * Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.5.rc1 - autobuilt v3.3.0-rc1 From b91a9a7e080af54086e4f7c2efca1298d512408c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 5 Aug 2021 18:04:28 +0000 Subject: [PATCH 42/72] podman-3:3.3.0-0.7.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 3f3d016..7c713eb 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.6.rc1%{?dist} +Release: 0.7.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.7.rc1 +- autobuilt v3.3.0-rc1 + * Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.6.rc1 - autobuilt v3.3.0-rc1 From 03ef34b4e91d29f963ed75a34a7740155ab37483 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 5 Aug 2021 19:04:36 +0000 Subject: [PATCH 43/72] podman-3:3.3.0-0.8.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 7c713eb..2d3cac7 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.7.rc1%{?dist} +Release: 0.8.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.8.rc1 +- autobuilt v3.3.0-rc1 + * Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.7.rc1 - autobuilt v3.3.0-rc1 From 989d6f79501467e7b7c5bf9a17e08b83ae6f424b Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 5 Aug 2021 19:43:02 +0000 Subject: [PATCH 44/72] podman-3:3.3.0-0.9.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 2d3cac7..4cc3823 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.8.rc1%{?dist} +Release: 0.9.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.9.rc1 +- autobuilt v3.3.0-rc1 + * Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.8.rc1 - autobuilt v3.3.0-rc1 From f610b65ca2160082ba0a6e372cfe9a0815847c73 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 10 Aug 2021 19:16:58 +0000 Subject: [PATCH 45/72] podman-3:3.3.0-0.10.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 4cc3823..8fbee64 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.9.rc1%{?dist} +Release: 0.10.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Tue Aug 10 2021 RH Container Bot - 3:3.3.0-0.10.rc1 +- autobuilt v3.3.0-rc1 + * Thu Aug 05 2021 RH Container Bot - 3:3.3.0-0.9.rc1 - autobuilt v3.3.0-rc1 From d12cb03ec977f0d1160f4381d6c80e18c1c1d02b Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 10 Aug 2021 19:48:16 +0000 Subject: [PATCH 46/72] podman-3:3.3.0-0.11.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 8fbee64..42248ff 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.10.rc1%{?dist} +Release: 0.11.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Tue Aug 10 2021 RH Container Bot - 3:3.3.0-0.11.rc1 +- autobuilt v3.3.0-rc1 + * Tue Aug 10 2021 RH Container Bot - 3:3.3.0-0.10.rc1 - autobuilt v3.3.0-rc1 From 7fb99d114fd2900077de2229d7e8d4a7e558bf53 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 10 Aug 2021 19:52:20 +0000 Subject: [PATCH 47/72] podman-3:3.3.0-0.12.rc1 autobuilt v3.3.0-rc1 Signed-off-by: RH Container Bot --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 42248ff..44897a0 100644 --- a/podman.spec +++ b/podman.spec @@ -64,7 +64,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.11.rc1%{?dist} +Release: 0.12.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/%{name}-machine %changelog +* Tue Aug 10 2021 RH Container Bot - 3:3.3.0-0.12.rc1 +- autobuilt v3.3.0-rc1 + * Tue Aug 10 2021 RH Container Bot - 3:3.3.0-0.11.rc1 - autobuilt v3.3.0-rc1 From 16c5c2dc0d671e93b7d1618cfd075a89d9572426 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 16 Aug 2021 09:23:33 -0400 Subject: [PATCH 48/72] podman-3:3.3.0-0.13.rc2 - Bump to v3.3.0-rc2 - Include podman-gvproxy which provides /usr/libexecdir/podman/podman-gvproxy - Bump dnsname to v1.3.0 commit dc59f28 Signed-off-by: Lokesh Mandvekar --- .gitignore | 3 +++ podman.spec | 69 ++++++++++++++++++++++++++++++++++++++++++++++------- sources | 5 ++-- 3 files changed, 66 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 0dc73a0..779c4c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1645,3 +1645,6 @@ /v3.2.2.tar.gz /v3.2.3.tar.gz /v3.3.0-rc1.tar.gz +/dnsname-dc59f28.tar.gz +/gvisor-tap-vsock-27590a0.tar.gz +/v3.3.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 44897a0..4a825e7 100644 --- a/podman.spec +++ b/podman.spec @@ -37,7 +37,7 @@ # https://github.com/containers/dnsname %global import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} -%global commit_plugins 3b29247c46d2811610ad57dd9fdae61157532a5b +%global commit_plugins dc59f285546a0b0d8b8f20033e1637ea82587840 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # podman-machine-cni @@ -48,9 +48,17 @@ %global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) +# gvproxy +%global repo_gvproxy gvisor-tap-vsock +# https://github.com/containers/gvisor-tap-vsock +%global import_path_gvproxy %%{provider}.%{provider_tld}/%{project}/%{repo_gvproxy} +%global git_gvproxy https://%{import_path_gvproxy} +%global commit_gvproxy 27590a075d79b4ac0554749f2be31a22a4baa27a +%global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7}) + # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.3.0-rc1 +%global built_tag v3.3.0-rc2 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -64,13 +72,14 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.12.rc1%{?dist} +Release: 0.13.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{git0}/archive/%{built_tag}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz +Source3: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{shortcommit_gvproxy}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -397,6 +406,7 @@ connections as well. %package plugins Summary: Plugins for %{name} Requires: dnsmasq +Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release} %description plugins This plugin sets up the use of dnsmasq on a given CNI network so @@ -406,6 +416,15 @@ that dnsmasq will read in. Similarly, when a pod is removed from the network, it will remove the entry from the hosts file. Each CNI network will have its own dnsmasq instance. +%package gvproxy +Summary: Go replacement for libslirp and VPNKit + +%description gvproxy +A replacement for libslirp and VPNKit, written in pure Go. +It is based on the network stack of gVisor. Compared to libslirp, +gvisor-tap-vsock brings a configurable DNS server and +dynamic port forwarding. + %prep %autosetup -Sgit -n %{name}-%{built_tag_strip} %ifarch %{ix86} armv7hl @@ -418,6 +437,9 @@ tar zxf %{SOURCE1} # untar %%{name}-machine-cni tar zxf %{SOURCE2} +# untar %%{name}-gvproxy +tar zxf %{SOURCE3} + %build export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) @@ -453,7 +475,7 @@ LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion remote" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -pushd dnsname-%{commit_plugins} +pushd %{repo_plugins}-%{commit_plugins} mkdir _build pushd _build mkdir -p src/%{provider}.%{provider_tld}/%{project} @@ -464,7 +486,7 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname popd -pushd %{name}-machine-cni-%{commit_mcni} +pushd %{repo_mcni}-%{commit_mcni} mkdir _build pushd _build mkdir -p src/%{provider}.%{provider_tld}/%{project} @@ -475,6 +497,17 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/%{name}-machine %{import_path_mcni}/plugins/meta/%{name}-machine popd +pushd %{repo_gvproxy}-%{commit_gvproxy} +mkdir _build +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../../ src/%{import_path_gvproxy} +popd +ln -s vendor src +export GOPATH=$(pwd)/_build:$(pwd) +%gobuild -o bin/%{name}-gvproxy %{import_path_gvproxy}/cmd/gvproxy +popd + %{__make} docs docker-docs %install @@ -493,15 +526,21 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build mv pkg/hooks/README.md pkg/hooks/README-hooks.md # install dnsname plugin -pushd dnsname-%{commit_plugins} +pushd %{repo_plugins}-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd # install machine-cni plugin -pushd %{name}-machine-cni-%{commit_mcni} +pushd %{repo_mcni}-%{commit_mcni} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd +# install gvproxy +pushd %{repo_gvproxy}-%{commit_gvproxy} +install -dp %{buildroot}%{_libexecdir}/%{name} +install -p -m0755 bin/%{name}-gvproxy %{buildroot}%{_libexecdir}/%{name} +popd + # do not include docker and podman-remote man pages in main package for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do echo "$file*" >> podman.file-list @@ -647,12 +686,24 @@ exit 0 %endif %files plugins -%license dnsname-%{commit_plugins}/LICENSE -%doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md} +%license %{repo_plugins}-%{commit_plugins}/LICENSE +%doc %{repo_plugins}-%{commit_plugins}/{README.md,README_PODMAN.md} %{_libexecdir}/cni/dnsname %{_libexecdir}/cni/%{name}-machine +%files gvproxy +%license %{repo_gvproxy}-%{commit_gvproxy}/LICENSE +%doc %{repo_gvproxy}-%{commit_gvproxy}/README.md +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/%{name}-gvproxy + %changelog +* Mon Aug 16 2021 Lokesh Mandvekar - 3:3.3.0-0.13.rc2 +- Bump to v3.3.0-rc2 +- Include podman-gvproxy which provides +/usr/libexecdir/podman/podman-gvproxy +- Bump dnsname to v1.3.0 commit dc59f28 + * Tue Aug 10 2021 RH Container Bot - 3:3.3.0-0.12.rc1 - autobuilt v3.3.0-rc1 diff --git a/sources b/sources index 3e270bf..ae7d81e 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ -SHA512 (dnsname-3b29247.tar.gz) = 79a73713f8c1b900db71487d4dabcedf7a478532588a2adff90fc791873c7a1c28a2ccf90cc45aebad134f5a8260ab21eb5140a844842a9068cd9a8cbc70163d +SHA512 (dnsname-dc59f28.tar.gz) = faf1b77f3d2d234570f15079ca78bc77c42ac5b45c6eef934b6e025bb574c040ed119a217c9315a553ac18d7ab10e395c9ad0fb6f1c9b24d582f292187a124ad +SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.3.0-rc1.tar.gz) = 3ceda8c658856f1e53e509e0b895e0fbc8a49d0afbcafffd70246615c69e1fba02e87cee27153a6b45f0acd987b7a8d239018cb1a88c063d91b310a0f83ae96e +SHA512 (v3.3.0-rc2.tar.gz) = 2303532f2fd14b94579ead488a51106423bc2828b695c36946296396be0e2d13230bf7a389e81b8ad9dbf77e53832d5c261bd8622fbbd962305f628001311902 From b1ace2517b3dd3b541bc5d6e4c006d4ad76f5bb0 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 17 Aug 2021 20:29:31 +0000 Subject: [PATCH 49/72] podman-3:3.3.0-0.14.rc3 autobuilt v3.3.0-rc3 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 779c4c7..5544514 100644 --- a/.gitignore +++ b/.gitignore @@ -1648,3 +1648,4 @@ /dnsname-dc59f28.tar.gz /gvisor-tap-vsock-27590a0.tar.gz /v3.3.0-rc2.tar.gz +/v3.3.0-rc3.tar.gz diff --git a/podman.spec b/podman.spec index 4a825e7..4ac23e2 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.3.0-rc2 +%global built_tag v3.3.0-rc3 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -72,7 +72,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.13.rc2%{?dist} +Release: 0.14.rc3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -698,6 +698,9 @@ exit 0 %{_libexecdir}/%{name}/%{name}-gvproxy %changelog +* Tue Aug 17 2021 RH Container Bot - 3:3.3.0-0.14.rc3 +- autobuilt v3.3.0-rc3 + * Mon Aug 16 2021 Lokesh Mandvekar - 3:3.3.0-0.13.rc2 - Bump to v3.3.0-rc2 - Include podman-gvproxy which provides diff --git a/sources b/sources index ae7d81e..8d5ee34 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-dc59f28.tar.gz) = faf1b77f3d2d234570f15079ca78bc77c42ac5b45c6eef934b6e025bb574c040ed119a217c9315a553ac18d7ab10e395c9ad0fb6f1c9b24d582f292187a124ad SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.3.0-rc2.tar.gz) = 2303532f2fd14b94579ead488a51106423bc2828b695c36946296396be0e2d13230bf7a389e81b8ad9dbf77e53832d5c261bd8622fbbd962305f628001311902 +SHA512 (v3.3.0-rc3.tar.gz) = 78a3f3c5c5afcfce4660e439a67afb3ae07dfc2281165b84a42613a4ad3a96b2cb28dbd6bd58c3b899120c6f7d7b5b9357f3a0c6c0829df857d916689000ce91 From 2a690986ee0037fa98bcfbbd38dc9c6116e8b355 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 20 Aug 2021 19:30:43 +0000 Subject: [PATCH 50/72] podman-3:3.3.0-1 autobuilt v3.3.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5544514..c3968a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1649,3 +1649,4 @@ /gvisor-tap-vsock-27590a0.tar.gz /v3.3.0-rc2.tar.gz /v3.3.0-rc3.tar.gz +/v3.3.0.tar.gz diff --git a/podman.spec b/podman.spec index 4ac23e2..fa25dd3 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.3.0-rc3 +%global built_tag v3.3.0 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -72,7 +72,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.14.rc3%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -698,6 +698,9 @@ exit 0 %{_libexecdir}/%{name}/%{name}-gvproxy %changelog +* Fri Aug 20 2021 RH Container Bot - 3:3.3.0-1 +- autobuilt v3.3.0 + * Tue Aug 17 2021 RH Container Bot - 3:3.3.0-0.14.rc3 - autobuilt v3.3.0-rc3 diff --git a/sources b/sources index 8d5ee34..300cc87 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-dc59f28.tar.gz) = faf1b77f3d2d234570f15079ca78bc77c42ac5b45c6eef934b6e025bb574c040ed119a217c9315a553ac18d7ab10e395c9ad0fb6f1c9b24d582f292187a124ad SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.3.0-rc3.tar.gz) = 78a3f3c5c5afcfce4660e439a67afb3ae07dfc2281165b84a42613a4ad3a96b2cb28dbd6bd58c3b899120c6f7d7b5b9357f3a0c6c0829df857d916689000ce91 +SHA512 (v3.3.0.tar.gz) = 0e77edfdbafc4ccb7b0b29d5e41054d52b09258fd25424be3339c256489a5d215109eda903eb620f2ed566c042a6d6b8a5d8adc26b08bba4fa66263a1ee3104d From 665eba56e769dc8b076c28dacc4bdddb9ddcbaf7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 27 Aug 2021 09:52:32 -0400 Subject: [PATCH 51/72] podman-3:3.3.0-2 - update gvproxy binary name Signed-off-by: Lokesh Mandvekar (cherry picked from commit 445da4204afa89e6b49aab6c47f8356776767c41) Signed-off-by: Lokesh Mandvekar --- podman.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index fa25dd3..a71135d 100644 --- a/podman.spec +++ b/podman.spec @@ -72,7 +72,7 @@ Version: 3.3.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -505,7 +505,7 @@ ln -s ../../../../ src/%{import_path_gvproxy} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) -%gobuild -o bin/%{name}-gvproxy %{import_path_gvproxy}/cmd/gvproxy +%gobuild -o bin/gvproxy %{import_path_gvproxy}/cmd/gvproxy popd %{__make} docs docker-docs @@ -538,7 +538,7 @@ popd # install gvproxy pushd %{repo_gvproxy}-%{commit_gvproxy} install -dp %{buildroot}%{_libexecdir}/%{name} -install -p -m0755 bin/%{name}-gvproxy %{buildroot}%{_libexecdir}/%{name} +install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name} popd # do not include docker and podman-remote man pages in main package @@ -695,9 +695,12 @@ exit 0 %license %{repo_gvproxy}-%{commit_gvproxy}/LICENSE %doc %{repo_gvproxy}-%{commit_gvproxy}/README.md %dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/%{name}-gvproxy +%{_libexecdir}/%{name}/gvproxy %changelog +* Fri Aug 27 2021 Lokesh Mandvekar - 3:3.3.0-2 +- update gvproxy binary name + * Fri Aug 20 2021 RH Container Bot - 3:3.3.0-1 - autobuilt v3.3.0 From 7feeda24fb02c8858b2577468772af8add829d30 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 30 Aug 2021 20:41:02 +0000 Subject: [PATCH 52/72] podman-3:3.3.1-1 autobuilt v3.3.1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c3968a9..5286ec9 100644 --- a/.gitignore +++ b/.gitignore @@ -1650,3 +1650,4 @@ /v3.3.0-rc2.tar.gz /v3.3.0-rc3.tar.gz /v3.3.0.tar.gz +/v3.3.1.tar.gz diff --git a/podman.spec b/podman.spec index a71135d..6270df4 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.3.0 +%global built_tag v3.3.1 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -67,12 +67,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.3.0 +Version: 3.3.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -698,6 +698,9 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Mon Aug 30 2021 RH Container Bot - 3:3.3.1-1 +- autobuilt v3.3.1 + * Fri Aug 27 2021 Lokesh Mandvekar - 3:3.3.0-2 - update gvproxy binary name diff --git a/sources b/sources index 300cc87..52abe41 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-dc59f28.tar.gz) = faf1b77f3d2d234570f15079ca78bc77c42ac5b45c6eef934b6e025bb574c040ed119a217c9315a553ac18d7ab10e395c9ad0fb6f1c9b24d582f292187a124ad SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 -SHA512 (v3.3.0.tar.gz) = 0e77edfdbafc4ccb7b0b29d5e41054d52b09258fd25424be3339c256489a5d215109eda903eb620f2ed566c042a6d6b8a5d8adc26b08bba4fa66263a1ee3104d +SHA512 (v3.3.1.tar.gz) = 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa From feab53904ca39cb37f093a271a9ff2920f47afe3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 15 Sep 2021 13:04:02 -0400 Subject: [PATCH 53/72] update dnsname and machine-cni to latest upstream tags Signed-off-by: Lokesh Mandvekar (cherry picked from commit 6972e15200c72420008cb71f4f8d1a483ee2aa9e) --- .gitignore | 2 ++ podman.spec | 4 ++-- sources | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5286ec9..1c552aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1651,3 +1651,5 @@ /v3.3.0-rc3.tar.gz /v3.3.0.tar.gz /v3.3.1.tar.gz +/dnsname-18822f9.tar.gz +/podman-machine-cni-0749884.tar.gz diff --git a/podman.spec b/podman.spec index 6270df4..cfc2434 100644 --- a/podman.spec +++ b/podman.spec @@ -37,7 +37,7 @@ # https://github.com/containers/dnsname %global import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} -%global commit_plugins dc59f285546a0b0d8b8f20033e1637ea82587840 +%global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # podman-machine-cni @@ -45,7 +45,7 @@ # https://github.com/containers/podman-machine-cni %global import_path_mcni %{provider}.%{provider_tld}/%{project}/%{repo_mcni} %global git_mcni https://%{import_path_mcni} -%global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396 +%global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) # gvproxy diff --git a/sources b/sources index 52abe41..c1e1a3b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (dnsname-dc59f28.tar.gz) = faf1b77f3d2d234570f15079ca78bc77c42ac5b45c6eef934b6e025bb574c040ed119a217c9315a553ac18d7ab10e395c9ad0fb6f1c9b24d582f292187a124ad +SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d -SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 +SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 SHA512 (v3.3.1.tar.gz) = 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa From 646b15a98ac228f50f7e2faa44317df93d84ec08 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 16 Sep 2021 23:04:00 +0000 Subject: [PATCH 54/72] podman-3:3.4.0-0.1.rc1 autobuilt v3.4.0-rc1 Signed-off-by: RH Container Bot (cherry picked from commit 52a2adf76a2a80ce65ee4708f24d01d113bc24ae) --- .gitignore | 1 + podman.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1c552aa..c7de8a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1653,3 +1653,4 @@ /v3.3.1.tar.gz /dnsname-18822f9.tar.gz /podman-machine-cni-0749884.tar.gz +/v3.4.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index cfc2434..f66beaa 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.3.1 +%global built_tag v3.4.0-rc1 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -67,12 +67,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.3.1 +Version: 3.4.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -698,6 +698,12 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Thu Sep 16 2021 RH Container Bot - 3:3.4.0-0.1.rc1 +- autobuilt v3.4.0-rc1 + +* Tue Aug 31 2021 Lokesh Mandvekar - 3:3.3.1-2 +- bump release to be on par with f35 + * Mon Aug 30 2021 RH Container Bot - 3:3.3.1-1 - autobuilt v3.3.1 diff --git a/sources b/sources index c1e1a3b..da8d687 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.3.1.tar.gz) = 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa +SHA512 (v3.4.0-rc1.tar.gz) = 4791c16ca974ea0d8e14aa5d74649a1fb34c8aeebed8c1abfcb3237f56b16169ff1013cd4a42e90eab5cce55fb91b9cff1a5c196b9e9425130f01cd51a6de771 From 74e78026a213760430f43726fb1bda73517810dc Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 23 Sep 2021 10:35:21 -0400 Subject: [PATCH 55/72] rm -f /var/lib/containers/storage/libpod/defaultCNINetExists in post --- podman.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index f66beaa..e0acc5d 100644 --- a/podman.spec +++ b/podman.spec @@ -72,7 +72,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -624,6 +624,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_bindir}/%{name} system renumber exit 0 +%post +rm -f %{_sharedstatedir}/containers/storage/libpod/defaultCNINetExists + #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -698,6 +701,9 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.2.rc1 +- rm -f /var/lib/containers/storage/libpod/defaultCNINetExists in post + * Thu Sep 16 2021 RH Container Bot - 3:3.4.0-0.1.rc1 - autobuilt v3.4.0-rc1 From ba3e40ee7f819ad4b4c139103836d9433807edbd Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 23 Sep 2021 15:13:10 -0400 Subject: [PATCH 56/72] Only remove defaultCNINetExits on updgrades from podman 3.2 or less --- podman.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index e0acc5d..ff609e6 100644 --- a/podman.spec +++ b/podman.spec @@ -72,7 +72,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -624,8 +624,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_bindir}/%{name} system renumber exit 0 -%post +%triggerpostun -- %{name} <= 3.2 rm -f %{_sharedstatedir}/containers/storage/libpod/defaultCNINetExists +exit 0 #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -701,6 +702,9 @@ rm -f %{_sharedstatedir}/containers/storage/libpod/defaultCNINetExists %{_libexecdir}/%{name}/gvproxy %changelog +* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.3.rc1 +- Only remove defaultCNINetExits on updgrades from podman 3.2 or less + * Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.2.rc1 - rm -f /var/lib/containers/storage/libpod/defaultCNINetExists in post From ee589f0ad388287ec1984e372f688bc83d92d363 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 24 Sep 2021 13:20:29 -0400 Subject: [PATCH 57/72] bump conmon requirement for rootless gating tests Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index ff609e6..3e34e4b 100644 --- a/podman.spec +++ b/podman.spec @@ -105,7 +105,7 @@ Requires: containers-common >= 4:1-20 Requires: containernetworking-plugins >= 1.0.0-0.2.rc1 Requires: iptables Requires: nftables -Requires: conmon >= 2:2.0.27-2 +Requires: conmon >= 2:2.0.30-2 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: fuse-overlayfs >= 0.3-8 Recommends: catatonit From 2a8f18fd0bbba328328ecfbdf303a94d3d4bed01 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 16 Sep 2021 15:15:05 -0600 Subject: [PATCH 58/72] gating tests: run podman-remote too A small handful of bugs have blocked us from running podman-remote in gating tests. Those are all fixed; it's time to enable testing. Signed-off-by: Ed Santiago (cherry picked from commit 967f9534f2066d95f3860536156078bce2cba4e5) Signed-off-by: Lokesh Mandvekar --- .../run_bats_tests/files/run_bats_tests.sh | 9 +++++++++ tests/test_podman.yml | 6 ++++++ tests/test_podman_remote.yml | 17 +++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 tests/test_podman_remote.yml diff --git a/tests/roles/run_bats_tests/files/run_bats_tests.sh b/tests/roles/run_bats_tests/files/run_bats_tests.sh index 17061a0..b65d2b9 100755 --- a/tests/roles/run_bats_tests/files/run_bats_tests.sh +++ b/tests/roles/run_bats_tests/files/run_bats_tests.sh @@ -42,10 +42,19 @@ if ! cd $testdir; then exit 0 fi +if [[ $PODMAN =~ remote ]]; then + ${PODMAN%%-remote} system service -t0 &>/dev/null & + PODMAN_SERVER_PID=$! +fi + echo "\$ bats ." bats . rc=$? +if [[ -n "$PODMAN_SERVER_PID" ]]; then + kill $PODMAN_SERVER_PID +fi + echo $divider echo "bats completed with status $rc" diff --git a/tests/test_podman.yml b/tests/test_podman.yml index d5e65be..9674dea 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -39,6 +39,12 @@ loop_control: loop_var: want_cgroups + - name: test podman-remote + include_tasks: test_podman_remote.yml + + - name: test toolbox + include_tasks: test_toolbox.yml + # Postprocessing: check for FAIL or ERROR in any test, exit 1 if so - name: check results include_tasks: check_results.yml diff --git a/tests/test_podman_remote.yml b/tests/test_podman_remote.yml new file mode 100644 index 0000000..8c61093 --- /dev/null +++ b/tests/test_podman_remote.yml @@ -0,0 +1,17 @@ +--- +- name: "podman-remote | install" + dnf: name="podman-remote" state=installed + +- include_role: + name: run_bats_tests + vars: + tests: + - name: podman-remote root + package: podman + environment: + PODMAN: /usr/bin/podman-remote + - name: podman-remote rootless + package: podman + environment: + PODMAN: /usr/bin/podman-remote + become: true From fac5da87d4d9f2cb6635f3904883b8cbddaea24a Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 23 Sep 2021 15:11:45 -0400 Subject: [PATCH 59/72] Add shadow-utils-subid-devel requirement (cherry picked from commit 0cbb51c4081867c051633362b63137ae879929c4) --- podman.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 3e34e4b..62804a9 100644 --- a/podman.spec +++ b/podman.spec @@ -72,7 +72,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.3.rc1%{?dist} +Release: 0.6.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -96,6 +96,9 @@ BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel +%if 0%{?fedora} >= 35 +BuildRequires: shadow-utils-subid-devel +%endif BuildRequires: pkgconfig BuildRequires: make BuildRequires: ostree-devel @@ -701,13 +704,20 @@ exit 0 %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvproxy +# rhcontainerbot account currently managed by lsm5 %changelog -* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.3.rc1 -- Only remove defaultCNINetExits on updgrades from podman 3.2 or less +* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.6.rc1 +- Add shadow-utils-subid-devel requirement -* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.2.rc1 +* Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.5.rc1 - rm -f /var/lib/containers/storage/libpod/defaultCNINetExists in post +* Wed Sep 22 2021 Lokesh Mandvekar - 3:3.4.0-0.4.rc1 +- bump conmon requirement for remote gating tests + +* Wed Sep 22 2021 Lokesh Mandvekar - 3:3.4.0-0.3.rc1 +- Requires: conmon >= 2:2.0.30 for remote gating tests + * Thu Sep 16 2021 RH Container Bot - 3:3.4.0-0.1.rc1 - autobuilt v3.4.0-rc1 From e890f39fceb1843ce381e16e25ee7fd5bdba815d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 24 Sep 2021 14:51:23 +0000 Subject: [PATCH 60/72] podman-3:3.4.0-0.7.rc2 autobuilt v3.4.0-rc2 Signed-off-by: RH Container Bot (cherry picked from commit 30ef54bb136b45b60ee5d17f76eb57e90c54ebda) --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c7de8a5..fc1a569 100644 --- a/.gitignore +++ b/.gitignore @@ -1654,3 +1654,4 @@ /dnsname-18822f9.tar.gz /podman-machine-cni-0749884.tar.gz /v3.4.0-rc1.tar.gz +/v3.4.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 62804a9..2a03da1 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.4.0-rc1 +%global built_tag v3.4.0-rc2 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -72,7 +72,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.6.rc1%{?dist} +Release: 0.7.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -706,6 +706,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Sep 24 2021 RH Container Bot - 3:3.4.0-0.7.rc2 +- autobuilt v3.4.0-rc2 + * Thu Sep 23 2021 Daniel J Walsh - 3:3.4.0-0.6.rc1 - Add shadow-utils-subid-devel requirement diff --git a/sources b/sources index da8d687..2fc88cf 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.4.0-rc1.tar.gz) = 4791c16ca974ea0d8e14aa5d74649a1fb34c8aeebed8c1abfcb3237f56b16169ff1013cd4a42e90eab5cce55fb91b9cff1a5c196b9e9425130f01cd51a6de771 +SHA512 (v3.4.0-rc2.tar.gz) = dcfbad98640f408b89cc2601fae05b126a5ba91b87a53fc3673ae77ae87b429911b0103c7f680b7c213bdda472ec70af0d86d1d46e290bbd9892e3ea1f4e053e From b579d78b6ca9cd006a2e092ffb2e9dac9826ea81 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 24 Sep 2021 17:38:54 -0400 Subject: [PATCH 61/72] podman-3:3.4.0-0.10.rc2 - build with libsubid buildtag Signed-off-by: Lokesh Mandvekar (cherry picked from commit 60778e8502938dca2f46a12a8dc4fe0c5bf07b86) --- podman.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 2a03da1..ca274e4 100644 --- a/podman.spec +++ b/podman.spec @@ -72,7 +72,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.7.rc2%{?dist} +Release: 0.10.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -465,6 +465,9 @@ ln -s vendor src # build %%{name} export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh) $(hack/systemd_tag.sh)" +%if 0%{?fedora} >= 35 +export BUILDTAGS+=" $(hack/libsubid_tag.sh)" +%endif %if 0%{?centos} export BUILDTAGS+=" containers_image_ostree_stub" %endif @@ -706,6 +709,16 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.10.rc2 +- build with libsubid buildtag + +* Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.9.rc2 +- depend on shadow-utils-subid for f35 and higher + +* Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.8.rc2 +- bump release to stay ahead of older fedoras + +>>>>>>> 60778e8 (podman-3:3.4.0-0.10.rc2) * Fri Sep 24 2021 RH Container Bot - 3:3.4.0-0.7.rc2 - autobuilt v3.4.0-rc2 From 79febf0ef04ba86750fb22c0ebfd4f91ff5b027c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 27 Sep 2021 08:21:58 -0400 Subject: [PATCH 62/72] fix triggerpostuns --- podman.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/podman.spec b/podman.spec index ca274e4..914d56b 100644 --- a/podman.spec +++ b/podman.spec @@ -626,14 +626,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ -%triggerpostun -- %{name} < 1.1 -%{_bindir}/%{name} system renumber -exit 0 - -%triggerpostun -- %{name} <= 3.2 -rm -f %{_sharedstatedir}/containers/storage/libpod/defaultCNINetExists -exit 0 - #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -707,6 +699,10 @@ exit 0 %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvproxy +%triggerpostun -- %{name} <= 3.2 +rm -f %{_sharedstatedir}/containers/storage/libpod/defaultCNINetExists +exit 0 + # rhcontainerbot account currently managed by lsm5 %changelog * Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.10.rc2 @@ -718,7 +714,6 @@ exit 0 * Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.8.rc2 - bump release to stay ahead of older fedoras ->>>>>>> 60778e8 (podman-3:3.4.0-0.10.rc2) * Fri Sep 24 2021 RH Container Bot - 3:3.4.0-0.7.rc2 - autobuilt v3.4.0-rc2 From 1bd5b83a36a7b6d4526c34cc246c1d01b09ec199 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 28 Sep 2021 10:30:09 -0400 Subject: [PATCH 63/72] centos conditionals no longer needed Signed-off-by: Lokesh Mandvekar (cherry picked from commit eaadc59b1f6dd3dce441d0c2fc338614c4c6e7f6) --- podman.spec | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/podman.spec b/podman.spec index 914d56b..98c9676 100644 --- a/podman.spec +++ b/podman.spec @@ -82,7 +82,9 @@ Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar Source3: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{shortcommit_gvproxy}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. +%if 0%{?fedora} && ! 0%{?rhel} +BuildRequires: btrfs-progs-devel +%endif BuildRequires: gcc BuildRequires: golang >= 1.16.6 BuildRequires: go-rpm-macros @@ -468,9 +470,6 @@ export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installe %if 0%{?fedora} >= 35 export BUILDTAGS+=" $(hack/libsubid_tag.sh)" %endif -%if 0%{?centos} -export BUILDTAGS+=" containers_image_ostree_stub" -%endif # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here? LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" @@ -552,14 +551,7 @@ for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},, echo "$file*" >> podman.file-list done -# do not install remote manpages on centos7 -%if 0%{?centos} && 0%{?centos} < 8 -rm -rf %{buildroot}%{_mandir}/man1/docker-remote.1 -rm -rf %{buildroot}%{_mandir}/man1/%{name}-remote.1 -rm -rf %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5 -%endif - -# source codes for building projects +# source code for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ From 24781287fdd1f12072f6dc0e26f55b5b069d76b2 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 30 Sep 2021 19:11:31 +0000 Subject: [PATCH 64/72] podman-3:3.4.0-1 autobuilt v3.4.0 Signed-off-by: RH Container Bot (cherry picked from commit de01250946d3079169e50dd6b59b8dcc82e4f0bf) --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fc1a569..5881908 100644 --- a/.gitignore +++ b/.gitignore @@ -1655,3 +1655,4 @@ /podman-machine-cni-0749884.tar.gz /v3.4.0-rc1.tar.gz /v3.4.0-rc2.tar.gz +/v3.4.0.tar.gz diff --git a/podman.spec b/podman.spec index 98c9676..2690494 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.4.0-rc2 +%global built_tag v3.4.0 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -72,7 +72,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.10.rc2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -697,6 +697,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Sep 30 2021 RH Container Bot - 3:3.4.0-1 +- autobuilt v3.4.0 + * Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.10.rc2 - build with libsubid buildtag diff --git a/sources b/sources index 2fc88cf..ad0295c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.4.0-rc2.tar.gz) = dcfbad98640f408b89cc2601fae05b126a5ba91b87a53fc3673ae77ae87b429911b0103c7f680b7c213bdda472ec70af0d86d1d46e290bbd9892e3ea1f4e053e +SHA512 (v3.4.0.tar.gz) = 195354b15beaaed19b4d5f71f5dbfcd1ebfc5c80c07db91043b76e3254d62b5fd001c52c536773656e5eba65954511c1639a50b955a9992fa4d18a55e573c2a1 From d1e3082904d0556500b05c7822a6c9f57636cf1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Fri, 1 Oct 2021 08:33:17 +0200 Subject: [PATCH 65/72] Remove hardcoded CFLAGS Instead, use %set_build_flags to get the buildroot CFLAGS, then remove the problematic ones. (cherry picked from commit ec6ea5bdc9b449e8d5c0029d72406a5adf253822) --- podman.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 2690494..0561c22 100644 --- a/podman.spec +++ b/podman.spec @@ -72,7 +72,7 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -446,17 +446,21 @@ tar zxf %{SOURCE2} tar zxf %{SOURCE3} %build +%set_build_flags export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) -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' +export CGO_CFLAGS=$CFLAGS +# 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') +CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g') +CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g') + %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" mkdir _build pushd _build @@ -697,6 +701,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Oct 01 2021 Timm Bäder - 3:3.4.0-2 +- Remove individual flags from $CFLAGS instead of hardcoding all flags + * Thu Sep 30 2021 RH Container Bot - 3:3.4.0-1 - autobuilt v3.4.0 From 7e21454e4da0fdedab193f4789477432e0d1d57c Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 5 Oct 2021 13:36:02 -0400 Subject: [PATCH 66/72] Drop i686 support for RHEL >= 9 RHEL 9 does not have i686 support for golang Signed-off-by: Stephen Gallagher (cherry picked from commit 555a5a504dd538d5be581f76a5a1fe72aec1e059) (cherry picked from commit b8150dda332208bb739bc7cc99fa44a4724f9f78) --- podman.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 0561c22..6d7ae3a 100644 --- a/podman.spec +++ b/podman.spec @@ -72,10 +72,11 @@ Version: 3.4.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ +ExclusiveArch: %{golang_arches} Source0: %{git0}/archive/%{built_tag}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz @@ -701,6 +702,14 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Oct 05 2021 Stephen Gallagher - 3:3.4.0-4 +- Drop i686 support for RHEL >= 9 +- RHEL 9 does not have i686 support for golang + +* Mon Oct 04 2021 Lokesh Mandvekar - 3:3.4.0-3 +- Gating tests: fix permissions error +- From: Ed Santiago + * Fri Oct 01 2021 Timm Bäder - 3:3.4.0-2 - Remove individual flags from $CFLAGS instead of hardcoding all flags From f1c3277e0a88eeabb4d8237056f44e31d90fdb43 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 20 Oct 2021 14:16:28 +0000 Subject: [PATCH 67/72] podman-3:3.4.1-1 autobuilt v3.4.1 Signed-off-by: RH Container Bot (cherry picked from commit be57771f47d9e8cff9518101c07fb573354f1a36) (cherry picked from commit 64ca785f8ffe73137f8e988225bc8b6a9f560290) --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5881908..290a154 100644 --- a/.gitignore +++ b/.gitignore @@ -1656,3 +1656,4 @@ /v3.4.0-rc1.tar.gz /v3.4.0-rc2.tar.gz /v3.4.0.tar.gz +/v3.4.1.tar.gz diff --git a/podman.spec b/podman.spec index 6d7ae3a..9554143 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild -%global built_tag v3.4.0 +%global built_tag v3.4.1 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -67,12 +67,12 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.4.0 +Version: 3.4.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 4%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -702,6 +702,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Oct 20 2021 RH Container Bot - 3:3.4.1-1 +- autobuilt v3.4.1 + * Tue Oct 05 2021 Stephen Gallagher - 3:3.4.0-4 - Drop i686 support for RHEL >= 9 - RHEL 9 does not have i686 support for golang diff --git a/sources b/sources index ad0295c..82d257c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.4.0.tar.gz) = 195354b15beaaed19b4d5f71f5dbfcd1ebfc5c80c07db91043b76e3254d62b5fd001c52c536773656e5eba65954511c1639a50b955a9992fa4d18a55e573c2a1 +SHA512 (v3.4.1.tar.gz) = b8602464358ab73429a9003262c92c38c9a06e1133c776fd0c4ce65dae26639db66f8f5ad510528f3e6e7bc2fe692746fcf1d90d4e95d701d102006d9a83b27e From eb4b9cf12ea2b71dbd5da069f1a404a597066d2a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 12 Nov 2021 13:03:08 -0500 Subject: [PATCH 68/72] bump gvisor-tap-vsock to v0.3.0 Signed-off-by: Lokesh Mandvekar (cherry picked from commit c012857b0e1dab1566939a83dae2921ba021c977) --- .gitignore | 1 + podman.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 290a154..c94091a 100644 --- a/.gitignore +++ b/.gitignore @@ -1657,3 +1657,4 @@ /v3.4.0-rc2.tar.gz /v3.4.0.tar.gz /v3.4.1.tar.gz +/gvisor-tap-vsock-4ee84d6.tar.gz diff --git a/podman.spec b/podman.spec index 9554143..415ba4b 100644 --- a/podman.spec +++ b/podman.spec @@ -53,7 +53,7 @@ # https://github.com/containers/gvisor-tap-vsock %global import_path_gvproxy %%{provider}.%{provider_tld}/%{project}/%{repo_gvproxy} %global git_gvproxy https://%{import_path_gvproxy} -%global commit_gvproxy 27590a075d79b4ac0554749f2be31a22a4baa27a +%global commit_gvproxy 4ee84d66bd86668f011733d8873989b5862bcd07 %global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7}) # Used for comparing with latest upstream tag diff --git a/sources b/sources index 82d257c..085c21e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 -SHA512 (gvisor-tap-vsock-27590a0.tar.gz) = c4b9a5070ec2956dc79589846e1d8edb04b0b4bdb5a0d63c5ca6cb437b88d091ae1ca0086fdf8ba87db47e5d343caaf4e9c3c74ecab79af0d50f04a5cb1aec6d +SHA512 (gvisor-tap-vsock-4ee84d6.tar.gz) = 6b0e97f25f0c9ec0f018edcf9c1801daaeacc4d97d05cc2b453467e071c50693bb44d483bac34e64e0c9de71e78e47810a7c46d028553adee9fd6f593df8eb1a SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 SHA512 (v3.4.1.tar.gz) = b8602464358ab73429a9003262c92c38c9a06e1133c776fd0c4ce65dae26639db66f8f5ad510528f3e6e7bc2fe692746fcf1d90d4e95d701d102006d9a83b27e From f29898d0d8aa5eff3e291a2fd6c85b0619b23edc Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 12 Nov 2021 20:03:52 +0000 Subject: [PATCH 69/72] podman-3:3.4.2-1 autobuilt v3.4.2 Signed-off-by: RH Container Bot (cherry picked from commit 93b5ce159543f95e4832391fb4207b7b8c0b6113) --- .gitignore | 1 + podman.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c94091a..4c0f945 100644 --- a/.gitignore +++ b/.gitignore @@ -1658,3 +1658,4 @@ /v3.4.0.tar.gz /v3.4.1.tar.gz /gvisor-tap-vsock-4ee84d6.tar.gz +/v3.4.2.tar.gz diff --git a/podman.spec b/podman.spec index 415ba4b..eceeeed 100644 --- a/podman.spec +++ b/podman.spec @@ -56,9 +56,7 @@ %global commit_gvproxy 4ee84d66bd86668f011733d8873989b5862bcd07 %global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7}) -# Used for comparing with latest upstream tag -# to decide whether to autobuild -%global built_tag v3.4.1 +%global built_tag v3.4.2 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -67,7 +65,7 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.4.1 +Version: 3.4.2 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, @@ -702,6 +700,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Nov 12 2021 RH Container Bot - 3:3.4.2-1 +- autobuilt v3.4.2 + * Wed Oct 20 2021 RH Container Bot - 3:3.4.1-1 - autobuilt v3.4.1 diff --git a/sources b/sources index 085c21e..34b7328 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-4ee84d6.tar.gz) = 6b0e97f25f0c9ec0f018edcf9c1801daaeacc4d97d05cc2b453467e071c50693bb44d483bac34e64e0c9de71e78e47810a7c46d028553adee9fd6f593df8eb1a SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.4.1.tar.gz) = b8602464358ab73429a9003262c92c38c9a06e1133c776fd0c4ce65dae26639db66f8f5ad510528f3e6e7bc2fe692746fcf1d90d4e95d701d102006d9a83b27e +SHA512 (v3.4.2.tar.gz) = 849a4d5897de7dae5d6ac71fab11449f7a814e6414a0f463846ddd3817cd91c5f12e288bd44e64cc5bdf5f6073d52dfbf77aba5cbc1fec6ac12a7b222d2a21a2 From ad0548587a6e69ec3b2a6d25e204f6f27da271c2 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 7 Dec 2021 15:34:02 +0000 Subject: [PATCH 70/72] podman-3:3.4.3-1 autobuilt v3.4.3 Signed-off-by: RH Container Bot (cherry picked from commit 8f022cec4f3db603d7a618f3fbd7c9467c6fdd8f) --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4c0f945..a41b0dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1659,3 +1659,4 @@ /v3.4.1.tar.gz /gvisor-tap-vsock-4ee84d6.tar.gz /v3.4.2.tar.gz +/v3.4.3.tar.gz diff --git a/podman.spec b/podman.spec index eceeeed..a3b5c77 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ %global commit_gvproxy 4ee84d66bd86668f011733d8873989b5862bcd07 %global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7}) -%global built_tag v3.4.2 +%global built_tag v3.4.3 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -65,7 +65,7 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.4.2 +Version: 3.4.3 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, @@ -700,6 +700,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Dec 07 2021 RH Container Bot - 3:3.4.3-1 +- autobuilt v3.4.3 + * Fri Nov 12 2021 RH Container Bot - 3:3.4.2-1 - autobuilt v3.4.2 diff --git a/sources b/sources index 34b7328..a789349 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-4ee84d6.tar.gz) = 6b0e97f25f0c9ec0f018edcf9c1801daaeacc4d97d05cc2b453467e071c50693bb44d483bac34e64e0c9de71e78e47810a7c46d028553adee9fd6f593df8eb1a SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.4.2.tar.gz) = 849a4d5897de7dae5d6ac71fab11449f7a814e6414a0f463846ddd3817cd91c5f12e288bd44e64cc5bdf5f6073d52dfbf77aba5cbc1fec6ac12a7b222d2a21a2 +SHA512 (v3.4.3.tar.gz) = c3eed482ac78a70f9babb39798a2925f29d0452f5e66f2e46f8eb9bb8aeeb4cd8392a9d961a9a37fc5aa3bccad8fb6754db65191b80f3ad882d72a329722994f From f4aa655e868ba6dcb719f575e64d45c9d4afacec Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 8 Dec 2021 21:04:03 +0000 Subject: [PATCH 71/72] podman-3:3.4.4-1 autobuilt v3.4.4 Signed-off-by: RH Container Bot (cherry picked from commit 034855d330ec303ac6074774f69c8947b550faa7) --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a41b0dc..31f7a69 100644 --- a/.gitignore +++ b/.gitignore @@ -1660,3 +1660,4 @@ /gvisor-tap-vsock-4ee84d6.tar.gz /v3.4.2.tar.gz /v3.4.3.tar.gz +/v3.4.4.tar.gz diff --git a/podman.spec b/podman.spec index a3b5c77..1fd73ad 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ %global commit_gvproxy 4ee84d66bd86668f011733d8873989b5862bcd07 %global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7}) -%global built_tag v3.4.3 +%global built_tag v3.4.4 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -65,7 +65,7 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.4.3 +Version: 3.4.4 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, @@ -700,6 +700,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Dec 08 2021 RH Container Bot - 3:3.4.4-1 +- autobuilt v3.4.4 + * Tue Dec 07 2021 RH Container Bot - 3:3.4.3-1 - autobuilt v3.4.3 diff --git a/sources b/sources index a789349..480888b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-4ee84d6.tar.gz) = 6b0e97f25f0c9ec0f018edcf9c1801daaeacc4d97d05cc2b453467e071c50693bb44d483bac34e64e0c9de71e78e47810a7c46d028553adee9fd6f593df8eb1a SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.4.3.tar.gz) = c3eed482ac78a70f9babb39798a2925f29d0452f5e66f2e46f8eb9bb8aeeb4cd8392a9d961a9a37fc5aa3bccad8fb6754db65191b80f3ad882d72a329722994f +SHA512 (v3.4.4.tar.gz) = cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666 From df56c5230554b959828387946f7907ba227e821f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 21 Apr 2022 13:32:50 -0400 Subject: [PATCH 72/72] podman-3:3.4.7-1 - built v3.4.7 - Resolves: #2070368, #2074164 - Security fix for CVE-2022-1227 - Resolves: #2045880, #2067448 - Security fix for CVE-2022-21698 - Resolves: #2064702, #2074267 - Security fix for CVE-2022-27191 - Resolves: #2066568, #2070102 - Security fix for CVE-2022-27649 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 156 ++++++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 99 insertions(+), 60 deletions(-) diff --git a/.gitignore b/.gitignore index 31f7a69..89b6d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1661,3 +1661,4 @@ /v3.4.2.tar.gz /v3.4.3.tar.gz /v3.4.4.tar.gz +/v3.4.7.tar.gz diff --git a/podman.spec b/podman.spec index 1fd73ad..d3f8f9e 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ %global commit_gvproxy 4ee84d66bd86668f011733d8873989b5862bcd07 %global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7}) -%global built_tag v3.4.4 +%global built_tag v3.4.7 %global built_tag_strip %(b=%{built_tag}; echo ${b:1}) Name: podman @@ -65,14 +65,14 @@ Epoch: 3 %else Epoch: 0 %endif -Version: 3.4.4 +Version: 3.4.7 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images -License: ASL 2.0 +License: ASL 2.0 and BSD and ISC and MIT and MPLv2.0 URL: https://%{name}.io/ ExclusiveArch: %{golang_arches} Source0: %{git0}/archive/%{built_tag}.tar.gz @@ -119,69 +119,70 @@ Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} && ! 0%{?rhel} BuildRequires: btrfs-progs-devel %endif - # vendored libraries -# awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort -Provides: bundled(golang(github.com/BurntSushi/toml)) = v0.3.1 -#Provides: bundled(golang(github.com/blang/semver)) = v3.5.1+incompatible -#Provides: bundled(golang(github.com/buger/goterm)) = v0.0.0-20181115115552-c206103e1f37 -#Provides: bundled(golang(github.com/checkpoint-restore/go-criu)) = v0.0.0-20190109184317-bdb7599cd87b -#Provides: bundled(golang(github.com/codahale/hdrhistogram)) = v0.0.0-20161010025455-3a0bb77429bd -Provides: bundled(golang(github.com/containernetworking/cni)) = v0.8.0 -Provides: bundled(golang(github.com/containernetworking/plugins)) = v0.8.7 -#Provides: bundled(golang(github.com/containers/buildah)) = v1.15.1-0.20200813183340-0a8dc1f8064c -#Provides: bundled(golang(github.com/containers/common)) = v0.20.3-0.20200827091701-a550d6a98aa3 -#Provides: bundled(golang(github.com/containers/conmon)) = v2.0.20+incompatible -Provides: bundled(golang(github.com/containers/image/v5)) = v5.5.2 -Provides: bundled(golang(github.com/containers/psgo)) = v1.5.1 -Provides: bundled(golang(github.com/containers/storage)) = v1.23.2 -Provides: bundled(golang(github.com/coreos/go-systemd/v22)) = v22.1.0 -Provides: bundled(golang(github.com/cri-o/ocicni)) = v0.2.0 -Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = v0.2.2 -Provides: bundled(golang(github.com/davecgh/go-spew)) = v1.1.1 +# 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/BurntSushi/toml)) = v0.4.1 +Provides: bundled(golang(github.com/blang/semver)) = v3.5.1+incompatible +Provides: bundled(golang(github.com/buger/goterm)) = v0.0.0_20181115115552_c206103e1f37 +Provides: bundled(golang(github.com/checkpoint_restore/checkpointctl)) = v0.0.0_20210301084134_a2024f5584e7 +Provides: bundled(golang(github.com/checkpoint_restore/go_criu/v5)) = v5.1.0 +Provides: bundled(golang(github.com/container_orchestrated_devices/container_device_interface)) = v0.0.0_20210325223243_f99e8b6c10b9 +Provides: bundled(golang(github.com/containernetworking/cni)) = v0.8.1 +Provides: bundled(golang(github.com/containernetworking/plugins)) = v0.9.1 +Provides: bundled(golang(github.com/containers/buildah)) = v1.23.1 +Provides: bundled(golang(github.com/containers/common)) = v0.44.5 +Provides: bundled(golang(github.com/containers/conmon)) = v2.0.20+incompatible +Provides: bundled(golang(github.com/containers/image/v5)) = v5.17.0 +Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.2 +Provides: bundled(golang(github.com/containers/psgo)) = v1.7.2_0.20220414132323_3ae304491648 +Provides: bundled(golang(github.com/containers/storage)) = v1.37.2 +Provides: bundled(golang(github.com/coreos/go_systemd/v22)) = v22.3.2 +Provides: bundled(golang(github.com/coreos/stream_metadata_go)) = v0.0.0_20210225230131_70edb9eb47b3 +Provides: bundled(golang(github.com/cri_o/ocicni)) = v0.2.1_0.20210621164014_d0acc7862283 +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/digitalocean/go_qemu)) = v0.0.0_20210209191958_152a1535e49f Provides: bundled(golang(github.com/docker/distribution)) = v2.7.1+incompatible -#Provides: bundled(golang(github.com/docker/docker)) = v1.4.2-0.20191219165747-a9416c67da9f -Provides: bundled(golang(github.com/docker/go-connections)) = v0.4.0 -Provides: bundled(golang(github.com/docker/go-units)) = v0.4.0 -Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.4.9 +Provides: bundled(golang(github.com/docker/docker)) = v20.10.11+incompatible +Provides: bundled(golang(github.com/docker/go_connections)) = v0.4.0 +Provides: bundled(golang(github.com/docker/go_plugins_helpers)) = v0.0.0_20200102110956_c9a8a2d92ccc +Provides: bundled(golang(github.com/docker/go_units)) = v0.4.0 +Provides: bundled(golang(github.com/dtylman/scp)) = v0.0.0_20181017070807_f3000a34aef4 +Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.5.1 Provides: bundled(golang(github.com/ghodss/yaml)) = v1.0.0 -Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.0.3 -#Provides: bundled(golang(github.com/google/shlex)) = v0.0.0-20181106134648-c34317bd91bf -Provides: bundled(golang(github.com/google/uuid)) = v1.1.2 -Provides: bundled(golang(github.com/gorilla/mux)) = v1.7.4 +Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.0.6 +Provides: bundled(golang(github.com/google/shlex)) = v0.0.0_20181106134648_c34317bd91bf +Provides: bundled(golang(github.com/google/uuid)) = v1.3.0 +Provides: bundled(golang(github.com/gorilla/handlers)) = v0.0.0_20150720190736_60c7bfde3e33 +Provides: bundled(golang(github.com/gorilla/mux)) = v1.8.0 Provides: bundled(golang(github.com/gorilla/schema)) = v1.2.0 -Provides: bundled(golang(github.com/hashicorp/go-multierror)) = v1.1.0 +Provides: bundled(golang(github.com/hashicorp/go_multierror)) = v1.1.1 Provides: bundled(golang(github.com/hpcloud/tail)) = v1.0.0 -Provides: bundled(golang(github.com/json-iterator/go)) = v1.1.10 -#Provides: bundled(golang(github.com/mrunalp/fileutils)) = v0.0.0-20171103030105-7d4729fb3618 -Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.14.0 -Provides: bundled(golang(github.com/onsi/gomega)) = v1.10.1 -Provides: bundled(golang(github.com/opencontainers/go-digest)) = v1.0.0 -#Provides: bundled(golang(github.com/opencontainers/image-spec)) = v1.0.2-0.20190823105129-775207bd45b6 -#Provides: bundled(golang(github.com/opencontainers/runc)) = v1.0.0-rc91.0.20200708210054-ce54a9d4d79b -#Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = v1.0.3-0.20200817204227-f9c09b4ea1df -Provides: bundled(golang(github.com/opencontainers/runtime-tools)) = v0.9.0 -Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.6.0 -Provides: bundled(golang(github.com/opentracing/opentracing-go)) = v1.2.0 +Provides: bundled(golang(github.com/json_iterator/go)) = v1.1.12 +Provides: bundled(golang(github.com/moby/term)) = v0.0.0_20210619224110_3f7ff695adc6 +Provides: bundled(golang(github.com/mrunalp/fileutils)) = v0.5.0 +Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.4 +Provides: bundled(golang(github.com/onsi/gomega)) = v1.16.0 +Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0 +Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.0.2_0.20210819154149_5ad6f50d6283 +Provides: bundled(golang(github.com/opencontainers/runc)) = v1.0.2 +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.9.1 Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1 -Provides: bundled(golang(github.com/pmezard/go-difflib)) = v1.0.0 -Provides: bundled(golang(github.com/rootless-containers/rootlesskit)) = v0.10.0 -Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.6.0 -Provides: bundled(golang(github.com/spf13/cobra)) = v0.0.7 +Provides: bundled(golang(github.com/pmezard/go_difflib)) = v1.0.0 +Provides: bundled(golang(github.com/prometheus/client_golang)) = v1.11.1 +Provides: bundled(golang(github.com/rootless_containers/rootlesskit)) = v0.14.5 +Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1 +Provides: bundled(golang(github.com/spf13/cobra)) = v1.2.1 Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5 -Provides: bundled(golang(github.com/stretchr/testify)) = v1.6.1 -#Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0-20180916011248-d98352740cb2 -Provides: bundled(golang(github.com/uber/jaeger-client-go)) = v2.25.0+incompatible -Provides: bundled(golang(github.com/uber/jaeger-lib)) = v2.2.0+incompatible -#Provides: bundled(golang(github.com/varlink/go)) = v0.0.0-20190502142041-0f1d566d194b -Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.1.0 -Provides: bundled(golang(go.etcd.io/bbolt)) = v1.3.5 -#Provides: bundled(golang(golang.org/x/crypto)) = v0.0.0-20200622213623-75b288015ac9 -#Provides: bundled(golang(golang.org/x/net)) = v0.0.0-20200707034311-ab3426394381 -#Provides: bundled(golang(golang.org/x/sync)) = v0.0.0-20200317015054-43a5402ce75a -#Provides: bundled(golang(golang.org/x/sys)) = v0.0.0-20200728102440-3e129f6d46b1 -Provides: bundled(golang(k8s.io/api)) = v0.18.8 -Provides: bundled(golang(k8s.io/apimachinery)) = v0.19.0 +Provides: bundled(golang(github.com/stretchr/testify)) = v1.7.0 +Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635 +Provides: bundled(golang(github.com/uber/jaeger_client_go)) = v2.29.1+incompatible +Provides: bundled(golang(github.com/vbauerster/mpb/v6)) = v6.0.4 +Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.1.1_0.20201029203352_d40f9887b852 +Provides: bundled(golang(k8s.io/api)) = v0.22.1 +Provides: bundled(golang(k8s.io/apimachinery)) = v0.22.1 %description %{name} (Pod Manager) is a fully featured container engine that is a simple @@ -700,6 +701,43 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Apr 21 2022 Lokesh Mandvekar - 3:3.4.7-1 +- built v3.4.7 +- Resolves: #2070368, #2074164 - Security fix for CVE-2022-1227 +- Resolves: #2045880, #2067448 - Security fix for CVE-2022-21698 +- Resolves: #2064702, #2074267 - Security fix for CVE-2022-27191 +- Resolves: #2066568, #2070102 - Security fix for CVE-2022-27649 + +* Tue Dec 07 2021 RH Container Bot - 3:3.4.3-1 +- autobuilt v3.4.3 + +* Fri Nov 12 2021 RH Container Bot - 3:3.4.2-1 +- autobuilt v3.4.2 + +* Wed Oct 20 2021 RH Container Bot - 3:3.4.1-1 +- autobuilt v3.4.1 + +* Tue Oct 05 2021 Stephen Gallagher - 3:3.4.0-4 +- Drop i686 support for RHEL >= 9 +- RHEL 9 does not have i686 support for golang + +* Mon Oct 04 2021 Lokesh Mandvekar - 3:3.4.0-3 +- Gating tests: fix permissions error +- From: Ed Santiago + +* Fri Oct 01 2021 Timm Bäder - 3:3.4.0-2 +- Remove individual flags from $CFLAGS instead of hardcoding all flags + +* Thu Sep 30 2021 RH Container Bot - 3:3.4.0-1 +- autobuilt v3.4.0 + +* Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.10.rc2 +- build with libsubid buildtag + +* Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.9.rc2 +- depend on shadow-utils-subid for f35 and higher + +* Fri Sep 24 2021 Lokesh Mandvekar - 3:3.4.0-0.8.rc2 * Wed Dec 08 2021 RH Container Bot - 3:3.4.4-1 - autobuilt v3.4.4 diff --git a/sources b/sources index 480888b..5318a68 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-4ee84d6.tar.gz) = 6b0e97f25f0c9ec0f018edcf9c1801daaeacc4d97d05cc2b453467e071c50693bb44d483bac34e64e0c9de71e78e47810a7c46d028553adee9fd6f593df8eb1a SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 -SHA512 (v3.4.4.tar.gz) = cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666 +SHA512 (v3.4.7.tar.gz) = 0f0700a630b6289a08ded15a256128a1cf7a13b92ab12f869a3827fc26624111ade71cc13148b55dec802ccc8698902fe926a66f11ef4805babd5d0421519908