kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 4.3.19

Browse source 
Remove patches that were upstreamed

xymon-client rc script: leftover children auto expire after 5 minutes;
remove stop_postcmd

Special thanks to JC Cleaver who is taking upstream Xymon to new and
exciting places.
This commit is contained in:
Mark Felder 2015-03-31 12:55:57 +00:00
parent 3d3b7057d8
commit e99774962f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=382811
8 changed files with 13 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net-mgmt/xymon-client/Makefile
View file

@ -1,8 +1,8 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= xymon PORTNAME= xymon
PORTVERSION= 4.3.18 PORTVERSION= 4.3.19
PORTREVISION= 6 PORTREVISION= 0
CATEGORIES= net-mgmt www CATEGORIES= net-mgmt www
MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} MASTER_SITES= SF/xymon/Xymon/${PORTVERSION}
PKGNAMESUFFIX= -client${PKGNAMESUFFIX2} PKGNAMESUFFIX= -client${PKGNAMESUFFIX2}

4
net-mgmt/xymon-client/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (repacked/xymon-4.3.18.tar.gz) = 39ed987400f6e3c06b0dde59a02d512b7de1e8c86b9b42a5bc3c85b341831978 SHA256 (repacked/xymon-4.3.19.tar.gz) = e8757a55d49445c06d273210773fa0fb2db789600fa29e4a94a6db70ee058c6a
SIZE (repacked/xymon-4.3.18.tar.gz) = 2773259 SIZE (repacked/xymon-4.3.19.tar.gz) = 2962417

2
net-mgmt/xymon-client/files/xymon-client.in
View file

@ -20,8 +20,6 @@ pidfile="%%WWWDIR%%/client/logs/clientlaunch.`hostname`.pid"
command=%%WWWDIR%%/client/bin/xymonlaunch command=%%WWWDIR%%/client/bin/xymonlaunch
command_args="--config=%%WWWDIR%%/client/etc/clientlaunch.cfg --log=%%WWWDIR%%/client/logs/clientlaunch.log --pidfile=${pidfile}" command_args="--config=%%WWWDIR%%/client/etc/clientlaunch.cfg --log=%%WWWDIR%%/client/logs/clientlaunch.log --pidfile=${pidfile}"
start_precmd=xymon_precmd start_precmd=xymon_precmd
# Clean up leftover children
stop_postcmd="pkill -U ${xymon_client_user} vmstat"
xymon_precmd() xymon_precmd()
{ {

4
net-mgmt/xymon-server/Makefile
View file

@ -1,8 +1,8 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= xymon PORTNAME= xymon
PORTVERSION= 4.3.18 PORTVERSION= 4.3.19
PORTREVISION= 6 PORTREVISION= 0
CATEGORIES= net-mgmt www CATEGORIES= net-mgmt www
MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} MASTER_SITES= SF/xymon/Xymon/${PORTVERSION}
PKGNAMESUFFIX= -server${PKGNAMESUFFIX2} PKGNAMESUFFIX= -server${PKGNAMESUFFIX2}

4
net-mgmt/xymon-server/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (repacked/xymon-4.3.18.tar.gz) = 39ed987400f6e3c06b0dde59a02d512b7de1e8c86b9b42a5bc3c85b341831978 SHA256 (repacked/xymon-4.3.19.tar.gz) = e8757a55d49445c06d273210773fa0fb2db789600fa29e4a94a6db70ee058c6a
SIZE (repacked/xymon-4.3.18.tar.gz) = 2773259 SIZE (repacked/xymon-4.3.19.tar.gz) = 2962417

11
net-mgmt/xymon-server/files/patch-xymonnet_dns2.c
View file

@ -1,11 +0,0 @@
--- xymonnet/dns2.c.orig 2015-01-05 13:46:32 UTC
+++ xymonnet/dns2.c
@@ -472,7 +472,7 @@ static const unsigned char *display_rr(c
/* The RR data is a 16-byte IPv6 address. */
if (dlen != 16) return NULL;
memcpy(&addr6, aptr, sizeof(struct in6_addr));
- addtobuffer_many(response->msgbuf, "\t", inet_ntop(AF_INET6,&addr6,msg,sizeof(msg)) );
+ addtobuffer_many(response->msgbuf, "\t", inet_ntop(AF_INET6,&addr6,msg,sizeof(msg)), NULL);
break;
case T_WKS:

11
net-mgmt/xymon-server/files/patch-xymonproxy_xymonproxy.c
View file

@ -1,11 +0,0 @@
--- xymonproxy/xymonproxy.c.orig 2015-02-17 17:31:01 UTC
+++ xymonproxy/xymonproxy.c
@@ -964,7 +964,7 @@ int main(int argc, char *argv[])
}
if (combining) {
- selecttmo.tv_sec = 0; selecttmo.tv_usec = COMBO_DELAY;
+ selecttmo.tv_sec = 0; selecttmo.tv_usec = COMBO_DELAY / 1000;
}
else {
selecttmo.tv_sec = 1; selecttmo.tv_usec = 0;

5
net-mgmt/xymon-server/pkg-plist
View file

@ -67,6 +67,7 @@ man/man8/xymond_sample.8
man/man8/xymonfetch.8 man/man8/xymonfetch.8
man/man8/xymonlaunch.8 man/man8/xymonlaunch.8
man/man8/xymonproxy.8 man/man8/xymonproxy.8
%%WWWDIR%%/cgi-bin/acknowledgements.sh
%%WWWDIR%%/cgi-bin/appfeed-critical.sh %%WWWDIR%%/cgi-bin/appfeed-critical.sh
%%WWWDIR%%/cgi-bin/appfeed.sh %%WWWDIR%%/cgi-bin/appfeed.sh
%%WWWDIR%%/cgi-bin/certreport.sh %%WWWDIR%%/cgi-bin/certreport.sh
@ -99,6 +100,7 @@ man/man8/xymonproxy.8
%%WWWDIR%%/cgi-secure/useradm.sh %%WWWDIR%%/cgi-secure/useradm.sh
%%WWWDIR%%/server/bin/ackinfo.cgi %%WWWDIR%%/server/bin/ackinfo.cgi
%%WWWDIR%%/server/bin/acknowledge.cgi %%WWWDIR%%/server/bin/acknowledge.cgi
%%WWWDIR%%/server/bin/acknowledgements.cgi
%%WWWDIR%%/server/bin/appfeed.cgi %%WWWDIR%%/server/bin/appfeed.cgi
%%WWWDIR%%/server/bin/bb %%WWWDIR%%/server/bin/bb
%%WWWDIR%%/server/bin/bbcmd %%WWWDIR%%/server/bin/bbcmd
@ -187,6 +189,9 @@ man/man8/xymonproxy.8
%%WWWDIR%%/server/web/acknowledge_footer %%WWWDIR%%/server/web/acknowledge_footer
%%WWWDIR%%/server/web/acknowledge_form %%WWWDIR%%/server/web/acknowledge_form
%%WWWDIR%%/server/web/acknowledge_header %%WWWDIR%%/server/web/acknowledge_header
%%WWWDIR%%/server/web/acknowledgements_footer
%%WWWDIR%%/server/web/acknowledgements_form
%%WWWDIR%%/server/web/acknowledgements_header
%%WWWDIR%%/server/web/columndoc_footer %%WWWDIR%%/server/web/columndoc_footer
%%WWWDIR%%/server/web/columndoc_header %%WWWDIR%%/server/web/columndoc_header
%%WWWDIR%%/server/web/confreport_back %%WWWDIR%%/server/web/confreport_back