From ae49d0a9febd08567eed0534289aa570384c3812 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 13 Aug 2019 14:17:57 -0400 Subject: [PATCH 001/130] Add recommends libvarlink-util --- podman.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/podman.spec b/podman.spec index 0c5bac4..e287abc 100644 --- a/podman.spec +++ b/podman.spec @@ -77,6 +77,7 @@ Requires: iptables Requires: nftables # #1686813 - conmon hasn't been made independent yet #Requires: conmon +Recommends: libvarlink-util %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -567,6 +568,8 @@ exit 0 %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service %{_unitdir}/io.%{name}.socket +%{_userunitdir}/io.%{name}.service +%{_userunitdir}/io.%{name}.socket %{_usr}/lib/tmpfiles.d/%{name}.conf %files docker @@ -598,6 +601,9 @@ exit 0 %endif %changelog +* Tue Aug 13 2019 Dan Walsh - 2:1.5.1-1.14.dev.gitce64c14 +- Add recommends libvarlink-util + * Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.14.dev.git031437b - autobuilt 031437b From 0a5dc0c786f50d2ce7ae21d590ca5712bfd10199 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 13 Aug 2019 14:27:20 -0400 Subject: [PATCH 002/130] Add recommends libvarlink-util --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index e287abc..383c61f 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 0.14.dev.git%{shortcommit0}%{?dist} +Release: 1.14.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ From 2fc6021c63e34924c00e2fcca5e03861d0f9ab25 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 13 Aug 2019 15:05:20 -0400 Subject: [PATCH 003/130] Add recommends libvarlink-util --- .gitignore | 2 ++ podman.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 79459fb..c5cafd9 100644 --- a/.gitignore +++ b/.gitignore @@ -384,3 +384,5 @@ /libpod-f634fd3.tar.gz /libpod-c48243e.tar.gz /libpod-031437b.tar.gz +/libpod-7a859f0.tar.gz +/libpod-ce64c14.tar.gz diff --git a/podman.spec b/podman.spec index 383c61f..75dc8c9 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 031437bf5b19b5121224cdec301dd9945f38e610 +%global commit0 ce64c1403df0e4ca75be50e4a835cc0889b0c8ac %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -46,7 +46,7 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 1.14.dev.git%{shortcommit0}%{?dist} +Release: 1.16.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -75,9 +75,9 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables +Recommends: libvarlink-util # #1686813 - conmon hasn't been made independent yet #Requires: conmon -Recommends: libvarlink-util %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -570,6 +570,7 @@ exit 0 %{_unitdir}/io.%{name}.socket %{_userunitdir}/io.%{name}.service %{_userunitdir}/io.%{name}.socket + %{_usr}/lib/tmpfiles.d/%{name}.conf %files docker @@ -601,9 +602,15 @@ exit 0 %endif %changelog -* Tue Aug 13 2019 Dan Walsh - 2:1.5.1-1.14.dev.gitce64c14 +* Tue Aug 13 2019 Dan Walsh - 2:1.5.1-1.16.dev.gitce64c14 - Add recommends libvarlink-util +* Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.16.dev.gitce64c14 +- autobuilt ce64c14 + +* Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.15.dev.git7a859f0 +- autobuilt 7a859f0 + * Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.14.dev.git031437b - autobuilt 031437b diff --git a/sources b/sources index 426ac07..aac27c7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 -SHA512 (libpod-031437b.tar.gz) = fa811585bb8fbd4d68a21399e3adf68c7c868f1e38545c033acdf448201e666cb95cd260fdaefcab088ad13513199a1d8267d7910dfc91f72dffea2418743ace +SHA512 (libpod-ce64c14.tar.gz) = ab65d054d8049c66dad7cc936a307db64787e0dc0b62f81cbdc3950d51d74edff37e81176277c902cb797a3d4ac80382e31d0f2d1d70a588599a861ad42e6c3d From 201e671fc2b8bf55e20e77c1a6baa8d6f1237bf2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Aug 2019 17:38:24 +0530 Subject: [PATCH 004/130] update built_tag macro for autobuilds Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 75dc8c9..2183aaa 100644 --- a/podman.spec +++ b/podman.spec @@ -37,7 +37,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.4.4 +%global built_tag v1.5.1 Name: podman %if 0%{?fedora} From 5a1e6e145f08658fa85128405d0f5c015b64deea Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 22 Aug 2019 14:10:11 -0400 Subject: [PATCH 005/130] Move man5 man pages into podman-manpage package --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 2183aaa..907e8bd 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 1.16.dev.git%{shortcommit0}%{?dist} +Release: 2.16.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -414,6 +414,7 @@ BuildArch: noarch %files manpages %{_mandir}/man1/%{name}*.1* +%{_mandir}/man5/*.5* %description manpages Man pages for the %{name} commands @@ -557,7 +558,6 @@ exit 0 %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} -%{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* # By "owning" the site-functions dir, we don't need to Require zsh %dir %{_datadir}/zsh/site-functions @@ -602,6 +602,9 @@ exit 0 %endif %changelog +* Thu Aug 22 2019 Daniel J Walsh - 2:1.5.1-2.16.dev.gitce64c14 +- Move man5 man pages into podman-manpage package + * Tue Aug 13 2019 Dan Walsh - 2:1.5.1-1.16.dev.gitce64c14 - Add recommends libvarlink-util From 70326cd69865dd31bf5d507eb3ba3ba361320680 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 27 Aug 2019 16:04:08 -0400 Subject: [PATCH 006/130] Require crun rather then runc Switch to crun by default for cgroupsV2 support --- podman.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/podman.spec b/podman.spec index 907e8bd..65eb0cd 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 2.16.dev.git%{shortcommit0}%{?dist} +Release: 2.17.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -70,7 +70,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: runc >= 2:1.0.0-57 +Requires: crun Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -421,14 +421,10 @@ Man pages for the %{name} commands %prep %autosetup -Sgit -n %{repo}-%{commit0} -rm -rf docs/containers-mounts.conf.5.md # untar conmon tar zxf %{SOURCE1} -sed -i 's/install.remote: podman-remote/install.remote:/' Makefile -sed -i 's/install.bin: podman/install.bin:/' Makefile - %build mkdir _build pushd _build @@ -457,6 +453,11 @@ pushd conmon-%{commit_conmon} popd %install +sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i +sed -i 's/install.remote: podman-remote/install.remote:/' Makefile +sed -i 's/install.bin: podman/install.bin:/' Makefile +rm -rf docs/containers-mounts.conf.5.md + install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ @@ -602,6 +603,10 @@ exit 0 %endif %changelog +* Tue Aug 27 2019 Daniel J Walsh - 2:1.5.1-2.17 +- Require crun rather then runc +- Switch to crun by default for cgroupsV2 support + * Thu Aug 22 2019 Daniel J Walsh - 2:1.5.1-2.16.dev.gitce64c14 - Move man5 man pages into podman-manpage package From 48f430129c5ed71cb4ae6e32e0e4914a9d208f0d Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 10 Sep 2019 14:53:39 -0600 Subject: [PATCH 007/130] Enable gating tests on f31 Signed-off-by: Ed Santiago --- gating.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..9571536 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +rules: + - !PassingTestCaseRule {test_case_name: org.centos.prod.ci.pipeline.allpackages-build.complete} From 38b752b0d6d89b8d59c6c64c9b7971d77be35209 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 13 Sep 2019 11:01:01 -0400 Subject: [PATCH 008/130] Grab specific version of crun or newer. --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 65eb0cd..124cbef 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 2.17.dev.git%{shortcommit0}%{?dist} +Release: 2.18.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -70,7 +70,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: crun +Requires: crun >= 0.9.1-1 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -603,6 +603,9 @@ exit 0 %endif %changelog +* Fri Sep 13 2019 Daniel J Walsh - 2:1.5.1-2.18 +- Grab specific version of crun or newer. + * Tue Aug 27 2019 Daniel J Walsh - 2:1.5.1-2.17 - Require crun rather then runc - Switch to crun by default for cgroupsV2 support From b8f783b7b686d84764c27b0b6c6bc220bb51b675 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 15 Sep 2019 04:30:13 +0530 Subject: [PATCH 009/130] podman-2:1.5.1-3.git0005792 - use v1.15.1 tag - use conmon package as runtime dep Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 32 +++++++------------------------- sources | 3 +-- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index c5cafd9..fd6db91 100644 --- a/.gitignore +++ b/.gitignore @@ -386,3 +386,4 @@ /libpod-031437b.tar.gz /libpod-7a859f0.tar.gz /libpod-ce64c14.tar.gz +/libpod-0005792.tar.gz diff --git a/podman.spec b/podman.spec index 124cbef..6946557 100644 --- a/podman.spec +++ b/podman.spec @@ -27,14 +27,9 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 ce64c1403df0e4ca75be50e4a835cc0889b0c8ac +%global commit0 00057929f5acfd98341964d85722383363376d52 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global import_path_conmon github.com/containers/conmon -%global git_conmon https://%{import_path_conmon} -%global commit_conmon e217fdff82e0b1a6184a28c43043a4065083407f -%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) - # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) %global built_tag v1.5.1 @@ -46,12 +41,11 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 2.18.dev.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Source1: %{git_conmon}/archive/%{commit_conmon}/conmon-%{shortcommit_conmon}.tar.gz # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel @@ -76,8 +70,7 @@ Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables Recommends: libvarlink-util -# #1686813 - conmon hasn't been made independent yet -#Requires: conmon +Requires: conmon %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -422,9 +415,6 @@ Man pages for the %{name} commands %prep %autosetup -Sgit -n %{repo}-%{commit0} -# untar conmon -tar zxf %{SOURCE1} - %build mkdir _build pushd _build @@ -447,11 +437,6 @@ export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devic %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif -# build conmon -pushd conmon-%{commit_conmon} -%{__make} all -popd - %install sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i sed -i 's/install.remote: podman-remote/install.remote:/' Makefile @@ -476,11 +461,6 @@ mv pkg/hooks/README.md pkg/hooks/README-hooks.md install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers -# install conmon -pushd conmon-%{commit_conmon} -%{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install.%{name} -popd - # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -563,8 +543,6 @@ exit 0 # By "owning" the site-functions dir, we don't need to Require zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name} -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service @@ -603,6 +581,10 @@ exit 0 %endif %changelog +* Sat Sep 14 2019 Lokesh Mandvekar - 2:1.5.1-3.git0005792 +- use v1.5.1 tag +- use conmon package as runtime dep + * Fri Sep 13 2019 Daniel J Walsh - 2:1.5.1-2.18 - Grab specific version of crun or newer. diff --git a/sources b/sources index aac27c7..744efd7 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 -SHA512 (libpod-ce64c14.tar.gz) = ab65d054d8049c66dad7cc936a307db64787e0dc0b62f81cbdc3950d51d74edff37e81176277c902cb797a3d4ac80382e31d0f2d1d70a588599a861ad42e6c3d +SHA512 (libpod-0005792.tar.gz) = 6b5209f1a495c0a5efb9bacb31390653cf8db983f402fc820572b31f5169dc368806aaa97eceae871643146b4dcf66fd776a0e6d4e7f27b9c76b04c1d6107214 From 0e6209bc573154524cb2392eb0141cba4fc90250 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 17 Sep 2019 19:07:07 +0000 Subject: [PATCH 010/130] podman-2:1.6.0-2.gitca5ff03 - bump to v1.6.0-rc1 - autobuilt ca5ff03 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fd6db91..d20f10a 100644 --- a/.gitignore +++ b/.gitignore @@ -387,3 +387,4 @@ /libpod-7a859f0.tar.gz /libpod-ce64c14.tar.gz /libpod-0005792.tar.gz +/libpod-ca5ff03.tar.gz diff --git a/podman.spec b/podman.spec index 6946557..d60e4d2 100644 --- a/podman.spec +++ b/podman.spec @@ -27,21 +27,21 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 00057929f5acfd98341964d85722383363376d52 +%global commit0 ca5ff03e2935c47288f7b28a2bae9212cbb83272 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.5.1 +%global built_tag v1.6.0-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.5.1 +Version: 1.6.0 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 3.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,10 @@ exit 0 %endif %changelog +* Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2.gitca5ff03 +- bump to v1.6.0-rc1 +- autobuilt ca5ff03 + * Sat Sep 14 2019 Lokesh Mandvekar - 2:1.5.1-3.git0005792 - use v1.5.1 tag - use conmon package as runtime dep diff --git a/sources b/sources index 744efd7..b05085a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-0005792.tar.gz) = 6b5209f1a495c0a5efb9bacb31390653cf8db983f402fc820572b31f5169dc368806aaa97eceae871643146b4dcf66fd776a0e6d4e7f27b9c76b04c1d6107214 +SHA512 (libpod-ca5ff03.tar.gz) = 65894c42865fd11ab59989f9e658e162f17181fd86bc36099eb706b8a8ec1a242d0e8a077e1b70f87cb12c7a263b8b405d1777372bc51ff9c20c4838169bc55a From e5eeb0cea631f79a3c93a80638815129c457d3e7 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 25 Sep 2019 19:27:38 +0000 Subject: [PATCH 011/130] podman-2:1.6.0-0.2.rc2.git9181c65 - bump to v1.6.0-rc2 - autobuilt 9181c65 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d20f10a..d4f35af 100644 --- a/.gitignore +++ b/.gitignore @@ -388,3 +388,4 @@ /libpod-ce64c14.tar.gz /libpod-0005792.tar.gz /libpod-ca5ff03.tar.gz +/libpod-9181c65.tar.gz diff --git a/podman.spec b/podman.spec index d60e4d2..5d91aee 100644 --- a/podman.spec +++ b/podman.spec @@ -27,12 +27,12 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 ca5ff03e2935c47288f7b28a2bae9212cbb83272 +%global commit0 9181c65b5d695fc480e4d1552887f3875e007821 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.0-rc1 +%global built_tag v1.6.0-rc2 Name: podman %if 0%{?fedora} @@ -41,7 +41,7 @@ Epoch: 2 Version: 1.6.0 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 2.git%{shortcommit0}%{?dist} +Release: 0.2.rc2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,10 @@ exit 0 %endif %changelog +* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2.git9181c65 +- bump to v1.6.0-rc2 +- autobuilt 9181c65 + * Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2.gitca5ff03 - bump to v1.6.0-rc1 - autobuilt ca5ff03 diff --git a/sources b/sources index b05085a..6df3385 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-ca5ff03.tar.gz) = 65894c42865fd11ab59989f9e658e162f17181fd86bc36099eb706b8a8ec1a242d0e8a077e1b70f87cb12c7a263b8b405d1777372bc51ff9c20c4838169bc55a +SHA512 (libpod-9181c65.tar.gz) = a04769a2ad2802d46472cffd1c9fae568890a77a1b580b8e2a9301acee3c6262adbd4368480f63cc741aa703acdc6f1c49900953317791775c88178962bb6e06 From 3cb26646a57823d2fd7c536211b20c5c687d6273 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 1 Oct 2019 18:16:55 +0000 Subject: [PATCH 012/130] podman-2:1.6.0-2 - bump to v1.6.0 - autobuilt b02b072 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d4f35af..a0b4d8f 100644 --- a/.gitignore +++ b/.gitignore @@ -389,3 +389,4 @@ /libpod-0005792.tar.gz /libpod-ca5ff03.tar.gz /libpod-9181c65.tar.gz +/libpod-b02b072.tar.gz diff --git a/podman.spec b/podman.spec index 5d91aee..ecaf2af 100644 --- a/podman.spec +++ b/podman.spec @@ -27,12 +27,12 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 9181c65b5d695fc480e4d1552887f3875e007821 +%global commit0 b02b072832cac26d7cc468d713303843d2935a36 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.0-rc2 +%global built_tag v1.6.0 Name: podman %if 0%{?fedora} @@ -41,7 +41,7 @@ Epoch: 2 Version: 1.6.0 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 0.2.rc2.git%{shortcommit0}%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,10 @@ exit 0 %endif %changelog +* Tue Oct 01 2019 RH Container Bot - 2:1.6.0-2 +- bump to v1.6.0 +- autobuilt b02b072 + * Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2.git9181c65 - bump to v1.6.0-rc2 - autobuilt 9181c65 diff --git a/sources b/sources index 6df3385..41d9b17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-9181c65.tar.gz) = a04769a2ad2802d46472cffd1c9fae568890a77a1b580b8e2a9301acee3c6262adbd4368480f63cc741aa703acdc6f1c49900953317791775c88178962bb6e06 +SHA512 (libpod-b02b072.tar.gz) = 5146a2220e4f778b5e164b9e53b166c6eacfa4efc73e17384f79bb5f4ebf266a9b36c200a0d381f025021a3af22eefcc2f518412d5c7d1b59800efe2a0d50a3c From 6afb9967fc9df4e57c0f37213a278468302ddaed Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Oct 2019 14:27:06 -0400 Subject: [PATCH 013/130] bump release tag Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index ecaf2af..5e6b7f3 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ Epoch: 2 Version: 1.6.0 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,9 @@ exit 0 %endif %changelog +* Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-3 +- bump release tag + * Tue Oct 01 2019 RH Container Bot - 2:1.6.0-2 - bump to v1.6.0 - autobuilt b02b072 From e086da63a39a0ff17839ac657cdd428648eaef48 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Oct 2019 14:28:27 -0400 Subject: [PATCH 014/130] remove release tag warning for rawhide Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/podman.spec b/podman.spec index 5e6b7f3..f5f7e58 100644 --- a/podman.spec +++ b/podman.spec @@ -39,8 +39,6 @@ Name: podman Epoch: 2 %endif Version: 1.6.0 -# Rawhide almost always ships unreleased builds, -# so release tag should be of the form 0.N.blahblah Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 From 2c8ac7d50d52087359c42fc115fc51b45131e9a2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Oct 2019 15:50:44 -0400 Subject: [PATCH 015/130] Requires: crun >= 0.10-1 Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index f5f7e58..9cc3ad4 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -62,7 +62,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: crun >= 0.9.1-1 +Requires: crun >= 0.10-1 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -579,6 +579,9 @@ exit 0 %endif %changelog +* Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-4 +- Requires: crun >= 0.10-1 + * Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-3 - bump release tag From 093482789d3cb4fae03940fb2949ef49381bb7e1 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 2 Oct 2019 17:46:27 +0000 Subject: [PATCH 016/130] podman-2:1.6.1-0.2.rc1 - bump to v1.6.1-rc1 - autobuilt a2fdb6e Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a0b4d8f..0bac0b7 100644 --- a/.gitignore +++ b/.gitignore @@ -390,3 +390,4 @@ /libpod-ca5ff03.tar.gz /libpod-9181c65.tar.gz /libpod-b02b072.tar.gz +/libpod-a2fdb6e.tar.gz diff --git a/podman.spec b/podman.spec index 9cc3ad4..2c7eef9 100644 --- a/podman.spec +++ b/podman.spec @@ -27,19 +27,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 b02b072832cac26d7cc468d713303843d2935a36 +%global commit0 a2fdb6ea0236fa3b5ea9a88dc513af310f07c49c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.0 +%global built_tag v1.6.1-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.6.0 -Release: 4%{?dist} +Version: 1.6.1 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -579,6 +579,10 @@ exit 0 %endif %changelog +* Wed Oct 02 2019 RH Container Bot - 2:1.6.1-0.2.rc1 +- bump to v1.6.1-rc1 +- autobuilt a2fdb6e + * Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-4 - Requires: crun >= 0.10-1 diff --git a/sources b/sources index 41d9b17..5a8c9a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-b02b072.tar.gz) = 5146a2220e4f778b5e164b9e53b166c6eacfa4efc73e17384f79bb5f4ebf266a9b36c200a0d381f025021a3af22eefcc2f518412d5c7d1b59800efe2a0d50a3c +SHA512 (libpod-a2fdb6e.tar.gz) = 713b8d25fecc5ef034d983c613c77c5662ce2e826beed12112849bc938cea526629aef297357a708c987c83f534c68ac8467bf5b7f4366076870e7e39681e46a From 5bea0ed1c379ea686e1f4b2dababdba51081a67c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 2 Oct 2019 23:17:14 +0000 Subject: [PATCH 017/130] podman-2:1.6.1-2 - bump to v1.6.1 - autobuilt 233d95f Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0bac0b7..37890d6 100644 --- a/.gitignore +++ b/.gitignore @@ -391,3 +391,4 @@ /libpod-9181c65.tar.gz /libpod-b02b072.tar.gz /libpod-a2fdb6e.tar.gz +/libpod-233d95f.tar.gz diff --git a/podman.spec b/podman.spec index 2c7eef9..d4874de 100644 --- a/podman.spec +++ b/podman.spec @@ -27,19 +27,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 a2fdb6ea0236fa3b5ea9a88dc513af310f07c49c +%global commit0 233d95f4f0a815f11d1c1ae9aba16781c4eb2700 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.1-rc1 +%global built_tag v1.6.1 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.6.1 -Release: 0.2.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -579,6 +579,10 @@ exit 0 %endif %changelog +* Wed Oct 02 2019 RH Container Bot - 2:1.6.1-2 +- bump to v1.6.1 +- autobuilt 233d95f + * Wed Oct 02 2019 RH Container Bot - 2:1.6.1-0.2.rc1 - bump to v1.6.1-rc1 - autobuilt a2fdb6e diff --git a/sources b/sources index 5a8c9a9..d9bde40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-a2fdb6e.tar.gz) = 713b8d25fecc5ef034d983c613c77c5662ce2e826beed12112849bc938cea526629aef297357a708c987c83f534c68ac8467bf5b7f4366076870e7e39681e46a +SHA512 (libpod-233d95f.tar.gz) = def9bc0d35956a98cf1fbccdfe0a3f376eb27c95611ab8476455c6f9636383806cde80d271075ce99d85765ff645fd5888e7ab286e0f8aee9330699bf6964c82 From d229c2ff42ff295fafbdc9c8f069bb6c6c37c04f Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 3 Oct 2019 08:26:19 -0600 Subject: [PATCH 018/130] gating tests: log important package versions Signed-off-by: Ed Santiago --- tests/test_podman.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_podman.sh b/tests/test_podman.sh index 5a339e9..47c382f 100755 --- a/tests/test_podman.sh +++ b/tests/test_podman.sh @@ -3,7 +3,11 @@ # Simple podman tests # -# Log program versions -rpm -q podman podman-tests +# Log program and kernel versions +echo "Important package versions:" +( + uname -r + rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd' | sort +) | sed -e 's/^/ /' bats /usr/share/podman/test/system From 93be2ffa71e9727edc8483f0e271dc9ac3814575 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 8 Oct 2019 13:22:53 -0400 Subject: [PATCH 019/130] podman-2:1.6.1-3 - add Recommends: runc for fedora Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index d4874de..22510f7 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -74,6 +74,7 @@ Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 +Recommends: runc %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: %{name}-manpages = %{version}-%{release} @@ -579,6 +580,9 @@ exit 0 %endif %changelog +* Tue Oct 08 2019 Lokesh Mandvekar - 2:1.6.1-3 +- add Recommends: runc for fedora + * Wed Oct 02 2019 RH Container Bot - 2:1.6.1-2 - bump to v1.6.1 - autobuilt 233d95f From 0de3dfb40bf2985cdf2d292657da52f2d808b423 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Oct 2019 08:45:17 -0400 Subject: [PATCH 020/130] podman-2:1.6.1-4 - Requires: crun >= 0.10.2-1 and polkit Signed-off-by: Lokesh Mandvekar --- podman.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 22510f7..0621619 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -62,12 +62,12 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: crun >= 0.10-1 +Requires: crun >= 0.10.2-1 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables -Recommends: libvarlink-util +Requires: polkit Requires: conmon %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -75,12 +75,14 @@ Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc +Recommends: libvarlink-util %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: %{name}-manpages = %{version}-%{release} Requires: container-selinux Requires: slirp4netns >= 0.3.0-2 Requires: runc >= 1.0.0-57 +Requires: libvarlink-util %endif # vendored libraries @@ -580,6 +582,9 @@ exit 0 %endif %changelog +* Wed Oct 09 2019 Lokesh Mandvekar - 2:1.6.1-4 +- Requires: crun >= 0.10.2-1 and polkit + * Tue Oct 08 2019 Lokesh Mandvekar - 2:1.6.1-3 - add Recommends: runc for fedora From 342a69f147ab0add68f2c36562dd20f2ad65e2eb Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 9 Oct 2019 08:10:13 -0600 Subject: [PATCH 021/130] Gating tests: use loginctl, dump env - instead of hacky mkdir /run/user/, use loginctl enable-linger and hope that it has the same effect. reason: the mkdir doesn't seem to be 100% effective. There are cases in which the first rootless podman invocation fails with: Error: could not get runtime: cannot mkdir /run/user/1000/libpod: mkdir /run/user/1000/libpod: no such file or directory - for future spelunking, dump environment at start of each test (both root and rootless). Suggested by Giuseppe. Signed-off-by: Ed Santiago --- tests/test_podman.sh | 4 ++++ tests/test_podman.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_podman.sh b/tests/test_podman.sh index 47c382f..1f7b3f7 100755 --- a/tests/test_podman.sh +++ b/tests/test_podman.sh @@ -10,4 +10,8 @@ echo "Important package versions:" rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd' | sort ) | sed -e 's/^/ /' +# Log environment; or at least the useful bits +echo "Environment:" +env | grep -v LS_COLORS= | sort | sed -e 's/^/ /' + bats /usr/share/podman/test/system diff --git a/tests/test_podman.yml b/tests/test_podman.yml index c73bf48..7002972 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -18,5 +18,5 @@ # running the test with su doesn't create the directory for fedora user on /run/user/ # so create it manually dir: ./ - run: mkdir /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora + run: loginctl enable-linger fedora; su -c ${PWD}/test_podman.sh - fedora timeout: 15m From 83bdcd3fba2929c4bed556a2d6b3eb61a1c3ab71 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Oct 2019 11:49:14 -0400 Subject: [PATCH 022/130] remove polkit dependency for now Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 0621619..f329699 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -67,7 +67,6 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables -Requires: polkit Requires: conmon %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -582,6 +581,9 @@ exit 0 %endif %changelog +* Wed Oct 09 2019 Lokesh Mandvekar - 2:1.6.1-5 +- remove polkit dependency for now + * Wed Oct 09 2019 Lokesh Mandvekar - 2:1.6.1-4 - Requires: crun >= 0.10.2-1 and polkit From 3af39e2b4ba39de77a44fa8bb368b73f8b7de516 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 16 Oct 2019 20:47:57 +0000 Subject: [PATCH 023/130] podman-2:1.6.2-0.2.rc1 - bump to v1.6.2-rc1 - autobuilt 4d653f0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 37890d6..7c9b271 100644 --- a/.gitignore +++ b/.gitignore @@ -392,3 +392,4 @@ /libpod-b02b072.tar.gz /libpod-a2fdb6e.tar.gz /libpod-233d95f.tar.gz +/libpod-4d653f0.tar.gz diff --git a/podman.spec b/podman.spec index f329699..15fb065 100644 --- a/podman.spec +++ b/podman.spec @@ -27,19 +27,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 233d95f4f0a815f11d1c1ae9aba16781c4eb2700 +%global commit0 4d653f07f3899aca8038e12574bfbffa45275181 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.1 +%global built_tag v1.6.2-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.6.1 -Release: 5%{?dist} +Version: 1.6.2 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,10 @@ exit 0 %endif %changelog +* Wed Oct 16 2019 RH Container Bot - 2:1.6.2-0.2.rc1 +- bump to v1.6.2-rc1 +- autobuilt 4d653f0 + * Wed Oct 09 2019 Lokesh Mandvekar - 2:1.6.1-5 - remove polkit dependency for now diff --git a/sources b/sources index d9bde40..8fd79f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-233d95f.tar.gz) = def9bc0d35956a98cf1fbccdfe0a3f376eb27c95611ab8476455c6f9636383806cde80d271075ce99d85765ff645fd5888e7ab286e0f8aee9330699bf6964c82 +SHA512 (libpod-4d653f0.tar.gz) = ac36ddaac6c123a4dfb0777456bd0d04a024f98a63f03a3a758d2fff3e235c2c62a84bef4986f22545d8ff78abada2b6b1d1bc2859df350573d21c436a68d256 From 14a7b4e64da004a0fa9bd8fcde2ed44cb5df4838 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 17 Oct 2019 22:16:51 +0000 Subject: [PATCH 024/130] podman-2:1.6.2-2 - bump to v1.6.2 - autobuilt f3ffda1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7c9b271..f550cff 100644 --- a/.gitignore +++ b/.gitignore @@ -393,3 +393,4 @@ /libpod-a2fdb6e.tar.gz /libpod-233d95f.tar.gz /libpod-4d653f0.tar.gz +/libpod-f3ffda1.tar.gz diff --git a/podman.spec b/podman.spec index 15fb065..9e49630 100644 --- a/podman.spec +++ b/podman.spec @@ -27,19 +27,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 4d653f07f3899aca8038e12574bfbffa45275181 +%global commit0 f3ffda1e08f19e9a6a88484136b5eed76533f21a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.2-rc1 +%global built_tag v1.6.2 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.6.2 -Release: 0.2.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,10 @@ exit 0 %endif %changelog +* Thu Oct 17 2019 RH Container Bot - 2:1.6.2-2 +- bump to v1.6.2 +- autobuilt f3ffda1 + * Wed Oct 16 2019 RH Container Bot - 2:1.6.2-0.2.rc1 - bump to v1.6.2-rc1 - autobuilt 4d653f0 diff --git a/sources b/sources index 8fd79f6..88750c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-4d653f0.tar.gz) = ac36ddaac6c123a4dfb0777456bd0d04a024f98a63f03a3a758d2fff3e235c2c62a84bef4986f22545d8ff78abada2b6b1d1bc2859df350573d21c436a68d256 +SHA512 (libpod-f3ffda1.tar.gz) = 05cedc0b58c5a3eac74d687ebca4ce4ffa3fe348deae89b3127e4edb5b1ce76d94c0b94df6ebae6c38ce0902cfab21dafe1f6fac752c0f67cfb001258727650c From 62e7cee1552196aa8d36441788f91a180c7c2653 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Oct 2019 12:24:21 +0000 Subject: [PATCH 025/130] podman-1.6.2-3 - crun only for fedora ATM Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 9e49630..152e0a0 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -62,7 +62,10 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel +# Not for CentOS yet +%if 0%{?fedora} Requires: crun >= 0.10.2-1 +%endif Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -581,6 +584,9 @@ exit 0 %endif %changelog +* Wed Oct 30 2019 Lokesh Mandvekar - 1.6.2-3 +- crun only for fedora ATM + * Thu Oct 17 2019 RH Container Bot - 2:1.6.2-2 - bump to v1.6.2 - autobuilt f3ffda1 From 30961a1dce8a8e8661c6754b21d5e44caf97d9f2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Oct 2019 12:29:10 +0000 Subject: [PATCH 026/130] go-md2man for CentOS Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 152e0a0..a0c3042 100644 --- a/podman.spec +++ b/podman.spec @@ -51,7 +51,11 @@ BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: git +%if 0%{?fedora} BuildRequires: golang-github-cpuguy83-md2man +%else +BuildRequires: go-md2man +%endif BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel From d0bbca11cb26437bf255b2ac7f88365f5bf22a6c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 18 Oct 2019 09:02:37 -0400 Subject: [PATCH 027/130] package podman-plugins Signed-off-by: Lokesh Mandvekar --- podman.spec | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index a0c3042..d2a47a7 100644 --- a/podman.spec +++ b/podman.spec @@ -30,6 +30,13 @@ %global commit0 f3ffda1e08f19e9a6a88484136b5eed76533f21a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global repo_plugins dnsname +# https://github.com/containers/libpod +%global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} +%global git_plugins https://%{import_path_plugins} +%global commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe +%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) %global built_tag v1.6.2 @@ -44,6 +51,7 @@ Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz +Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel @@ -75,6 +83,7 @@ Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables Requires: conmon +Requires: %{name}-plugins = %{epoch}:%{version}-%{release} %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -419,18 +428,33 @@ BuildArch: noarch %description manpages Man pages for the %{name} commands +%package plugins +Summary: Plugins for %{name} + +%description plugins +This plugin sets up the use of dnsmasq on a given CNI network so +that Pods can resolve each other by name. When configured, +the pod and its IP address are added to a network specific hosts file +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. + %prep %autosetup -Sgit -n %{repo}-%{commit0} +# untar dnsname +tar zxf %{SOURCE1} + %build +export GO111MODULE=off +export GOPATH=$(pwd)/_build:$(pwd) + mkdir _build pushd _build mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src -export GOPATH=$(pwd)/_build:$(pwd) -export GO111MODULE=off %gogenerate ./cmd/%{name}/varlink/... # build %%{name} @@ -444,6 +468,17 @@ export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devic %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif +pushd dnsname-%{commit_plugins} +mkdir _build +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../../ src/%{import_path_plugins} +popd +ln -s vendor src +export GOPATH=$(pwd)/_build:$(pwd) +%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname +popd + %install sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i sed -i 's/install.remote: podman-remote/install.remote:/' Makefile @@ -468,6 +503,11 @@ mv pkg/hooks/README.md pkg/hooks/README-hooks.md install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers +# install plugins +pushd dnsname-%{commit_plugins} +%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install +popd + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -587,6 +627,11 @@ exit 0 %{_datadir}/%{name}/test %endif +%files plugins +%license dnsname-%{commit_plugins}/LICENSE +%doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md} +%{_libexecdir}/cni/dnsname + %changelog * Wed Oct 30 2019 Lokesh Mandvekar - 1.6.2-3 - crun only for fedora ATM From 0b5720b3e2068900882b125a90621f4b81daad75 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 8 Nov 2019 08:03:10 -0500 Subject: [PATCH 028/130] add podman-plugins subpackage Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index d2a47a7..032a487 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -633,6 +633,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Nov 08 2019 Lokesh Mandvekar - 2:1.6.2-4 +- add podman-plugins subpackage + * Wed Oct 30 2019 Lokesh Mandvekar - 1.6.2-3 - crun only for fedora ATM From 5b7f6b673603004d81aeb8d5040b5e98b2a1e7a4 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 11 Dec 2019 19:11:12 +0000 Subject: [PATCH 029/130] podman-2:1.7.0-0.2.rc1 - bump to v1.7.0-rc1 - autobuilt 7bbef41 Signed-off-by: RH Container Bot --- .gitignore | 2 ++ podman.spec | 12 ++++++++---- sources | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f550cff..6f6d0cb 100644 --- a/.gitignore +++ b/.gitignore @@ -394,3 +394,5 @@ /libpod-233d95f.tar.gz /libpod-4d653f0.tar.gz /libpod-f3ffda1.tar.gz +/dnsname-f5af33d.tar.gz +/libpod-7bbef41.tar.gz diff --git a/podman.spec b/podman.spec index 032a487..afa9af2 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 f3ffda1e08f19e9a6a88484136b5eed76533f21a +%global commit0 7bbef419fbbe49eddc9caf975159088e9d805823 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global repo_plugins dnsname @@ -39,14 +39,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.2 +%global built_tag v1.7.0-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.6.2 -Release: 4%{?dist} +Version: 1.7.0 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -633,6 +633,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Dec 11 2019 RH Container Bot - 2:1.7.0-0.2.rc1 +- bump to v1.7.0-rc1 +- autobuilt 7bbef41 + * Fri Nov 08 2019 Lokesh Mandvekar - 2:1.6.2-4 - add podman-plugins subpackage diff --git a/sources b/sources index 88750c6..f067b36 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (libpod-f3ffda1.tar.gz) = 05cedc0b58c5a3eac74d687ebca4ce4ffa3fe348deae89b3127e4edb5b1ce76d94c0b94df6ebae6c38ce0902cfab21dafe1f6fac752c0f67cfb001258727650c +SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc +SHA512 (libpod-7bbef41.tar.gz) = c1a4c3e2dd3f2d0ca8e2c213b64866fb52d8c6acb5ff5695f4412628c15999e534569aaef6c8391fe56166ca7466da9a498addb965a3003dee7a6d2806c75c8c From 065e89cb60783c14450d2d0bbbe5c4df1e7ffdc4 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 2 Jan 2020 21:10:24 +0000 Subject: [PATCH 030/130] podman-2:1.7.0-0.3.rc1 - bump to v1.7.0-rc2 - autobuilt 9090c47 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6f6d0cb..58fddc2 100644 --- a/.gitignore +++ b/.gitignore @@ -396,3 +396,4 @@ /libpod-f3ffda1.tar.gz /dnsname-f5af33d.tar.gz /libpod-7bbef41.tar.gz +/libpod-9090c47.tar.gz diff --git a/podman.spec b/podman.spec index afa9af2..53c8ec8 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 7bbef419fbbe49eddc9caf975159088e9d805823 +%global commit0 9090c476f76638ae9e86b6bc30b64fce3252266c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global repo_plugins dnsname @@ -39,14 +39,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.7.0-rc1 +%global built_tag v1.7.0-rc2 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.7.0 -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/ @@ -633,6 +633,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Thu Jan 02 2020 RH Container Bot - 2:1.7.0-0.3.rc1 +- bump to v1.7.0-rc2 +- autobuilt 9090c47 + * Wed Dec 11 2019 RH Container Bot - 2:1.7.0-0.2.rc1 - bump to v1.7.0-rc1 - autobuilt 7bbef41 @@ -678,7 +682,7 @@ exit 0 - bump to v1.6.0 - autobuilt b02b072 -* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2.git9181c65 +* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2git9181c65 - bump to v1.6.0-rc2 - autobuilt 9181c65 diff --git a/sources b/sources index f067b36..1bf8584 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (libpod-7bbef41.tar.gz) = c1a4c3e2dd3f2d0ca8e2c213b64866fb52d8c6acb5ff5695f4412628c15999e534569aaef6c8391fe56166ca7466da9a498addb965a3003dee7a6d2806c75c8c +SHA512 (libpod-9090c47.tar.gz) = a6c1082ad5db5aabbca6ab292d9dc3a8910acf71b0564af267abfd8f8cf9c8bdfdbc25841f01d37ca2bbab6fa5946b88fb48ef54d26aab9a8d0adf8f6e27628b From 4f889b68edd9ac2c3abe780da6345fb235a88ba0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 6 Jan 2020 23:57:23 +0530 Subject: [PATCH 031/130] use correct rc tag Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 53c8ec8..601daf8 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Name: podman Epoch: 2 %endif Version: 1.7.0 -Release: 0.3.rc1%{?dist} +Release: 0.4.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -633,6 +633,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Jan 06 2020 Lokesh Mandvekar - 2:1.7.0-0.4.rc2 +- use correct rc tag + * Thu Jan 02 2020 RH Container Bot - 2:1.7.0-0.3.rc1 - bump to v1.7.0-rc2 - autobuilt 9090c47 From edde6e2d142bdd3f3305191fa5dd4c37d48b4b40 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Tue, 7 Jan 2020 12:12:48 +0100 Subject: [PATCH 032/130] podman-1.7.0-0.5.rc2.fc31 - merge podman-manpages with podman package - require container-selinux (#1765818) - minor spec file updates Signed-off-by: Jindrich Novy --- podman.spec | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/podman.spec b/podman.spec index 601daf8..3eda915 100644 --- a/podman.spec +++ b/podman.spec @@ -46,12 +46,14 @@ Name: podman Epoch: 2 %endif Version: 1.7.0 -Release: 0.4.rc2%{?dist} +Release: 0.5.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.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. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel @@ -84,17 +86,14 @@ Requires: iptables Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} +Requires: container-selinux %if 0%{?fedora} -Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} -Recommends: container-selinux +Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc -Recommends: libvarlink-util %else #### DO NOT REMOVE - NEEDED FOR CENTOS -Requires: %{name}-manpages = %{version}-%{release} -Requires: container-selinux Requires: slirp4netns >= 0.3.0-2 Requires: runc >= 1.0.0-57 Requires: libvarlink-util @@ -207,9 +206,12 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8 daemonless tool. %{name} provides a Docker-CLI comparable command line that eases the transition from other container engines and allows the management of pods, containers and images. Simply put: alias docker=%{name}. -Most %{name} commands can be run as a regular user, without requiring additional privileges. +Most %{name} commands can be run as a regular user, without requiring +additional privileges. -%{name} uses Buildah(1) internally to create container images. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. +%{name} uses Buildah(1) internally to create container images. +Both tools share image (not container) storage, hence each can use or +manipulate images (but not containers) created by the other. %{summary} %{repo} Simple management tool for pods, containers and images @@ -383,7 +385,8 @@ Requires: golang(github.com/urfave/cli) %description unit-test-devel %{summary} -libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. +%{repo} provides a library for applications looking to use the +Container Pod concept popularized by Kubernetes. This package contains unit tests for project providing packages with %{import_path} prefix. @@ -404,7 +407,6 @@ This package contains system tests for %{name} %package remote Summary: (Experimental) Remote client for managing %{name} containers -Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} %description remote Remote client for managing %{name} containers. @@ -417,17 +419,6 @@ manage pods, containers and container images. %{name}-remote supports ssh connections as well. %endif -%package manpages -Summary: Man pages for the %{name} commands -BuildArch: noarch - -%files manpages -%{_mandir}/man1/%{name}*.1* -%{_mandir}/man5/*.5* - -%description manpages -Man pages for the %{name} commands - %package plugins Summary: Plugins for %{name} @@ -596,8 +587,9 @@ exit 0 %{_unitdir}/io.%{name}.socket %{_userunitdir}/io.%{name}.service %{_userunitdir}/io.%{name}.socket - %{_usr}/lib/tmpfiles.d/%{name}.conf +%{_mandir}/man1/%{name}*.1* +%{_mandir}/man5/*.5* %files docker %{_bindir}/docker @@ -633,6 +625,11 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Jan 07 2020 Jindrich Novy - 2:1.7.0-0.5.rc2 +- merge podman-manpages with podman package +- require container-selinux (#1765818) +- minor spec file updates + * Mon Jan 06 2020 Lokesh Mandvekar - 2:1.7.0-0.4.rc2 - use correct rc tag From 32767aad7c6120ebaef5dcdf09468fb9bfe94441 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 7 Jan 2020 17:10:26 +0000 Subject: [PATCH 033/130] podman-2:1.7.0-2 - bump to v1.7.0 - autobuilt b7ce115 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 58fddc2..3bd534e 100644 --- a/.gitignore +++ b/.gitignore @@ -397,3 +397,4 @@ /dnsname-f5af33d.tar.gz /libpod-7bbef41.tar.gz /libpod-9090c47.tar.gz +/libpod-b7ce115.tar.gz diff --git a/podman.spec b/podman.spec index 3eda915..90aee06 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 9090c476f76638ae9e86b6bc30b64fce3252266c +%global commit0 b7ce1157b00af09f4a09e39b377aa3abff46ee05 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global repo_plugins dnsname @@ -39,14 +39,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.7.0-rc2 +%global built_tag v1.7.0 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.7.0 -Release: 0.5.rc2%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -625,6 +625,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Jan 07 2020 RH Container Bot - 2:1.7.0-2 +- bump to v1.7.0 +- autobuilt b7ce115 + * Tue Jan 07 2020 Jindrich Novy - 2:1.7.0-0.5.rc2 - merge podman-manpages with podman package - require container-selinux (#1765818) diff --git a/sources b/sources index 1bf8584..25ef3e0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (libpod-9090c47.tar.gz) = a6c1082ad5db5aabbca6ab292d9dc3a8910acf71b0564af267abfd8f8cf9c8bdfdbc25841f01d37ca2bbab6fa5946b88fb48ef54d26aab9a8d0adf8f6e27628b +SHA512 (libpod-b7ce115.tar.gz) = 7981b5cd9eab77e33ed229cf2d507262199aaf11bac365fbe2c1a9ea142166f7e2c90049d2a852ef219e2ca9d6766099357f53958a24b74a05ac6ed2cb025180 From f89b62d924173a7b6fbf46943c9fd4654f2e9a3c Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Wed, 8 Jan 2020 15:04:21 +0100 Subject: [PATCH 034/130] podman-1.7.0-2.fc31 - require container-selinux only when selinux-policy is installed and move podman-remote man pages to dedicated package (#1765818) Signed-off-by: Jindrich Novy --- podman.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 90aee06..39f96d5 100644 --- a/podman.spec +++ b/podman.spec @@ -86,7 +86,7 @@ Requires: iptables Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} -Requires: container-selinux +Requires: (container-selinux if selinux-policy) %if 0%{?fedora} Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 @@ -499,6 +499,11 @@ pushd dnsname-%{commit_plugins} %{__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 +done + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -573,7 +578,7 @@ exit 0 #define license tag if not already defined %{!?_licensedir:%global license %doc} -%files +%files -f podman.file-list %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} @@ -588,8 +593,6 @@ exit 0 %{_userunitdir}/io.%{name}.service %{_userunitdir}/io.%{name}.socket %{_usr}/lib/tmpfiles.d/%{name}.conf -%{_mandir}/man1/%{name}*.1* -%{_mandir}/man5/*.5* %files docker %{_bindir}/docker @@ -613,6 +616,8 @@ exit 0 %files remote %license LICENSE %{_bindir}/%{name}-remote +%{_mandir}/man1/%{name}-remote*.1* +%{_mandir}/man5/%{name}-remote*.5* %files tests %license LICENSE @@ -625,6 +630,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Jan 08 2020 Jindrich Novy - 2:1.7.1-3 +- require container-selinux only when selinux-policy is installed and + move podman-remote man pages to dedicated package (#1765818) + * Tue Jan 07 2020 RH Container Bot - 2:1.7.0-2 - bump to v1.7.0 - autobuilt b7ce115 From 5a94bec9eb4b72c963a4c6d9bdf1b33cdd99cb3a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Feb 2020 10:02:40 -0500 Subject: [PATCH 035/130] adjust macros and deps for OBS build Signed-off-by: Lokesh Mandvekar --- podman.spec | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/podman.spec b/podman.spec index 39f96d5..363b58c 100644 --- a/podman.spec +++ b/podman.spec @@ -1,15 +1,15 @@ %global with_devel 0 %global with_bundled 1 -%global with_debug 1 %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} >= 8 #### DO NOT REMOVE - NEEDED FOR CENTOS %bcond_without varlink -%define gogenerate go generate +%global with_debug 1 %else %bcond_with varlink +%global with_debug 0 %endif %if 0%{?with_debug} @@ -19,6 +19,11 @@ %global debug_package %{nil} %endif +%if ! 0%{?gobuild:1} +%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; +%endif +%define gogenerate go generate + %global provider github %global provider_tld com %global project containers @@ -39,7 +44,9 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.7.0 +%define built_tag v1.7.0 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz Name: podman %if 0%{?fedora} @@ -50,22 +57,18 @@ Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ -Source0: %{git0}/archive/%{commit0}/%{repo}-%{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} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: golang BuildRequires: btrfs-progs-devel BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: git -%if 0%{?fedora} -BuildRequires: golang-github-cpuguy83-md2man -%else BuildRequires: go-md2man -%endif BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel @@ -76,10 +79,6 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -# Not for CentOS yet -%if 0%{?fedora} -Requires: crun >= 0.10.2-1 -%endif Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -92,10 +91,13 @@ Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc +Requires: crun >= 0.10.2-1 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 Requires: runc >= 1.0.0-57 +%endif +%if 0%{?centos} >= 8 Requires: libvarlink-util %endif @@ -431,7 +433,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 %{repo}-%{commit0} +%autosetup -Sgit -n %{repo}-%{built_tag_strip} # untar dnsname tar zxf %{SOURCE1} @@ -471,7 +473,9 @@ export GOPATH=$(pwd)/_build:$(pwd) popd %install +%if 0%{?fedora} sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i +%endif sed -i 's/install.remote: podman-remote/install.remote:/' Makefile sed -i 's/install.bin: podman/install.bin:/' Makefile rm -rf docs/containers-mounts.conf.5.md From 518b0a49bca42013d2ea82449e7df8e1d569a5ca Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Feb 2020 10:38:42 -0500 Subject: [PATCH 036/130] no ostree/btrfs deps for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 363b58c..41ac3eb 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,6 @@ 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: golang -BuildRequires: btrfs-progs-devel BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static @@ -74,7 +73,6 @@ BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel -BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd @@ -87,6 +85,8 @@ Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} Requires: (container-selinux if selinux-policy) %if 0%{?fedora} +BuildRequires: btrfs-progs-devel +BuildRequires: ostree-devel Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 @@ -452,12 +452,18 @@ ln -s vendor src # build %%{name} export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +%if 0%{?centos} +export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" +%endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} %if 0%{?fedora} #### DO NOT REMOVE - NEEDED FOR CENTOS # build %%{name}-remote export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +%if 0%{?centos} +export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" +%endif %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif From d3487efebb0f65e4ecba9d574efb62369449ac39 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Feb 2020 10:46:53 -0500 Subject: [PATCH 037/130] set Epoch:0 for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/podman.spec b/podman.spec index 41ac3eb..876a9be 100644 --- a/podman.spec +++ b/podman.spec @@ -51,6 +51,8 @@ Name: podman %if 0%{?fedora} Epoch: 2 +%else +Epoch: 0 %endif Version: 1.7.0 Release: 2%{?dist} From 6676d817bce0060693e2b707a4aafbbcf45d7fda Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Feb 2020 11:00:20 -0500 Subject: [PATCH 038/130] built v1.8.0-rc1 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 40 ++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 3bd534e..f0dabe6 100644 --- a/.gitignore +++ b/.gitignore @@ -398,3 +398,4 @@ /libpod-7bbef41.tar.gz /libpod-9090c47.tar.gz /libpod-b7ce115.tar.gz +/v1.8.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 876a9be..1228d24 100644 --- a/podman.spec +++ b/podman.spec @@ -24,27 +24,27 @@ %endif %define gogenerate go generate -%global provider github -%global provider_tld com -%global project containers -%global repo libpod +%define provider github +%define provider_tld com +%define project containers +%define repo libpod # https://github.com/containers/libpod -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 b7ce1157b00af09f4a09e39b377aa3abff46ee05 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%define import_path %{provider_prefix} +%define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} +%define commit0 5558c2620cb9ad32173a1a9e2240c2adff2fc888 +%define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global repo_plugins dnsname +%define repo_plugins dnsname # https://github.com/containers/libpod -%global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} -%global git_plugins https://%{import_path_plugins} -%global commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe -%global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) +%define import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins} +%define git_plugins https://github.com/containers/dnsname +%define commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe +%define shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.7.0 +%define built_tag v1.8.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -54,13 +54,13 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.7.0 -Release: 2%{?dist} +Version: 1.8.0 +Release: 0.1%{?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 +Source1: https://github.com/containers/dnsname/archive/%{commit_plugins}/dnsname-%{shortcommit_plugins}.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. @@ -609,6 +609,7 @@ exit 0 %files docker %{_bindir}/docker %{_mandir}/man1/docker*.1* +%{_usr}/lib/tmpfiles.d/%{name}-docker.conf %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list @@ -642,6 +643,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Feb 03 2020 Lokesh Mandvekar - 2:1.8.0-0.1 +- built v1.8.0-rc1 + * Wed Jan 08 2020 Jindrich Novy - 2:1.7.1-3 - require container-selinux only when selinux-policy is installed and move podman-remote man pages to dedicated package (#1765818) diff --git a/sources b/sources index 25ef3e0..0d8ed73 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (libpod-b7ce115.tar.gz) = 7981b5cd9eab77e33ed229cf2d507262199aaf11bac365fbe2c1a9ea142166f7e2c90049d2a852ef219e2ca9d6766099357f53958a24b74a05ac6ed2cb025180 +SHA512 (v1.8.0-rc1.tar.gz) = 14dd3c1f4bd59cea34f342248f05ed6eb942c055ece407d0f2f1a27a746e3706c4afa0c7cc40280aae0c0f179bfc9c20852deb52ee8e5663b68897c481c0c8c7 From e957fe4a2226f212e24d1cdbc6e7ea3288220705 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 4 Feb 2020 09:03:21 -0500 Subject: [PATCH 039/130] adjust build steps for happy CentOS builds on OBS Signed-off-by: Lokesh Mandvekar --- podman.spec | 62 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/podman.spec b/podman.spec index 1228d24..f4b855d 100644 --- a/podman.spec +++ b/podman.spec @@ -6,9 +6,13 @@ %if 0%{?fedora} || 0%{?centos} >= 8 #### DO NOT REMOVE - NEEDED FOR CENTOS %bcond_without varlink -%global with_debug 1 %else %bcond_with varlink +%endif + +%if 0%{?fedora} +%global with_debug 1 +%else %global with_debug 0 %endif @@ -60,7 +64,7 @@ Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{download_url} -Source1: https://github.com/containers/dnsname/archive/%{commit_plugins}/dnsname-%{shortcommit_plugins}.tar.gz +Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.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. @@ -85,7 +89,7 @@ Requires: iptables Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} -Requires: (container-selinux if selinux-policy) +Requires: container-selinux %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel @@ -396,7 +400,6 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif -%if 0%{?fedora} %package tests Summary: Tests for %{name} @@ -409,6 +412,7 @@ Requires: jq This package contains system tests for %{name} +%if 0%{?fedora} || 0%{?centos} >= 8 %package remote Summary: (Experimental) Remote client for managing %{name} containers @@ -442,8 +446,20 @@ tar zxf %{SOURCE1} %build export GO111MODULE=off -export GOPATH=$(pwd)/_build:$(pwd) +# build plugins first cause we don't wanna use podman's buildtags +pushd dnsname-%{commit_plugins} +mkdir _build +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../../ src/%{import_path_plugins} +popd +ln -s vendor src +export GOPATH=$(pwd)/_build:$(pwd) +%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname +popd + +export GOPATH=$(pwd)/_build:$(pwd) mkdir _build pushd _build mkdir -p src/%{provider}.%{provider_tld}/%{project} @@ -459,27 +475,12 @@ export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" %endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -%if 0%{?fedora} -#### DO NOT REMOVE - NEEDED FOR CENTOS +%if 0%{?fedora} || 0%{?centos} >= 8 # build %%{name}-remote -export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" -%if 0%{?centos} -export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" -%endif +export BUILDTAGS+="remoteclient" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif -pushd dnsname-%{commit_plugins} -mkdir _build -pushd _build -mkdir -p src/%{provider}.%{provider_tld}/%{project} -ln -s ../../../../ src/%{import_path_plugins} -popd -ln -s vendor src -export GOPATH=$(pwd)/_build:$(pwd) -%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname -popd - %install %if 0%{?fedora} sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i @@ -488,10 +489,17 @@ sed -i 's/install.remote: podman-remote/install.remote:/' Makefile sed -i 's/install.bin: podman/install.bin:/' Makefile rm -rf docs/containers-mounts.conf.5.md +# do not install remote manpages on centos7 +%if 0%{?centos} < 8 +rm -rf docs/build/man/docker-remote.1 +rm -rf docs/build/man/%{name}-remote.1 +rm -rf docs/build/man/%{name}-remote.conf.5 +%endif + install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} >= 8 install.remote \ %endif install.man \ @@ -625,17 +633,19 @@ exit 0 %endif #### DO NOT REMOVE - NEEDED FOR CENTOS -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} >= 8 %files remote %license LICENSE %{_bindir}/%{name}-remote %{_mandir}/man1/%{name}-remote*.1* %{_mandir}/man5/%{name}-remote*.5* +%endif %files tests %license LICENSE -%{_datadir}/%{name}/test -%endif +%dir %{_datadir}/%{name}/test +%dir %{_datadir}/%{name}/test/system +%{_datadir}/%{name}/test/system/* %files plugins %license dnsname-%{commit_plugins}/LICENSE From fc17da38eef71d1b8a3c9e3c13724ee58957b988 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 6 Feb 2020 06:50:12 -0500 Subject: [PATCH 040/130] do not install remote files for centos7 Signed-off-by: Lokesh Mandvekar --- podman.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/podman.spec b/podman.spec index f4b855d..b8ea708 100644 --- a/podman.spec +++ b/podman.spec @@ -489,13 +489,6 @@ sed -i 's/install.remote: podman-remote/install.remote:/' Makefile sed -i 's/install.bin: podman/install.bin:/' Makefile rm -rf docs/containers-mounts.conf.5.md -# do not install remote manpages on centos7 -%if 0%{?centos} < 8 -rm -rf docs/build/man/docker-remote.1 -rm -rf docs/build/man/%{name}-remote.1 -rm -rf docs/build/man/%{name}-remote.conf.5 -%endif - install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ @@ -524,6 +517,13 @@ 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} < 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 %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ From a136e565f6767ba0021b5f1db210ed499ef2f119 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 6 Feb 2020 11:28:22 -0500 Subject: [PATCH 041/130] podman-2:1.8.0-0.2 - bump crun dependency Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index b8ea708..904187a 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 0.1%{?dist} +Release: 0.2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -97,7 +97,7 @@ Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc -Requires: crun >= 0.10.2-1 +Requires: crun >= 0.12.1-1 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 +- bump crun dependency + * Mon Feb 03 2020 Lokesh Mandvekar - 2:1.8.0-0.1 - built v1.8.0-rc1 From 7bae89e0f110d8e740eb9ae49b3783731943947c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 7 Feb 2020 14:29:14 -0500 Subject: [PATCH 042/130] keep remote manpages for fedora Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 904187a..2533734 100644 --- a/podman.spec +++ b/podman.spec @@ -518,7 +518,7 @@ for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},, done # do not install remote manpages on centos7 -%if 0%{?centos} < 8 +%if ! 0%{?fedora} && 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 From cc155853f29f0c4227647674c6cc83b431ce6126 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 20:01:46 +0000 Subject: [PATCH 043/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f0dabe6..34ed955 100644 --- a/.gitignore +++ b/.gitignore @@ -399,3 +399,4 @@ /libpod-9090c47.tar.gz /libpod-b7ce115.tar.gz /v1.8.0-rc1.tar.gz +/v1.8.0.tar.gz diff --git a/podman.spec b/podman.spec index 2533734..03bf78a 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 5558c2620cb9ad32173a1a9e2240c2adff2fc888 +%define commit0 2ced9094d4728dd09f60a177faa32339a8d0f721 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.8.0-rc1 +%define built_tag v1.8.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 0.2%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency diff --git a/sources b/sources index 0d8ed73..c178719 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.8.0-rc1.tar.gz) = 14dd3c1f4bd59cea34f342248f05ed6eb942c055ece407d0f2f1a27a746e3706c4afa0c7cc40280aae0c0f179bfc9c20852deb52ee8e5663b68897c481c0c8c7 +SHA512 (v1.8.0.tar.gz) = 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87 From 3e12549aab26a2970505ffd796651c80d9d72e9a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 20:09:56 +0000 Subject: [PATCH 044/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 03bf78a..03784c5 100644 --- a/podman.spec +++ b/podman.spec @@ -657,6 +657,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From d297d054af5437382b1fee723b5c32e525ba4e5a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 21:09:34 +0000 Subject: [PATCH 045/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 03784c5..9d5ef6c 100644 --- a/podman.spec +++ b/podman.spec @@ -661,6 +661,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From 194ad3b3ee0b9907d79e447f54dd4ef7a6839cc4 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 22:03:52 +0000 Subject: [PATCH 046/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 9d5ef6c..732c152 100644 --- a/podman.spec +++ b/podman.spec @@ -665,6 +665,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From 710914e79c141e8e67129c9f83ba73eba702e553 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 22:09:43 +0000 Subject: [PATCH 047/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 732c152..dd23427 100644 --- a/podman.spec +++ b/podman.spec @@ -669,6 +669,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From d78d741879c5109e4d11d4534985aad4ac96cde3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 22:26:37 +0000 Subject: [PATCH 048/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index dd23427..701fa94 100644 --- a/podman.spec +++ b/podman.spec @@ -673,6 +673,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From 9809d0f98fc9995434fcf1c1ece903016728e7c8 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 22:37:52 +0000 Subject: [PATCH 049/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 701fa94..211d483 100644 --- a/podman.spec +++ b/podman.spec @@ -677,6 +677,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From 04898a3b500602a3f5cfa4485eb1ff24ebf22eb3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 23:09:35 +0000 Subject: [PATCH 050/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 211d483..db1bc62 100644 --- a/podman.spec +++ b/podman.spec @@ -681,6 +681,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From eaaf25899d67518760f7b7c115bb7bc562c01d98 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 00:09:36 +0000 Subject: [PATCH 051/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index db1bc62..56f9cdd 100644 --- a/podman.spec +++ b/podman.spec @@ -653,6 +653,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 02fe23666867bfd453606a94f0f7be9673b7fdda Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 01:11:25 +0000 Subject: [PATCH 052/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 56f9cdd..9eb00d8 100644 --- a/podman.spec +++ b/podman.spec @@ -657,6 +657,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 4a41bf1da5e0930368f8682d7dca64604d87bbf6 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 02:11:26 +0000 Subject: [PATCH 053/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 9eb00d8..9a1dab8 100644 --- a/podman.spec +++ b/podman.spec @@ -661,6 +661,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 5764bc9eff25c9d4ee393554d0ab6d35e4c98b22 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 03:10:41 +0000 Subject: [PATCH 054/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 9a1dab8..67216f0 100644 --- a/podman.spec +++ b/podman.spec @@ -665,6 +665,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 5da5b1be27c7e131a792c1d45ef235850a2e136c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 04:28:26 +0000 Subject: [PATCH 055/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 67216f0..ee02718 100644 --- a/podman.spec +++ b/podman.spec @@ -669,6 +669,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 5a111af584a8163563c9130dfde0b36542cab953 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 05:11:10 +0000 Subject: [PATCH 056/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index ee02718..bf4864e 100644 --- a/podman.spec +++ b/podman.spec @@ -673,6 +673,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 6a20051cd72434f68a5b6c78be50cb4b85d33f6c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 06:11:16 +0000 Subject: [PATCH 057/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index bf4864e..006f6a6 100644 --- a/podman.spec +++ b/podman.spec @@ -677,6 +677,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 341a1f9757c7c7bcc79a001bdabe269dbd512446 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 07:10:29 +0000 Subject: [PATCH 058/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 006f6a6..9ecc78d 100644 --- a/podman.spec +++ b/podman.spec @@ -681,6 +681,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 5cc1730e7e287823f34f859990b9e7ad42743a22 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 08:11:15 +0000 Subject: [PATCH 059/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 9ecc78d..6451301 100644 --- a/podman.spec +++ b/podman.spec @@ -685,6 +685,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 2404379b4f75263fe4bf7afc999a9fb6cfd1bf74 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 09:12:10 +0000 Subject: [PATCH 060/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 6451301..15ca868 100644 --- a/podman.spec +++ b/podman.spec @@ -689,6 +689,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 4ef281656f8423911d43252e075f81d396f09cca Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 10:11:44 +0000 Subject: [PATCH 061/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 15ca868..7a711ad 100644 --- a/podman.spec +++ b/podman.spec @@ -693,6 +693,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 0235e90b88cc6b462ab621a3cbcd9dc5e880472c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 11:11:24 +0000 Subject: [PATCH 062/130] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 7a711ad..ae2d92d 100644 --- a/podman.spec +++ b/podman.spec @@ -697,6 +697,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 5840f03527e9fb897c6d58fde107fb72b145b412 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 12 Feb 2020 20:06:55 -0500 Subject: [PATCH 063/130] no min version requirement on runc for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index ae2d92d..6cb6c9b 100644 --- a/podman.spec +++ b/podman.spec @@ -101,7 +101,7 @@ Requires: crun >= 0.12.1-1 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 -Requires: runc >= 1.0.0-57 +Requires: runc %endif %if 0%{?centos} >= 8 Requires: libvarlink-util From 80ce35f90f859bc1ee610ae2781001b4add3b4ff Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 14 Feb 2020 10:40:52 -0500 Subject: [PATCH 064/130] remove redundant changelogs Signed-off-by: Lokesh Mandvekar --- podman.spec | 76 ----------------------------------------------------- 1 file changed, 76 deletions(-) diff --git a/podman.spec b/podman.spec index 6cb6c9b..8db3827 100644 --- a/podman.spec +++ b/podman.spec @@ -657,82 +657,6 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - -* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 -- bump to v1.8.0 -- autobuilt 2ced909 - * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From a1dfd2d9dc4bc526b74abd8b781dd0f1bc114a9a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 15 Feb 2020 02:41:55 +0000 Subject: [PATCH 065/130] podman-2:1.8.0-1 - autobuilt v1.8.0 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 8db3827..2078bb2 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Sat Feb 15 2020 RH Container Bot - 2:1.8.0-1 +- autobuilt v1.8.0 + * Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From ee34e18ff4c933e2f5b1a3556c884954c7114fdd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 14 Feb 2020 21:43:03 -0500 Subject: [PATCH 066/130] Revert "podman-2:1.8.0-1" This reverts commit a1dfd2d9dc4bc526b74abd8b781dd0f1bc114a9a. --- podman.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 2078bb2..8db3827 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,9 +653,6 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog -* Sat Feb 15 2020 RH Container Bot - 2:1.8.0-1 -- autobuilt v1.8.0 - * Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 4fe5cbc0b280e52543d02bd3403995587f64e9ac Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 15 Feb 2020 03:13:49 +0000 Subject: [PATCH 067/130] podman-2:1.8.0-1 - autobuilt v1.8.0 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 8db3827..2078bb2 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Sat Feb 15 2020 RH Container Bot - 2:1.8.0-1 +- autobuilt v1.8.0 + * Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 4970476ccaf10496fd94030e0473c324fcb113a3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 14 Feb 2020 22:16:47 -0500 Subject: [PATCH 068/130] Revert "podman-2:1.8.0-1" This reverts commit 4fe5cbc0b280e52543d02bd3403995587f64e9ac. --- podman.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 2078bb2..8db3827 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,9 +653,6 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog -* Sat Feb 15 2020 RH Container Bot - 2:1.8.0-1 -- autobuilt v1.8.0 - * Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 45a2d2ce7a684e4b7993b484f671b07709d21e7a Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 20 Feb 2020 08:00:24 -0700 Subject: [PATCH 069/130] Require: skopeo (in tests package) ...for new tests which check skopeo-podman credential compatibility Signed-off-by: Ed Santiago --- podman.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 8db3827..8f61749 100644 --- a/podman.spec +++ b/podman.spec @@ -406,6 +406,7 @@ Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bats Requires: jq +Requires: skopeo %description tests %{summary} @@ -479,7 +480,7 @@ export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" # build %%{name}-remote export BUILDTAGS+="remoteclient" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -%endif +%endif %install %if 0%{?fedora} From 1e31428397bd144d623e5a9cecca8bf47ec17eb8 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 21 Feb 2020 22:11:25 +0000 Subject: [PATCH 070/130] podman-2:1.8.0-0.2.rc1 - autobuilt v1.8.1-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 34ed955..276d8c7 100644 --- a/.gitignore +++ b/.gitignore @@ -400,3 +400,4 @@ /libpod-b7ce115.tar.gz /v1.8.0-rc1.tar.gz /v1.8.0.tar.gz +/v1.8.1-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 8f61749..74f5986 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 2ced9094d4728dd09f60a177faa32339a8d0f721 +%define commit0 aee4d1d3748ff55bb3bb355b55409ee668468c57 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.8.0 +%define built_tag v1.8.1-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -58,8 +58,8 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.8.0 -Release: 2%{?dist} +Version: 1.8.1 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -654,6 +654,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Feb 21 2020 RH Container Bot - 2:1.8.0-0.2.rc1 +- autobuilt v1.8.1-rc1 + * Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 diff --git a/sources b/sources index c178719..34b7077 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.8.0.tar.gz) = 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87 +SHA512 (v1.8.1-rc1.tar.gz) = b17acd9c52684c1f60db889429c2d905cfb3603849d0d988625e163c3944affc698e145e0b8bb8685312baa5a89ee62734ea23aea046e0a1f1676d890cf6b78e From b5dafec860f33c21acd5d230733fd8105d5a901e Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sat, 22 Feb 2020 13:39:20 +0100 Subject: [PATCH 071/130] Fixes podman-remote A space was missing in BUILDTAGS, so the tag "remoteclient" was never passed. As a consequence, "podman-remote" was actually identical to "podman". Signed-off-by: Olivier Lemasle --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 74f5986..7de9c3b 100644 --- a/podman.spec +++ b/podman.spec @@ -478,7 +478,7 @@ export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" %if 0%{?fedora} || 0%{?centos} >= 8 # build %%{name}-remote -export BUILDTAGS+="remoteclient" +export BUILDTAGS+=" remoteclient" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif From bab4ccca2d6f3cde1c68227da4fd5646c31867c6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 23 Feb 2020 14:32:45 -0500 Subject: [PATCH 072/130] podman-2:1.8.1-0.3.rc1 - Resolves: #1806147 - correct buildtags for podman-remote Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 7de9c3b..c283809 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.1 -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/ @@ -654,7 +654,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog -* Fri Feb 21 2020 RH Container Bot - 2:1.8.0-0.2.rc1 +* Sun Feb 23 2020 Lokesh Mandvekar - 2:1.8.1-0.3.rc1 +- Resolves: #1806147 - correct buildtags for podman-remote + +* Fri Feb 21 2020 RH Container Bot - 2:1.8.1-0.2.rc1 - autobuilt v1.8.1-rc1 * Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 From 484070e89ad1786e2d059083fb2251d164793251 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 24 Feb 2020 10:35:21 -0500 Subject: [PATCH 073/130] fix build issues Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index c283809..f2bfd50 100644 --- a/podman.spec +++ b/podman.spec @@ -601,7 +601,7 @@ exit 0 %files -f podman.file-list %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md %{_bindir}/%{name} %{_datadir}/bash-completion/completions/* # By "owning" the site-functions dir, we don't need to Require zsh @@ -623,14 +623,14 @@ exit 0 %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %endif %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test-devel -f unit-test-devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md %endif #### DO NOT REMOVE - NEEDED FOR CENTOS From 231f5d8013f156b50e54bf8fa9913c82057e93da Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 28 Feb 2020 19:11:26 +0000 Subject: [PATCH 074/130] podman-2:1.8.1-0.3.rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 276d8c7..42eee72 100644 --- a/.gitignore +++ b/.gitignore @@ -401,3 +401,4 @@ /v1.8.0-rc1.tar.gz /v1.8.0.tar.gz /v1.8.1-rc1.tar.gz +/v1.8.1-rc2.tar.gz diff --git a/podman.spec b/podman.spec index f2bfd50..9f1e572 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 aee4d1d3748ff55bb3bb355b55409ee668468c57 +%define commit0 9f8565a53030246ffcb3255da7a7ecce33cf3444 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.8.1-rc1 +%define built_tag v1.8.1-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz diff --git a/sources b/sources index 34b7077..4c64113 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.8.1-rc1.tar.gz) = b17acd9c52684c1f60db889429c2d905cfb3603849d0d988625e163c3944affc698e145e0b8bb8685312baa5a89ee62734ea23aea046e0a1f1676d890cf6b78e +SHA512 (v1.8.1-rc2.tar.gz) = bdb5ed13ab06bed4852b40ffd7ce5bca546cc134f31f8a299b1fcda514aaa370774a0e2a319412d57c8f055cc6b70821fbb063b6c80b9a121eb26fb6afde94d1 From c38b613a1bf72a627c66654e678767cbab9fa61f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 1 Mar 2020 13:45:32 -0500 Subject: [PATCH 075/130] correct changelog entry Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 9f1e572..1005fe9 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.1 -Release: 0.3.rc1%{?dist} +Release: 0.4.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -654,6 +654,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Sun Mar 01 2020 Lokesh Mandvekar - 2:1.8.1-0.4.rc2 +- correct changelog + * Sun Feb 23 2020 Lokesh Mandvekar - 2:1.8.1-0.3.rc1 - Resolves: #1806147 - correct buildtags for podman-remote From 14c8db8b71a69345b0829a66afc4c7133521686e Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 6 Mar 2020 23:11:50 +0000 Subject: [PATCH 076/130] podman-2:1.8.1-0.4.rc2 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 42eee72..841aac4 100644 --- a/.gitignore +++ b/.gitignore @@ -402,3 +402,4 @@ /v1.8.0.tar.gz /v1.8.1-rc1.tar.gz /v1.8.1-rc2.tar.gz +/v1.8.1-rc3.tar.gz diff --git a/podman.spec b/podman.spec index 1005fe9..f7feddb 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 9f8565a53030246ffcb3255da7a7ecce33cf3444 +%define commit0 e5f7cb397874fec193fc9cdebc0cc29c0437e8d2 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.8.1-rc2 +%define built_tag v1.8.1-rc3 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz diff --git a/sources b/sources index 4c64113..9771000 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.8.1-rc2.tar.gz) = bdb5ed13ab06bed4852b40ffd7ce5bca546cc134f31f8a299b1fcda514aaa370774a0e2a319412d57c8f055cc6b70821fbb063b6c80b9a121eb26fb6afde94d1 +SHA512 (v1.8.1-rc3.tar.gz) = 2c80a858408c0b35878c438f87216b3cd302ffeedad5a209d015763aa0bbe0bafd5802ffb33b1c057594e4fd1d2612386b4c79221fbb69cc368ba4458820aac3 From e6cd5027e891673d5e59df61532568c54700a88d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 7 Mar 2020 08:14:07 -0500 Subject: [PATCH 077/130] update changelog and release tag Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index f7feddb..d5a4c00 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.1 -Release: 0.4.rc2%{?dist} +Release: 0.5.rc3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -654,6 +654,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Sat Mar 07 2020 Lokesh Mandvekar - 2:1.8.1-0.5.rc3 +- bump to v1.8.1-rc3 + * Sun Mar 01 2020 Lokesh Mandvekar - 2:1.8.1-0.4.rc2 - correct changelog From 2089723ab6ba4489391bb4a08d6a45949637eadb Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 10 Mar 2020 13:39:56 +0000 Subject: [PATCH 078/130] podman-2:1.8.1-0.6.rc3 - autobuilt v1.8.1-rc4 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 841aac4..10b1b00 100644 --- a/.gitignore +++ b/.gitignore @@ -403,3 +403,4 @@ /v1.8.1-rc1.tar.gz /v1.8.1-rc2.tar.gz /v1.8.1-rc3.tar.gz +/v1.8.1-rc4.tar.gz diff --git a/podman.spec b/podman.spec index d5a4c00..1c88803 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 e5f7cb397874fec193fc9cdebc0cc29c0437e8d2 +%define commit0 d5b027f412d69096e689baa1ada45bc33f228b63 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.8.1-rc3 +%define built_tag v1.8.1-rc4 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.1 -Release: 0.5.rc3%{?dist} +Release: 0.6.rc3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -654,6 +654,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Mar 10 2020 RH Container Bot - 2:1.8.1-0.6.rc3 +- autobuilt v1.8.1-rc4 + * Sat Mar 07 2020 Lokesh Mandvekar - 2:1.8.1-0.5.rc3 - bump to v1.8.1-rc3 diff --git a/sources b/sources index 9771000..0e0b2b4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.8.1-rc3.tar.gz) = 2c80a858408c0b35878c438f87216b3cd302ffeedad5a209d015763aa0bbe0bafd5802ffb33b1c057594e4fd1d2612386b4c79221fbb69cc368ba4458820aac3 +SHA512 (v1.8.1-rc4.tar.gz) = 5965d461db12afa87d08114919b9e8ebaf94c18fe25dde43660254ee2a8bb3973219c5d6d8f6f25c12f4d21b3e345ae1a57dc6831dcde7f53cf201dc0d3a933a From 048a21eba516ea0362f6a2b4f1aeaf1329d9c2e6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 10 Mar 2020 09:52:02 -0400 Subject: [PATCH 079/130] podman-2:1.8.1-0.7.rc4 - correct release tag Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 1c88803..b810f94 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.1 -Release: 0.6.rc3%{?dist} +Release: 0.7.rc4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -654,6 +654,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Mar 10 2020 Lokesh Mandvekar - 2:1.8.1-0.7.rc4 +- correct release tag + * Tue Mar 10 2020 RH Container Bot - 2:1.8.1-0.6.rc3 - autobuilt v1.8.1-rc4 From 91b4814c323f72066b376503a0ab745c91799830 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 11 Mar 2020 17:12:07 +0000 Subject: [PATCH 080/130] podman-2:1.8.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 10b1b00..2cf8973 100644 --- a/.gitignore +++ b/.gitignore @@ -404,3 +404,4 @@ /v1.8.1-rc2.tar.gz /v1.8.1-rc3.tar.gz /v1.8.1-rc4.tar.gz +/v1.8.1.tar.gz diff --git a/podman.spec b/podman.spec index b810f94..8de93ae 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 d5b027f412d69096e689baa1ada45bc33f228b63 +%define commit0 444a19cdd2e6108c75f6c1aadc1a2a9138a8bd73 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.8.1-rc4 +%define built_tag v1.8.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.1 -Release: 0.7.rc4%{?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 %{_libexecdir}/cni/dnsname %changelog +* Wed Mar 11 2020 RH Container Bot - 2:1.8.1-1 +- autobuilt v1.8.1 + * Tue Mar 10 2020 Lokesh Mandvekar - 2:1.8.1-0.7.rc4 - correct release tag diff --git a/sources b/sources index 0e0b2b4..85e62c5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.8.1-rc4.tar.gz) = 5965d461db12afa87d08114919b9e8ebaf94c18fe25dde43660254ee2a8bb3973219c5d6d8f6f25c12f4d21b3e345ae1a57dc6831dcde7f53cf201dc0d3a933a +SHA512 (v1.8.1.tar.gz) = 48b5f9f67f3a5b9b0d91c24ac87a1a62146661bbcab385e63cf09ac56f85e384b4acae91d8e887557c4e87a37f56b10f90b3bb22278a2cfcc4f1da42ad4e5027 From ac07aa427e3b573d28809469642b90fae766a72f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Mar 2020 17:50:58 -0400 Subject: [PATCH 081/130] podman-2:1.8.1-2 - bump cause previous release went bad somewhere at fedora-infra Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 8de93ae..f29d5b3 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -654,6 +654,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Mar 11 2020 Lokesh Mandvekar - 2:1.8.1-2 +- bump cause previous release went bad somewhere at fedora-infra + * Wed Mar 11 2020 RH Container Bot - 2:1.8.1-1 - autobuilt v1.8.1 From edf92f501410977a9dde2749088862cc9adb590c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 18 Mar 2020 15:11:39 +0000 Subject: [PATCH 082/130] podman-2:1.8.1-0.2.rc1 - autobuilt v1.8.2-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2cf8973..4d53490 100644 --- a/.gitignore +++ b/.gitignore @@ -405,3 +405,4 @@ /v1.8.1-rc3.tar.gz /v1.8.1-rc4.tar.gz /v1.8.1.tar.gz +/v1.8.2-rc1.tar.gz diff --git a/podman.spec b/podman.spec index f29d5b3..00a082f 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 444a19cdd2e6108c75f6c1aadc1a2a9138a8bd73 +%define commit0 c617484c15db0c0f227cab3c57f36a1585092a31 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.8.1 +%define built_tag v1.8.2-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -58,8 +58,8 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.8.1 -Release: 2%{?dist} +Version: 1.8.2 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -654,6 +654,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Mar 18 2020 RH Container Bot - 2:1.8.1-0.2.rc1 +- autobuilt v1.8.2-rc1 + * Wed Mar 11 2020 Lokesh Mandvekar - 2:1.8.1-2 - bump cause previous release went bad somewhere at fedora-infra diff --git a/sources b/sources index 85e62c5..9081aa8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.8.1.tar.gz) = 48b5f9f67f3a5b9b0d91c24ac87a1a62146661bbcab385e63cf09ac56f85e384b4acae91d8e887557c4e87a37f56b10f90b3bb22278a2cfcc4f1da42ad4e5027 +SHA512 (v1.8.2-rc1.tar.gz) = 602210ec3d2a11d224771f3a52eddf8b831d7cdc4e191ff7973781a6df7c32fde6311c8b3721cfae4265efc6ae7d00c61acd1500788ed96a86573ad4d1f94ac3 From 991a7dfeae49e37012b1beff22ffa5af07d3e8b2 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 19 Mar 2020 21:11:24 +0000 Subject: [PATCH 083/130] podman-2:1.8.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 4d53490..22652d4 100644 --- a/.gitignore +++ b/.gitignore @@ -406,3 +406,4 @@ /v1.8.1-rc4.tar.gz /v1.8.1.tar.gz /v1.8.2-rc1.tar.gz +/v1.8.2.tar.gz diff --git a/podman.spec b/podman.spec index 00a082f..f41d272 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 c617484c15db0c0f227cab3c57f36a1585092a31 +%define commit0 028e3317eb1494b9b2acba4a0a295df80fae66cc %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.8.2-rc1 +%define built_tag v1.8.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.2 -Release: 0.2.rc1%{?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 %{_libexecdir}/cni/dnsname %changelog +* Thu Mar 19 2020 RH Container Bot - 2:1.8.2-1 +- autobuilt v1.8.2 + * Wed Mar 18 2020 RH Container Bot - 2:1.8.1-0.2.rc1 - autobuilt v1.8.2-rc1 diff --git a/sources b/sources index 9081aa8..3919cae 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.8.2-rc1.tar.gz) = 602210ec3d2a11d224771f3a52eddf8b831d7cdc4e191ff7973781a6df7c32fde6311c8b3721cfae4265efc6ae7d00c61acd1500788ed96a86573ad4d1f94ac3 +SHA512 (v1.8.2.tar.gz) = c6e1426f66299a21be66be033460c44830b422f8a3319f37bbe53030f6a2bf84b140a29f30b83f6b61199f1df373f81a6d73787d16423ad942fc8a9154c68366 From f5b2b2b18132b610fc9df73145f5d6160081033d Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 20 Mar 2020 07:44:01 -0400 Subject: [PATCH 084/130] autobuilt v1.8.2 --- podman.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index f41d272..d38e78c 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -561,6 +561,13 @@ for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do done %endif +#TODO Next release this section should be removed, since the make install will handle it +# install service +install -m 644 contrib/systemd/user/podman.socket %{buildroot}/%{_userunitdir}/podman.socket +install -m 644 contrib/systemd/user/podman.service %{buildroot}/%{_userunitdir}/podman.service +install -m 644 contrib/systemd/system/podman.socket %{buildroot}/%{_unitdir}/podman.socket +install -m 644 contrib/systemd/system/podman.service %{buildroot}/%{_unitdir}/podman.service + %if 0%{?with_devel} sort -u -o devel.file-list devel.file-list %endif @@ -614,6 +621,10 @@ exit 0 %{_userunitdir}/io.%{name}.service %{_userunitdir}/io.%{name}.socket %{_usr}/lib/tmpfiles.d/%{name}.conf +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}.socket +%{_userunitdir}/%{name}.service +%{_userunitdir}/%{name}.socket %files docker %{_bindir}/docker From 719d52db122bac654663c90eda8f6d65cbcaf6ae Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 20 Mar 2020 07:49:52 -0400 Subject: [PATCH 085/130] Install the APIV2 services --- podman.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/podman.spec b/podman.spec index d38e78c..c0e00c5 100644 --- a/podman.spec +++ b/podman.spec @@ -665,6 +665,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Mar 20 2020 Dan Walsh - 2:1.8.2-2 +- Install the APIV2 services + * Thu Mar 19 2020 RH Container Bot - 2:1.8.2-1 - autobuilt v1.8.2 From 8bce4784ce359183f824674c080aa85c8707f1c7 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 13 Apr 2020 15:08:37 +0000 Subject: [PATCH 086/130] podman-2:1.8.2-0.2.rc1 - autobuilt v1.9.0-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 22652d4..e800a9d 100644 --- a/.gitignore +++ b/.gitignore @@ -407,3 +407,4 @@ /v1.8.1.tar.gz /v1.8.2-rc1.tar.gz /v1.8.2.tar.gz +/v1.9.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index c0e00c5..40a8c12 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 028e3317eb1494b9b2acba4a0a295df80fae66cc +%define commit0 cbb5652a531bd19f1c6702f42c273596f79baee8 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.8.2 +%define built_tag v1.9.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -58,8 +58,8 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.8.2 -Release: 2%{?dist} +Version: 1.9.0 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -665,6 +665,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Apr 13 2020 RH Container Bot - 2:1.8.2-0.2.rc1 +- autobuilt v1.9.0-rc1 + * Fri Mar 20 2020 Dan Walsh - 2:1.8.2-2 - Install the APIV2 services diff --git a/sources b/sources index 3919cae..5970244 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.8.2.tar.gz) = c6e1426f66299a21be66be033460c44830b422f8a3319f37bbe53030f6a2bf84b140a29f30b83f6b61199f1df373f81a6d73787d16423ad942fc8a9154c68366 +SHA512 (v1.9.0-rc1.tar.gz) = 1fa42505c9d02b0e27019aa0ce46fde56f4c4cc77f123d805b99cc3d7554ce22b320a20271ec3cc8de99ac0cb5b990cc69b48b32d4290be21a693cf9a99e88b2 From 1ee0bef863ca8ffd3a1006a3fbb9c5bf3cb15a68 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 13 Apr 2020 12:23:38 -0400 Subject: [PATCH 087/130] Switch container-selinux to recommends --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 40a8c12..cd5fd01 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.9.0 -Release: 0.2.rc1%{?dist} +Release: 1.0.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -89,7 +89,7 @@ Requires: iptables Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} -Requires: container-selinux +Recommends: container-selinux %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel @@ -665,6 +665,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Apr 13 2020 Dan Walsh - 2:1.8.2-1.0.rc1 +- Switch container-selinux to recommends + * Mon Apr 13 2020 RH Container Bot - 2:1.8.2-0.2.rc1 - autobuilt v1.9.0-rc1 From b622952289845071e1fcb56c1a97d8e832aed3d3 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 13 Apr 2020 13:15:00 -0400 Subject: [PATCH 088/130] Switch container-selinux to recommends --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index cd5fd01..7106f5f 100644 --- a/podman.spec +++ b/podman.spec @@ -467,7 +467,7 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src -%gogenerate ./cmd/%{name}/varlink/... +%gogenerate ./pkg/varlink/... # build %%{name} export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" From 8dbc78ac54217be6347bd2f5647170506947f9dc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 13 Apr 2020 13:36:09 -0400 Subject: [PATCH 089/130] Revert "Switch container-selinux to recommends" This reverts commit b622952289845071e1fcb56c1a97d8e832aed3d3. --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 7106f5f..cd5fd01 100644 --- a/podman.spec +++ b/podman.spec @@ -467,7 +467,7 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src -%gogenerate ./pkg/varlink/... +%gogenerate ./cmd/%{name}/varlink/... # build %%{name} export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" From 6ccd180c9822ffc046aae9690decde956b729989 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 13 Apr 2020 11:45:58 -0400 Subject: [PATCH 090/130] podman- 2:1.9.0-0.3.rc1 - correct varlink go generate - container-selinux is a recommends for fedora and centos8 but requires for centos7 Signed-off-by: Lokesh Mandvekar --- podman.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index cd5fd01..f8ee6ff 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.9.0 -Release: 1.0.rc1%{?dist} +Release: 0.3.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -89,7 +89,6 @@ Requires: iptables Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} -Recommends: container-selinux %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel @@ -106,6 +105,12 @@ Requires: runc %if 0%{?centos} >= 8 Requires: libvarlink-util %endif +# container-selinux +%if 0%{?fedora} || 0%{?centos} >= 8 +Recommends: container-selinux +%else +Requires: container-selinux +%endif # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -665,8 +670,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog -* Mon Apr 13 2020 Dan Walsh - 2:1.8.2-1.0.rc1 -- Switch container-selinux to recommends +* Mon Apr 13 2020 Lokesh Mandvekar - 2:1.9.0-0.3.rc1 +- correct varlink go generate +- container-selinux is a recommends for fedora and centos8 but requires for centos7 * Mon Apr 13 2020 RH Container Bot - 2:1.8.2-0.2.rc1 - autobuilt v1.9.0-rc1 From 57efb9da49272d322d8b91ec540b0a7b8391619d Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 1 Apr 2020 12:53:59 -0500 Subject: [PATCH 091/130] correct varlink go generate Signed-off-by: Brent Baude --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index f8ee6ff..71dd79e 100644 --- a/podman.spec +++ b/podman.spec @@ -472,7 +472,7 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src -%gogenerate ./cmd/%{name}/varlink/... +%gogenerate ./pkg/varlink/... # build %%{name} export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" From 6867f35cd697aaa27e57b2e8de62f7faebb037e3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 14 Apr 2020 18:07:32 +0000 Subject: [PATCH 092/130] podman-2:1.9.0-0.4.rc1 - autobuilt v1.9.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 e800a9d..230230d 100644 --- a/.gitignore +++ b/.gitignore @@ -408,3 +408,4 @@ /v1.8.2-rc1.tar.gz /v1.8.2.tar.gz /v1.9.0-rc1.tar.gz +/v1.9.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 71dd79e..98b8b49 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 cbb5652a531bd19f1c6702f42c273596f79baee8 +%define commit0 443aab15e61759f072cd82fc3217dfda5cc97018 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.9.0-rc1 +%define built_tag v1.9.0-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.9.0 -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/ @@ -670,6 +670,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Apr 14 2020 RH Container Bot - 2:1.9.0-0.4.rc1 +- autobuilt v1.9.0-rc2 + * Mon Apr 13 2020 Lokesh Mandvekar - 2:1.9.0-0.3.rc1 - correct varlink go generate - container-selinux is a recommends for fedora and centos8 but requires for centos7 diff --git a/sources b/sources index 5970244..65f3174 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.9.0-rc1.tar.gz) = 1fa42505c9d02b0e27019aa0ce46fde56f4c4cc77f123d805b99cc3d7554ce22b320a20271ec3cc8de99ac0cb5b990cc69b48b32d4290be21a693cf9a99e88b2 +SHA512 (v1.9.0-rc2.tar.gz) = 54482f45012d43e6f15dbaba9c3486820943f497ea369ca5740f37ff0ece72c8beb29f1ce2285c8c0c65c867a3336f1a0f4b6fc5c00abccaa287c45e351a6931 From 65099a3a4954bd5033ca937f94134dd0a263d2de Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 15 Apr 2020 09:21:51 -0500 Subject: [PATCH 093/130] update crun run dep Signed-off-by: Brent Baude --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 98b8b49..f514540 100644 --- a/podman.spec +++ b/podman.spec @@ -96,7 +96,7 @@ Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc -Requires: crun >= 0.12.1-1 +Requires: crun >= 0.13-2 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 From 927447e8032acd63c20eb641ac0fe8c648752dd7 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 15 Apr 2020 16:08:19 +0000 Subject: [PATCH 094/130] podman-2:1.9.0-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 230230d..20e2e36 100644 --- a/.gitignore +++ b/.gitignore @@ -409,3 +409,4 @@ /v1.8.2.tar.gz /v1.9.0-rc1.tar.gz /v1.9.0-rc2.tar.gz +/v1.9.0.tar.gz diff --git a/podman.spec b/podman.spec index f514540..25af55e 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 443aab15e61759f072cd82fc3217dfda5cc97018 +%define commit0 d985723506a29766ed21585ba8541033db6bd572 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.9.0-rc2 +%define built_tag v1.9.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.9.0 -Release: 0.4.rc1%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -670,6 +670,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Apr 15 2020 RH Container Bot - 2:1.9.0-1 +- autobuilt v1.9.0 + * Tue Apr 14 2020 RH Container Bot - 2:1.9.0-0.4.rc1 - autobuilt v1.9.0-rc2 diff --git a/sources b/sources index 65f3174..a763027 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.9.0-rc2.tar.gz) = 54482f45012d43e6f15dbaba9c3486820943f497ea369ca5740f37ff0ece72c8beb29f1ce2285c8c0c65c867a3336f1a0f4b6fc5c00abccaa287c45e351a6931 +SHA512 (v1.9.0.tar.gz) = ba7de72e03dc55896025b698465745873f3030547e19133b835e4f47c1cd1c0261f17845d50cbe7b824db2a9ed77def7883405637333e141f7abecada644b5be From 8fb0a8a84a567d06d8ff68c4db000bfb9cea44e6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 29 Apr 2020 09:23:06 -0400 Subject: [PATCH 095/130] podman-2:1.9.1-1 - new version Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 20e2e36..088797c 100644 --- a/.gitignore +++ b/.gitignore @@ -410,3 +410,4 @@ /v1.9.0-rc1.tar.gz /v1.9.0-rc2.tar.gz /v1.9.0.tar.gz +/v1.9.1.tar.gz diff --git a/podman.spec b/podman.spec index 25af55e..7484a9f 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 d985723506a29766ed21585ba8541033db6bd572 +%define commit0 37a3aa6c83603ec774939a8d07c950dd3b26110a %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.9.0 +%define built_tag v1.9.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -58,7 +58,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.9.0 +Version: 1.9.1 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -670,6 +670,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Apr 29 2020 Lokesh Mandvekar - 2:1.9.1-1 +- new version + * Wed Apr 15 2020 RH Container Bot - 2:1.9.0-1 - autobuilt v1.9.0 diff --git a/sources b/sources index a763027..463ef19 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.9.0.tar.gz) = ba7de72e03dc55896025b698465745873f3030547e19133b835e4f47c1cd1c0261f17845d50cbe7b824db2a9ed77def7883405637333e141f7abecada644b5be +SHA512 (v1.9.1.tar.gz) = b51b7181cd1273af35112e4102ce60165436a52971dc18dfede97bd0065f979560a900db71196760f3c3328f4fd5dc0914620fe3d1338be820ed2f29f25289e7 From 72859c14445ca36e112b814f4e016308b24a1214 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 29 Apr 2020 09:52:28 -0400 Subject: [PATCH 096/130] adjust dependencies for centos v/s fedora Signed-off-by: Lokesh Mandvekar --- podman.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/podman.spec b/podman.spec index 7484a9f..4185714 100644 --- a/podman.spec +++ b/podman.spec @@ -89,27 +89,24 @@ Requires: iptables Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} +Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel -Recommends: libvarlink-util -Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 -Recommends: runc Requires: crun >= 0.13-2 -%else -#### DO NOT REMOVE - NEEDED FOR CENTOS -Requires: slirp4netns >= 0.3.0-2 -Requires: runc %endif -%if 0%{?centos} >= 8 -Requires: libvarlink-util -%endif -# container-selinux %if 0%{?fedora} || 0%{?centos} >= 8 +Recommends: catatonit Recommends: container-selinux +Recommends: libvarlink-util +Recommends: runc +Recommends: slirp4netns >= 0.3.0-2 %else +Requires: catatonit Requires: container-selinux +Requires: runc +Requires: slirp4netns >= 0.3.0-2 %endif # vendored libraries From cff95896bd666473b31f2c64d1d703f74b73d2af Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 13 May 2020 16:36:55 -0400 Subject: [PATCH 097/130] podman-2:1.9.2-1 - bump to v1.9.2 - update min deps on conmon and cni plugins Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ podman.spec | 17 +++++++++-------- sources | 3 ++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 088797c..0974fa4 100644 --- a/.gitignore +++ b/.gitignore @@ -411,3 +411,5 @@ /v1.9.0-rc2.tar.gz /v1.9.0.tar.gz /v1.9.1.tar.gz +/libpod-5b4e91d.tar.gz +/v1.9.2.tar.gz diff --git a/podman.spec b/podman.spec index 4185714..4da0806 100644 --- a/podman.spec +++ b/podman.spec @@ -33,11 +33,8 @@ %define project containers %define repo libpod # https://github.com/containers/libpod -%define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%define import_path %{provider_prefix} +%define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 37a3aa6c83603ec774939a8d07c950dd3b26110a -%define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname # https://github.com/containers/libpod @@ -48,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.9.1 +%define built_tag v1.9.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -58,7 +55,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.9.1 +Version: 1.9.2 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -84,10 +81,10 @@ BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel Requires: containers-common -Requires: containernetworking-plugins >= 0.7.5-1 +Requires: containernetworking-plugins >= 0.8.6-1 Requires: iptables Requires: nftables -Requires: conmon +Requires: conmon >= 2.0.16-1 Requires: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} @@ -667,6 +664,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed May 13 2020 Lokesh Mandvekar - 2:1.9.2-1 +- bump to v1.9.2 +- update min deps on conmon and cni plugins + * Wed Apr 29 2020 Lokesh Mandvekar - 2:1.9.1-1 - new version diff --git a/sources b/sources index 463ef19..8c3c87c 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.9.1.tar.gz) = b51b7181cd1273af35112e4102ce60165436a52971dc18dfede97bd0065f979560a900db71196760f3c3328f4fd5dc0914620fe3d1338be820ed2f29f25289e7 +SHA512 (libpod-5b4e91d.tar.gz) = 3266019ffdacbf3d5c4da2d2738993d9dc4c103bab1152096e16f593509fd55e80cacec71d7f08736b7c0190f9c83223b13e8ea6969bc12ea50d707f50d9cffa +SHA512 (v1.9.2.tar.gz) = 5f28239814e8df5cc3d938fc0743c92b6fa588c152cd49afa12fa580557d688915c1c171b1d8be83ae1c8ba3b51301324119201b56da9cbe428c476fa539009d From 3d1192607f371b332d9bc1cd42b8a819cfc301c5 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 20 May 2020 10:38:00 -0600 Subject: [PATCH 098/130] update gating.yaml to gate on new testcase name --- gating.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 9571536..c2d0ba7 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,4 +3,4 @@ product_versions: - fedora-* decision_context: bodhi_update_push_testing rules: - - !PassingTestCaseRule {test_case_name: org.centos.prod.ci.pipeline.allpackages-build.complete} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From 3f1e60419b0af831ab837634ea55d42915da38eb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 25 May 2020 14:40:47 -0400 Subject: [PATCH 099/130] podman-2:1.9.3-1 - bump to v1.9.3 - require conmon >= 2:2.0.16-3 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 13 ++++++++++--- sources | 3 +-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0974fa4..11a2c53 100644 --- a/.gitignore +++ b/.gitignore @@ -413,3 +413,4 @@ /v1.9.1.tar.gz /libpod-5b4e91d.tar.gz /v1.9.2.tar.gz +/v1.9.3.tar.gz diff --git a/podman.spec b/podman.spec index 4da0806..25fa0ec 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.9.2 +%define built_tag v1.9.3 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -55,7 +55,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.9.2 +Version: 1.9.3 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -84,7 +84,7 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.8.6-1 Requires: iptables Requires: nftables -Requires: conmon >= 2.0.16-1 +Requires: conmon >= 2:2.0.16-3 Requires: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} @@ -664,6 +664,13 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon May 25 2020 Lokesh Mandvekar - 2:1.9.3-1 +- bump to v1.9.3 +- require conmon >= 2:2.0.16-3 + +* Fri May 15 2020 Lokesh Mandvekar - 2:1.9.2-2 +- use correct epoch for conmon + * Wed May 13 2020 Lokesh Mandvekar - 2:1.9.2-1 - bump to v1.9.2 - update min deps on conmon and cni plugins diff --git a/sources b/sources index 8c3c87c..6b786c5 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (libpod-5b4e91d.tar.gz) = 3266019ffdacbf3d5c4da2d2738993d9dc4c103bab1152096e16f593509fd55e80cacec71d7f08736b7c0190f9c83223b13e8ea6969bc12ea50d707f50d9cffa -SHA512 (v1.9.2.tar.gz) = 5f28239814e8df5cc3d938fc0743c92b6fa588c152cd49afa12fa580557d688915c1c171b1d8be83ae1c8ba3b51301324119201b56da9cbe428c476fa539009d +SHA512 (v1.9.3.tar.gz) = d85cdf49b740f47a341b7717a4bc22ff326d22234e224bd572a3d879b75eaa33139bebdc293c2e7bc41a9902289d89380b9b56975a0826172324e9a54f8f5e03 From b30101db98cb1a947da7b4c29ebc9b2f931677f3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 20 Jun 2020 11:18:39 -0400 Subject: [PATCH 100/130] podman-2:2.0.0-1 - bump to v2.0.0 Signed-off-by: Lokesh Mandvekar --- podman.spec | 54 ++++++++++++++++++++++++++--------------------------- sources | 2 +- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/podman.spec b/podman.spec index 25fa0ec..2fe45f7 100644 --- a/podman.spec +++ b/podman.spec @@ -34,7 +34,7 @@ %define repo libpod # https://github.com/containers/libpod %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} +%define git0 https://%{import_path} %define repo_plugins dnsname # https://github.com/containers/libpod @@ -45,9 +45,9 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.9.3 +%define built_tag v2.0.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz +%define download_url %{git0}/archive/%{built_tag}.tar.gz Name: podman %if 0%{?fedora} @@ -55,7 +55,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.9.3 +Version: 2.0.0 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -84,7 +84,7 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.8.6-1 Requires: iptables Requires: nftables -Requires: conmon >= 2:2.0.16-3 +Requires: conmon >= 2:2.0.18-1 Requires: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} @@ -474,39 +474,36 @@ export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hac export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" %endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} - + %if 0%{?fedora} || 0%{?centos} >= 8 # build %%{name}-remote export BUILDTAGS+=" remoteclient" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif - + +%{__make} docs + %install -%if 0%{?fedora} -sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i -%endif -sed -i 's/install.remote: podman-remote/install.remote:/' Makefile -sed -i 's/install.bin: podman/install.bin:/' Makefile rm -rf docs/containers-mounts.conf.5.md - + install -dp %{buildroot}%{_unitdir} -PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ - install.bin \ +install -dp %{buildroot}%{_userunitdir} +install -dp %{buildroot}%{_tmpfilesdir} + +PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \ + ETCDIR=%{buildroot}%{_sysconfdir} BUILDTAGS="varlink" \ + install.bin-nobuild \ %if 0%{?fedora} || 0%{?centos} >= 8 - install.remote \ + install.remote-nobuild \ %endif - install.man \ - install.cni \ - install.systemd \ - install.completions \ - install.docker - + install.man-nobuild \ + install.cni \ + install.systemd \ + install.completions \ + install.docker + mv pkg/hooks/README.md pkg/hooks/README-hooks.md -# install libpod.conf -install -dp %{buildroot}%{_datadir}/containers -install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers - # install plugins pushd dnsname-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install @@ -614,7 +611,6 @@ exit 0 %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name} %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist -%{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service %{_unitdir}/io.%{name}.socket %{_userunitdir}/io.%{name}.service @@ -649,7 +645,6 @@ exit 0 %license LICENSE %{_bindir}/%{name}-remote %{_mandir}/man1/%{name}-remote*.1* -%{_mandir}/man5/%{name}-remote*.5* %endif %files tests @@ -664,6 +659,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Jun 22 2020 Lokesh Mandvekar - 2:2.0.0-1 +- bump to v2.0.0 + * Mon May 25 2020 Lokesh Mandvekar - 2:1.9.3-1 - bump to v1.9.3 - require conmon >= 2:2.0.16-3 diff --git a/sources b/sources index 6b786c5..069e200 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.9.3.tar.gz) = d85cdf49b740f47a341b7717a4bc22ff326d22234e224bd572a3d879b75eaa33139bebdc293c2e7bc41a9902289d89380b9b56975a0826172324e9a54f8f5e03 +SHA512 (v2.0.0.tar.gz) = 29f7e365dbd4ab6d20ee3e85939804f74dcfe95f65a6d030d1c10a36512c29d3934907cbb014047d659fd96ed3a2946570ef7922cd77cc729370ac099b4b58a2 From db7c1fd715dc016842b0be92d14242dbcb2bdcd5 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 22 Jun 2020 14:24:59 +0000 Subject: [PATCH 101/130] podman-2:2.0.0-2 - autobuilt v2.0.0-rc7 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 11a2c53..c9e274f 100644 --- a/.gitignore +++ b/.gitignore @@ -414,3 +414,4 @@ /libpod-5b4e91d.tar.gz /v1.9.2.tar.gz /v1.9.3.tar.gz +/v2.0.0-rc7.tar.gz diff --git a/podman.spec b/podman.spec index 2fe45f7..1bb13b2 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.0 +%define built_tag v2.0.0-rc7 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Epoch: 2 Epoch: 0 %endif Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -659,6 +659,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Jun 22 2020 RH Container Bot - 2:2.0.0-2 +- autobuilt v2.0.0-rc7 + * Mon Jun 22 2020 Lokesh Mandvekar - 2:2.0.0-1 - bump to v2.0.0 diff --git a/sources b/sources index 069e200..e3a9122 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.0.tar.gz) = 29f7e365dbd4ab6d20ee3e85939804f74dcfe95f65a6d030d1c10a36512c29d3934907cbb014047d659fd96ed3a2946570ef7922cd77cc729370ac099b4b58a2 +SHA512 (v2.0.0-rc7.tar.gz) = ec52d8473ff4bdcf044e10f7627bdd7c879ea966e2968ad8a988b9d731b900852394102e8e2841bef504114ec4d9971f4ecf7246cece4303ad89eb38122e9090 From 4152ad0674eace90a63bae06109bc677af7d1828 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 22 Jun 2020 14:53:07 -0400 Subject: [PATCH 102/130] Revert "podman-2:2.0.0-2" This reverts commit db7c1fd715dc016842b0be92d14242dbcb2bdcd5. Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 - podman.spec | 7 ++----- sources | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c9e274f..11a2c53 100644 --- a/.gitignore +++ b/.gitignore @@ -414,4 +414,3 @@ /libpod-5b4e91d.tar.gz /v1.9.2.tar.gz /v1.9.3.tar.gz -/v2.0.0-rc7.tar.gz diff --git a/podman.spec b/podman.spec index 1bb13b2..2fe45f7 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.0-rc7 +%define built_tag v2.0.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Epoch: 2 Epoch: 0 %endif Version: 2.0.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -659,9 +659,6 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog -* Mon Jun 22 2020 RH Container Bot - 2:2.0.0-2 -- autobuilt v2.0.0-rc7 - * Mon Jun 22 2020 Lokesh Mandvekar - 2:2.0.0-1 - bump to v2.0.0 diff --git a/sources b/sources index e3a9122..069e200 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.0-rc7.tar.gz) = ec52d8473ff4bdcf044e10f7627bdd7c879ea966e2968ad8a988b9d731b900852394102e8e2841bef504114ec4d9971f4ecf7246cece4303ad89eb38122e9090 +SHA512 (v2.0.0.tar.gz) = 29f7e365dbd4ab6d20ee3e85939804f74dcfe95f65a6d030d1c10a36512c29d3934907cbb014047d659fd96ed3a2946570ef7922cd77cc729370ac099b4b58a2 From f68c80aa44b780878d61e4d095209888dc3007c9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 23 Jun 2020 17:31:45 -0400 Subject: [PATCH 103/130] add comments to allow building random commits Signed-off-by: Lokesh Mandvekar (cherry picked from commit 4f24105e5c771ac80f2d84f10d470ef99b66354f) --- podman.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/podman.spec b/podman.spec index 2fe45f7..329af95 100644 --- a/podman.spec +++ b/podman.spec @@ -61,6 +61,10 @@ Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{download_url} +# To build a random user's fork/commit, comment out above line, +# uncomment below Source0, and replace the placeholders with the right info +# Also, adjust %%prep section as necessary. +#Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} @@ -440,6 +444,10 @@ file. Each CNI network will have its own dnsmasq instance. %prep %autosetup -Sgit -n %{repo}-%{built_tag_strip} +# If you have replaced Source0 for building a random commit, uncomment +# comment out the autosetup line above and uncomment below autosetup line +# Use appropriate value for $BRANCH as in Source0 +#%%autosetup -Sgit -n %{repo}-$BRANCH # untar dnsname tar zxf %{SOURCE1} From 65bf6e837e706c24818afa3991aa37cdfadd0003 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 23 Jun 2020 17:32:27 -0400 Subject: [PATCH 104/130] no macros in comments Signed-off-by: Lokesh Mandvekar (cherry picked from commit d903524ef01e7fb3f2baf82c37e91a5ca1004359) --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 329af95..18222c8 100644 --- a/podman.spec +++ b/podman.spec @@ -447,7 +447,7 @@ file. Each CNI network will have its own dnsmasq instance. # If you have replaced Source0 for building a random commit, uncomment # comment out the autosetup line above and uncomment below autosetup line # Use appropriate value for $BRANCH as in Source0 -#%%autosetup -Sgit -n %{repo}-$BRANCH +#%%autosetup -Sgit -n %%{repo}-$BRANCH # untar dnsname tar zxf %{SOURCE1} From fc6f6bbe2a8b21d0c957aff69e9dfe80fbe615db Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 26 Jun 2020 09:51:00 -0400 Subject: [PATCH 105/130] podman-2:2.0.1-1 - bump to v2.0.1 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 742c7824b70c754e491eb4e26cc3016aa530390a) --- .gitignore | 10 ++++++++++ podman.spec | 25 +++++++++++-------------- sources | 2 +- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 11a2c53..8015be4 100644 --- a/.gitignore +++ b/.gitignore @@ -414,3 +414,13 @@ /libpod-5b4e91d.tar.gz /v1.9.2.tar.gz /v1.9.3.tar.gz +<<<<<<< HEAD +======= +/v2.0.0-rc4.tar.gz +/v2.0.0-rc5.tar.gz +/v2.0.0-rc6.tar.gz +/v2.0.0-rc7.tar.gz +/v2.0.0.tar.gz +/libpod-6bc5dcc.tar.gz +/v2.0.1.tar.gz +>>>>>>> 742c782... podman-2:2.0.1-1 diff --git a/podman.spec b/podman.spec index 18222c8..fdb81b0 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.0 +%define built_tag v2.0.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,7 +55,9 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.0.0 +Version: 2.0.1 +# RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER +# N.foo if released, 0.N.foo if unreleased Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -493,11 +495,7 @@ export BUILDTAGS+=" remoteclient" %install rm -rf docs/containers-mounts.conf.5.md - -install -dp %{buildroot}%{_unitdir} -install -dp %{buildroot}%{_userunitdir} -install -dp %{buildroot}%{_tmpfilesdir} - + PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \ ETCDIR=%{buildroot}%{_sysconfdir} BUILDTAGS="varlink" \ install.bin-nobuild \ @@ -565,13 +563,6 @@ for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do done %endif -#TODO Next release this section should be removed, since the make install will handle it -# install service -install -m 644 contrib/systemd/user/podman.socket %{buildroot}/%{_userunitdir}/podman.socket -install -m 644 contrib/systemd/user/podman.service %{buildroot}/%{_userunitdir}/podman.service -install -m 644 contrib/systemd/system/podman.socket %{buildroot}/%{_unitdir}/podman.socket -install -m 644 contrib/systemd/system/podman.service %{buildroot}/%{_unitdir}/podman.service - %if 0%{?with_devel} sort -u -o devel.file-list devel.file-list %endif @@ -667,6 +658,12 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Jun 26 2020 Lokesh Mandvekar - 2:2.0.1-1 +- bump to v2.0.1 + +* Sat Jun 20 2020 Lokesh Mandvekar - 2:2.0.0-2 +- depend on conmon-2:2.0.18-1 + * Mon Jun 22 2020 Lokesh Mandvekar - 2:2.0.0-1 - bump to v2.0.0 diff --git a/sources b/sources index 069e200..7bb6822 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.0.tar.gz) = 29f7e365dbd4ab6d20ee3e85939804f74dcfe95f65a6d030d1c10a36512c29d3934907cbb014047d659fd96ed3a2946570ef7922cd77cc729370ac099b4b58a2 +SHA512 (v2.0.1.tar.gz) = e52d3eef3d698360a0196dca6338c319511b6685c0237bd4d24a3763eb5e46262946d7609d1f36798dec6eb63d4511efdc8b77fa22c06bd55b666505f4fe6730 From 8ab072674ac53c9f08eaa2858539c0c6a10a08cb Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 1 Jun 2020 15:09:26 -0600 Subject: [PATCH 106/130] specfile: require nmap-ncat for podman-tests Used in recently added networking test Signed-off-by: Ed Santiago --- podman.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/podman.spec b/podman.spec index fdb81b0..b77c409 100644 --- a/podman.spec +++ b/podman.spec @@ -412,6 +412,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bats Requires: jq Requires: skopeo +Requires: nmap-ncat %description tests %{summary} From fb4ae46236d50e8a50076bd1417650b49ade86df Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 7 Jul 2020 14:54:48 -0400 Subject: [PATCH 107/130] remove varlink for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/podman.spec b/podman.spec index b77c409..f035952 100644 --- a/podman.spec +++ b/podman.spec @@ -98,11 +98,11 @@ BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel Recommends: fuse-overlayfs >= 0.3-8 Requires: crun >= 0.13-2 +Recommends: libvarlink-util %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: catatonit Recommends: container-selinux -Recommends: libvarlink-util Recommends: runc Recommends: slirp4netns >= 0.3.0-2 %else @@ -477,18 +477,24 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src + +%if 0%{?fedora} && ! 0%{?centos} %gogenerate ./pkg/varlink/... +%endif # build %%{name} -export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +%if 0%{?fedora} && ! 0%{?centos} +export BUILDTAGS+=" varlink" +%endif %if 0%{?centos} -export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" +export BUILDTAGS+=" exclude_graphdriver_btrfs containers_image_ostree_stub" %endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} %if 0%{?fedora} || 0%{?centos} >= 8 # build %%{name}-remote -export BUILDTAGS+=" remoteclient" +export BUILDTAGS+=" remote" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif @@ -498,7 +504,10 @@ export BUILDTAGS+=" remoteclient" rm -rf docs/containers-mounts.conf.5.md PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \ - ETCDIR=%{buildroot}%{_sysconfdir} BUILDTAGS="varlink" \ + ETCDIR=%{buildroot}%{_sysconfdir} \ +%if 0%{?fedora} && ! 0%{?centos} + BUILDTAGS="varlink" \ +%endif install.bin-nobuild \ %if 0%{?fedora} || 0%{?centos} >= 8 install.remote-nobuild \ @@ -611,15 +620,17 @@ exit 0 %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name} %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist -%{_unitdir}/io.%{name}.service -%{_unitdir}/io.%{name}.socket -%{_userunitdir}/io.%{name}.service -%{_userunitdir}/io.%{name}.socket -%{_usr}/lib/tmpfiles.d/%{name}.conf %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket +%if 0%{?fedora} && ! 0%{?centos} +%{_unitdir}/io.%{name}.service +%{_unitdir}/io.%{name}.socket +%{_userunitdir}/io.%{name}.service +%{_userunitdir}/io.%{name}.socket +%{_tmpfilesdir}/%{name}.conf +%endif %files docker %{_bindir}/docker From 6a9e527fa6c41980b51f7ba66185f8b6d9f4539d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 7 Jul 2020 19:13:38 +0000 Subject: [PATCH 108/130] podman-2:2.0.2-1 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 8015be4..be11eb7 100644 --- a/.gitignore +++ b/.gitignore @@ -424,3 +424,4 @@ /libpod-6bc5dcc.tar.gz /v2.0.1.tar.gz >>>>>>> 742c782... podman-2:2.0.1-1 +/v2.0.2.tar.gz diff --git a/podman.spec b/podman.spec index f035952..d3e40ec 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.1 +%define built_tag v2.0.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,7 +55,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.0.1 +Version: 2.0.2 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased Release: 1%{?dist} @@ -670,6 +670,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Jul 07 2020 RH Container Bot - 2:2.0.2-1 +- autobuilt v2.0.2 + * Fri Jun 26 2020 Lokesh Mandvekar - 2:2.0.1-1 - bump to v2.0.1 diff --git a/sources b/sources index 7bb6822..ff181c8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.1.tar.gz) = e52d3eef3d698360a0196dca6338c319511b6685c0237bd4d24a3763eb5e46262946d7609d1f36798dec6eb63d4511efdc8b77fa22c06bd55b666505f4fe6730 +SHA512 (v2.0.2.tar.gz) = 2446a6e603da1dd43683515e6f70849bc3a3a9a4c072ca262e22d90c378aa67a03b10bc7a22035f100d9f1fe5c519e83e87749ed95fb84c4e74da542e25e08f7 From 75772fbf3422ddb807d130926353c90486865fdb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 8 Jul 2020 14:08:53 -0400 Subject: [PATCH 109/130] upstream name changed, but %{import_path} still the same Signed-off-by: Lokesh Mandvekar (cherry picked from commit 86c84863a1f93f9e4770e7103487bbe14b439b8f) Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index d3e40ec..7517cad 100644 --- a/podman.spec +++ b/podman.spec @@ -227,7 +227,7 @@ Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. %{summary} -%{repo} Simple management tool for pods, containers and images +%{name} is a simple management tool for pods, containers and images %package docker Summary: Emulate Docker CLI using %{name} @@ -398,7 +398,7 @@ Requires: golang(github.com/urfave/cli) %description unit-test-devel %{summary} -%{repo} provides a library for applications looking to use the +%{name} provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. This package contains unit tests for project @@ -446,11 +446,11 @@ 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 %{repo}-%{built_tag_strip} +%autosetup -Sgit -n %{name}-%{built_tag_strip} # If you have replaced Source0 for building a random commit, uncomment # comment out the autosetup line above and uncomment below autosetup line # Use appropriate value for $BRANCH as in Source0 -#%%autosetup -Sgit -n %%{repo}-$BRANCH +#%%autosetup -Sgit -n %%{name}-$BRANCH # untar dnsname tar zxf %{SOURCE1} From a20289b35891a3dc92f95f22552f985d2fdac396 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 23 Jul 2020 17:49:45 +0000 Subject: [PATCH 110/130] podman-2:2.0.3-1 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 be11eb7..8ae659d 100644 --- a/.gitignore +++ b/.gitignore @@ -425,3 +425,4 @@ /v2.0.1.tar.gz >>>>>>> 742c782... podman-2:2.0.1-1 /v2.0.2.tar.gz +/v2.0.3.tar.gz diff --git a/podman.spec b/podman.spec index 7517cad..b3fc2c6 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.2 +%define built_tag v2.0.3 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,7 +55,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.0.2 +Version: 2.0.3 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased Release: 1%{?dist} @@ -670,6 +670,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Thu Jul 23 17:49:29 GMT 2020 RH Container Bot - 2:2.0.3-1 +- autobuilt v2.0.3 + * Tue Jul 07 2020 RH Container Bot - 2:2.0.2-1 - autobuilt v2.0.2 diff --git a/sources b/sources index ff181c8..33f7e24 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.2.tar.gz) = 2446a6e603da1dd43683515e6f70849bc3a3a9a4c072ca262e22d90c378aa67a03b10bc7a22035f100d9f1fe5c519e83e87749ed95fb84c4e74da542e25e08f7 +SHA512 (v2.0.3.tar.gz) = ee6d4f4735196fc07e03e9c1e99aa62650d9651bd5f24657398d42b3f2ebf59240a49fecfbf71a3d90636ea44c243cc4f7504c43d8f48e76ee504b3d10762240 From e69653baed9cdbbd36a56877a2fad19cdc3ab197 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 31 Jul 2020 21:09:56 +0000 Subject: [PATCH 111/130] podman-2:2.0.4-1 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 8ae659d..e270103 100644 --- a/.gitignore +++ b/.gitignore @@ -426,3 +426,4 @@ >>>>>>> 742c782... podman-2:2.0.1-1 /v2.0.2.tar.gz /v2.0.3.tar.gz +/v2.0.4.tar.gz diff --git a/podman.spec b/podman.spec index b3fc2c6..e090548 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.3 +%define built_tag v2.0.4 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,7 +55,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.0.3 +Version: 2.0.4 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased Release: 1%{?dist} @@ -670,6 +670,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Jul 31 21:09:43 GMT 2020 RH Container Bot - 2:2.0.4-1 +- autobuilt v2.0.4 + * Thu Jul 23 17:49:29 GMT 2020 RH Container Bot - 2:2.0.3-1 - autobuilt v2.0.3 diff --git a/sources b/sources index 33f7e24..8943543 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.3.tar.gz) = ee6d4f4735196fc07e03e9c1e99aa62650d9651bd5f24657398d42b3f2ebf59240a49fecfbf71a3d90636ea44c243cc4f7504c43d8f48e76ee504b3d10762240 +SHA512 (v2.0.4.tar.gz) = 39313615b4c0befec3a073b7bf4a689208e39cb7bcba81f6d8982e188402c457cbe4835a128274761e55ab1272a780f9747caa07746fe62af7a568eebc96ad6a From 05a71b0f50bfe936154efed6fcc2d6519d49fed2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 12 Aug 2020 17:57:38 -0400 Subject: [PATCH 112/130] btrfs tags are detected by the hack/btrfs*.sh scripts already Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index e090548..7f82ac8 100644 --- a/podman.spec +++ b/podman.spec @@ -488,7 +488,7 @@ export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_ export BUILDTAGS+=" varlink" %endif %if 0%{?centos} -export BUILDTAGS+=" exclude_graphdriver_btrfs containers_image_ostree_stub" +export BUILDTAGS+=" containers_image_ostree_stub" %endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} From 572d315f9c3d7074808e26bfccae8acc4ad3e2d2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 13 Aug 2020 13:59:41 -0400 Subject: [PATCH 113/130] use correct tags for podman-remote Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 7f82ac8..8787553 100644 --- a/podman.spec +++ b/podman.spec @@ -494,7 +494,7 @@ export BUILDTAGS+=" containers_image_ostree_stub" %if 0%{?fedora} || 0%{?centos} >= 8 # build %%{name}-remote -export BUILDTAGS+=" remote" +export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion remote" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif From ae7c12ae1e9e7d288539b808db4fc2bf67acf62a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 24 Aug 2020 23:12:25 +0000 Subject: [PATCH 114/130] podman-2:2.0.5-1 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 e270103..d75d55e 100644 --- a/.gitignore +++ b/.gitignore @@ -427,3 +427,4 @@ /v2.0.2.tar.gz /v2.0.3.tar.gz /v2.0.4.tar.gz +/v2.0.5.tar.gz diff --git a/podman.spec b/podman.spec index 8787553..6d77a5d 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.4 +%define built_tag v2.0.5 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,7 +55,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.0.4 +Version: 2.0.5 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased Release: 1%{?dist} @@ -670,6 +670,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Aug 24 2020 RH Container Bot - 2:2.0.5-1 +- autobuilt v2.0.5 + * Fri Jul 31 21:09:43 GMT 2020 RH Container Bot - 2:2.0.4-1 - autobuilt v2.0.4 diff --git a/sources b/sources index 8943543..8390c04 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.4.tar.gz) = 39313615b4c0befec3a073b7bf4a689208e39cb7bcba81f6d8982e188402c457cbe4835a128274761e55ab1272a780f9747caa07746fe62af7a568eebc96ad6a +SHA512 (v2.0.5.tar.gz) = efe1bdfd1fec61d470c748ac1cfff8ec4a64a47751becac2c35d85e61f1f1d511781f4fafb3463558bd5df347f3ee021c4f9ed00823b6cb5dd8963a2c2bc570b From b542e226d6a4f41596946813aeedb62c0a2a0e0c Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 19 Aug 2020 06:44:16 -0600 Subject: [PATCH 115/130] Define 'buildInfo', to get timestamp in podman version Weirdness that will probably haunt us one day: in the project source tree Makefile there's a "/v2" that doesn't work when we specify it in the specfile. Signed-off-by: Ed Santiago --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 6d77a5d..bc27c0b 100644 --- a/podman.spec +++ b/podman.spec @@ -490,6 +490,10 @@ export BUILDTAGS+=" varlink" %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)" + %gobuild -o bin/%{name} %{import_path}/cmd/%{name} %if 0%{?fedora} || 0%{?centos} >= 8 From f73704c08c18ecf4150d0d7181609a9a330de4d3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 28 Aug 2020 16:31:07 +0000 Subject: [PATCH 116/130] podman-2:2.0.5-0.2.rc1 - autobuilt v2.0.6-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 d75d55e..5c4a0d7 100644 --- a/.gitignore +++ b/.gitignore @@ -428,3 +428,4 @@ /v2.0.3.tar.gz /v2.0.4.tar.gz /v2.0.5.tar.gz +/v2.0.6-rc1.tar.gz diff --git a/podman.spec b/podman.spec index bc27c0b..5c7eb92 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.5 +%define built_tag v2.0.6-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,10 +55,10 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.0.5 +Version: 2.0.6 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 1%{?dist} +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -674,6 +674,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Aug 28 2020 RH Container Bot - 2:2.0.5-0.2.rc1 +- autobuilt v2.0.6-rc1 + * Mon Aug 24 2020 RH Container Bot - 2:2.0.5-1 - autobuilt v2.0.5 diff --git a/sources b/sources index 8390c04..392c209 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.5.tar.gz) = efe1bdfd1fec61d470c748ac1cfff8ec4a64a47751becac2c35d85e61f1f1d511781f4fafb3463558bd5df347f3ee021c4f9ed00823b6cb5dd8963a2c2bc570b +SHA512 (v2.0.6-rc1.tar.gz) = 92d79b84718e88f05b5cbb268186f242762e756b1c3e71c5fe2ede45cddfb3b68de105355c45ee65162f64b7f6309e89d27dc69810fade88cbefd9d4adf6a06d From 3e5c1cd00df1a716fd2929149b514dd917750952 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 28 Aug 2020 12:55:31 -0400 Subject: [PATCH 117/130] correct messed up changelog entry Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 5c7eb92..6ba044a 100644 --- a/podman.spec +++ b/podman.spec @@ -674,7 +674,7 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog -* Fri Aug 28 2020 RH Container Bot - 2:2.0.5-0.2.rc1 +* Fri Aug 28 2020 RH Container Bot - 2:2.0.6-0.2.rc1 - autobuilt v2.0.6-rc1 * Mon Aug 24 2020 RH Container Bot - 2:2.0.5-1 From 7acabfbbf005ec648312123004b5ee6bff2fbbe7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Sep 2020 15:22:42 -0400 Subject: [PATCH 118/130] podman-2:2.0.6-1 - bump to v2.0.6 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 3a603f34d2d9bbd71f1c1d06f40a048111d84ef0) --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5c4a0d7..be82a2e 100644 --- a/.gitignore +++ b/.gitignore @@ -429,3 +429,4 @@ /v2.0.4.tar.gz /v2.0.5.tar.gz /v2.0.6-rc1.tar.gz +/v2.0.6.tar.gz diff --git a/podman.spec b/podman.spec index 6ba044a..498f277 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.6-rc1 +%define built_tag v2.0.6 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.0.6 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 0.2.rc1%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -674,6 +674,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Sep 01 2020 Lokesh Mandvekar - 2:2.0.6-1 +- bump to v2.0.6 + * Fri Aug 28 2020 RH Container Bot - 2:2.0.6-0.2.rc1 - autobuilt v2.0.6-rc1 diff --git a/sources b/sources index 392c209..c6f51a6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.6-rc1.tar.gz) = 92d79b84718e88f05b5cbb268186f242762e756b1c3e71c5fe2ede45cddfb3b68de105355c45ee65162f64b7f6309e89d27dc69810fade88cbefd9d4adf6a06d +SHA512 (v2.0.6.tar.gz) = b0e4d8211fea920cabd0e5481b3363762afd09eabdcbfa0861ee19950a812af676069aee4085fdbe0207d4ff9f8e85bb955b14309b0de74455e55bd5db92410f From 2666a92ac14587e5f188c7dbae5cfdab85a56b53 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 14 Sep 2020 14:00:08 +0000 Subject: [PATCH 119/130] podman-2:2.1.0-0.1.rc1 autobuilt v2.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 be82a2e..70a83ab 100644 --- a/.gitignore +++ b/.gitignore @@ -430,3 +430,4 @@ /v2.0.5.tar.gz /v2.0.6-rc1.tar.gz /v2.0.6.tar.gz +/v2.1.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 498f277..26e1a52 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.0.6 +%define built_tag v2.1.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,10 +55,10 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.0.6 +Version: 2.1.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 1%{?dist} +Release: 0.1.rc1 Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -674,6 +674,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Sep 14 2020 RH Container Bot - 2:2.1.0-0.1.rc1 +- autobuilt v2.1.0-rc1 + * Tue Sep 01 2020 Lokesh Mandvekar - 2:2.0.6-1 - bump to v2.0.6 diff --git a/sources b/sources index c6f51a6..5384cc3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.6.tar.gz) = b0e4d8211fea920cabd0e5481b3363762afd09eabdcbfa0861ee19950a812af676069aee4085fdbe0207d4ff9f8e85bb955b14309b0de74455e55bd5db92410f +SHA512 (v2.1.0-rc1.tar.gz) = 17f9d73a63f0d54c0ce80f830c0e2829bb54e1d1f69d3bdac70a0d5be5e20a604ec0f3e3f8978b2b13c2481a301475ff1e529115e94a0c87995af1a74f0d21b4 From 15ce32f71cfc3df807d387a03fe29d698a3d257a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Sep 2020 14:41:04 -0400 Subject: [PATCH 120/130] podman-2:2.1.0-0.2.rc1 - use correct release tag Signed-off-by: Lokesh Mandvekar (cherry picked from commit 5ca4944c618bce36a9cbb5aa22b3582b67959f29) Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 26e1a52..6c7322a 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.1.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 0.1.rc1 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -674,6 +674,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Sep 14 14:40:56 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.2.rc1 +- use correct release tag + * Mon Sep 14 2020 RH Container Bot - 2:2.1.0-0.1.rc1 - autobuilt v2.1.0-rc1 From 19d88e062ad0f10a65a64a7a336d51e14badfc0a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Sep 2020 16:17:40 -0400 Subject: [PATCH 121/130] fix build issues (cherry picked from commit 2304af7d3662e154cf5b86e0067c6044e685cfda) Signed-off-by: Lokesh Mandvekar --- podman.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 6c7322a..d1dded2 100644 --- a/podman.spec +++ b/podman.spec @@ -31,7 +31,7 @@ %define provider github %define provider_tld com %define project containers -%define repo libpod +%define repo %{name} # https://github.com/containers/libpod %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} @@ -488,7 +488,7 @@ export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_ export BUILDTAGS+=" varlink" %endif %if 0%{?centos} -export BUILDTAGS+=" containers_image_ostree_stub" +export BUILDTAGS+=" exclude_graphdriver_btrfs containers_image_ostree_stub" %endif # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here? @@ -626,9 +626,13 @@ exit 0 %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket +%{_unitdir}/%{name}-auto-update.service +%{_unitdir}/%{name}-auto-update.timer %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket -%if 0%{?fedora} && ! 0%{?centos} +%{_userunitdir}/%{name}-auto-update.service +%{_userunitdir}/%{name}-auto-update.timer +%if %{with varlink} %{_unitdir}/io.%{name}.service %{_unitdir}/io.%{name}.socket %{_userunitdir}/io.%{name}.service From 9ab98ab2c11e6c3d820dde4d2cf8d17382456c3d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 17 Sep 2020 21:12:35 +0000 Subject: [PATCH 122/130] podman-2:2.1.0-0.3.rc1 autobuilt v2.1.0-rc2 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 70a83ab..3eba279 100644 --- a/.gitignore +++ b/.gitignore @@ -431,3 +431,4 @@ /v2.0.6-rc1.tar.gz /v2.0.6.tar.gz /v2.1.0-rc1.tar.gz +/v2.1.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index d1dded2..cb34c3c 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.1.0-rc1 +%define built_tag v2.1.0-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.1.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -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/ @@ -678,6 +678,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Thu Sep 17 2020 RH Container Bot - 2:2.1.0-0.3.rc1 +- autobuilt v2.1.0-rc2 + * Mon Sep 14 14:40:56 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.2.rc1 - use correct release tag diff --git a/sources b/sources index 5384cc3..ebbbbfc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.1.0-rc1.tar.gz) = 17f9d73a63f0d54c0ce80f830c0e2829bb54e1d1f69d3bdac70a0d5be5e20a604ec0f3e3f8978b2b13c2481a301475ff1e529115e94a0c87995af1a74f0d21b4 +SHA512 (v2.1.0-rc2.tar.gz) = 9ec5ccfe0f82f19a16fd89cbd5e20311ae90a30d570da0ffa66746e8393da34840d08c9e0ce8c094558736f3e465e64ac6848a2accae56123f0d1079fce7d43b From 1d0ee90bc15fef15d1ca44b469e70eecec9d8f27 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 18 Sep 2020 08:29:55 -0400 Subject: [PATCH 123/130] podman-2:2.1.0-0.4.rc2 - use correct release tag Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index cb34c3c..cbee531 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.1.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 0.3.rc1%{?dist} +Release: 0.4.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -436,6 +436,7 @@ connections as well. %package plugins Summary: Plugins for %{name} +Requires: dnsmasq %description plugins This plugin sets up the use of dnsmasq on a given CNI network so @@ -678,10 +679,13 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Sep 18 2020 Lokesh Mandvekar - 2:2.1.0-0.4.rc2 +- use correct release tag + * Thu Sep 17 2020 RH Container Bot - 2:2.1.0-0.3.rc1 - autobuilt v2.1.0-rc2 -* Mon Sep 14 14:40:56 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.2.rc1 +* Mon Sep 14 2020 Lokesh Mandvekar - 2:2.1.0-0.2.rc1 - use correct release tag * Mon Sep 14 2020 RH Container Bot - 2:2.1.0-0.1.rc1 From 338a7255630c5fb5299b73ff46f2d3d70f1241bc Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 22 Sep 2020 17:53:31 +0000 Subject: [PATCH 124/130] podman-2:2.1.0-1 autobuilt v2.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 3eba279..13b1507 100644 --- a/.gitignore +++ b/.gitignore @@ -432,3 +432,4 @@ /v2.0.6.tar.gz /v2.1.0-rc1.tar.gz /v2.1.0-rc2.tar.gz +/v2.1.0.tar.gz diff --git a/podman.spec b/podman.spec index cbee531..4e38b10 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.1.0-rc2 +%define built_tag v2.1.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.1.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 0.4.rc2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -679,6 +679,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Sep 22 2020 RH Container Bot - 2:2.1.0-1 +- autobuilt v2.1.0 + * Fri Sep 18 2020 Lokesh Mandvekar - 2:2.1.0-0.4.rc2 - use correct release tag diff --git a/sources b/sources index ebbbbfc..fd09024 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.1.0-rc2.tar.gz) = 9ec5ccfe0f82f19a16fd89cbd5e20311ae90a30d570da0ffa66746e8393da34840d08c9e0ce8c094558736f3e465e64ac6848a2accae56123f0d1079fce7d43b +SHA512 (v2.1.0.tar.gz) = eb9b0cb184138af022e6d8e145fc6c4188c75c0695e0c6e62d54112a6b143424dd0caf9686f83637d08ff1fdbc24afca564c89f8cb4ab68b8f8d07345856398e From 3c0734ac39cde8d1f93f01d548e3acdd7ff65a17 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 22 Sep 2020 15:23:56 -0400 Subject: [PATCH 125/130] fix build issues with varlink buildtag Upstream PR: https://github.com/containers/podman/pull/7734 (cherry picked from commit 27b5a733406a3699a1ce9ac96749f4fed785a260) Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 4e38b10..f009438 100644 --- a/podman.spec +++ b/podman.spec @@ -67,7 +67,8 @@ Source0: %{download_url} # uncomment below Source0, and replace the placeholders with the right info # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz -Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz +Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz +Patch0: 0001-fix-build-with-varlink.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. @@ -97,7 +98,7 @@ Obsoletes: oci-systemd-hook <= 0.2.0-3 BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel Recommends: fuse-overlayfs >= 0.3-8 -Requires: crun >= 0.13-2 +Requires: crun >= 0.14-2 Recommends: libvarlink-util %endif %if 0%{?fedora} || 0%{?centos} >= 8 From ef329dce87d2c9066055336015fff89e7977fd73 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 22 Sep 2020 15:27:30 -0400 Subject: [PATCH 126/130] actually add build fix patch (cherry picked from commit ac96438b1e8e8fa569d4fdf2e2ce37d003701b79) Signed-off-by: Lokesh Mandvekar --- 0001-fix-build-with-varlink.patch | 45 +++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 0001-fix-build-with-varlink.patch diff --git a/0001-fix-build-with-varlink.patch b/0001-fix-build-with-varlink.patch new file mode 100644 index 0000000..41232d2 --- /dev/null +++ b/0001-fix-build-with-varlink.patch @@ -0,0 +1,45 @@ +From 8030fd390a1940e52191013803564641778cd54c Mon Sep 17 00:00:00 2001 +From: Lokesh Mandvekar +Date: Tue, 22 Sep 2020 15:01:01 -0400 +Subject: [PATCH] fix build with varlink + +Signed-off-by: Lokesh Mandvekar +--- + pkg/varlinkapi/system.go | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go +index 9e4db2611..e5c766a6d 100644 +--- a/pkg/varlinkapi/system.go ++++ b/pkg/varlinkapi/system.go +@@ -7,6 +7,7 @@ import ( + "fmt" + "os" + goruntime "runtime" ++ "strconv" + "time" + + "github.com/containers/image/v5/pkg/sysregistriesv2" +@@ -22,13 +23,18 @@ func (i *VarlinkAPI) GetVersion(call iopodman.VarlinkCall) error { + return err + } + ++ int64APIVersion, err := strconv.ParseInt(versionInfo.APIVersion, 10, 64) ++ if err != nil { ++ return err ++ } ++ + return call.ReplyGetVersion( + versionInfo.Version, + versionInfo.GoVersion, + versionInfo.GitCommit, + time.Unix(versionInfo.Built, 0).Format(time.RFC3339), + versionInfo.OsArch, +- versionInfo.APIVersion, ++ int64APIVersion, + ) + } + +-- +2.28.0 + From 57b1103af557751e7399a905970969cd15221347 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 25 Sep 2020 21:13:06 +0000 Subject: [PATCH 127/130] podman-2:2.1.1-1 autobuilt v2.1.1 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 13b1507..3307957 100644 --- a/.gitignore +++ b/.gitignore @@ -433,3 +433,4 @@ /v2.1.0-rc1.tar.gz /v2.1.0-rc2.tar.gz /v2.1.0.tar.gz +/v2.1.1.tar.gz diff --git a/podman.spec b/podman.spec index f009438..3b9d0b1 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.1.0 +%define built_tag v2.1.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,7 +55,7 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.1.0 +Version: 2.1.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased Release: 1%{?dist} @@ -680,6 +680,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Sep 25 2020 RH Container Bot - 2:2.1.1-1 +- autobuilt v2.1.1 + * Tue Sep 22 2020 RH Container Bot - 2:2.1.0-1 - autobuilt v2.1.0 diff --git a/sources b/sources index fd09024..7bf9ccb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.1.0.tar.gz) = eb9b0cb184138af022e6d8e145fc6c4188c75c0695e0c6e62d54112a6b143424dd0caf9686f83637d08ff1fdbc24afca564c89f8cb4ab68b8f8d07345856398e +SHA512 (v2.1.1.tar.gz) = 94096aca1816bb1726b74c71a3c3cd50c4c783110c79dd00e851e6292438ccae7b933b6028177039a7d7d96373afcb783f4bc0449a62c18ae97d73767ee3fa26 From e5180ff17081a1829b97b83ff86ae53d4b3aea9a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Sep 2020 14:45:41 -0400 Subject: [PATCH 128/130] update Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 3b9d0b1..562519d 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.1.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -98,7 +98,7 @@ Obsoletes: oci-systemd-hook <= 0.2.0-3 BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel Recommends: fuse-overlayfs >= 0.3-8 -Requires: crun >= 0.14-2 +Requires: crun >= 0.15-4 Recommends: libvarlink-util %endif %if 0%{?fedora} || 0%{?centos} >= 8 @@ -680,6 +680,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-2 +- Require: crun >= 0.15-4 + * Fri Sep 25 2020 RH Container Bot - 2:2.1.1-1 - autobuilt v2.1.1 From 180cc67d43b18b1a7ea785736a13b7f189e6550c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Sep 2020 14:53:10 -0400 Subject: [PATCH 129/130] podman-2:2.1.1-3 - fix crun gating test issue - bump release tag to preserve upgrade path (cherry picked from commit 5d1014bb11fdcd325e42b6059dd72357e7588e96) Signed-off-by: Lokesh Mandvekar --- 0001-fix-build-with-varlink.patch | 45 ------------------------------- gating-test-crun.patch | 33 +++++++++++++++++++++++ podman.spec | 23 +++++++++++++--- 3 files changed, 53 insertions(+), 48 deletions(-) delete mode 100644 0001-fix-build-with-varlink.patch create mode 100644 gating-test-crun.patch diff --git a/0001-fix-build-with-varlink.patch b/0001-fix-build-with-varlink.patch deleted file mode 100644 index 41232d2..0000000 --- a/0001-fix-build-with-varlink.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8030fd390a1940e52191013803564641778cd54c Mon Sep 17 00:00:00 2001 -From: Lokesh Mandvekar -Date: Tue, 22 Sep 2020 15:01:01 -0400 -Subject: [PATCH] fix build with varlink - -Signed-off-by: Lokesh Mandvekar ---- - pkg/varlinkapi/system.go | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go -index 9e4db2611..e5c766a6d 100644 ---- a/pkg/varlinkapi/system.go -+++ b/pkg/varlinkapi/system.go -@@ -7,6 +7,7 @@ import ( - "fmt" - "os" - goruntime "runtime" -+ "strconv" - "time" - - "github.com/containers/image/v5/pkg/sysregistriesv2" -@@ -22,13 +23,18 @@ func (i *VarlinkAPI) GetVersion(call iopodman.VarlinkCall) error { - return err - } - -+ int64APIVersion, err := strconv.ParseInt(versionInfo.APIVersion, 10, 64) -+ if err != nil { -+ return err -+ } -+ - return call.ReplyGetVersion( - versionInfo.Version, - versionInfo.GoVersion, - versionInfo.GitCommit, - time.Unix(versionInfo.Built, 0).Format(time.RFC3339), - versionInfo.OsArch, -- versionInfo.APIVersion, -+ int64APIVersion, - ) - } - --- -2.28.0 - diff --git a/gating-test-crun.patch b/gating-test-crun.patch new file mode 100644 index 0000000..18f7930 --- /dev/null +++ b/gating-test-crun.patch @@ -0,0 +1,33 @@ +From f732e2edcb5a1b925aa2bea65bfe1162edec032e Mon Sep 17 00:00:00 2001 +From: Ed Santiago +Date: Tue, 29 Sep 2020 06:20:21 -0600 +Subject: [PATCH] Gating-test fix: deal with new crun error msg + +crun changed an error message: + + https://github.com/containers/crun/pull/439 + +It's a good change, absolutely the right thing to do, but +it broke gating tests. Fix tests so they handle both old +and new format. + +Fixes: #7814 + +Signed-off-by: Ed Santiago +--- + test/system/030-run.bats | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/system/030-run.bats b/test/system/030-run.bats +index 4a286d3ae1..b3599cc173 100644 +--- a/test/system/030-run.bats ++++ b/test/system/030-run.bats +@@ -14,7 +14,7 @@ load helpers + # ...but check the configured runtime engine, and switch to crun as needed + run_podman info --format '{{ .Host.OCIRuntime.Path }}' + if expr "$output" : ".*/crun"; then +- err_no_such_cmd="Error: executable file not found in \$PATH: No such file or directory: OCI runtime command not found error" ++ err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI runtime command not found error" + err_no_exec_dir="Error: open executable: Operation not permitted: OCI runtime permission denied error" + fi + diff --git a/podman.spec b/podman.spec index 562519d..29da620 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.1.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -67,8 +67,8 @@ Source0: %{download_url} # uncomment below Source0, and replace the placeholders with the right info # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz -Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz -Patch0: 0001-fix-build-with-varlink.patch +Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz +Patch0: gating-test-crun.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. @@ -680,9 +680,26 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-3 +- fix crun gating test issue +- bump release tag to preserve upgrade path + * Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-2 - Require: crun >= 0.15-4 +* Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-6 +- fedora Requires: crun-0.15-4 + +* Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-5 +- fedora requires crun >= 0.15-3 + +* Sun Sep 27 2020 Lokesh Mandvekar - 2:2.1.1-4 +- correct bad date in changelog + +* Sun Sep 27 2020 Lokesh Mandvekar - 2:2.1.1-3 +- adjust deps for centos7 +>>>>>>> 5d1014b... podman-2:2.1.1-7 + * Fri Sep 25 2020 RH Container Bot - 2:2.1.1-1 - autobuilt v2.1.1 From 8f775e9013043ecefac9a622f24d1be5cc8c592c Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 19 Oct 2020 06:27:01 -0600 Subject: [PATCH 130/130] Podman tests now require buildah PR #7891 introduced a way for podman-rm to remove external containers; to test it, we need buildah. Signed-off-by: Ed Santiago (cherry picked from commit fee6ccac125f77013703c2ad6f2b14a765d35dde) Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 29da620..2451d20 100644 --- a/podman.spec +++ b/podman.spec @@ -414,6 +414,10 @@ Requires: bats Requires: jq Requires: skopeo Requires: nmap-ncat +Requires: httpd-tools +Requires: openssl +Requires: socat +Requires: buildah %description tests %{summary}