summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrakuco <rakuco@FreeBSD.org>2016-02-25 22:27:41 +0000
committerrakuco <rakuco@FreeBSD.org>2016-02-25 22:27:41 +0000
commitd545864c099934a8f283e3d1c709126a86eab8c3 (patch)
tree511a8e54b3fabf48334dab5186d7984a56856837
parent9a19a7d3a6a39e7a05425dd110160881b3e6563b (diff)
downloadFreeBSD-ports-d545864c099934a8f283e3d1c709126a86eab8c3.zip
FreeBSD-ports-d545864c099934a8f283e3d1c709126a86eab8c3.tar.gz
MFH: r409564
Add a patch to avoid overflows when reading hw.physmem and vfs.bufspace. Use longs instead of ints, otherwise we risk reporting negative values. Submitted by: Axel Gonzalez <loox@e-shell.net> Approved by: portmgr blanket approval
-rw-r--r--deskutils/superkaramba/Makefile1
-rw-r--r--deskutils/superkaramba/files/patch-src_sensors_mem.cpp21
2 files changed, 22 insertions, 0 deletions
diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile
index 7f2d5cc..7af7ddf 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@@ -2,6 +2,7 @@
PORTNAME= superkaramba
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
diff --git a/deskutils/superkaramba/files/patch-src_sensors_mem.cpp b/deskutils/superkaramba/files/patch-src_sensors_mem.cpp
new file mode 100644
index 0000000..9f13d02
--- /dev/null
+++ b/deskutils/superkaramba/files/patch-src_sensors_mem.cpp
@@ -0,0 +1,21 @@
+Use the right type to avoid overflows and negative values.
+--- src/sensors/mem.cpp.orig 2014-09-14 14:15:59 UTC
++++ src/sensors/mem.cpp
+@@ -97,7 +97,7 @@ void MemSensor::processExited(K3Process
+ int MemSensor::getMemTotal()
+ {
+ #if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD) || defined(__DragonFly__)
+- static int mem = 0;
++ static long mem = 0;
+ size_t size = sizeof(mem);
+
+ sysctlbyname("hw.physmem", &mem, &size, NULL, 0);
+@@ -136,7 +136,7 @@ int MemSensor::getMemFree()
+ int MemSensor::getBuffers()
+ {
+ #if defined(Q_OS_FREEBSD) || defined(__DragonFly__)
+- static int mem = 0;
++ static long mem = 0;
+ size_t size = sizeof(mem);
+
+ sysctlbyname("vfs.bufspace", &mem, &size, NULL, 0);
OpenPOWER on IntegriCloud