svn commit: r553927 - in head/sysutils/fluent-bit: . files

[Palle Girgensohn]

Author: girgen
Date: Mon Nov  2 20:57:22 2020
New Revision: 553927
URL: https://svnweb.freebsd.org/changeset/ports/553927

Log:
  Update to 1.6.3
  
  Fix build problems with FreeBSD versions < 12
  
  Release notes:	https://fluentbit.io/announcements/v1.6.3/

Added:
  head/sysutils/fluent-bit/files/extra-patch-lib_luajit__src__lj_prng.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	Mon Nov  2 20:23:34 2020	(r553926)
+++ head/sysutils/fluent-bit/Makefile	Mon Nov  2 20:57:22 2020	(r553927)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fluent-bit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.2
+DISTVERSION=	1.6.3
 CATEGORIES=	sysutils
 
 MAINTAINER=	girgen at FreeBSD.org
@@ -18,7 +18,7 @@ BROKEN_mips=		fails to build: conflicting types for 'r
 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
+USES=		cmake:noninja gmake bison compiler
 
 OPTIONS_DEFINE=		SSL PGSQL
 OPTIONS_DEFAULT=	SSL
@@ -27,7 +27,7 @@ CMAKE_ARGS=		-DFLB_DEBUG=Off -DFLB_TRACE=Off -DFLB_COR
 
 SSL_USES=		ssl
 SSL_CMAKE_ON=		-DFLB_TLS=On
-SSL_CMAKE_OFF=		-DFLB_TLS=On
+SSL_CMAKE_OFF=		-DFLB_TLS=Off
 
 EXAMPLES_CMAKE_ON=	-DFLB_EXAMPLES=On
 EXAMPLES_CMAKE_OFF=	-DFLB_EXAMPLES=Off
@@ -37,6 +37,12 @@ PGSQL_CMAKE_ON=		-DFLB_OUT_PGSQL=On
 PGSQL_CMAKE_OFF=	-DFLB_OUT_PGSQL=Off
 
 USE_RC_SUBR=	${PORTNAME}
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-lib_luajit__src__lj_prng.c
+.endif
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample

Modified: head/sysutils/fluent-bit/distinfo
==============================================================================
--- head/sysutils/fluent-bit/distinfo	Mon Nov  2 20:23:34 2020	(r553926)
+++ head/sysutils/fluent-bit/distinfo	Mon Nov  2 20:57:22 2020	(r553927)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603699254
-SHA256 (fluent-fluent-bit-v1.6.2_GH0.tar.gz) = d94e2eb98f977fdbea169cf4906c10450a13ea52c74d950bb3d170b3b9ff85d6
-SIZE (fluent-fluent-bit-v1.6.2_GH0.tar.gz) = 13626825
+TIMESTAMP = 1604304854
+SHA256 (fluent-fluent-bit-v1.6.3_GH0.tar.gz) = b2cacf1891de16a44ff38cae0ef52f114f7c88658506102e78ff6f1c9ffd6e32
+SIZE (fluent-fluent-bit-v1.6.3_GH0.tar.gz) = 13626759

Added: head/sysutils/fluent-bit/files/extra-patch-lib_luajit__src__lj_prng.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/fluent-bit/files/extra-patch-lib_luajit__src__lj_prng.c	Mon Nov  2 20:57:22 2020	(r553927)
@@ -0,0 +1,11 @@
+--- lib/luajit-2.1.0-dd5032e/src/lj_prng.c.orig	2020-10-31 04:27:35.000000000 +0100
++++ lib/luajit-2.1.0-dd5032e/src/lj_prng.c	2020-11-02 21:47:49.484698000 +0100
+@@ -116,7 +116,7 @@
+ #define LJ_TARGET_HAS_GETENTROPY	1
+ #endif
+ #elif LJ_TARGET_BSD || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN
+-#define LJ_TARGET_HAS_GETENTROPY	1
++#define LJ_TARGET_HAS_GETENTROPY	0
+ #endif
+ 
+ #if LJ_TARGET_HAS_GETENTROPY