diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 36927f4f6d3a..3b345e994e30 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -9,23 +9,23 @@ }: let - # remove when upgrading to pjsip >2.12.1 + # remove when upgrading to pjsip >2.13 pjsip_patches = [ - (fetchpatch { - name = "0150-CVE-2022-31031.patch"; - url = "https://github.com/pjsip/pjproject/commit/450baca94f475345542c6953832650c390889202.patch"; - sha256 = "sha256-30kHrmB51UIw4x/J6/CD+vPKf/gBYDCcFoUpwEWkDMY="; - }) - (fetchpatch { - name = "0151-CVE-2022-39244.patch"; - url = "https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae.patch"; - sha256 = "sha256-hTUMh6bYAizn6GF+sRV1vjKVxSf9pnI+eQdPOqsdJI4="; - }) (fetchpatch { name = "0152-CVE-2022-39269.patch"; url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch"; sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ="; }) + (fetchpatch { + name = "pjsip-2.12.1-CVE-2022-23537.patch"; + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23537.patch"; + sha256 = "sha256-KNSnHt0/o1qJk4r2z5bxbYxKAa7WBtzGOhRXkru3VK4="; + }) + (fetchpatch { + name = "pjsip-2.12.1-CVE-2022-23547.patch"; + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23547.patch"; + sha256 = "sha256-0iEr/Z4UQpWsTXYWVYzWWk7MQDOFnTQ1BBYpynGLTVQ="; + }) ]; common = {version, sha256, externals}: stdenv.mkDerivation { inherit version; diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 7e6943a6822d..b1a6319a51d1 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,18 +1,18 @@ { "asterisk_16": { - "sha256": "406a91290e18d25a6fc23ae6b9c56b1fb2bd70216e336c74cf9c26b908c89c3d", - "version": "16.29.0" + "sha256": "f8448e8784df7fac019e459bf7c82529d80afe64ae97d73d40e6aa0e4fb39724", + "version": "16.30.0" }, "asterisk_18": { - "sha256": "a963dafeba0e7e1051a1ac56964999c111dbcdb25a47010bc1f772bf8edbed75", - "version": "18.15.0" + "sha256": "2d280794ae7505ed3dfc58b3190774cb491aa74c339fbde1a11740e6be79b466", + "version": "18.16.0" }, "asterisk_19": { - "sha256": "832a967c5a040b0768c0e8df1646762f7304019fcf7f2e065a8b4828fa4092b7", - "version": "19.7.0" + "sha256": "f0c56d1f8e39e0427455edfe25d24ff088c756bdc32dd1278c9f7a320815cbaa", + "version": "19.8.0" }, "asterisk_20": { - "sha256": "949022c20dc6da65b456e1b1b5b42a7901bb41fc9ce20920891739e7220d72eb", - "version": "20.0.0" + "sha256": "4364dc762652e2fd4d3e7dc8428c83550ebae090b8a0e9d4820583e081778883", + "version": "20.1.0" } }