Package: ettercap
Version: 1:0.7.3-2.1
Severity: normal
Tags: patch
Justification: Policy 9.3.2
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch
Hello,
In Ubuntu we applied the following changes:
- Add ettercap.xpm and ettercap.desktop.
- debian/etercap-gtk.dirs: Added 'usr/share/applications' and
'usr/share/pixmaps'.
- debian/patches/01_file_permissions.diff: Specify file permission in
open: the patch exists in the last merged ubuntu package as
02_file_permissions.diff, adding this
and we think you might be interested in applying them too. Attaching the
patch.
diff -pruN 1:0.7.3-2.1/debian/ettercap.desktop 1:0.7.3-2.1ubuntu1/debian/ettercap.desktop
--- 1:0.7.3-2.1/debian/ettercap.desktop 1970-01-01 01:00:00.000000000 +0100
+++ 1:0.7.3-2.1ubuntu1/debian/ettercap.desktop 2010-10-22 17:54:15.000000000 +0100
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=ettercap
+GenericName=Ettercap
+Comment=Multipurpose sniffer/interceptor/logger
+Icon=ettercap.xpm
+Exec=gksu "/usr/sbin/ettercap --gtk"
+Terminal=false
+Categories=Application;Network;System;Security;GTK
diff -pruN 1:0.7.3-2.1/debian/ettercap-gtk.dirs 1:0.7.3-2.1ubuntu1/debian/ettercap-gtk.dirs
--- 1:0.7.3-2.1/debian/ettercap-gtk.dirs 2010-10-22 18:01:07.000000000 +0100
+++ 1:0.7.3-2.1ubuntu1/debian/ettercap-gtk.dirs 2010-10-22 17:54:15.000000000 +0100
@@ -1 +1,3 @@
usr/sbin
+usr/share/applications
+usr/share/pixmaps
diff -pruN 1:0.7.3-2.1/debian/ettercap.xpm 1:0.7.3-2.1ubuntu1/debian/ettercap.xpm
--- 1:0.7.3-2.1/debian/ettercap.xpm 1970-01-01 01:00:00.000000000 +0100
+++ 1:0.7.3-2.1ubuntu1/debian/ettercap.xpm 2010-10-22 17:54:15.000000000 +0100
@@ -0,0 +1,133 @@
+/* XPM */
+static char *e[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 95 2",
+" c black",
+". c #292942",
+"X c #29294A",
+"o c #31314A",
+"O c #39394A",
+"+ c #313152",
+"@ c #31315A",
+"# c #39395A",
+"$ c #21217B",
+"% c #31316B",
+"& c #313173",
+"* c #39397B",
+"= c #42425A",
+"- c #4A4A5A",
+"; c #42426B",
+": c #4A4A63",
+"> c #42427B",
+", c #525263",
+"< c #52526B",
+"1 c #5A5A63",
+"2 c #5A5A6B",
+"3 c #525273",
+"4 c #52527B",
+"5 c #5A5A73",
+"6 c #5A5A7B",
+"7 c #63636B",
+"8 c gray42",
+"9 c #636373",
+"0 c #6B6B73",
+"q c #6B6B7B",
+"w c gray45",
+"e c #73737B",
+"r c #7B7B7B",
+"t c #292984",
+"y c #313184",
+"u c #39398C",
+"i c #42428C",
+"p c #4A4A84",
+"a c #4A4A94",
+"s c #525284",
+"d c #52528C",
+"f c #52529C",
+"g c #5A5A9C",
+"h c #636384",
+"j c #63639C",
+"k c #6B6B94",
+"l c #737384",
+"z c #7B7B84",
+"x c #7B7B8C",
+"c c #73739C",
+"v c #7B7B94",
+"b c #6363A5",
+"n c #6B6BA5",
+"m c #7373AD",
+"M c #7B7BA5",
+"N c #7B7BAD",
+"B c #7B7BB5",
+"V c #848484",
+"C c #84848C",
+"Z c #848494",
+"A c #8C8C94",
+"S c #8C8C9C",
+"D c gray58",
+"F c #94949C",
+"G c #8484B5",
+"H c #8C8CB5",
+"J c #9C9CAD",
+"K c #9494BD",
+"L c #A5A5A5",
+"P c #A5A5BD",
+"I c gray71",
+"U c #9C9CC6",
+"Y c #ADADC6",
+"T c #B5B5CE",
+"R c #BDBDCE",
+"E c #BDBDD6",
+"W c #BDBDDE",
+"Q c #C6C6C6",
+"! c #C6C6CE",
+"~ c #C6C6D6",
+"^ c #CECED6",
+"/ c #CECEDE",
+"( c gray84",
+") c #D6D6DE",
+"_ c gray87",
+"` c #C6C6E7",
+"' c #D6D6E7",
+"] c #DEDEEF",
+"[ c #E7E7E7",
+"{ c #EFEFEF",
+"} c #E7E7F7",
+"| c #EFEFF7",
+" . c gray97",
+".. c #F7F7FF",
+"X. c None",
+/* pixels */
+"X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X. .| { [ { { [ { X.X.X.X.X.X.X.X.",
+"X.X.X.X.X.X.X.X.X.X.X.X.X.X.| { [ } Q 0 9 h 7 r C .X.X.X.X.X.X.",
+"X.X.X.X.X.X.X.X.X.X.X.X.X.{ { _ e c N N N n m n e r | X.X.X.X.X.",
+"X.X.X.X.X.X.X.X.X.X.X.{ [ { x j m m m m m n g f ; 0 T X.X.X.X.X.",
+"X.X.X.X.X.X.X.X.X.X.| { e > a g n m m n n n g f ; 0 C { X.X.X.X.",
+"X.X.X.X.X.X.X.X.X.| { 8 u t y i a @ ; g f g f d o e x / X.X.X.X.",
+"X.X.X.X.X.X.X.X.X.{ Q u y t $ & . o 1 p f g d g . x F E X.X.X.X.",
+"X.X.X.X.X.X.X.X.{ [ h y $ $ y . 2 e 9 < a d f f O 0 W ) X.X.X.X.",
+"X.X.X.X.X.X.X.{ { 7 j n b j @ o x 0 P 3 g b j g ; 9 R ' X.X.X.X.",
+"X.X.X.X.X.X. .[ D g g n n n . x 0 R q g g j g f o e x ' X.X.X.X.",
+"X.X.X.X.X.X.{ ) d f g g f # O 9 J q g g g g g o o x S / X.X.X.X.",
+"X.X.X.X.X.{ { 1 a f f d f o 9 7 2 g g g g f # . x C ` / X.X.X.X.",
+"X.X.X.X.X.| I a f g n b g g g g f f d f f + . x x E ` .X.X.X.X.",
+"X.X.X.X.X.{ 0 a f g g j b g j g g g g d . o z C Y ~ ' X.X.X.X.X.",
+"X.X.X.X.X.{ 7 a a g g j b j j b b # . o - x x Y ~ ' } X.X.X.X.X.",
+"X.X.X.X.X._ 5 f a f g j g X X . o o l x x C E W ' } X.X.X.X.X.X.",
+"X.X.X.X. .^ 3 f g d g b # O x x x x C Z T E ` ' } .X.X.X.X.X.X.",
+"X.X.X.X. .Q 4 a i g n m . e Z J Y T E ` / ' ' | .X.X.X.X.X.X.X.",
+"X.X.X.X.| I s a f j n N o 9 P ~ ' ' ' ' } { .X.X.X.X.X.X.X.X.X.",
+"X.X.X.X.{ L p a d B G K H 9 A ' ' | [ .. .X.X.X.X.X.X.X.X.X.X.X.",
+"X.X.X.X.{ A a f n H U H M , x ' ] [ { { | X.X.X.X.X.X.X.X.X.X.X.",
+"X.X.X.X.{ r m G H n n a a , 9 ! ) ^ 7 l D | X.X.X.X.X.X.X.X.X.X.",
+"X.X.X.X.| r k j f a i i i g 3 , 6 n b h w D | .X.X.X.X.X.X.X.X.",
+"X.X.X.X.X.V 7 g i y t t y i f N n g f # 0 C ' | X.X.X.X.X.X.X.X.",
+"X.X.X.X.X.( 0 * $ a j H K g u u f n N . x Z ' } X.X.X.X.X.X.X.X.",
+"X.X.X.X.X.X.r w y m H K K G m g t % . - x Y / | X.X.X.X.X.X.X.X.",
+"X.X.X.X.X.X.) w 7 H H m b b m o . . 0 x x W ' { X.X.X.X.X.X.X.X.",
+"X.X.X.X.X.X.X.F 0 : = ; X . . o x C x C W ~ } | X.X.X.X.X.X.X.X.",
+"X.X.X.X.X.X.X. .A e 8 - , 9 z x v F W ` / ' | X.X.X.X.X.X.X.X.X.",
+"X.X.X.X.X.X.X.X. .T A C x v C v ` ~ ' ' ] .X.X.X.X.X.X.X.X.X.X.",
+"X.X.X.X.X.X.X.X.X.{ ] / ` ~ ` ~ ' ' ] .| X.X.X.X.X.X.X.X.X.X.X.",
+"X.X.X.X.X.X.X.X.X.X. .} ' ] ] } } { .X.X.X.X.X.X.X.X.X.X.X.X.X."
+};
diff -pruN 1:0.7.3-2.1/debian/patches/02_file_permissions.diff 1:0.7.3-2.1ubuntu1/debian/patches/02_file_permissions.diff
--- 1:0.7.3-2.1/debian/patches/02_file_permissions.diff 1970-01-01 01:00:00.000000000 +0100
+++ 1:0.7.3-2.1ubuntu1/debian/patches/02_file_permissions.diff 2010-10-22 17:54:15.000000000 +0100
@@ -0,0 +1,15 @@
+# Description: specify file permission in open call
+
+Index: ettercap-0.7.3-1.4ubuntu1/src/ec_log.c
+===================================================================
+--- ettercap-0.7.3-1.4ubuntu1.orig/src/ec_log.c 2009-07-10 16:11:16.427060161 -0400
++++ ettercap-0.7.3-1.4ubuntu1/src/ec_log.c 2009-07-10 16:11:42.789785610 -0400
+@@ -190,7 +190,7 @@
+ if (fd->cfd == NULL)
+ SEMIFATAL_ERROR("%s", gzerror(fd->cfd, &zerr));
+ } else {
+- fd->fd = open(filename, O_CREAT | O_TRUNC | O_RDWR | O_BINARY);
++ fd->fd = open(filename, O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0664);
+ if (fd->fd == -1)
+ SEMIFATAL_ERROR("Can't create %s: %s", filename, strerror(errno));
+ }
diff -pruN 1:0.7.3-2.1/debian/patches/series 1:0.7.3-2.1ubuntu1/debian/patches/series
--- 1:0.7.3-2.1/debian/patches/series 2010-10-22 18:01:07.000000000 +0100
+++ 1:0.7.3-2.1ubuntu1/debian/patches/series 2010-10-22 17:54:15.000000000 +0100
@@ -1,3 +1,3 @@
01_pointers_and_ints_dont_mix.diff
02_configure_fix.diff
-
+02_file_permissions.diff
diff -pruN 1:0.7.3-2.1/debian/rules 1:0.7.3-2.1ubuntu1/debian/rules
--- 1:0.7.3-2.1/debian/rules 2010-10-22 18:01:07.000000000 +0100
+++ 1:0.7.3-2.1ubuntu1/debian/rules 2010-10-22 17:54:15.000000000 +0100
@@ -69,6 +69,9 @@ install: build
dh_prep
dh_installdirs
+ cp debian/ettercap.xpm debian/ettercap-gtk/usr/share/pixmaps/
+ cp debian/ettercap.desktop debian/ettercap-gtk/usr/share/applications
+
# Add here commands to install the package into debian/ettercap.
$(MAKE) DATADIR=/etc/ettercap DESTDIR=$(CURDIR)/debian/ettercap-common install
#/usr/bin/install -m 700 ettercap debian/ettercap/usr/sbin/
