rpms/ettercap/FC-5 ettercap-NG-0.7.3-UI.patch, 1.1, 1.2 ettercap.spec, 1.16, 1.17
Jon Ciesla (limb)
fedora-extras-commits at redhat.com
Mon Mar 26 17:50:32 UTC 2007
Author: limb
Update of /cvs/extras/rpms/ettercap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9226
Modified Files:
ettercap-NG-0.7.3-UI.patch ettercap.spec
Log Message:
Patch fix, spec unification. Deprecated/erges -plugins.
ettercap-NG-0.7.3-UI.patch:
Index: ettercap-NG-0.7.3-UI.patch
===================================================================
RCS file: /cvs/extras/rpms/ettercap/FC-5/ettercap-NG-0.7.3-UI.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ettercap-NG-0.7.3-UI.patch 19 Mar 2007 15:34:13 -0000 1.1
+++ ettercap-NG-0.7.3-UI.patch 26 Mar 2007 17:49:59 -0000 1.2
@@ -1,6 +1,6 @@
diff -ru ettercap-NG-0.7.3/src/ec_parser.c ettercap-NG-0.7.3.patched/src/ec_parser.c
--- ettercap-NG-0.7.3/src/ec_parser.c 2004-07-20 11:53:53.000000000 +0200
-+++ ettercap-NG-0.7.3.patched/src/ec_parser.c 2007-03-11 23:01:07.000000000 +0100
++++ ettercap-NG-0.7.3.patched/src/ec_parser.c 2007-03-26 18:50:41.000000000 +0200
@@ -73,12 +73,16 @@
fprintf(stdout, " -t, --proto <proto> sniff only this proto (default is all)\n");
@@ -21,15 +21,16 @@
fprintf(stdout, "\nLogging options:\n");
fprintf(stdout, " -w, --write <file> write sniffed data to pcapfile <file>\n");
-@@ -173,6 +177,17 @@
+@@ -173,6 +177,18 @@
{ 0 , 0 , 0 , 0}
};
++
+#ifdef HAVE_GTK
+ if (strcmp(argv[0], "ettercap-gtk") == 0)
+ select_gtk_interface();
+#endif
-+#ifdef HAVE_CURSES
++#ifdef HAVE_NCURSES
+ if (strcmp(argv[0], "ettercap-curses") == 0)
+ select_curses_interface();
+#endif
@@ -39,7 +40,7 @@
for (c = 0; c < argc; c++)
DEBUG_MSG("parse_options -- [%d] [%s]", c, argv[c]);
-@@ -215,11 +230,20 @@
+@@ -215,11 +231,20 @@
break;
case 'C':
@@ -61,7 +62,7 @@
break;
case 'D':
-@@ -429,8 +453,9 @@
+@@ -429,8 +454,9 @@
if (GBL_OPTIONS->read && GBL_OPTIONS->mitm)
FATAL_ERROR("Cannot use mitm attacks while reading from file");
Index: ettercap.spec
===================================================================
RCS file: /cvs/extras/rpms/ettercap/FC-5/ettercap.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ettercap.spec 23 Mar 2007 17:13:08 -0000 1.16
+++ ettercap.spec 26 Mar 2007 17:49:59 -0000 1.17
@@ -1,6 +1,6 @@
Name: ettercap
Version: 0.7.3
-Release: 14%{?dist}.3
+Release: 16%{?dist}
Summary: Network traffic sniffer/analyser, NCURSES interface version
Group: Applications/Internet
License: GPL
@@ -11,18 +11,39 @@
Patch0: ettercap-NG-0.7.3-UI.patch
BuildRoot: %{_tmppath}/%{name}-NG-%{version}-%{release}-root%(%{__id_u} -n)
-BuildRequires: libnet-devel
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: pcre-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}
+BuildRequires: libnet
+%if "0%{?dist}" =="0.el4"
+#epel 4
+BuildRequires: libtool
BuildRequires: libpcap
+%else
+#epel 5
BuildRequires: libtool-ltdl-devel
-
+BuildRequires: libpcap-devel
+%endif
+%endif
+%if 0%{?fedora}
+%if "0%{?dist}" == "0.fc5"
+BuildRequires: libpcap
+%else
+BuildRequires: libpcap-devel
+%endif
+BuildRequires: libnet-devel
+BuildRequires: libtool-ltdl-devel
+%endif
Requires: ettercap-common = %{version}-%{release}
Requires(post): %{_sbindir}/alternatives
Requires(preun): %{_sbindir}/alternatives
+Obsoletes: ettercap-plugins <= 0.7.3-14
+Provides: ettercap-plugins <= %{version}
%description
Ettercap is a suite for man in the middle attacks on LAN. It features
@@ -64,20 +85,6 @@
This package contains the GTK version.
-%package plugins
-Summary: Network traffic sniffer/analyser, gtk interface version
-Group: Applications/Internet
-Requires: ettercap-common = %{version}-%{release}
-
-%description plugins
-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 available plugins.
-
%prep
%setup -q -n ettercap-NG-%{version}
@@ -97,7 +104,8 @@
make install DESTDIR=%{buildroot}
install -c -m 755 src/ettercap-gtk %{buildroot}%{_bindir}
mv %{buildroot}%{_bindir}/ettercap %{buildroot}%{_bindir}/ettercap-tui
-[ -f %{buildroot}%{_libdir}/ettercap/*.la ] && rm %{buildroot}%{_libdir}/ettercap/*.la
+#getting rid of libtool files potentially left behind when building plugins
+rm -f %{buildroot}%{_libdir}/ettercap/*.la
mkdir -p %{buildroot}%{_docdir}
install -c -m 644 %{SOURCE2} %{buildroot}%{_docdir}
@@ -158,10 +166,12 @@
%{_bindir}/etterfilter
%{_bindir}/etterlog
%{_datadir}/ettercap
+%{_libdir}/ettercap
%{_mandir}/man5/etter.conf.5.gz
%{_mandir}/man8/ettercap.8.gz
%{_mandir}/man8/etterfilter.8.gz
%{_mandir}/man8/etterlog.8.gz
+%{_mandir}/man8/ettercap_plugins.8.gz
%files gtk
%defattr(-,root,root,-)
@@ -169,18 +179,13 @@
%{_datadir}/applications/fedora-ettercap.desktop
%{_datadir}/icons/hicolor/32x32/apps/ettercap.png
-%files plugins
-%defattr(-,root,root,-)
-%{_mandir}/man8/ettercap_plugins.8.gz
-%{_libdir}/ettercap
-
%changelog
-* Fri Mar 23 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-14.3
-- BR fix.
-* Fri Mar 23 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-14.2
-- De-unified spec from FC6 and devel.
-* Fri Mar 23 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-14.1
-- Patched FC5 compat fix.
+* Mon Mar 26 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-16
+- Merged -plugins into common.
+- Fixed UI patch from Till Maas.
+* Sat Mar 24 2007 Manuel Wolfshant <wolfy at pcnet.ro> - 0.7.3-15
+- Unified spec for epel / FC5 / FC6; build for epel is not possible until
+ libnet is made available
* Fri Mar 23 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-14
- Alternatives fix by Manuel Wolfshant.
- Please run rpm -e ettercap ettercap-gtk --noscripts before upgrading.
More information about the fedora-extras-commits
mailing list