Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Sep 2020 16:20:00 +0000 (UTC)
From:      Palle Girgensohn <girgen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r549926 - in head/sysutils/fluent-bit: . files
Message-ID:  <202009241620.08OGK0Kn025881@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: girgen
Date: Thu Sep 24 16:20:00 2020
New Revision: 549926
URL: https://svnweb.freebsd.org/changeset/ports/549926

Log:
  Add upstreams patch to fix build problem
  
  Update to 1.5.6
  Release notes:	https://fluentbit.io/announcements/v1.5.6/

Added:
  head/sysutils/fluent-bit/files/patch-src__flb_strptime_c   (contents, props changed)
Modified:
  head/sysutils/fluent-bit/Makefile
  head/sysutils/fluent-bit/distinfo

Modified: head/sysutils/fluent-bit/Makefile
==============================================================================
--- head/sysutils/fluent-bit/Makefile	Thu Sep 24 16:08:34 2020	(r549925)
+++ head/sysutils/fluent-bit/Makefile	Thu Sep 24 16:20:00 2020	(r549926)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fluent-bit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.2
+DISTVERSION=	1.5.6
 CATEGORIES=	sysutils
 
 MAINTAINER=	girgen@FreeBSD.org

Modified: head/sysutils/fluent-bit/distinfo
==============================================================================
--- head/sysutils/fluent-bit/distinfo	Thu Sep 24 16:08:34 2020	(r549925)
+++ head/sysutils/fluent-bit/distinfo	Thu Sep 24 16:20:00 2020	(r549926)
@@ -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

Added: head/sysutils/fluent-bit/files/patch-src__flb_strptime_c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/fluent-bit/files/patch-src__flb_strptime_c	Thu Sep 24 16:20:00 2020	(r549926)
@@ -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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009241620.08OGK0Kn025881>