[ettercap/el6: 23/23] Merge branch 'f16' into el6

[Jon Ciesla]

commit 88772efa059c40381608e61b8f6b7698ae7e3f0a
Merge: 52e62ed bab15a1
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jan 14 12:28:54 2013 -0600

    Merge branch 'f16' into el6
    
    Conflicts:
    	ettercap.spec

 .gitignore                           |    4 +
 ettercap-0.7.5-dhcp-spoof.patch      |   11 ++
 ettercap-0.7.5.1-CVE-2013-0722.patch |   73 ++++++++++++++
 ettercap.desktop                     |    2 +-
 ettercap.spec                        |  182 +++++++++++++---------------------
 sources                              |    2 +-
 6 files changed, 157 insertions(+), 117 deletions(-)
---
diff --cc ettercap.spec
index e732f14,3a1b77e..c87a109
--- a/ettercap.spec
+++ b/ettercap.spec
@@@ -30,11 -28,11 +28,11 @@@ BuildRequires: gtk2-deve
  BuildRequires: ncurses-devel
  BuildRequires: openssl-devel
  BuildRequires: pcre-devel
- BuildRequires: autoconf
  BuildRequires: libtool
- #BuildRequires: byacc
  BuildRequires: bison
  BuildRequires: flex
 -BuildRequires: cmake
++BuildRequires: cmake28
+ BuildRequires: groff
  #some requirements are available in fedora but not in stock epel
  #build for epel requires libnet which is only available from rpmforge
  %if 0%{?rhel}
@@@ -57,80 -46,37 +46,43 @@@ BuildRequires: libpcap-deve
  BuildRequires: libnet-devel
  BuildRequires: libtool-ltdl-devel
  %endif
 +%if "0%{?dist}" =="0.el6"
 +BuildRequires: libnet-devel
 +%endif
 +Requires: ettercap-common = %{version}-%{release}
 +Requires(post): %{_sbindir}/alternatives
 +Requires(preun): %{_sbindir}/alternatives
  Obsoletes: ettercap-plugins < 0.7.3-15
  Provides: ettercap-plugins = %{version}-%{release}
+ Obsoletes: ettercap-common < 0.7.5
+ Provides: ettercap-common = %{version}-%{release}
+ Obsoletes: ettercap-gtk < 0.7.5
+ Provides: ettercap-gtk = %{version}-%{release}
  
- %description
- Ettercap is a suite for man in the middle attacks on LAN. It features
- sniffing of live connections, content filtering on the fly and many other
- interesting tricks. It supports active and passive dissection of many
- protocols (even ciphered ones) and includes many feature for network and host
- analysis. 
- 
- This package contains the NCURSES version.
- 
- %package common
- Summary: Common files for Ettercap, Network traffic sniffer/analyser
- Group: Applications/Internet
- Requires: ettercap = %{version}-%{release}
- 
- %description common
- Ettercap is a suite for man in the middle attacks on LAN. It features
- sniffing of live connections, content filtering on the fly and many other
- interesting tricks. It supports active and passive dissection of many
- protocols (even ciphered ones) and includes many feature for network and host
- analysis. 
- 
- This package contains files common to both the GTK and NCURSES versions.
- 
- %package gtk
- Summary: Network traffic sniffer/analyser, gtk interface version
- Group: Applications/Internet
- Requires: ettercap-common = %{version}-%{release}
- Requires(post): %{_sbindir}/alternatives
- Requires(preun): %{_sbindir}/alternatives
- Provides: ettercap = %{version}-%{release}
  
- %description gtk
+ %description
  Ettercap is a suite for man in the middle attacks on LAN. It features
  sniffing of live connections, content filtering on the fly and many other
  interesting tricks. It supports active and passive dissection of many
  protocols (even ciphered ones) and includes many feature for network and host
  analysis. 
  
- This package contains the GTK version.
  
  %prep
- %setup -q -n ettercap
+ %setup -qn ettercap-0.7.4.1-erc-c796e5
  
- %patch0 -p1
- #%patch1 -p0
- %patch2 -p0
- %patch3 -p0
  %patch4 -p0
  %patch5 -p0
- #%patch6 -p0
- #%patch7 -p0
  %patch8 -p1 -b .license
  %patch9 -p0
+ %patch10 -p0
+ %patch11 -p1
  
  %build
- autoconf
- %configure --enable-gtk
- #make %{?_smp_mflags}
- make CFLAGS="$RPM_OPT_FLAGS"
- cp src/ettercap src/ettercap-gtk
- make clean
- %configure --disable-gtk
- #make %{?_smp_mflags}  Broken as of 0.7.4
- make CFLAGS="$RPM_OPT_FLAGS"
+ mkdir build
+ pushd build
 -%cmake ../ -DINSTALL_PREFIX=/usr -DMAN_INSTALLDIR=%{_mandir} -DINSTALL_LIBDIR=%{_libdir}
++cmake28 ../ -DINSTALL_PREFIX=/usr -DMAN_INSTALLDIR=%{_mandir} -DINSTALL_LIBDIR=%{_libdir}
+ make CFLAGS="$RPM_BUILD_FLAGS"
  
  %install
  rm -rf %{buildroot}