summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-09-14 11:21:46 +0200
committerGitHub <noreply@github.com>2021-09-14 11:21:46 +0200
commitb5655eebb76d7459f7b3742bee8d13ac9e579cc6 (patch)
tree92ff8d34593aa719f1520b59abd9f96f9b1f1f71
parent87fbc5f376b67a7b7e443515362253147fc7f133 (diff)
parentb9608ec767fd61a18c3bc4020ddbf6308a7f819d (diff)
Merge pull request #137771 from LeSuisse/opentsdb-CVE-2020-35476
-rw-r--r--pkgs/tools/misc/opentsdb/default.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index 678c2607b614..bc7baa55fecd 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools
+{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools
, python, git
}:
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2020-35476.patch";
+ url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch";
+ sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb";
+ })
+ ];
+
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ autoconf automake curl jdk nettools python git ];
@@ -33,8 +41,5 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus;
platforms = lib.platforms.linux;
maintainers = [ ];
- knownVulnerabilities = [
- "CVE-2020-35476" # https://github.com/OpenTSDB/opentsdb/issues/2051
- ];
};
}