[PR PATCH] New package: fluent-bit-1.7.1

[PR PATCH] New package: fluent-bit-1.7.1

[SimonAdameit]

[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]

There is a new pull request by SimonAdameit against master on the void-packages repository

https://github.com/SimonAdameit/void-packages master
https://github.com/void-linux/void-packages/pull/29064

New package: fluent-bit-1.7.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29064.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29064.patch --]
[-- Type: text/x-diff, Size: 2777 bytes --]

From 7627262ca272a1882127fca8a74aee8a410a58d7 Mon Sep 17 00:00:00 2001
From: Simon Adameit <simon@simonadameit.com>
Date: Fri, 26 Feb 2021 00:36:08 +0100
Subject: [PATCH] New package: fluent-bit-1.7.1

---
 srcpkgs/fluent-bit/patches/flb_coro.patch | 17 ++++++++++
 srcpkgs/fluent-bit/template               | 38 +++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 srcpkgs/fluent-bit/patches/flb_coro.patch
 create mode 100644 srcpkgs/fluent-bit/template

diff --git a/srcpkgs/fluent-bit/patches/flb_coro.patch b/srcpkgs/fluent-bit/patches/flb_coro.patch
new file mode 100644
index 00000000000..b8b57d610ee
--- /dev/null
+++ b/srcpkgs/fluent-bit/patches/flb_coro.patch
@@ -0,0 +1,17 @@
+#
+# Hardcode the coroutine stack size to the glibc default also on musl
+#
+# This is so that the > getpagesize() check of the config passes also on musl.
+# We don't use another value, as the documentation warns against setting this to small:
+# https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/configuration-file#config_section
+#
+--- include/fluent-bit/flb_coro.h
++++ include/fluent-bit/flb_coro.h
+@@ -65,7 +65,7 @@
+ #ifdef FLB_CORO_STACK_SIZE
+ #define FLB_CORO_STACK_SIZE      FLB_CORO_STACK_SIZE
+ #else
+-#define FLB_CORO_STACK_SIZE      ((3 * PTHREAD_STACK_MIN) / 2)
++#define FLB_CORO_STACK_SIZE      24576
+ #endif
+ #define FLB_CORO_DATA(coro)      (((char *) coro) + sizeof(struct flb_coro))
diff --git a/srcpkgs/fluent-bit/template b/srcpkgs/fluent-bit/template
new file mode 100644
index 00000000000..d402b7a4b5f
--- /dev/null
+++ b/srcpkgs/fluent-bit/template
@@ -0,0 +1,38 @@
+# Template file for 'fluent-bit'
+pkgname=fluent-bit
+version=1.7.1
+revision=1
+short_desc="Fluent Bit is an open source Log Processor and Forwarder"
+maintainer="Simon Adameit <simon@simonadameit.com>"
+license="Apache-2.0"
+homepage="https://fluentbit.io/"
+distfiles="https://fluentbit.io/releases/1.7/fluent-bit-${version}.tar.gz"
+checksum=2a870d8b2f3455b83e4660f677c83a9403b75b148c7c33b1b198c63f555e4c16
+
+# Configure build 
+# See:
+# https://docs.fluentbit.io/manual/installation/sources/build-and-install
+build_style=cmake
+export CMAKE_GENERATOR='Unix Makefiles'
+make_cmd=make
+
+hostmakedepends="pkg-config flex bison"
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+	configure_args+=" -DCMAKE_C_STANDARD_LIBRARIES=-lfts"
+fi
+
+# Set release flags
+configure_args+=" -DFLB_RELEASE=On"
+configure_args+=" -DFLB_DEBUG=Off"
+configure_args+=" -DFLB_TRACE=Off"
+
+# Enable Features
+configure_args+=" -DFLB_JEMALLOC=On"
+configure_args+=" -DFLB_TLS=On"
+configure_args+=" -DFLB_HTTP_SERVER=On"
+
+# Enable additional plugins
+configure_args+=" -DFLB_OUT_KAFKA=On"
+configure_args+=" -DFLG_OUT_NATS=On"

Re: [PR REVIEW] [WIP] New package: fluent-bit-1.7.1

[sgn]

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29064#discussion_r583304811

Comment:
`s/1.7/${version%.*}/`

Re: [PR REVIEW] [WIP] New package: fluent-bit-1.7.1

[sgn]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29064#discussion_r583305976

Comment:
Unbundle `jemalloc` please.

Re: [PR REVIEW] [WIP] New package: fluent-bit-1.7.1

[sgn]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29064#discussion_r583308419

Comment:
And `mbedtls`, too.

