cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.60; upgrading users who have modified setup.inc will need

Browse Source 
to merge changes from setup.inc.sample.
This commit is contained in:
sthen 2010-07-01 13:15:52 +00:00
parent 0857e2ce53
commit 5fe315516f
7 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/syweb/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.5 2009/11/14 11:06:42 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2010/07/01 13:15:52 sthen Exp $
COMMENT= web frontend to symon
DISTNAME= syweb-0.55
PKGNAME= ${DISTNAME}p3
DISTNAME= syweb-0.60
CATEGORIES= www sysutils
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
@ -35,5 +34,6 @@ do-install:
mkdir ${PREFIX}/symon/rrds
mkdir ${PREFIX}/symon/cache
cd ${PREFIX}/htdocs/syweb && mv setup.inc setup.inc.sample
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/htdocs/syweb ${PREFIX}/symon
.include <bsd.port.mk>

10
www/syweb/distinfo
View File

@ -1,5 +1,5 @@
MD5 (syweb-0.55.tar.gz) = FTFhXBTW1wqAq01TXUg2/g==
RMD160 (syweb-0.55.tar.gz) = ZM2KtPxFqQbHa7c0BeIihNmJJEE=
SHA1 (syweb-0.55.tar.gz) = gyAaxaRc2wBW7RncluycHjiXhs8=
SHA256 (syweb-0.55.tar.gz) = NN85yH44J0TrsJhcs98UL7xr4XIcHJde/I2eeYwKCc0=
SIZE (syweb-0.55.tar.gz) = 40960
MD5 (syweb-0.60.tar.gz) = jBMoXswBCB/z5nip6VPUyA==
RMD160 (syweb-0.60.tar.gz) = ctkZhYX/PooE9bD9QxxxAHNEwOg=
SHA1 (syweb-0.60.tar.gz) = HCwY4kuQC4MGugUdMJHIaf6+hYM=
SHA256 (syweb-0.60.tar.gz) = CF3XWu+rdJyryfzmYzCdsmZK/1dRlbn549HRaH4cWLk=
SIZE (syweb-0.60.tar.gz) = 36003

