freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add upstreams patch to fix build problem

Browse Source 
Update to 1.5.6
Release notes:	https://fluentbit.io/announcements/v1.5.6/
This commit is contained in:
Palle Girgensohn
2020-09-24 16:20:00 +00:00
parent 02c9ee5364
commit c1431dc5c8
3 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/fluent-bit/Makefile
View File

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

6
sysutils/fluent-bit/distinfo
View File

@@ -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

46
sysutils/fluent-bit/files/patch-src__flb_strptime_c Normal file
View File

@@ -0,0 +1,46 @@
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)