From eb8acbbcf92cfb111abf1db6f4ff2f0abe3ac015 Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 9 Nov 2022 18:41:31 +0800 Subject: [PATCH] [22.05] Backport pjsip CVE fix for jami --- .../networking/instant-messengers/jami/daemon.nix | 2 +- .../networking/instant-messengers/jami/pjproject-src.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix index f39b731132ea..6be849b2ae2e 100644 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -67,7 +67,7 @@ let src = fetchFromGitHub src-args; - patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); + patches = map (x: patch-src + x) (readLinesToList ./config/pjsip_patches); }); opendht-jami = opendht.override { diff --git a/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix b/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix index 76e88d887555..f8119d57ffaf 100644 --- a/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix +++ b/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix @@ -1,6 +1,6 @@ { owner = "savoirfairelinux"; repo = "pjproject"; - rev = "e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a"; - sha256 = "0inpmyb6mhrzr0g309d6clkc99lddqdvyf9xajz0igvgp9pvgpza"; + rev = "513a3f14c44b2c2652f9219ec20dea64b236b713"; + hash = "sha256-93AlJGMnlzJMrJquelpHQQKjhEgfpTFXTMqkBnm87u8="; }