Your message dated Wed, 02 Oct 2024 10:50:02 +0000
with message-id <[email protected]>
and subject line Bug#1083117: fixed in podman 5.2.3+ds1-2
has caused the Debian Bug report #1083117,
regarding podman: Do not hardcode golang-github-shirou-gopsutil v3
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1083117: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1083117
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: podman
Source-Version: 5.2.3+ds1-1
Severity: wishlist
Tags: patch
Hi!
I'm trying to upgrade the golang-github-shirou-gopsutil package from
v3 to v4, and this is one of the reverse dependencies that would fail
to build if I uploading it now.
The attached patch removes the hardcoded v3 suffix, which should make
it build with both v3 and v4. So it would be nice if this could be
uploaded right away to make this not block this mini-transition
anymore. :)
Thanks,
Guillem
From 9b8d0ea36d0cce1d867129a9f8f2a82f8175a6d4 Mon Sep 17 00:00:00 2001
From: Guillem Jover <[email protected]>
Date: Wed, 2 Oct 2024 00:26:41 +0200
Subject: [PATCH] Do not hardcode gopsutil v3
We can use v4 when no version suffix is used. Remove it so that we can
upgrade the gopsutil modules from v3 to v4 in Debian.
---
debian/patches/Use-gopsutil-v4.patch | 58 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 59 insertions(+)
create mode 100644 debian/patches/Use-gopsutil-v4.patch
diff --git a/debian/patches/Use-gopsutil-v4.patch b/debian/patches/Use-gopsutil-v4.patch
new file mode 100644
index 000000000..b9863d7c3
--- /dev/null
+++ b/debian/patches/Use-gopsutil-v4.patch
@@ -0,0 +1,58 @@
+From: Guillem Jover <[email protected]>
+Date: Tue, 01 Oct 2024 22:48:05 +0200
+Subject: Do not hardcode gopsutil v3
+
+We can use v4 when no version suffix is used. Remove it so that we can
+upgrade the gopsutil modules from v3 to v4 in Debian.
+
+---
+ cmd/podman/machine/init.go | 2 +-
+ cmd/podman/machine/server9p.go | 2 +-
+ pkg/machine/e2e/init_test.go | 2 +-
+ pkg/machine/gvproxy_unix.go | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/cmd/podman/machine/init.go
++++ b/cmd/podman/machine/init.go
+@@ -15,7 +15,7 @@ import (
+ "github.com/containers/podman/v5/pkg/machine/define"
+ "github.com/containers/podman/v5/pkg/machine/shim"
+ "github.com/containers/podman/v5/pkg/machine/vmconfigs"
+- "github.com/shirou/gopsutil/v3/mem"
++ "github.com/shirou/gopsutil/mem"
+ "github.com/sirupsen/logrus"
+ "github.com/spf13/cobra"
+ )
+--- a/cmd/podman/machine/server9p.go
++++ b/cmd/podman/machine/server9p.go
+@@ -11,7 +11,7 @@ import (
+ "github.com/containers/common/pkg/completion"
+ "github.com/containers/podman/v5/cmd/podman/registry"
+ "github.com/containers/podman/v5/pkg/fileserver"
+- psutil "github.com/shirou/gopsutil/v3/process"
++ psutil "github.com/shirou/gopsutil/process"
+ "github.com/sirupsen/logrus"
+ "github.com/spf13/cobra"
+ )
+--- a/pkg/machine/e2e/init_test.go
++++ b/pkg/machine/e2e/init_test.go
+@@ -15,7 +15,7 @@ import (
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+ . "github.com/onsi/gomega/gexec"
+- "github.com/shirou/gopsutil/v3/mem"
++ "github.com/shirou/gopsutil/mem"
+ "github.com/sirupsen/logrus"
+ )
+
+--- a/pkg/machine/gvproxy_unix.go
++++ b/pkg/machine/gvproxy_unix.go
+@@ -8,7 +8,7 @@ import (
+ "syscall"
+ "time"
+
+- psutil "github.com/shirou/gopsutil/v3/process"
++ psutil "github.com/shirou/gopsutil/process"
+ "github.com/sirupsen/logrus"
+ "golang.org/x/sys/unix"
+ )
diff --git a/debian/patches/series b/debian/patches/series
index dc69b6d08..e2a8b58f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
system-goimports.patch
0002-Revert-update-to-docker-27.patch
0003-TestProviders-Skip-test-if-unable-to-list-providers.patch
+Use-gopsutil-v4.patch
--
2.45.2
--- End Message ---
--- Begin Message ---
Source: podman
Source-Version: 5.2.3+ds1-2
Done: Reinhard Tartler <[email protected]>
We believe that the bug you reported is fixed in the latest version of
podman, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Reinhard Tartler <[email protected]> (supplier of updated podman package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Wed, 02 Oct 2024 06:00:51 -0400
Source: podman
Architecture: source
Version: 5.2.3+ds1-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Go Packaging Team
<[email protected]>
Changed-By: Reinhard Tartler <[email protected]>
Closes: 1079327 1083117
Changes:
podman (5.2.3+ds1-2) unstable; urgency=medium
.
[ Reinhard Tartler ]
* Enable CNI networking for now, closes: #1079327
* Reenable full salsa-ci pipeline
* simplify builtin-test
* builtin-tests: restrict to building the podman executable
* fix source/lintian-override
* Supress more "field-to-long" lintian warnings
.
[ Guillem Jover ]
* Do not hardcode gopsutil v3, closes: #1083117
Checksums-Sha1:
2009d677019055ea7cc94819b736708eb93ca700 5496 podman_5.2.3+ds1-2.dsc
df7493f8a0498a5f007b9af60c347ecb7e449d5c 26432 podman_5.2.3+ds1-2.debian.tar.xz
Checksums-Sha256:
38d9d2b434b6255533cdbb43a2fa13e65b4b990dbe05cbac60b4bbda6f4e15e2 5496
podman_5.2.3+ds1-2.dsc
6b8581466b37cd11aab9c038cc0519438b6b713d6c33dac1fe8b91dc096e7df0 26432
podman_5.2.3+ds1-2.debian.tar.xz
Files:
6cb36acb396ec1fef9ee4a77a15b4269 5496 admin optional podman_5.2.3+ds1-2.dsc
84980c93bc6f7c84fd3187e7eb9b0353 26432 admin optional
podman_5.2.3+ds1-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
iQJIBAEBCgAyFiEEMN59F2OrlFLH4IJQSadpd5QoJssFAmb9IBMUHHNpcmV0YXJ0
QHRhdXdhcmUuZGUACgkQSadpd5QoJstgZxAAqxVtphsjIDSaRSNZ2czaP8MtuHmT
G+pc3aBbg0uQB1cbB6rypSFAPAx0nwwSD1s7PsDlOkcfDgrnNyVzPs0h1xBn+yk7
/o4LSaVZCf6nMT6FDucTgXhH5eX9rojVHa5JXvDIJWpO5aMl05bLCjDDew7dnqvy
SBKmquhBd7wAzx6rrtB5b8wLIdQF5ZWR3/NM12YDpmBID5CItFibKst6Gb2XqBY3
5rsOpp2P/gll4zrqINYVHTrpSR6NH29y5C2dITfxXb+gyvHuEKFLgow82pXjYaBa
XFP31BDWsEvg/KF93LaZFgOnZtel7gTKZgB7w9PgyVOp7EiMBOx+K75wyf4iUhrA
erWiDNqxoan3HTRltwtc51edTLBeGmSqKAtMDWqpVU7K2CSpRkmZ2jnlEyRBFS4O
UzgYRO9ZSaykQM0lvNyEJkLT2Sr1qmcEHpA+LKZRqurvA7iaiaKDKZP8q2LL71tw
OiN9MjMgLEDLB2GXQJSUNBGN/oRfifxSgk748exP2pX24PjpiCJVdTuAUcHwfKXB
t5qOZu6YvhU2Np+HtmoYvGiyzpzi9ochjWWp3jOUAu+XfOI7iZm7T6fq0jpMFr+M
W3uf2XjAmEIgom8hwKoSJTsD4Nqa03vsJ/gtF8jAvJoir39XWWqd+Q92ykgoJf6e
MwwB025udb55OzM=
=wgdu
-----END PGP SIGNATURE-----
pgpQ5_ea5hNj_.pgp
Description: PGP signature
--- End Message ---
_______________________________________________
Pkg-go-maintainers mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-go-maintainers
