summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2023-07-14 11:50:31 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-07-29 00:48:12 +0000
commit5ba1fcbad9338f85b9e35dba0b8af806f076e04b (patch)
treed35fd4111aae61450fbc0ae6b0d774baf848e6c6
parentMerge pull request #245959 from NixOS/backport-245713-to-release-23.05 (diff)
downloadnixpkgs-5ba1fcbad9338f85b9e35dba0b8af806f076e04b.tar.gz
pjsip: 2.13 -> 2.13.1
Fixes CVE-2023-27585. Changes: https://github.com/pjsip/pjproject/releases/tag/2.13.1 (cherry picked from commit 3601ccf5aeece88bf85f4373aa9aaf3c939b0e73)
-rw-r--r--pkgs/applications/networking/pjsip/default.nix17
1 files changed, 3 insertions, 14 deletions
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 11462dab9a1b..9c1b8e4f2617 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -2,7 +2,6 @@
, testers
, stdenv
, fetchFromGitHub
-, fetchpatch
, openssl
, libsamplerate
, swig
@@ -16,27 +15,17 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pjsip";
- version = "2.13";
+ version = "2.13.1";
src = fetchFromGitHub {
owner = finalAttrs.pname;
repo = "pjproject";
- rev = finalAttrs.version;
- sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE=";
+ rev = "refs/tags/${finalAttrs.version}";
+ hash = "sha256-R1iKIkWyNCRV2PjQgTqKmJYUgHAZrREanD60Jz6MY1Y=";
};
patches = [
./fix-aarch64.patch
- (fetchpatch {
- name = "CVE-2022-23537.patch";
- url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch";
- sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA=";
- })
- (fetchpatch {
- name = "CVE-2022-23547.patch";
- url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch";
- sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k=";
- })
];
nativeBuildInputs =