View | Details | Raw Unified | Return to bug 197579
Collapse All | Expand All

(-)/usr/home/pi/myp/net-mgmt/smokeping/Makefile (-14 / +10 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/net-mgmt/smokeping/Makefile 376298 2015-01-05 13:18:58Z marino $
2
# $FreeBSD: head/net-mgmt/smokeping/Makefile 376298 2015-01-05 13:18:58Z marino $
3
3
4
PORTNAME=	smokeping
4
PORTNAME=	smokeping
5
PORTVERSION=	2.6.9
5
PORTVERSION=	2.6.11
6
PORTREVISION=	4
7
CATEGORIES=	net-mgmt www
6
CATEGORIES=	net-mgmt www
8
MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/ \
7
MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/ \
9
		http://smokeping.cs.pu.edu.tw/pub/
8
		http://smokeping.cs.pu.edu.tw/pub/
Lines 16-27 Link Here
16
LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
15
LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
17
BUILD_DEPENDS=	p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
16
BUILD_DEPENDS=	p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
18
		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
17
		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
18
		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
19
		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
20
		p5-IO-Pty-Easy>=0:${PORTSDIR}/devel/p5-IO-Pty-Easy \
19
		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
21
		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
20
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
22
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
21
		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
23
		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
22
		p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI \
24
		p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI \
23
		p5-Config-Grammar>=0:${PORTSDIR}/devel/p5-Config-Grammar \
25
		p5-Config-Grammar>=0:${PORTSDIR}/devel/p5-Config-Grammar \
24
		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6
26
		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
27
		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
28
		p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
29
		p5-Net-OpenSSH>=0:${PORTSDIR}/net/p5-Net-OpenSSH \
30
		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
25
RUN_DEPENDS:=	${BUILD_DEPENDS}
31
RUN_DEPENDS:=	${BUILD_DEPENDS}
26
32
27
USES=		gmake perl5
33
USES=		gmake perl5
Lines 47-59 Link Here
47
FPING_DESC=	Support for fping probes
53
FPING_DESC=	Support for fping probes
48
ECHOPING_DESC=	Support for EchoPing probes
54
ECHOPING_DESC=	Support for EchoPing probes
49
CURL_DESC=	Support for Curl probes
55
CURL_DESC=	Support for Curl probes
50
LDAP_DESC=	Support for LDAP probes
51
LDAPSSL_DESC=	Support for SSL-enabled LDAP probes
52
RADIUS_DESC=	Support for Radius probes
56
RADIUS_DESC=	Support for Radius probes
53
TELNET_DESC=	Support for TelnetIOSPing probes
57
TELNET_DESC=	Support for TelnetIOSPing probes
54
DNS_DESC=	Support for AnotherDNS probes
58
DNS_DESC=	Support for AnotherDNS probes
55
59
56
OPTIONS_DEFINE=	ECHOPING CURL RADIUS TELNET DNS FPING LDAP LDAPSSL
60
OPTIONS_DEFINE=	ECHOPING CURL RADIUS TELNET DNS FPING
57
OPTIONS_DEFAULT=	FPING
61
OPTIONS_DEFAULT=	FPING
58
62
59
.include <bsd.port.options.mk>
63
.include <bsd.port.options.mk>
Lines 70-87 Link Here
70
RUN_DEPENDS+=	${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
74
RUN_DEPENDS+=	${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
71
.endif
75
.endif
72
76
73
.if ${PORT_OPTIONS:MLDAP} || ${PORT_OPTIONS:MLDAPSSL}
74
RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
75
.endif
76
77
.if ${PORT_OPTIONS:MRADIUS}
77
.if ${PORT_OPTIONS:MRADIUS}
78
RUN_DEPENDS+=	p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius
78
RUN_DEPENDS+=	p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius
79
.endif
79
.endif
80
80
81
.if ${PORT_OPTIONS:MLDAPSSL}
82
RUN_DEPENDS+=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
83
.endif
84
85
.if ${PORT_OPTIONS:MTELNET}
81
.if ${PORT_OPTIONS:MTELNET}
86
RUN_DEPENDS+=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
82
RUN_DEPENDS+=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
87
.endif
83
.endif
(-)/usr/home/pi/myp/net-mgmt/smokeping/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (smokeping-2.6.9.tar.gz) = cd551d4384d8b19879d128ea0566bd680c19bb4ad8664a3c5a304604746f8863
1
SHA256 (smokeping-2.6.11.tar.gz) = f2b3c386e95a74af2b1e7aec6410d0a58852339f00e9963f3c770cfd85ba30dd
2
SIZE (smokeping-2.6.9.tar.gz) = 427185
2
SIZE (smokeping-2.6.11.tar.gz) = 417338
(-)/usr/home/pi/myp/net-mgmt/smokeping/files/patch-htdocs-Makefile.in (-4 / +4 lines)
Lines 1-11 Link Here
1
--- htdocs/Makefile.in.orig	2013-03-04 13:07:55.000000000 +0000
1
--- htdocs/Makefile.in.orig	2014-11-04 23:50:59.000000000 +0100
2
+++ htdocs/Makefile.in	2014-07-19 10:42:00.470292529 +0000
2
+++ htdocs/Makefile.in	2015-02-12 19:30:27.000000000 +0100
3
@@ -432,9 +432,9 @@
3
@@ -466,9 +466,9 @@
4
 
4
 
5
 install-data-local:
5
 install-data-local:
6
 	$(MKDIR) -p $(DESTDIR)$(HTDOCSDIR)
6
 	$(MKDIR) -p $(DESTDIR)$(HTDOCSDIR)
7
-	$(ECHO)	"#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
7
-	$(ECHO)	"#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
8
-	$(ECHO)	"exec $(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
8
-	$(ECHO)	"exec $(bindir)/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
9
-	chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
9
-	chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
10
+	$(ECHO)	"#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample
10
+	$(ECHO)	"#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample
11
+	$(ECHO)	"exec $(prefix)/bin/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample
11
+	$(ECHO)	"exec $(prefix)/bin/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample
(-)/usr/home/pi/myp/net-mgmt/smokeping/files/patch-lib__Smokeping.pm (-9 / +55 lines)
Lines 1-11 Link Here
1
--- ./lib/Smokeping.pm.orig	2014-09-20 00:55:47.498042436 +0400
1
--- lib/Smokeping.pm.orig	2015-02-12 19:31:21.000000000 +0100
2
+++ ./lib/Smokeping.pm	2014-09-20 00:56:31.929038660 +0400
2
+++ lib/Smokeping.pm	2015-02-12 19:34:23.000000000 +0100
3
@@ -2631,7 +2631,7 @@
3
@@ -2632,12 +2632,14 @@
4
 The base directory where SmokePing keeps the files related to the DYNAMIC function.
4
         {
5
 This directory must be writeable by the WWW server. It is also used for temporary
5
          %$DIRCHECK_SUB,
6
 storage of slave polling results by the master in 
6
          _doc => <<DOC,
7
-L<the master/slave mode|smokeping_master_slave>.
7
-The base directory where SmokePing keeps the files related to the DYNAMIC function.
8
+L<the masterE<sol>slave mode|smokeping_master_slave>.
8
-This directory must be writeable by the WWW server. It is also used for temporary
9
-storage of slave polling results by the master in 
10
+The base directory where SmokePing keeps the files related to the DYNAMIC
11
+function.
12
+This directory must be writeable by the WWW server. It is also used for
13
+temporary storage of slave polling results by the master in 
14
 L<the masterE<sol>slave mode|smokeping_master_slave>.
9
 
15
 
10
 If this variable is not specified, the value of C<datadir> will be used instead.
16
-If this variable is not specified, the value of C<datadir> will be used instead.
17
+If this variable is not specified, the value of C<datadir> will be
18
+used instead.
11
 DOC
19
 DOC
20
         },
21
         piddir  =>
22
@@ -4214,7 +4216,7 @@
23
         if(defined $opt{'check'}) { verify_cfg($cfgfile); exit 0; }
24
         if($opt{reload})  { 
25
             load_cfg $cfgfile, 'noinit'; # we need just the piddir
26
-            kill_smoke $cfg->{General}{piddir}."/smokeping.pid", SIGHUP; 
27
+            kill_smoke $cfg->{General}{piddir}."/pid", SIGHUP; 
28
             print "HUP signal sent to the running SmokePing process, exiting.\n";
29
             exit 0;
30
         };
31
@@ -4223,7 +4225,7 @@
32
         if(defined $opt{'static-pages'}) { makestaticpages $cfg, $opt{'static-pages'}; exit 0 };
33
         if($opt{email})    { enable_dynamic $cfg, $cfg->{Targets},"",""; exit 0 };
34
     }
35
-    if($opt{restart})  { kill_smoke $cfg->{General}{piddir}."/smokeping.pid", SIGINT;};
36
+    if($opt{restart})  { kill_smoke $cfg->{General}{piddir}."/pid", SIGINT;};
37
 
38
     if($opt{logfile})      { initialize_filelog($opt{logfile}) };
39
 
40
@@ -4236,7 +4238,7 @@
41
                 initialize_syslog($cfg->{General}{syslogfacility}, 
42
                                   $cfg->{General}{syslogpriority});
43
         }
44
-        daemonize_me $cfg->{General}{piddir}."/smokeping.pid";
45
+        daemonize_me $cfg->{General}{piddir}."/pid";
46
     }
