summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorbouyer <bouyer@pkgsrc.org>2016-02-07 12:41:11 +0000
committerbouyer <bouyer@pkgsrc.org>2016-02-07 12:41:11 +0000
commitf46edce99ccd5ceeae1bf875e416987a13775f8a (patch)
tree538f0069405e36854cb157593f81d230e17fc995 /net
parent9afb6991b6cfe55ccd011a3f3cb6362e7df7735e (diff)
downloadpkgsrc-f46edce99ccd5ceeae1bf875e416987a13775f8a.tar.gz
Workaround for 64bit time_t bug on i386, causing logs to be filled with
"(null)" instead of the message. Bump PKGREVISION.
Diffstat (limited to 'net')
-rw-r--r--net/nagios-base/Makefile4
-rw-r--r--net/nagios-base/distinfo3
-rw-r--r--net/nagios-base/patches/patch-base_logging.c15
3 files changed, 19 insertions, 3 deletions
diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 62ae20ccc53..1ced7e2ecee 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.61 2015/11/18 14:19:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2016/02/07 12:41:11 bouyer Exp $
#
DISTNAME= nagios-4.0.8
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net sysutils
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
diff --git a/net/nagios-base/distinfo b/net/nagios-base/distinfo
index a483ae6bfca..93c3737764d 100644
--- a/net/nagios-base/distinfo
+++ b/net/nagios-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2015/12/18 00:55:17 rodent Exp $
+$NetBSD: distinfo,v 1.28 2016/02/07 12:41:11 bouyer Exp $
SHA1 (nagios-4.0.8.tar.gz) = d49586db6905a8e58a082251d8f89ef5c2cab872
RMD160 (nagios-4.0.8.tar.gz) = b53631755e0a23aba918a99f58b7bea237fdd799
@@ -10,6 +10,7 @@ SHA512 (nagios-netbsd40-icons.tar.gz) = 27cd564ef6dbe076b43dc2207f8f4f49bfb575f2
Size (nagios-netbsd40-icons.tar.gz) = 5659 bytes
SHA1 (patch-Makefile.in) = 953eea6b276beba75ab5c64c14d10cdcf1ca2188
SHA1 (patch-base_Makefile.in) = 2b0162bb4d395b1d529f5fc1fdf9eab3ddaeb161
+SHA1 (patch-base_logging.c) = a37151fbf36b4f0858a4eaad3c6704a32fb493da
SHA1 (patch-cgi_Makefile.in) = 25c22914986c0b781f5dd665a7a53778e1031a63
SHA1 (patch-cgi_cmd.c) = 90dfbfc78b08c5d72f168003d6c9fb56d67a8743
SHA1 (patch-cgi_extinfo.c) = 8cad0787fbe0a782edb93ca299462a5718a34a4b
diff --git a/net/nagios-base/patches/patch-base_logging.c b/net/nagios-base/patches/patch-base_logging.c
new file mode 100644
index 00000000000..dc71c2189dc
--- /dev/null
+++ b/net/nagios-base/patches/patch-base_logging.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+64bit time_t workaround
+
+--- base/logging.c.orig 2016-02-07 13:23:57.000000000 +0100
++++ base/logging.c 2016-02-07 13:24:50.000000000 +0100
+@@ -184,7 +184,7 @@
+ strip(buffer);
+
+ /* write the buffer to the log file */
+- fprintf(fp, "[%lu] %s\n", log_time, buffer);
++ fprintf(fp, "[%lu] %s\n", (u_long)log_time, buffer);
+ fflush(fp);
+
+ #ifdef USE_EVENT_BROKER