[Pkg-wmaker-commits] [wmcube] 33/67: debian/patches: (40_bts-357072_long_uptime_fix.patch) Convert to quilt, update for new upstream version, and add DEP3 header.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Tue Aug 25 03:22:16 UTC 2015


This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmcube.

commit ca518f6d72eb5e1d32b95d37289b81e8da3b740b
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Mon Jan 12 07:18:30 2015 -0600

    debian/patches: (40_bts-357072_long_uptime_fix.patch) Convert to quilt,
    update for new upstream version, and add DEP3 header.
---
 debian/patches/40_bts-357072_long_uptime_fix.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/40_bts-357072_long_uptime_fix.patch b/debian/patches/40_bts-357072_long_uptime_fix.patch
new file mode 100644
index 0000000..10320c1
--- /dev/null
+++ b/debian/patches/40_bts-357072_long_uptime_fix.patch
@@ -0,0 +1,29 @@
+Description: Fix execution on machine with long uptime using unsigned int.
+Author: Sandro Tosi <matrixhasu at gmail.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357072
+Last-Update: 2015-01-12
+
+--- a/wmcube/wmcube.c
++++ b/wmcube/wmcube.c
+@@ -1143,17 +1143,18 @@
+ }
+ 
+ int calc_cpu_total() {
+-	int total, used, t=0, i;
++	unsigned int total, used;
++	int t=0, i;
+ 	static int previous_total = 0, previous_used = 0;
+ 	char cpuid[6];
+-	int cpu,nice,system,idle;
++	unsigned int cpu,nice,system,idle;
+ 	char tmp[32];
+ 	FILE *fp;
+ 	
+ 	fp = fopen("/proc/stat","rt");
+ 
+ 	for (i = -2; i < which_cpu; i++) {
+-		fscanf(fp,"%5s %d %d %d %d %31s %31s %31s %31s", cpuid, &cpu, &nice, &system, &idle, tmp, tmp, tmp, tmp);
++		fscanf(fp,"%5s %u %u %u %u %31s %31s %31s %31s", cpuid, &cpu, &nice, &system, &idle, tmp, tmp, tmp, tmp);
+ 	}
+ 
+ 	fclose(fp);
diff --git a/debian/patches/series b/debian/patches/series
index 64b0900..90f7a36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 30_bts-386850_fix_smp.patch
+40_bts-357072_long_uptime_fix.patch
 update_makefile.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcube.git



More information about the Pkg-wmaker-commits mailing list