<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4492980a3a48e7ea365a81904ed6f7544a061c10">https://github.com/macports/macports-ports/commit/4492980a3a48e7ea365a81904ed6f7544a061c10</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4492980a3a48e7ea365a81904ed6f7544a061c10
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sat May 4 16:50:07 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> smokeping: update to 2.7.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> use apache2, perl5.28
</span><span style='display:block; white-space:pre;color:#404040;'> use MacPorts perl modules
</span>---
net/smokeping/Portfile | 130 ++++++++++++----------
net/smokeping/files/patch-Makefile.in.diff | 11 ++
net/smokeping/files/patch-bin-smokeinfo.diff | 16 ++-
net/smokeping/files/patch-bin-smokeping.diff | 18 ++-
net/smokeping/files/patch-bin-smokeping_cgi.diff | 14 +--
net/smokeping/files/patch-bin-tSmoke.diff | 20 ++--
net/smokeping/files/patch-etc-config.dist.diff | 48 --------
net/smokeping/files/patch-etc-config.dist.in.diff | 41 +++++++
8 files changed, 152 insertions(+), 146 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/smokeping/Portfile b/net/smokeping/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec01260..0a046ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/smokeping/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/smokeping/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup perl5 1.0
name smokeping
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license GPL-2+
categories net perl
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,61 +18,69 @@ long_description SmokePing is a deluxe latency measurement tool. \
</span> state of each network connection.
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://oss.oetiker.ch/smokeping/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://oss.oetiker.ch/smokeping/pub/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://oss.oetiker.ch/smokeping/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}pub/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 80722b7b30fa6ce589cc330fe8c657fc85cebc69 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f2b3c386e95a74af2b1e7aec6410d0a58852339f00e9963f3c770cfd85ba30dd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 54ebc0f840a7c52e4610a7409fa3213e1a90b647 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 430fd58030a494068a897f772c052fc0979ebdd38d1859a03820e098628d36b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6614710
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-etc-config.dist.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-etc-config.dist.in.diff \
</span> patch-bin-smokeping.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bin-smokeping_cgi.diff \
</span> patch-bin-tSmoke.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-bin-smokeinfo.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-bin-smokeping_cgi.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bin-smokeinfo.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.28
</span>
depends_lib-append port:perl${perl5.major} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-cgi \
</span> port:p${perl5.major}-cgi-fast \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-fcgi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-config-grammar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-data-hexdump \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-html-tagset \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-io-html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-io-tty \
</span> port:p${perl5.major}-libwww-perl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-socket6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-net-snmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-net-telnet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-mozilla-ca \
</span> port:p${perl5.major}-net-dns \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-net-ip \
</span> port:p${perl5.major}-net-openssh \
port:p${perl5.major}-net-radius \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-net-snmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-net-telnet \
</span> port:p${perl5.major}-perl-ldap \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-io-socket-ssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-io-tty \
</span> port:p${perl5.major}-pathtools \
port:p${perl5.major}-snmp_session \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-config-grammar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mod_fastcgi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:apache22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-xml-sax-base \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mod_fcgid \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:apache2 \
</span> port:rrdtool \
port:fping \
port:curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set smokeroot ${prefix}/lib/smokeping
</span> set smokedata ${prefix}/var/smokeping
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set smokeetc ${prefix}/etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set macports_apache_docroot ${prefix}/apache22/htdocs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set smokeetc ${prefix}/etc/smokeping
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${perl5.bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sysconfdir=${smokeetc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-htdocs-dir=${prefix}/www/smokeping
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PERL5LIB=${perl5.lib}
</span>
startupitem.create yes
startupitem.name smokeping
startupitem.executable \
${prefix}/bin/smokeping --nodaemon
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|__PREFIX__|${prefix}|g" \
${worksrcpath}/bin/smokeping \
${worksrcpath}/bin/tSmoke \
${worksrcpath}/bin/smokeinfo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/bin/smokeping_cgi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/etc/config.dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/bin/smokeping_cgi
</span>
reinplace "s|__PERL5__ARCHLIB__|${perl5.archlib}|g" \
${worksrcpath}/bin/smokeping \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,13 +102,11 @@ post-patch {
</span> ${worksrcpath}/lib/Smokeping/probes/passwordchecker.pm
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.perl ${perl5.bin}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.env-append PERL5LIB=${perl5.lib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create the configuration directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${smokeetc}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Create and retain the data directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create and retain the data directory
</span> xinstall -m 755 -d ${destroot}${smokedata}/log
destroot.keepdirs ${destroot}${smokedata}/log
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,69 +114,73 @@ post-destroot {
</span> notes \
" #### To complete the Smokeping installation ####
<span style='display:block; white-space:pre;background:#ffe0e0;'>-1) Enable mod_fastcgi (installed as a dependency of Smokeping) for MacPorts Apache 2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+1) Enable mod_fcgid (installed as a dependency of Smokeping) for MacPorts Apache 2.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Rdd the line below to ${prefix}/apache22/conf/httpd.conf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Rdd the line below to ${prefix}/etc/apache2/httpd.conf.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LoadModule fastcgi_module modules/mod_fastcgi.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LoadModule fcgid_module modules/mod_fcgid.so
</span>
2) Changes to httpd.conf for Smokeping.
-Uncomment this line to enable the CGI script handler.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AddHandler cgi-script .cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddHandler cgi-script .cgi
</span>
-Add a directive for Smokeping's data directory and add
smokeping.cgi to DirectoryIndex for a simple /smokeping url.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Alias /smokeping \"${prefix}/var/smokeping\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <Directory \"${prefix}/var/smokeping\">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Allow from all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Options ExecCGI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </Directory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Alias /smokeping \"${prefix}/var/smokeping\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <Directory \"${prefix}/var/smokeping\">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Allow from all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Options ExecCGI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </Directory>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <IfModule dir_module>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DirectoryIndex index.html smokeping.cgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </IfModule>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <IfModule dir_module>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DirectoryIndex index.html smokeping.cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </IfModule>
</span>
3) Set Smokeping data directory permissions to the Apache user and group set
in httpd.conf. The default Apache user and group for OS X is www.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo chown -R <smokeping-user>:<smokeping-group> ${smokedata}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo chown -R <smokeping-user>:<smokeping-group> ${smokedata}/
</span>
4) Setup Smokeping logging.
-Add this statement to /etc/syslog.conf.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- local1.* ${smokedata}/log/smokeping.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ local1.* ${smokedata}/log/smokeping.log
</span>
-Create a logfile to receive the log messages.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cd ${smokedata}/log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo touch smokeping.log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo chmod 600 smokeping.log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo chown root:admin smokeping.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd ${smokedata}/log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo touch smokeping.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo chmod 600 smokeping.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo chown root:admin smokeping.log
</span>
-Then restart the syslog facility.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo kill -HUP `cat /var/run/syslog.pid`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo kill -HUP `cat /var/run/syslog.pid`
</span>
5) Rename and edit the ${smokeetc}/config sample files, then test your config file.
-Remove the .dist extension from all files; do not change the filenames.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cd ${smokeetc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo mv config.dist config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd ${smokeetc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo cp basepage.html.dist basepage.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo cp config.dist config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo cp smokemail.dist smokemail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo cp smokeping_secrets.dist smokeping_secrets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo cp tmail.dist stmail
</span>
-Set the DNS names for the Smokeping config file url's \"imageurl\" and \"cgiurl\".
But you should leave all file paths alone -they are set by MacPorts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- imgurl = http://myhost.mycompany.com/smokeping
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cgiurl = http://myhost.mycompany.com/smokeping/smokeping.cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ imgurl = http://myhost.mycompany.com/smokeping
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cgiurl = http://myhost.mycompany.com/smokeping/smokeping.cgi
</span>
-Customize variables.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,17 +201,17 @@ notes \
</span> -Perform a config file test from a terminal window and correct any errors that
are reported.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- smokeping --check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ smokeping --check
</span>
6) Start Smokeping and verify it is running. (Give it a minute to start)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo launchctl load -w /Library/LaunchDaemons/org.macports.smokeping.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ps -ax |grep smoke
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo launchctl load -w /Library/LaunchDaemons/org.macports.smokeping.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ps -ax |grep smoke
</span>
1713 Ss 0:00.16 ${prefix}/bin/smokeping \[FPing\]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1753 Ss 0:00.18 ${prefix}/bin/speedy_backend -w ${prefix}/apache22/htdocs/smokeping/smokeping.cgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1754 S 0:01.56 ${prefix}/bin/speedy_backend -w ${prefix}/apache22/htdocs/smokeping/smokeping.cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1753 Ss 0:00.18 ${prefix}/bin/speedy_backend -w ${prefix}/www/smokeping/smokeping.cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1754 S 0:01.56 ${prefix}/bin/speedy_backend -w ${prefix}/www/smokeping/smokeping.cgi
</span>
7) Check the Smokeping graphs with a web browser.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,4 +224,4 @@ notes \
</span> After adding or removing targets from ${smokeetc}/config, you must reload
Smokeping from a terminal window.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo smokeping --reload"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo smokeping --reload"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/smokeping/files/patch-Makefile.in.diff b/net/smokeping/files/patch-Makefile.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ca7a50e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/smokeping/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2018-12-20 04:22:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2019-05-04 13:34:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,7 +313,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ top_builddir = @top_builddir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ top_srcdir = @top_srcdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOMAKE_OPTIONS = foreign
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SUBDIRS = thirdparty doc etc htdocs lib bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SUBDIRS = doc etc htdocs lib bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTRA_DIST = COPYRIGHT CHANGES CONTRIBUTORS LICENSE PERL_MODULES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ THIRDPARTY_DIR := $(shell pwd)/thirdparty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: all-recursive
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/smokeping/files/patch-bin-smokeinfo.diff b/net/smokeping/files/patch-bin-smokeinfo.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9cd9f75..a68da3e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/smokeping/files/patch-bin-smokeinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/smokeping/files/patch-bin-smokeinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/smokeinfo.orig 2011-10-05 02:51:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/smokeinfo 2013-01-16 12:19:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bin/smokeinfo.orig 2018-04-13 07:13:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bin/smokeinfo 2019-05-04 09:10:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use warnings;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use FindBin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # PERL5LIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--use lib "$FindBin::Bin/../thirdparty/lib/perl5";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--use lib "$FindBin::Bin/../lib";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+use lib "__PERL5__ARCHLIB__/auto/RRDs";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+use lib "__PREFIX__/lib/smokeping/lib";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use lib (split /:/, q{}); # PERL5LIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++use FindBin;use lib "__PREFIX__/lib/smokeping/lib";use lib "__PERL5__ARCHLIB__/auto/RRDs"; # LIBDIR
</span>
use Smokeping::Info;
use Getopt::Long 2.25 qw(:config no_ignore_case);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/smokeping/files/patch-bin-smokeping.diff b/net/smokeping/files/patch-bin-smokeping.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0852a7a..3dddbde 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/smokeping/files/patch-bin-smokeping.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/smokeping/files/patch-bin-smokeping.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/smokeping.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/smokeping
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,12 +6,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bin/smokeping.orig 2018-04-13 07:13:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bin/smokeping 2019-05-04 09:07:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,11 +6,11 @@
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ use lib (split /:/, q{}); # PERL5LIB
</span> use FindBin;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # PERL5LIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--use lib "$FindBin::Bin/../thirdparty/lib/perl5";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--use lib "$FindBin::Bin/../lib";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+use lib "__PERL5__ARCHLIB__/auto/RRDs";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+use lib "__PREFIX__/lib/smokeping";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++use lib "__PREFIX__/lib/smokeping";use lib "__PERL5__ARCHLIB__/auto/RRDs"; # LIBDIR
</span>
use Smokeping;
<span style='display:block; white-space:pre;background:#ffe0e0;'>--Smokeping::main("$FindBin::Bin/../etc/config");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Smokeping::main("$FindBin::RealBin/../etc/config");
</span> +Smokeping::main("__PREFIX__/etc/smokeping/config");
=head1 NAME
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,22 +131,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,22 +130,7 @@
</span>
=head1 SETUP
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/smokeping/files/patch-bin-smokeping_cgi.diff b/net/smokeping/files/patch-bin-smokeping_cgi.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ced615..76e921e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/smokeping/files/patch-bin-smokeping_cgi.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/smokeping/files/patch-bin-smokeping_cgi.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/smokeping_cgi.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/smokeping_cgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,8 +6,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bin/smokeping_cgi.orig 2018-04-13 07:13:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bin/smokeping_cgi 2019-05-04 09:11:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,7 @@
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ use lib (split /:/, q{}); # PERL5LIB
</span> use FindBin;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # PERL5LIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--use lib "$FindBin::Bin/../thirdparty/lib/perl5";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--use lib "$FindBin::Bin/../lib";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+use lib "__PERL5__ARCHLIB__/auto/RRDs";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+use lib "__PREFIX__/lib/smokeping/lib";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++use lib "__PREFIX__/lib/smokeping/lib";use lib "__PERL5__ARCHLIB__/auto/RRDs"; # LIBDIR
</span>
# don't bother with zombies
$SIG{CHLD} = 'IGNORE';
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/smokeping/files/patch-bin-tSmoke.diff b/net/smokeping/files/patch-bin-tSmoke.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index eff89e2..20291f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/smokeping/files/patch-bin-tSmoke.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/smokeping/files/patch-bin-tSmoke.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/tSmoke.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/tSmoke
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,8 +53,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bin/tSmoke.orig 2018-04-13 07:13:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bin/tSmoke 2019-05-04 09:08:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,7 @@
</span> # Point the lib variables to your implementation
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use FindBin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # PERL5LIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--use lib "$FindBin::Bin/../thirdparty/lib/perl5";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--use lib "$FindBin::Bin/../lib";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+use lib "__PERL5__ARCHLIB__/auto/RRDs";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+use lib "__PREFIX__/lib/smokeping/lib";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use lib (split /:/, q{}); # PERL5LIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++use FindBin;use lib "__PREFIX__/lib/smokeping/lib";use lib "__PERL5__ARCHLIB__/auto/RRDs"; # LIBDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
use Smokeping;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use Net::SMTP;
</span> @@ -63,7 +63,7 @@
use RRDs;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +18,7 @@
</span>
# global variables
my $cfg;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -484,33 +484,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -504,33 +504,6 @@
</span>
=head1 SETUP
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/smokeping/files/patch-etc-config.dist.diff b/net/smokeping/files/patch-etc-config.dist.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6f6e114..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/smokeping/files/patch-etc-config.dist.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- etc/config.dist.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc/config.dist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,15 +7,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # NOTE: do not put the Image Cache below cgi-bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # since all files under cgi-bin will be executed ... this is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # good for images.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--imgcache = /tmp/smokeping-12038-build/cache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--imgurl = cache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--datadir = /tmp/smokeping-12038-build/data
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--piddir = /tmp/smokeping-12038-build/var
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cgiurl = http://some.url/smokeping.cgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--smokemail = /tmp/smokeping-12038-build/etc/smokemail.dist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--tmail = /tmp/smokeping-12038-build/etc/tmail.dist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+imgcache = __PREFIX__/var/smokeping
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+imgurl = http://myhost.mycompany.com/smokeping
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+datadir = __PREFIX__/var/smokeping
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+piddir = /var/run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cgiurl = http://myhost.mycompany.com/smokeping/smokeping.cgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+smokemail = __PREFIX__/etc/smokeping/smokemail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tmail = __PREFIX__/etc/smokeping/tmail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # specify this to get syslog logging
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--syslogfacility = local0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+syslogfacility = local1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # each probe is now run in its own process
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # disable this to revert to the old behaviour
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # concurrentprobes = no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *** Presentation ***
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--template = /tmp/smokeping-12038-build/etc/basepage.html.dist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template = __PREFIX__/etc/smokeping/basepage.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- + charts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,10 +105,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- + FPing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--binary = /usr/sbin/fping
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+binary = __PREFIX__/sbin/fping
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *** Slaves ***
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--secrets=/tmp/smokeping-12038-build/etc/smokeping_secrets.dist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+secrets=__PREFIX__/etc/smokeping/smokeping_secrets.dist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- +boomer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- display_name=boomer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- color=0000ff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/smokeping/files/patch-etc-config.dist.in.diff b/net/smokeping/files/patch-etc-config.dist.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..baf8e38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/smokeping/files/patch-etc-config.dist.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- etc/config.dist.in.orig 2017-06-25 13:18:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ etc/config.dist.in 2019-05-04 15:30:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,13 +7,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: do not put the Image Cache below cgi-bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # since all files under cgi-bin will be executed ... this is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # good for images.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-imgcache = @prefix@/cache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-imgurl = cache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-datadir = @prefix@/data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-piddir = @prefix@/var
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cgiurl = http://some.url/smokeping.cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-smokemail = @prefix@/etc/smokemail.dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-tmail = @prefix@/etc/tmail.dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++imgcache = @prefix@/var/smokeping
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++imgurl = http://myhost.mycompany.com/smokeping
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++datadir = @prefix@/var/smokeping
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++piddir = /var/run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cgiurl = http://myhost.mycompany.com/smokeping/smokeping.cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++smokemail = @prefix@/etc/smokeping/smokemail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tmail = @prefix@/etc/smokeping/tmail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # specify this to get syslog logging
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ syslogfacility = local0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # each probe is now run in its own process
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *** Presentation ***
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template = @prefix@/etc/basepage.html.dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template = @prefix@/etc/smokeping/basepage.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ htmltitle = yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ graphborders = no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ binary = /usr/sbin/fping
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *** Slaves ***
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-secrets=@prefix@/etc/smokeping_secrets.dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++secrets=@prefix@/etc/smokeping/smokeping_secrets.dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +boomer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ display_name=boomer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ color=0000ff
</span></pre><pre style='margin:0'>
</pre>