rpms/podman
7
0
Fork 0
Code Issues Pull Requests Releases Activity

podman-3:3.3.0-0.26.rc1

Browse Source 
- Bump to v3.3.0-rc1

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2021-08-03 14:12:46 -04:00
parent 2b8650ef34
commit 9ea57922f7
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1775,3 +1775,4 @@
/podman-fc34f35.tar.gz /podman-fc34f35.tar.gz
/podman-599b7d7.tar.gz /podman-599b7d7.tar.gz
/podman-d32e566.tar.gz /podman-d32e566.tar.gz
/v3.3.0-rc1.tar.gz

22
podman.spec
View File

@ -3,7 +3,6 @@
%global with_check 0 %global with_check 0
%global with_unit_test 0 %global with_unit_test 0
# disable debuginfo temporarily to get a successful build past gating issues
%global with_debug 1 %global with_debug 1
%if 0%{?with_debug} %if 0%{?with_debug}
@ -27,8 +26,8 @@
# To build a random user's fork/commit, comment out above line, # To build a random user's fork/commit, comment out above line,
# uncomment below line and replace the placeholders and commit0 below with the right info # uncomment below line and replace the placeholders and commit0 below with the right info
#%%global git0 https://github.com/$GITHUB_USER/$GITHUB_USER_REPO #%%global git0 https://github.com/$GITHUB_USER/$GITHUB_USER_REPO
%global commit0 d32e56658aec5246c3a5dc4d2156918d4f3031a7 #%%global commit0 d32e56658aec5246c3a5dc4d2156918d4f3031a7
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
# dnsname # dnsname
%global repo_plugins dnsname %global repo_plugins dnsname
@ -46,7 +45,7 @@
%global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396 %global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396
%global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
%define built_tag v3.2.3 %define built_tag v3.3.0-rc1
%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define built_tag_strip %(b=%{built_tag}; echo ${b:1})
Name: podman Name: podman
@ -60,11 +59,11 @@ Version: 3.3.0
# N.foo if released, 0.N.foo if unreleased # N.foo if released, 0.N.foo if unreleased
# Rawhide almost always ships unreleased builds, # Rawhide almost always ships unreleased builds,
# so release tag should be of the form 0.N.foo # so release tag should be of the form 0.N.foo
Release: 0.25.dev.git%{shortcommit0}%{?dist} Release: 0.26.rc1%{?dist}
Summary: Manage Pods, Containers and Container Images Summary: Manage Pods, Containers and Container Images
License: ASL 2.0 License: ASL 2.0
URL: https://%{name}.io/ URL: https://%{name}.io/
Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Source0: %{git0}/archive/%{built_tag}.tar.gz
Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz
Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz
Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
@ -399,9 +398,7 @@ is removed from the network, it will remove the entry from the hosts
file. Each CNI network will have its own dnsmasq instance. file. Each CNI network will have its own dnsmasq instance.
%prep %prep
%autosetup -Sgit -n %{name}-%{commit0} %autosetup -Sgit -n %{name}-%{built_tag_strip}
rm -f docs/source/markdown/containers-mounts.conf.5.md
sed -i 's/id128StringMax := C.ulong/id128StringMax := C.size_t/' vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go
# untar dnsname # untar dnsname
tar zxf %{SOURCE1} tar zxf %{SOURCE1}
@ -569,10 +566,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
install -d -p %{buildroot}/%{_datadir}/%{name}/test/system install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
%triggerpostun -- %{name} < 1.1
%{_bindir}/%{name} system renumber
exit 0
#define license tag if not already defined #define license tag if not already defined
%{!?_licensedir:%global license %doc} %{!?_licensedir:%global license %doc}
@ -642,6 +635,9 @@ exit 0
# rhcontainerbot account currently managed by lsm5 # rhcontainerbot account currently managed by lsm5
%changelog %changelog
* Tue Aug 03 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 3:3.3.0-0.26.rc1
- Bump to v3.3.0-rc1
* Mon Aug 02 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 3:3.3.0-0.25.dev.gitd32e566 * Mon Aug 02 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 3:3.3.0-0.25.dev.gitd32e566
- Resolves: #1983596, #1987739 - Security fix for CVE-2021-34558 - Resolves: #1983596, #1987739 - Security fix for CVE-2021-34558

2
sources
View File

@ -1,3 +1,3 @@
SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0
SHA512 (podman-d32e566.tar.gz) = fb272da87dc8e7fafaea3ca73ab0aa50e0a676849e4e7f9bca2adf6f79dfb06086298796a45ab28e942dfc338cee2b3a5a2710fc278d61e0a01a9c3a3b8d58cc
SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91 SHA512 (podman-machine-cni-afab2d8.tar.gz) = 121f33e212daebd3c2c10d24ef2a5dae28d1df5b758209d5590d600d7cd3cfc6af5955371f03e2cb3b9ef0f6e9a1a345f50925abc8ccc2147bc4c925ac670d91
SHA512 (v3.3.0-rc1.tar.gz) = 3ceda8c658856f1e53e509e0b895e0fbc8a49d0afbcafffd70246615c69e1fba02e87cee27153a6b45f0acd987b7a8d239018cb1a88c063d91b310a0f83ae96e