mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge pull request #197782 from risicle/ris-pjsip-CVE-2022-39269-CVE-2022-39244
This commit is contained in:
commit
50d91e7871
|
@ -71,10 +71,14 @@ rec {
|
||||||
sha256 = "sha256-ENRfQh/HCXqInTV0tu8tGQO7+vTbST6XXpptERXMACE=";
|
sha256 = "sha256-ENRfQh/HCXqInTV0tu8tGQO7+vTbST6XXpptERXMACE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
|
patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
|
||||||
|
|
||||||
configureFlags = (readLinesToList ./config/pjsip_args_common)
|
configureFlags = (readLinesToList ./config/pjsip_args_common)
|
||||||
++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);
|
++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
knownVulnerabilities = [ "CVE-2022-39269" "CVE-2022-39244" ];
|
||||||
|
} // old.meta;
|
||||||
});
|
});
|
||||||
|
|
||||||
opendht-jami = opendht.override {
|
opendht-jami = opendht.override {
|
||||||
|
|
|
@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./fix-aarch64.patch
|
./fix-aarch64.patch
|
||||||
|
(fetchpatch {
|
||||||
|
name = "CVE-2022-39269.patch";
|
||||||
|
url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch";
|
||||||
|
sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ=";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
name = "CVE-2022-39244.patch";
|
||||||
|
url = "https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae.patch";
|
||||||
|
sha256 = "sha256-hTUMh6bYAizn6GF+sRV1vjKVxSf9pnI+eQdPOqsdJI4=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ openssl libsamplerate ]
|
buildInputs = [ openssl libsamplerate ]
|
||||||
|
|
Loading…
Reference in a new issue