[ettercap] 0.7.5 snapshot.
Jon Ciesla
limb at fedoraproject.org
Wed Sep 5 12:27:23 UTC 2012
commit 4fb7e2ff6e3d2a941a93bdc55cbd94fa29b069fe
Author: Jon Ciesla <limburgher at gmail.com>
Date: Wed Sep 5 07:26:05 2012 -0500
0.7.5 snapshot.
.gitignore | 1 +
ettercap.desktop | 2 +-
ettercap.spec | 150 ++++++++++++------------------------------------------
sources | 2 +-
4 files changed, 36 insertions(+), 119 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 54d0e99..577ca95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
ettercap-NG-0.7.3.tar.gz
/ettercap-0.7.4.tar.gz
/ettercap-0.7.4.1.tar.gz
+/ettercap-0.7.4.1-erc-c796e5.tar.bz2
diff --git a/ettercap.desktop b/ettercap.desktop
index b2fb6ce..dc6fc8b 100644
--- a/ettercap.desktop
+++ b/ettercap.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=Ettercap
Comment=Nework sniffer/analyser
-Exec=ettercap-gtk
+Exec=ettercap -G
Icon=ettercap
Terminal=false
Type=Application
diff --git a/ettercap.spec b/ettercap.spec
index 4d789d6..b85d732 100644
--- a/ettercap.spec
+++ b/ettercap.spec
@@ -1,24 +1,19 @@
%define _hardened_build 1
Name: ettercap
-Version: 0.7.4.1
-Release: 4%{?dist}
+Version: 0.7.5
+Release: 0%{?dist}.20120905gitc796e5
Summary: Network traffic sniffer/analyser, NCURSES interface version
Group: Applications/Internet
License: GPLv2+
URL: http://ettercap.sourceforge.net
-Source0: http://downloads.sourceforge.net/ettercap/ettercap-%{version}.tar.gz
+#Source0: http://downloads.sourceforge.net/ettercap/ettercap-%{version}.tar.gz
+Source0: ettercap-0.7.4.1-erc-c796e5.tar.bz2
Source1: ettercap.desktop
Source2: ettercap-README.fedora
# Permission from upstream to drop the silly modification restriction
Source3: ettercap_easter_egg_license.txt
-Patch0: ettercap-NG-0.7.3-UI.patch
-#Patch1: ettercap-NG-0.7.3-ec_log.patch
-Patch2: ettercap-NG-0.7.3-daemon-ui.patch
-Patch3: ettercap-NG-0.7.3-daemon-textmode.patch
Patch4: ettercap-NG-0.7.3-mitm-loop.patch
Patch5: ettercap-NG-0.7.3-selinux-fcntl.patch
-#Patch6: ettercap-NG-0.7.3-64bit-crash.patch
-#Patch7: ettercap-NG-0.7.3-passive-dns.patch
# Remove the silly modification restriction
Patch8: ettercap-NG-0.7.3-license-fix.patch
Patch9: ettercap-0.7.4-CVE-2010-3843.patch
@@ -31,111 +26,59 @@ BuildRequires: gtk2-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
-BuildRequires: autoconf
BuildRequires: libtool
-#BuildRequires: byacc
BuildRequires: bison
BuildRequires: flex
+BuildRequires: cmake
#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-15
Provides: ettercap-plugins = %{version}-%{release}
+Obsoletes: ettercap-common < 0.7.4.1-4
+Provides: ettercap-common = %{version}-%{release}
+Obsoletes: ettercap-gtk < 0.7.4.1-4
+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
%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}
+make CFLAGS="$RPM_BUILD_FLAGS"
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
+pushd build
make install DESTDIR=%{buildroot}
-install -c -m 755 src/ettercap-gtk %{buildroot}%{_bindir}
-mv %{buildroot}%{_bindir}/ettercap %{buildroot}%{_bindir}/ettercap-tui
+make install man DESTDIR=%{buildroot}
#getting rid of libtool files potentially left behind when building plugins
rm -f %{buildroot}%{_libdir}/ettercap/*.la
mkdir -p %{buildroot}%{_docdir}
@@ -149,76 +92,49 @@ desktop-file-install --vendor fedora \
%{SOURCE1}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-convert contrib/nsis/eNG.ico ettercap.png
-mv ettercap-3.png ettercap.png
-install -p -m 644 ettercap.png \
+install -p -m 644 ../share/ettercap.png \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps
rm -f ettercap*png
-%post
-%{_sbindir}/alternatives --install %{_bindir}/ettercap ettercap %{_bindir}/ettercap-tui 30 \
- --slave /usr/bin/ettercap-text ettercap-text /usr/bin/ettercap-tui \
- --slave /usr/bin/ettercap-curses ettercap-curses /usr/bin/ettercap-tui
-
-%preun
-if [ "$1" = 0 ]; then
- %{_sbindir}/alternatives --remove ettercap %{_bindir}/ettercap-tui
-fi
-%post gtk
+%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
-%{_sbindir}/alternatives --install %{_bindir}/ettercap ettercap %{_bindir}/ettercap-gtk 40 \
- --slave /usr/bin/ettercap-text ettercap-text /usr/bin/ettercap-gtk \
- --slave /usr/bin/ettercap-curses ettercap-curses /usr/bin/ettercap-gtk
-
-%preun gtk
-if [ "$1" = 0 ]; then
- %{_sbindir}/alternatives --remove ettercap %{_bindir}/ettercap-gtk
-fi
-
-%postun gtk
+%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%{_bindir}/ettercap-tui
-%{_mandir}/man8/ettercap_curses.8.gz
-%attr(0755 root root) %ghost %{_bindir}/ettercap
-
-%files common
-%defattr(-,root,root,-)
%doc LICENSE AUTHORS CHANGELOG THANKS TODO* README doc/
+%{_bindir}/etter*
+%config(noreplace) %{_sysconfdir}/ettercap/
%{_docdir}/ettercap-README.fedora
%{_docdir}/ettercap_easter_egg_license.txt
-%config(noreplace) %{_sysconfdir}/etter.conf
-%{_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,-)
-%{_bindir}/ettercap-gtk
+%{_mandir}/man5/etter*
+%{_mandir}/man8/etter*
+%{_datadir}/ettercap/
+%{_libdir}/ettercap/
%{_datadir}/applications/fedora-ettercap.desktop
%{_datadir}/icons/hicolor/32x32/apps/ettercap.png
%changelog
+* Tue Sep 04 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.5-0.20120905gitc796e5
+- Switch to git ettercap_rc branch for gtk crash, BZ 853791.
+- Dropped UI and daemon patches.
+- Merged subpackages, in part due to buildsystem change.
+- Spec cleanup.
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.4.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index b0ee559..fd1a250 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e13ff5504b5bb4f1fc6a465d57ce7ea ettercap-0.7.4.1.tar.gz
+766ae443bf1fefc5699a948d9e0b5aa4 ettercap-0.7.4.1-erc-c796e5.tar.bz2
More information about the scm-commits
mailing list