Index: head/sysutils/fluent-bit/Makefile =================================================================== --- head/sysutils/fluent-bit/Makefile (revision 549925) +++ head/sysutils/fluent-bit/Makefile (revision 549926) @@ -1,45 +1,45 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= fluent-bit DISTVERSIONPREFIX= v -DISTVERSION= 1.5.2 +DISTVERSION= 1.5.6 CATEGORIES= sysutils MAINTAINER= girgen@FreeBSD.org COMMENT= Fast and lightweight data forwarder LICENSE= APACHE20 USE_GITHUB= yes GH_ACCOUNT= fluent BROKEN_mips= fails to build: conflicting types for 'restrict' BROKEN_mips64= fails to build: conflicting types for 'restrict' BROKEN_powerpc64= fails to build: cast from pointer to integer of different size USES= cmake:noninja gmake bison OPTIONS_DEFINE= SSL PGSQL OPTIONS_DEFAULT= SSL CMAKE_ARGS= -DFLB_DEBUG=Off -DFLB_TRACE=Off -DFLB_CORO_STACK_SIZE=24576 SSL_USES= ssl SSL_CMAKE_ON= -DFLB_TLS=On SSL_CMAKE_OFF= -DFLB_TLS=On EXAMPLES_CMAKE_ON= -DFLB_EXAMPLES=On EXAMPLES_CMAKE_OFF= -DFLB_EXAMPLES=Off PGSQL_USES= pgsql PGSQL_CMAKE_ON= -DFLB_OUT_PGSQL=On PGSQL_CMAKE_OFF= -DFLB_OUT_PGSQL=Off USE_RC_SUBR= ${PORTNAME} post-install: ${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/parsers.conf ${STAGEDIR}${ETCDIR}/parsers.conf.sample .include Index: head/sysutils/fluent-bit/distinfo =================================================================== --- head/sysutils/fluent-bit/distinfo (revision 549925) +++ head/sysutils/fluent-bit/distinfo (revision 549926) @@ -1,3 +1,3 @@ -TIMESTAMP = 1596438927 -SHA256 (fluent-fluent-bit-v1.5.2_GH0.tar.gz) = d9dd4fe94116533cd23fc5d2e505408f687c1eb1b4c233b4f9413ff6b87d53f3 -SIZE (fluent-fluent-bit-v1.5.2_GH0.tar.gz) = 12864447 +TIMESTAMP = 1600085362 +SHA256 (fluent-fluent-bit-v1.5.6_GH0.tar.gz) = a33419f9828183389a5a6ab1f1912dd8c24e768cad01525d85f825107023e2dc +SIZE (fluent-fluent-bit-v1.5.6_GH0.tar.gz) = 12873394 Index: head/sysutils/fluent-bit/files/patch-src__flb_strptime_c =================================================================== --- head/sysutils/fluent-bit/files/patch-src__flb_strptime_c (nonexistent) +++ head/sysutils/fluent-bit/files/patch-src__flb_strptime_c (revision 549926) @@ -0,0 +1,46 @@ +commit bee7feb5849d8ede5e108c9c859bd4f01f2cc9be +Author: Fujimoto Seiji +Date: Thu Sep 24 23:22:39 2020 +0900 + + strptime: Add a fallback macro for `timezone` (#2493) + + According to the UNIX standard: + + The external variable timezone shall be set to the difference, + in seconds, between Coordinated Universal Time (UTC) and local + standard time + + FreeBSD is incompatible with this standard. In particular, since it + exposes a function symbol `char* timezone(int, int)`, expressions + like `-(timezone)` causes a compile error. + + Fix it by adding a compat macro for FreeBSD. + + Signed-off-by: Fujimoto Seiji + +diff --git a/src/flb_strptime.c b/src/flb_strptime.c +index 2e7f170d..390f558a 100644 +--- src/flb_strptime.c ++++ src/flb_strptime.c +@@ -116,6 +116,21 @@ static char *_flb_strptime(const char *, const char *, struct tm *, int); + static const u_char *_find_string(const u_char *, int *, const char * const *, + const char * const *, int); + ++/* ++ * FreeBSD does not support `timezone` in time.h. ++ * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=24590 ++ */ ++#ifdef __FreeBSD__ ++int flb_timezone(void) ++{ ++ struct tm tm; ++ time_t t = 0; ++ tzset(); ++ localtime_r(&t, &tm); ++ return -(tm.tm_gmtoff); ++} ++#define timezone (flb_timezone()) ++#endif + + char * + flb_strptime(const char *buf, const char *fmt, struct tm *tm) Property changes on: head/sysutils/fluent-bit/files/patch-src__flb_strptime_c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property