From d38053095587b2ff24ab1ab07917d5e5d73ed6ef Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mar 26 2007 18:16:57 +0000 Subject: Patch fix, spec unification, merged plugins. --- diff --git a/ettercap-NG-0.7.3-UI.patch b/ettercap-NG-0.7.3-UI.patch index 4146934..163e0e0 100644 --- a/ettercap-NG-0.7.3-UI.patch +++ b/ettercap-NG-0.7.3-UI.patch @@ -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 sniff only this proto (default is all)\n"); @@ -21,15 +21,16 @@ diff -ru ettercap-NG-0.7.3/src/ec_parser.c ettercap-NG-0.7.3.patched/src/ec_pars fprintf(stdout, "\nLogging options:\n"); fprintf(stdout, " -w, --write write sniffed data to pcapfile \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 @@ diff -ru ettercap-NG-0.7.3/src/ec_parser.c ettercap-NG-0.7.3.patched/src/ec_pars 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 @@ diff -ru ettercap-NG-0.7.3/src/ec_parser.c ettercap-NG-0.7.3.patched/src/ec_pars 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"); diff --git a/ettercap.spec b/ettercap.spec index 60cdda8..0d60297 100644 --- a/ettercap.spec +++ b/ettercap.spec @@ -1,6 +1,6 @@ Name: ettercap Version: 0.7.3 -Release: 14%{?dist} +Release: 16%{?dist} Summary: Network traffic sniffer/analyser, NCURSES interface version Group: Applications/Internet License: GPL @@ -11,18 +11,39 @@ Source2: ettercap-README.fedora 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 @@ analysis. 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 @@ mkdir -p %{buildroot}%{_bindir} make install DESTDIR=%{buildroot} install -c -m 755 src/ettercap-gtk %{buildroot}%{_bindir} mv %{buildroot}%{_bindir}/ettercap %{buildroot}%{_bindir}/ettercap-tui -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 @@ rm -rf %{buildroot} %{_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,15 +179,15 @@ rm -rf %{buildroot} %{_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 +* Mon Mar 26 2007 Jon Ciesla - 0.7.3-16 +- Merged -plugins into common. +- Fixed UI patch from Till Maas. +* Sat Mar 24 2007 Manuel Wolfshant - 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 - 0.7.3-14 - Alternatives fix by Manuel Wolfshant. -- re-ununified.spec. - Please run rpm -e ettercap ettercap-gtk --noscripts before upgrading. - Bump to unified FC5 compat. * Thu Mar 15 2007 Jon Ciesla - 0.7.3-12