diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2020-11-02 20:57:22 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2020-11-02 20:57:22 +0000 |
| commit | 1ed2fdaa0e48c513b7dec2629d1dd7a526f22140 (patch) | |
| tree | 4e76ce8dde29573f3c08d3f94a04982c36dce8aa | |
| parent | Document gitlab vulnerabilities. (diff) | |
Update to 1.6.3
Fix build problems with FreeBSD versions < 12
Release notes: https://fluentbit.io/announcements/v1.6.3/
| -rw-r--r-- | sysutils/fluent-bit/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/fluent-bit/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/fluent-bit/files/extra-patch-lib_luajit__src__lj_prng.c | 11 |
3 files changed, 23 insertions, 6 deletions
diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index 35b94edf9c86..fb89c7514128 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -3,7 +3,7 @@ PORTNAME= fluent-bit DISTVERSIONPREFIX= v -DISTVERSION= 1.6.2 +DISTVERSION= 1.6.3 CATEGORIES= sysutils MAINTAINER= girgen@FreeBSD.org @@ -18,7 +18,7 @@ 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 +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_CORO_STACK_SIZE=24576 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 @@ -38,6 +38,12 @@ 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 ${MV} ${STAGEDIR}${ETCDIR}/parsers.conf ${STAGEDIR}${ETCDIR}/parsers.conf.sample diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo index e90ffb643c31..7d9139225240 100644 --- a/sysutils/fluent-bit/distinfo +++ b/sysutils/fluent-bit/distinfo @@ -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 diff --git a/sysutils/fluent-bit/files/extra-patch-lib_luajit__src__lj_prng.c b/sysutils/fluent-bit/files/extra-patch-lib_luajit__src__lj_prng.c new file mode 100644 index 000000000000..08cbb50f437b --- /dev/null +++ b/sysutils/fluent-bit/files/extra-patch-lib_luajit__src__lj_prng.c @@ -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 |