Date: Sat, 3 Nov 2012 12:48:07 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306912 - in head/net-mgmt/mk-livestatus: . files Message-ID: <201211031248.qA3Cm7H7066827@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sat Nov 3 12:48:07 2012 New Revision: 306912 URL: http://svn.freebsd.org/changeset/ports/306912 Log: - update to 1.2.0p3 Thanks to Erik Sejr <eriks@ssimicro.com> for providing the patch! Feature safe: yes Added: head/net-mgmt/mk-livestatus/files/patch-src__check_icmp.c (contents, props changed) head/net-mgmt/mk-livestatus/files/patch-src__livecheck.c (contents, props changed) Modified: head/net-mgmt/mk-livestatus/Makefile head/net-mgmt/mk-livestatus/distinfo Modified: head/net-mgmt/mk-livestatus/Makefile ============================================================================== --- head/net-mgmt/mk-livestatus/Makefile Sat Nov 3 11:59:52 2012 (r306911) +++ head/net-mgmt/mk-livestatus/Makefile Sat Nov 3 12:48:07 2012 (r306912) @@ -1,12 +1,8 @@ -# New ports collection makefile for: mk-livestatus -# Date created: 10 april 2010 -# Whom: Peter C. Lai <cowbert@gmail.com> -# +# Created by: Peter C. Lai <cowbert@gmail.com> # $FreeBSD$ -# PORTNAME= mk-livestatus -PORTVERSION= 1.1.11i4 +PORTVERSION= 1.2.0p3 CATEGORIES= net-mgmt MASTER_SITES= http://mathias-kettner.de/download/ \ LOCAL/ohauer Modified: head/net-mgmt/mk-livestatus/distinfo ============================================================================== --- head/net-mgmt/mk-livestatus/distinfo Sat Nov 3 11:59:52 2012 (r306911) +++ head/net-mgmt/mk-livestatus/distinfo Sat Nov 3 12:48:07 2012 (r306912) @@ -1,2 +1,2 @@ -SHA256 (check_mk/mk-livestatus-1.1.11i4.tar.gz) = e941456019e1b06861dfa72d2a2d22f842d718a9faa637d5a3a377a35b0ba7ea -SIZE (check_mk/mk-livestatus-1.1.11i4.tar.gz) = 342609 +SHA256 (check_mk/mk-livestatus-1.2.0p3.tar.gz) = 92e19813c1543ca153c19403cd82fd5d8705954e583b51e20f7e84cfb730ef34 +SIZE (check_mk/mk-livestatus-1.2.0p3.tar.gz) = 371779 Added: head/net-mgmt/mk-livestatus/files/patch-src__check_icmp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/mk-livestatus/files/patch-src__check_icmp.c Sat Nov 3 12:48:07 2012 (r306912) @@ -0,0 +1,22 @@ +--- ./src/check_icmp.c.orig 2012-11-03 13:00:18.000000000 +0100 ++++ ./src/check_icmp.c 2012-11-03 13:05:33.000000000 +0100 +@@ -65,12 +65,19 @@ + #include <netdb.h> + #include <sys/socket.h> + #include <net/if.h> ++#ifdef __FreeBSD__ ++#include <netinet/in.h> ++#include <arpa/inet.h> ++#include <netinet/ip.h> ++#endif + #include "/usr/include/netinet/ip_icmp.h" + // #include <netinet/ip_icmp.h> + #include <netinet/in_systm.h> ++#ifndef __FreeBSD__ + #include <netinet/in.h> + #include <netinet/ip.h> + #include <arpa/inet.h> ++#endif + #include <signal.h> + #include <float.h> + Added: head/net-mgmt/mk-livestatus/files/patch-src__livecheck.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/mk-livestatus/files/patch-src__livecheck.c Sat Nov 3 12:48:07 2012 (r306912) @@ -0,0 +1,64 @@ +--- ./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> + #include <sys/wait.h> + #include <sys/timeb.h> ++#ifdef __FreeBSD__ ++#include <sys/resource.h> ++#include <arpa/inet.h> ++#endif + #include <netinet/ip.h> + #include <stdlib.h> ++#ifdef __FreeBSD__ ++#include <signal.h> ++#endif + #include <fcntl.h> + #include <string.h> + +@@ -79,8 +86,13 @@ + } + + int is_host_check = service[0] == '\n'; ++#ifndef __FreeBSD__ + struct timeb start; + ftime(&start); ++#else ++ struct timeval start; ++ gettimeofday(&start); ++#endif + char output[8192]; + int return_code; + +@@ -175,8 +187,13 @@ + } + } + } ++#ifndef __FreeBSD__ + struct timeb end; + ftime(&end); ++#else ++ struct timeval end; ++ gettimeofday(&end); ++#endif + char template[256]; + snprintf(template, sizeof(template), "%s/cXXXXXX", check_result_path); + int fd = mkstemp(template); +@@ -199,10 +216,17 @@ + getpid(), + is_host_check ? 0 : 1, + latency, ++#ifndef __FreeBSD__ + (int)start.time, + start.millitm, + (int)end.time, + end.millitm, ++#else ++ (int)start.tv_sec, ++ start.tv_usec, ++ (int)end.tv_sec, ++ end.tv_usec, ++#endif + return_code, + output); + fchown(fd, real_uid, real_gid);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211031248.qA3Cm7H7066827>