[ettercap/el5] 0.7.3, security fix only.
Jon Ciesla
limb at fedoraproject.org
Fri Jan 27 17:57:14 UTC 2012
commit e02d87ac11bfe2fe587f161748f36f6ba46ca08c
Author: Jon Ciesla <limburgher at gmail.com>
Date: Fri Jan 27 11:57:04 2012 -0600
0.7.3, security fix only.
.gitignore | 1 +
ettercap.spec | 181 +++++----------------------------------------------------
sources | 2 +-
3 files changed, 16 insertions(+), 168 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..89108be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/ettercap-NG-0.7.3.tar.gz
diff --git a/ettercap.spec b/ettercap.spec
index a3ea7b3..0cf306e 100644
--- a/ettercap.spec
+++ b/ettercap.spec
@@ -1,40 +1,22 @@
Name: ettercap
-Version: 0.7.4
-Release: 2%{?dist}
+Version: 0.7.3
+Release: 20%{?dist}
Summary: Network traffic sniffer/analyser, NCURSES interface version
Group: Applications/Internet
-License: GPLv2+
+License: GPL
URL: http://ettercap.sourceforge.net
-Source0: http://downloads.sourceforge.net/ettercap/ettercap-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/ettercap/ettercap-NG-%{version}.tar.gz
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
-
+Patch1: ettercap-0.7.4-CVE-2010-3843.patch
BuildRoot: %{_tmppath}/%{name}-NG-%{version}-%{release}-root%(%{__id_u} -n)
BuildRequires: desktop-file-utils
-BuildRequires: ImageMagick
BuildRequires: gtk2-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
-BuildRequires: autoconf
-BuildRequires: libtool
-#BuildRequires: byacc
-BuildRequires: bison
-BuildRequires: flex
#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}
@@ -58,9 +40,6 @@ BuildRequires: libpcap-devel
BuildRequires: libnet-devel
BuildRequires: libtool-ltdl-devel
%endif
-%if "0%{?dist}" =="0.el6"
-BuildRequires: libnet-devel
-%endif
Requires: ettercap-common = %{version}-%{release}
Requires(post): %{_sbindir}/alternatives
Requires(preun): %{_sbindir}/alternatives
@@ -108,29 +87,18 @@ analysis.
This package contains the GTK version.
%prep
-%setup -q -n ettercap
+%setup -q -n ettercap-NG-%{version}
%patch0 -p1
-#%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-#%patch6 -p0
-#%patch7 -p0
-%patch8 -p1 -b .license
-%patch9 -p0
+%patch1 -p0
%build
-autoconf
%configure --enable-gtk
-#make %{?_smp_mflags}
-make
+make %{?_smp_mflags}
cp src/ettercap src/ettercap-gtk
make clean
%configure --disable-gtk
-#make %{?_smp_mflags} Broken as of 0.7.4
-make
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
@@ -142,7 +110,6 @@ mv %{buildroot}%{_bindir}/ettercap %{buildroot}%{_bindir}/ettercap-tui
rm -f %{buildroot}%{_libdir}/ettercap/*.la
mkdir -p %{buildroot}%{_docdir}
install -c -m 644 %{SOURCE2} %{buildroot}%{_docdir}
-install -c -m 644 %{SOURCE3} %{buildroot}%{_docdir}
touch %{buildroot}%{_bindir}/ettercap
mkdir -p %{buildroot}%{_datadir}/applications
@@ -151,11 +118,8 @@ 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 \
@@ -202,17 +166,16 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%doc LICENSE AUTHORS CHANGELOG THANKS TODO* README doc/
%{_docdir}/ettercap-README.fedora
-%{_docdir}/ettercap_easter_egg_license.txt
%config(noreplace) %{_sysconfdir}/etter.conf
%{_bindir}/etterfilter
%{_bindir}/etterlog
%{_datadir}/ettercap
-%{_libdir}/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
+#%{_mandir}/man8/ettercap_plugins.8.gz
%files gtk
%defattr(-,root,root,-)
@@ -221,100 +184,24 @@ rm -rf %{buildroot}
%{_datadir}/icons/hicolor/32x32/apps/ettercap.png
%changelog
-* Thu Jan 26 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.4-2
-- Patch for CVE-2010-3843.
-
-* Thu Jan 26 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.4-1
-- New upstream. Now BRs bison, flex.
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-40
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.7.3-39
-- Rebuild for new libpng
-
-* Wed Feb 09 2011 Tom Callaway <spot at fedoraproject.org> - 0.7.3-38
-- fix licensing issue with easter egg and include documentation of permission
- from upstream
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-37
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Oct 26 2010 Jon Ciesla <limb at jcomserv.net> - 0.7.3-36
-- Patch to support passive DNS, BZ 646162.
-
-* Fri Apr 23 2010 Jon Ciesla <limb at jcomserv.net> - 0.7.3-35
-- Patch for 64bit crash by Timothy Redaelli, BZ 550237.
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-34
-- rebuilt with new openssl
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Mar 31 2009 Jon Ciesla <limb at jcomserv.net> - 0.7.3-32
-- Patch for selinux/fctnl issue, BZ 491612.
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 04 2009 Jon Ciesla <limb at jcomserv.net> - 0.7.3-30
-- Correction to -29.
-
-* Wed Feb 04 2009 Jon Ciesla <limb at jcomserv.net> - 0.7.3-29
-- Use more reasonably sized icon, BZ484030.
-
-* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-28
-- rebuild with new openssl
-
-* Thu Dec 04 2008 Caolán McNamara <caolanm at redhat.com> - 0.7.3-27
-- rebuild for dependencies
-
-* Mon Jun 16 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.3-26
-- Fix for mitm CPU util bug.
-
-* Thu Jun 12 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.3-25
-- Corrected -24 patch.
-
-* Thu Jun 12 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.3-24
-- Patch to fix daemon mode mitm behaviour BZ 450923.
-
-* Tue Jun 10 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.3-23
-- Patch to fix ui in daemon mode BZ 450029.
-
-* Fri Feb 08 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.3-22
-- GCC 4.3 rebuild.
-
-* Wed Dec 05 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-21
-- Rebuild due to openssl soname bump.
-- Fixed desktop icon path.
-
-* Thu Aug 16 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-20
-- License tag correction.
-- Fixed open() in ec_log.c
-
+* Fri Jan 27 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.3-20
+- Fix for CVE-2010-3843.
* Wed Mar 28 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-19
- /usr/bin/ettercap ownership fix.
-
* Tue Mar 27 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-18
- Obsoletes fix.
-
* Mon Mar 26 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-17
- Provides/obsoletes fixes.
-
* 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.
- 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.
@@ -323,71 +210,31 @@ rm -rf %{buildroot}
* 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.
diff --git a/sources b/sources
index 2fb973a..e5cd986 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6846d76af94c0c1c1eb107d1913cc768 ettercap-0.7.4.tar.gz
+28fb15cd024162c55249888fe1b97820 ettercap-NG-0.7.3.tar.gz
More information about the scm-commits
mailing list