summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorAlexey Shmalko <rasen.dubi@gmail.com>2020-04-29 16:50:33 +0300
committerGitHub <noreply@github.com>2020-04-29 16:50:33 +0300
commitde83c2da167d54ba5ed9302a0e95ccd4e8c7c979 (patch)
tree622548a5bdc99d056673285bc873d4509fc766c7 /pkgs/servers
parente970627a71265419bf1b785dea6fee6e86ae210f (diff)
parent704a018aaea16e044c1adf33accce6be2884911d (diff)
downloadnixpkgs-de83c2da167d54ba5ed9302a0e95ccd4e8c7c979.tar
nixpkgs-de83c2da167d54ba5ed9302a0e95ccd4e8c7c979.tar.gz
nixpkgs-de83c2da167d54ba5ed9302a0e95ccd4e8c7c979.tar.bz2
nixpkgs-de83c2da167d54ba5ed9302a0e95ccd4e8c7c979.tar.lz
nixpkgs-de83c2da167d54ba5ed9302a0e95ccd4e8c7c979.tar.xz
nixpkgs-de83c2da167d54ba5ed9302a0e95ccd4e8c7c979.tar.zst
nixpkgs-de83c2da167d54ba5ed9302a0e95ccd4e8c7c979.zip
Merge pull request #86268 from mweinelt/coturn/CVE-2020-6061+6062
coturn: apply patch for CVE-2020-6061/6062
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/coturn/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index 24dc256ba69..51502c3fd97 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, libevent }:
+{ stdenv, fetchFromGitHub, fetchpatch, openssl, libevent }:
 
 stdenv.mkDerivation rec {
   pname = "coturn";
@@ -13,7 +13,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl libevent ];
 
-  patches = [ ./pure-configure.patch ];
+  patches = [
+    ./pure-configure.patch
+    (fetchpatch {
+      name = "CVE-2020-6061+6062.patch";
+      url = "https://sources.debian.org/data/main/c/coturn/4.5.1.1-1.2/debian/patches/CVE-2020-6061+6062.patch";
+      sha256 = "0fcy1wp91bb4hlhnp96sf9bs0d9hf3pwx5f7b1r9cfvr3l5c1bk2";
+    })
+  ];
 
   meta = with stdenv.lib; {
     homepage = "https://coturn.net/";