[ettercap/f17: 5/5] Merge branch 'master' into f17

[Jon Ciesla]

commit 279a2ce0fd883c8e49480ea301178d0554c1e34c
Merge: ca18c37 722141d
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jan 14 10:02:14 2013 -0600

    Merge branch 'master' into f17
    
    Conflicts:
    	ettercap.spec

 .gitignore                           |    2 +
 ettercap-0.7.5.1-CVE-2013-0722.patch |   73 ++++++++++++++++++++++++++++++++++
 ettercap.spec                        |   40 ++++++++++++-------
 sources                              |    2 +-
 4 files changed, 101 insertions(+), 16 deletions(-)
---
diff --cc ettercap.spec
index 3345e94,0691b5b..1061c4d
--- a/ettercap.spec
+++ b/ettercap.spec
@@@ -31,7 -32,7 +32,8 @@@ BuildRequires: libtoo
  BuildRequires: bison
  BuildRequires: flex
  BuildRequires: cmake
 +BuildRequires: groff-base
+ BuildRequires: libcurl-devel
  #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}