From 217ef98f63ee2423a700da0627a823ee7a47c8ef Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 18 Feb 2020 08:43:07 -0500 Subject: [PATCH 001/125] Bump release to make sure new version installs on F32 and remove -dev branch --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index c0b9e62..832a544 100644 --- a/podman.spec +++ b/podman.spec @@ -55,7 +55,7 @@ Epoch: 0 Version: 1.8.0 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 0.4.dev.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -648,6 +648,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Feb 18 2020 Dan Walsh - 2:1.8.0-3.git5092c07 +- Bump release to make sure new version installs on F32 and remove -dev branch + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.4.dev.git5092c07 - bump crun dependency From fad5738a873d9ffd18a59b3d86ee3690b8189681 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 18 Feb 2020 16:06:05 -0500 Subject: [PATCH 002/125] Bump release to make sure new version installs on F32 and remove -dev branch --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 832a544..31e0c3e 100644 --- a/podman.spec +++ b/podman.spec @@ -515,7 +515,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%{?centos} && 0%{?centos} < 8 rm -rf %{buildroot}%{_mandir}/man1/docker-remote.1 rm -rf %{buildroot}%{_mandir}/man1/%{name}-remote.1 rm -rf %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5 From f7fe11edd70dc85b4aceaf85c7b7b3cf7231d7cb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 18 Feb 2020 17:24:27 -0500 Subject: [PATCH 003/125] podman-2:1.8.0-4 - bump to v1.8.0 - autobuilt 2ced909 - cosmetic changes for autobuilds Signed-off-by: Lokesh Mandvekar --- podman.spec | 106 ++++++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 48 deletions(-) diff --git a/podman.spec b/podman.spec index 31e0c3e..09bf962 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 @@ -24,27 +28,29 @@ %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 5092c078ec635c9f1598989b27ccf53369b3cf2b -%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 2ced9094d4728dd09f60a177faa32339a8d0f721 +%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.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 Name: podman %if 0%{?fedora} @@ -53,14 +59,12 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -# Rawhide almost always ships unreleased builds, -# so release tag should be of the form 0.N.blahblah -Release: 3.git%{shortcommit0}%{?dist} +Release: 4%{?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 +Source0: %{download_url} +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 @@ -99,6 +103,9 @@ Requires: crun >= 0.12.1-1 Requires: slirp4netns >= 0.3.0-2 Requires: runc %endif +%if 0%{?centos} >= 8 +Requires: libvarlink-util +%endif # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -393,20 +400,19 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif -%if 0%{?fedora} %package tests Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bats Requires: jq -Obsoletes: oci-systemd-hook <= 0.2.0-3 %description tests %{summary} This package contains system tests for %{name} +%if 0%{?fedora} || 0%{?centos} >= 8 %package remote Summary: (Experimental) Remote client for managing %{name} containers @@ -433,15 +439,27 @@ 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} %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} @@ -457,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 @@ -489,7 +492,7 @@ rm -rf docs/containers-mounts.conf.5.md 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 \ @@ -515,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} && 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 @@ -630,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 @@ -648,6 +653,11 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Feb 18 2020 Lokesh Mandvekar - 2:1.8.0-4 +- bump to v1.8.0 +- autobuilt 2ced909 +- cosmetic changes for autobuilds + * Tue Feb 18 2020 Dan Walsh - 2:1.8.0-3.git5092c07 - Bump release to make sure new version installs on F32 and remove -dev branch From e6276674c786677bfde9622ddc6c7376303daf98 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 18 Feb 2020 22:17:13 -0500 Subject: [PATCH 004/125] commit sources file Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 27a9836..a1121c6 100644 --- a/.gitignore +++ b/.gitignore @@ -787,3 +787,4 @@ /libpod-4699d5e.tar.gz /libpod-c4f6d56.tar.gz /libpod-5092c07.tar.gz +/v1.8.0.tar.gz diff --git a/sources b/sources index 585c3f6..c178719 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (libpod-5092c07.tar.gz) = 207a78efcfb1fb85e2b297ba1a04b5ebef0f6423f747289f0c547c51e34c16d7a39149eb2854008695ccc177f0e58013184b4c4765de71ca272c635e443c0e55 +SHA512 (v1.8.0.tar.gz) = 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87 From 4e458874e26d3130603e3add73e518d4fa271943 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 20 Feb 2020 08:00:24 -0700 Subject: [PATCH 005/125] 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 09bf962..71a9c0c 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 cd0d9e0609092dfe1e82a5ef609598af842d17b8 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sat, 22 Feb 2020 13:39:20 +0100 Subject: [PATCH 006/125] 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 71a9c0c..8a5314a 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 4e5102e9f13236506ca0dddb6df5df04b60b73c8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 23 Feb 2020 13:29:06 -0500 Subject: [PATCH 007/125] podman-2:1.8.0-5 - Resolves: #1806147 - correct buildtags for podman-remote Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 8a5314a..0b35535 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 4%{?dist} +Release: 5%{?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 Feb 23 2020 Lokesh Mandvekar - 2:1.8.0-5 +- Resolves: #1806147 - correct buildtags for podman-remote + * Tue Feb 18 2020 Lokesh Mandvekar - 2:1.8.0-4 - bump to v1.8.0 - autobuilt 2ced909 From 4a451c9d23d413c629ff85705733efa10f198a70 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 23 Feb 2020 14:35:56 -0500 Subject: [PATCH 008/125] podman-2:1.8.1-0.3.rc1 - bump to v1.8.1-rc1 Signed-off-by: Lokesh Mandvekar --- podman.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 0b35535..35b1108 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: 5%{?dist} +Version: 1.8.1 +Release: 0.3.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 +* Sun Feb 23 2020 Lokesh Mandvekar - 2:1.8.1-0.3.rc1 +- bump to v1.8.1-rc1 + * Sun Feb 23 2020 Lokesh Mandvekar - 2:1.8.0-5 - Resolves: #1806147 - correct buildtags for podman-remote From eb32c6db11506962cf36574c1c7256cb688937a7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 23 Feb 2020 14:46:06 -0500 Subject: [PATCH 009/125] upload sources to lookaside cache Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a1121c6..82a97e9 100644 --- a/.gitignore +++ b/.gitignore @@ -788,3 +788,4 @@ /libpod-c4f6d56.tar.gz /libpod-5092c07.tar.gz /v1.8.0.tar.gz +/v1.8.1-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 35b1108..0a5cb31 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 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 a45db55b945940cfad1b8e96d335819a21c68a1b Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 28 Feb 2020 19:12:06 +0000 Subject: [PATCH 010/125] 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 82a97e9..548c3e7 100644 --- a/.gitignore +++ b/.gitignore @@ -789,3 +789,4 @@ /libpod-5092c07.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 0a5cb31..fb55938 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 97a29ee928427c74f0a2136e5c6fc718dd4c39a6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 1 Mar 2020 13:45:32 -0500 Subject: [PATCH 011/125] 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 fb55938..ac145d9 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 - bump to v1.8.1-rc1 From 3ce395d3affb67bbc10d11acfbee71a728322c22 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 6 Mar 2020 23:11:49 +0000 Subject: [PATCH 012/125] 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 548c3e7..75c7c78 100644 --- a/.gitignore +++ b/.gitignore @@ -790,3 +790,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 ac145d9..fb782c5 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 a5ee7b9e221a39e856b8a80643785e32f5841d40 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 7 Mar 2020 08:14:07 -0500 Subject: [PATCH 013/125] 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 fb782c5..0dc3cc5 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 97510a9ebd69778e2e99d3abeaf55d7660007ef6 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 10 Mar 2020 13:40:00 +0000 Subject: [PATCH 014/125] 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 75c7c78..9d4c60f 100644 --- a/.gitignore +++ b/.gitignore @@ -791,3 +791,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 0dc3cc5..29a8fd8 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 e62b1f949d5bb8001de05e35c549ad70590a7c91 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 10 Mar 2020 09:52:02 -0400 Subject: [PATCH 015/125] 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 29a8fd8..ce224ff 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 7406e2f9fa017a22cec1b2797869e27b5b2cdb2f Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 11 Mar 2020 17:12:20 +0000 Subject: [PATCH 016/125] 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 9d4c60f..0012d4c 100644 --- a/.gitignore +++ b/.gitignore @@ -792,3 +792,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 ce224ff..3fe6ef6 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 17bb2afa2705c23ddaafa463e0b4d42394d7fd2c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 11 Mar 2020 17:50:58 -0400 Subject: [PATCH 017/125] 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 3fe6ef6..ab0c641 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 0ba1ca465a00d3ac2c7afe497e2aa0985398944c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 18 Mar 2020 15:11:49 +0000 Subject: [PATCH 018/125] 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 0012d4c..9eab0b4 100644 --- a/.gitignore +++ b/.gitignore @@ -793,3 +793,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 ab0c641..d7c15da 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 bbd01477ba5ba934e7de12c3cf3bbbbcbc7f950e Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 19 Mar 2020 21:11:26 +0000 Subject: [PATCH 019/125] 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 9eab0b4..662974e 100644 --- a/.gitignore +++ b/.gitignore @@ -794,3 +794,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 d7c15da..274622c 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 10e0f7ccb9e460a418454a9a5d1ed0aac3627b39 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 20 Mar 2020 07:38:52 -0400 Subject: [PATCH 020/125] autobuilt v1.8.2 --- podman.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 274622c..4c507cc 100644 --- a/podman.spec +++ b/podman.spec @@ -59,12 +59,13 @@ 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/ Source0: %{download_url} 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. @@ -561,6 +562,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 +622,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 dd05b9cf2374adf9d4d36da229adb104b8cc142f Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 20 Mar 2020 07:49:39 -0400 Subject: [PATCH 021/125] Install the APIV2 services --- podman.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/podman.spec b/podman.spec index 4c507cc..9909897 100644 --- a/podman.spec +++ b/podman.spec @@ -666,6 +666,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 8aa99c4511e9ea82f0a449d76c7250ba36a00f06 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 30 Mar 2020 11:49:05 -0400 Subject: [PATCH 022/125] podman-2:1.8.2-3 - Resolves: gh#5316 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 0daca6700d5c045436e60c0f07478d0d0063ea50) Signed-off-by: Lokesh Mandvekar --- podman.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 9909897..b31db31 100644 --- a/podman.spec +++ b/podman.spec @@ -59,13 +59,12 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{download_url} Source1: 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. @@ -514,6 +513,11 @@ pushd dnsname-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd +# install /etc/modules-load.d/podman.conf +echo br_netfilter > %{name}.conf +install -dp %{buildroot}%{_sysconfdir}/modules-load.d +install -p -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/modules-load.d/ + # 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 @@ -607,7 +611,7 @@ exit 0 #define license tag if not already defined %{!?_licensedir:%global license %doc} -%files -f podman.file-list +%files -f %{name}.file-list %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md %{_bindir}/%{name} @@ -626,6 +630,7 @@ exit 0 %{_unitdir}/%{name}.socket %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket +%{_sysconfdir}/modules-load.d/%{name}.conf %files docker %{_bindir}/docker @@ -666,6 +671,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Mar 30 2020 Lokesh Mandvekar - 2:1.8.2-3 +- Resolves: gh#5316 + * Fri Mar 20 2020 Dan Walsh - 2:1.8.2-2 - Install the APIV2 services From 3a5e3ef16f377857ae57ba59c28552f8d97cc710 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 13 Apr 2020 15:08:37 +0000 Subject: [PATCH 023/125] 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 662974e..b730126 100644 --- a/.gitignore +++ b/.gitignore @@ -795,3 +795,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 b31db31..02ae17e 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: 3%{?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/ @@ -671,6 +671,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 + * Mon Mar 30 2020 Lokesh Mandvekar - 2:1.8.2-3 - Resolves: gh#5316 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 838ad1242d525fa78beb2bc1832e18cc6a98aa1e Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 1 Apr 2020 12:53:59 -0500 Subject: [PATCH 024/125] 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 02ae17e..8823682 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 b801ecb570dee45f3cfdbfd0c5ca42f4217d9113 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 13 Apr 2020 11:45:58 -0400 Subject: [PATCH 025/125] 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 8823682..fab923b 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: 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} -Requires: container-selinux %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel @@ -97,14 +96,17 @@ Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc +Recommends: container-selinux Requires: crun >= 0.12.1-1 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 Requires: runc +Requires: container-selinux %endif %if 0%{?centos} >= 8 Requires: libvarlink-util +Recommends: container-selinux %endif # vendored libraries @@ -671,6 +673,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* 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 f908e25cf01eb74f02e09c92737ece272031b4df Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 13 Apr 2020 14:02:44 -0400 Subject: [PATCH 026/125] podman-2:1.9.0-0.4.rc1 - rewrite container-selinux conditionals more cleanly Signed-off-by: Lokesh Mandvekar --- podman.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index fab923b..5c8aead 100644 --- a/podman.spec +++ b/podman.spec @@ -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/ @@ -96,17 +96,20 @@ Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc -Recommends: container-selinux Requires: crun >= 0.12.1-1 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 Requires: runc -Requires: container-selinux %endif %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 @@ -673,6 +676,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Apr 13 2020 Lokesh Mandvekar - 2:1.9.0-0.4.rc1 +- rewrite container-selinux conditionals more cleanly + * 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 From 6b1dc92ec85b79f482cfa0e253f2e1b516d9bf39 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 14 Apr 2020 18:07:33 +0000 Subject: [PATCH 027/125] podman-2:1.9.0-0.5.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 b730126..6556fab 100644 --- a/.gitignore +++ b/.gitignore @@ -796,3 +796,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 5c8aead..3d50e7f 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.4.rc1%{?dist} +Release: 0.5.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -676,6 +676,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Apr 14 2020 RH Container Bot - 2:1.9.0-0.5.rc1 +- autobuilt v1.9.0-rc2 + * Mon Apr 13 2020 Lokesh Mandvekar - 2:1.9.0-0.4.rc1 - rewrite container-selinux conditionals more cleanly 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 613553fb73247479b0ce9d9d94b89b17702b3e56 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 15 Apr 2020 09:21:22 -0500 Subject: [PATCH 028/125] update crun 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 3d50e7f..3b84ef2 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 70862eedb8df0e53cae9891c362e13900b233f2d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 15 Apr 2020 16:08:21 +0000 Subject: [PATCH 029/125] 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 6556fab..423704e 100644 --- a/.gitignore +++ b/.gitignore @@ -797,3 +797,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 3b84ef2..04cf0de 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.5.rc1%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -676,6 +676,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.5.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 fe6b8a99231fd19a018e5a4b875698d649c7cf1b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 29 Apr 2020 09:23:06 -0400 Subject: [PATCH 030/125] 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 423704e..a9d76da 100644 --- a/.gitignore +++ b/.gitignore @@ -798,3 +798,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 04cf0de..5494920 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 @@ -676,6 +676,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 646a5647bfbc0ad8b5af0bcbc8aa42b09e0c6c7d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 29 Apr 2020 09:52:28 -0400 Subject: [PATCH 031/125] 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 5494920..a74f204 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 d9d71b20979ee1dd56a53b4e47cab7b3cf3bad0c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 13 May 2020 16:36:55 -0400 Subject: [PATCH 032/125] 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 a9d76da..598b7f5 100644 --- a/.gitignore +++ b/.gitignore @@ -799,3 +799,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 a74f204..247e4bb 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} @@ -673,6 +670,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 097ae3e0a4f1cf81e312fcf9c01591f8e67af8d7 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 20 May 2020 10:34:55 -0600 Subject: [PATCH 033/125] update gating.yaml to gate on new testcase name Also: update decision context: I think for released branches it's supposed to be 'testing'. (It was set to 'stable', probably an accident of when f32 stabilized from master) --- gating.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gating.yaml b/gating.yaml index 92d738a..c2d0ba7 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,6 @@ --- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_stable +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 6c5a0a8a3b8527e9dc98ffb6dc12fb3bdc3b1719 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 25 May 2020 14:40:47 -0400 Subject: [PATCH 034/125] 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 598b7f5..2950290 100644 --- a/.gitignore +++ b/.gitignore @@ -801,3 +801,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 247e4bb..4a2e856 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} @@ -670,6 +670,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 c691e9fd540180d9a98a4c428133a1bc72444130 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Thu, 4 Jun 2020 12:31:14 -0500 Subject: [PATCH 035/125] build rc4 on f32 Signed-off-by: Brent Baude --- podman.spec | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/podman.spec b/podman.spec index 4a2e856..695fc4e 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.3 +%define built_tag v2.0.0-rc4 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -55,8 +55,8 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.9.3 -Release: 1%{?dist} +Version: 2.0.0 +Release: rc4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -482,9 +482,6 @@ export BUILDTAGS+=" remoteclient" %endif %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 @@ -503,10 +500,6 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build 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 @@ -619,12 +612,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 -%{_userunitdir}/io.%{name}.socket -%{_usr}/lib/tmpfiles.d/%{name}.conf %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket %{_userunitdir}/%{name}.service @@ -670,6 +657,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Thu Jun 04 2020 Brent Baude - 2:2.0.0-rc4 +- rc4 + * Mon May 25 2020 Lokesh Mandvekar - 2:1.9.3-1 - bump to v1.9.3 - require conmon >= 2:2.0.16-3 From 2ea3bb6109f9df2afb4b7baeb43abd6073a90994 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Thu, 4 Jun 2020 14:33:59 -0500 Subject: [PATCH 036/125] add sources Signed-off-by: Brent Baude --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 2950290..5b1344c 100644 --- a/.gitignore +++ b/.gitignore @@ -802,3 +802,4 @@ /libpod-5b4e91d.tar.gz /v1.9.2.tar.gz /v1.9.3.tar.gz +/v2.0.0-rc4.tar.gz diff --git a/sources b/sources index 6b786c5..4de2874 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc SHA512 (v1.9.3.tar.gz) = d85cdf49b740f47a341b7717a4bc22ff326d22234e224bd572a3d879b75eaa33139bebdc293c2e7bc41a9902289d89380b9b56975a0826172324e9a54f8f5e03 +SHA512 (v2.0.0-rc4.tar.gz) = efb65a6522d3779ef09d6a8ec5212bc2e724bc20110315b70f3b3fea96641997319d3828dc819aec01f7804e4dcc805640d9ee81f35641e12c087d6215392bc6 From 324ec6e5a94910118d2be816072d3fb90a104ed9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 8 Jun 2020 15:46:41 -0400 Subject: [PATCH 037/125] d Signed-off-by: Daniel J Walsh --- podman.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/podman.spec b/podman.spec index 695fc4e..714fbee 100644 --- a/podman.spec +++ b/podman.spec @@ -55,8 +55,13 @@ Epoch: 2 %else Epoch: 0 %endif +<<<<<<< Updated upstream Version: 2.0.0 Release: rc4%{?dist} +======= +Version: 1.9.2 +Release: 2%{?dist} +>>>>>>> Stashed changes Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -485,6 +490,7 @@ export BUILDTAGS+=" remoteclient" 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 +rm docs/libpod.conf.5.md install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ @@ -612,6 +618,14 @@ exit 0 %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name} %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist +<<<<<<< Updated upstream +======= +%{_unitdir}/io.%{name}.service +%{_unitdir}/io.%{name}.socket +%{_userunitdir}/io.%{name}.service +%{_userunitdir}/io.%{name}.socket +%{_usr}/lib/tmpfiles.d/%{name}.conf +>>>>>>> Stashed changes %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket %{_userunitdir}/%{name}.service @@ -657,6 +671,7 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +<<<<<<< Updated upstream * Thu Jun 04 2020 Brent Baude - 2:2.0.0-rc4 - rc4 @@ -666,6 +681,10 @@ exit 0 * Fri May 15 2020 Lokesh Mandvekar - 2:1.9.2-2 - use correct epoch for conmon +======= +* Mon May 25 2020 Dan Walsh - 2:1.9.2-2 +- Remove libpod.conf +>>>>>>> Stashed changes * Wed May 13 2020 Lokesh Mandvekar - 2:1.9.2-1 - bump to v1.9.2 From 2b0093e05877f8c3314c21918b8e3c4ae2861268 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 8 Jun 2020 15:51:03 -0400 Subject: [PATCH 038/125] Remove /etc/modules-load.d/podman.conf --- podman.spec | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/podman.spec b/podman.spec index 714fbee..542259d 100644 --- a/podman.spec +++ b/podman.spec @@ -55,13 +55,8 @@ Epoch: 2 %else Epoch: 0 %endif -<<<<<<< Updated upstream Version: 2.0.0 -Release: rc4%{?dist} -======= -Version: 1.9.2 -Release: 2%{?dist} ->>>>>>> Stashed changes +Release: rc4.1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -490,7 +485,6 @@ export BUILDTAGS+=" remoteclient" 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 -rm docs/libpod.conf.5.md install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ @@ -511,11 +505,6 @@ pushd dnsname-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd -# install /etc/modules-load.d/podman.conf -echo br_netfilter > %{name}.conf -install -dp %{buildroot}%{_sysconfdir}/modules-load.d -install -p -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/modules-load.d/ - # 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 @@ -618,19 +607,10 @@ exit 0 %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name} %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist -<<<<<<< Updated upstream -======= -%{_unitdir}/io.%{name}.service -%{_unitdir}/io.%{name}.socket -%{_userunitdir}/io.%{name}.service -%{_userunitdir}/io.%{name}.socket -%{_usr}/lib/tmpfiles.d/%{name}.conf ->>>>>>> Stashed changes %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket -%{_sysconfdir}/modules-load.d/%{name}.conf %files docker %{_bindir}/docker @@ -671,7 +651,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog -<<<<<<< Updated upstream +* Mon Jun 8 2020 Dan Walsh - 2:2.0.0-rc4.1 +- Remove /etc/modules-load.d/podman.conf + * Thu Jun 04 2020 Brent Baude - 2:2.0.0-rc4 - rc4 @@ -681,10 +663,6 @@ exit 0 * Fri May 15 2020 Lokesh Mandvekar - 2:1.9.2-2 - use correct epoch for conmon -======= -* Mon May 25 2020 Dan Walsh - 2:1.9.2-2 -- Remove libpod.conf ->>>>>>> Stashed changes * Wed May 13 2020 Lokesh Mandvekar - 2:1.9.2-1 - bump to v1.9.2 From e5637d00ba5d43bbeeb28a0335a7885b06ccbd21 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 10 Jun 2020 13:42:58 -0500 Subject: [PATCH 039/125] rc5 Signed-off-by: Brent Baude --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5b1344c..05d2ed9 100644 --- a/.gitignore +++ b/.gitignore @@ -803,3 +803,4 @@ /v1.9.2.tar.gz /v1.9.3.tar.gz /v2.0.0-rc4.tar.gz +/v2.0.0-rc5.tar.gz diff --git a/podman.spec b/podman.spec index 542259d..0947a0d 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-rc4 +%define built_tag v2.0.0-rc5 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -56,7 +56,7 @@ Epoch: 2 Epoch: 0 %endif Version: 2.0.0 -Release: rc4.1%{?dist} +Release: rc4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -651,6 +651,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Jun 10 2020 Brent Baude - 2:2.0.0-rc5 +- rc5 + * Mon Jun 8 2020 Dan Walsh - 2:2.0.0-rc4.1 - Remove /etc/modules-load.d/podman.conf diff --git a/sources b/sources index 4de2874..f2a478b 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc SHA512 (v1.9.3.tar.gz) = d85cdf49b740f47a341b7717a4bc22ff326d22234e224bd572a3d879b75eaa33139bebdc293c2e7bc41a9902289d89380b9b56975a0826172324e9a54f8f5e03 SHA512 (v2.0.0-rc4.tar.gz) = efb65a6522d3779ef09d6a8ec5212bc2e724bc20110315b70f3b3fea96641997319d3828dc819aec01f7804e4dcc805640d9ee81f35641e12c087d6215392bc6 +SHA512 (v2.0.0-rc5.tar.gz) = 145ca6fbe3ca92cf614a1d1c3d9fa490d66f08348e0335173845569c5a697e3598c5c5f40a3d7f33583e8e19c636731b05d1e08f8b5a4936ed09033c7e358e8c From fce0caee755d14ba481554c2bee1d94cee5c5808 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 10 Jun 2020 13:44:36 -0500 Subject: [PATCH 040/125] rc5 Signed-off-by: Brent Baude --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 0947a0d..6b66835 100644 --- a/podman.spec +++ b/podman.spec @@ -56,7 +56,7 @@ Epoch: 2 Epoch: 0 %endif Version: 2.0.0 -Release: rc4%{?dist} +Release: rc5%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ From 797da2202a0179787b6c14abe6b2874be8b17ffa Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 10 Jun 2020 13:35:23 -0600 Subject: [PATCH 041/125] tests subpackage: now Requires: nmap-ncat ...because of new networking test Signed-off-by: Ed Santiago --- podman.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/podman.spec b/podman.spec index 6b66835..ed88d0f 100644 --- a/podman.spec +++ b/podman.spec @@ -406,6 +406,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bats Requires: jq Requires: skopeo +Requires: nmap-ncat %description tests %{summary} From 2c88e2135e14ac4993178bae0f87fe8dd8e6f2ea Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 15 Jun 2020 08:39:27 -0400 Subject: [PATCH 042/125] add release tag guidelines comment Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/podman.spec b/podman.spec index ed88d0f..f98ac28 100644 --- a/podman.spec +++ b/podman.spec @@ -56,6 +56,8 @@ Epoch: 2 Epoch: 0 %endif Version: 2.0.0 +# RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER +# N.foo if released, 0.N.foo if unreleased Release: rc5%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 From d04f8f327a68b483123af954a88ec91552bc6ac3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 15 Jun 2020 08:42:49 -0400 Subject: [PATCH 043/125] add comment for who manages rhcontainerbot Signed-off-by: Lokesh Mandvekar --- podman.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/podman.spec b/podman.spec index f98ac28..95b5837 100644 --- a/podman.spec +++ b/podman.spec @@ -653,6 +653,7 @@ exit 0 %doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md} %{_libexecdir}/cni/dnsname +# rhcontainerbot account currently managed by lsm5 %changelog * Wed Jun 10 2020 Brent Baude - 2:2.0.0-rc5 - rc5 From 0f8ff50367905488676ab9c835b132b591720567 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 15 Jun 2020 10:02:17 -0400 Subject: [PATCH 044/125] podman-2:2.0.0-0.1.rc5 - correct release tag format Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 95b5837..0c3c918 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.0.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: rc5%{?dist} +Release: 0.1.rc5%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -655,6 +655,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Jun 15 2020 Lokesh Mandvekar - 2:2.0.0-0.1.rc5 +- correct release tag format + * Wed Jun 10 2020 Brent Baude - 2:2.0.0-rc5 - rc5 From df4018959fabfa728768c8432f32caa6d7b40c6c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 15 Jun 2020 13:57:27 -0400 Subject: [PATCH 045/125] podman-2:2.0.0-0.2.rc6 - built v2.0.0-rc6 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 35 +++++++++++++++++++++++------------ sources | 4 +--- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 05d2ed9..3f7bad3 100644 --- a/.gitignore +++ b/.gitignore @@ -804,3 +804,4 @@ /v1.9.3.tar.gz /v2.0.0-rc4.tar.gz /v2.0.0-rc5.tar.gz +/v2.0.0-rc6.tar.gz diff --git a/podman.spec b/podman.spec index 0c3c918..68a7926 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-rc5 +%define built_tag v2.0.0-rc6 %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: 0 Version: 2.0.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 0.1.rc5%{?dist} +Release: 0.2.rc6%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -484,22 +484,25 @@ export BUILDTAGS+=" remoteclient" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif +%{__make} docs + %install -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 @@ -614,6 +617,11 @@ exit 0 %{_unitdir}/%{name}.socket %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket +%{_unitdir}/io.%{name}.service +%{_unitdir}/io.%{name}.socket +%{_userunitdir}/io.%{name}.service +%{_userunitdir}/io.%{name}.socket +%{_tmpfilesdir}/%{name}.conf %files docker %{_bindir}/docker @@ -655,6 +663,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Jun 15 2020 Lokesh Mandvekar - 2:2.0.0-0.2.rc6 +- built v2.0.0-rc6 + * Mon Jun 15 2020 Lokesh Mandvekar - 2:2.0.0-0.1.rc5 - correct release tag format diff --git a/sources b/sources index f2a478b..1a16892 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.9.3.tar.gz) = d85cdf49b740f47a341b7717a4bc22ff326d22234e224bd572a3d879b75eaa33139bebdc293c2e7bc41a9902289d89380b9b56975a0826172324e9a54f8f5e03 -SHA512 (v2.0.0-rc4.tar.gz) = efb65a6522d3779ef09d6a8ec5212bc2e724bc20110315b70f3b3fea96641997319d3828dc819aec01f7804e4dcc805640d9ee81f35641e12c087d6215392bc6 -SHA512 (v2.0.0-rc5.tar.gz) = 145ca6fbe3ca92cf614a1d1c3d9fa490d66f08348e0335173845569c5a697e3598c5c5f40a3d7f33583e8e19c636731b05d1e08f8b5a4936ed09033c7e358e8c +SHA512 (v2.0.0-rc6.tar.gz) = a21b0d5321ad4bf5dc5274f1f544d1c7da594296694fc814bbd3d956d41f0bb09310ce65212a33163ad330983057b36697e834deb78196f804e0c3a6c00b711c From 7dbb38a6812e200d2005738196d7dba90e8db16c Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 17 Jun 2020 16:26:41 -0500 Subject: [PATCH 046/125] rc7 Signed-off-by: Brent Baude --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3f7bad3..268726b 100644 --- a/.gitignore +++ b/.gitignore @@ -805,3 +805,4 @@ /v2.0.0-rc4.tar.gz /v2.0.0-rc5.tar.gz /v2.0.0-rc6.tar.gz +/v2.0.0-rc7.tar.gz diff --git a/podman.spec b/podman.spec index 68a7926..403fcca 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-rc6 +%define built_tag v2.0.0-rc7 %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: 0 Version: 2.0.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 0.2.rc6%{?dist} +Release: 0.3.rc7%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -663,6 +663,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Jun 17 2020 Brent Baude - 2:2.0.0-0.3.rc7 +- built v2.0.0-rc7 + * Mon Jun 15 2020 Lokesh Mandvekar - 2:2.0.0-0.2.rc6 - built v2.0.0-rc6 diff --git a/sources b/sources index 1a16892..b249174 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc SHA512 (v2.0.0-rc6.tar.gz) = a21b0d5321ad4bf5dc5274f1f544d1c7da594296694fc814bbd3d956d41f0bb09310ce65212a33163ad330983057b36697e834deb78196f804e0c3a6c00b711c +SHA512 (v2.0.0-rc7.tar.gz) = ec52d8473ff4bdcf044e10f7627bdd7c879ea966e2968ad8a988b9d731b900852394102e8e2841bef504114ec4d9971f4ecf7246cece4303ad89eb38122e9090 From 467d74db000ec5889509a7af1b1bee0fb0afd752 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 20 Jun 2020 10:47:48 -0400 Subject: [PATCH 047/125] podman-2:2.0.0-1 - bump to v2.0.0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 8 +++++--- sources | 4 +--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 268726b..b1aa247 100644 --- a/.gitignore +++ b/.gitignore @@ -806,3 +806,4 @@ /v2.0.0-rc5.tar.gz /v2.0.0-rc6.tar.gz /v2.0.0-rc7.tar.gz +/v2.0.0.tar.gz diff --git a/podman.spec b/podman.spec index 403fcca..adc589b 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 https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.0.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 0.3.rc7%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -647,7 +647,6 @@ exit 0 %license LICENSE %{_bindir}/%{name}-remote %{_mandir}/man1/%{name}-remote*.1* -%{_mandir}/man5/%{name}-remote*.5* %endif %files tests @@ -663,6 +662,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Jun 19 2020 Lokesh Mandvekar - 2:2.0.0-1 +- bump to v2.0.0 + * Wed Jun 17 2020 Brent Baude - 2:2.0.0-0.3.rc7 - built v2.0.0-rc7 diff --git a/sources b/sources index b249174..229788d 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v2.0.0-rc6.tar.gz) = a21b0d5321ad4bf5dc5274f1f544d1c7da594296694fc814bbd3d956d41f0bb09310ce65212a33163ad330983057b36697e834deb78196f804e0c3a6c00b711c -SHA512 (v2.0.0-rc7.tar.gz) = ec52d8473ff4bdcf044e10f7627bdd7c879ea966e2968ad8a988b9d731b900852394102e8e2841bef504114ec4d9971f4ecf7246cece4303ad89eb38122e9090 +SHA512 (v2.0.0.tar.gz) = 29f7e365dbd4ab6d20ee3e85939804f74dcfe95f65a6d030d1c10a36512c29d3934907cbb014047d659fd96ed3a2946570ef7922cd77cc729370ac099b4b58a2 From c29e05666343c64e46ec3a04dc31a2b11a38fb7a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 20 Jun 2020 10:50:26 -0400 Subject: [PATCH 048/125] include all tarballs Signed-off-by: Lokesh Mandvekar --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 229788d..069e200 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc SHA512 (v2.0.0.tar.gz) = 29f7e365dbd4ab6d20ee3e85939804f74dcfe95f65a6d030d1c10a36512c29d3934907cbb014047d659fd96ed3a2946570ef7922cd77cc729370ac099b4b58a2 From 902e1063ef5146a1258eab9ff970ca2596079d25 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 20 Jun 2020 11:19:20 -0400 Subject: [PATCH 049/125] podman-2:2.0.0-2 - depend on conmon-2:2.0.18-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 adc589b..0193b58 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.0.0 # 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/ @@ -86,7 +86,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} @@ -662,6 +662,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Sat Jun 20 2020 Lokesh Mandvekar - 2:2.0.0-2 +- depend on conmon-2:2.0.18-1 + * Fri Jun 19 2020 Lokesh Mandvekar - 2:2.0.0-1 - bump to v2.0.0 From 2b5c4b088e8ad8c9ae0d67eb2539f1e5fe310cbe Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 22 Jun 2020 14:24:53 +0000 Subject: [PATCH 050/125] podman-2:2.0.0-3 - autobuilt v2.0.0-rc7 Signed-off-by: RH Container Bot --- podman.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 0193b58..582bee7 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 https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.0.0 # 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/ @@ -662,6 +662,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Jun 22 2020 RH Container Bot - 2:2.0.0-3 +- autobuilt v2.0.0-rc7 + * Sat Jun 20 2020 Lokesh Mandvekar - 2:2.0.0-2 - depend on conmon-2:2.0.18-1 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 bd5a9139ed15c923d6ba7491665d5b407db63587 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 22 Jun 2020 11:08:53 -0400 Subject: [PATCH 051/125] Revert "podman-2:2.0.0-3" This reverts commit 2b5c4b088e8ad8c9ae0d67eb2539f1e5fe310cbe. Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 ++----- sources | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/podman.spec b/podman.spec index 582bee7..0193b58 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 https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.0.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 3%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -662,9 +662,6 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog -* Mon Jun 22 2020 RH Container Bot - 2:2.0.0-3 -- autobuilt v2.0.0-rc7 - * Sat Jun 20 2020 Lokesh Mandvekar - 2:2.0.0-2 - depend on conmon-2:2.0.18-1 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 4f24105e5c771ac80f2d84f10d470ef99b66354f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 23 Jun 2020 17:31:45 -0400 Subject: [PATCH 052/125] add comments to allow building random commits Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/podman.spec b/podman.spec index 0193b58..8f9c57d 100644 --- a/podman.spec +++ b/podman.spec @@ -63,6 +63,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} @@ -443,6 +447,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 d903524ef01e7fb3f2baf82c37e91a5ca1004359 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 23 Jun 2020 17:32:27 -0400 Subject: [PATCH 053/125] no macros in comments Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 8f9c57d..19db26d 100644 --- a/podman.spec +++ b/podman.spec @@ -450,7 +450,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 742c7824b70c754e491eb4e26cc3016aa530390a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 26 Jun 2020 09:51:00 -0400 Subject: [PATCH 054/125] podman-2:2.0.1-1 - bump to v2.0.1 Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ podman.spec | 19 ++++++------------- sources | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index b1aa247..fe477d0 100644 --- a/.gitignore +++ b/.gitignore @@ -807,3 +807,5 @@ /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 diff --git a/podman.spec b/podman.spec index 19db26d..a6e6a49 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 https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -55,10 +55,10 @@ 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: 2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -497,9 +497,6 @@ 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 \ @@ -567,13 +564,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 @@ -670,6 +660,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %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 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 2aa8321d39f8e71fb0ad87ab352c4e3084b2ffeb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 7 Jul 2020 14:54:48 -0400 Subject: [PATCH 055/125] remove varlink for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/podman.spec b/podman.spec index a6e6a49..cc39a6a 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 \ @@ -615,11 +624,13 @@ exit 0 %{_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 a3af169e0098a9f7fa1a04e10a1585b8cb945edf Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 7 Jul 2020 19:13:10 +0000 Subject: [PATCH 056/125] 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 fe477d0..5ae6b08 100644 --- a/.gitignore +++ b/.gitignore @@ -809,3 +809,4 @@ /v2.0.0.tar.gz /libpod-6bc5dcc.tar.gz /v2.0.1.tar.gz +/v2.0.2.tar.gz diff --git a/podman.spec b/podman.spec index cc39a6a..6394e80 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 https://github.com/containers/libpod/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} @@ -671,6 +671,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %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 86c84863a1f93f9e4770e7103487bbe14b439b8f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 8 Jul 2020 14:08:53 -0400 Subject: [PATCH 057/125] upstream name changed, but %{import_path} still the same Signed-off-by: Lokesh Mandvekar --- podman.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/podman.spec b/podman.spec index 6394e80..857d204 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 @@ -47,7 +47,7 @@ # to decide whether to autobuild (non-rawhide only) %define built_tag v2.0.2 %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} @@ -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 df99a0e1a1ae9f4d9baa4d22f57a8002bce655e8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 12 Jul 2020 11:13:43 -0400 Subject: [PATCH 058/125] re-enable varlink for podman Signed-off-by: Lokesh Mandvekar --- podman.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/podman.spec b/podman.spec index 857d204..01e7a6f 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.0.2 # 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,13 +98,13 @@ 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: runc Recommends: slirp4netns >= 0.3.0-2 +Recommends: libvarlink-util %else Requires: catatonit Requires: container-selinux @@ -478,13 +478,13 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src -%if 0%{?fedora} && ! 0%{?centos} +%if %{with varlink} %gogenerate ./pkg/varlink/... %endif # build %%{name} 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} +%if %{with varlink} export BUILDTAGS+=" varlink" %endif %if 0%{?centos} @@ -505,7 +505,7 @@ rm -rf docs/containers-mounts.conf.5.md PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \ ETCDIR=%{buildroot}%{_sysconfdir} \ -%if 0%{?fedora} && ! 0%{?centos} +%if %{with varlink} BUILDTAGS="varlink" \ %endif install.bin-nobuild \ @@ -624,7 +624,7 @@ exit 0 %{_unitdir}/%{name}.socket %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket -%if 0%{?fedora} && ! 0%{?centos} +%if %{with varlink} %{_unitdir}/io.%{name}.service %{_unitdir}/io.%{name}.socket %{_userunitdir}/io.%{name}.service @@ -671,6 +671,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Sun Jul 12 2020 Lokesh Mandvekar - 2:2.0.2-2 +- re-enable varlink for centos8 + * Tue Jul 07 2020 RH Container Bot - 2:2.0.2-1 - autobuilt v2.0.2 From c14694998ab19e8508c06b5fd8657f7fbbdf6a2b Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 23 Jul 2020 17:49:45 +0000 Subject: [PATCH 059/125] podman-2:2.0.3-1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5ae6b08..eb1dd6c 100644 --- a/.gitignore +++ b/.gitignore @@ -810,3 +810,4 @@ /libpod-6bc5dcc.tar.gz /v2.0.1.tar.gz /v2.0.2.tar.gz +/v2.0.3.tar.gz diff --git a/podman.spec b/podman.spec index 01e7a6f..bf09c37 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,10 +55,10 @@ 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: 2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -671,6 +671,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Jul 23 17:49:29 GMT 2020 RH Container Bot - 2:2.0.3-1 +- autobuilt v2.0.3 + * Sun Jul 12 2020 Lokesh Mandvekar - 2:2.0.2-2 - re-enable varlink for centos8 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 f8738b5dc40a53373af4c4ac96fe615db58e60f1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 29 Jul 2020 13:40:08 -0400 Subject: [PATCH 060/125] remove tz info from changelog 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 bf09c37..282afb2 100644 --- a/podman.spec +++ b/podman.spec @@ -671,7 +671,7 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog -* Thu Jul 23 17:49:29 GMT 2020 RH Container Bot - 2:2.0.3-1 +* Thu Jul 23 RH Container Bot - 2:2.0.3-1 - autobuilt v2.0.3 * Sun Jul 12 2020 Lokesh Mandvekar - 2:2.0.2-2 From 61204036c93ba39f6f3ffde6c9e0163ef65d6063 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 29 Jul 2020 13:49:05 -0400 Subject: [PATCH 061/125] correct changelog Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 282afb2..2edb5cc 100644 --- a/podman.spec +++ b/podman.spec @@ -671,7 +671,7 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog -* Thu Jul 23 RH Container Bot - 2:2.0.3-1 +* Thu Jul 23 2020 RH Container Bot - 2:2.0.3-1 - autobuilt v2.0.3 * Sun Jul 12 2020 Lokesh Mandvekar - 2:2.0.2-2 From c1521d4c1f6039f90df6d09e72692db196a3095f Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 31 Jul 2020 21:10:00 +0000 Subject: [PATCH 062/125] 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 eb1dd6c..fd32f2b 100644 --- a/.gitignore +++ b/.gitignore @@ -811,3 +811,4 @@ /v2.0.1.tar.gz /v2.0.2.tar.gz /v2.0.3.tar.gz +/v2.0.4.tar.gz diff --git a/podman.spec b/podman.spec index 2edb5cc..b5a561e 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} @@ -671,6 +671,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Jul 31 21:09:48 GMT 2020 RH Container Bot - 2:2.0.4-1 +- autobuilt v2.0.4 + * Thu Jul 23 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 05e86bad1c6bebe0e3565734391dda8635615097 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 1 Aug 2020 08:51:06 -0400 Subject: [PATCH 063/125] remove timezone from changelog for centos7 Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index b5a561e..d61916e 100644 --- a/podman.spec +++ b/podman.spec @@ -671,7 +671,7 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog -* Fri Jul 31 21:09:48 GMT 2020 RH Container Bot - 2:2.0.4-1 +* Fri Jul 31 2020 RH Container Bot - 2:2.0.4-1 - autobuilt v2.0.4 * Thu Jul 23 2020 RH Container Bot - 2:2.0.3-1 From bca3c024d02be3dd33a2c528b16f78327f5c1140 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 12 Aug 2020 17:57:38 -0400 Subject: [PATCH 064/125] 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 d61916e..88b7559 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 266b62ebac7ed0dbc396c6d4cc12a7469a9bfecd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 13 Aug 2020 13:59:41 -0400 Subject: [PATCH 065/125] 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 88b7559..71f9770 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 c0a4062d46708d28d21e88d396645e466baee6a2 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 24 Aug 2020 23:12:19 +0000 Subject: [PATCH 066/125] 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 fd32f2b..5b35e80 100644 --- a/.gitignore +++ b/.gitignore @@ -812,3 +812,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 71f9770..fd57a35 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} @@ -671,6 +671,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Aug 24 2020 RH Container Bot - 2:2.0.5-1 +- autobuilt v2.0.5 + * Fri Jul 31 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 9a5b19b371e266730bd92062210803368be300e1 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 19 Aug 2020 06:44:16 -0600 Subject: [PATCH 067/125] 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 fd57a35..6380234 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 152865a64b8a0dc02591a23b0bc49734a25e396c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 25 Aug 2020 08:46:39 -0400 Subject: [PATCH 068/125] buildinfo in LDFLAGS Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 6380234..e97c5fb 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.0.5 # 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/ @@ -675,6 +675,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Aug 25 2020 Lokesh Mandvekar - 2:2.0.5-2 +- buildinfo in LDFLAGS + * Mon Aug 24 2020 RH Container Bot - 2:2.0.5-1 - autobuilt v2.0.5 From 707511b6dd8552acee371f5b9c22d1701cabe9f7 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 28 Aug 2020 16:31:05 +0000 Subject: [PATCH 069/125] 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 5b35e80..2f5e826 100644 --- a/.gitignore +++ b/.gitignore @@ -813,3 +813,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 e97c5fb..a15679c 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: 2%{?dist} +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -675,6 +675,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Aug 28 2020 RH Container Bot - 2:2.0.5-0.2.rc1 +- autobuilt v2.0.6-rc1 + * Tue Aug 25 2020 Lokesh Mandvekar - 2:2.0.5-2 - buildinfo in LDFLAGS 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 037f97e3192be7c7acbd6b76fa6caeff18dfbbca Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 28 Aug 2020 12:32:51 -0400 Subject: [PATCH 070/125] 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 a15679c..193c19c 100644 --- a/podman.spec +++ b/podman.spec @@ -675,7 +675,7 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %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 * Tue Aug 25 2020 Lokesh Mandvekar - 2:2.0.5-2 From 3a603f34d2d9bbd71f1c1d06f40a048111d84ef0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Sep 2020 15:22:42 -0400 Subject: [PATCH 071/125] podman-2:2.0.6-1 - bump to v2.0.6 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2f5e826..b9bd6c9 100644 --- a/.gitignore +++ b/.gitignore @@ -814,3 +814,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 193c19c..3159ecd 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/ @@ -675,6 +675,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %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 a0a0f04347d32222bdbc4ff1a17f018026c66106 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 14 Sep 2020 14:00:48 +0000 Subject: [PATCH 072/125] 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 b9bd6c9..b0cb42f 100644 --- a/.gitignore +++ b/.gitignore @@ -815,3 +815,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 3159ecd..05ef80e 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/ @@ -675,6 +675,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %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 5ca4944c618bce36a9cbb5aa22b3582b67959f29 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Sep 2020 14:41:04 -0400 Subject: [PATCH 073/125] podman-2:2.1.0-0.2.rc1 - use 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 05ef80e..12e5ada 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/ @@ -675,6 +675,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %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 2304af7d3662e154cf5b86e0067c6044e685cfda Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Sep 2020 16:17:40 -0400 Subject: [PATCH 074/125] fix build issues Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 12e5ada..5fa4337 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,8 +626,12 @@ 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 +%{_userunitdir}/%{name}-auto-update.service +%{_userunitdir}/%{name}-auto-update.timer %if %{with varlink} %{_unitdir}/io.%{name}.service %{_unitdir}/io.%{name}.socket From 927e806e785da0559754c10b13390d71a8b01236 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 16 Sep 2020 13:36:14 -0400 Subject: [PATCH 075/125] podman-2:2.1.0-0.3.rc1 - plugins requires dnsmasq Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 5fa4337..ada6794 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.2.rc1%{?dist} +Release: 0.3.rc1%{?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 @@ -679,6 +680,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Sep 16 13:36:01 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.3.rc1 +- plugins requires dnsmasq + * Mon Sep 14 14:40:56 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.2.rc1 - use correct release tag From 44a3fb6ec0f6b2d9fa0be51503fb5909509c600d Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 17 Sep 2020 21:12:34 +0000 Subject: [PATCH 076/125] podman-2:2.1.0-0.4.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 b0cb42f..320bc23 100644 --- a/.gitignore +++ b/.gitignore @@ -816,3 +816,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 ada6794..2f62236 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.3.rc1%{?dist} +Release: 0.4.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -680,6 +680,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Thu Sep 17 2020 RH Container Bot - 2:2.1.0-0.4.rc1 +- autobuilt v2.1.0-rc2 + * Wed Sep 16 13:36:01 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.3.rc1 - plugins requires dnsmasq 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 73b0f7aa936518568e88cbf46f139fe6af87f699 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 18 Sep 2020 08:27:34 -0400 Subject: [PATCH 077/125] podman-2:2.1.0-0.5.rc2 - fix release tag Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 2f62236..190d1cb 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.4.rc1%{?dist} +Release: 0.5.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -680,10 +680,13 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Sep 18 2020 Lokesh Mandvekar - 2:2.1.0-0.5.rc2 +- fix release tag + * Thu Sep 17 2020 RH Container Bot - 2:2.1.0-0.4.rc1 - autobuilt v2.1.0-rc2 -* Wed Sep 16 13:36:01 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.3.rc1 +* Wed Sep 16 2020 Lokesh Mandvekar - 2:2.1.0-0.3.rc1 - plugins requires dnsmasq * Mon Sep 14 14:40:56 EDT 2020 Lokesh Mandvekar - 2:2.1.0-0.2.rc1 From cb93654a02b3613c0f985043b29e98587d34b384 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 22 Sep 2020 17:53:09 +0000 Subject: [PATCH 078/125] 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 320bc23..37e3de5 100644 --- a/.gitignore +++ b/.gitignore @@ -817,3 +817,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 190d1cb..9100396 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.5.rc2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -680,6 +680,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %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.5.rc2 - fix 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 27b5a733406a3699a1ce9ac96749f4fed785a260 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 22 Sep 2020 15:23:56 -0400 Subject: [PATCH 079/125] fix build issues with varlink buildtag Upstream PR: https://github.com/containers/podman/pull/7734 Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 9100396..9b4383b 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 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: catatonit From ac96438b1e8e8fa569d4fdf2e2ce37d003701b79 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 22 Sep 2020 15:27:30 -0400 Subject: [PATCH 080/125] actually add build fix patch 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 3d89601498af74cbdb2fc626c48c2ee69d32dd4e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 22 Sep 2020 18:03:37 -0400 Subject: [PATCH 081/125] make centos7 happy Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 9b4383b..e21bd29 100644 --- a/podman.spec +++ b/podman.spec @@ -693,7 +693,7 @@ exit 0 * Wed Sep 16 2020 Lokesh Mandvekar - 2:2.1.0-0.3.rc1 - plugins requires dnsmasq -* 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 6d67e0272f2f7798dc8fce13106c587ec4842fd9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 22 Sep 2020 19:13:49 -0400 Subject: [PATCH 082/125] podman-2:2.1.0-1 - autobuilt v2.1.0 - Resolves: #1874268, #1881345 - CVE-2020-14370 Signed-off-by: Lokesh Mandvekar --- podman.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index e21bd29..caf936f 100644 --- a/podman.spec +++ b/podman.spec @@ -67,7 +67,7 @@ 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 +Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz Patch0: 0001-fix-build-with-varlink.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} @@ -683,6 +683,7 @@ exit 0 %changelog * Tue Sep 22 2020 RH Container Bot - 2:2.1.0-1 - autobuilt v2.1.0 +- Resolves: #1874268, #1881345 - CVE-2020-14370 * Fri Sep 18 2020 Lokesh Mandvekar - 2:2.1.0-0.5.rc2 - fix release tag From 5da7ade97fc7b448992dd359a250d2c25ed64d7d Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 18 Sep 2020 11:56:41 -0400 Subject: [PATCH 083/125] spec: make podman-plugins a weak dep That way someone who wants just podman doesn't also get dnsmasq. This is a point of contention in FCOS currently: https://github.com/coreos/fedora-coreos-tracker/issues/519 (cherry picked from commit 217f4344ec796dd1134a5ba54a8ce2fb5a32a5b6) Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index caf936f..e6147a1 100644 --- a/podman.spec +++ b/podman.spec @@ -92,7 +92,7 @@ Requires: containernetworking-plugins >= 0.8.6-1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.18-1 -Requires: %{name}-plugins = %{epoch}:%{version}-%{release} +Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel From 5cdbd0d453136c75e09960c9bed4ce4b428a1409 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 23 Sep 2020 16:43:31 -0400 Subject: [PATCH 084/125] podman-2:2.1.0-2 - podman-plugins is a weak dep for podman Signed-off-by: Lokesh Mandvekar (cherry picked from commit c1d4bd28f07ae1f4a2255cba984ae963de675f26) Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index e6147a1..69e5db6 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,9 @@ Epoch: 0 Version: 2.1.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 1%{?dist} +# Rawhide almost always ships unreleased builds, +# so release tag should be of the form 0.N.foo +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -681,6 +683,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Sep 23 2020 Lokesh Mandvekar - 2:2.1.0-2 +- podman-plugins is a weak dep for podman + * Tue Sep 22 2020 RH Container Bot - 2:2.1.0-1 - autobuilt v2.1.0 - Resolves: #1874268, #1881345 - CVE-2020-14370 From 70ec865d1b79d829bb5f1dc9f0a394e180403b94 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 27 Sep 2020 09:39:39 -0400 Subject: [PATCH 085/125] podman-2:2.1.1-1 - bump to v2.1.1 - depend on containers-common >= 1.1.1-9 for f33 gating tests Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 37e3de5..9c70d8f 100644 --- a/.gitignore +++ b/.gitignore @@ -818,3 +818,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 69e5db6..9f64981 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 # Rawhide almost always ships unreleased builds, @@ -89,7 +89,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common +Requires: containers-common >= 1.1.1-9 Requires: containernetworking-plugins >= 0.8.6-1 Requires: iptables Requires: nftables @@ -683,6 +683,10 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Sep 23 2020 Lokesh Mandvekar - 2:2.1.1-1 +- bump to v2.1.1 +- depend on containers-common >= 1.1.1-9 for f33 gating tests + * Wed Sep 23 2020 Lokesh Mandvekar - 2:2.1.0-2 - podman-plugins is a weak dep for podman 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 7c988791aac9ba1c1136132405b0073b78f312c7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 27 Sep 2020 10:59:41 -0400 Subject: [PATCH 086/125] update Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 9f64981..90e7e1b 100644 --- a/podman.spec +++ b/podman.spec @@ -89,7 +89,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common >= 1.1.1-9 +Requires: containers-common Requires: containernetworking-plugins >= 0.8.6-1 Requires: iptables Requires: nftables From 100487af42cfe735c655c9330fb9a2b6171b1e07 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 27 Sep 2020 14:31:24 -0400 Subject: [PATCH 087/125] adjust deps for centos7 Signed-off-by: Lokesh Mandvekar --- 0001-fix-build-with-varlink.patch | 45 ------------------------------- podman.spec | 10 ++++--- 2 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 0001-fix-build-with-varlink.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/podman.spec b/podman.spec index 90e7e1b..20c5805 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -70,7 +70,6 @@ Source0: %{download_url} # 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 -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. @@ -94,7 +93,6 @@ Requires: containernetworking-plugins >= 0.8.6-1 Requires: iptables Requires: nftables Requires: conmon >= 2:2.0.18-1 -Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel @@ -103,12 +101,14 @@ Recommends: fuse-overlayfs >= 0.3-8 Requires: crun >= 0.14-2 %endif %if 0%{?fedora} || 0%{?centos} >= 8 +Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: catatonit Recommends: container-selinux Recommends: runc Recommends: slirp4netns >= 0.3.0-2 Recommends: libvarlink-util %else +Requires: %{name}-plugins = %{epoch}:%{version}-%{release} Requires: catatonit Requires: container-selinux Requires: runc @@ -683,9 +683,11 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Sun Sep 27 14:31:14 EDT 2020 Lokesh Mandvekar - 2:2.1.1-3 +- adjust deps for centos7 + * Wed Sep 23 2020 Lokesh Mandvekar - 2:2.1.1-1 - bump to v2.1.1 -- depend on containers-common >= 1.1.1-9 for f33 gating tests * Wed Sep 23 2020 Lokesh Mandvekar - 2:2.1.0-2 - podman-plugins is a weak dep for podman From 93e384f46ee13779798628af66585d6ac5e8fb24 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 27 Sep 2020 15:56:34 -0400 Subject: [PATCH 088/125] podman-2:2.1.1-4 - correct bad date in changelog Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 20c5805..9f97f79 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -683,7 +683,10 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog -* Sun Sep 27 14:31:14 EDT 2020 Lokesh Mandvekar - 2:2.1.1-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 * Wed Sep 23 2020 Lokesh Mandvekar - 2:2.1.1-1 From dc67fdbcc1856b94c808ddf851e29b1cc70cbf58 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Sep 2020 10:41:51 -0400 Subject: [PATCH 089/125] podman-2:2.1.1-5 - fedora requires crun >= 0.15-3 Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 9f97f79..d57ddd7 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 4%{?dist} +Release: 5%{?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-3 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} @@ -683,6 +683,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* 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 From 2ea4e812e45df4a22de8df0ec7af5d2bbfe0a1e7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Sep 2020 11:01:47 -0400 Subject: [PATCH 090/125] podman-2:2.1.1-6 - fedora Requires: crun-0.15-4 Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index d57ddd7..6e9b187 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 5%{?dist} +Release: 6%{?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.15-3 +Requires: crun >= 0.15-4 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} @@ -683,6 +683,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* 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 From 5d1014bb11fdcd325e42b6059dd72357e7588e96 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Sep 2020 14:53:10 -0400 Subject: [PATCH 091/125] podman-2:2.1.1-7 - fix crun gating test issue - bump release tag to preserve upgrade path (cherry picked from commit 851325f1b654cdbc521d9f696ad0d37d670eb33c) Signed-off-by: Lokesh Mandvekar --- gating-test-crun.patch | 33 +++++++++++++++++++++++++++++++++ podman.spec | 7 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gating-test-crun.patch 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 6e9b187..44eaf99 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 6%{?dist} +Release: 7%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -70,6 +70,7 @@ Source0: %{download_url} # 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 +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. @@ -683,6 +684,10 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-7 +- fix crun gating test issue +- bump release tag to preserve upgrade path + * Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-6 - fedora Requires: crun-0.15-4 From fa4859ea695a2ae7c8bcb45f7c43818a99b90e93 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Thu, 24 Sep 2020 12:38:01 +0000 Subject: [PATCH 092/125] Require container-selinux when selinux-policy is installed (#1881218) (cherry picked from commit 5620973b1af4f2b5ca491eae27b6e25bf460781e) Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 44eaf99..e86b3c3 100644 --- a/podman.spec +++ b/podman.spec @@ -104,7 +104,7 @@ Requires: crun >= 0.15-4 %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: catatonit -Recommends: container-selinux +Requires: (container-selinux if selinux-policy) Recommends: runc Recommends: slirp4netns >= 0.3.0-2 Recommends: libvarlink-util From 3293ad92798de0ecb2d381c5d108d3558ebd2558 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 Oct 2020 10:43:51 -0400 Subject: [PATCH 093/125] podman-2:2.1.1-8 - Requires: (container-selinux if selinux-policy) Signed-off-by: Lokesh Mandvekar (cherry picked from commit 176a630bfb546abfbda3e7a90770dde537e8b3e6) Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index e86b3c3..6f7ab30 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 7%{?dist} +Release: 8%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -684,6 +684,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-8 +- Requires: (container-selinux if selinux-policy) + * Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-7 - fix crun gating test issue - bump release tag to preserve upgrade path From 80213126a2ee073527e5df9286aa81dc7f68e3b3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 Oct 2020 15:24:58 -0400 Subject: [PATCH 094/125] podman-2:2.1.1-9 - fix capset issue on podman run (upstream PR#7898) Signed-off-by: Lokesh Mandvekar (cherry picked from commit 0a3af289296fe26eb367857918fe132bd6dd2dc3) Signed-off-by: Lokesh Mandvekar --- fix-capset-issue.patch | 102 +++++++++++++++++++++++++++++++++++++++++ podman.spec | 6 ++- 2 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 fix-capset-issue.patch diff --git a/fix-capset-issue.patch b/fix-capset-issue.patch new file mode 100644 index 0000000..044705e --- /dev/null +++ b/fix-capset-issue.patch @@ -0,0 +1,102 @@ +From 445b6cc2e776e5c0417acfe119772bcdb7fbd9f2 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano +Date: Tue, 29 Sep 2020 10:06:48 +0200 +Subject: [PATCH] capabilities: always set ambient and inheritable + +change capabilities handling to reflect what docker does. + +Bounding: set to caplist +Inheritable: set to caplist +Effective: if uid != 0 then clear; else set to caplist +Permitted: if uid != 0 then clear; else set to caplist +Ambient: clear + +Signed-off-by: Giuseppe Scrivano +(cherry picked from commit 703381b4a2b1dc761ffee0d8e36b47f21ffd92c5) +--- + pkg/specgen/generate/security.go | 3 ++- + test/e2e/cp_test.go | 4 ++-- + test/system/030-run.bats | 4 ++-- + test/system/075-exec.bats | 4 ++-- + 4 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go +index 87e8029a75..d5e8cd4ff4 100644 +--- a/pkg/specgen/generate/security.go ++++ b/pkg/specgen/generate/security.go +@@ -130,12 +130,13 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, + } + + configSpec := g.Config ++ configSpec.Process.Capabilities.Ambient = []string{} + configSpec.Process.Capabilities.Bounding = caplist ++ configSpec.Process.Capabilities.Inheritable = caplist + + if s.User == "" || s.User == "root" || s.User == "0" { + configSpec.Process.Capabilities.Effective = caplist + configSpec.Process.Capabilities.Permitted = caplist +- configSpec.Process.Capabilities.Inheritable = caplist + } else { + userCaps, err := capabilities.NormalizeCapabilities(s.CapAdd) + if err != nil { +diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go +index a53485fa46..0a9fa990c5 100644 +--- a/test/e2e/cp_test.go ++++ b/test/e2e/cp_test.go +@@ -269,11 +269,11 @@ var _ = Describe("Podman cp", func() { + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + +- session = podmanTest.Podman([]string{"exec", "-u", "testuser", "testctr", "touch", "testfile"}) ++ session = podmanTest.Podman([]string{"exec", "-u", "testuser", "testctr", "touch", "/tmp/testfile"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + +- session = podmanTest.Podman([]string{"cp", "--pause=false", "testctr:testfile", "testfile1"}) ++ session = podmanTest.Podman([]string{"cp", "--pause=false", "testctr:/tmp/testfile", "testfile1"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + +diff --git a/test/system/030-run.bats b/test/system/030-run.bats +index 518d902a7b..59983fef01 100644 +--- a/test/system/030-run.bats ++++ b/test/system/030-run.bats +@@ -312,7 +312,7 @@ echo $rand | 0 | $rand + @test "podman run : --userns=keep-id: passwd file is modifiable" { + skip_if_remote "FIXME: pending #7195" + +- run_podman run -d --userns=keep-id $IMAGE sh -c 'while ! test -e /stop; do sleep 0.1; done' ++ run_podman run -d --userns=keep-id --cap-add=dac_override $IMAGE sh -c 'while ! test -e /tmp/stop; do sleep 0.1; done' + cid="$output" + + # Assign a UID that is (a) not in our image /etc/passwd and (b) not +@@ -333,7 +333,7 @@ echo $rand | 0 | $rand + is "$output" "newuser3:x:$uid:999:$gecos:/home/newuser3:/bin/sh" \ + "newuser3 added to /etc/passwd in container" + +- run_podman exec $cid touch /stop ++ run_podman exec $cid touch /tmp/stop + run_podman wait $cid + } + +diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats +index e9db8c27eb..edd7dedc43 100644 +--- a/test/system/075-exec.bats ++++ b/test/system/075-exec.bats +@@ -92,14 +92,14 @@ load helpers + # #6829 : add username to /etc/passwd inside container if --userns=keep-id + @test "podman exec - with keep-id" { + run_podman run -d --userns=keep-id $IMAGE sh -c \ +- "echo READY;while [ ! -f /stop ]; do sleep 1; done" ++ "echo READY;while [ ! -f /tmp/stop ]; do sleep 1; done" + cid="$output" + wait_for_ready $cid + + run_podman exec $cid id -un + is "$output" "$(id -un)" "container is running as current user" + +- run_podman exec --user=$(id -un) $cid touch /stop ++ run_podman exec --user=$(id -un) $cid touch /tmp/stop + run_podman wait $cid + run_podman rm $cid + } diff --git a/podman.spec b/podman.spec index 6f7ab30..1e0d65c 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 8%{?dist} +Release: 9%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -71,6 +71,7 @@ Source0: %{download_url} #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 Patch0: gating-test-crun.patch +Patch1: fix-capset-issue.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. @@ -684,6 +685,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-9 +- fix capset issue on podman run (upstream PR#7898) + * Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-8 - Requires: (container-selinux if selinux-policy) From 24950cb7aea02f059025277b17fcd7956e9e09ed Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 2 Oct 2020 16:11:14 -0400 Subject: [PATCH 095/125] correct containers-common dependency Signed-off-by: Lokesh Mandvekar (cherry picked from commit 8daa8e6f6b5e30a24be2405d7e9edf99ead0f290) Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 1e0d65c..36c9575 100644 --- a/podman.spec +++ b/podman.spec @@ -90,7 +90,6 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: containers-common Requires: containernetworking-plugins >= 0.8.6-1 Requires: iptables Requires: nftables @@ -99,8 +98,11 @@ Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel +Requires: containers-common >= 1:1.2.0-2 Recommends: fuse-overlayfs >= 0.3-8 -Requires: crun >= 0.15-4 +Recommends: crun >= 0.15-5 +%else +Requires: containers-common >= 2:1.2.0-2 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} @@ -687,6 +689,7 @@ exit 0 %changelog * Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-9 - fix capset issue on podman run (upstream PR#7898) +- Requires containers-common >= %%epoch:1.2.0-2 * Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-8 - Requires: (container-selinux if selinux-policy) From 29c393733ab1bd03bad0d062a07fcbeeafb00545 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 4 Oct 2020 19:20:35 -0400 Subject: [PATCH 096/125] podman-2:2.1.1-10 - fix permission denied issue when using --net=host Signed-off-by: Lokesh Mandvekar (cherry picked from commit 5f498229e275dbd84b6ef311ef52a79912ed317a) Signed-off-by: Lokesh Mandvekar --- net-host.patch | 133 +++++++++++++++++++++++++++++++++++++++++++++++++ podman.spec | 6 ++- 2 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 net-host.patch diff --git a/net-host.patch b/net-host.patch new file mode 100644 index 0000000..8164da8 --- /dev/null +++ b/net-host.patch @@ -0,0 +1,133 @@ +From e896ca924f214404be48de116fb18cb21404cbca Mon Sep 17 00:00:00 2001 +From: Daniel J Walsh +Date: Mon, 28 Sep 2020 15:55:06 -0400 +Subject: [PATCH] Ignore containers.conf sysctl when namespaces set to host + +If user sets namespace to host, then default sysctls need to be ignored +that are specific to that namespace. + +--net=host ignore sysctls that begin with net. +--ipc=host ignore fs.mqueue +--uts=host ignore kernel.domainname and kernel.hostname + +Signed-off-by: Daniel J Walsh +(cherry picked from commit 0d70df119539d818224b0d014602aaad2bd1b95e) +Signed-off-by: Lokesh Mandvekar +--- + cmd/podman/common/create.go | 2 +- + pkg/specgen/generate/security.go | 46 ++++++++++++++++++++++++++++++++ + test/e2e/containers_conf_test.go | 6 +++++ + test/e2e/run_test.go | 5 ++++ + 4 files changed, 58 insertions(+), 1 deletion(-) + +diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go +index 7e3dc7fb4e..d5cad675d5 100644 +--- a/cmd/podman/common/create.go ++++ b/cmd/podman/common/create.go +@@ -448,7 +448,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { + + createFlags.StringSliceVar( + &cf.Sysctl, +- "sysctl", containerConfig.Sysctls(), ++ "sysctl", []string{}, + "Sysctl options", + ) + createFlags.StringVar( +diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go +index d5e8cd4ff4..d17cd4a9a2 100644 +--- a/pkg/specgen/generate/security.go ++++ b/pkg/specgen/generate/security.go +@@ -7,6 +7,7 @@ import ( + "github.com/containers/common/pkg/capabilities" + "github.com/containers/common/pkg/config" + "github.com/containers/podman/v2/libpod" ++ "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/util" +@@ -168,7 +169,52 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, + } + + g.SetRootReadonly(s.ReadOnlyFilesystem) ++ ++ // Add default sysctls ++ defaultSysctls, err := util.ValidateSysctls(rtc.Sysctls()) ++ if err != nil { ++ return err ++ } ++ for sysctlKey, sysctlVal := range defaultSysctls { ++ ++ // Ignore mqueue sysctls if --ipc=host ++ if s.IpcNS.IsHost() && strings.HasPrefix(sysctlKey, "fs.mqueue.") { ++ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since IPC Namespace set to host", sysctlKey, sysctlVal) ++ ++ continue ++ } ++ ++ // Ignore net sysctls if --net=host ++ if s.NetNS.IsHost() && strings.HasPrefix(sysctlKey, "net.") { ++ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since Network Namespace set to host", sysctlKey, sysctlVal) ++ continue ++ } ++ ++ // Ignore uts sysctls if --uts=host ++ if s.UtsNS.IsHost() && (strings.HasPrefix(sysctlKey, "kernel.domainname") || strings.HasPrefix(sysctlKey, "kernel.hostname")) { ++ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since UTS Namespace set to host", sysctlKey, sysctlVal) ++ continue ++ } ++ ++ g.AddLinuxSysctl(sysctlKey, sysctlVal) ++ } ++ + for sysctlKey, sysctlVal := range s.Sysctl { ++ ++ if s.IpcNS.IsHost() && strings.HasPrefix(sysctlKey, "fs.mqueue.") { ++ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since IPC Namespace set to host", sysctlKey, sysctlVal) ++ } ++ ++ // Ignore net sysctls if --net=host ++ if s.NetNS.IsHost() && strings.HasPrefix(sysctlKey, "net.") { ++ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since Host Namespace set to host", sysctlKey, sysctlVal) ++ } ++ ++ // Ignore uts sysctls if --uts=host ++ if s.UtsNS.IsHost() && (strings.HasPrefix(sysctlKey, "kernel.domainname") || strings.HasPrefix(sysctlKey, "kernel.hostname")) { ++ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since UTS Namespace set to host", sysctlKey, sysctlVal) ++ } ++ + g.AddLinuxSysctl(sysctlKey, sysctlVal) + } + +diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go +index 8339b77321..981b9638db 100644 +--- a/test/e2e/containers_conf_test.go ++++ b/test/e2e/containers_conf_test.go +@@ -182,6 +182,12 @@ var _ = Describe("Podman run", func() { + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + Expect(session.OutputToString()).To(ContainSubstring("1000")) ++ ++ // Ignore containers.conf setting if --net=host ++ session = podmanTest.Podman([]string{"run", "--rm", "--net", "host", fedoraMinimal, "cat", "/proc/sys/net/ipv4/ping_group_range"}) ++ session.WaitWithDefaultTimeout() ++ Expect(session.ExitCode()).To(Equal(0)) ++ Expect(session.OutputToString()).ToNot((ContainSubstring("1000"))) + }) + + It("podman run containers.conf search domain", func() { +diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go +index c8655dcad0..359c6a41c2 100644 +--- a/test/e2e/run_test.go ++++ b/test/e2e/run_test.go +@@ -375,6 +375,11 @@ USER bin` + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + Expect(session.OutputToString()).To(ContainSubstring("net.core.somaxconn = 65535")) ++ ++ // network sysctls should fail if --net=host is set ++ session = podmanTest.Podman([]string{"run", "--net", "host", "--rm", "--sysctl", "net.core.somaxconn=65535", ALPINE, "sysctl", "net.core.somaxconn"}) ++ session.WaitWithDefaultTimeout() ++ Expect(session.ExitCode()).To(Equal(125)) + }) + + It("podman run blkio-weight test", func() { diff --git a/podman.spec b/podman.spec index 36c9575..a4132ac 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 9%{?dist} +Release: 10%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -72,6 +72,7 @@ Source0: %{download_url} Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz Patch0: gating-test-crun.patch Patch1: fix-capset-issue.patch +Patch2: net-host.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. @@ -687,6 +688,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Sun Oct 4 2020 Lokesh Mandvekar - 2:2.1.1-10 +- fix permission denied issue when using --net=host + * Fri Oct 2 2020 Lokesh Mandvekar - 2:2.1.1-9 - fix capset issue on podman run (upstream PR#7898) - Requires containers-common >= %%epoch:1.2.0-2 From 50bd50384e4fe8a89a5e0284440c60e467cc6beb Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 19 Oct 2020 06:27:01 -0600 Subject: [PATCH 097/125] 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 a4132ac..d65ab9c 100644 --- a/podman.spec +++ b/podman.spec @@ -421,6 +421,10 @@ Requires: bats Requires: jq Requires: skopeo Requires: nmap-ncat +Requires: httpd-tools +Requires: openssl +Requires: socat +Requires: buildah %description tests %{summary} From 450ca035e162887ee312c713b95192692a23b827 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 12:43:28 -0500 Subject: [PATCH 098/125] podman-2:2.1.1-13 - bump dnsname to v1.1.0, commit a9c2a10 Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ podman.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9c70d8f..9725f05 100644 --- a/.gitignore +++ b/.gitignore @@ -819,3 +819,5 @@ /v2.1.0-rc2.tar.gz /v2.1.0.tar.gz /v2.1.1.tar.gz +/dnsname-a9c2a10.tar.gz +/podman-286d356.tar.gz diff --git a/podman.spec b/podman.spec index d65ab9c..f17079f 100644 --- a/podman.spec +++ b/podman.spec @@ -38,10 +38,10 @@ %define repo_plugins dnsname # https://github.com/containers/libpod -%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}) +%global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} +%global git_plugins https://%{import_path_plugins} +%global commit_plugins a9c2a10a3a24e082996cf2d9edb1cee295651413 +%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) @@ -60,7 +60,7 @@ Version: 2.1.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 10%{?dist} +Release: 13%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -69,7 +69,7 @@ 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: https://github.com/containers/dnsname/archive/%{commit_plugins}/dnsname-%{shortcommit_plugins}.tar.gz Patch0: gating-test-crun.patch Patch1: fix-capset-issue.patch Patch2: net-host.patch @@ -692,6 +692,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Nov 18 2020 Lokesh Mandvekar - 2:2.1.1-13 +- bump dnsname to v1.1.0, commit a9c2a10 + * Sun Oct 4 2020 Lokesh Mandvekar - 2:2.1.1-10 - fix permission denied issue when using --net=host diff --git a/sources b/sources index 7bf9ccb..d4e60b0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc +SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 SHA512 (v2.1.1.tar.gz) = 94096aca1816bb1726b74c71a3c3cd50c4c783110c79dd00e851e6292438ccae7b933b6028177039a7d7d96373afcb783f4bc0449a62c18ae97d73767ee3fa26 From b465086792a9ab3ac0c387e67530248c71d4c732 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 13:16:00 -0500 Subject: [PATCH 099/125] Remove containers-mounts.conf.5.md Present in containers-common From: Ed Santiago Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index f17079f..a5063af 100644 --- a/podman.spec +++ b/podman.spec @@ -465,6 +465,8 @@ file. Each CNI network will have its own dnsmasq instance. # Use appropriate value for $BRANCH as in Source0 #%%autosetup -Sgit -n %%{name}-$BRANCH +rm -f docs/source/markdown/containers-mounts.conf.5.md + # untar dnsname tar zxf %{SOURCE1} @@ -518,8 +520,6 @@ export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion remote" %{__make} docs %install -rm -rf docs/containers-mounts.conf.5.md - PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \ ETCDIR=%{buildroot}%{_sysconfdir} \ %if %{with varlink} From 3b441767f11b5662c64d1cdd2e389672f4aabe1a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 13:20:00 -0500 Subject: [PATCH 100/125] remove patches merged upstream for v2.2 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 4bbf1704bc7b0c39c5b86edb6e30787988d98a72) Signed-off-by: Lokesh Mandvekar --- fix-capset-issue.patch | 102 ------------------------------- gating-test-crun.patch | 33 ---------- net-host.patch | 133 ----------------------------------------- podman.spec | 3 - 4 files changed, 271 deletions(-) delete mode 100644 fix-capset-issue.patch delete mode 100644 gating-test-crun.patch delete mode 100644 net-host.patch diff --git a/fix-capset-issue.patch b/fix-capset-issue.patch deleted file mode 100644 index 044705e..0000000 --- a/fix-capset-issue.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 445b6cc2e776e5c0417acfe119772bcdb7fbd9f2 Mon Sep 17 00:00:00 2001 -From: Giuseppe Scrivano -Date: Tue, 29 Sep 2020 10:06:48 +0200 -Subject: [PATCH] capabilities: always set ambient and inheritable - -change capabilities handling to reflect what docker does. - -Bounding: set to caplist -Inheritable: set to caplist -Effective: if uid != 0 then clear; else set to caplist -Permitted: if uid != 0 then clear; else set to caplist -Ambient: clear - -Signed-off-by: Giuseppe Scrivano -(cherry picked from commit 703381b4a2b1dc761ffee0d8e36b47f21ffd92c5) ---- - pkg/specgen/generate/security.go | 3 ++- - test/e2e/cp_test.go | 4 ++-- - test/system/030-run.bats | 4 ++-- - test/system/075-exec.bats | 4 ++-- - 4 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go -index 87e8029a75..d5e8cd4ff4 100644 ---- a/pkg/specgen/generate/security.go -+++ b/pkg/specgen/generate/security.go -@@ -130,12 +130,13 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, - } - - configSpec := g.Config -+ configSpec.Process.Capabilities.Ambient = []string{} - configSpec.Process.Capabilities.Bounding = caplist -+ configSpec.Process.Capabilities.Inheritable = caplist - - if s.User == "" || s.User == "root" || s.User == "0" { - configSpec.Process.Capabilities.Effective = caplist - configSpec.Process.Capabilities.Permitted = caplist -- configSpec.Process.Capabilities.Inheritable = caplist - } else { - userCaps, err := capabilities.NormalizeCapabilities(s.CapAdd) - if err != nil { -diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go -index a53485fa46..0a9fa990c5 100644 ---- a/test/e2e/cp_test.go -+++ b/test/e2e/cp_test.go -@@ -269,11 +269,11 @@ var _ = Describe("Podman cp", func() { - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - -- session = podmanTest.Podman([]string{"exec", "-u", "testuser", "testctr", "touch", "testfile"}) -+ session = podmanTest.Podman([]string{"exec", "-u", "testuser", "testctr", "touch", "/tmp/testfile"}) - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - -- session = podmanTest.Podman([]string{"cp", "--pause=false", "testctr:testfile", "testfile1"}) -+ session = podmanTest.Podman([]string{"cp", "--pause=false", "testctr:/tmp/testfile", "testfile1"}) - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - -diff --git a/test/system/030-run.bats b/test/system/030-run.bats -index 518d902a7b..59983fef01 100644 ---- a/test/system/030-run.bats -+++ b/test/system/030-run.bats -@@ -312,7 +312,7 @@ echo $rand | 0 | $rand - @test "podman run : --userns=keep-id: passwd file is modifiable" { - skip_if_remote "FIXME: pending #7195" - -- run_podman run -d --userns=keep-id $IMAGE sh -c 'while ! test -e /stop; do sleep 0.1; done' -+ run_podman run -d --userns=keep-id --cap-add=dac_override $IMAGE sh -c 'while ! test -e /tmp/stop; do sleep 0.1; done' - cid="$output" - - # Assign a UID that is (a) not in our image /etc/passwd and (b) not -@@ -333,7 +333,7 @@ echo $rand | 0 | $rand - is "$output" "newuser3:x:$uid:999:$gecos:/home/newuser3:/bin/sh" \ - "newuser3 added to /etc/passwd in container" - -- run_podman exec $cid touch /stop -+ run_podman exec $cid touch /tmp/stop - run_podman wait $cid - } - -diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats -index e9db8c27eb..edd7dedc43 100644 ---- a/test/system/075-exec.bats -+++ b/test/system/075-exec.bats -@@ -92,14 +92,14 @@ load helpers - # #6829 : add username to /etc/passwd inside container if --userns=keep-id - @test "podman exec - with keep-id" { - run_podman run -d --userns=keep-id $IMAGE sh -c \ -- "echo READY;while [ ! -f /stop ]; do sleep 1; done" -+ "echo READY;while [ ! -f /tmp/stop ]; do sleep 1; done" - cid="$output" - wait_for_ready $cid - - run_podman exec $cid id -un - is "$output" "$(id -un)" "container is running as current user" - -- run_podman exec --user=$(id -un) $cid touch /stop -+ run_podman exec --user=$(id -un) $cid touch /tmp/stop - run_podman wait $cid - run_podman rm $cid - } diff --git a/gating-test-crun.patch b/gating-test-crun.patch deleted file mode 100644 index 18f7930..0000000 --- a/gating-test-crun.patch +++ /dev/null @@ -1,33 +0,0 @@ -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/net-host.patch b/net-host.patch deleted file mode 100644 index 8164da8..0000000 --- a/net-host.patch +++ /dev/null @@ -1,133 +0,0 @@ -From e896ca924f214404be48de116fb18cb21404cbca Mon Sep 17 00:00:00 2001 -From: Daniel J Walsh -Date: Mon, 28 Sep 2020 15:55:06 -0400 -Subject: [PATCH] Ignore containers.conf sysctl when namespaces set to host - -If user sets namespace to host, then default sysctls need to be ignored -that are specific to that namespace. - ---net=host ignore sysctls that begin with net. ---ipc=host ignore fs.mqueue ---uts=host ignore kernel.domainname and kernel.hostname - -Signed-off-by: Daniel J Walsh -(cherry picked from commit 0d70df119539d818224b0d014602aaad2bd1b95e) -Signed-off-by: Lokesh Mandvekar ---- - cmd/podman/common/create.go | 2 +- - pkg/specgen/generate/security.go | 46 ++++++++++++++++++++++++++++++++ - test/e2e/containers_conf_test.go | 6 +++++ - test/e2e/run_test.go | 5 ++++ - 4 files changed, 58 insertions(+), 1 deletion(-) - -diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go -index 7e3dc7fb4e..d5cad675d5 100644 ---- a/cmd/podman/common/create.go -+++ b/cmd/podman/common/create.go -@@ -448,7 +448,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { - - createFlags.StringSliceVar( - &cf.Sysctl, -- "sysctl", containerConfig.Sysctls(), -+ "sysctl", []string{}, - "Sysctl options", - ) - createFlags.StringVar( -diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go -index d5e8cd4ff4..d17cd4a9a2 100644 ---- a/pkg/specgen/generate/security.go -+++ b/pkg/specgen/generate/security.go -@@ -7,6 +7,7 @@ import ( - "github.com/containers/common/pkg/capabilities" - "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/libpod" -+ "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/libpod/image" - "github.com/containers/podman/v2/pkg/specgen" - "github.com/containers/podman/v2/pkg/util" -@@ -168,7 +169,52 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, - } - - g.SetRootReadonly(s.ReadOnlyFilesystem) -+ -+ // Add default sysctls -+ defaultSysctls, err := util.ValidateSysctls(rtc.Sysctls()) -+ if err != nil { -+ return err -+ } -+ for sysctlKey, sysctlVal := range defaultSysctls { -+ -+ // Ignore mqueue sysctls if --ipc=host -+ if s.IpcNS.IsHost() && strings.HasPrefix(sysctlKey, "fs.mqueue.") { -+ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since IPC Namespace set to host", sysctlKey, sysctlVal) -+ -+ continue -+ } -+ -+ // Ignore net sysctls if --net=host -+ if s.NetNS.IsHost() && strings.HasPrefix(sysctlKey, "net.") { -+ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since Network Namespace set to host", sysctlKey, sysctlVal) -+ continue -+ } -+ -+ // Ignore uts sysctls if --uts=host -+ if s.UtsNS.IsHost() && (strings.HasPrefix(sysctlKey, "kernel.domainname") || strings.HasPrefix(sysctlKey, "kernel.hostname")) { -+ logrus.Infof("Sysctl %s=%s ignored in containers.conf, since UTS Namespace set to host", sysctlKey, sysctlVal) -+ continue -+ } -+ -+ g.AddLinuxSysctl(sysctlKey, sysctlVal) -+ } -+ - for sysctlKey, sysctlVal := range s.Sysctl { -+ -+ if s.IpcNS.IsHost() && strings.HasPrefix(sysctlKey, "fs.mqueue.") { -+ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since IPC Namespace set to host", sysctlKey, sysctlVal) -+ } -+ -+ // Ignore net sysctls if --net=host -+ if s.NetNS.IsHost() && strings.HasPrefix(sysctlKey, "net.") { -+ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since Host Namespace set to host", sysctlKey, sysctlVal) -+ } -+ -+ // Ignore uts sysctls if --uts=host -+ if s.UtsNS.IsHost() && (strings.HasPrefix(sysctlKey, "kernel.domainname") || strings.HasPrefix(sysctlKey, "kernel.hostname")) { -+ return errors.Wrapf(define.ErrInvalidArg, "sysctl %s=%s can't be set since UTS Namespace set to host", sysctlKey, sysctlVal) -+ } -+ - g.AddLinuxSysctl(sysctlKey, sysctlVal) - } - -diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go -index 8339b77321..981b9638db 100644 ---- a/test/e2e/containers_conf_test.go -+++ b/test/e2e/containers_conf_test.go -@@ -182,6 +182,12 @@ var _ = Describe("Podman run", func() { - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - Expect(session.OutputToString()).To(ContainSubstring("1000")) -+ -+ // Ignore containers.conf setting if --net=host -+ session = podmanTest.Podman([]string{"run", "--rm", "--net", "host", fedoraMinimal, "cat", "/proc/sys/net/ipv4/ping_group_range"}) -+ session.WaitWithDefaultTimeout() -+ Expect(session.ExitCode()).To(Equal(0)) -+ Expect(session.OutputToString()).ToNot((ContainSubstring("1000"))) - }) - - It("podman run containers.conf search domain", func() { -diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go -index c8655dcad0..359c6a41c2 100644 ---- a/test/e2e/run_test.go -+++ b/test/e2e/run_test.go -@@ -375,6 +375,11 @@ USER bin` - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - Expect(session.OutputToString()).To(ContainSubstring("net.core.somaxconn = 65535")) -+ -+ // network sysctls should fail if --net=host is set -+ session = podmanTest.Podman([]string{"run", "--net", "host", "--rm", "--sysctl", "net.core.somaxconn=65535", ALPINE, "sysctl", "net.core.somaxconn"}) -+ session.WaitWithDefaultTimeout() -+ Expect(session.ExitCode()).To(Equal(125)) - }) - - It("podman run blkio-weight test", func() { diff --git a/podman.spec b/podman.spec index a5063af..fdce961 100644 --- a/podman.spec +++ b/podman.spec @@ -70,9 +70,6 @@ Source0: %{download_url} # 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/%{commit_plugins}/dnsname-%{shortcommit_plugins}.tar.gz -Patch0: gating-test-crun.patch -Patch1: fix-capset-issue.patch -Patch2: net-host.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. From ede9b4e0655b5b58a8fbd84190406db8ebf0cae9 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 18 Nov 2020 19:32:39 +0000 Subject: [PATCH 101/125] podman-2:2.2.0-0.1.rc1 autobuilt v2.2.0-rc1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9725f05..446713e 100644 --- a/.gitignore +++ b/.gitignore @@ -821,3 +821,4 @@ /v2.1.1.tar.gz /dnsname-a9c2a10.tar.gz /podman-286d356.tar.gz +/v2.2.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index fdce961..03ba624 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.1 +%define built_tag v2.2.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,12 +55,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.1.1 +Version: 2.2.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 13%{?dist} +Release: 0.1.rc1 Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -689,6 +689,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Nov 18 2020 RH Container Bot - 2:2.2.0-0.1.rc1 +- autobuilt v2.2.0-rc1 + * Wed Nov 18 2020 Lokesh Mandvekar - 2:2.1.1-13 - bump dnsname to v1.1.0, commit a9c2a10 diff --git a/sources b/sources index d4e60b0..8e19127 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 -SHA512 (v2.1.1.tar.gz) = 94096aca1816bb1726b74c71a3c3cd50c4c783110c79dd00e851e6292438ccae7b933b6028177039a7d7d96373afcb783f4bc0449a62c18ae97d73767ee3fa26 +SHA512 (v2.2.0-rc1.tar.gz) = e0145fc38b46da0adb385e514df1de3a759512a2434176c850b1b8820136bf479a8eea0c014513d5b03a2589b2c6084c707d96177ece2c79322558197ace8e56 From e6a9f5d09d2befe63bbc69f75e95c754b142359a Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 18 Nov 2020 13:15:20 -0700 Subject: [PATCH 102/125] 2.2.0-rc1 : fix broken build - add back %{?dist}, accidentally removed in last commit; without this we don't get the '.f33' - package new fish/zsh completion files - package less-new tmpfiles.d/podman.conf Signed-off-by: Ed Santiago (cherry picked from commit 3272f460dbee669201a462f37f480613b84552aa) Signed-off-by: Lokesh Mandvekar --- podman.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 03ba624..dfaa8af 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1 +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -629,10 +629,12 @@ exit 0 %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md %{_bindir}/%{name} -%{_datadir}/bash-completion/completions/* +%{_datadir}/bash-completion/completions/%{name} # By "owning" the site-functions dir, we don't need to Require zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name} +%dir %{_datadir}/fish/vendor_completions.d +%{_datadir}/fish/vendor_completions.d/%{name}.fish %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket @@ -640,6 +642,7 @@ exit 0 %{_unitdir}/%{name}-auto-update.timer %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket + %{_userunitdir}/%{name}-auto-update.service %{_userunitdir}/%{name}-auto-update.timer %if %{with varlink} @@ -673,7 +676,13 @@ exit 0 %files remote %license LICENSE %{_bindir}/%{name}-remote -%{_mandir}/man1/%{name}-remote*.1* +%{_mandir}/man1/%{name}-remote*.* +%{_datadir}/bash-completion/completions/%{name}-remote +%dir %{_datadir}/fish/vendor_completions.d +%{_datadir}/fish/vendor_completions.d/%{name}-remote.fish +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_%{name}-remote +#%%{_datadir}/man/man5/%%{name}-remote*.* %endif %files tests From 68ef1d72cb4f2a4f151c1903ee1e5a956c3f8e2f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 16:07:45 -0500 Subject: [PATCH 103/125] podman-2:2.2.0-0.2.rc1 - require containers-common 1:1.2.0-8 for shortnames Signed-off-by: Lokesh Mandvekar --- podman.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index dfaa8af..b77e839 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -96,11 +96,11 @@ Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel -Requires: containers-common >= 1:1.2.0-2 +Requires: containers-common >= 1:1.2.0-8 Recommends: fuse-overlayfs >= 0.3-8 Recommends: crun >= 0.15-5 %else -Requires: containers-common >= 2:1.2.0-2 +Requires: containers-common >= 2:1.2.0-8 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} @@ -698,6 +698,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.2.rc1 +- require containers-common 1:1.2.0-8 for shortnames + * Wed Nov 18 2020 RH Container Bot - 2:2.2.0-0.1.rc1 - autobuilt v2.2.0-rc1 From c2691743fe4644b94f3e0a3a58cc12c66e351e76 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 16:17:11 -0500 Subject: [PATCH 104/125] podman-2:2.2.0-0.3.rc1 - podman-plugins should require podman Signed-off-by: Lokesh Mandvekar (cherry picked from commit fe0c24ca600abcefba7af022900698ab125039ed) Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index b77e839..2ddb65a 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -446,6 +446,7 @@ connections as well. %package plugins Summary: Plugins for %{name} Requires: dnsmasq +Requires: %{name} = %{epoch}:%{version}-%{release} %description plugins This plugin sets up the use of dnsmasq on a given CNI network so @@ -698,6 +699,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.3.rc1 +- podman-plugins should require podman + * Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.2.rc1 - require containers-common 1:1.2.0-8 for shortnames From 5d8573d1270a19f1101a54170031908618ae79aa Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 Nov 2020 16:18:55 -0500 Subject: [PATCH 105/125] better changelog message for latest entry Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 2ddb65a..bd0fa1c 100644 --- a/podman.spec +++ b/podman.spec @@ -700,7 +700,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog * Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.3.rc1 -- podman-plugins should require podman +- podman-plugins should require podman otherwise it can cause funny upgrade +scenarios, where if "podman" upgrade fails, "podman-plugins" could still +succeed * Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.2.rc1 - require containers-common 1:1.2.0-8 for shortnames From 63f15c58c257b8c382f276bba5d823d4651a8f41 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 19 Nov 2020 15:21:18 -0500 Subject: [PATCH 106/125] use %define instead of %global for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index bd0fa1c..1c11227 100644 --- a/podman.spec +++ b/podman.spec @@ -38,10 +38,10 @@ %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 a9c2a10a3a24e082996cf2d9edb1cee295651413 -%global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) +%define import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} +%define git_plugins https://%{import_path_plugins} +%define commit_plugins a9c2a10a3a24e082996cf2d9edb1cee295651413 +%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) From 25ecad4ee0cff0354fc1a4f71ca0633d87f93cbd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 19 Nov 2020 15:28:25 -0500 Subject: [PATCH 107/125] use full url for Source1 Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 1c11227..a59d6e0 100644 --- a/podman.spec +++ b/podman.spec @@ -69,7 +69,7 @@ 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/%{commit_plugins}/dnsname-%{shortcommit_plugins}.tar.gz +Source1: https://github.com/containers/dnsname/archive/a9c2a10a3a24e082996cf2d9edb1cee295651413/dnsname-a9c2a10.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. From 5432758b144fd51aa9ea904c446516499aeac0ae Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 19 Nov 2020 16:00:10 -0500 Subject: [PATCH 108/125] hardcode import_path Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index a59d6e0..a7f469b 100644 --- a/podman.spec +++ b/podman.spec @@ -32,7 +32,7 @@ %define provider_tld com %define project containers %define repo %{name} -# https://github.com/containers/libpod +# https://github.com/containers/podman %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} @@ -475,7 +475,7 @@ export GO111MODULE=off pushd dnsname-%{commit_plugins} mkdir _build pushd _build -mkdir -p src/%{provider}.%{provider_tld}/%{project} +mkdir -p src/github.com/containers ln -s ../../../../ src/%{import_path_plugins} popd ln -s vendor src @@ -486,7 +486,7 @@ popd export GOPATH=$(pwd)/_build:$(pwd) mkdir _build pushd _build -mkdir -p src/%{provider}.%{provider_tld}/%{project} +mkdir -p src/github.com/containers ln -s ../../../../ src/%{import_path} popd ln -s vendor src From a16b12bb087f6daf089e89aa1e1e3f47cef5915b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 20 Nov 2020 11:16:51 -0500 Subject: [PATCH 109/125] use %global instead of %define for podman-plugins Signed-off-by: Lokesh Mandvekar --- podman.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/podman.spec b/podman.spec index a7f469b..82bb5de 100644 --- a/podman.spec +++ b/podman.spec @@ -36,12 +36,12 @@ %define import_path %{provider}.%{provider_tld}/%{project}/%{repo} %define git0 https://%{import_path} -%define repo_plugins dnsname +%global repo_plugins dnsname # https://github.com/containers/libpod -%define import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} -%define git_plugins https://%{import_path_plugins} -%define commit_plugins a9c2a10a3a24e082996cf2d9edb1cee295651413 -%define shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) +%global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} +%global git_plugins https://%{import_path_plugins} +%global commit_plugins a9c2a10a3a24e082996cf2d9edb1cee295651413 +%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) @@ -475,7 +475,7 @@ export GO111MODULE=off pushd dnsname-%{commit_plugins} mkdir _build pushd _build -mkdir -p src/github.com/containers +mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path_plugins} popd ln -s vendor src @@ -486,7 +486,7 @@ popd export GOPATH=$(pwd)/_build:$(pwd) mkdir _build pushd _build -mkdir -p src/github.com/containers +mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src From 5bac95eb1e42fb0d32f901d8637b742fd813ffc8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 20 Nov 2020 11:18:12 -0500 Subject: [PATCH 110/125] podman-2:2.2.0-0.4.rc1 - use latest containers-common 1.2.0-9 Signed-off-by: Lokesh Mandvekar --- podman.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 82bb5de..8ace87b 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.3.rc1%{?dist} +Release: 0.4.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -96,11 +96,11 @@ Obsoletes: oci-systemd-hook <= 0.2.0-3 %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel -Requires: containers-common >= 1:1.2.0-8 +Requires: containers-common >= 1:1.2.0-9 Recommends: fuse-overlayfs >= 0.3-8 Recommends: crun >= 0.15-5 %else -Requires: containers-common >= 2:1.2.0-8 +Requires: containers-common >= 2:1.2.0-9 %endif %if 0%{?fedora} || 0%{?centos} >= 8 Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} @@ -699,6 +699,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Fri Nov 20 2020 Lokesh Mandvekar - 2:2.2.0-0.4.rc1 +- use latest containers-common 1.2.0-9 + * Wed Nov 18 2020 Lokesh Mandvekar - 2:2.2.0-0.3.rc1 - podman-plugins should require podman otherwise it can cause funny upgrade scenarios, where if "podman" upgrade fails, "podman-plugins" could still From b8c95c5e84feea49ec31753bbf58f96b918e8fd8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 20 Nov 2020 13:45:57 -0500 Subject: [PATCH 111/125] handle centos7 Signed-off-by: Lokesh Mandvekar --- podman.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 8ace87b..3fbc4ab 100644 --- a/podman.spec +++ b/podman.spec @@ -547,9 +547,13 @@ done # do not install remote manpages on centos7 %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 +rm -f %{buildroot}%{_mandir}/man1/docker-remote.1 +rm -f %{buildroot}%{_mandir}/man1/%{name}-remote.1 +rm -f %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5 +rm -f %{buildroot}%{_datadir}/bash-completion/completions/%{name}-remote +rm -f %{buildroot}%{_datadir}/zsh/site-functions/_%{name}-remote +rm -f %{buildroot}%{_datadir}/fish/vendor_completions/%{name}-remote.fish + %endif # source codes for building projects @@ -643,7 +647,6 @@ exit 0 %{_unitdir}/%{name}-auto-update.timer %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}.socket - %{_userunitdir}/%{name}-auto-update.service %{_userunitdir}/%{name}-auto-update.timer %if %{with varlink} From 6795c07998e33070c3365ba23a58057adb4042a7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 23 Nov 2020 13:41:19 -0500 Subject: [PATCH 112/125] podman-2:2.2.0-0.5.rc1 - handle centos7 Signed-off-by: Lokesh Mandvekar --- podman.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 3fbc4ab..a9909e8 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.4.rc1%{?dist} +Release: 0.5.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -552,8 +552,8 @@ rm -f %{buildroot}%{_mandir}/man1/%{name}-remote.1 rm -f %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5 rm -f %{buildroot}%{_datadir}/bash-completion/completions/%{name}-remote rm -f %{buildroot}%{_datadir}/zsh/site-functions/_%{name}-remote -rm -f %{buildroot}%{_datadir}/fish/vendor_completions/%{name}-remote.fish - +rm -f %{buildroot}%{_datadir}/fish/vendor_completions.d/%{name}-remote.fish +rm -f %{buildroot}%{_tmpfilesdir}/%{name}.conf %endif # source codes for building projects @@ -682,11 +682,12 @@ exit 0 %{_bindir}/%{name}-remote %{_mandir}/man1/%{name}-remote*.* %{_datadir}/bash-completion/completions/%{name}-remote +%dir %{_datadir}/fish %dir %{_datadir}/fish/vendor_completions.d %{_datadir}/fish/vendor_completions.d/%{name}-remote.fish +%dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name}-remote -#%%{_datadir}/man/man5/%%{name}-remote*.* %endif %files tests @@ -702,6 +703,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Nov 23 2020 Lokesh Mandvekar - 2:2.2.0-0.5.rc1 +- handle centos7 + * Fri Nov 20 2020 Lokesh Mandvekar - 2:2.2.0-0.4.rc1 - use latest containers-common 1.2.0-9 From 132846cd081b4f6ff084632d51c241fcc77295b1 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 24 Nov 2020 12:33:27 +0000 Subject: [PATCH 113/125] podman-2:2.2.0-0.6.rc2 autobuilt v2.2.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 446713e..d67ca62 100644 --- a/.gitignore +++ b/.gitignore @@ -822,3 +822,4 @@ /dnsname-a9c2a10.tar.gz /podman-286d356.tar.gz /v2.2.0-rc1.tar.gz +/v2.2.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index a9909e8..aad1081 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.2.0-rc1 +%define built_tag v2.2.0-rc2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -60,7 +60,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.5.rc1%{?dist} +Release: 0.6.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -703,6 +703,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Nov 24 2020 RH Container Bot - 2:2.2.0-0.6.rc2 +- autobuilt v2.2.0-rc2 + * Mon Nov 23 2020 Lokesh Mandvekar - 2:2.2.0-0.5.rc1 - handle centos7 diff --git a/sources b/sources index 8e19127..6c9d34b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 -SHA512 (v2.2.0-rc1.tar.gz) = e0145fc38b46da0adb385e514df1de3a759512a2434176c850b1b8820136bf479a8eea0c014513d5b03a2589b2c6084c707d96177ece2c79322558197ace8e56 +SHA512 (v2.2.0-rc2.tar.gz) = 2478fcb41226690e61bc47643773c3027133ab44865a395df811e7b0977bcb33704f4aa41bfe2aba0636fb63fa0900aa15e3b946b85b542715c121a829220484 From 540063311a1f83408e0e309b8dc948993c346b92 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 1 Dec 2020 02:33:35 +0000 Subject: [PATCH 114/125] podman-2:2.2.0-1 autobuilt v2.2.0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d67ca62..6ef8763 100644 --- a/.gitignore +++ b/.gitignore @@ -823,3 +823,4 @@ /podman-286d356.tar.gz /v2.2.0-rc1.tar.gz /v2.2.0-rc2.tar.gz +/v2.2.0.tar.gz diff --git a/podman.spec b/podman.spec index aad1081..2c627e2 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.2.0-rc2 +%define built_tag v2.2.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -60,7 +60,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.6.rc2%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -703,6 +703,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Dec 1 2020 RH Container Bot - 2:2.2.0-1 +- autobuilt v2.2.0 + * Tue Nov 24 2020 RH Container Bot - 2:2.2.0-0.6.rc2 - autobuilt v2.2.0-rc2 diff --git a/sources b/sources index 6c9d34b..ecc85f0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 -SHA512 (v2.2.0-rc2.tar.gz) = 2478fcb41226690e61bc47643773c3027133ab44865a395df811e7b0977bcb33704f4aa41bfe2aba0636fb63fa0900aa15e3b946b85b542715c121a829220484 +SHA512 (v2.2.0.tar.gz) = 8c8a8ec73c8d454450d83f1f0429b3e09e2a6a331c6ee2ce1733ebc30850a95a265669fbebf02b15508c4cbf036a03f849dcf1918875424f139f2706ee0c1b8d From 4690ee0136c8f7d8fae60ec55d65a37b064bb10c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Dec 2020 12:25:35 -0500 Subject: [PATCH 115/125] podman-2:2.2.0-2 - use podman-plugins / dnsname upstream v1.1.1 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 6ef8763..2fa212e 100644 --- a/.gitignore +++ b/.gitignore @@ -824,3 +824,4 @@ /v2.2.0-rc1.tar.gz /v2.2.0-rc2.tar.gz /v2.2.0.tar.gz +/dnsname-c654c95.tar.gz diff --git a/podman.spec b/podman.spec index 2c627e2..66e90ae 100644 --- a/podman.spec +++ b/podman.spec @@ -40,7 +40,7 @@ # 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 a9c2a10a3a24e082996cf2d9edb1cee295651413 +%global commit_plugins c654c95366ac5f309ca3e5727c9b858864247328 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # Used for comparing with latest upstream tag @@ -60,7 +60,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -69,7 +69,7 @@ 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/a9c2a10a3a24e082996cf2d9edb1cee295651413/dnsname-a9c2a10.tar.gz +Source1: https://github.com/containers/dnsname/archive/c654c95366ac5f309ca3e5727c9b858864247328/dnsname-c654c95.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. @@ -703,6 +703,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Dec 1 2020 Lokesh Mandvekar - 2:2.2.0-2 +- use podman-plugins / dnsname upstream v1.1.1 + * Tue Dec 1 2020 RH Container Bot - 2:2.2.0-1 - autobuilt v2.2.0 diff --git a/sources b/sources index ecc85f0..2da6b4a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 +SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 SHA512 (v2.2.0.tar.gz) = 8c8a8ec73c8d454450d83f1f0429b3e09e2a6a331c6ee2ce1733ebc30850a95a265669fbebf02b15508c4cbf036a03f849dcf1918875424f139f2706ee0c1b8d From eab33a46b9fb5cee0fc1232ab327d6336bc0ad82 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 2 Dec 2020 13:40:08 -0500 Subject: [PATCH 116/125] handle btrfs 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 66e90ae..9473adf 100644 --- a/podman.spec +++ b/podman.spec @@ -501,7 +501,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+=" exclude_graphdriver_btrfs btrfs_noversion containers_image_ostree_stub" %endif # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here? From aa5f4c2e24fd8729baa16b7162480766981332a7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 10:08:03 -0500 Subject: [PATCH 117/125] Harden cgo based golang binaries - adjust CGO_CFLAGS to make both koji and checksec happy Reported-by: Wade Mealing Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/podman.spec b/podman.spec index 9473adf..ba016ce 100644 --- a/podman.spec +++ b/podman.spec @@ -470,6 +470,12 @@ tar zxf %{SOURCE1} %build export GO111MODULE=off +export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +%ifarch x86_64 +export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection" +%endif +# These extra flags present in %%{optflags} have been skipped for now as they break the build +#export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" # build plugins first cause we don't wanna use podman's buildtags pushd dnsname-%{commit_plugins} From c3a1c76c950305e518b8bea0d8e8a17701025747 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 10:09:20 -0500 Subject: [PATCH 118/125] podman-2:2.2.0-3 - harden cgo based golang binaries Reported-by: Wade Mealing Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index ba016ce..82ef65c 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -709,6 +709,10 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Dec 7 2020 Lokesh Mandvekar - 2:2.2.0-3 +- harden cgo based golang binaries +- Reported-by: Wade Mealing + * Tue Dec 1 2020 Lokesh Mandvekar - 2:2.2.0-2 - use podman-plugins / dnsname upstream v1.1.1 From 7a29eeae7ce0ee139eb01315cb1a3da22cad5fa9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 10:31:29 -0500 Subject: [PATCH 119/125] -fcf-protection cflag NOT for centos <= 7 Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 82ef65c..7435f07 100644 --- a/podman.spec +++ b/podman.spec @@ -472,7 +472,10 @@ tar zxf %{SOURCE1} export GO111MODULE=off export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" %ifarch x86_64 -export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection" +export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic" +%if 0%{?fedora} || 0%{?centos} >= 8 +export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection" +%endif %endif # These extra flags present in %%{optflags} have been skipped for now as they break the build #export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" From d909aed18cd11798a2d3aa6f75ab1b25a7047757 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 7 Dec 2020 10:32:33 -0500 Subject: [PATCH 120/125] podman-2:2.2.0-4 - bump release tag to make centos OBS happy Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 7435f07..a0c82fc 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.2.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -712,6 +712,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Dec 7 2020 Lokesh Mandvekar - 2:2.2.0-4 +- bump release tag to make centos OBS happy + * Mon Dec 7 2020 Lokesh Mandvekar - 2:2.2.0-3 - harden cgo based golang binaries - Reported-by: Wade Mealing From 2a7686f0acbda93105ad5d71ceee1cac4fbd2edc Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 8 Dec 2020 14:33:13 +0000 Subject: [PATCH 121/125] podman-2:2.2.1-1 autobuilt v2.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 2fa212e..ccf8974 100644 --- a/.gitignore +++ b/.gitignore @@ -825,3 +825,4 @@ /v2.2.0-rc2.tar.gz /v2.2.0.tar.gz /dnsname-c654c95.tar.gz +/v2.2.1.tar.gz diff --git a/podman.spec b/podman.spec index a0c82fc..6bd6e96 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.2.0 +%define built_tag v2.2.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,12 +55,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.2.0 +Version: 2.2.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 4%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -712,6 +712,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Dec 8 2020 RH Container Bot - 2:2.2.1-1 +- autobuilt v2.2.1 + * Mon Dec 7 2020 Lokesh Mandvekar - 2:2.2.0-4 - bump release tag to make centos OBS happy diff --git a/sources b/sources index 2da6b4a..01ae7d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v2.2.0.tar.gz) = 8c8a8ec73c8d454450d83f1f0429b3e09e2a6a331c6ee2ce1733ebc30850a95a265669fbebf02b15508c4cbf036a03f849dcf1918875424f139f2706ee0c1b8d +SHA512 (v2.2.1.tar.gz) = 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367 From 90db42a56cf4c0c944229459a71a7131706f95cf Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 11 Jan 2021 14:37:44 -0500 Subject: [PATCH 122/125] BR: git-core instead of git Signed-off-by: Lokesh Mandvekar (cherry picked from commit fb46e70f3556f2b7999f881ed6fa8610c0e96ce8) --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 6bd6e96..d0ec2c2 100644 --- a/podman.spec +++ b/podman.spec @@ -77,7 +77,7 @@ BuildRequires: golang BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static -BuildRequires: git +BuildRequires: git-core BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel From 8127fac7be9569c6b1078cace5517a65fb483889 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 18 Jan 2021 16:03:17 +0000 Subject: [PATCH 123/125] podman-2:3.0.0-0.1.rc1 autobuilt v3.0.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 ccf8974..60ed953 100644 --- a/.gitignore +++ b/.gitignore @@ -826,3 +826,4 @@ /v2.2.0.tar.gz /dnsname-c654c95.tar.gz /v2.2.1.tar.gz +/v3.0.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index d0ec2c2..bffe1d3 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.2.1 +%define built_tag v3.0.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,12 +55,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 2.2.1 +Version: 3.0.0 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 0.1.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -712,6 +712,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Jan 18 2021 RH Container Bot - 2:3.0.0-0.1.rc1 +- autobuilt v3.0.0-rc1 + * Tue Dec 8 2020 RH Container Bot - 2:2.2.1-1 - autobuilt v2.2.1 diff --git a/sources b/sources index 01ae7d3..dccb33c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v2.2.1.tar.gz) = 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367 +SHA512 (v3.0.0-rc1.tar.gz) = 118c7b9fd3ca05d32cfbc5e6a1ba9e62a62d4c55201eec580380b7f4e19162c09fdefc9950fd5d04090e16c0393507c261d7c83a3e89e9ffafc72bcf234f0c28 From 9829f9c48e8e77ae7b3126e3cecabdf5d6317b4e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 18 Jan 2021 11:28:06 -0500 Subject: [PATCH 124/125] Revert "podman-2:3.0.0-0.1.rc1" do not bump to 3.0 on f32 This reverts commit 8127fac7be9569c6b1078cace5517a65fb483889. --- .gitignore | 1 - podman.spec | 9 +++------ sources | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 60ed953..ccf8974 100644 --- a/.gitignore +++ b/.gitignore @@ -826,4 +826,3 @@ /v2.2.0.tar.gz /dnsname-c654c95.tar.gz /v2.2.1.tar.gz -/v3.0.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index bffe1d3..d0ec2c2 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 v3.0.0-rc1 +%define built_tag v2.2.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -55,12 +55,12 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 3.0.0 +Version: 2.2.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.rc1%{?dist} +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -712,9 +712,6 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog -* Mon Jan 18 2021 RH Container Bot - 2:3.0.0-0.1.rc1 -- autobuilt v3.0.0-rc1 - * Tue Dec 8 2020 RH Container Bot - 2:2.2.1-1 - autobuilt v2.2.1 diff --git a/sources b/sources index dccb33c..01ae7d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 -SHA512 (v3.0.0-rc1.tar.gz) = 118c7b9fd3ca05d32cfbc5e6a1ba9e62a62d4c55201eec580380b7f4e19162c09fdefc9950fd5d04090e16c0393507c261d7c83a3e89e9ffafc72bcf234f0c28 +SHA512 (v2.2.1.tar.gz) = 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367 From 2a1b3a36380be4cba0b961a3db620f0eac876f63 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 18 Jan 2021 11:39:21 -0500 Subject: [PATCH 125/125] bump release for centos7 Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index d0ec2c2..212d6b6 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ Version: 2.2.1 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -712,6 +712,9 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Mon Jan 18 2021 Lokesh Mandvekar - 2:2.2.1-2 +- bump release + * Tue Dec 8 2020 RH Container Bot - 2:2.2.1-1 - autobuilt v2.2.1