Version in base suite: 4.3.1+ds1-8 Base version: libpod_4.3.1+ds1-8 Target version: libpod_4.3.1+ds1-8+deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/libp/libpod/libpod_4.3.1+ds1-8.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/libp/libpod/libpod_4.3.1+ds1-8+deb12u1.dsc .gitlab-ci.yml | 25 ------------------------ changelog | 7 ++++++ patches/fix-removed-container-handling.patch | 28 +++++++++++++++++++++++++++ patches/series | 1 4 files changed, 36 insertions(+), 25 deletions(-) diff -Nru libpod-4.3.1+ds1/debian/.gitlab-ci.yml libpod-4.3.1+ds1/debian/.gitlab-ci.yml --- libpod-4.3.1+ds1/debian/.gitlab-ci.yml 2023-04-30 12:19:54.000000000 +0000 +++ libpod-4.3.1+ds1/debian/.gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ ---- -# https://docs.gitlab.com/ce/ci/yaml/#include -include: - - remote: https://salsa.debian.org/onlyjob/ci/raw/master/onlyjob-ci.yml - -## "amd64-unstable" always runs by default followed by lintian. - -## Job to check Build-Depends versioning: -amd64-testing_unstable: - extends: .build - variables: - arch: amd64 - dist: testing_unstable - -i386-unstable: - extends: .build - variables: - arch: i386 - dist: unstable - -amd64-experimental: - extends: .build - variables: - arch: amd64 - dist: experimental diff -Nru libpod-4.3.1+ds1/debian/changelog libpod-4.3.1+ds1/debian/changelog --- libpod-4.3.1+ds1/debian/changelog 2023-04-30 12:19:54.000000000 +0000 +++ libpod-4.3.1+ds1/debian/changelog 2024-02-26 14:30:29.000000000 +0000 @@ -1,3 +1,10 @@ +libpod (4.3.1+ds1-8+deb12u1) bookworm; urgency=medium + + * Non-maintainer upload. + * d/patches: backport fix for removed container handling (Closes: #1059496) + + -- Jérôme Charaoui Mon, 26 Feb 2024 09:30:29 -0500 + libpod (4.3.1+ds1-8) unstable; urgency=medium * [upstream] unbreak using docker as client diff -Nru libpod-4.3.1+ds1/debian/patches/fix-removed-container-handling.patch libpod-4.3.1+ds1/debian/patches/fix-removed-container-handling.patch --- libpod-4.3.1+ds1/debian/patches/fix-removed-container-handling.patch 1970-01-01 00:00:00.000000000 +0000 +++ libpod-4.3.1+ds1/debian/patches/fix-removed-container-handling.patch 2024-02-26 14:30:29.000000000 +0000 @@ -0,0 +1,28 @@ +From: Valentin Rothberg +Date: Mon, 6 Feb 2023 13:52:40 +0100 +Subject: [PATCH] network ls: handle removed container + +Handle a race condition in the REST API when listing networks. +In between listing all containers and inspecting them, they may have +already been removed, so handle this case gracefully. + +[NO NEW TESTS NEEDED] as it's a race condition. + +Fixes: #17341 + +Forwarded: not-needed +Origin: upstream, https://github.com/containers/podman/commit/ced934284058232c1c3d76956786106d64511f89 +diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go +index 704af4b0e427..587da14361eb 100644 +--- a/pkg/api/handlers/compat/networks.go ++++ b/pkg/api/handlers/compat/networks.go +@@ -74,6 +74,9 @@ func convertLibpodNetworktoDockerNetwork(runtime *libpod.Runtime, network *netty + for _, con := range cons { + data, err := con.Inspect(false) + if err != nil { ++ if errors.Is(err, define.ErrNoSuchCtr) || errors.Is(err, define.ErrCtrRemoved) { ++ continue ++ } + return nil, err + } + if netData, ok := data.NetworkSettings.Networks[network.Name]; ok { diff -Nru libpod-4.3.1+ds1/debian/patches/series libpod-4.3.1+ds1/debian/patches/series --- libpod-4.3.1+ds1/debian/patches/series 2023-04-30 12:19:54.000000000 +0000 +++ libpod-4.3.1+ds1/debian/patches/series 2024-02-26 14:30:29.000000000 +0000 @@ -3,3 +3,4 @@ CVE-2023-0778.patch fix-podman-client.patch show-graphroot-before-removal.patch +fix-removed-container-handling.patch