diff -Nru ettercap-0.8.2/debian/changelog ettercap-0.8.2/debian/changelog --- ettercap-0.8.2/debian/changelog 2016-10-31 16:38:38.000000000 +0100 +++ ettercap-0.8.2/debian/changelog 2017-03-07 21:28:07.000000000 +0100 @@ -1,3 +1,13 @@ +ettercap (1:0.8.2-4) unstable; urgency=high + + * debian/patches/626dc56686f15f2dda13c48f78c2a666cb6d8506.patch: + - upstream fix fox CVE-2017-6430 (Closes: #857035) + * Remove mips64el luajit-5.1-dev to allow build here (Closes: #790405) + (and reorder, as well as removing sparc) + * Add luajit-5.1-dev to hurd + + -- Gianfranco Costamagna Tue, 07 Mar 2017 20:27:49 +0100 + ettercap (1:0.8.2-3) unstable; urgency=low * debian/patches/740.patch: fix openssl 1.1 build failure diff -Nru ettercap-0.8.2/debian/control ettercap-0.8.2/debian/control --- ettercap-0.8.2/debian/control 2016-10-31 16:37:42.000000000 +0100 +++ ettercap-0.8.2/debian/control 2017-03-07 21:27:01.000000000 +0100 @@ -15,7 +15,7 @@ libcurl4-openssl-dev, libgtk2.0-dev, libltdl-dev, - libluajit-5.1-dev [!hurd-i386 !kfreebsd-amd64 !s390x !arm64 !ppc64el !sparc !alpha !arm64 !hppa !m68k !ppc64 !sh4 !sparc64 !x32], + libluajit-5.1-dev [!arm64 !mips64el !ppc64el !s390x !alpha !hppa !kfreebsd-amd64 !m68k !ppc64 !sh4 !sparc64 !x32], libncurses5-dev, libnet1-dev, libpcap-dev, diff -Nru ettercap-0.8.2/debian/patches/626dc56686f15f2dda13c48f78c2a666cb6d8506.patch ettercap-0.8.2/debian/patches/626dc56686f15f2dda13c48f78c2a666cb6d8506.patch --- ettercap-0.8.2/debian/patches/626dc56686f15f2dda13c48f78c2a666cb6d8506.patch 1970-01-01 01:00:00.000000000 +0100 +++ ettercap-0.8.2/debian/patches/626dc56686f15f2dda13c48f78c2a666cb6d8506.patch 2017-03-07 20:32:22.000000000 +0100 @@ -0,0 +1,69 @@ +From 626dc56686f15f2dda13c48f78c2a666cb6d8506 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Thu, 9 Feb 2017 16:01:30 +0100 +Subject: [PATCH] Exit gracefully in case of corrupted filters (Closes issue + #782) + +--- + utils/etterfilter/ef_compiler.c | 4 +++- + utils/etterfilter/ef_main.c | 9 +++++++-- + utils/etterfilter/ef_output.c | 3 +++ + 3 files changed, 13 insertions(+), 3 deletions(-) + +Index: ettercap-0.8.2/utils/etterfilter/ef_compiler.c +=================================================================== +--- ettercap-0.8.2.orig/utils/etterfilter/ef_compiler.c ++++ ettercap-0.8.2/utils/etterfilter/ef_compiler.c +@@ -239,7 +239,9 @@ + struct filter_op *array = NULL; + struct unfold_elm *ue; + +- BUG_IF(tree_root == NULL); ++ // invalid file ++ if (tree_root == NULL) ++ return 0; + + fprintf(stdout, " Unfolding the meta-tree "); + fflush(stdout); +Index: ettercap-0.8.2/utils/etterfilter/ef_main.c +=================================================================== +--- ettercap-0.8.2.orig/utils/etterfilter/ef_main.c ++++ ettercap-0.8.2/utils/etterfilter/ef_main.c +@@ -39,7 +39,7 @@ + + int main(int argc, char *argv[]) + { +- ++ int ret_value = 0; + globals_alloc(); + /* etterfilter copyright */ + fprintf(stdout, "\n" EC_COLOR_BOLD "%s %s" EC_COLOR_END " copyright %s %s\n\n", +@@ -84,8 +84,12 @@ + fprintf(stdout, "\n\nThe script contains errors...\n\n"); + + /* write to file */ +- if (write_output() != E_SUCCESS) +- FATAL_ERROR("Cannot write output file (%s)", GBL_OPTIONS->output_file); ++ ret_value = write_output(); ++ if (ret_value == -E_NOTHANDLED) ++ FATAL_ERROR("Cannot write output file (%s): the filter is not correctly handled.", GBL_OPTIONS->output_file); ++ else if (ret_value == -E_INVALID) ++ FATAL_ERROR("Cannot write output file (%s): the filter format is not correct. ", GBL_OPTIONS->output_file); ++ + globals_free(); + return 0; + } +Index: ettercap-0.8.2/utils/etterfilter/ef_output.c +=================================================================== +--- ettercap-0.8.2.orig/utils/etterfilter/ef_output.c ++++ ettercap-0.8.2/utils/etterfilter/ef_output.c +@@ -51,6 +51,9 @@ + if (fop == NULL) + return -E_NOTHANDLED; + ++ if (ninst == 0) ++ return -E_INVALID; ++ + /* create the file */ + fd = open(GBL_OPTIONS->output_file, O_CREAT | O_RDWR | O_TRUNC | O_BINARY, 0644); + ON_ERROR(fd, -1, "Can't create file %s", GBL_OPTIONS->output_file); diff -Nru ettercap-0.8.2/debian/patches/740.patch ettercap-0.8.2/debian/patches/740.patch --- ettercap-0.8.2/debian/patches/740.patch 2016-10-31 16:36:44.000000000 +0100 +++ ettercap-0.8.2/debian/patches/740.patch 2017-03-07 20:32:27.000000000 +0100 @@ -1,6 +1,3 @@ -## Description: add some description -## Origin/Author: add some origin or author -## Bug: bug URL From f0d63b27c82df2ad5f7ada6310727d841b43fbcc Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 27 Jun 2016 12:41:33 +0200 diff -Nru ettercap-0.8.2/debian/patches/series ettercap-0.8.2/debian/patches/series --- ettercap-0.8.2/debian/patches/series 2016-10-31 16:36:37.000000000 +0100 +++ ettercap-0.8.2/debian/patches/series 2017-03-07 20:32:03.000000000 +0100 @@ -1 +1,2 @@ 740.patch +626dc56686f15f2dda13c48f78c2a666cb6d8506.patch