diff --git a/12118.patch b/12118.patch index ec5940d..ca47d74 100644 --- a/12118.patch +++ b/12118.patch @@ -14,9 +14,10 @@ Signed-off-by: Hironori Shiina test/system/130-kill.bats | 15 ++++++++++++++- 2 files changed, 37 insertions(+), 6 deletions(-) -diff -up containers-podman-8de9950/test/system/035-logs.bats.orig containers-podman-8de9950/test/system/035-logs.bats ---- containers-podman-8de9950/test/system/035-logs.bats.orig 2021-11-08 15:24:57.000000000 +0100 -+++ containers-podman-8de9950/test/system/035-logs.bats 2021-11-09 10:09:23.610813091 +0100 +diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats +index 44b66676eeb..7fb3e62e459 100644 +--- a/test/system/035-logs.bats ++++ b/test/system/035-logs.bats @@ -30,6 +30,17 @@ load helpers run_podman rm $cid } @@ -58,24 +59,6 @@ diff -up containers-podman-8de9950/test/system/035-logs.bats.orig containers-pod is "$output" \ "${cid[0]} a$etc ${cid[1]} b$etc -@@ -114,7 +127,7 @@ $s_after" - - run_podman logs --since $after test - is "$output" "$s_after" -- run_podman rm -f test -+ run_podman rm -t 1 -f test - } - - @test "podman logs - since k8s-file" { -@@ -167,7 +180,7 @@ $s_after" - - run_podman logs --until $after test - is "$output" "$s_both" "podman logs --until after" -- run_podman rm -f test -+ run_podman rm -t 0 -f test - } - - @test "podman logs - until k8s-file" { @@ -187,15 +200,20 @@ function _log_test_follow() { contentA=$(random_string) contentB=$(random_string) @@ -100,9 +83,10 @@ diff -up containers-podman-8de9950/test/system/035-logs.bats.orig containers-pod } @test "podman logs - --follow k8s-file" { -diff -up containers-podman-8de9950/test/system/130-kill.bats.orig containers-podman-8de9950/test/system/130-kill.bats ---- containers-podman-8de9950/test/system/130-kill.bats.orig 2021-11-08 15:24:57.000000000 +0100 -+++ containers-podman-8de9950/test/system/130-kill.bats 2021-11-09 10:09:23.611813102 +0100 +diff --git a/test/system/130-kill.bats b/test/system/130-kill.bats +index d85f0a6a998..1ff3a7b6199 100644 +--- a/test/system/130-kill.bats ++++ b/test/system/130-kill.bats @@ -6,9 +6,22 @@ load helpers diff --git a/podman.spec b/podman.spec index 92f6fd9..7b45fd6 100644 --- a/podman.spec +++ b/podman.spec @@ -17,7 +17,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global import_path github.com/containers/podman %global branch v3.4 -%global commit0 8de9950038b5a0582bfecfbe3a11427e6cfbfcfe +%global commit0 fd010adfdcb6f578623b77281f2ae012bcd1ac85 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 %global dnsnamever 1.3.0 @@ -29,7 +29,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 1 Name: podman Version: 3.4.2 -Release: 0.7%{?dist} +Release: 0.8%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -402,6 +402,11 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Fri Nov 12 2021 Jindrich Novy - 1:3.4.2-0.8 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/fd010ad) +- Related: #2000051 + * Thu Nov 11 2021 Jindrich Novy - 1:3.4.2-0.7 - backport https://github.com/containers/podman/pull/12118 to 3.4 in attempt to fix gating tests diff --git a/sources b/sources index c06f0fa..9dbc455 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ SHA512 (v0.1.0.tar.gz) = 72d27e2a7c20f956a177bcda96508c1ec7b8ac0a512f9ab1a045bcf SHA512 (v1.3.0.tar.gz) = df48c4715582f098c41d45533163632ac1953621ce91fc78e88cc84e61d8a0a537e6da5aabab2be18cbddccd8e4c867670ae1fbc5ff7b6473bf7f4b464cb6ee2 SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 SHA512 (v0.1.7.tar.gz) = 7d3174c60e1c8bd1f4b95b7751ccbe01cac63265060f18914b53311f68f7b4c63c693604f348ccfac5db4a96939169f835fbbbd614803b18062053d94f7dca67 -SHA512 (v3.4-8de9950.tar.gz) = 52db38498948eb0f780805986d799c675fdfa6bc076438ebe79f54395fc0fa9b4af340503fca6327a597ba258d646e59f12e5b205e2fce30d3cc277bb9f28f36 +SHA512 (v3.4-fd010ad.tar.gz) = aae713e31ac3ae0aa673ea242a57ac54c4eeedd06e98158a5fc41d7a2472c86dd10491398a4d4cb0ec0044fdfaff3886c0ced8e63444d908bc1ac6de002c1471