summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-04-18 08:29:19 +0200
committerVladimír Čunát <v@cunat.cz>2022-04-18 08:29:19 +0200
commite766d457c63ed752fb602e99b2177712638b28d4 (patch)
tree6d89216ee6e4f9fe9ab433a994a62b14ac82c6b7
parentfad2f3353c1916b45e2d6936cf8ebf30bbd95b9c (diff)
parente7e3e939a8e9d71e9ec32bc7f3165a311c0a3821 (diff)
downloadnixpkgs-e766d457c63ed752fb602e99b2177712638b28d4.tar
nixpkgs-e766d457c63ed752fb602e99b2177712638b28d4.tar.gz
nixpkgs-e766d457c63ed752fb602e99b2177712638b28d4.tar.bz2
nixpkgs-e766d457c63ed752fb602e99b2177712638b28d4.tar.lz
nixpkgs-e766d457c63ed752fb602e99b2177712638b28d4.tar.xz
nixpkgs-e766d457c63ed752fb602e99b2177712638b28d4.tar.zst
nixpkgs-e766d457c63ed752fb602e99b2177712638b28d4.zip
Merge #165339: pjsip: add patch for CVE-2022-24764
-rw-r--r--pkgs/applications/networking/pjsip/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 175f9b48080..6406337541f 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }:
+{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "pjsip";
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./fix-aarch64.patch
+    (fetchpatch {
+      name = "CVE-2022-24764.patch";
+      url = "https://github.com/pjsip/pjproject/commit/560a1346f87aabe126509bb24930106dea292b00.patch";
+      sha256 = "1fy78v3clm0gby7qcq3ny6f7d7f4qnn01lkqq67bf2s85k2phisg";
+    })
   ];
 
   buildInputs = [ openssl libsamplerate ]