diff options
| author | Robert Scott <code@humanleg.org.uk> | 2023-07-29 20:51:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-29 20:51:24 +0100 |
| commit | 83203e154e754ec460c5e16b6f15cc2eca31fd46 (patch) | |
| tree | 72026293305f1b0d6a8a47b42c7c213cefcb8ef7 /pkgs/applications | |
| parent | d63df5a32b6292679c95af0e41272ae0dcbb0186 (diff) | |
| parent | 1b78e939aa8ffe1aa7a15f8940fb5df2b74e6c20 (diff) | |
Merge pull request #246057 from linsui/jami
jami: apply CVE patch
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jami/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 5a002b6be9f38..1b0185447ac03 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -2,6 +2,7 @@ , lib , pkg-config , fetchFromGitLab +, fetchpatch , gitUpdater , ffmpeg_6 @@ -90,7 +91,15 @@ stdenv.mkDerivation rec { hash = "sha256-QeD2o6uz9r5vc3Scs1oRKYZ+aNH+01TSxLBj71ssfj4="; }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); + patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [ + (fetchpatch { + name = "CVE-2023-27585.patch"; + url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch"; + hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg="; + }) + ]; + + patchFlags = [ "-p1" "-l" ]; configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); |