diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix index 61c25e183bd0..7fcc8c58c1ce 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -71,6 +71,17 @@ stdenv.mkDerivation rec { url = "https://github.com/libproxy/libproxy/pull/95.patch"; sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi"; }) + (fetchpatch { + name = "CVE-2020-25219.patch"; + url = "https://github.com/libproxy/libproxy/commit/a83dae404feac517695c23ff43ce1e116e2bfbe0.patch"; + sha256 = "0wdh9qjq99aw0jnf2840237i3hagqzy42s09hz9chfgrw8pyr72k"; + }) + (fetchpatch { + name = "CVE-2020-26154.patch"; + url = "https://github.com/libproxy/libproxy/commit/4411b523545b22022b4be7d0cac25aa170ae1d3e.patch"; + sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8"; + }) + ] ++ stdenv.lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; |