diff options
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/mk-livestatus/Makefile | 3 | ||||
| -rw-r--r-- | net-mgmt/mk-livestatus/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/mk-livestatus/files/patch-src-Makefile.in | 12 | ||||
| -rw-r--r-- | net-mgmt/mk-livestatus/files/patch-src__Makefile.in | 19 | ||||
| -rw-r--r-- | net-mgmt/mk-livestatus/files/patch-src__livecheck.c | 27 |
5 files changed, 35 insertions, 30 deletions
diff --git a/net-mgmt/mk-livestatus/Makefile b/net-mgmt/mk-livestatus/Makefile index 162d1580301a..8b99c294cb90 100644 --- a/net-mgmt/mk-livestatus/Makefile +++ b/net-mgmt/mk-livestatus/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mk-livestatus -PORTVERSION= 1.2.0p3 -PORTREVISION= 1 +PORTVERSION= 1.2.2p2 CATEGORIES= net-mgmt MASTER_SITES= http://mathias-kettner.de/download/ \ LOCAL/ohauer diff --git a/net-mgmt/mk-livestatus/distinfo b/net-mgmt/mk-livestatus/distinfo index 2976a0c742f5..e665a473273d 100644 --- a/net-mgmt/mk-livestatus/distinfo +++ b/net-mgmt/mk-livestatus/distinfo @@ -1,2 +1,2 @@ -SHA256 (check_mk/mk-livestatus-1.2.0p3.tar.gz) = 92e19813c1543ca153c19403cd82fd5d8705954e583b51e20f7e84cfb730ef34 -SIZE (check_mk/mk-livestatus-1.2.0p3.tar.gz) = 371779 +SHA256 (check_mk/mk-livestatus-1.2.2p2.tar.gz) = 77213f22898cd6280196293743e9ef9486ffccca878350ed277d358146a6d0b5 +SIZE (check_mk/mk-livestatus-1.2.2p2.tar.gz) = 382165 diff --git a/net-mgmt/mk-livestatus/files/patch-src-Makefile.in b/net-mgmt/mk-livestatus/files/patch-src-Makefile.in deleted file mode 100644 index 5e92703665f9..000000000000 --- a/net-mgmt/mk-livestatus/files/patch-src-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- src/Makefile.in.orig 2010-04-06 12:02:18.000000000 +0000 -+++ src/Makefile.in 2010-04-06 12:03:10.000000000 +0000 -@@ -227,7 +227,7 @@ - am__quote = @am__quote@ - am__tar = @am__tar@ - am__untar = @am__untar@ --bindir = @bindir@ -+bindir = $(pkglibdir) - build_alias = @build_alias@ - builddir = @builddir@ - datadir = @datadir@ - diff --git a/net-mgmt/mk-livestatus/files/patch-src__Makefile.in b/net-mgmt/mk-livestatus/files/patch-src__Makefile.in new file mode 100644 index 000000000000..e39e7292457c --- /dev/null +++ b/net-mgmt/mk-livestatus/files/patch-src__Makefile.in @@ -0,0 +1,19 @@ +--- ./src/Makefile.in.orig 2013-06-10 14:49:28.000000000 +0200 ++++ ./src/Makefile.in 2013-06-16 22:13:23.000000000 +0200 +@@ -264,7 +264,7 @@ + am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ +-bindir = @bindir@ ++bindir = $(pkglibdir) + build_alias = @build_alias@ + builddir = @builddir@ + datadir = @datadir@ +@@ -1966,7 +1966,6 @@ + $(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir) + rm -f $(DESTDIR)$(pkglibdir)/livestatus.so + $(INSTALL_PROGRAM) livecheck $(DESTDIR)$(pkglibdir) +- rm -f $(DESTDIR)$(bindir)/livecheck + + clean-local: + rm -f *~ diff --git a/net-mgmt/mk-livestatus/files/patch-src__livecheck.c b/net-mgmt/mk-livestatus/files/patch-src__livecheck.c index 82657a6330ae..14f57066511e 100644 --- a/net-mgmt/mk-livestatus/files/patch-src__livecheck.c +++ b/net-mgmt/mk-livestatus/files/patch-src__livecheck.c @@ -1,11 +1,10 @@ ---- ./src/livecheck.c.orig 2012-03-09 11:12:44.000000000 +0100 -+++ ./src/livecheck.c 2012-11-03 13:12:14.000000000 +0100 -@@ -26,8 +26,15 @@ - #include <sys/types.h> +--- ./src/livecheck.c.orig 2013-06-10 14:49:02.000000000 +0200 ++++ ./src/livecheck.c 2013-06-16 22:13:23.000000000 +0200 +@@ -27,8 +27,14 @@ #include <sys/wait.h> #include <sys/timeb.h> + #include <sys/resource.h> +#ifdef __FreeBSD__ -+#include <sys/resource.h> +#include <arpa/inet.h> +#endif #include <netinet/ip.h> @@ -16,7 +15,7 @@ #include <fcntl.h> #include <string.h> -@@ -79,8 +86,13 @@ +@@ -80,8 +86,13 @@ } int is_host_check = service[0] == '\n'; @@ -27,10 +26,10 @@ + struct timeval start; + gettimeofday(&start); +#endif - char output[8192]; + char output[16384]; int return_code; - -@@ -175,8 +187,13 @@ + // Optimization(1): +@@ -188,8 +199,13 @@ } } } @@ -44,9 +43,9 @@ char template[256]; snprintf(template, sizeof(template), "%s/cXXXXXX", check_result_path); int fd = mkstemp(template); -@@ -199,10 +216,17 @@ +@@ -212,10 +228,17 @@ getpid(), - is_host_check ? 0 : 1, + 0, latency, +#ifndef __FreeBSD__ (int)start.time, @@ -59,6 +58,6 @@ + (int)end.tv_sec, + end.tv_usec / 1000, +#endif - return_code, - output); - fchown(fd, real_uid, real_gid); + return_code); + char *ptr_output = output; + char *ptr_walk = output; |