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

update to version 2.1.1; from Stuart Henderson

Browse Source 
change MAINTAINER to Stuart as well
This commit is contained in:
jakob 2007-06-29 06:58:22 +00:00
parent 73366c6ce5
commit 37841b96cb
6 changed files with 65 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/smokeping/Makefile
View File

@ -1,17 +1,16 @@
# $OpenBSD: Makefile,v 1.9 2007/04/03 14:53:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2007/06/29 06:58:22 jakob Exp $
COMMENT= "latency logging and graphing system"
VERSION= 2.0.9
VERSION= 2.1.1
DISTNAME= smokeping-${VERSION}
PKGNAME= smokeping-${VERSION}p0
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}pub/
HOMEPAGE= http://oss.oetiker.ch/smokeping/
MAINTAINER= Jakob Schlyter <jakob@openbsd.org>
MAINTAINER= Stuart Henderson <stu@spacehopper.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
@ -20,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
RUN_DEPENDS= ::devel/p5-Config-Grammar \
::net/rrdtool \
:p5-RRD-*:net/rrdtool,-perl \
::net/p5-SNMP_Session \
::net/fping \
::www/p5-CGI-SpeedyCGI
@ -41,7 +40,8 @@ do-install:
@perl -pi -e "s|%%SYSCONFDIR%%|${SYSCONFDIR}|g" \
< ${WRKSRC}/bin/smokeping.dist > ${WRKSRC}/bin/smokeping
${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin/smokeping
@perl -pi -e "s|%%SYSCONFDIR%%|${SYSCONFDIR}|g" \
@perl -pi -e "s|%%SYSCONFDIR%%|${SYSCONFDIR}|g; \
s|%%LOCALBASE%%|${LOCALBASE}|g" \
< ${WRKSRC}/htdocs/smokeping.cgi.dist \
> ${WRKSRC}/htdocs/smokeping.cgi
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/smokeping
@ -56,6 +56,9 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/lib/Smokeping/matchers/*.pm \
${PREFIX}/${PMDIR}/Smokeping/matchers
${INSTALL_DATA_DIR} ${PREFIX}/${PMDIR}/Smokeping/probes
${INSTALL_DATA} ${WRKSRC}/lib/Smokeping/probes/*.pm \
${PREFIX}/${PMDIR}/Smokeping/probes
${INSTALL_DATA_DIR} ${PREFIX}/${PMDIR}/Smokeping/sorters
${INSTALL_DATA} ${WRKSRC}/lib/Smokeping/probes/*.pm \
${PREFIX}/${PMDIR}/Smokeping/probes
${INSTALL_MAN} ${WRKSRC}/doc/smokeping*.1 ${PREFIX}/man/man1
@ -67,6 +70,9 @@ do-install:
${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}/etc/${file}.dist \
${PREFIX}/share/examples/smokeping/${file}

10
net/smokeping/distinfo
View File

@ -1,5 +1,5 @@
MD5 (smokeping-2.0.9.tar.gz) = USwLw4F2RR331mQFCxKD2Q==
RMD160 (smokeping-2.0.9.tar.gz) = PdvjX27GNHc9b6zF1+TBfBd1OYQ=
SHA1 (smokeping-2.0.9.tar.gz) = iUJxIuraX99fYUVwXwgFg/stJFo=
SHA256 (smokeping-2.0.9.tar.gz) = yfwQ0Er64xrFKDEB8CEehC+vmHhDAReIM62h4+Sg3PU=
SIZE (smokeping-2.0.9.tar.gz) = 393777
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

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

@ -1,7 +1,7 @@
$OpenBSD: patch-bin_smokeping_dist,v 1.6 2006/11/22 10:18:32 jakob Exp $
--- bin/smokeping.dist.orig Fri Jul 14 13:17:59 2006
+++ bin/smokeping.dist Wed Nov 22 11:15:06 2006
@@ -1,12 +1,17 @@
$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 @@
-#!/usr/sepp/bin/perl-5.8.4 -w
+#!/usr/bin/perl -w
# -*-perl-*-
@ -9,17 +9,15 @@ $OpenBSD: patch-bin_smokeping_dist,v 1.6 2006/11/22 10:18:32 jakob Exp $
-use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl);
use lib qw(lib);
use Smokeping 2.000009;
use Smokeping 2.001001;
-
-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");
+POSIX::setgid($uid) or die "setgid() to $gid failed, abort\n";
+POSIX::setuid($uid) or die "setuid() to $uid failed, abort\n";
+
+Smokeping::main("%%SYSCONFDIR%%/smokeping/config");
=head1 NAME

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

@ -1,6 +1,6 @@
$OpenBSD: patch-etc_config_dist,v 1.2 2006/06/18 18:05:46 jakob Exp $
--- etc/config.dist.orig Fri Mar 24 17:51:02 2006
+++ etc/config.dist Sun Jun 18 19:38:15 2006
$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
@ -19,8 +19,8 @@ $OpenBSD: patch-etc_config_dist,v 1.2 2006/06/18 18:05:46 jakob Exp $
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 = %%SYSCONFDIR%%/smokeping/smokemail
+tmail = %%SYSCONFDIR%%/smokeping/tmail
+smokemail = /etc/smokeping/smokemail
+tmail = /etc/smokeping/tmail
# specify this to get syslog logging
syslogfacility = local0
# each probe is now run in its own process

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

@ -1,16 +1,16 @@
$OpenBSD: patch-htdocs_smokeping_cgi_dist,v 1.6 2006/11/22 10:18:32 jakob Exp $
--- htdocs/smokeping.cgi.dist.orig Fri Jul 14 13:17:59 2006
+++ htdocs/smokeping.cgi.dist Wed Nov 22 11:15:40 2006
$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 @@
-#!/usr/sepp/bin/speedy -w
+#!/usr/local/bin/speedy -w
+#!%%LOCALBASE%%/bin/speedy -w
# -*-perl-*-
-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.000009;
use Smokeping 2.001001;
-Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
+Smokeping::cgi("%%SYSCONFDIR%%/smokeping/config");

33
net/smokeping/pkg/PLIST
View File

@ -1,15 +1,19 @@
@comment $OpenBSD: PLIST,v 1.7 2006/06/19 19:40:01 jakob Exp $
@comment $OpenBSD: PLIST,v 1.8 2007/06/29 06:58:22 jakob 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/Examples.pm
${PMDIR}/Smokeping/RRDtools.pm
${PMDIR}/Smokeping/ciscoRttMonMIB.pm
${PMDIR}/Smokeping/matchers/
${PMDIR}/Smokeping/matchers/Avgratio.pm
${PMDIR}/Smokeping/matchers/CheckLatency.pm
${PMDIR}/Smokeping/matchers/CheckLoss.pm
${PMDIR}/Smokeping/matchers/Median.pm
${PMDIR}/Smokeping/matchers/Medratio.pm
${PMDIR}/Smokeping/matchers/base.pm
${PMDIR}/Smokeping/probes/
${PMDIR}/Smokeping/probes/AnotherDNS.pm
@ -21,31 +25,43 @@ ${PMDIR}/Smokeping/probes/Curl.pm
${PMDIR}/Smokeping/probes/DNS.pm
${PMDIR}/Smokeping/probes/EchoPing.pm
${PMDIR}/Smokeping/probes/EchoPingChargen.pm
${PMDIR}/Smokeping/probes/EchoPingDNS.pm
${PMDIR}/Smokeping/probes/EchoPingDiscard.pm
${PMDIR}/Smokeping/probes/EchoPingHttp.pm
${PMDIR}/Smokeping/probes/EchoPingHttps.pm
${PMDIR}/Smokeping/probes/EchoPingIcp.pm
${PMDIR}/Smokeping/probes/EchoPingLDAP.pm
${PMDIR}/Smokeping/probes/EchoPingPlugin.pm
${PMDIR}/Smokeping/probes/EchoPingSmtp.pm
${PMDIR}/Smokeping/probes/EchoPingWhois.pm
${PMDIR}/Smokeping/probes/FPing.pm
${PMDIR}/Smokeping/probes/FPing6.pm
${PMDIR}/Smokeping/probes/FTPtransfer.pm
${PMDIR}/Smokeping/probes/IOSPing.pm
${PMDIR}/Smokeping/probes/LDAP.pm
${PMDIR}/Smokeping/probes/Radius.pm
${PMDIR}/Smokeping/probes/RemoteFPing.pm
${PMDIR}/Smokeping/probes/SSH.pm
${PMDIR}/Smokeping/probes/TacacsPlus.pm
${PMDIR}/Smokeping/probes/TelnetIOSPing.pm
${PMDIR}/Smokeping/probes/TelnetJunOSPing.pm
${PMDIR}/Smokeping/probes/WebProxyFilter.pm
${PMDIR}/Smokeping/probes/base.pm
${PMDIR}/Smokeping/probes/basefork.pm
${PMDIR}/Smokeping/probes/basevars.pm
${PMDIR}/Smokeping/probes/passwordchecker.pm
${PMDIR}/Smokeping/probes/skel.pm
${PMDIR}/Smokeping/sorters/
@man man/man1/smokeping.1
@man man/man1/smokeping.cgi.1
share/doc/smokeping/
share/doc/smokeping/Smokeping.txt
share/doc/smokeping/matchers/
share/doc/smokeping/matchers/Avgratio.txt
share/doc/smokeping/matchers/CheckLatency.txt
share/doc/smokeping/matchers/CheckLoss.txt
share/doc/smokeping/matchers/Median.txt
share/doc/smokeping/matchers/Medratio.txt
share/doc/smokeping/matchers/base.txt
share/doc/smokeping/probes/
share/doc/smokeping/probes/AnotherDNS.txt
@ -57,19 +73,27 @@ share/doc/smokeping/probes/Curl.txt
share/doc/smokeping/probes/DNS.txt
share/doc/smokeping/probes/EchoPing.txt
share/doc/smokeping/probes/EchoPingChargen.txt
share/doc/smokeping/probes/EchoPingDNS.txt
share/doc/smokeping/probes/EchoPingDiscard.txt
share/doc/smokeping/probes/EchoPingHttp.txt
share/doc/smokeping/probes/EchoPingHttps.txt
share/doc/smokeping/probes/EchoPingIcp.txt
share/doc/smokeping/probes/EchoPingLDAP.txt
share/doc/smokeping/probes/EchoPingPlugin.txt
share/doc/smokeping/probes/EchoPingSmtp.txt
share/doc/smokeping/probes/EchoPingWhois.txt
share/doc/smokeping/probes/FPing.txt
share/doc/smokeping/probes/FPing6.txt
share/doc/smokeping/probes/FTPtransfer.txt
share/doc/smokeping/probes/IOSPing.txt
share/doc/smokeping/probes/LDAP.txt
share/doc/smokeping/probes/Radius.txt
share/doc/smokeping/probes/RemoteFPing.txt
share/doc/smokeping/probes/SSH.txt
share/doc/smokeping/probes/TacacsPlus.txt
share/doc/smokeping/probes/TelnetIOSPing.txt
share/doc/smokeping/probes/TelnetJunOSPing.txt
share/doc/smokeping/probes/WebProxyFilter.txt
share/doc/smokeping/probes/base.txt
share/doc/smokeping/probes/basefork.txt
share/doc/smokeping/probes/basevars.txt
@ -82,6 +106,12 @@ share/doc/smokeping/smokeping_examples.txt
share/doc/smokeping/smokeping_extend.txt
share/doc/smokeping/smokeping_install.txt
share/doc/smokeping/smokeping_upgrade.txt
share/doc/smokeping/sorters/
share/doc/smokeping/sorters/Loss.txt
share/doc/smokeping/sorters/Max.txt
share/doc/smokeping/sorters/Median.txt
share/doc/smokeping/sorters/StdDev.txt
share/doc/smokeping/sorters/base.txt
share/doc/smokeping/tSmoke.txt
share/examples/smokeping/
@sample ${SYSCONFDIR}/smokeping/
@ -104,7 +134,6 @@ share/examples/smokeping/tmail
@group _smokeping
@sample /var/db/smokeping/
@sample /var/www/htdocs/smokeping/
@mode 0755
@owner www
@group
@sample /var/www/htdocs/smokeping/img/