Upgrading to 1.6.2

Release notes:	https://fluentbit.io/announcements/v1.6.2/
This commit is contained in:
Palle Girgensohn 2020-10-26 10:03:02 +00:00
parent a479963cf8
commit c60e89259a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=553331
5 changed files with 8 additions and 61 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= fluent-bit
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.6
DISTVERSION= 1.6.2
CATEGORIES= sysutils
MAINTAINER= girgen@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1600085362
SHA256 (fluent-fluent-bit-v1.5.6_GH0.tar.gz) = a33419f9828183389a5a6ab1f1912dd8c24e768cad01525d85f825107023e2dc
SIZE (fluent-fluent-bit-v1.5.6_GH0.tar.gz) = 12873394
TIMESTAMP = 1603699254
SHA256 (fluent-fluent-bit-v1.6.2_GH0.tar.gz) = d94e2eb98f977fdbea169cf4906c10450a13ea52c74d950bb3d170b3b9ff85d6
SIZE (fluent-fluent-bit-v1.6.2_GH0.tar.gz) = 13626825

View File

@ -1,11 +0,0 @@
--- lib/LuaJIT-2.1.0-beta3/src/Makefile.orig 2019-01-07 21:56:34 UTC
+++ lib/LuaJIT-2.1.0-beta3/src/Makefile
@@ -24,7 +24,7 @@ NODOTABIVER= 51
# removing the '#' in front of them. Make sure you force a full recompile
# with "make clean", followed by "make" if you change any options.
#
-DEFAULT_CC = gcc
+DEFAULT_CC = cc
#
# LuaJIT builds as a native 32 or 64 bit binary by default.
CC= $(DEFAULT_CC)

View File

@ -1,46 +0,0 @@
commit bee7feb5849d8ede5e108c9c859bd4f01f2cc9be
Author: Fujimoto Seiji <fujimoto@ceptord.net>
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 <fujimoto@ceptord.net>
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)

View File

@ -20,6 +20,7 @@ include/fluent-bit/flb_env.h
include/fluent-bit/flb_error.h
include/fluent-bit/flb_filter.h
include/fluent-bit/flb_filter_plugin.h
include/fluent-bit/flb_fstore.h
include/fluent-bit/flb_gzip.h
include/fluent-bit/flb_hash.h
include/fluent-bit/flb_http_client.h
@ -29,6 +30,7 @@ include/fluent-bit/flb_info.h
include/fluent-bit/flb_input.h
include/fluent-bit/flb_input_chunk.h
include/fluent-bit/flb_input_plugin.h
include/fluent-bit/flb_intermediate_metric.h
include/fluent-bit/flb_io.h
include/fluent-bit/flb_io_tls.h
include/fluent-bit/flb_io_tls_rw.h
@ -55,9 +57,11 @@ include/fluent-bit/flb_pipe.h
include/fluent-bit/flb_plugin.h
include/fluent-bit/flb_plugin_proxy.h
include/fluent-bit/flb_ra_key.h
include/fluent-bit/flb_random.h
include/fluent-bit/flb_record_accessor.h
include/fluent-bit/flb_regex.h
include/fluent-bit/flb_router.h
include/fluent-bit/flb_s3_local_buffer.h
include/fluent-bit/flb_scheduler.h
include/fluent-bit/flb_sds.h
include/fluent-bit/flb_sha512.h