bump to v4.0.1, add iptables modules for fedora >= 36

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2022-02-25 11:50:25 -05:00
parent fc31a699bb
commit bbc4d5af60
4 changed files with 9 additions and 49 deletions

1
.gitignore vendored
View File

@ -1798,3 +1798,4 @@
/v4.0.0-rc4.tar.gz
/v4.0.0-rc5.tar.gz
/v4.0.0.tar.gz
/v4.0.1.tar.gz

View File

@ -1,46 +0,0 @@
From 49f8da7271ed9b9256a182aca004700047e271ed Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Wed, 16 Feb 2022 14:10:39 -0500
Subject: [PATCH] Bump to v4.0.0
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
test/apiv2/01-basic.at | 2 +-
version/version.go | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/apiv2/01-basic.at b/test/apiv2/01-basic.at
index 06db6278578..e4348a9a70e 100644
--- a/test/apiv2/01-basic.at
+++ b/test/apiv2/01-basic.at
@@ -19,7 +19,7 @@ for i in /version version; do
t GET $i 200 \
.Components[0].Name="Podman Engine" \
.Components[0].Details.APIVersion~4[0-9.-]\\+ \
- .Components[0].Details.MinAPIVersion=3.3.1 \
+ .Components[0].Details.MinAPIVersion=4.0.0 \
.Components[0].Details.Os=linux \
.ApiVersion=1.40 \
.MinAPIVersion=1.24 \
diff --git a/version/version.go b/version/version.go
index da74029677a..02d110198e3 100644
--- a/version/version.go
+++ b/version/version.go
@@ -27,7 +27,7 @@ const (
// NOTE: remember to bump the version at the top
// of the top-level README.md file when this is
// bumped.
-var Version = semver.MustParse("4.0.0-dev")
+var Version = semver.MustParse("4.0.0")
// See https://docs.docker.com/engine/api/v1.40/
// libpod compat handlers are expected to honor docker API versions
@@ -38,7 +38,7 @@ var Version = semver.MustParse("4.0.0-dev")
var APIVersion = map[Tree]map[Level]semver.Version{
Libpod: {
CurrentAPI: Version,
- MinimalAPI: semver.MustParse("3.3.1"),
+ MinimalAPI: semver.MustParse("4.0.0"),
},
Compat: {
CurrentAPI: semver.MustParse("1.40.0"),

View File

@ -31,7 +31,7 @@
%global commit_gvproxy 4ee84d66bd86668f011733d8873989b5862bcd07
%global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7})
%global built_tag v4.0.0
%global built_tag v4.0.1
%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
@ -46,7 +46,6 @@ ExclusiveArch: %{golang_arches}
Source0: %{git0}/archive/%{built_tag}.tar.gz
Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz
Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{shortcommit_gvproxy}.tar.gz
Patch0: fix-version.patch
Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
BuildRequires: btrfs-progs-devel
BuildRequires: gcc
@ -306,6 +305,9 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build
install.docker \
install.docker-docs \
install.remote \
%if 0%{?fedora} >= 36
install.modules-load
%endif
mv pkg/hooks/README.md pkg/hooks/README-hooks.md
@ -348,6 +350,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
%{_unitdir}/%{name}*
%{_userunitdir}/%{name}*
%{_tmpfilesdir}/%{name}.conf
%if 0%{?fedora} >= 36
%{_modulesloaddir}/%{name}-iptables.conf
%endif
%files docker
%{_bindir}/docker

View File

@ -1,3 +1,3 @@
SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
SHA512 (gvisor-tap-vsock-4ee84d6.tar.gz) = 6b0e97f25f0c9ec0f018edcf9c1801daaeacc4d97d05cc2b453467e071c50693bb44d483bac34e64e0c9de71e78e47810a7c46d028553adee9fd6f593df8eb1a
SHA512 (v4.0.0.tar.gz) = 2e25f303d143bc4e265f0f8998ea1c4af3d6da8b35452cf6b27a4eb204805a9b5f75f4b6430921b42c80b76a6b5c9cf35a732c265727a11261fca25cc96f57e7
SHA512 (v4.0.1.tar.gz) = b333c91f1c04ef084df05dc6f31717e89078a3e5c6b620c403c29e4a3c9db30bbd15537334a645206d85bfb9679b1f4748c46936d9ca21c1f77066e8cf0f25c8