public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #105287 from mweinelt/libproxy 

libproxy: fix CVE-2020-25219, CVE-2020-26154
This commit is contained in:
Andreas Rammhold 2020-11-30 16:21:11 +01:00 committed by GitHub
parent f0323b5bc1 c0e0a6876f
commit 76587f2c1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libproxy/default.nix
View File

@ -71,6 +71,17 @@ stdenv.mkDerivation rec {
url = "https://github.com/libproxy/libproxy/pull/95.patch"; url = "https://github.com/libproxy/libproxy/pull/95.patch";
sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi"; 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 [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
(fetchpatch { (fetchpatch {
url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";