diff -pruN 2.41.3-1/debian/changelog 2.41.3-1ubuntu1/debian/changelog --- 2.41.3-1/debian/changelog 2024-02-16 18:16:32.000000000 +0000 +++ 2.41.3-1ubuntu1/debian/changelog 2025-09-04 12:52:42.000000000 +0000 @@ -1,3 +1,35 @@ +libgtop2 (2.41.3-1ubuntu1) questing; urgency=medium + + [ Andreas Glinserer ] + * d/p/add-model-name-gathering-from-lscpu.patch + - Expand fields with data from lscpu (LP: #2116763) + + -- Andreas Glinserer Thu, 04 Sep 2025 14:52:42 +0200 + +libgtop2 (2.41.3-1build4) noble; urgency=medium + + * No-change rebuild to restore i386 binaries. + + -- Matthias Klose Wed, 17 Apr 2024 13:30:12 +0200 + +libgtop2 (2.41.3-1build3) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- Steve Langasek Sun, 31 Mar 2024 02:01:26 +0000 + +libgtop2 (2.41.3-1build2) noble; urgency=medium + + * No-change rebuild against libglib2.0-0t64 + + -- Steve Langasek Mon, 11 Mar 2024 23:02:27 +0000 + +libgtop2 (2.41.3-1build1) noble; urgency=medium + + * No-change rebuild against libglib2.0-0t64 + + -- Steve Langasek Fri, 08 Mar 2024 05:23:37 +0000 + libgtop2 (2.41.3-1) unstable; urgency=medium * New upstream release diff -pruN 2.41.3-1/debian/control 2.41.3-1ubuntu1/debian/control --- 2.41.3-1/debian/control 2024-02-16 18:16:32.000000000 +0000 +++ 2.41.3-1ubuntu1/debian/control 2024-03-08 05:23:37.000000000 +0000 @@ -1,7 +1,8 @@ Source: libgtop2 Section: libs Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Emilio Pozuelo Monfort , Jeremy Bícha Build-Depends: debhelper-compat (= 13), diff -pruN 2.41.3-1/debian/patches/add-model-name-gathering-from-lscpu.patch 2.41.3-1ubuntu1/debian/patches/add-model-name-gathering-from-lscpu.patch --- 2.41.3-1/debian/patches/add-model-name-gathering-from-lscpu.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.41.3-1ubuntu1/debian/patches/add-model-name-gathering-from-lscpu.patch 2025-09-04 12:52:42.000000000 +0000 @@ -0,0 +1,86 @@ +From: Andreas Glinserer +Date: Mon, 11 Aug 2025 12:34:29 +0200 +Subject: add model name gathering from lscpu + +Co-authored-by: Marco Trevisan +--- + sysdeps/linux/sysinfo.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) + +diff --git a/sysdeps/linux/sysinfo.c b/sysdeps/linux/sysinfo.c +index 7dbd5ee..a0d4e5a 100644 +--- a/sysdeps/linux/sysinfo.c ++++ b/sysdeps/linux/sysinfo.c +@@ -33,6 +33,64 @@ static const unsigned long _glibtop_sysdeps_sysinfo = + + static glibtop_sysinfo sysinfo = { .flags = 0 }; + ++static void ++extend_sysinfo (glibtop *server) ++{ ++ /* expand the already retrieved information by augmenting the output of lscpu into it */ ++ const char* key = "model name"; ++ g_autofree char *output = NULL; ++ g_autofree char *lscpu = NULL; ++ gint exit_status; ++ g_autoptr (GError) error = NULL; ++ g_auto (GStrv) lines = NULL; ++ g_auto (GStrv) fields = NULL; ++ guint i; ++ const char *command = "lscpu --parse=cpu,MODELNAME"; ++ ++ if (g_spawn_command_line_sync (command, &output, NULL, &exit_status, &error)) { ++ if (!g_spawn_check_wait_status (exit_status, &error)) { ++ glibtop_warn_r (server, "Could not execute \"%s\" (%i)", command, exit_status); ++ return; ++ } ++ } else { ++ glibtop_warn_r (server, "Failed to spawn \"lscpu\""); ++ } ++ ++ /* use output form here on */ ++ if (output == NULL) ++ return; ++ ++ lines = g_strsplit (output, "\n", 0); ++ char *model; ++ model = NULL; ++ ++ for (i = 0; lines[i]; i++) { ++ if (*lines[i] == '#') ++ continue; ++ ++ fields = g_strsplit (lines[i], ",", 3); ++ if (g_strv_length (fields) < 2) { ++ continue; ++ } ++ ++ /* parse cpu number and model name */ ++ guint cpu_num = g_ascii_strtoull (fields[0], NULL, 0); ++ ++ if (cpu_num >= sysinfo.ncpu) { ++ continue; ++ } ++ ++ /* check if model name field is already present */ ++ glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[cpu_num]; ++ model = g_hash_table_lookup (cpuinfo->values, key); ++ ++ if (model == NULL) { ++ g_ptr_array_add (cpuinfo->labels, key); ++ g_hash_table_insert (cpuinfo->values, g_strdup (key), g_strdup (fields[1])); ++ } ++ } ++} ++ + static void + init_sysinfo (glibtop *server) + { +@@ -100,6 +158,7 @@ init_sysinfo (glibtop *server) + } + + g_strfreev(processors); ++ extend_sysinfo (server); + + sysinfo.flags = _glibtop_sysdeps_sysinfo; + } diff -pruN 2.41.3-1/debian/patches/series 2.41.3-1ubuntu1/debian/patches/series --- 2.41.3-1/debian/patches/series 2024-02-16 18:16:32.000000000 +0000 +++ 2.41.3-1ubuntu1/debian/patches/series 2025-09-04 12:52:42.000000000 +0000 @@ -0,0 +1 @@ +add-model-name-gathering-from-lscpu.patch