nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-01 09:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #325082 from LeSuisse/opentelemetry-collector-CVE-2024-36129

Browse Source 
[24.05] opentelemetry-collector: apply patch for CVE-2024-36129
This commit is contained in:
Robert Scott 2024-07-12 23:26:03 +01:00 committed by GitHub
commit f12ee5f64c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/misc/opentelemetry-collector/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, buildGoModule
, fetchFromGitHub
, fetchpatch
, installShellFiles
, testers
, opentelemetry-collector
@ -17,8 +18,21 @@ buildGoModule rec {
hash = "sha256-BRZxeTFw4v4LLXPPzIzcjtR/RTckpolGGcB6jyq+ZOA=";
};
# there is a nested go.mod
sourceRoot = "${src.name}/cmd/otelcorecol";
vendorHash = "sha256-dO0j26AlpibsmbOqozz9+xMAJS/ZZHT6Z857AblYFHA=";
modRoot = "cmd/otelcorecol";
vendorHash = "sha256-Bay8D+jEj5iXedsbWQPFY+n1/li75bWGEtanllS/APQ=";
patches = [
(fetchpatch {
name = "CVE-2024-36129_1.patch";
url = "https://github.com/open-telemetry/opentelemetry-collector/commit/7dbaebb48f33cf707a069c67eed5b2b614e9913b.patch";
hash = "sha256-0rzdxwl7ieS3QU+PBlmPV82aWoUE5ulpEnqvK/h070E=";
})
(fetchpatch {
name = "CVE-2024-36129_2.patch";
url = "https://github.com/open-telemetry/opentelemetry-collector/commit/760f773df042305bd2d92e908cedc17957f6c542.patch";
hash = "sha256-xFMPwFXJyD0JiRBzoz31DElhkW0VjtQa4whuDiefOM8=";
})
];
nativeBuildInputs = [ installShellFiles ];