Thu Feb 2 20:08:41 2012 UTC ()
Pullup ticket #3670 - requested by bouyer
net/smokeping: security update

Revisions pulled up:
- net/smokeping/MESSAGE                                         1.5
- net/smokeping/Makefile                                        1.28
- net/smokeping/PLIST                                           1.12
- net/smokeping/distinfo                                        1.14
- net/smokeping/files/smokeping.conf                            1.2
- net/smokeping/patches/patch-aa                                1.11
- net/smokeping/patches/patch-ab                                1.11
- net/smokeping/patches/patch-ac                                1.9
- net/smokeping/patches/patch-ad                                1.6
- net/smokeping/patches/patch-ae                                1.2
- net/smokeping/patches/patch-af                                1.1
- net/smokeping/patches/patch-ag                                1.1

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Thu Feb  2 18:54:35 UTC 2012

   Modified Files:
   	pkgsrc/net/smokeping: MESSAGE Makefile PLIST distinfo
   	pkgsrc/net/smokeping/files: smokeping.conf
   	pkgsrc/net/smokeping/patches: patch-aa patch-ab patch-ac patch-ad
   	    patch-ae
   Added Files:
   	pkgsrc/net/smokeping/patches: patch-af patch-ag

   Log Message:
   Update smokeping from 2.4.2 to 2.6.7, fixing SA47678.

   Major changes between 2.4 and 2.6:
   New in Version 2.6

       Added automake support for easy "configure, make install" installation
       fixed strftime bug when sending alert mails

   New in Version 2.5

       Switched from SpeedyCGI to FastCGI
       DismanPing probe by Bill Fenner
       OpenSSHJunOSPing (Sponsoerd by Juniper)
       SIP Ping Probe (Sponsored by ANI Networks)
       Support alert patterns with upper AND lower limit: (>a<b)
       SmokeTrace removed. Check out remOcular.
       Updated Prototype and scriptaculous libraries
       ExpLoss matcher by Konoplev V.Konoplev
       Improved slave update performance


(tron)
diff -r1.4 -r1.4.38.1 pkgsrc/net/smokeping/MESSAGE
diff -r1.27 -r1.27.16.1 pkgsrc/net/smokeping/Makefile
diff -r1.11 -r1.11.22.1 pkgsrc/net/smokeping/PLIST
diff -r1.13 -r1.13.30.1 pkgsrc/net/smokeping/distinfo
diff -r1.1 -r1.1.38.1 pkgsrc/net/smokeping/files/smokeping.conf
diff -r1.10 -r1.10.30.1 pkgsrc/net/smokeping/patches/patch-aa
diff -r1.10 -r1.10.30.1 pkgsrc/net/smokeping/patches/patch-ab
diff -r1.8 -r1.8.30.1 pkgsrc/net/smokeping/patches/patch-ac
diff -r1.5 -r1.5.30.1 pkgsrc/net/smokeping/patches/patch-ad
diff -r1.1 -r1.1.30.1 pkgsrc/net/smokeping/patches/patch-ae
diff -r0 -r1.1.2.2 pkgsrc/net/smokeping/patches/patch-af
diff -r0 -r1.1.2.2 pkgsrc/net/smokeping/patches/patch-ag
cvs diff -r1.4 -r1.4.38.1 pkgsrc/net/smokeping/MESSAGE (expand / switch to unified diff)

--- pkgsrc/net/smokeping/MESSAGE 2007/11/22 20:25:54 1.4
+++ pkgsrc/net/smokeping/MESSAGE 2012/02/02 20:08:40 1.4.38.1
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.4 2007/11/22 20:25:54 adrianp Exp $ 2$NetBSD: MESSAGE,v 1.4.38.1 2012/02/02 20:08:40 tron Exp $
3 3
4Smokeping is now installed. 4Smokeping is now installed.
5The documentation can be found at ${PREFIX}/share/doc/smokeping/ 5The documentation can be found at ${PREFIX}/share/doc/smokeping/
6 6
7A sample config file can be found in: 7A sample config file can be found in:
8 ${PREFIX}/share/examples/smokeping/config.dist 8 ${PREFIX}/share/examples/smokeping/config.dist
9 9
10A copy has been installed as ${PKG_SYSCONFDIR}/config and you will 10A copy has been installed as ${PKG_SYSCONFDIR}/config and you will
11need to adjust it as needed. You may also want to have a look at 11need to adjust it as needed. You may also want to have a look at
12basepage.html and smokemail in this directory. 12basepage.html and smokemail in this directory.
13 13
14Make sure that your web's server /cgi-bin/smokeping.cgi refers to 14Make sure that your web's server /cgi-bin/smokeping.cgi refers to
15${PREFIX}/libexec/cgi-bin/smokeping.cgi, or copy the smokeping in your 15${PREFIX}/libexec/cgi-bin/smokeping.cgi, or copy the smokeping in your
16web server's cgi space. 16web server's cgi space.
 17Also make sure that /cropper/ refers to ${PREFIX}/share/httpd/htdocs/cropper/
17 18
18You will need to make smokeping accessible through your HTTP server. 19You will need to make smokeping accessible through your HTTP server.
19If you are running Apache then you may add the following lines to httpd.conf: 20If you are running Apache then you may add the following lines to httpd.conf:
20 21
21 Include ${PKG_SYSCONFDIR}/smokeping.conf 22 Include ${PKG_SYSCONFDIR}/smokeping.conf
22 23
23to make smokeping accessible through: 24to make smokeping accessible through:
24 25
25 http://localhost/cgi-bin/smokeping.cgi 26 http://localhost/cgi-bin/smokeping.cgi
26 27
27Please remember to grant write permissions to the following directory for 28Please remember to grant write permissions to the following directory for
28the user your web server runs as: 29the user your web server runs as:
29 30
cvs diff -r1.27 -r1.27.16.1 pkgsrc/net/smokeping/Makefile (expand / switch to unified diff)

--- pkgsrc/net/smokeping/Makefile 2010/01/27 17:40:30 1.27
+++ pkgsrc/net/smokeping/Makefile 2012/02/02 20:08:40 1.27.16.1
@@ -1,108 +1,93 @@ @@ -1,108 +1,93 @@
1# $NetBSD: Makefile,v 1.27 2010/01/27 17:40:30 joerg Exp $ 1# $NetBSD: Makefile,v 1.27.16.1 2012/02/02 20:08:40 tron Exp $
2 2
3DISTNAME= smokeping-2.4.2 3DISTNAME= smokeping-2.6.7
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ 5MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/
6 6
7MAINTAINER= bouyer@NetBSD.org 7MAINTAINER= bouyer@NetBSD.org
8HOMEPAGE= http://oss.oetiker.ch/smokeping/index.en.html 8HOMEPAGE= http://oss.oetiker.ch/smokeping/index.en.html
9COMMENT= Latency/packet loss monitoring/graphing tool 9COMMENT= Latency/packet loss monitoring/graphing tool
10 10
11PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
 12GNU_CONFIGURE= yes
 13CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db/smokeping
 14CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
 15CONFIGURE_ARGS+= --with-htdocs-dir=${PREFIX}/share/httpd/htdocs
12 16
13DEPENDS+= rrdtool>=1.0:../../databases/rrdtool 17DEPENDS+= rrdtool>=1.0:../../databases/rrdtool
14DEPENDS+= fping>=2.4b2:../../net/fping 18DEPENDS+= fping>=2.4b2:../../net/fping
15DEPENDS+= p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5 19DEPENDS+= p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5
 20DEPENDS+= p5-Digest-HMAC>=1.03:../../security/p5-Digest-HMAC
16DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww 21DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww
 22DEPENDS+= p5-FCGI>=0.74:../../www/p5-FCGI
 23DEPENDS+= p5-Config-Grammar>=1.10:../../devel/p5-Config-Grammar
17 24
18USE_TOOLS+= pax perl:run 25USE_TOOLS+= pax gmake perl:run
19NO_BUILD= YES 
20 26
21PKG_SYSCONFSUBDIR?= smokeping 27PKG_SYSCONFSUBDIR?= smokeping
22SMOKEPING_HOME= ${VARBASE}/db/smokeping 28SMOKEPING_HOME= ${VARBASE}/db/smokeping
23MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 29MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
24BUILD_DEFS+= VARBASE 30BUILD_DEFS+= VARBASE
25 31
26EGDIR= ${PREFIX}/share/examples/smokeping 32EGDIR= ${PREFIX}/share/examples/smokeping
27SPDIR= ${PREFIX}/share/smokeping 33SPDIR= ${PREFIX}/share/smokeping
28CONF_FILES= ${EGDIR}/basepage.html.dist \ 34CONF_FILES= ${EGDIR}/basepage.html.dist \
29 ${PKG_SYSCONFDIR}/basepage.html 35 ${PKG_SYSCONFDIR}/basepage.html
30CONF_FILES+= ${EGDIR}/smokemail.dist ${PKG_SYSCONFDIR}/smokemail 36CONF_FILES+= ${EGDIR}/smokemail.dist ${PKG_SYSCONFDIR}/smokemail
 37CONF_FILES+= ${EGDIR}/smokeping_secrets.dist ${PKG_SYSCONFDIR}/smokeping_secrets
31CONF_FILES+= ${EGDIR}/config.dist ${PKG_SYSCONFDIR}/config 38CONF_FILES+= ${EGDIR}/config.dist ${PKG_SYSCONFDIR}/config
32CONF_FILES+= ${EGDIR}/tmail.dist ${PKG_SYSCONFDIR}/tmail 39CONF_FILES+= ${EGDIR}/tmail.dist ${PKG_SYSCONFDIR}/tmail
33CONF_FILES+= ${EGDIR}/smokeping.conf ${PKG_SYSCONFDIR}/smokeping.conf 40CONF_FILES+= ${EGDIR}/smokeping.conf ${PKG_SYSCONFDIR}/smokeping.conf
 41
34RCD_SCRIPTS= smokeping 42RCD_SCRIPTS= smokeping
35REPLACE_PERL= bin/smokeping.dist bin/tSmoke.dist 43REPLACE_PERL= bin/smokeping_cgi bin/smokeping
 44REPLACE_PERL+= bin/smokeinfo bin/tSmoke
36 45
37.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
38 47
39SUBST_CLASSES+= files 48SUBST_CLASSES+= files
40SUBST_STAGE.files= post-patch 49SUBST_STAGE.files= post-patch
41SUBST_FILES.files= bin/smokeping.dist htdocs/smokeping.cgi.dist \ 50SUBST_FILES.files= etc/config.dist.in bin/smokeping \
42 etc/config.dist etc/smokemail.dist bin/tSmoke.dist \ 51 bin/smokeping_cgi bin/tSmoke \
43 etc/basepage.html.dist smokeping.conf htdocs/tr.cgi.dist 52 htdocs/Makefile.in smokeping.conf
44SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" 53SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g"
45SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g" 54SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g"
46SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 55SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
47SUBST_SED.files+= -e "s|@INTERP@|${INTERP}|g" 56SUBST_SED.files+= -e "s|@INTERP@|${INTERP}|g"
48SUBST_SED.files+= -e "s|perl-5.8.4|perl|g" 
49SUBST_SED.files+= -e "s|/usr/bin/perl|${PERL5}|g" 
50SUBST_SED.files+= -e "s|@SPDIR@|${SPDIR}|g" 57SUBST_SED.files+= -e "s|@SPDIR@|${SPDIR}|g"
51SUBST_SED.files+= -e "s|cropper/|/smokeping/cropper/|g" 
52SUBST_SED.files+= -e "s|= cache|= /smokeping/.simg|g" 
53SUBST_MESSAGE.files= Fixing configuration files. 58SUBST_MESSAGE.files= Fixing configuration files.
54 59
 60SUBST_CLASSES+= libs
 61SUBST_STAGE.libs= post-patch
 62SUBST_FILES.libs= bin/smokeping_cgi bin/smokeping bin/smokeinfo bin/tSmoke
 63SUBST_SED.libs= -e "s|FindBin::Bin/../lib|FindBin::Bin/../lib/smokeping|g"
 64SUBST_MESSAGE.libs= Fixing library path
 65
