From b0ab2e2b65d4c8c8cd0e15f31ebdae4d8f92da34 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 19 Oct 2005 22:19:35 +0000 Subject: [PATCH] version bump - bug #109348 Package-Manager: portage-2.0.53_rc3 --- net-analyzer/ethereal/ChangeLog | 8 +- net-analyzer/ethereal/Manifest | 17 ++- net-analyzer/ethereal/ethereal-0.10.13.ebuild | 106 ++++++++++++++++++ .../ethereal/files/digest-ethereal-0.10.13 | 1 + net-analyzer/ethereal/files/fifo.patch | 27 ----- 5 files changed, 128 insertions(+), 31 deletions(-) create mode 100644 net-analyzer/ethereal/ethereal-0.10.13.ebuild create mode 100644 net-analyzer/ethereal/files/digest-ethereal-0.10.13 delete mode 100644 net-analyzer/ethereal/files/fifo.patch diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog index 54b735befedd..e45c3c2738d3 100644 --- a/net-analyzer/ethereal/ChangeLog +++ b/net-analyzer/ethereal/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/ethereal # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.137 2005/09/21 21:21:44 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.138 2005/10/19 22:19:34 dragonheart Exp $ + +*ethereal-0.10.13 (19 Oct 2005) + + 19 Oct 2005; Daniel Black -files/fifo.patch, + +ethereal-0.10.13.ebuild: + version bump - bug #109348 21 Sep 2005; Marcelo Goes ethereal-0.10.12.ebuild: Fix ebuild so that it works without building X. Passing --disable-ethereal diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest index cfb57cf9c70c..a87bf8b6f67f 100644 --- a/net-analyzer/ethereal/Manifest +++ b/net-analyzer/ethereal/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 44bf1d9b4ef98fb95bf12c025d7e082a ChangeLog 11169 MD5 f8df469837b3a964d556a54c89c4dd7e ethereal-0.10.12.ebuild 3472 -MD5 5bce438ee5ecab27c437a1b0be899305 ChangeLog 11005 -MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224 +MD5 bcef154f9993bb8d92c50dfa2c335f83 ethereal-0.10.13.ebuild 3370 MD5 34bd8a0285aea402be479f40304aa947 files/digest-ethereal-0.10.12 70 -MD5 a4d5fb3621ed4e86f311718f1447a870 files/fifo.patch 1138 +MD5 ce9e77144029b2f1104aa92c1927f4e9 files/digest-ethereal-0.10.13 70 MD5 e37a324c1e08bfd08a70fd5958dadeb4 files/ethereal-0.10.12-fix-encrypted-conflict.diff 2838 +MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux) + +iD8DBQFDVsaEmdTrptrqvGERAnYpAJ90lnS2vFqFzoX6cz/X866YB3HpxgCgiYgQ +sx84pp8wO5f3n8YUhQ27OHg= +=i58r +-----END PGP SIGNATURE----- diff --git a/net-analyzer/ethereal/ethereal-0.10.13.ebuild b/net-analyzer/ethereal/ethereal-0.10.13.ebuild new file mode 100644 index 000000000000..3b7d752ff7b0 --- /dev/null +++ b/net-analyzer/ethereal/ethereal-0.10.13.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.13.ebuild,v 1.1 2005/10/19 22:19:35 dragonheart Exp $ + +inherit libtool flag-o-matic eutils + +DESCRIPTION="A commercial-quality network protocol analyzer" +HOMEPAGE="http://www.ethereal.com/" +#SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="adns gtk ipv6 snmp ssl kerberos" + +RDEPEND=">=sys-libs/zlib-1.1.4 + snmp? ( >=net-analyzer/net-snmp-5.1.1 ) + >=dev-util/pkgconfig-0.15.0 + gtk? ( >=dev-libs/glib-2.0.4 + =x11-libs/gtk+-2* + x11-libs/pango + dev-libs/atk ) + !gtk? ( =dev-libs/glib-1.2* ) + ssl? ( >=dev-libs/openssl-0.9.6e ) + virtual/libpcap + >=dev-libs/libpcre-4.2 + adns? ( net-libs/adns ) + kerberos? ( virtual/krb5 )" + +DEPEND="${RDEPEND} + dev-lang/perl + sys-devel/bison + sys-devel/flex + sys-apps/sed" + +src_compile() { + + replace-flags -O? -O + + # Fix gcc-3.4 segfault #49238 + #[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops + + local myconf + + if use gtk; then + einfo "Building with gtk support" + else + einfo "Building without gtk support" + myconf="${myconf} --disable-ethereal" + # the asn1 plugin needs gtk + sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed" + sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed" + fi + + econf \ + $(use_with ssl) \ + $(use_enable ipv6) \ + $(use_with adns) \ + $(use_with kerberos krb5) \ + $(use_with snmp net-snmp) \ + $(use_enable gtk gtk2) \ + --without-ucd-snmp \ + --enable-dftest \ + --enable-randpkt \ + --sysconfdir=/etc/ethereal \ + --enable-editcap \ + --enable-capinfos \ + --enable-text2pcap \ + --enable-dftest \ + --enable-randpkt \ + ${myconf} || die "bad ./configure" + + # fixes an access violation caused by libnetsnmp - see bug 79068 + use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs" + + emake || die "compile problem" +} + +src_install() { + dodir /usr/lib/ethereal/plugins/${PV} + make DESTDIR="${D}" install || die + + dodoc AUTHORS ChangeLog INSTALL.* NEWS README* + + insinto /usr/share/icons/hicolor/16x16/apps + newins "${S}"/image/hi16-app-ethereal.png ethereal.png + insinto /usr/share/icons/hicolor/32x32/apps + newins "${S}"/image/hi32-app-ethereal.png ethereal.png + insinto /usr/share/icons/hicolor/48x48/apps + newins "${S}"/image/hi48-app-ethereal.png ethereal.png + make_desktop_entry ethereal "Ethereal" ethereal +} + +pkg_postinst() { + ewarn "Due to a history of security flaws in this piece of software, it may contain more flaws." + ewarn "To protect yourself against malicious damage due to potential flaws in this product we recommend" + ewarn "you take the following security precautions when running ethereal in an untrusted environment:" + ewarn "do no run any longer than you need to;" + ewarn "use in a root jail - prefereably one that has been hardened with grsec like rootjail protections;" + ewarn "use a hardened operating system;" + ewarn "do not listen to addition interfaces;" + ewarn "if possible, run behind a firewall;" + ewarn "take a capture with tcpdump and analyze the contents offline running ethereal as a the least privileged user;" + ewarn "and subscribe to ethereal's announce list to be notified of newly discovered vulnerabilities." +} diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.13 b/net-analyzer/ethereal/files/digest-ethereal-0.10.13 new file mode 100644 index 000000000000..5048d2238514 --- /dev/null +++ b/net-analyzer/ethereal/files/digest-ethereal-0.10.13 @@ -0,0 +1 @@ +MD5 9998cb4907a70925d33292bae89530d4 ethereal-0.10.13.tar.gz 10213459 diff --git a/net-analyzer/ethereal/files/fifo.patch b/net-analyzer/ethereal/files/fifo.patch deleted file mode 100644 index a7ec4937409c..000000000000 --- a/net-analyzer/ethereal/files/fifo.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- capture_loop.c 2005-07-16 14:44:28.000000000 +0300 -+++ capture_loop.c 2005-07-16 14:31:19.000000000 +0300 -@@ -157,6 +157,7 @@ - gboolean from_cap_pipe; /* TRUE if we are capturing data from a capture pipe */ - #ifndef _WIN32 - struct pcap_hdr cap_pipe_hdr; -+ struct pcaprec_modified_hdr cap_pipe_rechdr; - int cap_pipe_fd; /* the file descriptor of the capture pipe */ - gboolean cap_pipe_modified; /* TRUE if data in the pipe uses modified pcap headers */ - gboolean cap_pipe_byte_swapped; /* TRUE if data in the pipe is byte swapped */ -@@ -889,7 +890,6 @@ - fd_set set1; - struct timeval timeout; - int sel_ret; -- struct pcaprec_modified_hdr rechdr; - guchar pcap_data[WTAP_MAX_PACKET_SIZE]; - #endif - -@@ -916,7 +916,7 @@ - /* - * "select()" says we can read from the pipe without blocking - */ -- inpkts = cap_pipe_dispatch(ld->cap_pipe_fd, ld, &ld->cap_pipe_hdr, &rechdr, pcap_data, -+ inpkts = cap_pipe_dispatch(ld->cap_pipe_fd, ld, &ld->cap_pipe_hdr, &ld->cap_pipe_rechdr, pcap_data, - errmsg, errmsg_len); - if (inpkts < 0) { - ld->go = FALSE; -- 2.26.2