rpms/ettercap/F-9 ettercap-NG-0.7.3-daemon-textmode.patch, NONE, 1.1 ettercap-NG-0.7.3-daemon-ui.patch, NONE, 1.1 ettercap-NG-0.7.3-mitm-loop.patch, NONE, 1.1 ettercap.spec, 1.12, 1.13

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/pkgs/rpms/ettercap/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30227

Modified Files:
	ettercap.spec 
Added Files:
	ettercap-NG-0.7.3-daemon-textmode.patch 
	ettercap-NG-0.7.3-daemon-ui.patch 
	ettercap-NG-0.7.3-mitm-loop.patch 
Log Message:
BZ 450029, 450923.


ettercap-NG-0.7.3-daemon-textmode.patch:

--- NEW FILE ettercap-NG-0.7.3-daemon-textmode.patch ---
--- src/ec_parser.c	2008-06-12 14:49:05.000000000 -0500
+++ src/ec_parser.c	2008-06-12 14:49:05.000000000 -0500
@@ -214,7 +214,7 @@
                   
          case 'o':
                   GBL_OPTIONS->only_mitm = 1;
-                  select_text_interface();
+                  //select_text_interface();
                   break;
                   
          case 'B':
@@ -459,12 +459,12 @@
     }
      
    /* force text interface for only mitm attack */
-   if (GBL_OPTIONS->only_mitm) {
-      if (GBL_OPTIONS->mitm)
-         select_text_interface();
-      else
-         FATAL_ERROR("Only mitm requires at least one mitm method");
-   }
+   //if (GBL_OPTIONS->only_mitm) {
+   //   if (GBL_OPTIONS->mitm)
+   //      select_text_interface();
+   //   else
+   //      FATAL_ERROR("Only mitm requires at least one mitm method");
+   //}
 
    DEBUG_MSG("parse_options: options combination looks good");
    

ettercap-NG-0.7.3-daemon-ui.patch:

--- NEW FILE ettercap-NG-0.7.3-daemon-ui.patch ---
--- src/ec_ui.c	2008-06-10 14:38:10.000000000 -0500
+++ src/ec_ui.c	2008-06-10 14:38:10.000000000 -0500
@@ -336,7 +336,7 @@
    BUG_IF(ops->fatal_error == NULL);
    GBL_UI->fatal_error = ops->fatal_error;
    
-   BUG_IF(ops->input == NULL);
+   BUG_IF((ops->input == NULL)&&(ops->type != UI_DAEMONIZE));
    GBL_UI->input = ops->input;
    
    BUG_IF(ops->progress == NULL);

ettercap-NG-0.7.3-mitm-loop.patch:

--- NEW FILE ettercap-NG-0.7.3-mitm-loop.patch ---
--- src/ec_mitm.c	2008-06-16 13:21:00.000000000 -0500
+++ src/ec_mitm.c	2008-06-16 13:21:00.000000000 -0500
@@ -193,6 +193,11 @@
    mitm_start();
 
    INSTANT_USER_MSG("Activated the mitm attack only... (press 'q' to exit)\n");
+
+   if (GBL_UI->type == UI_DAEMONIZE)
+       LOOP {
+           sleep(1);
+       }
   
    /* wait for user to exit */
    while (ch != 'q' && ch != 'Q') {


Index: ettercap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ettercap/F-9/ettercap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ettercap.spec	9 Feb 2008 04:32:33 -0000	1.12
+++ ettercap.spec	17 Jun 2008 12:31:35 -0000	1.13
@@ -1,6 +1,6 @@
 Name: ettercap
 Version: 0.7.3
-Release: 22%{?dist}
+Release: 26%{?dist}
 Summary: Network traffic sniffer/analyser, NCURSES interface version
 Group: Applications/Internet
 License: GPLv2+
@@ -10,6 +10,9 @@
 Source2: ettercap-README.fedora
 Patch0: ettercap-NG-0.7.3-UI.patch
 Patch1: ettercap-NG-0.7.3-ec_log.patch
+Patch2: ettercap-NG-0.7.3-daemon-ui.patch
+Patch3: ettercap-NG-0.7.3-daemon-textmode.patch
+Patch4: ettercap-NG-0.7.3-mitm-loop.patch
 BuildRoot: %{_tmppath}/%{name}-NG-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -91,6 +94,9 @@
 
 %patch0 -p1
 %patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
 
 %build
 %configure --enable-gtk
@@ -184,6 +190,18 @@
 %{_datadir}/icons/hicolor/32x32/apps/ettercap.png
 
 %changelog
+* Mon Jun 16 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.3-26
+- Fix for mitm CPU util bug.
+
+* Thu Jun 12 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.3-25
+- Corrected -24 patch.
+
+* Thu Jun 12 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.3-24
+- Patch to fix daemon mode mitm behaviour BZ 450923.
+
+* Tue Jun 10 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.3-23
+- Patch to fix ui in daemon mode BZ 450029.
+
 * Fri Feb 08 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.3-22
 - GCC 4.3 rebuild.