Commit Graph

44 Commits

Author SHA1 Message Date
R. Ryantm
fff1e6e8d2 fluent-bit: 5.0.7 -> 5.1.0 2026-08-13 16:11:54 +00:00
R. Ryantm
68adff4f68 fluent-bit: 5.0.6 -> 5.0.7 2026-06-12 16:04:58 +00:00
R. Ryantm
54d31096be fluent-bit: 5.0.5 -> 5.0.6 2026-05-25 08:11:15 +00:00
R. Ryantm
f1166e64b6 fluent-bit: 5.0.3 -> 5.0.5 2026-05-08 16:51:12 +00:00
R. Ryantm
d064e53d6b fluent-bit: 4.2.2 -> 5.0.3 2026-04-21 06:23:08 +00:00
nixpkgs-ci[bot]
9502fa5828 Merge master into staging-next 2025-12-27 18:05:54 +00:00
Fernando Rodrigues
f5c5cd686c treewide: move PKG_CONFIG env variables into env for structuredAttrs (#473942) 2025-12-27 15:39:03 +00:00
Sigmanificient
965d9c2a4c fluent-bit: move PKG_CONFIG env variables into env for structuredAttrs 2025-12-25 02:01:49 +01:00
nixpkgs-ci[bot]
2d4d35c482 Merge master into staging-next 2025-12-24 12:07:12 +00:00
R. Ryantm
395eff3e31 fluent-bit: 4.2.0 -> 4.2.2 2025-12-24 09:46:30 +00:00
nixpkgs-ci[bot]
f00ebe801e Merge staging-next into staging 2025-12-08 00:19:10 +00:00
Jonathan Davies
116036d574 treewide: Remove redundant versionCheckProgramArg = "--version"; with:
```shell
git grep -l -e 'versionCheckProgramArg = "--version";' -e 'versionCheckProgramArg = \[ "--version" \];' | while read f; do
  sed -i '/versionCheckProgramArg/d' "$f"
  sed -i '/^$/N;/\n$/D' "$f"
done
```
2025-11-20 10:39:02 +00:00
R. Ryantm
6c3a9bdefb fluent-bit: 4.1.1 -> 4.2.0 2025-11-15 02:47:34 +00:00
R. Ryantm
99ea56813b fluent-bit: 4.0.10 -> 4.1.1 2025-10-11 05:40:28 +00:00
NAHO
c8d4dabc43 pkgs: remove optional builtins prefixes from prelude functions
Remove optional builtins prefixes from prelude functions by running:

    builtins=(
      abort
      baseNameOf
      break
      derivation
      derivationStrict
      dirOf
      false
      fetchGit
      fetchMercurial
      fetchTarball
      fetchTree
      fromTOML
      import
      isNull
      map
      null
      placeholder
      removeAttrs
      scopedImport
      throw
      toString
      true
    )

    fd \
      --type file \
      . \
      pkgs \
      --exec-batch sed --in-place --regexp-extended "
        s/\<builtins\.($(
          printf '%s\n' "${builtins[@]}" |
            paste --delimiter '|' --serial -
        ))\>/\1/g
      "

    nix fmt
2025-10-04 19:02:37 +02:00
R. Ryantm
57a4ea8036 fluent-bit: 4.0.7 -> 4.0.10 2025-09-22 09:51:50 +00:00
R. Ryantm
995a386f62 fluent-bit: 4.0.5 -> 4.0.7 2025-08-12 11:28:07 +00:00
R. Ryantm
38b7e3688f fluent-bit: 4.0.3 -> 4.0.5 2025-07-31 17:03:23 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Peder Bergebakken Sundt
97262ee871 treewide: replace stdenv.is with stdenv.hostPlatform.is 2025-06-04 19:01:03 +02:00
Arian van Putten
cd90fbd9cc fluent-bit: 3.2.6 -> 4.0.3
fluent-bit now dynamically links against libzstd, sqlite and msgpack

This means that we will not run into the issue that caused us
to roll back from 3.2.9 to 3.2.6 anymore (https://github.com/NixOS/nixpkgs/pull/395128)
as there shouldn't be two incompatible versions of libzstd loaded at the same time.

Fixes https://github.com/fluent/fluent-bit/issues/10139

Is this eligible for back-porting even-though it's a major version bump?  In my
opinion: yes.  We can't keep maintaining 3.x as all the builds after 3.2.6 have
the same issue so we are missing out on critical vulnerability fixes. In the
meantine Non of the following links mention any backwards compatibilities with
3.2.6:

* https://fluentbit.io/announcements/v4.0.0/
* https://fluentbit.io/announcements/v4.0.1/
* https://fluentbit.io/announcements/v4.0.2/
* https://fluentbit.io/announcements/v4.0.3/
* https://docs.fluentbit.io/manual/installation/upgrade-notes/
2025-06-02 19:51:32 +02:00
Arian van Putten
1ff2c33055 fluent-bit: 3.2.9 -> 3.2.6
fluent-bit 3.2.7, 3.2.8 and 3.2.9 are segfaulting when
used in combination with the systemd input. Lets
revert to 3.2.6 for now.

Upstream bug: https://github.com/fluent/fluent-bit/issues/10139

Note that fluent-bit-3.2.7 fixes two high CVEs which we are now
reintroducing. However they are only exploitable if you are
using the OpenTelemetry input or the Prometheus Remote Write input.

OpenTelemetry input: [CVE-2024-50609](https://nvd.nist.gov/vuln/detail/CVE-2024-50609)
Prometheus Remote Write input: [CVE-2024-50608](https://nvd.nist.gov/vuln/detail/CVE-2024-50608)

The problem is as follows:

3.2.7 started vendoring a copy of `libzstd` in tree and statically
linking against it. Also, the fluent-bit binary exports the symbols
of static libraries it links against.

This is a problem because `libzstd` gets `dlopen()`ed by `libsystemd`
when enumerating the journal (as journal logs are zstd compressed). and `libzstd` in Nixpkgs is built
with `-DZSTD_LEGACY_SUPPORT=0` which causes `struct ZSTD_DCtx` to be 16
bytes smaller than without this flag https://github.com/facebook/zstd/blob/dev/lib/decompress/zstd_decompress_internal.h#L183-L187

`libsystemd` calls [`sym_ZSTD_createDCtx()`](1e79a29233/src/basic/compress.c (L480))
which calls the function pointer returned by `dlsym()` which is calling into
the `libzstd` that comes with `nixpkgs` and thus allocates a struct that is 16 bytes smaller.

Later then `sym_ZSTD_freeDCtx()` is called. However because fluent-bit
has `zstd` in its global symbol table, any functions that `sym_ZSTD_freeDCtx()`
calls will be calls to the functions in the vendored fluent-bit version of the library
which expects the larger struct. This then causes enough heap corruption to cause
a segfault.

E.g. the subsequent calls to `ZSTD_clearDict(dctx)` and `ZSTD_customFree(dctx->inBuff)`
in https://github.com/facebook/zstd/blob/dev/lib/decompress/zstd_decompress.c#L324
will be working on a struct that is 16 bytes smaller than the one that was allocated
by `libsystemd` and will cause a segfault at some point and thus are probably modifying
pieces of memory that they shouldn't

	(gdb) bt
	#0  0x00007f10e7e9916c in __pthread_kill_implementation () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6
	#1  0x00007f10e7e40e86 in raise () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6
	#2  0x00007f10e7e2893a in abort () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6
	#3  0x000000000046a938 in flb_signal_handler ()
	#4  <signal handler called>
	#5  0x00007f10e7ea42b7 in unlink_chunk.isra () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6
	#6  0x00007f10e7ea45cd in _int_free_create_chunk () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6
	#7  0x00007f10e7ea5a1c in _int_free_merge_chunk () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6
	#8  0x00007f10e7ea5dc9 in _int_free () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6
	#9  0x00007f10e7ea8613 in free () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6
	#10 0x00007f10e80ad3b5 in ZSTD_freeDCtx () from /nix/store/wy0slah6yvchgra8nhp6vgrqa6ay72cq-zstd-1.5.6/lib/libzstd.so.1
	#11 0x00007f10e8c90f6b in decompress_blob_zstd () from /nix/store/b2cfj7yk3wfg1jdwjzim7306hvsc5gnl-systemd-257.3/lib/libsystemd.so.0
	#12 0x00007f10e8bf0efe in journal_file_data_payload () from /nix/store/b2cfj7yk3wfg1jdwjzim7306hvsc5gnl-systemd-257.3/lib/libsystemd.so.0
	#13 0x00007f10e8c00f74 in sd_journal_enumerate_data () from /nix/store/b2cfj7yk3wfg1jdwjzim7306hvsc5gnl-systemd-257.3/lib/libsystemd.so.0
	#14 0x00000000004eae2f in in_systemd_collect ()
	#15 0x00000000004eb5a0 in in_systemd_collect_archive ()
	#16 0x000000000047aa18 in flb_input_collector_fd ()
	#17 0x0000000000495223 in flb_engine_start ()
	#18 0x000000000046f304 in flb_lib_worker ()
	#19 0x00007f10e7e972e3 in start_thread () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6
	#20 0x00007f10e7f1b2fc in __clone3 () from /nix/store/rmy663w9p7xb202rcln4jjzmvivznmz8-glibc-2.40-66/lib/libc.so.6

Reverts 7310ab328b
Reverts 4fbc6cf9c3
2025-04-01 10:35:57 +01:00
R. Ryantm
af10651930 fluent-bit: 3.2.8 -> 3.2.9 2025-03-22 09:24:14 +00:00
commiterate
3366b27e59 fluent-bit: link against Nix dependencies, fix Darwin builds, and add NixOS module 2025-03-19 18:48:46 -04:00
R. Ryantm
7b91946f37 fluent-bit: 3.2.6 -> 3.2.8 2025-03-10 19:05:23 +00:00
R. Ryantm
8b18dfdc09 fluent-bit: 3.2.5 -> 3.2.6 2025-02-12 04:40:12 +00:00
Alyssa Ross
35febc093c Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/by-name/ha/harper/package.nix
2025-01-28 13:29:32 +01:00
R. Ryantm
1093b6a4e6 fluent-bit: 3.2.4 -> 3.2.5 2025-01-28 01:44:40 +00:00
Wolfgang Walther
546ece569b libpq: init at 17.2
Resolves #61580
2025-01-19 12:49:21 +01:00
Emily
5fb9031b35 treewide: remove obsolete TARGET_OS_* workarounds (#371310) 2025-01-06 14:56:24 +00:00
Emily
873cc4bf0f fluent-bit: remove obsolete TARGET_OS_* workaround 2025-01-06 00:47:50 +00:00
Emily
40abf9f7db fluent-bit: remove code for macOS < 11 2025-01-05 20:57:35 +00:00
R. Ryantm
fde138989e fluent-bit: 3.2.3 -> 3.2.4 2024-12-31 13:42:15 +00:00
R. Ryantm
cab605c4c2 fluent-bit: 3.2.2 -> 3.2.3 2024-12-20 13:52:02 +00:00
R. Ryantm
9d75005cbc fluent-bit: 3.1.10 -> 3.2.2 2024-12-08 15:17:08 +00:00
R. Ryantm
cf772c1b56 fluent-bit: 3.1.9 -> 3.1.10 2024-11-09 02:03:04 +00:00
R. Ryantm
ed4895b4d0 fluent-bit: 3.1.8 -> 3.1.9 2024-10-04 22:08:34 +02:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
R. Ryantm
f185333baa fluent-bit: 3.1.7 -> 3.1.8 2024-09-17 04:26:25 +00:00
R. Ryantm
d98bc8b252 fluent-bit: 3.1.6 -> 3.1.7 2024-09-03 01:07:24 +00:00
R. Ryantm
e591b806c7 fluent-bit: 3.1.5 -> 3.1.6 2024-08-19 05:34:04 +00:00
R. Ryantm
4cb6719cfb fluent-bit: 3.1.4 -> 3.1.5 2024-08-11 21:29:45 +00:00
R. Ryantm
3ad3b5c925 fluent-bit: 3.1.3 -> 3.1.4 2024-08-03 09:20:43 +00:00
Franz Pletz
436548a5b5 fluent-bit: move to by-name 2024-07-21 21:06:53 +02:00