Your message dated Sun, 16 Feb 2025 19:23:08 +0000
with message-id <e1tjkeo-00db3o...@fasolo.debian.org>
and subject line Bug#1095710: fixed in scaphandre 1.0.2-2
has caused the Debian Bug report #1095710,
regarding scaphandre: Upcoming update of procfs to v0.17
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 ow...@bugs.debian.org
immediately.)
--
1095710: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1095710
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: scaphandre
Version: 1.0.0-8
Severity: normal
Tags: patch
X-Debbugs-Cc: noisyc...@tutanota.com
Hi!
procfs v0.17 was just uploaded to experimental and we intend to downlift it
to unstable in the near future. scaphandre builds with v0.17 using the
(non-trivial) patch in attachment. Since there are no tests in the package,
I didn't do checks other than a test build.
Cheers!
>From d541c8f2f83b5f1a0a995d9a9110f6db5f03f106 Mon Sep 17 00:00:00 2001
From: NoisyCoil <noisyc...@tutanota.com>
Date: Sat, 18 Jan 2025 21:18:17 +0100
Subject: [PATCH] bump build-dependency for crate procfs
---
debian/control | 2 +-
debian/patches/2002_procfs.patch | 91 +++++++++++++++++++++++++++-
debian/patches/2003_no_windows.patch | 2 +-
3 files changed, 90 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index af598ca..c9a23fb 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
librust-log-0.4+default-dev,
librust-loggerv-0.7+default-dev,
librust-ordered-float-4+default-dev,
- librust-procfs-dev (<< 0.16),
+ librust-procfs-dev (<< 0.18),
librust-protobuf-2+default-dev,
librust-rand-0.8+default-dev,
librust-regex-1+default-dev,
diff --git a/debian/patches/2002_procfs.patch b/debian/patches/2002_procfs.patch
index 0faecc3..b2e4282 100644
--- a/debian/patches/2002_procfs.patch
+++ b/debian/patches/2002_procfs.patch
@@ -1,7 +1,7 @@
-Description: accept older branch of crate procfs
+Description: accept different branch of crate procfs
Author: Jonas Smedegaard <d...@jones.dk>
Forwarded: not-needed
-Last-Update: 2024-08-27
+Last-Update: 2025-02-10
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Cargo.toml
@@ -11,7 +11,92 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
[target.'cfg(target_os="linux")'.dependencies]
-procfs = { version = "0.15.0" }
-+procfs = { version = ">= 0.14.2, <= 0.15" }
++procfs = { version = ">= 0.14.2, <= 0.17" }
[target.'cfg(target_os="windows")'.dependencies]
windows = { version = "0.27.0", features =
["alloc","Win32_Storage_FileSystem","Win32_Foundation","Win32_Security","Win32_System_IO","Win32_System_Ioctl","Win32_System_Threading",
"Win32_System_SystemInformation"]}
+--- a/src/sensors/utils.rs
++++ b/src/sensors/utils.rs
+@@ -185,7 +185,7 @@
+ let res;
+ #[cfg(target_os = "linux")]
+ {
+- res = Ok(procfs::page_size().unwrap() as u64)
++ res = Ok(procfs::page_size())
+ }
+ #[cfg(target_os = "windows")]
+ {
+--- a/src/sensors/mod.rs
++++ b/src/sensors/mod.rs
+@@ -12,7 +12,7 @@
+ pub mod units;
+ pub mod utils;
+ #[cfg(target_os = "linux")]
+-use procfs::{CpuInfo, CpuTime, KernelStats};
++use procfs::{CpuInfo, CpuTime, Current, CurrentSI, KernelStats};
+ use std::{collections::HashMap, error::Error, fmt, fs, mem::size_of_val, str,
time::Duration};
+ #[allow(unused_imports)]
+ use sysinfo::{Pid, System};
+@@ -173,7 +173,7 @@
+ let sysinfo_cores = sysinfo_system.cpus();
+ debug!("Sysinfo sees {}", sysinfo_cores.len());
+ #[cfg(target_os = "linux")]
+- let cpuinfo = CpuInfo::new().unwrap();
++ let cpuinfo = CpuInfo::current().unwrap();
+ for (id, c) in (0_u16..).zip(sysinfo_cores.iter()) {
+ let mut info = HashMap::<String, String>::new();
+ #[cfg(target_os = "linux")]
+@@ -535,7 +535,7 @@
+ pub fn read_stats(&self) -> Option<CPUStat> {
+ #[cfg(target_os = "linux")]
+ {
+- let kernelstats_or_not = KernelStats::new();
++ let kernelstats_or_not = KernelStats::current();
+ if let Ok(res_cputime) = kernelstats_or_not {
+ return Some(CPUStat {
+ user: res_cputime.total.user,
+@@ -558,7 +558,7 @@
+ pub fn read_nb_process_total_count(&self) -> Option<u64> {
+ #[cfg(target_os = "linux")]
+ {
+- if let Ok(result) = KernelStats::new() {
++ if let Ok(result) = KernelStats::current() {
+ return Some(result.processes);
+ }
+ }
+@@ -569,7 +569,7 @@
+ pub fn read_nb_process_running_current(&self) -> Option<u32> {
+ #[cfg(target_os = "linux")]
+ {
+- if let Ok(result) = KernelStats::new() {
++ if let Ok(result) = KernelStats::current() {
+ if let Some(procs_running) = result.procs_running {
+ return Some(procs_running);
+ }
+@@ -581,7 +581,7 @@
+ pub fn read_nb_process_blocked_current(&self) -> Option<u32> {
+ #[cfg(target_os = "linux")]
+ {
+- if let Ok(result) = KernelStats::new() {
++ if let Ok(result) = KernelStats::current() {
+ if let Some(procs_blocked) = result.procs_blocked {
+ return Some(procs_blocked);
+ }
+@@ -593,7 +593,7 @@
+ pub fn read_nb_context_switches_total_count(&self) -> Option<u64> {
+ #[cfg(target_os = "linux")]
+ {
+- if let Ok(result) = KernelStats::new() {
++ if let Ok(result) = KernelStats::current() {
+ return Some(result.ctxt);
+ }
+ }
+@@ -1326,7 +1326,7 @@
+ fn read_stats(&self) -> Option<CPUStat> {
+ #[cfg(target_os = "linux")]
+ {
+- if let Ok(mut kernelstats) = KernelStats::new() {
++ if let Ok(mut kernelstats) = KernelStats::current() {
+ return Some(CPUStat::from_procfs_cputime(
+ kernelstats.cpu_time.remove(self.id as usize),
+ ));
diff --git a/debian/patches/2003_no_windows.patch
b/debian/patches/2003_no_windows.patch
index 9de435d..c5f61b8 100644
--- a/debian/patches/2003_no_windows.patch
+++ b/debian/patches/2003_no_windows.patch
@@ -8,7 +8,7 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
+++ b/Cargo.toml
@@ -33,13 +33,6 @@
[target.'cfg(target_os="linux")'.dependencies]
- procfs = { version = ">= 0.14.2, <= 0.15" }
+ procfs = { version = ">= 0.14.2, <= 0.17" }
-[target.'cfg(target_os="windows")'.dependencies]
-windows = { version = "0.27.0", features =
["alloc","Win32_Storage_FileSystem","Win32_Foundation","Win32_Security","Win32_System_IO","Win32_System_Ioctl","Win32_System_Threading",
"Win32_System_SystemInformation"]}
--
2.47.2
--- End Message ---
--- Begin Message ---
Source: scaphandre
Source-Version: 1.0.2-2
Done: Jonas Smedegaard <d...@jones.dk>
We believe that the bug you reported is fixed in the latest version of
scaphandre, 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 1095...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jonas Smedegaard <d...@jones.dk> (supplier of updated scaphandre 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 ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 16 Feb 2025 19:49:06 +0100
Source: scaphandre
Architecture: source
Version: 1.0.2-2
Distribution: unstable
Urgency: medium
Maintainer: Jonas Smedegaard <d...@jones.dk>
Changed-By: Jonas Smedegaard <d...@jones.dk>
Closes: 1095710
Changes:
scaphandre (1.0.2-2) unstable; urgency=medium
.
* add patch 1001_procfs, superseding 2002_procfs;
bump build-dependency for crate procfs;
closes: bug#1095710, thanks to NoisyCoil
Checksums-Sha1:
5f1484137aecb7fe3ef60288333f57aeb5bf89bd 3279 scaphandre_1.0.2-2.dsc
2ab4c6f428928a9b8cb5e9cf41fe3504f06e75ee 10896 scaphandre_1.0.2-2.debian.tar.xz
453d242829d31e6fcdc65ae3ac33c3470f67e996 20172
scaphandre_1.0.2-2_amd64.buildinfo
Checksums-Sha256:
6dc68a627d12c1e27371e8633d70287d816295c9b84abd481ff697d1caa0b45c 3279
scaphandre_1.0.2-2.dsc
3ed1d4ba862c59fad49733be30f60637cf462111efb9f948695e9970cf2a0d8c 10896
scaphandre_1.0.2-2.debian.tar.xz
2acfa1a2ab9d68cb5dbf2fc25eefb931843cc76da8030dd670303e6d7e248353 20172
scaphandre_1.0.2-2_amd64.buildinfo
Files:
dbd766352dd0e5a8acb6dbc3fbbf2794 3279 utils optional scaphandre_1.0.2-2.dsc
2d95a396e8b2a8e7fd65eba246732993 10896 utils optional
scaphandre_1.0.2-2.debian.tar.xz
2c0b0d1a70da77bc5e10e4c327952cc0 20172 utils optional
scaphandre_1.0.2-2_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
wsG7BAEBCgBvBYJnsjS1CRAsfDFGwaABIUcUAAAAAAAeACBzYWx0QG5vdGF0aW9u
cy5zZXF1b2lhLXBncC5vcmemlV+RlhsrWSXd1Mix0MCLddldAhDgbcxL/Ru+kn8b
dxYhBJ/j6cNmkaaf9TzGhCx8MUbBoAEhAAAvfQ//Sh7dT5fbDewXV6BlgF3oVnEq
Z4jNpNmhky1ikpoN1CA+tw+v/0S4i40yyiVf6OOCYn8dLQ1CogeLz/AzZaB6lVgc
SHmwlaJj6dGTQ/QkRPwhKdsQF+cjvZ3CjnwEDb8oQjP0X2b7brmMhXKVHIaXQ70O
FuCm7M+LuGw00WGI2i5rS9wLCWmQwPFP5pYKI9/0XtzVGkqg5oTfd7Ni6mRl99bc
QFiDTXrD/KCH/B3k7aBniso/mNY1B4YewUG22SE7Z6uO7apGEDbJ59ENAUliFG+4
8cx43nF5rLQjKi5ML1p/nRsQAn5sKC1tsswKiboX/Mb/ZMHqtJWi1UdaEk0t/40D
ulGsqL8OdwHX0vEp5CgLkAOAxZIWWShg/POAf/BurvpYq1nYEMYe5ljP6h1Yc6JU
K38Q6NBAO4LiCQ7+KZmozXxrBVIRdkNLhPaYvHIZovxzvbsR7N+0hCjfBq1yuQu2
u5uipwR76Q9NF7qi4pMCBQd2MjmUf6MR7P267IIUVUHieJaOUYM97juIhzyXYHR7
z6qOJZsl/fS/QfVWPXd0v7dtqLxHxlvwjFseFMwNjighdHqoAe0Ez8059kz98udG
wiZ5W5rN54ZwtvnMx+LCAAo34R3lI/nUL5lwgN+jaRv2y/WsdPq5u1DCFsT+QVhr
wT1V8FqwWDIqJBSRn78=
=NPUF
-----END PGP SIGNATURE-----
pgpKZ1JRPdlBS.pgp
Description: PGP signature
--- End Message ---
