ettercap: 0.8.2 -> 0.8.3
fixes openssl 1.1 compat
This commit is contained in:
parent
86e1839847
commit
93b46241a8
@ -1,34 +1,23 @@
|
|||||||
{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre
|
{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre
|
||||||
, openssl, ncurses, glib, gtk2, atk, pango, flex, bison
|
, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip
|
||||||
, fetchpatch }:
|
, pkgconfig }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "ettercap-${version}";
|
name = "ettercap-${version}";
|
||||||
version = "0.8.2";
|
version = "0.8.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Ettercap";
|
owner = "Ettercap";
|
||||||
repo = "ettercap";
|
repo = "ettercap";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd";
|
sha256 = "0m40bmbrv9a8qlg54z3b5f8r541gl9vah5hm0bbqcgyyljpg39bz";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
strictDeps = true;
|
||||||
(fetchpatch {
|
nativeBuildInputs = [ cmake flex bison pkgconfig ];
|
||||||
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 = [
|
buildInputs = [
|
||||||
cmake libpcap libnet zlib curl pcre openssl ncurses
|
libpcap libnet zlib curl pcre openssl ncurses
|
||||||
glib gtk2 atk pango flex bison
|
glib gtk3 atk pango geoip
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
@ -37,8 +26,8 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
|
"-DBUNDLED_LIBS=Off"
|
||||||
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
|
"-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user