12
www/syweb/patches/patch-htdocs_syweb_class_graph_inc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-htdocs_syweb_class_graph_inc,v 1.2 2009/11/14 11:06:42 sthen Exp $
--- htdocs/syweb/class_graph.inc.orig Wed Dec 20 20:59:23 2006
+++ htdocs/syweb/class_graph.inc Fri Nov 13 22:03:21 2009
@@ -109,7 +109,7 @@ class Graph {
}
function _parse_filename($filename, $index='') {
- if (preg_match("/^(.*\/)?((cpu|if|io|mem|pf|pfq|proc|debug|mbuf|sensor|df)([0-9]{0,2}))(_([a-z\.]+))?([0-9]{0,4}[a-z]{0,1}[0-9]{0,1}[a-z]{0,1}).rrd$/",
+ if (preg_match("/^(.*\/)?((cpu|if|io|mem|pf|pfq|proc|debug|mbuf|sensor|df)([0-9]{0,2}))(_{0,1}([A-Za-z0-9\.-]+))?([0-9]{0,4}[A-Za-z]{0,1}[0-9]{0,1}[A-Za-z]{0,1}).rrd$/",
$filename, $match)) {
$this->vars->def('rrdtype'. $index, $match[2]);
$this->vars->def('rrdwhat'. $index, $match[6]);

20
www/syweb/patches/patch-htdocs_syweb_setup_inc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-htdocs_syweb_setup_inc,v 1.1.1.1 2007/10/05 13:32:32 winiger Exp $
--- htdocs/syweb/setup.inc.orig Tue Oct 2 15:31:49 2007
+++ htdocs/syweb/setup.inc Tue Oct 2 15:32:04 2007
@@ -18,12 +18,11 @@
$OpenBSD: patch-htdocs_syweb_setup_inc,v 1.2 2010/07/01 13:15:52 sthen Exp $
--- htdocs/syweb/setup.inc.orig Thu Jun 3 14:00:08 2010
+++ htdocs/syweb/setup.inc Wed Jun 30 17:09:02 2010
@@ -17,12 +17,11 @@
*
*/
@ -15,17 +15,17 @@ $OpenBSD: patch-htdocs_syweb_setup_inc,v 1.1.1.1 2007/10/05 13:32:32 winiger Exp
/* running OpenBSD, apache not chrooted:
$symon['rrdtool_path']='/usr/local/bin/rrdtool';
@@ -32,11 +31,12 @@ $symon['host_tree']='/var/www/symon/rrds';
$symon['layout_dir']='/var/www/symon';
@@ -38,11 +37,12 @@ $symon['host_tree']='/usr/local/www/symon/rrds';
$symon['layout_dir']='/usr/local/www/symon';
*/
-/* running FreeBSD, apache not chrooted: */
+/* running FreeBSD, apache not chrooted:
$symon['rrdtool_path']='/usr/local/bin/rrdtool';
-/* running Linux, apache not chrooted: */
+/* running Linux, apache not chrooted:
$symon['rrdtool_path']='/usr/bin/rrdtool';
$symon['cache_dir']='/usr/local/www/symon/cache';
$symon['host_tree']='/usr/local/www/symon/rrds';
$symon['layout_dir']='/usr/local/www/symon';
+*/
$symon['cache_duration']=20;
$symon['isolate_hosts']=1;
$symon['host_layouts']=1;

8
www/syweb/patches/patch-htdocs_syweb_tools_inc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-htdocs_syweb_tools_inc,v 1.1.1.1 2007/10/05 13:32:32 winiger Exp $
--- htdocs/syweb/tools.inc.orig Fri Oct 5 10:10:05 2007
+++ htdocs/syweb/tools.inc Fri Oct 5 10:10:36 2007
@@ -60,7 +60,7 @@ function normalise_filename($filename) {
$OpenBSD: patch-htdocs_syweb_tools_inc,v 1.2 2010/07/01 13:15:52 sthen Exp $
--- htdocs/syweb/tools.inc.orig Tue Jun 1 14:40:04 2010
+++ htdocs/syweb/tools.inc Wed Jun 30 17:07:55 2010
@@ -58,7 +58,7 @@ function normalise_filename($filename) {
$filename = $match[1];
}
/* remove all but lowercase and digits */

8
www/syweb/patches/patch-install_rrdtool_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-install_rrdtool_sh,v 1.1.1.1 2007/10/05 13:32:32 winiger Exp $
--- install_rrdtool.sh.orig Fri Oct 5 10:51:01 2007
+++ install_rrdtool.sh Fri Oct 5 10:51:56 2007
@@ -31,10 +31,11 @@ if [ "${LIBS}x" = x ]; then
$OpenBSD: patch-install_rrdtool_sh,v 1.2 2010/07/01 13:15:52 sthen Exp $
--- install_rrdtool.sh.orig Sat Nov 28 14:03:52 2009
+++ install_rrdtool.sh Wed Jun 30 17:07:55 2010
@@ -28,10 +28,11 @@ if [ "${LIBS}x" = x ]; then
fi
cd ${PREFIX}

7
www/syweb/pkg/PLIST
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2008/04/17 19:57:27 sthen Exp $
@owner root
@group www
@comment $OpenBSD: PLIST,v 1.3 2010/07/01 13:15:52 sthen Exp $
htdocs/syweb/
htdocs/syweb/class_cache.inc
htdocs/syweb/class_graph.inc
@ -14,6 +12,7 @@ htdocs/syweb/configtest.php
htdocs/syweb/graph.php
htdocs/syweb/graph_defaults.inc
htdocs/syweb/index.php
htdocs/syweb/index_noui.php
htdocs/syweb/setup.inc.sample
@sample htdocs/syweb/setup.inc
htdocs/syweb/spacer.png
@ -22,8 +21,10 @@ htdocs/syweb/symon.png
htdocs/syweb/tools.inc
symon/
@mode 775
@group www
symon/cache/
@mode
@group
symon/hifn_test.layout
symon/install_rrdtool.sh
symon/pf.layout