[ettercap/el5: 48/48] Merge branch 'el6' into el5

[Jon Ciesla]

commit 1e3434890f34689f7581b8d3a188daf15c582e04
Merge: 6880f17 47d1c49
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jan 26 15:24:58 2012 -0600

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	ettercap.desktop
    	ettercap.spec
    	sources

 ettercap-0.7.4-CVE-2010-3843.patch      |   37 +++++++
 ettercap-NG-0.7.3-64bit-crash.patch     |   10 ++
 ettercap-NG-0.7.3-daemon-textmode.patch |   30 ++++++
 ettercap-NG-0.7.3-daemon-ui.patch       |   11 ++
 ettercap-NG-0.7.3-ec_log.patch          |   11 ++
 ettercap-NG-0.7.3-license-fix.patch     |   12 ++
 ettercap-NG-0.7.3-mitm-loop.patch       |   14 +++
 ettercap-NG-0.7.3-passive-dns.patch     |   49 +++++++++
 ettercap-NG-0.7.3-selinux-fcntl.patch   |    5 +
 ettercap.desktop                        |    2 +-
 ettercap.spec                           |  173 +++++++++++++++++++++++++++++--
 ettercap_easter_egg_license.txt         |   56 ++++++++++
 sources                                 |    2 +-
 13 files changed, 402 insertions(+), 10 deletions(-)
---
diff --cc ettercap.spec
index fa50a4a,f77a453..a3ea7b3
--- a/ettercap.spec
+++ b/ettercap.spec
@@@ -198,39 -314,50 +314,80 @@@ rm -rf %{buildroot
  - Alternatives fix by Manuel Wolfshant.
  - Please run rpm -e ettercap ettercap-gtk --noscripts before upgrading.
  - Bump to unified FC5 compat.
++<<<<<<< HEAD
 +* Thu Mar 15 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-12
 +- Added ettercap-README.fedora
 +- Fixed Requires versioning.
 +* Thu Mar 15 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-11
 +- Fixed several typos, clarified a few minor things.
 +* Thu Mar 15 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-10
 +- Added doc and README.
 +- Replaced symlinks with alternatives solution.
++=======
+ 
+ * Thu Mar 15 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-12
+ - Added ettercap-README.fedora
+ - Fixed Requires versioning.
+ 
+ * Thu Mar 15 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-11
+ - Fixed several typos, clarified a few minor things.
+ 
+ * Thu Mar 15 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-10
+ - Added doc and README.
+ - Replaced symlinks with alternatives solution.
+ 
++>>>>>>> el6
  * Thu Mar 15 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-9
  - Removed libtool BR.
  - Removed .la files.
  - Moved plugins to subpackage.
  - Re-added Provides to GTK package.
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> el6
  * Tue Mar 13 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-8
  - Added libtool-ltdl-devel BR.
  - Removed full path from desktop.
  - Dropped provides from gtk package
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> el6
  * Tue Mar 13 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-7
  - Fixed .desktop icon path
  * Tue Mar 13 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-6
  - Moved to consistent buildroot.
  - Fixed BR, Rs.
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> el6
  * Tue Mar 13 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-5
  - Removed dupes, moved symlinks for t and c to common only
  - Moved desktop scriptlets to gtk package.
  - Moved curses man page to curses package.
++<<<<<<< HEAD
 +* Tue Mar 13 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-4
 +- Added Provides
++=======
+ 
+ * Tue Mar 13 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-4
+ - Added Provides
+ 
++>>>>>>> el6
  * Tue Mar 13 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-3
  - Updated BRs.
  - Split out gtk and NCURSES versions from common package.
  - Added UI patch from Till Maas, symlinks, .desktop, icon installation.
++<<<<<<< HEAD
++* Sat Mar 10 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-2
++- Corrected Source URL.
++=======
+ 
  * Sat Mar 10 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-2
  - Corrected Source URL.
+ 
++>>>>>>> el6
  * Sat Mar 10 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-1
  - Initial packaging.