diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-12-14 18:06:17 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-14 18:06:17 -0300 |
| commit | 2a9ed54bae7e321cdcc2d0a9490c5112fd444b27 (patch) | |
| tree | aaf6092f52295af24f276e2dd9361d2dab7be374 | |
| parent | Merge pull request #150608 from collares/backport-148236-to-release-21.11 (diff) | |
| parent | [21.11] calibre: fix CVE-2021-44686 (security) (diff) | |
| download | nixpkgs-2a9ed54bae7e321cdcc2d0a9490c5112fd444b27.tar.gz | |
Merge pull request #150758 from wamserma/fix-calibre-cve
[21.11] calibre: fix CVE-2021-44686 (security)
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a991d7c0d13d..3fe954336ca0 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -42,6 +42,13 @@ mkDerivation rec { url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA="; }) + + # fix for CVE-2021-44686 + (fetchpatch { + name = "0002-CVE-2021-44686.patch"; + url = "https://github.com/kovidgoyal/calibre/commit/235b7e38c197ba4a3c17531e516610af8795e348.patch"; + sha256 = "07ncv6r2v05m8rnv4syjfalkpksqpjag6icf1z57nv7k9dkkfmfw"; + }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; |