diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-10-02 00:22:12 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-10-02 00:22:12 +0000 |
| commit | fda26c8476c1684f77bacacf2b5c46b1fbf65b41 (patch) | |
| tree | 84752640ad3cf64ba372bdd4aab713c097023281 /pkgs/applications/networking/sniffers | |
| parent | 21976d1fbd612f67825473a7a2b05bb1387e5840 (diff) | |
| parent | 6b8806dff7a2cd11e37944af1bbb276ceb870199 (diff) | |
Merge branch 'master' into staging
* master: (271 commits) pysmbc: clarify license pysmbc: fix license bazel: 0.5.4 -> 0.6.0 (#29990) googler: init at 3.3 go: declare support for aarch64 firefox-beta-bin: 56.0b5 -> 57.0b4 spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26 gogs: 0.11.19 -> 0.11.29 grafana: 4.5.1 -> 4.5.2 mopidy-iris: 3.4.1 -> 3.4.9 nextcloud: 12.0.2 -> 12.0.3 haskell-json-autotype: jailbreak to fix build within LTS 9.x kore: fix up kore: init at 2.0.0 glusterfs service: fix issues with useRpcbind tig: 2.2.2 -> 2.3.0 haskell-hspec-core: enable test suite again hackage-packages.nix: automatic Haskell package set update librsvg: fix thumbnailer path awscli: 1.11.108 -> 1.11.162 ...
Diffstat (limited to 'pkgs/applications/networking/sniffers')
| -rw-r--r-- | pkgs/applications/networking/sniffers/ettercap/default.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index cc8e5dc4de081..13d536ccf1bbd 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre, - openssl, ncurses, glib, gtk2, atk, pango, flex, bison }: +{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre +, openssl, ncurses, glib, gtk2, atk, pango, flex, bison +, fetchpatch }: stdenv.mkDerivation rec { name = "ettercap-${version}"; @@ -12,6 +13,19 @@ stdenv.mkDerivation rec { sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-8366.patch"; + url = "https://github.com/Ettercap/ettercap/commit/1083d604930ebb9f350126b83802ecd2cbc17f90.patch"; + sha256 = "1ff6fp8fxisvd3fkkd01y4fjykgcj414kczzpfscdmi52ridwg8m"; + }) + (fetchpatch { + name = "CVE-2017-6430.patch"; + url = "https://github.com/Ettercap/ettercap/commit/7f50c57b2101fe75592c8dc9960883bbd1878bce.patch"; + sha256 = "0s13nc9yzxzp611rixsd1c8aw1b57q2lnvfq8wawxyrw07h7b2j4"; + }) + ]; + buildInputs = [ cmake libpcap libnet zlib curl pcre openssl ncurses glib gtk2 atk pango flex bison |