From 180cc67d43b18b1a7ea785736a13b7f189e6550c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sep 30 2020 19:41:57 +0000 Subject: podman-2:2.1.1-3 - fix crun gating test issue - bump release tag to preserve upgrade path (cherry picked from commit 5d1014bb11fdcd325e42b6059dd72357e7588e96) Signed-off-by: Lokesh Mandvekar --- diff --git a/0001-fix-build-with-varlink.patch b/0001-fix-build-with-varlink.patch deleted file mode 100644 index 41232d2..0000000 --- a/0001-fix-build-with-varlink.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8030fd390a1940e52191013803564641778cd54c Mon Sep 17 00:00:00 2001 -From: Lokesh Mandvekar -Date: Tue, 22 Sep 2020 15:01:01 -0400 -Subject: [PATCH] fix build with varlink - -Signed-off-by: Lokesh Mandvekar ---- - pkg/varlinkapi/system.go | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go -index 9e4db2611..e5c766a6d 100644 ---- a/pkg/varlinkapi/system.go -+++ b/pkg/varlinkapi/system.go -@@ -7,6 +7,7 @@ import ( - "fmt" - "os" - goruntime "runtime" -+ "strconv" - "time" - - "github.com/containers/image/v5/pkg/sysregistriesv2" -@@ -22,13 +23,18 @@ func (i *VarlinkAPI) GetVersion(call iopodman.VarlinkCall) error { - return err - } - -+ int64APIVersion, err := strconv.ParseInt(versionInfo.APIVersion, 10, 64) -+ if err != nil { -+ return err -+ } -+ - return call.ReplyGetVersion( - versionInfo.Version, - versionInfo.GoVersion, - versionInfo.GitCommit, - time.Unix(versionInfo.Built, 0).Format(time.RFC3339), - versionInfo.OsArch, -- versionInfo.APIVersion, -+ int64APIVersion, - ) - } - --- -2.28.0 - diff --git a/gating-test-crun.patch b/gating-test-crun.patch new file mode 100644 index 0000000..18f7930 --- /dev/null +++ b/gating-test-crun.patch @@ -0,0 +1,33 @@ +From f732e2edcb5a1b925aa2bea65bfe1162edec032e Mon Sep 17 00:00:00 2001 +From: Ed Santiago +Date: Tue, 29 Sep 2020 06:20:21 -0600 +Subject: [PATCH] Gating-test fix: deal with new crun error msg + +crun changed an error message: + + https://github.com/containers/crun/pull/439 + +It's a good change, absolutely the right thing to do, but +it broke gating tests. Fix tests so they handle both old +and new format. + +Fixes: #7814 + +Signed-off-by: Ed Santiago +--- + test/system/030-run.bats | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/system/030-run.bats b/test/system/030-run.bats +index 4a286d3ae1..b3599cc173 100644 +--- a/test/system/030-run.bats ++++ b/test/system/030-run.bats +@@ -14,7 +14,7 @@ load helpers + # ...but check the configured runtime engine, and switch to crun as needed + run_podman info --format '{{ .Host.OCIRuntime.Path }}' + if expr "$output" : ".*/crun"; then +- err_no_such_cmd="Error: executable file not found in \$PATH: No such file or directory: OCI runtime command not found error" ++ err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI runtime command not found error" + err_no_exec_dir="Error: open executable: Operation not permitted: OCI runtime permission denied error" + fi + diff --git a/podman.spec b/podman.spec index 562519d..29da620 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,7 @@ Epoch: 0 Version: 2.1.1 # RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER # N.foo if released, 0.N.foo if unreleased -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -67,8 +67,8 @@ Source0: %{download_url} # uncomment below Source0, and replace the placeholders with the right info # Also, adjust %%prep section as necessary. #Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz -Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz -Patch0: 0001-fix-build-with-varlink.patch +Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz +Patch0: gating-test-crun.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -680,9 +680,26 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-3 +- fix crun gating test issue +- bump release tag to preserve upgrade path + * Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-2 - Require: crun >= 0.15-4 +* Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-6 +- fedora Requires: crun-0.15-4 + +* Wed Sep 30 2020 Lokesh Mandvekar - 2:2.1.1-5 +- fedora requires crun >= 0.15-3 + +* Sun Sep 27 2020 Lokesh Mandvekar - 2:2.1.1-4 +- correct bad date in changelog + +* Sun Sep 27 2020 Lokesh Mandvekar - 2:2.1.1-3 +- adjust deps for centos7 +>>>>>>> 5d1014b... podman-2:2.1.1-7 + * Fri Sep 25 2020 RH Container Bot - 2:2.1.1-1 - autobuilt v2.1.1