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

update smokeping to 2.2.7

Browse Source 
ok ajacoutot
This commit is contained in:
sthen 2007-12-19 17:54:51 +00:00
parent 9c2cc1a432
commit d2ef356b37
7 changed files with 135 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
net/smokeping/Makefile
View File

@ -1,10 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2007/09/12 15:13:24 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2007/12/19 17:54:51 sthen Exp $
COMMENT= latency logging and graphing system
VERSION= 2.1.1
DISTNAME= smokeping-${VERSION}
PKGNAME= smokeping-${VERSION}p3
DISTNAME= smokeping-2.2.7
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}pub/
@ -31,11 +29,7 @@ PKG_ARCH= *
PMDIR= libdata/perl5/site_perl
SUBST_VARS= PMDIR
ETCFILES= basepage.html config smokemail tmail
post-extract:
@find ${WRKDIST} -name \*.tmp -print0 | xargs -0 rm
WWWDIR= ${PREFIX}/share/examples/smokeping
do-install:
@perl -pi -e "s|%%SYSCONFDIR%%|${SYSCONFDIR}|g; \
@ -48,25 +42,25 @@ do-install:
s|%%LOCALBASE%%|${LOCALBASE}|g" \
< ${WRKSRC}/htdocs/smokeping.cgi.dist \
> ${WRKSRC}/htdocs/smokeping.cgi
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/smokeping
${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi \
${PREFIX}/share/examples/smokeping/smokeping.cgi
${INSTALL_DATA_DIR} ${WWWDIR}
${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi ${WWWDIR}
cd ${WRKSRC}/htdocs/; tar cf - cropper | tar xf - -C ${WWWDIR}
${INSTALL_DATA_DIR} ${PREFIX}/${PMDIR}/Smokeping
cd ${WRKSRC}/lib/; tar cf - Smokeping* | \
tar xf - -C ${PREFIX}/${PMDIR}/
${INSTALL_MAN} ${WRKSRC}/doc/smokeping*.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/examples
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/smokeping
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/matchers
${INSTALL_DATA} ${WRKSRC}/doc/Smokeping/matchers/*.txt \
${PREFIX}/share/doc/smokeping/matchers
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/probes
${INSTALL_DATA} ${WRKSRC}/doc/Smokeping/probes/*.txt \
${PREFIX}/share/doc/smokeping/probes
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/sorters
${INSTALL_DATA} ${WRKSRC}/doc/Smokeping/sorters/*.txt \
${PREFIX}/share/doc/smokeping/sorters
.for file in ${ETCFILES}
${INSTALL_DATA} ${WRKSRC}/doc/examples/* \
${PREFIX}/share/doc/smokeping/examples
.for dir in matchers probes sorters
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/${dir}
${INSTALL_DATA} ${WRKSRC}/doc/Smokeping/${dir}/*.txt \
${PREFIX}/share/doc/smokeping/${dir}
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/smokeping
.for file in basepage.html config smokemail tmail smokeping_secrets
${INSTALL_DATA} ${WRKSRC}/etc/${file}.dist \
${PREFIX}/share/examples/smokeping/${file}
.endfor

10
net/smokeping/distinfo
View File

@ -1,5 +1,5 @@
MD5 (smokeping-2.1.1.tar.gz) = RYI0QTAD/V77BNYc39cdqA==
RMD160 (smokeping-2.1.1.tar.gz) = OD0+981Vt5XWxN0vpju7fUCpDzA=
SHA1 (smokeping-2.1.1.tar.gz) = izAEoZmQsDUuEQskhQqnFoOw09c=
SHA256 (smokeping-2.1.1.tar.gz) = GNx1HAdULjvQ5N2JJvFLVd1D3koEISB7+OVt1OkXxTo=
SIZE (smokeping-2.1.1.tar.gz) = 501956
MD5 (smokeping-2.2.7.tar.gz) = vjNbEF9v9yjp87+am3a+yw==
RMD160 (smokeping-2.2.7.tar.gz) = A3s/isRCsnDpYzdpY1oN4fgoZFQ=
SHA1 (smokeping-2.2.7.tar.gz) = UBHbHM76DV7JZwBvxIK0LE676ts=
SHA256 (smokeping-2.2.7.tar.gz) = KioJ00A3sXN3iTyTnUP+wXf+0HMeKgBw8wxkm8WjHIY=
SIZE (smokeping-2.2.7.tar.gz) = 557546

22
net/smokeping/patches/patch-bin_smokeping_dist
View File

@ -1,23 +1,15 @@
$OpenBSD: patch-bin_smokeping_dist,v 1.7 2007/06/29 06:58:22 jakob Exp $
--- bin/smokeping.dist.orig Wed May 2 18:15:31 2007
+++ bin/smokeping.dist Wed Jun 27 09:42:29 2007
@@ -1,12 +1,15 @@
$OpenBSD: patch-bin_smokeping_dist,v 1.8 2007/12/19 17:54:51 sthen Exp $
--- bin/smokeping.dist.orig Mon Nov 5 21:59:38 2007
+++ bin/smokeping.dist Wed Dec 19 15:05:07 2007
@@ -1,5 +1,4 @@
-#!/usr/sepp/bin/perl-5.8.4 -w
+#!/usr/bin/perl -w
# -*-perl-*-
-use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl);
-use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl);
use lib qw(lib);
use Smokeping 2.001001;
-
@@ -8,3 +7,3 @@ use Smokeping 2.002007;
-Smokeping::main("etc/config.dist");
+
+Smokeping::main("%%SYSCONFDIR%%/smokeping/config");
+
+use POSIX qw(setuid setgid getpwnam);
+print "Dropping privileges to _smokeping ...\n";
+my (undef, undef, $uid, $gid) = POSIX::getpwnam("_smokeping");
=head1 NAME

18
net/smokeping/patches/patch-etc_basepage_html_dist Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-etc_basepage_html_dist,v 1.1 2007/12/19 17:54:51 sthen Exp $
--- etc/basepage.html.dist.orig Wed Dec 19 15:05:15 2007
+++ etc/basepage.html.dist Wed Dec 19 15:05:26 2007
@@ -43,10 +43,10 @@ a.menulink:hover {
-->
</STYLE>
-<script src="cropper/lib/prototype.js" type="text/javascript"></script>
-<script src="cropper/lib/scriptaculous.js?load=builder,dragdrop" type="text/javascript"></script>
-<script src="cropper/cropper.js" type="text/javascript"></script>
-<script src="cropper/smokeping-zoom.js" type="text/javascript"></script>
+<script src="../cropper/lib/prototype.js" type="text/javascript"></script>
+<script src="../cropper/lib/scriptaculous.js?load=builder,dragdrop" type="text/javascript"></script>
+<script src="../cropper/cropper.js" type="text/javascript"></script>
+<script src="../cropper/smokeping-zoom.js" type="text/javascript"></script>

51
net/smokeping/patches/patch-etc_config_dist
View File

@ -1,44 +1,47 @@
$OpenBSD: patch-etc_config_dist,v 1.3 2007/06/29 06:58:22 jakob Exp $
--- etc/config.dist.orig Tue Aug 29 08:45:25 2006
+++ etc/config.dist Wed Jun 20 16:36:12 2007
@@ -7,14 +7,15 @@
owner = Joe Random
contact = joe@some.place.xyz
mailhost = smtp.mailhost.abc
$OpenBSD: patch-etc_config_dist,v 1.4 2007/12/19 17:54:51 sthen Exp $
--- etc/config.dist.orig Wed Sep 12 23:34:58 2007
+++ etc/config.dist Tue Oct 23 11:04:55 2007
@@ -3,14 +3,14 @@
owner = Peter Random
contact = some@address.nowhere
mailhost = my.mail.host
-sendmail = /usr/lib/sendmail
-imgcache = /home/oetiker/public_html/.simg
-imgurl = ../.simg
-datadir = /home/oetiker/data/projects/AADJ-smokeping/dist/var
-piddir = /home/oetiker/data/projects/AADJ-smokeping/dist/var
-imgcache = /home/oetiker/public_html/smokeping-ms/cache
-imgurl = cache
-datadir = /tmp/smokeping-ms/data
-piddir = /tmp/smokeping-ms/var
+sendmail = /usr/sbin/sendmail
+imgcache = /var/www/htdocs/smokeping/img
+imgurl = /smokeping/img
+pagedir = /var/www/htdocs/smokeping
+datadir = /var/db/smokeping
+piddir = /var/run/smokeping
cgiurl = http://people.ee.ethz.ch/~oetiker/smokeping/smokeping.cgi
-smokemail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/smokemail.dist
-tmail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/tmail.dist
+smokemail = /etc/smokeping/smokemail
+tmail = /etc/smokeping/tmail
cgiurl = http://some.url/smokeping.cgi
-smokemail = /home/oetiker/checkouts/smokeping/trunk/software/etc/smokemail.dist
-tmail = /home/oetiker/checkouts/smokeping/trunk/software/etc/tmail.dist
+smokemail = %%SYSCONFDIR%%/smokeping/smokemail
+tmail = %%SYSCONFDIR%%/smokeping/tmail
# specify this to get syslog logging
syslogfacility = local0
# each probe is now run in its own process
@@ -66,7 +67,7 @@ AVERAGE 0.5 144 720
@@ -44,7 +44,7 @@ AVERAGE 0.5 144 720
*** Presentation ***
-template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html.dist
-template = /home/oetiker/checkouts/smokeping/trunk/software/etc/basepage.html.dist
+template = %%SYSCONFDIR%%/smokeping/basepage.html
+ overview
+ charts
@@ -89,7 +90,7 @@ unison_tolerance = 2
@@ -96,10 +96,10 @@ unison_tolerance = 2
+ FPing
-binary = /usr/sepp/bin/fping
-binary = /usr/sbin/fping
+binary = %%LOCALBASE%%/sbin/fping
*** Targets ***
*** Slaves ***
-secrets=/home/oetiker/checkouts/smokeping/trunk/software/etc/smokeping_secrets.dist
+secrets=%%SYSCONFDIR%%/smokeping/smokeping_secrets
+boomer
display_name=boomer
color=0000ff

13
net/smokeping/patches/patch-htdocs_smokeping_cgi_dist
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-htdocs_smokeping_cgi_dist,v 1.7 2007/06/29 06:58:22 jakob Exp $
--- htdocs/smokeping.cgi.dist.orig Wed May 2 18:15:31 2007
+++ htdocs/smokeping.cgi.dist Wed Jun 27 09:38:14 2007
@@ -1,13 +1,11 @@
$OpenBSD: patch-htdocs_smokeping_cgi_dist,v 1.8 2007/12/19 17:54:51 sthen Exp $
--- htdocs/smokeping.cgi.dist.orig Mon Nov 5 21:59:38 2007
+++ htdocs/smokeping.cgi.dist Wed Dec 19 15:07:30 2007
@@ -1,6 +1,4 @@
-#!/usr/sepp/bin/speedy -w
+#!%%LOCALBASE%%/bin/speedy -w
# -*-perl-*-
@ -9,11 +9,8 @@ $OpenBSD: patch-htdocs_smokeping_cgi_dist,v 1.7 2007/06/29 06:58:22 jakob Exp $
-use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
-use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
use CGI::Carp qw(fatalsToBrowser);
use Smokeping 2.001001;
@@ -9,3 +7,3 @@ use Smokeping 2.002007;
-Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
+Smokeping::cgi("%%SYSCONFDIR%%/smokeping/config");
=head1 NAME

63
net/smokeping/pkg/PLIST
View File

@ -1,12 +1,17 @@
@comment $OpenBSD: PLIST,v 1.9 2007/06/29 17:49:56 jasper Exp $
@comment $OpenBSD: PLIST,v 1.10 2007/12/19 17:54:51 sthen Exp $
@newgroup _smokeping:562
@newuser _smokeping:562:562:daemon:Smokeping account:/var/empty:/sbin/nologin
bin/smokeping
${PMDIR}/Smokeping/
${PMDIR}/Smokeping.pm
${PMDIR}/Smokeping/Colorspace.pm
${PMDIR}/Smokeping/Config.pm
${PMDIR}/Smokeping/Examples.pm
${PMDIR}/Smokeping/Graphs.pm
${PMDIR}/Smokeping/Master.pm
${PMDIR}/Smokeping/RRDhelpers.pm
${PMDIR}/Smokeping/RRDtools.pm
${PMDIR}/Smokeping/Slave.pm
${PMDIR}/Smokeping/ciscoRttMonMIB.pm
${PMDIR}/Smokeping/matchers/
${PMDIR}/Smokeping/matchers/Avgratio.pm
@ -61,6 +66,13 @@ ${PMDIR}/Smokeping/sorters/base.pm
@man man/man1/smokeping.cgi.1
share/doc/smokeping/
share/doc/smokeping/Smokeping.txt
share/doc/smokeping/examples/
share/doc/smokeping/examples/config.echoping
share/doc/smokeping/examples/config.fping-instances
share/doc/smokeping/examples/config.multiple-probes
share/doc/smokeping/examples/config.simple
share/doc/smokeping/examples/config.targetvars-with-Curl
share/doc/smokeping/examples/config.template
share/doc/smokeping/matchers/
share/doc/smokeping/matchers/Avgratio.txt
share/doc/smokeping/matchers/CheckLatency.txt
@ -110,6 +122,7 @@ share/doc/smokeping/smokeping_config.txt
share/doc/smokeping/smokeping_examples.txt
share/doc/smokeping/smokeping_extend.txt
share/doc/smokeping/smokeping_install.txt
share/doc/smokeping/smokeping_master_slave.txt
share/doc/smokeping/smokeping_upgrade.txt
share/doc/smokeping/sorters/
share/doc/smokeping/sorters/Loss.txt
@ -122,23 +135,61 @@ share/examples/smokeping/
@sample ${SYSCONFDIR}/smokeping/
@sample /var/www/smokeping/
@sample /var/www/smokeping/cgi-bin/
@sample /var/www/htdocs/smokeping/
@owner www
@sample /var/www/htdocs/smokeping/img/
@owner
share/examples/smokeping/basepage.html
@sample ${SYSCONFDIR}/smokeping/basepage.html
share/examples/smokeping/config
@sample ${SYSCONFDIR}/smokeping/config
share/examples/smokeping/cropper/
@sample /var/www/htdocs/smokeping/cropper/
share/examples/smokeping/cropper/cropper.css
@sample /var/www/htdocs/smokeping/cropper/cropper.css
share/examples/smokeping/cropper/cropper.js
@sample /var/www/htdocs/smokeping/cropper/cropper.js
share/examples/smokeping/cropper/cropper.uncompressed.js
@sample /var/www/htdocs/smokeping/cropper/cropper.uncompressed.js
share/examples/smokeping/cropper/lib/
@sample /var/www/htdocs/smokeping/cropper/lib/
share/examples/smokeping/cropper/lib/builder.js
@sample /var/www/htdocs/smokeping/cropper/lib/builder.js
share/examples/smokeping/cropper/lib/controls.js
@sample /var/www/htdocs/smokeping/cropper/lib/controls.js
share/examples/smokeping/cropper/lib/dragdrop.js
@sample /var/www/htdocs/smokeping/cropper/lib/dragdrop.js
share/examples/smokeping/cropper/lib/effects.js
@sample /var/www/htdocs/smokeping/cropper/lib/effects.js
share/examples/smokeping/cropper/lib/prototype.js
@sample /var/www/htdocs/smokeping/cropper/lib/prototype.js
share/examples/smokeping/cropper/lib/prototype.js.LICENSE
@sample /var/www/htdocs/smokeping/cropper/lib/prototype.js.LICENSE
share/examples/smokeping/cropper/lib/scriptaculous.js
@sample /var/www/htdocs/smokeping/cropper/lib/scriptaculous.js
share/examples/smokeping/cropper/lib/slider.js
@sample /var/www/htdocs/smokeping/cropper/lib/slider.js
share/examples/smokeping/cropper/lib/unittest.js
@sample /var/www/htdocs/smokeping/cropper/lib/unittest.js
share/examples/smokeping/cropper/licence.txt
@sample /var/www/htdocs/smokeping/cropper/licence.txt
share/examples/smokeping/cropper/marqueeHoriz.gif
@sample /var/www/htdocs/smokeping/cropper/marqueeHoriz.gif
share/examples/smokeping/cropper/marqueeVert.gif
@sample /var/www/htdocs/smokeping/cropper/marqueeVert.gif
share/examples/smokeping/cropper/smokeping-zoom.js
@sample /var/www/htdocs/smokeping/cropper/smokeping-zoom.js
share/examples/smokeping/smokemail
@sample ${SYSCONFDIR}/smokeping/smokemail
share/examples/smokeping/smokeping.cgi
@mode 0755
@mode 755
@sample /var/www/smokeping/cgi-bin/smokeping.cgi
@mode
share/examples/smokeping/smokeping_secrets
@sample ${SYSCONFDIR}/smokeping/smokeping_secrets
share/examples/smokeping/tmail
@sample ${SYSCONFDIR}/smokeping/tmail
@mode 0755
@owner _smokeping
@group _smokeping
@sample /var/db/smokeping/
@sample /var/www/htdocs/smokeping/
@owner www
@group
@sample /var/www/htdocs/smokeping/img/