diff options
| author | ajs124 <ajs124@users.noreply.github.com> | 2022-05-09 10:31:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 10:31:56 +0100 |
| commit | 1a9fc5b8bad13c5b09104e2637fb6bb21648d4ff (patch) | |
| tree | ef8cd45c4663af37f1f7ee16349650f6711c6cb1 | |
| parent | Merge pull request #172106 from markuskowa/back-slurm (diff) | |
| parent | rsyslog: prevent heap buffer overflows in TCP receiver (diff) | |
| download | nixpkgs-1a9fc5b8bad13c5b09104e2637fb6bb21648d4ff.tar.gz | |
Merge pull request #172110 from mweinelt/21.11/rsyslog
rsyslog: prevent heap buffer overflows in TCP receiver
| -rw-r--r-- | pkgs/tools/system/rsyslog/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 22c093303afc..82bd98329376 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null , libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null @@ -21,7 +21,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-P5BOwTfKZBLoJz94ltli7LWJ99DFib3xaxcJ7CfiTzE="; }; - #patches = [ ./fix-gnutls-detection.patch ]; + patches = [ + #./fix-gnutls-detection.patch + + (fetchpatch { + # https://github.com/rsyslog/rsyslog/security/advisories/GHSA-ggw7-xr6h-mmr8 + name = "CVE-2022-24903.patch"; + url = "https://github.com/rsyslog/rsyslog/commit/89955b0bcb1ff105e1374aad7e0e993faa6a038f.patch"; + sha256 = "sha256-G4emQdagSZKVoFq3fN69EABSWXSRdycCi7Q3Jte6EDU="; + }) + ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ |