From 7964078bb23cbb2094f70fd1bb377328896acbb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Charaoui?= <jerome@riseup.net>
Date: Mon, 26 Feb 2024 09:30:29 -0500
Subject: [PATCH] Import Debian changes 4.3.1+ds1-8+deb12u1
---
debian/.gitlab-ci.yml | 25 -----------------
debian/changelog | 7 +++++
.../fix-removed-container-handling.patch | 28 +++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 36 insertions(+), 25 deletions(-)
delete mode 100644 debian/.gitlab-ci.yml
create mode 100644 debian/patches/fix-removed-container-handling.patch
diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
deleted file mode 100644
index 73ddb5d..0000000
--- a/debian/.gitlab-ci.yml
+++ /dev/null
@@ -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 --git a/debian/changelog b/debian/changelog
index 6019f3b..6137641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <jerome@riseup.net> Mon, 26 Feb 2024 09:30:29 -0500
+
libpod (4.3.1+ds1-8) unstable; urgency=medium
* [upstream] unbreak using docker as client
diff --git a/debian/patches/fix-removed-container-handling.patch b/debian/patches/fix-removed-container-handling.patch
new file mode 100644
index 0000000..aa2042b
--- /dev/null
+++ b/debian/patches/fix-removed-container-handling.patch
@@ -0,0 +1,28 @@
+From: Valentin Rothberg <vrothberg@redhat.com>
+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 --git a/debian/patches/series b/debian/patches/series
index 3c2a89f..8f64142 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ system-goimports.patch
CVE-2023-0778.patch
fix-podman-client.patch
show-graphroot-before-removal.patch
+fix-removed-container-handling.patch
--
GitLab