55OWN_DIRS+= ${SMOKEPING_HOME} 66OWN_DIRS+= ${SMOKEPING_HOME}
56OWN_DIRS+= ${SPDIR}/.simg 67OWN_DIRS+= ${SPDIR}/.simg
57 68
58INSTALLATION_DIRS= bin libexec/cgi-bin 69INSTALLATION_DIRS= bin libexec/cgi-bin share/httpd/htdocs
59 
60.include "options.mk" 
61 70
62post-extract: 71post-extract:
63 ${CP} ${FILESDIR}/smokeping.conf ${WRKSRC} 72 ${CP} ${FILESDIR}/smokeping.conf ${WRKSRC}
64 73
65INSTALLATION_DIRS+= lib/smokeping share/doc/smokeping ${EGDIR} \ 74post-install:
66 ${SPDIR}/cropper ${SPDIR}/resource ${SPDIR}/script 75 for FILE in CHANGES CONTRIBUTORS COPYRIGHT LICENSE README TODO; do \
67 
68do-install: 
69 for FILE in CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO; do \ 
70 ${INSTALL_DATA} \ 76 ${INSTALL_DATA} \
71 ${WRKSRC}/$$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping; \ 77 ${WRKSRC}/$$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping ; \
72 done 78 done
73 79
74 for FILE in ${WRKSRC}/doc/*.txt; do \ 80 ${INSTALL_DATA} ${WRKSRC}/smokeping.conf ${DESTDIR}${EGDIR}
75 ${INSTALL_DATA} $$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping; \ 
76 done 
77 
78 for FILE in ${WRKSRC}/doc/examples/config.*; do \ 
79 ${INSTALL_DATA} $$FILE ${DESTDIR}${EGDIR}; \ 
80 done 
81 81
82 ${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist ${DESTDIR}${PREFIX}/bin/smokeping 82 ${MV} ${DESTDIR}${PREFIX}/share/httpd/htdocs/smokeping.fcgi.dist \
83 ${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke.dist ${DESTDIR}${PREFIX}/bin/tSmoke 83 ${DESTDIR}${PREFIX}/libexec/cgi-bin/smokeping.cgi
 84 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/*.dist ${DESTDIR}${EGDIR}/
 85 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/examples/* ${DESTDIR}${EGDIR}/
 86 ${RMDIR} ${DESTDIR}${PKG_SYSCONFDIR}/examples
84 87
85 ${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi.dist \ 88.include "options.mk"
86 ${DESTDIR}${PREFIX}/libexec/cgi-bin/smokeping.cgi 
87 ${INSTALL_SCRIPT} ${WRKSRC}/htdocs/tr.cgi.dist \ 
88 ${DESTDIR}${PREFIX}/libexec/cgi-bin/tr.cgi 
89 
90 cd ${WRKSRC}/htdocs/cropper && pax -rw -pm . ${DESTDIR}${SPDIR}/cropper 
91 cd ${WRKSRC}/htdocs/resource && pax -rw -pm . ${DESTDIR}${SPDIR}/resource 
92 cd ${WRKSRC}/htdocs/script && pax -rw -pm . ${DESTDIR}${SPDIR}/script 
93 cd ${WRKSRC}/lib && pax -rw -pm . ${DESTDIR}${PREFIX}/lib/smokeping 
94 ${INSTALL_DATA} ${WRKSRC}/htdocs/tr.html ${DESTDIR}${SPDIR} 
95 
96 for FILE in ${WRKSRC}/etc/config.dist \ 
97 ${WRKSRC}/etc/basepage.html.dist \ 
98 ${WRKSRC}/etc/tmail.dist \ 
99 ${WRKSRC}/etc/config.dist \ 
100 ${WRKSRC}/smokeping.conf \ 
101 ${WRKSRC}/etc/smokemail.dist; do \ 
102 ${INSTALL_DATA} $$FILE ${DESTDIR}${EGDIR}; \ 
103 done 
104 89
105 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/smokeping/JSON/*.pm 90INSTALLATION_DIRS+= lib/smokeping share/doc/smokeping ${EGDIR} \
106 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/smokeping/JSON.pm 91 ${SPDIR}/cropper ${SPDIR}/resource ${SPDIR}/script
107 92
108.include "../../mk/bsd.pkg.mk" 93.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.11.22.1 pkgsrc/net/smokeping/PLIST (expand / switch to unified diff)

--- pkgsrc/net/smokeping/PLIST 2009/06/14 18:09:43 1.11
+++ pkgsrc/net/smokeping/PLIST 2012/02/02 20:08:40 1.11.22.1
@@ -1,171 +1,169 @@ @@ -1,171 +1,169 @@
1@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:09:43 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.11.22.1 2012/02/02 20:08:40 tron Exp $
 2bin/smokeinfo
2bin/smokeping 3bin/smokeping
 4bin/smokeping_cgi
3bin/tSmoke 5bin/tSmoke
4lib/smokeping/BER.pm 6lib/smokeping/BER.pm
5lib/smokeping/CGI/Session.pm 
6lib/smokeping/CGI/Session/Driver.pm 
7lib/smokeping/CGI/Session/Driver/DBI.pm 
8lib/smokeping/CGI/Session/Driver/db_file.pm 
9lib/smokeping/CGI/Session/Driver/file.pm 
10lib/smokeping/CGI/Session/Driver/mysql.pm 
11lib/smokeping/CGI/Session/Driver/postgresql.pm 
12lib/smokeping/CGI/Session/Driver/sqlite.pm 
13lib/smokeping/CGI/Session/ErrorHandler.pm 
14lib/smokeping/CGI/Session/ID/incr.pm 
15lib/smokeping/CGI/Session/ID/md5.pm 
16lib/smokeping/CGI/Session/ID/static.pm 
17lib/smokeping/CGI/Session/Serialize/default.pm 
18lib/smokeping/CGI/Session/Serialize/freezethaw.pm 
19lib/smokeping/CGI/Session/Serialize/json.pm 
20lib/smokeping/CGI/Session/Serialize/storable.pm 
21lib/smokeping/CGI/Session/Serialize/yaml.pm 
22lib/smokeping/CGI/Session/Test/Default.pm 
23lib/smokeping/CGI/Session/Tutorial.pm 
24lib/smokeping/Config/Grammar.pm 
25lib/smokeping/Config/Grammar/Document.pm 
26lib/smokeping/Config/Grammar/Dynamic.pm 
27lib/smokeping/Digest/HMAC.LICENSE 
28lib/smokeping/Digest/HMAC.pm 
29lib/smokeping/Digest/HMAC_MD5.pm 
30lib/smokeping/Digest/HMAC_SHA1.pm 
31lib/smokeping/JSON.pm 
32lib/smokeping/JSON/Converter.pm 
33lib/smokeping/JSON/PP.pm 
34lib/smokeping/JSON/PP5005.pm 
35lib/smokeping/JSON/PP56.pm 
36lib/smokeping/JSON/Parser.pm 
37lib/smokeping/Qooxdoo/JSONRPC.pm 
38lib/smokeping/Qooxdoo/Services/Tr.pm 
39lib/smokeping/SNMP_Session.pm 7lib/smokeping/SNMP_Session.pm
40lib/smokeping/SNMP_util.pm 8lib/smokeping/SNMP_util.pm
41lib/smokeping/Smokeping.pm 9lib/smokeping/Smokeping.pm
42lib/smokeping/Smokeping/Colorspace.pm 10lib/smokeping/Smokeping/Colorspace.pm
43lib/smokeping/Smokeping/Config.pm 11lib/smokeping/Smokeping/Config.pm
44lib/smokeping/Smokeping/Examples.pm 12lib/smokeping/Smokeping/Examples.pm
45lib/smokeping/Smokeping/Graphs.pm 13lib/smokeping/Smokeping/Graphs.pm
 14lib/smokeping/Smokeping/Info.pm
46lib/smokeping/Smokeping/Master.pm 15lib/smokeping/Smokeping/Master.pm
47lib/smokeping/Smokeping/RRDhelpers.pm 16lib/smokeping/Smokeping/RRDhelpers.pm
48lib/smokeping/Smokeping/RRDtools.pm 17lib/smokeping/Smokeping/RRDtools.pm
49lib/smokeping/Smokeping/Slave.pm 18lib/smokeping/Smokeping/Slave.pm
50lib/smokeping/Smokeping/ciscoRttMonMIB.pm 19lib/smokeping/Smokeping/ciscoRttMonMIB.pm
51lib/smokeping/Smokeping/matchers/Avgratio.pm 20lib/smokeping/Smokeping/matchers/Avgratio.pm
52lib/smokeping/Smokeping/matchers/CheckLatency.pm 21lib/smokeping/Smokeping/matchers/CheckLatency.pm
53lib/smokeping/Smokeping/matchers/CheckLoss.pm 22lib/smokeping/Smokeping/matchers/CheckLoss.pm
 23lib/smokeping/Smokeping/matchers/ExpLoss.pm
54lib/smokeping/Smokeping/matchers/Median.pm 24lib/smokeping/Smokeping/matchers/Median.pm
55lib/smokeping/Smokeping/matchers/Medratio.pm 25lib/smokeping/Smokeping/matchers/Medratio.pm
56lib/smokeping/Smokeping/matchers/base.pm 26lib/smokeping/Smokeping/matchers/base.pm
 27lib/smokeping/Smokeping/pingMIB.pm
57lib/smokeping/Smokeping/probes/AnotherDNS.pm 28lib/smokeping/Smokeping/probes/AnotherDNS.pm
58lib/smokeping/Smokeping/probes/AnotherSSH.pm 29lib/smokeping/Smokeping/probes/AnotherSSH.pm
59lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm 30lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm
60lib/smokeping/Smokeping/probes/CiscoRTTMonEchoICMP.pm 31lib/smokeping/Smokeping/probes/CiscoRTTMonEchoICMP.pm
61lib/smokeping/Smokeping/probes/CiscoRTTMonTcpConnect.pm 32lib/smokeping/Smokeping/probes/CiscoRTTMonTcpConnect.pm
62lib/smokeping/Smokeping/probes/Curl.pm 33lib/smokeping/Smokeping/probes/Curl.pm
63lib/smokeping/Smokeping/probes/DNS.pm 34lib/smokeping/Smokeping/probes/DNS.pm
 35lib/smokeping/Smokeping/probes/DismanPing.pm
64lib/smokeping/Smokeping/probes/EchoPing.pm 36lib/smokeping/Smokeping/probes/EchoPing.pm
65lib/smokeping/Smokeping/probes/EchoPingChargen.pm 37lib/smokeping/Smokeping/probes/EchoPingChargen.pm
66lib/smokeping/Smokeping/probes/EchoPingDNS.pm 38lib/smokeping/Smokeping/probes/EchoPingDNS.pm
67lib/smokeping/Smokeping/probes/EchoPingDiscard.pm 39lib/smokeping/Smokeping/probes/EchoPingDiscard.pm
68lib/smokeping/Smokeping/probes/EchoPingHttp.pm 40lib/smokeping/Smokeping/probes/EchoPingHttp.pm
69lib/smokeping/Smokeping/probes/EchoPingHttps.pm 41lib/smokeping/Smokeping/probes/EchoPingHttps.pm
70lib/smokeping/Smokeping/probes/EchoPingIcp.pm 42lib/smokeping/Smokeping/probes/EchoPingIcp.pm
71lib/smokeping/Smokeping/probes/EchoPingLDAP.pm 43lib/smokeping/Smokeping/probes/EchoPingLDAP.pm
72lib/smokeping/Smokeping/probes/EchoPingPlugin.pm 44lib/smokeping/Smokeping/probes/EchoPingPlugin.pm
73lib/smokeping/Smokeping/probes/EchoPingSmtp.pm 45lib/smokeping/Smokeping/probes/EchoPingSmtp.pm
74lib/smokeping/Smokeping/probes/EchoPingWhois.pm 46lib/smokeping/Smokeping/probes/EchoPingWhois.pm
75lib/smokeping/Smokeping/probes/FPing.pm 47lib/smokeping/Smokeping/probes/FPing.pm
76lib/smokeping/Smokeping/probes/FPing6.pm 48lib/smokeping/Smokeping/probes/FPing6.pm
77lib/smokeping/Smokeping/probes/FTPtransfer.pm 49lib/smokeping/Smokeping/probes/FTPtransfer.pm
78lib/smokeping/Smokeping/probes/IOSPing.pm 50lib/smokeping/Smokeping/probes/IOSPing.pm
79lib/smokeping/Smokeping/probes/LDAP.pm 51lib/smokeping/Smokeping/probes/LDAP.pm
 52lib/smokeping/Smokeping/probes/NFSping.pm
 53lib/smokeping/Smokeping/probes/OpenSSHJunOSPing.pm
80lib/smokeping/Smokeping/probes/Radius.pm 54lib/smokeping/Smokeping/probes/Radius.pm
81lib/smokeping/Smokeping/probes/RemoteFPing.pm 55lib/smokeping/Smokeping/probes/RemoteFPing.pm
82lib/smokeping/Smokeping/probes/SSH.pm 56lib/smokeping/Smokeping/probes/SSH.pm
 57lib/smokeping/Smokeping/probes/SipSak.pm
83lib/smokeping/Smokeping/probes/TCPPing.pm 58lib/smokeping/Smokeping/probes/TCPPing.pm
84lib/smokeping/Smokeping/probes/TacacsPlus.pm 59lib/smokeping/Smokeping/probes/TacacsPlus.pm
85lib/smokeping/Smokeping/probes/TelnetIOSPing.pm 60lib/smokeping/Smokeping/probes/TelnetIOSPing.pm
86lib/smokeping/Smokeping/probes/TelnetJunOSPing.pm 61lib/smokeping/Smokeping/probes/TelnetJunOSPing.pm
87lib/smokeping/Smokeping/probes/WebProxyFilter.pm 62lib/smokeping/Smokeping/probes/WebProxyFilter.pm
88lib/smokeping/Smokeping/probes/base.pm 63lib/smokeping/Smokeping/probes/base.pm
89lib/smokeping/Smokeping/probes/basefork.pm 64lib/smokeping/Smokeping/probes/basefork.pm
90lib/smokeping/Smokeping/probes/basevars.pm 65lib/smokeping/Smokeping/probes/basevars.pm
91lib/smokeping/Smokeping/probes/passwordchecker.pm 66lib/smokeping/Smokeping/probes/passwordchecker.pm
92lib/smokeping/Smokeping/probes/skel.pm 67lib/smokeping/Smokeping/probes/skel.pm
93lib/smokeping/Smokeping/sorters/Loss.pm 68lib/smokeping/Smokeping/sorters/Loss.pm
94lib/smokeping/Smokeping/sorters/Max.pm 69lib/smokeping/Smokeping/sorters/Max.pm
95lib/smokeping/Smokeping/sorters/Median.pm 70lib/smokeping/Smokeping/sorters/Median.pm
96lib/smokeping/Smokeping/sorters/StdDev.pm 71lib/smokeping/Smokeping/sorters/StdDev.pm
97lib/smokeping/Smokeping/sorters/base.pm 72lib/smokeping/Smokeping/sorters/base.pm
98libexec/cgi-bin/smokeping.cgi 73libexec/cgi-bin/smokeping.cgi
99libexec/cgi-bin/tr.cgi 74man/man1/smokeping.1
 75man/man1/smokeping_cgi.1
 76man/man1/tSmoke.1
 77man/man3/Smokeping_matchers_Avgratio.3
 78man/man3/Smokeping_matchers_CheckLatency.3
 79man/man3/Smokeping_matchers_CheckLoss.3
 80man/man3/Smokeping_matchers_ExpLoss.3
 81man/man3/Smokeping_matchers_Median.3
 82man/man3/Smokeping_matchers_Medratio.3
 83man/man3/Smokeping_matchers_base.3
 84man/man3/Smokeping_probes_AnotherDNS.3
 85man/man3/Smokeping_probes_AnotherSSH.3
 86man/man3/Smokeping_probes_CiscoRTTMonDNS.3
 87man/man3/Smokeping_probes_CiscoRTTMonEchoICMP.3
 88man/man3/Smokeping_probes_CiscoRTTMonTcpConnect.3
 89man/man3/Smokeping_probes_Curl.3
 90man/man3/Smokeping_probes_DNS.3
 91man/man3/Smokeping_probes_DismanPing.3
 92man/man3/Smokeping_probes_EchoPing.3
 93man/man3/Smokeping_probes_EchoPingChargen.3
 94man/man3/Smokeping_probes_EchoPingDNS.3
 95man/man3/Smokeping_probes_EchoPingDiscard.3
 96man/man3/Smokeping_probes_EchoPingHttp.3
 97man/man3/Smokeping_probes_EchoPingHttps.3
 98man/man3/Smokeping_probes_EchoPingIcp.3
 99man/man3/Smokeping_probes_EchoPingLDAP.3
 100man/man3/Smokeping_probes_EchoPingPlugin.3
 101man/man3/Smokeping_probes_EchoPingSmtp.3
 102man/man3/Smokeping_probes_EchoPingWhois.3
 103man/man3/Smokeping_probes_FPing.3
 104man/man3/Smokeping_probes_FPing6.3
 105man/man3/Smokeping_probes_FTPtransfer.3
 106man/man3/Smokeping_probes_IOSPing.3
 107man/man3/Smokeping_probes_LDAP.3
 108man/man3/Smokeping_probes_NFSping.3
 109man/man3/Smokeping_probes_OpenSSHJunOSPing.3
 110man/man3/Smokeping_probes_Radius.3
 111man/man3/Smokeping_probes_RemoteFPing.3
 112man/man3/Smokeping_probes_SSH.3
 113man/man3/Smokeping_probes_SipSak.3
 114man/man3/Smokeping_probes_TCPPing.3
 115man/man3/Smokeping_probes_TacacsPlus.3
 116man/man3/Smokeping_probes_TelnetIOSPing.3
 117man/man3/Smokeping_probes_TelnetJunOSPing.3
 118man/man3/Smokeping_probes_WebProxyFilter.3
 119man/man3/Smokeping_probes_base.3
 120man/man3/Smokeping_probes_basefork.3
 121man/man3/Smokeping_probes_basevars.3
 122man/man3/Smokeping_probes_passwordchecker.3
 123man/man3/Smokeping_probes_skel.3
 124man/man3/Smokeping_sorters_Loss.3
 125man/man3/Smokeping_sorters_Max.3
 126man/man3/Smokeping_sorters_Median.3
 127man/man3/Smokeping_sorters_StdDev.3
 128man/man3/Smokeping_sorters_base.3
 129man/man5/smokeping_config.5
 130man/man5/smokeping_examples.5
 131man/man7/smokeping_extend.7
 132man/man7/smokeping_install.7
 133man/man7/smokeping_master_slave.7
 134man/man7/smokeping_upgrade.7
100share/doc/smokeping/CHANGES 135share/doc/smokeping/CHANGES
101share/doc/smokeping/CONTRIBUTORS 136share/doc/smokeping/CONTRIBUTORS
102share/doc/smokeping/COPYING 
103share/doc/smokeping/COPYRIGHT 137share/doc/smokeping/COPYRIGHT
 138share/doc/smokeping/LICENSE
104share/doc/smokeping/README 139share/doc/smokeping/README
105share/doc/smokeping/Smokeping.txt 
106share/doc/smokeping/TODO 140share/doc/smokeping/TODO
107share/doc/smokeping/smokeping.cgi.txt 
108share/doc/smokeping/smokeping.txt 
109share/doc/smokeping/smokeping_config.txt 
110share/doc/smokeping/smokeping_examples.txt 
111share/doc/smokeping/smokeping_extend.txt 
112share/doc/smokeping/smokeping_install.txt 
113share/doc/smokeping/smokeping_master_slave.txt 
114share/doc/smokeping/smokeping_upgrade.txt 
115share/doc/smokeping/smoketrace.txt 
116share/doc/smokeping/tSmoke.txt 
117share/examples/rc.d/smokeping 141share/examples/rc.d/smokeping
118share/examples/smokeping/basepage.html.dist 142share/examples/smokeping/basepage.html.dist
119share/examples/smokeping/config.dist 143share/examples/smokeping/config.dist
120share/examples/smokeping/config.echoping 144share/examples/smokeping/config.echoping
121share/examples/smokeping/config.fping-instances 145share/examples/smokeping/config.fping-instances
122share/examples/smokeping/config.multiple-probes 146share/examples/smokeping/config.multiple-probes
123share/examples/smokeping/config.simple 147share/examples/smokeping/config.simple
124share/examples/smokeping/config.targetvars-with-Curl 148share/examples/smokeping/config.targetvars-with-Curl
125share/examples/smokeping/config.template 149share/examples/smokeping/config.template
126share/examples/smokeping/smokemail.dist 150share/examples/smokeping/smokemail.dist
 151share/examples/smokeping/smokeping_secrets.dist
127share/examples/smokeping/smokeping.conf 152share/examples/smokeping/smokeping.conf
128share/examples/smokeping/tmail.dist 153share/examples/smokeping/tmail.dist
129share/smokeping/cropper/cropper.css 154share/httpd/htdocs/cropper/cropper.css
130share/smokeping/cropper/cropper.js 155share/httpd/htdocs/cropper/cropper.js
131share/smokeping/cropper/cropper.uncompressed.js 156share/httpd/htdocs/cropper/cropper.uncompressed.js
132share/smokeping/cropper/lib/builder.js 157share/httpd/htdocs/cropper/lib/builder.js
133share/smokeping/cropper/lib/controls.js 158share/httpd/htdocs/cropper/lib/controls.js
134share/smokeping/cropper/lib/dragdrop.js 159share/httpd/htdocs/cropper/lib/dragdrop.js
135share/smokeping/cropper/lib/effects.js 160share/httpd/htdocs/cropper/lib/effects.js
136share/smokeping/cropper/lib/prototype.js 161share/httpd/htdocs/cropper/lib/prototype.js
137share/smokeping/cropper/lib/prototype.js.LICENSE 162share/httpd/htdocs/cropper/lib/scriptaculous.js
138share/smokeping/cropper/lib/scriptaculous.js 163share/httpd/htdocs/cropper/lib/slider.js
139share/smokeping/cropper/lib/slider.js 164share/httpd/htdocs/cropper/lib/sound.js
140share/smokeping/cropper/lib/unittest.js 165share/httpd/htdocs/cropper/lib/unittest.js
141share/smokeping/cropper/licence.txt 166share/httpd/htdocs/cropper/licence.txt
142share/smokeping/cropper/marqueeHoriz.gif 167share/httpd/htdocs/cropper/marqueeHoriz.gif
143share/smokeping/cropper/marqueeVert.gif 168share/httpd/htdocs/cropper/marqueeVert.gif
144share/smokeping/cropper/smokeping-zoom.js 169share/httpd/htdocs/cropper/smokeping-zoom.js
145share/smokeping/resource/Tr/image/ajax-loader.gif 
146share/smokeping/resource/qx/icon/CrystalClear/16/actions/view-refresh.png 
147share/smokeping/resource/qx/icon/Nuvola/16/actions/view-refresh.png 
148share/smokeping/resource/qx/static/image/blank.gif 
149share/smokeping/resource/qx/static/image/dotted_white.gif 
150share/smokeping/resource/qx/widget/Windows/arrows/down.gif 
151share/smokeping/resource/qx/widget/Windows/arrows/down_small.gif 
152share/smokeping/resource/qx/widget/Windows/arrows/next.gif 
153share/smokeping/resource/qx/widget/Windows/arrows/up.gif 
154share/smokeping/resource/qx/widget/Windows/arrows/up_small.gif 
155share/smokeping/resource/qx/widget/Windows/cursors/alias.gif 
156share/smokeping/resource/qx/widget/Windows/cursors/copy.gif 
157share/smokeping/resource/qx/widget/Windows/cursors/move.gif 
158share/smokeping/resource/qx/widget/Windows/cursors/nodrop.gif 
159share/smokeping/resource/qx/widget/Windows/menu/checkbox.gif 
160share/smokeping/resource/qx/widget/Windows/menu/radiobutton.gif 
161share/smokeping/resource/qx/widget/Windows/splitpane/knob-horizontal.png 
162share/smokeping/resource/qx/widget/Windows/splitpane/knob-vertical.png 
163share/smokeping/resource/qx/widget/Windows/table/ascending.png 
164share/smokeping/resource/qx/widget/Windows/table/descending.png 
165share/smokeping/resource/qx/widget/Windows/table/selectColumnOrder.png 
166share/smokeping/resource/qx/widget/Windows/window/close.gif 
167share/smokeping/resource/qx/widget/Windows/window/maximize.gif 
168share/smokeping/resource/qx/widget/Windows/window/minimize.gif 
169share/smokeping/resource/qx/widget/Windows/window/restore.gif 
170share/smokeping/script/Tr.js 
171share/smokeping/tr.html 
cvs diff -r1.13 -r1.13.30.1 pkgsrc/net/smokeping/distinfo (expand / switch to unified diff)

--- pkgsrc/net/smokeping/distinfo 2008/08/17 11:09:10 1.13
+++ pkgsrc/net/smokeping/distinfo 2012/02/02 20:08:40 1.13.30.1
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: distinfo,v 1.13 2008/08/17 11:09:10 adrianp Exp $ 1$NetBSD: distinfo,v 1.13.30.1 2012/02/02 20:08:40 tron Exp $
2 2
3SHA1 (smokeping-2.4.2.tar.gz) = 055d65c7e3c49cd0d6e8f96242131fe69dc3110e 3SHA1 (smokeping-2.6.7.tar.gz) = bc0b118164f00f79f6264f46ccb129acd1962dfc
4RMD160 (smokeping-2.4.2.tar.gz) = 4c91f1c6be77ef4d851821f5c0a8a60be0770527 4RMD160 (smokeping-2.6.7.tar.gz) = 126adae8ec55d7119ce57daf135327b56625ba3b
5Size (smokeping-2.4.2.tar.gz) = 909514 bytes 5Size (smokeping-2.6.7.tar.gz) = 423151 bytes
6SHA1 (patch-aa) = 71a76129c337bfb40b226503f09118204cafebec 6SHA1 (patch-aa) = 1926aa6ebe13b06fc4cf2fae903f32b79b4f610a
7SHA1 (patch-ab) = 0649530b924fcdc3ba0b082faada6d048a1dacfc 7SHA1 (patch-ab) = 9258886479491e991408e07ebdf23b6fcb770f96
8SHA1 (patch-ac) = 14232cf5e5ad9e90308e9541f42149bcccc4027d 8SHA1 (patch-ac) = fdad1384d1925cc41e200e7a95834f76e6780fb4
9SHA1 (patch-ad) = 8a41972bd8c3b6cb7bf5d8e1daa4a194b2ef9be2 9SHA1 (patch-ad) = 1b5581b88054182115ce4f667dbaaeea10596acd
10SHA1 (patch-ae) = e243eaeb2a9377647392f3501e29e210b844084b 10SHA1 (patch-ae) = 45410102cd230d4514d8d493655a3fa9302c3e0e
 11SHA1 (patch-af) = ecb2c6f5beed570def7e4dd830864bb82b92654f
 12SHA1 (patch-ag) = f200c0522db44e08d475f1a0895ee14e01663fd8
cvs diff -r1.1 -r1.1.38.1 pkgsrc/net/smokeping/files/smokeping.conf (expand / switch to unified diff)

--- pkgsrc/net/smokeping/files/smokeping.conf 2007/11/22 20:25:54 1.1
+++ pkgsrc/net/smokeping/files/smokeping.conf 2012/02/02 20:08:40 1.1.38.1
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1# $NetBSD: smokeping.conf,v 1.1 2007/11/22 20:25:54 adrianp Exp $ 1# $NetBSD: smokeping.conf,v 1.1.38.1 2012/02/02 20:08:40 tron Exp $
2# 2#
3# smokeping configuration file fragment for Apache 3# smokeping configuration file fragment for Apache
4 4
5<IfModule mod_alias.c> 5<IfModule mod_alias.c>
6 Alias /smokeping/ "@SPDIR@/" 6 Alias /smokeping/ "@SPDIR@/"
 7 Alias /cropper/ "@PREFIX@/share/httpd/htdocs/cropper/"
7</IfModule> 8</IfModule>
8 9
9<Directory "@SPDIR@"> 10<Directory "@SPDIR@">
10 Order allow,deny 11 Order allow,deny
11 Allow from all 12 Allow from all
12</Directory> 13</Directory>
cvs diff -r1.10 -r1.10.30.1 pkgsrc/net/smokeping/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/smokeping/patches/patch-aa 2008/08/17 11:09:10 1.10
+++ pkgsrc/net/smokeping/patches/patch-aa 2012/02/02 20:08:41 1.10.30.1
@@ -1,41 +1,13 @@ @@ -1,41 +1,13 @@
1$NetBSD: patch-aa,v 1.10 2008/08/17 11:09:10 adrianp Exp $ 1$NetBSD: patch-aa,v 1.10.30.1 2012/02/02 20:08:41 tron Exp $
2 2
3--- bin/smokeping.dist.orig 2008-07-24 18:37:05.000000000 +0100 3--- bin/smokeping.orig 2012-02-02 15:09:15.000000000 +0100
4+++ bin/smokeping.dist 4+++ bin/smokeping 2012-02-02 15:10:46.000000000 +0100
5@@ -1,13 +1,12 @@ 5@@ -11,7 +11,7 @@
6 #!/usr/bin/perl -w 
7 # -*-perl-*- 
8  6
9-use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl); 7 use Smokeping;
10-use lib qw(lib); 
11+use lib qw(@PREFIX@/lib/smokeping); 
12 use strict; 
13 use warnings; 
14 use Smokeping 2.004002; 
15  8
16-Smokeping::main("etc/config.dist"); 9-Smokeping::main("$FindBin::Bin/../etc/config");
17+Smokeping::main("@PKG_SYSCONFDIR@/config"); 10+Smokeping::main("@PKG_SYSCONFDIR@/config");
18  11
19 =head1 NAME 12 =head1 NAME
20  13
21@@ -132,17 +131,17 @@ local system. Three paths have to be ent 
22  
23 One pointing to your B<rrdtool> installation 
24  
25- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); 
26+ use lib qw(@PREFIX@/lib/smokeping); 
27  
28 One pointing to the place where you have installed the SmokePing libraries 
29  
30- use lib qw(/home/oetiker/public_html/smokeping/lib); 
31+ use lib qw(@PREFIX@/lib/smokeping); 
32  
33 The third path is the argument to the Smokeping::main command. It points to 
34 the SmokePing configuration file. 
35  
36 use Smokeping; 
37- Smokeping::main("/home/oetiker/.smokeping/config"); 
38+ Smokeping::main("@PKG_SYSCONFDIR@/config"); 
39  
40 =head1 COPYRIGHT 
41  
cvs diff -r1.10 -r1.10.30.1 pkgsrc/net/smokeping/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/smokeping/patches/patch-ab 2008/08/17 11:09:10 1.10
+++ pkgsrc/net/smokeping/patches/patch-ab 2012/02/02 20:08:41 1.10.30.1
@@ -1,46 +1,13 @@ @@ -1,46 +1,13 @@
1$NetBSD: patch-ab,v 1.10 2008/08/17 11:09:10 adrianp Exp $ 1$NetBSD: patch-ab,v 1.10.30.1 2012/02/02 20:08:41 tron Exp $
2 2
3--- htdocs/smokeping.cgi.dist.orig 2008-07-24 18:37:05.000000000 +0100 3--- bin/smokeping_cgi.orig 2012-02-02 15:12:05.000000000 +0100
4+++ htdocs/smokeping.cgi.dist 4+++ bin/smokeping_cgi 2012-02-02 15:12:35.000000000 +0100
5@@ -1,17 +1,16 @@ 5@@ -18,7 +18,7 @@
6-#!/usr/bin/speedy 
7+#!@PREFIX@/@INTERP@ -w 
8 # -*-perl-*- 
9  6
10 use strict; 7 use CGI::Fast;
11 use warnings; 
12  8
13-use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl); 9-my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config";
14-use lib qw(/home/oetiker/checkouts/smokeping/trunk/software/lib); 10+my $cfg = (shift @ARGV) || "@PKG_SYSCONFDIR@/config";
15+use lib qw(@PREFIX@/lib/smokeping); 
16  11
17 use CGI::Carp qw(fatalsToBrowser); 
18  12
19 use Smokeping 2.004002; 13 while (my $q = new CGI::Fast) {
20  
21-Smokeping::cgi("/home/oetiker/checkouts/smokeping/trunk/software/etc/config.dist"); 
22+Smokeping::cgi("@PKG_SYSCONFDIR@/config"); 
23  
24 =head1 NAME 
25  
26@@ -41,17 +40,17 @@ Please refer to the installation documen 
27 When installing SmokePing, this file has to be adjusted to fit your 
28 local system. Three paths have to be entered. 
29  
30- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); 
31+ use lib qw(@PREFIX@/lib/smokeping); 
32  
33 One pointing to your B<rrdtool> installation 
34  
35- use lib qw(/home/oetiker/public_html/smokeping/lib); 
36+ use lib qw(@PREFIX@/lib/smokeping); 
37  
38 One pointing to the place where you have installed the SmokePing libraries 
39  
40 use Smokeping; 
41  
42- Smokeping::cgi("/home/oetiker/.smokeping/config"); 
43+ Smokeping::cgi("@PKG_SYSCONFDIR@/config"); 
44  
45 The third path is the argument to the Smokeping::cgi command. It points to 
46 the SmokePing configuration file. 
cvs diff -r1.8 -r1.8.30.1 pkgsrc/net/smokeping/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/smokeping/patches/patch-ac 2008/08/17 11:09:10 1.8
+++ pkgsrc/net/smokeping/patches/patch-ac 2012/02/02 20:08:41 1.8.30.1
@@ -1,52 +1,55 @@ @@ -1,52 +1,55 @@
1$NetBSD: patch-ac,v 1.8 2008/08/17 11:09:10 adrianp Exp $ 1$NetBSD: patch-ac,v 1.8.30.1 2012/02/02 20:08:41 tron Exp $
2 2
3--- etc/config.dist.orig 2008-07-24 18:36:57.000000000 +0100 3--- etc/config.dist.in.orig 2011-10-30 11:33:11.000000000 +0100
4+++ etc/config.dist 4+++ etc/config.dist.in 2012-02-02 16:51:40.000000000 +0100
5@@ -1,19 +1,19 @@ 5@@ -1,19 +1,19 @@
6 *** General *** 6 *** General ***
7  7
8-owner = Peter Random 8-owner = Peter Random
9-contact = some@address.nowhere 9-contact = some@address.nowhere
10-mailhost = my.mail.host 10-mailhost = my.mail.host
11-sendmail = /usr/lib/sendmail 
12+owner = Charlie Root 11+owner = Charlie Root
13+contact = root@localhost 12+contact = root@localhost
14+mailhost = localhost 13+mailhost = localhost
15+sendmail = /usr/sbin/sendmail 14 sendmail = @SENDMAIL@
16 # NOTE: do not put the Image Cache below cgi-bin 15 # NOTE: do not put the Image Cache below cgi-bin
17 # since all files under cgi-bin will be executed ... this is not 16 # since all files under cgi-bin will be executed ... this is not
18 # good for images. 17 # good for images.
19-imgcache = /home/oetiker/public_html/smokeping-ms/cache 18-imgcache = @prefix@/cache
20+imgcache = @SPDIR@/.simg 19+imgcache = @SPDIR@/.simg
21 imgurl = cache 20 imgurl = cache
22-datadir = /tmp/smokeping-ms/data 21-datadir = @prefix@/data
23-piddir = /tmp/smokeping-ms/var 22-piddir = @prefix@/var
24-cgiurl = http://some.url/smokeping.cgi 23-cgiurl = http://some.url/smokeping.cgi
25-smokemail = /home/oetiker/checkouts/smokeping/trunk/software/etc/smokemail.dist 24-smokemail = @prefix@/etc/smokemail.dist
26-tmail = /home/oetiker/checkouts/smokeping/trunk/software/etc/tmail.dist 25-tmail = @prefix@/etc/tmail.dist
27+datadir = @VARBASE@/db/smokeping 26+datadir = @VARBASE@/db/smokeping
28+piddir = @VARBASE@/run 27+piddir = @VARBASE@/run
29+cgiurl = http://localhost/cgi-bin/smokeping.cgi 28+cgiurl = http://localhost/cgi-bin/smokeping.cgi
30+smokemail = @PREFIX@/etc/smokeping/smokemail 29+smokemail = @PKG_SYSCONFDIR@/smokemail
31+tmail = @PKG_SYSCONFDIR@/tmail 30+tmail = @PKG_SYSCONFDIR@/tmail
32 # specify this to get syslog logging 31 # specify this to get syslog logging
33 syslogfacility = local0 32 syslogfacility = local0
34 # each probe is now run in its own process 33 # each probe is now run in its own process
35@@ -47,7 +47,7 @@ AVERAGE 0.5 144 720 34@@ -47,7 +47,7 @@
36  35
37 *** Presentation *** 36 *** Presentation ***
38  37
39-template = /home/oetiker/checkouts/smokeping/trunk/software/etc/basepage.html.dist 38-template = @prefix@/etc/basepage.html.dist
40+template = @PKG_SYSCONFDIR@/basepage.html 39+template = @PKG_SYSCONFDIR@/basepage.html
41  40
42 + charts 41 + charts
43  42
44@@ -105,7 +105,7 @@ unison_tolerance = 2 43@@ -105,10 +105,10 @@
45  44
46 + FPing 45 + FPing
47  46
48-binary = /usr/sbin/fping 47-binary = /usr/sbin/fping
49+binary = @PREFIX@/sbin/fping 48+binary = @PREFIX@/sbin/fping
50  49
51 *** Slaves *** 50 *** Slaves ***
52 secrets=/home/oetiker/checkouts/smokeping/trunk/software/etc/smokeping_secrets.dist 51-secrets=@prefix@/etc/smokeping_secrets.dist
 52+secrets=@PKG_SYSCONFDIR@/smokeping_secrets
 53 +boomer
 54 display_name=boomer
 55 color=0000ff
cvs diff -r1.5 -r1.5.30.1 pkgsrc/net/smokeping/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/smokeping/patches/patch-ad 2008/08/17 11:09:10 1.5
+++ pkgsrc/net/smokeping/patches/patch-ad 2012/02/02 20:08:41 1.5.30.1
@@ -1,56 +1,13 @@ @@ -1,56 +1,13 @@
1$NetBSD: patch-ad,v 1.5 2008/08/17 11:09:10 adrianp Exp $ 1$NetBSD: patch-ad,v 1.5.30.1 2012/02/02 20:08:41 tron Exp $
2 2
3--- bin/tSmoke.dist.orig 2008-07-24 18:37:05.000000000 +0100 3--- bin/tSmoke.orig 2012-02-02 15:16:10.000000000 +0100
4+++ bin/tSmoke.dist 4+++ bin/tSmoke 2012-02-02 15:16:31.000000000 +0100
5@@ -51,8 +51,7 @@ use warnings; 5@@ -63,7 +63,7 @@
6 # -- Getopt::Long 
7 # 
8 # Point the lib variables to your implementation 
9-use lib qw(lib); 
10-use lib qw(/usr/local/rrdtool-1.0.39/lib/perl); 
11+use lib "@PREFIX@/lib/smokeping"; 
12  
13 use Smokeping 2.004002; 
14 use Net::SMTP; 
15@@ -61,7 +60,7 @@ use Pod::Usage; 
16 use RRDs; 6 use RRDs;
17  7
18 # Point to your Smokeping config file 8 # Point to your Smokeping config file
19-my $cfgfile = "etc/config.dist"; 9-my $cfgfile = "etc/config.dist";
20+my $cfgfile = "@PKG_SYSCONFDIR@/config"; 10+my $cfgfile = "@PKG_SYSCONFDIR@/config.dist";
21  11
22 # global variables 12 # global variables
23 my $cfg; 13 my $cfg;
24@@ -476,9 +475,9 @@ past week and past month including an ov 
25 Typical crontab used to invoke this are 
26  
27 # Quick morning alert to see what's down 
28- 0 6 * * * /usr/local/smokeping/bin/tSmoke.pl --q --to=mobilephone@att.net.invalid --morning 
29+ 0 6 * * * @PREFIX@/bin/tSmoke.pl --q --to=mobilephone@att.net.invalid --morning 
30 # Weekly report on the percent availability of network systems with no detail 
31- 0 8 * * * /usr/local/smokeping/bin/tSmoke.pl --q --to=mailbox@company.com.invalid --weekly --detail=0 
32+ 0 8 * * * @PREFIX@/bin/tSmoke.pl --q --to=mailbox@company.com.invalid --weekly --detail=0 
33  
34 =head1 SETUP 
35  
36@@ -498,17 +497,16 @@ We need to use the following B<libraries 
37  
38 Set up your libraries: 
39  
40- use lib "/usr/local/smokeping/lib"; 
41- use lib "/usr/local/rrdtool-1.0.39/lib/perl"; 
42+ use lib "@PREFIX@/lib/smokeping"; 
43  
44 Point to your Smokeping B<config> file 
45  
46- my $cfgfile = "/usr/local/smokeping/etc/config"; 
47+ my $cfgfile = "@PKG_SYSCONFDIR@/config"; 
48  
49 Modify the Smokeping config file to include a path for tmail in the 
50 General section: 
51  
52- tmail = /usr/local/smokeping/etc/tmail 
53+ tmail = @PKG_SYSCONFDIR@/tmail 
54  
55 =head1 COPYRIGHT 
56  
cvs diff -r1.1 -r1.1.30.1 pkgsrc/net/smokeping/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/smokeping/patches/patch-ae 2008/08/17 11:09:10 1.1
+++ pkgsrc/net/smokeping/patches/patch-ae 2012/02/02 20:08:41 1.1.30.1
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ae,v 1.1 2008/08/17 11:09:10 adrianp Exp $ 1$NetBSD: patch-ae,v 1.1.30.1 2012/02/02 20:08:41 tron Exp $
2 2
3--- htdocs/tr.cgi.dist.orig 2008-07-24 19:25:28.000000000 +0100 3--- htdocs/Makefile.in.orig 2012-02-02 15:51:17.000000000 +0100
4+++ htdocs/tr.cgi.dist 4+++ htdocs/Makefile.in 2012-02-02 15:52:04.000000000 +0100
5@@ -1,6 +1,6 @@ 5@@ -424,7 +424,7 @@
6-#!/usr/sepp/bin/speedy-5.8.8 -w 6 install-data-local:
7+#!@PREFIX@/@INTERP@ -w 7 $(MKDIR) -p $(DESTDIR)$(HTDOCSDIR)
8 use strict; 8 $(ECHO) "#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
9-use lib qw(/home/oposs/smokeping/software/lib); 9- $(ECHO) "$(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
10+use lib qw(@PREFIX@/lib/smokeping); 10+ $(ECHO) "$(prefix)/bin/smokeping_cgi @PKG_SYSCONFDIR@/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
11 use lib qw(perl); 11 chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
12  12
13 use CGI; 13 # Tell versions [3.59,3.63) of GNU make to not export all variables.
File Added: pkgsrc/net/smokeping/patches/patch-af
$NetBSD: patch-af,v 1.1.2.2 2012/02/02 20:08:41 tron Exp $

--- lib/Makefile.in.orig	2012-02-02 16:07:25.000000000 +0100
+++ lib/Makefile.in	2012-02-02 16:07:33.000000000 +0100
@@ -217,7 +217,7 @@
 PROBE := $(wildcard Smokeping/probes/*.pm)
 MATCH := $(wildcard Smokeping/matchers/*.pm)
 EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH)
-perllibdir = $(prefix)/lib
+perllibdir = $(prefix)/lib/smokeping
 nobase_perllib_DATA = $(EXTRA_DIST)
 all: all-am
File Added: pkgsrc/net/smokeping/patches/patch-ag
$NetBSD: patch-ag,v 1.1.2.2 2012/02/02 20:08:41 tron Exp $

--- etc/basepage.html.dist.orig	2012-02-02 18:44:25.000000000 +0100
+++ etc/basepage.html.dist	2012-02-02 18:44:37.000000000 +0100
@@ -53,10 +53,10 @@
 -->
 </STYLE>
 
-<script src="cropper/lib/prototype.js" type="text/javascript"></script>      
-<script src="cropper/lib/scriptaculous.js?load=builder,effects,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,effects,dragdrop" type="text/javascript"></script>
+<script src="/cropper/cropper.js" type="text/javascript"></script>
+<script src="/cropper/smokeping-zoom.js" type="text/javascript"></script>