47
     do_log "Smokeping version $VERSION successfully launched.";
48
 
49
@@ -4413,7 +4415,7 @@
50
             my $new_conf = Smokeping::Slave::submit_results $slave_cfg,$cfg,$myprobe,$probes;
51
             if ($new_conf && !$gothup){
52
                 do_log('server has new config for me ... HUPing the parent');
53
-                kill_smoke $cfg->{General}{piddir}."/smokeping.pid", SIGHUP; 
54
+                kill_smoke $cfg->{General}{piddir}."/pid", SIGHUP; 
55
                 # wait until the parent signals back if it didn't already
56
                 sleep if (!$gothup);
57
                 if (!$gothup) {
(-)/usr/home/pi/myp/net-mgmt/smokeping/files/patch-lib__Smokeping__probes__AnotherDNS.pm (-4 / +4 lines)
Lines 1-5 Link Here
1
--- lib/Smokeping/probes/AnotherDNS.pm.orig	2012-07-09 09:45:46.000000000 +0000
1
--- lib/Smokeping/probes/AnotherDNS.pm.orig	2014-10-29 09:03:10.000000000 +0100
2
+++ lib/Smokeping/probes/AnotherDNS.pm	2014-07-22 23:07:45.626343897 +0000
2
+++ lib/Smokeping/probes/AnotherDNS.pm	2015-02-12 19:43:50.000000000 +0100
3
@@ -25,6 +25,8 @@
3
@@ -25,6 +25,8 @@
4
 use IO::Select;
4
 use IO::Select;
5
 use Net::DNS;
5
 use Net::DNS;
Lines 9-19 Link Here
9
 sub pod_hash {
9
 sub pod_hash {
10
 	return {
10
 	return {
11
 		name => <<DOC,
11
 		name => <<DOC,
12
@@ -95,7 +97,7 @@
12
@@ -108,7 +110,7 @@
13
         $elapsed = tv_interval( $t0, $t1 );
13
         $elapsed = tv_interval( $t0, $t1 );
14
         if ( defined $ready ) {
14
         if ( defined $ready ) {
15
             my $buf = '';
15
             my $buf = '';
16
-            $ready->recv( $buf, &Net::DNS::PACKETSZ );
16
-            $ready->recv( $buf, 512 );
17
+            $ready->recv( $buf, PACKETSZ );
17
+            $ready->recv( $buf, PACKETSZ );
18
 	    my ($recvPacket, $err) = Net::DNS::Packet->new(\$buf);
18
 	    my ($recvPacket, $err) = Net::DNS::Packet->new(\$buf);
19
 	    if (defined $recvPacket) {
19
 	    if (defined $recvPacket) {
(-)/usr/home/pi/myp/net-mgmt/smokeping/files/smokeping.in (-6 / +41 lines)
Lines 20-32 Link Here
20
. /etc/rc.subr
20
. /etc/rc.subr
21
21
22
name=smokeping
22
name=smokeping
23
24
rcvar=smokeping_enable
23
rcvar=smokeping_enable
25
24
26
load_rc_config $name
25
extra_commands="status configtest reload"
26
27
status_cmd="smokeping_status"
28
configtest_cmd="smokeping_configtest"
29
reload_cmd="smokeping_reload"
30
stop_cmd="smokeping_stop"
27
31
28
: ${smokeping_enable:=NO}
32
: ${smokeping_enable:=NO}
29
: ${smokeping_pidfile="%%PREFIX%%/var/smokeping/smokeping.pid"}
33
# pidfile is hardcoded in Smokeping.pm, not configurable
34
smokeping_pidfile="%%PREFIX%%/var/smokeping/pid"
30
: ${smokeping_logfile=/var/log/smokeping.log}
35
: ${smokeping_logfile=/var/log/smokeping.log}
31
: ${smokeping_user="%%USERS%%"}
36
: ${smokeping_user="%%USERS%%"}
32
: ${smokeping_group="%%GROUPS%%"}
37
: ${smokeping_group="%%GROUPS%%"}
Lines 36-44 Link Here
36
pidfile="${smokeping_pidfile}"
41
pidfile="${smokeping_pidfile}"
37
command_interpreter="%%PREFIX%%/bin/perl"
42
command_interpreter="%%PREFIX%%/bin/perl"
38
43
39
extra_commands=reload
40
reload_cmd="${command} --reload"
41
42
smokeping_startprecmd()
44
smokeping_startprecmd()
43
{
45
{
44
	if [ ! -e ${smokeping_logfile} ];
46
	if [ ! -e ${smokeping_logfile} ];
Lines 47-50 Link Here
47
	fi
49
	fi
48
}
50
}
49
51
52
smokeping_status()
53
{
54
	rc_pid=$(check_pidfile $pidfile $command)
55
	if [ -z "$rc_pid" ]; then
56
		_run_rc_notrunning
57
	else
58
		echo "${name} is running as pid $rc_pid"
59
        fi
60
}
61
62
smokeping_configtest()
63
{
64
	/usr/local/bin/smokeping --check
65
}
66
67
smokeping_reload()
68
{
69
	/usr/local/bin/smokeping --reload
70
}
71
72
smokeping_stop()
73
{
74
	rc_pid=$(check_pidfile $pidfile $command)
75
	if [ -z "$rc_pid" ]; then
76
		_run_rc_notrunning
77
	else
78
		echo "Stopping ${name} (pid $rc_pid)."
79
		kill -15 $rc_pid
80
        fi
81
}
82
83
load_rc_config $name
84
50
run_rc_command "$1"
85
run_rc_command "$1"
(-)/usr/home/pi/myp/net-mgmt/smokeping/pkg-plist (-14 / +18 lines)
Lines 74-80 Link Here
74
smokeping/lib/Smokeping/probes/IOSPing.pm
74
smokeping/lib/Smokeping/probes/IOSPing.pm
75
smokeping/lib/Smokeping/probes/LDAP.pm
75
smokeping/lib/Smokeping/probes/LDAP.pm
76
smokeping/lib/Smokeping/probes/NFSping.pm
76
smokeping/lib/Smokeping/probes/NFSping.pm
77
smokeping/lib/Smokeping/probes/OpenSSHEOSPing.pm
77
smokeping/lib/Smokeping/probes/OpenSSHJunOSPing.pm
78
smokeping/lib/Smokeping/probes/OpenSSHJunOSPing.pm
79
smokeping/lib/Smokeping/probes/Qstat.pm
78
smokeping/lib/Smokeping/probes/Radius.pm
80
smokeping/lib/Smokeping/probes/Radius.pm
79
smokeping/lib/Smokeping/probes/RemoteFPing.pm
81
smokeping/lib/Smokeping/probes/RemoteFPing.pm
80
smokeping/lib/Smokeping/probes/SSH.pm
82
smokeping/lib/Smokeping/probes/SSH.pm
Lines 130-136 Link Here
130
man/man3/Smokeping_probes_IOSPing.3.gz
132
man/man3/Smokeping_probes_IOSPing.3.gz
131
man/man3/Smokeping_probes_LDAP.3.gz
133
man/man3/Smokeping_probes_LDAP.3.gz
132
man/man3/Smokeping_probes_NFSping.3.gz
134
man/man3/Smokeping_probes_NFSping.3.gz
135
man/man3/Smokeping_probes_OpenSSHEOSPing.3.gz
133
man/man3/Smokeping_probes_OpenSSHJunOSPing.3.gz
136
man/man3/Smokeping_probes_OpenSSHJunOSPing.3.gz
137
man/man3/Smokeping_probes_Qstat.3.gz
134
man/man3/Smokeping_probes_Radius.3.gz
138
man/man3/Smokeping_probes_Radius.3.gz
135
man/man3/Smokeping_probes_RemoteFPing.3.gz
139
man/man3/Smokeping_probes_RemoteFPing.3.gz
136
man/man3/Smokeping_probes_SSH.3.gz
140
man/man3/Smokeping_probes_SSH.3.gz
Lines 157-175 Link Here
157
man/man7/smokeping_install.7.gz
161
man/man7/smokeping_install.7.gz
158
man/man7/smokeping_master_slave.7.gz
162
man/man7/smokeping_master_slave.7.gz
159
man/man7/smokeping_upgrade.7.gz
163
man/man7/smokeping_upgrade.7.gz
160
@dirrm etc/smokeping
164
@dir etc/smokeping
161
@dirrm var/smokeping
165
@dir var/smokeping
162
@dirrm var
166
@dir var
163
@dirrm smokeping/lib/Smokeping/sorters
167
@dir smokeping/lib/Smokeping/sorters
164
@dirrm smokeping/lib/Smokeping/probes
168
@dir smokeping/lib/Smokeping/probes
165
@dirrm smokeping/lib/Smokeping/matchers
169
@dir smokeping/lib/Smokeping/matchers
166
@dirrm smokeping/lib/Smokeping
170
@dir smokeping/lib/Smokeping
167
@dirrm smokeping/lib
171
@dir smokeping/lib
168
@dirrm smokeping/htdocs/img
172
@dir smokeping/htdocs/img
169
@dirrm smokeping/htdocs/cropper/lib
173
@dir smokeping/htdocs/cropper/lib
170
@dirrm smokeping/htdocs/cropper
174
@dir smokeping/htdocs/cropper
171
@dirrm smokeping/htdocs
175
@dir smokeping/htdocs
172
@dirrm smokeping
176
@dir smokeping
173
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
177
%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%
174
@exec mkdir -p %D/smokeping/htdocs/img; chown www:www %D/smokeping/htdocs/img
178
@exec mkdir -p %D/smokeping/htdocs/img; chown www:www %D/smokeping/htdocs/img
175
@exec mkdir -p %D/var/smokeping; chown smokeping:smokeping %D/var/smokeping
179
@exec mkdir -p %D/var/smokeping; chown smokeping:smokeping %D/var/smokeping

Return to bug 197579