Re: [PR REVIEW] [WIP] New package: fluent-bit-1.7.1

[sgn]

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29064#discussion_r583308818

Comment:
In other word, I would `rm -rf lib` in `post_extract` and fix their build system to use system libraries.

Re: [PR REVIEW] [WIP] New package: fluent-bit-1.7.1

[sgn]

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29064#discussion_r583318594

Comment:
No need to patch, either below options should be fine.
```sh
configure_args+="-DFLB_CORO_STACK_SIZE=24576"
```
or:
```sh
CFLAGS=-DFLB_CORO_STACK_SIZE=24576
```

Re: [PR PATCH] [Updated] [WIP] New package: fluent-bit-1.7.1

[SimonAdameit]

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by SimonAdameit against master on the void-packages repository

https://github.com/SimonAdameit/void-packages master
https://github.com/void-linux/void-packages/pull/29064

[WIP] New package: fluent-bit-1.7.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29064.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29064.patch --]
[-- Type: text/x-diff, Size: 1879 bytes --]

From ac30619f5c045059a49448a14372263e09d9c4a9 Mon Sep 17 00:00:00 2001
From: Simon Adameit <simon@simonadameit.com>
Date: Fri, 26 Feb 2021 00:36:08 +0100
Subject: [PATCH] New package: fluent-bit-1.7.1

---
 srcpkgs/fluent-bit/template | 41 +++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 srcpkgs/fluent-bit/template

diff --git a/srcpkgs/fluent-bit/template b/srcpkgs/fluent-bit/template
new file mode 100644
index 00000000000..a77cc75cc87
--- /dev/null
+++ b/srcpkgs/fluent-bit/template
@@ -0,0 +1,41 @@
+# Template file for 'fluent-bit'
+pkgname=fluent-bit
+version=1.7.1
+revision=1
+short_desc="Fluent Bit is an open source Log Processor and Forwarder"
+maintainer="Simon Adameit <simon@simonadameit.com>"
+license="Apache-2.0"
+homepage="https://fluentbit.io/"
+distfiles="https://fluentbit.io/releases/${version%.*}/fluent-bit-${version}.tar.gz"
+checksum=2a870d8b2f3455b83e4660f677c83a9403b75b148c7c33b1b198c63f555e4c16
+
+# Configure build 
+# See:
+# https://docs.fluentbit.io/manual/installation/sources/build-and-install
+build_style=cmake
+export CMAKE_GENERATOR='Unix Makefiles'
+make_cmd=make
+
+hostmakedepends="pkg-config flex bison"
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+	configure_args+=" -DCMAKE_C_STANDARD_LIBRARIES=-lfts"
+	# Set the default coroutine stack size to the same value as on glibc.
+	# This avoids running into a > getpagesize() check.
+	configure_args+=" -DDFLB_CORO_STACK_SIZE=24576"
+fi
+
+# Set release flags
+configure_args+=" -DFLB_RELEASE=On"
+configure_args+=" -DFLB_DEBUG=Off"
+configure_args+=" -DFLB_TRACE=Off"
+
+# Enable Features
+configure_args+=" -DFLB_JEMALLOC=On"
+configure_args+=" -DFLB_TLS=On"
+configure_args+=" -DFLB_HTTP_SERVER=On"
+
+# Enable additional plugins
+configure_args+=" -DFLB_OUT_KAFKA=On"
+configure_args+=" -DFLG_OUT_NATS=On"

Re: [WIP] New package: fluent-bit-1.7.1

[SimonAdameit]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New comment by SimonAdameit on void-packages repository

https://github.com/void-linux/void-packages/pull/29064#issuecomment-786868076

Comment:
@sgn @ericonr Thanks for the reviews! I decided to not get this into void, due to the effort involved. I still applied and pushed the changes you suggested, except for the unbundling, which I won't perform now.

Re: [PR PATCH] [Closed]: [WIP] New package: fluent-bit-1.7.1

[SimonAdameit]

[-- Attachment #1: Type: text/plain, Size: 1446 bytes --]

There's a closed pull request on the void-packages repository

[WIP] New package: fluent-bit-1.7.1
https://github.com/void-linux/void-packages/pull/29064

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Re: [WIP] New package: fluent-bit-1.7.1

[sgn]

[-- Attachment #1: Type: text/plain, Size: 458 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29064#issuecomment-787479971

Comment:
Hi, I spent my time to de-bundle most of libraries from fluent-bit.
If you want to try, here you're https://github.com/sgn/void-packages/tree/fluent-bit

If you can confirm it's good for you, I'll submit it to upstream.
There're some libraries that I didn't de-bundle because their developers also work on fluent-bit.