Control: tags 966638 + patch

Dear maintainer,

I've prepared an NMU for gkrellm2-cpufreq (versioned as 0.6.4-6.1). The 
diff is attached to this message.

cu
Adrian
diff -Nru gkrellm2-cpufreq-0.6.4/debian/changelog gkrellm2-cpufreq-0.6.4/debian/changelog
--- gkrellm2-cpufreq-0.6.4/debian/changelog	2019-09-04 12:56:46.000000000 +0300
+++ gkrellm2-cpufreq-0.6.4/debian/changelog	2021-02-07 13:38:30.000000000 +0200
@@ -1,3 +1,11 @@
+gkrellm2-cpufreq (0.6.4-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch from Bernhard Übelacker fixing an undefined symbol.
+    (Closes: #966638)
+
+ -- Adrian Bunk <[email protected]>  Sun, 07 Feb 2021 13:38:30 +0200
+
 gkrellm2-cpufreq (0.6.4-6) unstable; urgency=medium
 
   * Remove stray characters in Section field in debian/control. (Closes: #939308)
diff -Nru gkrellm2-cpufreq-0.6.4/debian/patches/0004-Get-number-of-cpus.patch gkrellm2-cpufreq-0.6.4/debian/patches/0004-Get-number-of-cpus.patch
--- gkrellm2-cpufreq-0.6.4/debian/patches/0004-Get-number-of-cpus.patch	1970-01-01 02:00:00.000000000 +0200
+++ gkrellm2-cpufreq-0.6.4/debian/patches/0004-Get-number-of-cpus.patch	2021-02-07 13:35:17.000000000 +0200
@@ -0,0 +1,41 @@
+Description: Get number of CPUs
+
+Author: Bernhard Übelacker <[email protected]>
+Bug-Debian: https://bugs.debian.org/966638
+Forwarded: no
+Last-Update: 2020-10-16
+
+Index: gkrellm2-cpufreq-0.6.4/cpufreq.c
+===================================================================
+--- gkrellm2-cpufreq-0.6.4.orig/cpufreq.c
++++ gkrellm2-cpufreq-0.6.4/cpufreq.c
+@@ -49,6 +49,7 @@
+ 
+ #include <gkrellm2/gkrellm.h>
+ #include <cpufreq.h>
++#include <sys/sysinfo.h>
+ 
+ /* version number */
+ #define  VERSION        "0.6.4"
+@@ -616,8 +617,7 @@ GkrellmMonitor* gkrellm_init_plugin(void
+   monitor = &plugin_mon;
+ 
+   /* determine number of cpus */
+-  for( ncpu = 0; cpufreq_cpu_exists(ncpu)==0; ++ncpu )
+-    ;
++  ncpu = get_nprocs();
+   ncpu = ncpu > NCPU_MAX ? NCPU_MAX : ncpu;
+ 
+   /* determine maximal frequency */
+@@ -625,7 +625,10 @@ GkrellmMonitor* gkrellm_init_plugin(void
+   for ( cpu = 0; cpu<ncpu; ++cpu) {
+     unsigned long khz_min = 0;
+     unsigned long khz_max_i = 0;
+-    cpufreq_get_hardware_limits( cpu, &khz_min, &khz_max_i );
++    int ret;
++    ret = cpufreq_get_hardware_limits( cpu, &khz_min, &khz_max_i );
++    if (ret < 0)
++        khz_min = khz_max_i = 1;
+     khz_max = khz_max < khz_max_i ? khz_max_i : khz_max;
+   }
+ 
diff -Nru gkrellm2-cpufreq-0.6.4/debian/patches/series gkrellm2-cpufreq-0.6.4/debian/patches/series
--- gkrellm2-cpufreq-0.6.4/debian/patches/series	2019-09-02 23:03:22.000000000 +0300
+++ gkrellm2-cpufreq-0.6.4/debian/patches/series	2021-02-07 13:38:28.000000000 +0200
@@ -1,3 +1,4 @@
 0001-Modify-Makefile-to-make-sure-linker-flags-are-proper.patch
 0002-Modify-Makefile-to-allow-gkrellm2-cpufreq-to-be-cros.patch
 0003-Modify-Makefile-to-link-against-libcpupower-instead-.patch
+0004-Get-number-of-cpus.patch

Reply via email to