[arch-commits] Commit in ettercap/repos (12 files)
Andrea Scarpino
andrea at archlinux.org
Tue Sep 6 20:08:47 UTC 2011
Date: Tuesday, September 6, 2011 @ 16:08:46
Author: andrea
Revision: 137221
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ettercap/repos/extra-i686/PKGBUILD
(from rev 137219, ettercap/trunk/PKGBUILD)
ettercap/repos/extra-i686/ettercap-gtk.install
(from rev 137219, ettercap/trunk/ettercap-gtk.install)
ettercap/repos/extra-i686/ettercap.desktop
(from rev 137219, ettercap/trunk/ettercap.desktop)
ettercap/repos/extra-x86_64/PKGBUILD
(from rev 137219, ettercap/trunk/PKGBUILD)
ettercap/repos/extra-x86_64/ettercap-gtk.install
(from rev 137220, ettercap/trunk/ettercap-gtk.install)
ettercap/repos/extra-x86_64/ettercap.desktop
(from rev 137220, ettercap/trunk/ettercap.desktop)
Deleted:
ettercap/repos/extra-i686/01_pointers_and_ints_dont_mix.diff
ettercap/repos/extra-i686/PKGBUILD
ettercap/repos/extra-i686/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
ettercap/repos/extra-x86_64/01_pointers_and_ints_dont_mix.diff
ettercap/repos/extra-x86_64/PKGBUILD
ettercap/repos/extra-x86_64/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
------------------------------------------------------------+
extra-i686/01_pointers_and_ints_dont_mix.diff | 13 -
extra-i686/PKGBUILD | 117 ++++++-----
extra-i686/ettercap-NG-0.7.3_dns_support_on_x86_64.patch | 39 ---
extra-i686/ettercap-gtk.install | 11 +
extra-i686/ettercap.desktop | 9
extra-x86_64/01_pointers_and_ints_dont_mix.diff | 13 -
extra-x86_64/PKGBUILD | 117 ++++++-----
extra-x86_64/ettercap-NG-0.7.3_dns_support_on_x86_64.patch | 39 ---
extra-x86_64/ettercap-gtk.install | 11 +
extra-x86_64/ettercap.desktop | 9
10 files changed, 172 insertions(+), 206 deletions(-)
Deleted: extra-i686/01_pointers_and_ints_dont_mix.diff
===================================================================
--- extra-i686/01_pointers_and_ints_dont_mix.diff 2011-09-06 20:08:17 UTC (rev 137220)
+++ extra-i686/01_pointers_and_ints_dont_mix.diff 2011-09-06 20:08:46 UTC (rev 137221)
@@ -1,13 +0,0 @@
-See debian bug #521857, patch from Timothy Redaelli <timothy at redaelli.eu>
-Revised by Robert Edmonds <edmonds at debian.org>
-
---- a/src/protocols/ec_tcp.c
-+++ b/src/protocols/ec_tcp.c
-@@ -116,7 +116,7 @@
- tcp = (struct tcp_header *)DECODE_DATA;
-
- opt_start = (u_char *)(tcp + 1);
-- opt_end = (u_char *)((int)tcp + tcp->off * 4);
-+ opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4);
-
- DECODED_LEN = (u_int32)(tcp->off * 4);
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-06 20:08:17 UTC (rev 137220)
+++ extra-i686/PKGBUILD 2011-09-06 20:08:46 UTC (rev 137221)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=ettercap
-pkgver=NG_0.7.3
-_origver=NG-0.7.3
-pkgrel=18
-pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
-arch=('i686' 'x86_64')
-url="http://ettercap.sourceforge.net/"
-license=('GPL')
-depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet')
-makedepends=('libnet' 'pkgconfig')
-backup=('etc/etter.conf')
-options=(!libtool)
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.gz"
- 01_pointers_and_ints_dont_mix.diff
- ettercap-NG-0.7.3_dns_support_on_x86_64.patch)
-md5sums=('28fb15cd024162c55249888fe1b97820'
- 'c8f2b004f69ac3522ffebb530478b324'
- 'd44f80292afcefdc13cba9a30c6391d6')
-
-build() {
- cd ${srcdir}/${pkgname}-${_origver}
- unset LDFLAGS
-
- libtoolize --force --copy
- aclocal
- autoconf
-
- patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff
-
- [ "$CARCH" = "x86_64" ] && patch -Np1 -i ${srcdir}/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --datarootdir=/usr/share \
- --enable-plugins \
- --enable-https \
- --disable-gtk
- sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${_origver}
-
- make DESTDIR=${pkgdir} install
-}
Copied: ettercap/repos/extra-i686/PKGBUILD (from rev 137219, ettercap/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-06 20:08:46 UTC (rev 137221)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer:
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgbase=ettercap
+pkgname=('ettercap' 'ettercap-gtk')
+pkgver=NG_0.7.4.1
+_origver=${pkgver/_/-}
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://ettercap.sourceforge.net/"
+license=('GPL')
+depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet'
+ 'pkgconfig' 'gtk2')
+source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz"
+ 'ettercap.desktop')
+md5sums=('c6ae5f86361a85a8e193051f594a74fa'
+ '6fb03d9c890430d3afa84466bb01781b')
+
+build() {
+ cd "${srcdir}"
+
+ cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk
+
+ cd ${pkgbase}-${_origver}
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --datarootdir=/usr/share \
+ --enable-plugins \
+ --enable-https \
+ --disable-gtk
+ make
+
+ cd ../${pkgbase}-${_origver}-gtk
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --datarootdir=/usr/share \
+ --enable-plugins \
+ --enable-https
+ make
+}
+
+package_ettercap() {
+ pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
+ depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet')
+ backup=('etc/etter.conf')
+ options=('!libtool')
+
+ cd "${srcdir}"/${pkgbase}-${_origver}
+ make DESTDIR="${pkgdir}" install
+}
+
+package_ettercap-gtk() {
+ pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
+ depends=('ettercap' 'gtk2' 'gksu')
+ install=ettercap-gtk.install
+
+ cd "${srcdir}"/${pkgbase}-${_origver}-gtk
+ install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk
+ install -Dm644 "${srcdir}"/ettercap.desktop \
+ "${pkgdir}"/usr/share/applications/ettercap.desktop
+ install -Dm644 desktop/ettercap.xpm \
+ "${pkgdir}"/usr/share/pixmaps/ettercap.xpm
+}
Deleted: extra-i686/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
===================================================================
--- extra-i686/ettercap-NG-0.7.3_dns_support_on_x86_64.patch 2011-09-06 20:08:17 UTC (rev 137220)
+++ extra-i686/ettercap-NG-0.7.3_dns_support_on_x86_64.patch 2011-09-06 20:08:46 UTC (rev 137221)
@@ -1,39 +0,0 @@
---- a/configure 2011-08-06 12:50:26.000000000 +0200
-+++ b/configure 2011-08-06 13:01:56.000000000 +0200
-@@ -15732,7 +15732,7 @@
- if ${ac_cv_search_dn_expand+:} false; then :
-
- else
-- ac_cv_search_dn_expand=no
-+ ac_cv_search_dn_expand='-lresolv'
- fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
-@@ -15790,14 +15790,14 @@
- ac_ec_dns=yes
-
- else
-- if false; then
-+ if true; then
- HAVE_DN_EXPAND_TRUE=
- HAVE_DN_EXPAND_FALSE='#'
- else
- HAVE_DN_EXPAND_TRUE='#'
- HAVE_DN_EXPAND_FALSE=
- fi
-- ac_ec_dns=no
-+ ac_ec_dns=yes
- fi
-
-
---- a/src/ec_log.c 2004-09-30 18:01:45.000000000 +0200
-+++ b/src/ec_log.c 2011-08-06 13:04:30.000000000 +0200
-@@ -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, 0666);
- if (fd->fd == -1)
- SEMIFATAL_ERROR("Can't create %s: %s", filename, strerror(errno));
- }
Copied: ettercap/repos/extra-i686/ettercap-gtk.install (from rev 137219, ettercap/trunk/ettercap-gtk.install)
===================================================================
--- extra-i686/ettercap-gtk.install (rev 0)
+++ extra-i686/ettercap-gtk.install 2011-09-06 20:08:46 UTC (rev 137221)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: ettercap/repos/extra-i686/ettercap.desktop (from rev 137219, ettercap/trunk/ettercap.desktop)
===================================================================
--- extra-i686/ettercap.desktop (rev 0)
+++ extra-i686/ettercap.desktop 2011-09-06 20:08:46 UTC (rev 137221)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+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
Deleted: extra-x86_64/01_pointers_and_ints_dont_mix.diff
===================================================================
--- extra-x86_64/01_pointers_and_ints_dont_mix.diff 2011-09-06 20:08:17 UTC (rev 137220)
+++ extra-x86_64/01_pointers_and_ints_dont_mix.diff 2011-09-06 20:08:46 UTC (rev 137221)
@@ -1,13 +0,0 @@
-See debian bug #521857, patch from Timothy Redaelli <timothy at redaelli.eu>
-Revised by Robert Edmonds <edmonds at debian.org>
-
---- a/src/protocols/ec_tcp.c
-+++ b/src/protocols/ec_tcp.c
-@@ -116,7 +116,7 @@
- tcp = (struct tcp_header *)DECODE_DATA;
-
- opt_start = (u_char *)(tcp + 1);
-- opt_end = (u_char *)((int)tcp + tcp->off * 4);
-+ opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4);
-
- DECODED_LEN = (u_int32)(tcp->off * 4);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-06 20:08:17 UTC (rev 137220)
+++ extra-x86_64/PKGBUILD 2011-09-06 20:08:46 UTC (rev 137221)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=ettercap
-pkgver=NG_0.7.3
-_origver=NG-0.7.3
-pkgrel=18
-pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
-arch=('i686' 'x86_64')
-url="http://ettercap.sourceforge.net/"
-license=('GPL')
-depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet')
-makedepends=('libnet' 'pkgconfig')
-backup=('etc/etter.conf')
-options=(!libtool)
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.gz"
- 01_pointers_and_ints_dont_mix.diff
- ettercap-NG-0.7.3_dns_support_on_x86_64.patch)
-md5sums=('28fb15cd024162c55249888fe1b97820'
- 'c8f2b004f69ac3522ffebb530478b324'
- 'd44f80292afcefdc13cba9a30c6391d6')
-
-build() {
- cd ${srcdir}/${pkgname}-${_origver}
- unset LDFLAGS
-
- libtoolize --force --copy
- aclocal
- autoconf
-
- patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff
-
- [ "$CARCH" = "x86_64" ] && patch -Np1 -i ${srcdir}/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --datarootdir=/usr/share \
- --enable-plugins \
- --enable-https \
- --disable-gtk
- sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${_origver}
-
- make DESTDIR=${pkgdir} install
-}
Copied: ettercap/repos/extra-x86_64/PKGBUILD (from rev 137219, ettercap/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-06 20:08:46 UTC (rev 137221)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer:
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgbase=ettercap
+pkgname=('ettercap' 'ettercap-gtk')
+pkgver=NG_0.7.4.1
+_origver=${pkgver/_/-}
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://ettercap.sourceforge.net/"
+license=('GPL')
+depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet'
+ 'pkgconfig' 'gtk2')
+source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz"
+ 'ettercap.desktop')
+md5sums=('c6ae5f86361a85a8e193051f594a74fa'
+ '6fb03d9c890430d3afa84466bb01781b')
+
+build() {
+ cd "${srcdir}"
+
+ cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk
+
+ cd ${pkgbase}-${_origver}
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --datarootdir=/usr/share \
+ --enable-plugins \
+ --enable-https \
+ --disable-gtk
+ make
+
+ cd ../${pkgbase}-${_origver}-gtk
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --datarootdir=/usr/share \
+ --enable-plugins \
+ --enable-https
+ make
+}
+
+package_ettercap() {
+ pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
+ depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet')
+ backup=('etc/etter.conf')
+ options=('!libtool')
+
+ cd "${srcdir}"/${pkgbase}-${_origver}
+ make DESTDIR="${pkgdir}" install
+}
+
+package_ettercap-gtk() {
+ pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
+ depends=('ettercap' 'gtk2' 'gksu')
+ install=ettercap-gtk.install
+
+ cd "${srcdir}"/${pkgbase}-${_origver}-gtk
+ install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk
+ install -Dm644 "${srcdir}"/ettercap.desktop \
+ "${pkgdir}"/usr/share/applications/ettercap.desktop
+ install -Dm644 desktop/ettercap.xpm \
+ "${pkgdir}"/usr/share/pixmaps/ettercap.xpm
+}
Deleted: extra-x86_64/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
===================================================================
--- extra-x86_64/ettercap-NG-0.7.3_dns_support_on_x86_64.patch 2011-09-06 20:08:17 UTC (rev 137220)
+++ extra-x86_64/ettercap-NG-0.7.3_dns_support_on_x86_64.patch 2011-09-06 20:08:46 UTC (rev 137221)
@@ -1,39 +0,0 @@
---- a/configure 2011-08-06 12:50:26.000000000 +0200
-+++ b/configure 2011-08-06 13:01:56.000000000 +0200
-@@ -15732,7 +15732,7 @@
- if ${ac_cv_search_dn_expand+:} false; then :
-
- else
-- ac_cv_search_dn_expand=no
-+ ac_cv_search_dn_expand='-lresolv'
- fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
-@@ -15790,14 +15790,14 @@
- ac_ec_dns=yes
-
- else
-- if false; then
-+ if true; then
- HAVE_DN_EXPAND_TRUE=
- HAVE_DN_EXPAND_FALSE='#'
- else
- HAVE_DN_EXPAND_TRUE='#'
- HAVE_DN_EXPAND_FALSE=
- fi
-- ac_ec_dns=no
-+ ac_ec_dns=yes
- fi
-
-
---- a/src/ec_log.c 2004-09-30 18:01:45.000000000 +0200
-+++ b/src/ec_log.c 2011-08-06 13:04:30.000000000 +0200
-@@ -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, 0666);
- if (fd->fd == -1)
- SEMIFATAL_ERROR("Can't create %s: %s", filename, strerror(errno));
- }
Copied: ettercap/repos/extra-x86_64/ettercap-gtk.install (from rev 137220, ettercap/trunk/ettercap-gtk.install)
===================================================================
--- extra-x86_64/ettercap-gtk.install (rev 0)
+++ extra-x86_64/ettercap-gtk.install 2011-09-06 20:08:46 UTC (rev 137221)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: ettercap/repos/extra-x86_64/ettercap.desktop (from rev 137220, ettercap/trunk/ettercap.desktop)
===================================================================
--- extra-x86_64/ettercap.desktop (rev 0)
+++ extra-x86_64/ettercap.desktop 2011-09-06 20:08:46 UTC (rev 137221)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+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
More information about the arch-commits
mailing list