diff options
| author | Rodrigo Osorio <rodrigo@FreeBSD.org> | 2019-02-13 07:29:04 +0000 |
|---|---|---|
| committer | Rodrigo Osorio <rodrigo@FreeBSD.org> | 2019-02-13 07:29:04 +0000 |
| commit | 94a1741e72f6f291ab86322f7bced1483882d7d1 (patch) | |
| tree | ac28cf4a2c375a2af506d2ec9803a139796ca34c /net-mgmt/smokeping | |
| parent | 58c66aa1e4326ec476019f5d9483c9856c6682c4 (diff) | |
| download | ports-94a1741e72f6f291ab86322f7bced1483882d7d1.tar.gz ports-94a1741e72f6f291ab86322f7bced1483882d7d1.zip | |
Upgrade net-mgmt/smokeping to 2.7.3
- Use GITHUB to get distfiles
- Redo the patches
- Rework options
Changelog: https://oss.oetiker.ch/smokeping/pub/CHANGES
Notes
Notes:
svn path=/head/; revision=492831
Diffstat (limited to 'net-mgmt/smokeping')
23 files changed, 309 insertions, 280 deletions
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index 5c509a1dcd7d..bf519f6f4c0f 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -2,11 +2,8 @@ # $FreeBSD$ PORTNAME= smokeping -PORTVERSION= 2.6.11 -PORTREVISION= 8 +PORTVERSION= 2.7.3 CATEGORIES= net-mgmt www -MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \ - http://smokeping.cs.pu.edu.tw/pub/ MAINTAINER= rodrigo@FreeBSD.org COMMENT= Latency logging and graphing system @@ -30,13 +27,20 @@ BUILD_DEPENDS= p5-CGI-Fast>=0:www/p5-CGI-Fast \ p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \ p5-Net-Telnet>=0:net/p5-Net-Telnet \ p5-Net-OpenSSH>=0:net/p5-Net-OpenSSH \ - p5-perl-ldap>=0:net/p5-perl-ldap + p5-perl-ldap>=0:net/p5-perl-ldap \ + p5-OrePAN2>=0:devel/p5-OrePAN2 \ + curl>=0:ftp/curl RUN_DEPENDS:= ${BUILD_DEPENDS} +USES= gmake perl5 autoreconf + CONFLICTS_INSTALL= nfsping +SUB_FILES= pkg-deinstall pkg-message +SUB_LIST= USERS=${USERS} \ + GROUPS=${GROUPS} + NO_ARCH= yes -USES= gmake perl5 GNU_CONFIGURE= yes CONFIGURE_ENV+= PERL=${PERL} PERL5LIB=${PREFIX}/smokeping/lib CONFIGURE_ARGS+= \ @@ -53,26 +57,31 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USERS= smokeping GROUPS= smokeping -SUB_FILES= pkg-deinstall pkg-message -SUB_LIST= USERS=${USERS} \ - GROUPS=${GROUPS} +OPTIONS_DEFINE= ECHOPING RADIUS TELNET DNS FPING EXAMPLES +OPTIONS_DEFAULT= FPING FPING_DESC= Support for fping probes +FPING_RUN_DEPENDS= ${LOCALBASE}/sbin/fping:net/fping + ECHOPING_DESC= Support for EchoPing probes -CURL_DESC= Support for Curl probes +ECHOPING_RUN_DEPENDS= ${LOCALBASE}/bin/echoping:net/echoping + RADIUS_DESC= Support for Radius probes +RADIUS_RUN_DEPENDS= p5-Authen-Radius>=0:security/p5-Authen-Radius + TELNET_DESC= Support for TelnetIOSPing probes +TELNET_RUN_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet + DNS_DESC= Support for AnotherDNS probes +DNS_RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS -OPTIONS_DEFINE= ECHOPING CURL RADIUS TELNET DNS FPING EXAMPLES -OPTIONS_DEFAULT= FPING +USE_GITHUB= yes +GH_ACCOUNT= oetiker +GH_PROJECT= SmokePing +GH_TAGNAME= 9b2ecb9 -FPING_RUN_DEPENDS= ${LOCALBASE}/sbin/fping:net/fping -ECHOPING_RUN_DEPENDS= ${LOCALBASE}/bin/echoping:net/echoping -CURL_RUN_DEPENDS= ${LOCALBASE}/bin/curl:ftp/curl -RADIUS_RUN_DEPENDS= p5-Authen-Radius>=0:security/p5-Authen-Radius -TELNET_RUN_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet -DNS_RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS +OPTIONS_DEFINE= ECHOPING RADIUS TELNET DNS FPING EXAMPLES +OPTIONS_DEFAULT= FPING # We will take these from CPAN instead post-extract: @@ -80,10 +89,14 @@ post-extract: post-patch: ${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/doc/Makefile.in \ + ${WRKSRC}/doc/Makefile.am \ ${WRKSRC}/bin/smokeping \ ${WRKSRC}/bin/smokeping_cgi \ ${WRKSRC}/bin/tSmoke + @for a in ${WRKSRC}/etc/*.dist; do \ + ${MV} $$a $${a%.dist}.sample; \ + done + ${MV} ${WRKSRC}/etc/config.dist.in ${WRKSRC}/etc/config.sample.in post-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/smokeping/htdocs/img diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo index 089e441e34c4..fc114aa54189 100644 --- a/net-mgmt/smokeping/distinfo +++ b/net-mgmt/smokeping/distinfo @@ -1,2 +1,3 @@ -SHA256 (smokeping-2.6.11.tar.gz) = f2b3c386e95a74af2b1e7aec6410d0a58852339f00e9963f3c770cfd85ba30dd -SIZE (smokeping-2.6.11.tar.gz) = 417338 +TIMESTAMP = 1548858797 +SHA256 (oetiker-SmokePing-2.7.3-9b2ecb9_GH0.tar.gz) = 10ff209c4efae212b5347ffdcda100a536f690ee154211e54e0d01c5d5508401 +SIZE (oetiker-SmokePing-2.7.3-9b2ecb9_GH0.tar.gz) = 317527 diff --git a/net-mgmt/smokeping/files/patch-Makefile.am b/net-mgmt/smokeping/files/patch-Makefile.am new file mode 100644 index 000000000000..0a9a25c5505c --- /dev/null +++ b/net-mgmt/smokeping/files/patch-Makefile.am @@ -0,0 +1,18 @@ +--- Makefile.am.orig 2019-01-30 16:17:01 UTC ++++ Makefile.am +@@ -16,14 +16,9 @@ + + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = thirdparty doc etc htdocs lib bin ++SUBDIRS = doc etc htdocs lib bin + + EXTRA_DIST = COPYRIGHT CHANGES CONTRIBUTORS LICENSE PERL_MODULES + +-THIRDPARTY_DIR := $(shell pwd)/thirdparty +- + dist-hook: + $(PERL) -i -p -e '"$(PACKAGE_VERSION)" =~ /(\d+)\.(\d+)\.(\d+)/ and $$v = sprintf("%d.%03d%03d",$$1,$$2,$$3) and s/^\$$VERSION\s*=\s*".*?"/\$$VERSION = "$$v"/' $(distdir)/lib/Smokeping.pm +- +-install-exec-hook: +- [ ! -d $(THIRDPARTY_DIR)/lib/perl5 ] || $(CP) -fr $(THIRDPARTY_DIR)/lib/perl5/* $(DESTDIR)$(libdir) diff --git a/net-mgmt/smokeping/files/patch-bin-smokeping b/net-mgmt/smokeping/files/patch-bin-smokeping deleted file mode 100644 index 720219b4e6e9..000000000000 --- a/net-mgmt/smokeping/files/patch-bin-smokeping +++ /dev/null @@ -1,17 +0,0 @@ ---- bin/smokeping.orig 2012-05-14 12:45:03.010872981 +0200 -+++ bin/smokeping 2012-05-14 12:54:39.881874010 +0200 -@@ -6,12 +6,11 @@ - - use FindBin; - # PERL5LIB --use lib "$FindBin::Bin/../thirdparty/lib/perl5"; --use lib "$FindBin::Bin/../lib"; -+use lib "%%PREFIX%%/smokeping/lib"; - - use Smokeping; - --Smokeping::main("$FindBin::Bin/../etc/config"); -+Smokeping::main("%%ETCDIR%%/config"); - - =head1 NAME - diff --git a/net-mgmt/smokeping/files/patch-bin-smokeping_cgi b/net-mgmt/smokeping/files/patch-bin-smokeping_cgi deleted file mode 100644 index 4bac5d642171..000000000000 --- a/net-mgmt/smokeping/files/patch-bin-smokeping_cgi +++ /dev/null @@ -1,21 +0,0 @@ ---- bin/smokeping_cgi.orig 2012-05-14 12:45:11.565909114 +0200 -+++ bin/smokeping_cgi 2012-05-14 12:55:19.866379488 +0200 -@@ -6,8 +6,7 @@ - - use FindBin; - # PERL5LIB --use lib "$FindBin::Bin/../thirdparty/lib/perl5"; --use lib "$FindBin::Bin/../lib"; -+use lib "%%PREFIX%%/smokeping/lib"; - - # don't bother with zombies - $SIG{CHLD} = 'IGNORE'; -@@ -18,7 +17,7 @@ - - use CGI::Fast; - --my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config"; -+my $cfg = (shift @ARGV) || "%%ETCDIR%%/config"; - - - while (my $q = new CGI::Fast) { diff --git a/net-mgmt/smokeping/files/patch-bin-tSmoke b/net-mgmt/smokeping/files/patch-bin-tSmoke deleted file mode 100644 index e444a249c14f..000000000000 --- a/net-mgmt/smokeping/files/patch-bin-tSmoke +++ /dev/null @@ -1,21 +0,0 @@ ---- bin/tSmoke.orig 2012-05-14 14:54:55.388873689 +0200 -+++ bin/tSmoke 2012-05-14 14:56:15.881875827 +0200 -@@ -53,8 +53,7 @@ - # Point the lib variables to your implementation - use FindBin; - # PERL5LIB --use lib "$FindBin::Bin/../thirdparty/lib/perl5"; --use lib "$FindBin::Bin/../lib"; -+use lib "%%PREFIX%%/smokeping/lib"; - - use Smokeping; - use Net::SMTP; -@@ -63,7 +62,7 @@ - use RRDs; - - # Point to your Smokeping config file --my $cfgfile = "etc/config.dist"; -+my $cfgfile = "%%ETCDIR%%/config"; - - # global variables - my $cfg; diff --git a/net-mgmt/smokeping/files/patch-bin_smokeping b/net-mgmt/smokeping/files/patch-bin_smokeping new file mode 100644 index 000000000000..c68eb5d98cd2 --- /dev/null +++ b/net-mgmt/smokeping/files/patch-bin_smokeping @@ -0,0 +1,18 @@ +--- bin/smokeping.orig 2018-02-02 21:14:55 UTC ++++ bin/smokeping +@@ -5,12 +5,11 @@ use strict; + use warnings; + + use lib (split /:/, q{}); # PERL5LIB +-use FindBin; +-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR ++use lib "/usr/local/smokeping/lib"; + + use Smokeping; +- +-Smokeping::main("$FindBin::RealBin/../etc/config"); ++ ++Smokeping::main("/usr/local/etc/smokeping/config"); + + =head1 NAME + diff --git a/net-mgmt/smokeping/files/patch-bin_smokeping__cgi b/net-mgmt/smokeping/files/patch-bin_smokeping__cgi new file mode 100644 index 000000000000..7900ba0d2bf6 --- /dev/null +++ b/net-mgmt/smokeping/files/patch-bin_smokeping__cgi @@ -0,0 +1,21 @@ +--- bin/smokeping_cgi.orig 2018-02-02 21:14:55 UTC ++++ bin/smokeping_cgi +@@ -5,8 +5,7 @@ use strict; + use warnings; + + use lib (split /:/, q{}); # PERL5LIB +-use FindBin; +-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR ++use lib "/usr/local/smokeping/lib"; + + # don't bother with zombies + $SIG{CHLD} = 'IGNORE'; +@@ -17,7 +16,7 @@ use Smokeping; + + use CGI::Fast; + +-my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config"; ++my $cfg = (shift @ARGV) || "/usr/local/etc/smokeping/config"; + + + while (my $q = new CGI::Fast) { diff --git a/net-mgmt/smokeping/files/patch-bin_tSmoke b/net-mgmt/smokeping/files/patch-bin_tSmoke new file mode 100644 index 000000000000..7d7826389708 --- /dev/null +++ b/net-mgmt/smokeping/files/patch-bin_tSmoke @@ -0,0 +1,20 @@ +--- bin/tSmoke.orig 2018-02-02 21:14:55 UTC ++++ bin/tSmoke +@@ -53,7 +53,7 @@ use warnings; + # Point the lib variables to your implementation + + use lib (split /:/, q{}); # PERL5LIB +-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR ++use lib "/usr/local/smokeping/lib"; + + + use Smokeping; +@@ -63,7 +63,7 @@ use Pod::Usage; + use RRDs; + + # Point to your Smokeping config file +-my $cfgfile = "etc/config.dist"; ++my $cfgfile = "/usr/local/etc/smokeping/config"; + + # global variables + my $cfg; diff --git a/net-mgmt/smokeping/files/patch-configure.ac b/net-mgmt/smokeping/files/patch-configure.ac new file mode 100644 index 000000000000..65ea4bda161b --- /dev/null +++ b/net-mgmt/smokeping/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2018-02-02 21:14:55 UTC ++++ configure.ac +@@ -143,7 +143,7 @@ NOTES + exit 1 + fi + +-AC_CONFIG_FILES([Makefile bin/Makefile doc/Makefile htdocs/Makefile etc/Makefile lib/Makefile thirdparty/Makefile etc/config.dist]) ++AC_CONFIG_FILES([Makefile bin/Makefile doc/Makefile htdocs/Makefile etc/Makefile lib/Makefile thirdparty/Makefile etc/config.sample]) + + AC_SUBST(VERSION) + diff --git a/net-mgmt/smokeping/files/patch-doc_Makefile.am b/net-mgmt/smokeping/files/patch-doc_Makefile.am new file mode 100644 index 000000000000..375c1346c534 --- /dev/null +++ b/net-mgmt/smokeping/files/patch-doc_Makefile.am @@ -0,0 +1,19 @@ +--- doc/Makefile.am.orig 2018-02-02 21:14:55 UTC ++++ doc/Makefile.am +@@ -92,7 +92,7 @@ tSmoke.1: ../bin/tSmoke + smokeping_config.pod: ../lib/Smokeping.pm + $(AM_V_GEN)$(MAKEPOD) > $@ + +-smokeping_examples.pod: ../lib/Smokeping/Examples.pm ../etc/config.dist ++smokeping_examples.pod: ../lib/Smokeping/Examples.pm ../etc/config.sample + $(AM_V_GEN)$(MKDIR) -p examples + $(AM_V_GEN)$(GENEX) + +@@ -116,6 +116,6 @@ iman7_DATA = $(MAN7) + + EXAMPLES := $(wildcard examples/config.*) + +-etcdir = $(sysconfdir)/examples ++etcdir = /usr/local/share/examples/smokeping + etc_DATA = $(EXAMPLES) + diff --git a/net-mgmt/smokeping/files/patch-doc__Makefile.in b/net-mgmt/smokeping/files/patch-doc__Makefile.in deleted file mode 100644 index 638d7645cdda..000000000000 --- a/net-mgmt/smokeping/files/patch-doc__Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./doc/Makefile.in.orig 2011-11-12 11:57:45.000000000 +0100 -+++ ./doc/Makefile.in 2012-02-02 14:54:50.000000000 +0100 -@@ -249,7 +249,7 @@ iman5_DATA = $(MAN5) - iman7dir = $(mandir)/man7 - iman7_DATA = $(MAN7) - EXAMPLES := $(wildcard examples/config.*) --etcdir = $(sysconfdir)/examples -+etcdir = %%EXAMPLESDIR%% - etc_DATA = $(EXAMPLES) - all: all-am - diff --git a/net-mgmt/smokeping/files/patch-doc_smokeping__install.pod b/net-mgmt/smokeping/files/patch-doc_smokeping__install.pod new file mode 100644 index 000000000000..bdb3ea6b4eca --- /dev/null +++ b/net-mgmt/smokeping/files/patch-doc_smokeping__install.pod @@ -0,0 +1,11 @@ +--- doc/smokeping_install.pod.orig 2018-02-02 21:14:55 UTC ++++ doc/smokeping_install.pod +@@ -108,7 +108,7 @@ to finish your setup. + + =head2 Configuration + +-Use the F<etc/config.dist> file as a template to create your own smokeping configuration file. ++Use the F<etc/config.sample> file as a template to create your own smokeping configuration file. + See L<smokeping_config> for details. + + =over diff --git a/net-mgmt/smokeping/files/patch-etc_Makefile.am b/net-mgmt/smokeping/files/patch-etc_Makefile.am new file mode 100644 index 000000000000..1007467540df --- /dev/null +++ b/net-mgmt/smokeping/files/patch-etc_Makefile.am @@ -0,0 +1,11 @@ +--- etc/Makefile.am.orig 2018-02-02 21:14:55 UTC ++++ etc/Makefile.am +@@ -15,7 +15,7 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + + +-EXTRA_DIST = basepage.html.dist config.dist smokemail.dist smokeping_secrets.dist tmail.dist ++EXTRA_DIST = basepage.html.sample config.sample smokemail.sample smokeping_secrets.sample tmail.sample + + etcdir = $(sysconfdir) + etc_DATA = $(EXTRA_DIST) diff --git a/net-mgmt/smokeping/files/patch-etc_Makefile.in b/net-mgmt/smokeping/files/patch-etc_Makefile.in deleted file mode 100644 index f3e6f231e0d9..000000000000 --- a/net-mgmt/smokeping/files/patch-etc_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- etc/Makefile.in 2013-03-04 13:07:55.000000000 +0000 -+++ etc/Makefile.in.changes 2014-07-19 10:38:59.338305503 +0000 -@@ -258,7 +258,8 @@ - @list='$(etc_DATA)'; test -n "$(etcdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -+ mv $$p $${p%%.dist}.sample; \ -+ echo "$$d$${p%%.dist}.sample"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(etcdir)'"; \ diff --git a/net-mgmt/smokeping/files/patch-etc__config.dist.in b/net-mgmt/smokeping/files/patch-etc__config.dist.in deleted file mode 100644 index d963290ed17e..000000000000 --- a/net-mgmt/smokeping/files/patch-etc__config.dist.in +++ /dev/null @@ -1,44 +0,0 @@ ---- ./etc/config.dist.in.orig 2011-10-30 11:33:11.000000000 +0100 -+++ ./etc/config.dist.in 2012-02-02 14:54:50.000000000 +0100 -@@ -7,13 +7,13 @@ sendmail = @SENDMAIL@ - # NOTE: do not put the Image Cache below cgi-bin - # since all files under cgi-bin will be executed ... this is not - # good for images. --imgcache = @prefix@/cache --imgurl = cache --datadir = @prefix@/data --piddir = @prefix@/var -+imgcache = @prefix@/smokeping/htdocs/img -+imgurl = img -+datadir = @prefix@/var/smokeping -+piddir = @prefix@/var/smokeping - cgiurl = http://some.url/smokeping.cgi --smokemail = @prefix@/etc/smokemail.dist --tmail = @prefix@/etc/tmail.dist -+smokemail = @prefix@/etc/smokeping/smokemail -+tmail = @prefix@/etc/smokeping/tmail - # specify this to get syslog logging - syslogfacility = local0 - # each probe is now run in its own process -@@ -47,7 +47,7 @@ AVERAGE 0.5 144 720 - - *** Presentation *** - --template = @prefix@/etc/basepage.html.dist -+template = @prefix@/etc/smokeping/basepage.html - - + charts - -@@ -105,10 +105,10 @@ unison_tolerance = 2 - - + FPing - --binary = /usr/sbin/fping -+binary = @prefix@/sbin/fping - - *** Slaves *** --secrets=@prefix@/etc/smokeping_secrets.dist -+secrets=@prefix@/etc/smokeping/smokeping_secrets - +boomer - display_name=boomer - color=0000ff diff --git a/net-mgmt/smokeping/files/patch-htdocs-Makefile.in b/net-mgmt/smokeping/files/patch-htdocs_Makefile.am index 7e2abf300be9..a23faf518358 100644 --- a/net-mgmt/smokeping/files/patch-htdocs-Makefile.in +++ b/net-mgmt/smokeping/files/patch-htdocs_Makefile.am @@ -1,6 +1,6 @@ ---- htdocs/Makefile.in.orig 2014-11-04 23:50:59.000000000 +0100 -+++ htdocs/Makefile.in 2015-02-12 19:30:27.000000000 +0100 -@@ -466,9 +466,9 @@ +--- htdocs/Makefile.am.orig 2018-02-02 21:14:55 UTC ++++ htdocs/Makefile.am +@@ -41,6 +41,6 @@ nobase_js_DATA = $(JS) install-data-local: $(MKDIR) -p $(DESTDIR)$(HTDOCSDIR) @@ -8,8 +8,5 @@ - $(ECHO) "exec $(bindir)/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist - chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist + $(ECHO) "#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample -+ $(ECHO) "exec $(prefix)/bin/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample ++ $(ECHO) "exec $(bindir)/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample + chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/net-mgmt/smokeping/files/patch-lib_Makefile.am b/net-mgmt/smokeping/files/patch-lib_Makefile.am new file mode 100644 index 000000000000..8d5ddff5c000 --- /dev/null +++ b/net-mgmt/smokeping/files/patch-lib_Makefile.am @@ -0,0 +1,9 @@ +--- lib/Makefile.am.orig 2018-02-02 21:14:55 UTC ++++ lib/Makefile.am +@@ -31,5 +31,5 @@ MATCH := $(wildcard Smokeping/matchers/*.pm) + + EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH) + +-perllibdir = $(prefix)/lib ++perllibdir = $(prefix)/smokeping/lib + nobase_perllib_DATA = $(EXTRA_DIST) diff --git a/net-mgmt/smokeping/files/patch-lib__Smokeping.pm b/net-mgmt/smokeping/files/patch-lib_Smokeping.pm index cdc0f2fef8f0..bee97c681432 100644 --- a/net-mgmt/smokeping/files/patch-lib__Smokeping.pm +++ b/net-mgmt/smokeping/files/patch-lib_Smokeping.pm @@ -1,25 +1,6 @@ ---- lib/Smokeping.pm.orig 2015-02-12 19:31:21.000000000 +0100 -+++ lib/Smokeping.pm 2015-02-12 19:34:23.000000000 +0100 -@@ -2632,12 +2632,14 @@ - { - %$DIRCHECK_SUB, - _doc => <<DOC, --The base directory where SmokePing keeps the files related to the DYNAMIC function. --This directory must be writeable by the WWW server. It is also used for temporary --storage of slave polling results by the master in -+The base directory where SmokePing keeps the files related to the DYNAMIC -+function. -+This directory must be writeable by the WWW server. It is also used for -+temporary storage of slave polling results by the master in - L<the masterE<sol>slave mode|smokeping_master_slave>. - --If this variable is not specified, the value of C<datadir> will be used instead. -+If this variable is not specified, the value of C<datadir> will be -+used instead. - DOC - }, - piddir => -@@ -4214,7 +4216,7 @@ +--- lib/Smokeping.pm.orig 2018-02-02 21:14:55 UTC ++++ lib/Smokeping.pm +@@ -4306,7 +4306,7 @@ sub main (;$) { if(defined $opt{'check'}) { verify_cfg($cfgfile); exit 0; } if($opt{reload}) { load_cfg $cfgfile, 'noinit'; # we need just the piddir @@ -28,7 +9,7 @@ print "HUP signal sent to the running SmokePing process, exiting.\n"; exit 0; }; -@@ -4223,7 +4225,7 @@ +@@ -4315,7 +4315,7 @@ sub main (;$) { if(defined $opt{'static-pages'}) { makestaticpages $cfg, $opt{'static-pages'}; exit 0 }; if($opt{email}) { enable_dynamic $cfg, $cfg->{Targets},"",""; exit 0 }; } @@ -37,7 +18,7 @@ if($opt{logfile}) { initialize_filelog($opt{logfile}) }; -@@ -4236,7 +4238,7 @@ +@@ -4328,7 +4328,7 @@ sub main (;$) { initialize_syslog($cfg->{General}{syslogfacility}, $cfg->{General}{syslogpriority}); } @@ -46,7 +27,7 @@ } do_log "Smokeping version $VERSION successfully launched."; -@@ -4413,7 +4415,7 @@ +@@ -4514,7 +4514,7 @@ KID: my $new_conf = Smokeping::Slave::submit_results $slave_cfg,$cfg,$myprobe,$probes; if ($new_conf && !$gothup){ do_log('server has new config for me ... HUPing the parent'); diff --git a/net-mgmt/smokeping/files/patch-lib_Smokeping_Examples.pm b/net-mgmt/smokeping/files/patch-lib_Smokeping_Examples.pm new file mode 100644 index 000000000000..d483bd9c0883 --- /dev/null +++ b/net-mgmt/smokeping/files/patch-lib_Smokeping_Examples.pm @@ -0,0 +1,29 @@ +--- lib/Smokeping/Examples.pm.orig 2018-02-02 21:14:55 UTC ++++ lib/Smokeping/Examples.pm +@@ -12,7 +12,7 @@ Smokeping::Examples - A module for generating the smok + This module generates L<smokeping_examples> and the example + configuration files distributed with Smokeping. It is supposed to be + invoked from the smokeping distribution top directory, as it will need +-the C<etc/config.dist> template configuration file and will create files ++the C<etc/config.sample> template configuration file and will create files + in the directories C<doc> and C<doc/examples>. + + =head1 DESCRIPTION +@@ -65,7 +65,7 @@ Niko Tyni <ntyni@iki.fi> + use strict; + + sub read_config_template { +- my $file = "../etc/config.dist"; ++ my $file = "../etc/config.sample"; + my $h = { + common => "", # everything up to the Probes section + probes => "", # the Probes section, without the *** Probes *** line +@@ -107,7 +107,7 @@ specifically the L<Smokeping::Examples|Smokeping::Exam + ${e}head1 DESCRIPTION + + Currently the examples differ only in the C<Probes> and C<Targets> +-sections. The other sections are taken from the C<etc/config.dist> ++sections. The other sections are taken from the C<etc/config.sample> + configuration template in the Smokeping distribution so that the example + files are complete. + diff --git a/net-mgmt/smokeping/files/patch-lib__Smokeping__probes__AnotherDNS.pm b/net-mgmt/smokeping/files/patch-lib_Smokeping_probes_AnotherDNS.pm index 9498e1a93afb..3339144765cc 100644 --- a/net-mgmt/smokeping/files/patch-lib__Smokeping__probes__AnotherDNS.pm +++ b/net-mgmt/smokeping/files/patch-lib_Smokeping_probes_AnotherDNS.pm @@ -1,6 +1,6 @@ ---- lib/Smokeping/probes/AnotherDNS.pm.orig 2014-10-29 09:03:10.000000000 +0100 -+++ lib/Smokeping/probes/AnotherDNS.pm 2015-02-12 19:43:50.000000000 +0100 -@@ -25,6 +25,8 @@ +--- lib/Smokeping/probes/AnotherDNS.pm.orig 2018-02-02 21:14:55 UTC ++++ lib/Smokeping/probes/AnotherDNS.pm +@@ -25,6 +25,8 @@ use IO::Socket; use IO::Select; use Net::DNS; @@ -9,7 +9,7 @@ sub pod_hash { return { name => <<DOC, -@@ -108,7 +110,7 @@ +@@ -111,7 +113,7 @@ sub pingone ($) { $elapsed = tv_interval( $t0, $t1 ); if ( defined $ready ) { my $buf = ''; diff --git a/net-mgmt/smokeping/files/patch-lib__Makefile.in b/net-mgmt/smokeping/files/patch-lib__Makefile.in deleted file mode 100644 index 66f7f167ee2f..000000000000 --- a/net-mgmt/smokeping/files/patch-lib__Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lib/Makefile.in.orig 2012-02-02 15:00:36.000000000 +0100 -+++ ./lib/Makefile.in 2012-02-02 15:01:17.000000000 +0100 -@@ -217,7 +217,7 @@ SORT := $(wildcard Smokeping/sorters/*.p - PROBE := $(wildcard Smokeping/probes/*.pm) - MATCH := $(wildcard Smokeping/matchers/*.pm) - EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH) --perllibdir = $(prefix)/lib -+perllibdir = $(prefix)/smokeping/lib - nobase_perllib_DATA = $(EXTRA_DIST) - all: all-am - diff --git a/net-mgmt/smokeping/pkg-plist b/net-mgmt/smokeping/pkg-plist index 67690a51a1dd..506d42957ac4 100644 --- a/net-mgmt/smokeping/pkg-plist +++ b/net-mgmt/smokeping/pkg-plist @@ -1,35 +1,106 @@ +@dir(smokeping,smokeping,) var/smokeping +@dir(www,www,) smokeping/htdocs/img bin/smokeinfo bin/smokeping bin/smokeping_cgi bin/tSmoke -@sample smokeping/htdocs/smokeping.fcgi.sample @sample %%ETCDIR%%/basepage.html.sample @sample %%ETCDIR%%/config.sample @sample %%ETCDIR%%/smokemail.sample -@sample %%ETCDIR%%/tmail.sample @sample %%ETCDIR%%/smokeping_secrets.sample +@sample %%ETCDIR%%/tmail.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.echoping %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.fping-instances %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.multiple-probes %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.simple %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.targetvars-with-Curl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.template -smokeping/htdocs/cropper/cropper.css -smokeping/htdocs/cropper/cropper.js -smokeping/htdocs/cropper/cropper.uncompressed.js -smokeping/htdocs/cropper/lib/builder.js -smokeping/htdocs/cropper/lib/controls.js -smokeping/htdocs/cropper/lib/dragdrop.js -smokeping/htdocs/cropper/lib/effects.js -smokeping/htdocs/cropper/lib/prototype.js -smokeping/htdocs/cropper/lib/scriptaculous.js -smokeping/htdocs/cropper/lib/slider.js -smokeping/htdocs/cropper/lib/sound.js -smokeping/htdocs/cropper/lib/unittest.js -smokeping/htdocs/cropper/licence.txt -smokeping/htdocs/cropper/marqueeHoriz.gif -smokeping/htdocs/cropper/marqueeVert.gif -smokeping/htdocs/cropper/smokeping-zoom.js +man/man1/smokeping.1.gz +man/man1/smokeping_cgi.1.gz +man/man1/tSmoke.1.gz +man/man3/Smokeping_matchers_Avgratio.3.gz +man/man3/Smokeping_matchers_CheckLatency.3.gz +man/man3/Smokeping_matchers_CheckLoss.3.gz +man/man3/Smokeping_matchers_ExpLoss.3.gz +man/man3/Smokeping_matchers_Median.3.gz +man/man3/Smokeping_matchers_Medratio.3.gz +man/man3/Smokeping_matchers_base.3.gz +man/man3/Smokeping_probes_AnotherCurl.3.gz +man/man3/Smokeping_probes_AnotherDNS.3.gz +man/man3/Smokeping_probes_AnotherSSH.3.gz +man/man3/Smokeping_probes_CiscoRTTMonDNS.3.gz +man/man3/Smokeping_probes_CiscoRTTMonEchoICMP.3.gz +man/man3/Smokeping_probes_CiscoRTTMonTcpConnect.3.gz +man/man3/Smokeping_probes_Curl.3.gz +man/man3/Smokeping_probes_DNS.3.gz +man/man3/Smokeping_probes_DismanPing.3.gz +man/man3/Smokeping_probes_EchoPing.3.gz +man/man3/Smokeping_probes_EchoPingChargen.3.gz +man/man3/Smokeping_probes_EchoPingDNS.3.gz +man/man3/Smokeping_probes_EchoPingDiscard.3.gz +man/man3/Smokeping_probes_EchoPingHttp.3.gz +man/man3/Smokeping_probes_EchoPingHttps.3.gz +man/man3/Smokeping_probes_EchoPingIcp.3.gz +man/man3/Smokeping_probes_EchoPingLDAP.3.gz +man/man3/Smokeping_probes_EchoPingPlugin.3.gz +man/man3/Smokeping_probes_EchoPingSmtp.3.gz +man/man3/Smokeping_probes_EchoPingWhois.3.gz +man/man3/Smokeping_probes_FPing.3.gz +man/man3/Smokeping_probes_FPing6.3.gz +man/man3/Smokeping_probes_FPingContinuous.3.gz +man/man3/Smokeping_probes_FTPtransfer.3.gz +man/man3/Smokeping_probes_IOSPing.3.gz +man/man3/Smokeping_probes_LDAP.3.gz +man/man3/Smokeping_probes_NFSping.3.gz +man/man3/Smokeping_probes_OpenSSHEOSPing.3.gz +man/man3/Smokeping_probes_OpenSSHJunOSPing.3.gz +man/man3/Smokeping_probes_Qstat.3.gz +man/man3/Smokeping_probes_Radius.3.gz +man/man3/Smokeping_probes_RemoteFPing.3.gz +man/man3/Smokeping_probes_SSH.3.gz +man/man3/Smokeping_probes_SendEmail.3.gz +man/man3/Smokeping_probes_SipSak.3.gz +man/man3/Smokeping_probes_TCPPing.3.gz +man/man3/Smokeping_probes_TacacsPlus.3.gz +man/man3/Smokeping_probes_TelnetIOSPing.3.gz +man/man3/Smokeping_probes_TelnetJunOSPing.3.gz +man/man3/Smokeping_probes_TraceroutePing.3.gz +man/man3/Smokeping_probes_WebProxyFilter.3.gz +man/man3/Smokeping_probes_base.3.gz +man/man3/Smokeping_probes_basefork.3.gz +man/man3/Smokeping_probes_basevars.3.gz +man/man3/Smokeping_probes_passwordchecker.3.gz +man/man3/Smokeping_probes_skel.3.gz +man/man3/Smokeping_sorters_Loss.3.gz +man/man3/Smokeping_sorters_Max.3.gz +man/man3/Smokeping_sorters_Median.3.gz +man/man3/Smokeping_sorters_StdDev.3.gz +man/man3/Smokeping_sorters_base.3.gz +man/man5/smokeping_config.5.gz +man/man5/smokeping_examples.5.gz +man/man7/smokeping_extend.7.gz +man/man7/smokeping_install.7.gz +man/man7/smokeping_master_slave.7.gz +man/man7/smokeping_upgrade.7.gz +smokeping/htdocs/css/smokeping-print.css +smokeping/htdocs/css/smokeping-screen.css +smokeping/htdocs/js/cropper/cropper.css +smokeping/htdocs/js/cropper/cropper.js +smokeping/htdocs/js/cropper/cropper.uncompressed.js +smokeping/htdocs/js/cropper/licence.txt +smokeping/htdocs/js/cropper/marqueeHoriz.gif +smokeping/htdocs/js/cropper/marqueeVert.gif +smokeping/htdocs/js/prototype.js +smokeping/htdocs/js/scriptaculous/builder.js +smokeping/htdocs/js/scriptaculous/controls.js +smokeping/htdocs/js/scriptaculous/dragdrop.js +smokeping/htdocs/js/scriptaculous/effects.js +smokeping/htdocs/js/scriptaculous/scriptaculous.js +smokeping/htdocs/js/scriptaculous/slider.js +smokeping/htdocs/js/scriptaculous/sound.js +smokeping/htdocs/js/scriptaculous/unittest.js +smokeping/htdocs/js/smokeping.js +smokeping/htdocs/smokeping.fcgi.sample smokeping/lib/Smokeping.pm smokeping/lib/Smokeping/Colorspace.pm smokeping/lib/Smokeping/Config.pm @@ -49,6 +120,7 @@ smokeping/lib/Smokeping/matchers/Median.pm smokeping/lib/Smokeping/matchers/Medratio.pm smokeping/lib/Smokeping/matchers/base.pm smokeping/lib/Smokeping/pingMIB.pm +smokeping/lib/Smokeping/probes/AnotherCurl.pm smokeping/lib/Smokeping/probes/AnotherDNS.pm smokeping/lib/Smokeping/probes/AnotherSSH.pm smokeping/lib/Smokeping/probes/CiscoRTTMonDNS.pm @@ -70,6 +142,7 @@ smokeping/lib/Smokeping/probes/EchoPingSmtp.pm smokeping/lib/Smokeping/probes/EchoPingWhois.pm smokeping/lib/Smokeping/probes/FPing.pm smokeping/lib/Smokeping/probes/FPing6.pm +smokeping/lib/Smokeping/probes/FPingContinuous.pm smokeping/lib/Smokeping/probes/FTPtransfer.pm smokeping/lib/Smokeping/probes/IOSPing.pm smokeping/lib/Smokeping/probes/LDAP.pm @@ -80,87 +153,21 @@ smokeping/lib/Smokeping/probes/Qstat.pm smokeping/lib/Smokeping/probes/Radius.pm smokeping/lib/Smokeping/probes/RemoteFPing.pm smokeping/lib/Smokeping/probes/SSH.pm +smokeping/lib/Smokeping/probes/SendEmail.pm smokeping/lib/Smokeping/probes/SipSak.pm smokeping/lib/Smokeping/probes/TCPPing.pm smokeping/lib/Smokeping/probes/TacacsPlus.pm smokeping/lib/Smokeping/probes/TelnetIOSPing.pm smokeping/lib/Smokeping/probes/TelnetJunOSPing.pm +smokeping/lib/Smokeping/probes/TraceroutePing.pm smokeping/lib/Smokeping/probes/WebProxyFilter.pm smokeping/lib/Smokeping/probes/base.pm smokeping/lib/Smokeping/probes/basefork.pm smokeping/lib/Smokeping/probes/basevars.pm smokeping/lib/Smokeping/probes/passwordchecker.pm smokeping/lib/Smokeping/probes/skel.pm -smokeping/lib/Smokeping/probes/SendEmail.pm smokeping/lib/Smokeping/sorters/Loss.pm smokeping/lib/Smokeping/sorters/Max.pm smokeping/lib/Smokeping/sorters/Median.pm smokeping/lib/Smokeping/sorters/StdDev.pm smokeping/lib/Smokeping/sorters/base.pm -man/man1/smokeping.1.gz -man/man1/smokeping_cgi.1.gz -man/man1/tSmoke.1.gz -man/man3/Smokeping_matchers_Avgratio.3.gz -man/man3/Smokeping_matchers_CheckLatency.3.gz -man/man3/Smokeping_matchers_CheckLoss.3.gz -man/man3/Smokeping_matchers_ExpLoss.3.gz -man/man3/Smokeping_matchers_Median.3.gz -man/man3/Smokeping_matchers_Medratio.3.gz -man/man3/Smokeping_matchers_base.3.gz -man/man3/Smokeping_probes_AnotherDNS.3.gz -man/man3/Smokeping_probes_AnotherSSH.3.gz -man/man3/Smokeping_probes_CiscoRTTMonDNS.3.gz -man/man3/Smokeping_probes_CiscoRTTMonEchoICMP.3.gz -man/man3/Smokeping_probes_CiscoRTTMonTcpConnect.3.gz -man/man3/Smokeping_probes_Curl.3.gz -man/man3/Smokeping_probes_DNS.3.gz -man/man3/Smokeping_probes_DismanPing.3.gz -man/man3/Smokeping_probes_EchoPing.3.gz -man/man3/Smokeping_probes_EchoPingChargen.3.gz -man/man3/Smokeping_probes_EchoPingDNS.3.gz -man/man3/Smokeping_probes_EchoPingDiscard.3.gz -man/man3/Smokeping_probes_EchoPingHttp.3.gz -man/man3/Smokeping_probes_EchoPingHttps.3.gz -man/man3/Smokeping_probes_EchoPingIcp.3.gz -man/man3/Smokeping_probes_EchoPingLDAP.3.gz -man/man3/Smokeping_probes_EchoPingPlugin.3.gz -man/man3/Smokeping_probes_EchoPingSmtp.3.gz -man/man3/Smokeping_probes_EchoPingWhois.3.gz -man/man3/Smokeping_probes_FPing.3.gz -man/man3/Smokeping_probes_FPing6.3.gz -man/man3/Smokeping_probes_FTPtransfer.3.gz -man/man3/Smokeping_probes_IOSPing.3.gz -man/man3/Smokeping_probes_LDAP.3.gz -man/man3/Smokeping_probes_NFSping.3.gz -man/man3/Smokeping_probes_OpenSSHEOSPing.3.gz -man/man3/Smokeping_probes_OpenSSHJunOSPing.3.gz -man/man3/Smokeping_probes_Qstat.3.gz -man/man3/Smokeping_probes_Radius.3.gz -man/man3/Smokeping_probes_RemoteFPing.3.gz -man/man3/Smokeping_probes_SSH.3.gz -man/man3/Smokeping_probes_SendEmail.3.gz -man/man3/Smokeping_probes_SipSak.3.gz -man/man3/Smokeping_probes_TCPPing.3.gz -man/man3/Smokeping_probes_TacacsPlus.3.gz -man/man3/Smokeping_probes_TelnetIOSPing.3.gz -man/man3/Smokeping_probes_TelnetJunOSPing.3.gz -man/man3/Smokeping_probes_WebProxyFilter.3.gz -man/man3/Smokeping_probes_base.3.gz -man/man3/Smokeping_probes_basefork.3.gz -man/man3/Smokeping_probes_basevars.3.gz -man/man3/Smokeping_probes_passwordchecker.3.gz -man/man3/Smokeping_probes_skel.3.gz -man/man3/Smokeping_sorters_Loss.3.gz -man/man3/Smokeping_sorters_Max.3.gz -man/man3/Smokeping_sorters_Median.3.gz -man/man3/Smokeping_sorters_StdDev.3.gz -man/man3/Smokeping_sorters_base.3.gz -man/man5/smokeping_config.5.gz -man/man5/smokeping_examples.5.gz -man/man7/smokeping_extend.7.gz -man/man7/smokeping_install.7.gz -man/man7/smokeping_master_slave.7.gz -man/man7/smokeping_upgrade.7.gz -@dir(www,www,) smokeping/htdocs/img -@dir(smokeping,smokeping,) var/smokeping -%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%% |