diff options
| author | feld <feld@FreeBSD.org> | 2015-03-31 20:55:57 +0800 |
|---|---|---|
| committer | feld <feld@FreeBSD.org> | 2015-03-31 20:55:57 +0800 |
| commit | 3aab8e95ed5a070df28f4a6d16a29dc347bbb845 (patch) | |
| tree | 17f63df7fb25eb04d9427579822c7d8e21c8de68 /net-mgmt/xymon-server | |
| parent | bd7abe8233afc7cc1d2ab23417e198c806025e67 (diff) | |
| download | freebsd-ports-gnome-3aab8e95ed5a070df28f4a6d16a29dc347bbb845.tar.gz freebsd-ports-gnome-3aab8e95ed5a070df28f4a6d16a29dc347bbb845.tar.zst freebsd-ports-gnome-3aab8e95ed5a070df28f4a6d16a29dc347bbb845.zip | |
Update to 4.3.19
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.
Diffstat (limited to 'net-mgmt/xymon-server')
| -rw-r--r-- | net-mgmt/xymon-server/Makefile | 4 | ||||
| -rw-r--r-- | net-mgmt/xymon-server/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/xymon-server/files/patch-xymonnet_dns2.c | 11 | ||||
| -rw-r--r-- | net-mgmt/xymon-server/files/patch-xymonproxy_xymonproxy.c | 11 | ||||
| -rw-r--r-- | net-mgmt/xymon-server/pkg-plist | 5 |
5 files changed, 9 insertions, 26 deletions
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile index f0b3b6069ca9..27f2528e7bdf 100644 --- a/net-mgmt/xymon-server/Makefile +++ b/net-mgmt/xymon-server/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= xymon -PORTVERSION= 4.3.18 -PORTREVISION= 6 +PORTVERSION= 4.3.19 +PORTREVISION= 0 CATEGORIES= net-mgmt www MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} PKGNAMESUFFIX= -server${PKGNAMESUFFIX2} diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo index 416f181fe71c..d6467de59d23 100644 --- a/net-mgmt/xymon-server/distinfo +++ b/net-mgmt/xymon-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (repacked/xymon-4.3.18.tar.gz) = 39ed987400f6e3c06b0dde59a02d512b7de1e8c86b9b42a5bc3c85b341831978 -SIZE (repacked/xymon-4.3.18.tar.gz) = 2773259 +SHA256 (repacked/xymon-4.3.19.tar.gz) = e8757a55d49445c06d273210773fa0fb2db789600fa29e4a94a6db70ee058c6a +SIZE (repacked/xymon-4.3.19.tar.gz) = 2962417 diff --git a/net-mgmt/xymon-server/files/patch-xymonnet_dns2.c b/net-mgmt/xymon-server/files/patch-xymonnet_dns2.c deleted file mode 100644 index c1b7db6d7bd5..000000000000 --- a/net-mgmt/xymon-server/files/patch-xymonnet_dns2.c +++ /dev/null @@ -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: diff --git a/net-mgmt/xymon-server/files/patch-xymonproxy_xymonproxy.c b/net-mgmt/xymon-server/files/patch-xymonproxy_xymonproxy.c deleted file mode 100644 index d40124e925c9..000000000000 --- a/net-mgmt/xymon-server/files/patch-xymonproxy_xymonproxy.c +++ /dev/null @@ -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; diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist index 41b4617e5cc6..8ee2e55d760c 100644 --- a/net-mgmt/xymon-server/pkg-plist +++ b/net-mgmt/xymon-server/pkg-plist @@ -67,6 +67,7 @@ man/man8/xymond_sample.8 man/man8/xymonfetch.8 man/man8/xymonlaunch.8 man/man8/xymonproxy.8 +%%WWWDIR%%/cgi-bin/acknowledgements.sh %%WWWDIR%%/cgi-bin/appfeed-critical.sh %%WWWDIR%%/cgi-bin/appfeed.sh %%WWWDIR%%/cgi-bin/certreport.sh @@ -99,6 +100,7 @@ man/man8/xymonproxy.8 %%WWWDIR%%/cgi-secure/useradm.sh %%WWWDIR%%/server/bin/ackinfo.cgi %%WWWDIR%%/server/bin/acknowledge.cgi +%%WWWDIR%%/server/bin/acknowledgements.cgi %%WWWDIR%%/server/bin/appfeed.cgi %%WWWDIR%%/server/bin/bb %%WWWDIR%%/server/bin/bbcmd @@ -187,6 +189,9 @@ man/man8/xymonproxy.8 %%WWWDIR%%/server/web/acknowledge_footer %%WWWDIR%%/server/web/acknowledge_form %%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_header %%WWWDIR%%/server/web/confreport_back |