update to 0.62, rolling in the patch to graph_defaults.inc

This commit is contained in:
sthen 2011-03-06 13:55:57 +00:00
parent 85b342f86b
commit b99b473f2e
3 changed files with 7 additions and 24 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.8 2011/03/05 13:43:00 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2011/03/06 13:55:57 sthen Exp $
COMMENT= web frontend to symon
DISTNAME= syweb-0.61
DISTNAME= syweb-0.62
CATEGORIES= www sysutils
MAINTAINER= Stuart Henderson <sthen@openbsd.org>

View File

@ -1,5 +1,5 @@
MD5 (syweb-0.61.tar.gz) = J7krlY2s/WA+djeqt9cIoA==
RMD160 (syweb-0.61.tar.gz) = 1plImeQRB/JZg0mNbJ7M7q03MUI=
SHA1 (syweb-0.61.tar.gz) = GCQog8QmfFzA0+mtg+EPWrhiaLs=
SHA256 (syweb-0.61.tar.gz) = z2bFJMmrhllfc61+iyb7SghCfnE7lE6SNxk8214eGWc=
SIZE (syweb-0.61.tar.gz) = 36151
MD5 (syweb-0.62.tar.gz) = 66Q1at2H0icxU3bPufIp3A==
RMD160 (syweb-0.62.tar.gz) = QMCu+ngSlkJiY4t06CTMpUGylu0=
SHA1 (syweb-0.62.tar.gz) = WdtNcCixXffWnE9zxWnfxeCk2ro=
SHA256 (syweb-0.62.tar.gz) = fyHwHRjxbbjWjXiBonAGNjPC+DLZ9mAM3toUOSfL6To=
SIZE (syweb-0.62.tar.gz) = 36202

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-htdocs_syweb_graph_defaults_inc,v 1.1 2011/03/05 13:43:00 sthen Exp $
On systems where only 1 cpu is graphed, 0xc0 + floor(0x40 / 1) works
out to be 0x100; this is too long for the 8-bit alpha channel value
to supply to rrdtool's grapher and breaks cpu graphs.
--- htdocs/syweb/graph_defaults.inc.orig Sat Mar 5 13:09:58 2011
+++ htdocs/syweb/graph_defaults.inc Sat Mar 5 13:26:22 2011
@@ -844,7 +844,7 @@ function get_combined_template($graph_type, $number) {
switch ($graph_type) {
case 'cpu':
case 'cpuiow':
- $alpha = sprintf("%02x", 0xc0 + floor(0x40 / $number));
+ $alpha = sprintf("%02x", 0xbf + floor(0x40 / $number));
$rrd = array('us' => 'user', 'ni' => 'nice', 'sy' => 'system',
'in' => 'interrupt' , 'id' => 'idle');
if ($graph_type == 'cpuiow')