From 018e0ae682949293d4cc7c42f6455d8bdc977a71 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Wed, 17 Jun 2009 06:34:46 +0000 Subject: Version bump. Dropped unused patches. (Portage version: 2.2_rc33/cvs/Linux i686) --- net-analyzer/wireshark/ChangeLog | 10 +- .../files/wireshark-1.1.2-misc-warnings.patch | 24 ---- .../files/wireshark-1.1.3-misc-warnings.patch | 15 -- net-analyzer/wireshark/wireshark-1.2.0.ebuild | 152 +++++++++++++++++++++ net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild | 152 --------------------- 5 files changed, 161 insertions(+), 192 deletions(-) delete mode 100644 net-analyzer/wireshark/files/wireshark-1.1.2-misc-warnings.patch delete mode 100644 net-analyzer/wireshark/files/wireshark-1.1.3-misc-warnings.patch create mode 100644 net-analyzer/wireshark/wireshark-1.2.0.ebuild delete mode 100644 net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index 392036dd820f..ab62065df37a 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.173 2009/05/29 11:53:15 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.174 2009/06/17 06:34:46 pva Exp $ + +*wireshark-1.2.0 (17 Jun 2009) + + 17 Jun 2009; Peter Volkov + -files/wireshark-1.1.2-misc-warnings.patch, + -files/wireshark-1.1.3-misc-warnings.patch, -wireshark-1.2.0_rc1.ebuild, + +wireshark-1.2.0.ebuild: + Version bump. Dropped unused patches. *wireshark-1.2.0_rc1 (29 May 2009) diff --git a/net-analyzer/wireshark/files/wireshark-1.1.2-misc-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.1.2-misc-warnings.patch deleted file mode 100644 index 2da9a5224ea4..000000000000 --- a/net-analyzer/wireshark/files/wireshark-1.1.2-misc-warnings.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3314 - -=== modified file 'epan/dissectors/packet-sflow.c' ---- epan/dissectors/packet-sflow.c 2009-03-08 10:18:22 +0000 -+++ epan/dissectors/packet-sflow.c 2009-03-08 10:22:32 +0000 -@@ -563,13 +563,13 @@ - { - guint32 header_proto, frame_length; - volatile guint32 header_length; -- tvbuff_t *next_tvb; -- proto_tree *sflow_header_tree; -+ tvbuff_t *volatile next_tvb; -+ proto_tree *volatile sflow_header_tree; - proto_item *ti; - /* stuff for saving column state before calling other dissectors. - * Thanks to Guy Harris for the tip. */ -- gboolean save_writable; -- gboolean save_in_error_pkt; -+ volatile gboolean save_writable; -+ volatile gboolean save_in_error_pkt; - volatile address save_dl_src; - volatile address save_dl_dst; - volatile address save_net_src; - diff --git a/net-analyzer/wireshark/files/wireshark-1.1.3-misc-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.1.3-misc-warnings.patch deleted file mode 100644 index ba948803b1c8..000000000000 --- a/net-analyzer/wireshark/files/wireshark-1.1.3-misc-warnings.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3353 - -=== modified file 'epan/dissectors/packet-mp2t.c' ---- epan/dissectors/packet-mp2t.c 2009-03-24 06:47:10 +0000 -+++ epan/dissectors/packet-mp2t.c 2009-03-24 06:58:38 +0000 -@@ -448,7 +448,7 @@ - guint32 header; - guint afc; - gint start_offset = offset; -- gint payload_len; -+ volatile gint payload_len; - - guint32 pid; - guint32 cc; - diff --git a/net-analyzer/wireshark/wireshark-1.2.0.ebuild b/net-analyzer/wireshark/wireshark-1.2.0.ebuild new file mode 100644 index 000000000000..56494d536c14 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-1.2.0.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.0.ebuild,v 1.1 2009/06/17 06:34:46 pva Exp $ + +EAPI=2 +inherit autotools libtool flag-o-matic eutils toolchain-funcs + +DESCRIPTION="A network protocol analyzer formerly known as ethereal" +HOMEPAGE="http://www.wireshark.org/" + +# _rc versions has different download location. +[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && { +SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz"; +S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \ +SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="adns ares +gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux" + +RDEPEND=">=dev-libs/glib-2.4.0:2 + zlib? ( sys-libs/zlib ) + smi? ( net-libs/libsmi ) + gtk? ( >=x11-libs/gtk+-2.4.0:2 + x11-libs/pango + dev-libs/atk ) + gnutls? ( net-libs/gnutls ) + gcrypt? ( dev-libs/libgcrypt ) + pcap? ( net-libs/libpcap ) + pcre? ( dev-libs/libpcre ) + caps? ( sys-libs/libcap ) + kerberos? ( virtual/krb5 ) + portaudio? ( media-libs/portaudio ) + ares? ( >=net-dns/c-ares-1.5 ) + !ares? ( adns? ( net-libs/adns ) ) + geoip? ( dev-libs/geoip ) + lua? ( >=dev-lang/lua-5.1 ) + selinux? ( sec-policy/selinux-wireshark )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.15.0 + dev-lang/perl + sys-devel/bison + sys-devel/flex" + +pkg_setup() { + if ! use gtk; then + ewarn "USE=-gtk will means no gui called wireshark will be created and" + ewarn "only command line utils are available" + fi + + # Add group for users allowed to sniff. + enewgroup wireshark +} + +src_prepare() { + cd "${S}"/epan # our hardened toolchain bug... + epatch "${FILESDIR}/wireshark-except-double-free.diff" + + cd "${S}" + epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch" + eautoreconf +} + +src_configure() { + local myconf + + # optimization bug, see bug #165340, bug #40660 + if [[ $(gcc-version) == 3.4 ]] ; then + elog "Found gcc 3.4, forcing -O3 into CFLAGS" + replace-flags -O? -O3 + elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then + elog "Found <=gcc-3.3, forcing -O into CFLAGS" + replace-flags -O? -O + fi + + if use ares && use adns; then + einfo "You asked for both, ares and adns, but we can use only one of them." + einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)." + myconf="$(use_with ares c-ares) --without-adns" + else + myconf="$(use_with adns) $(use_with ares c-ares)" + fi + + # see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001 + # our hardened toolchain bug + filter-flags -fstack-protector + + # profile and -fomit-frame-pointer are incompatible, bug #215806 + use profile && filter-flags -fomit-frame-pointer + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos; then + case `krb5-config --libs` in + *-lcrypto*) myconf="${myconf} --with-ssl" ;; + esac + fi + + # dumpcap requires libcap, setuid-install requires dumpcap + econf $(use_enable gtk wireshark) \ + $(use_enable profile profile-build) \ + $(use_with gnutls) \ + $(use_with gcrypt) \ + $(use_enable ipv6) \ + $(use_enable threads) \ + $(use_with lua) \ + $(use_with kerberos krb5) \ + $(use_with smi libsmi) \ + $(use_with pcap) \ + $(use_with zlib) \ + $(use_with pcre) \ + $(use_with geoip) \ + $(use_with portaudio) \ + $(use_with caps libcap) \ + $(use_enable pcap setuid-install) \ + --sysconfdir=/etc/wireshark \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + use pcap && fowners 0:wireshark /usr/bin/dumpcap + use pcap && fperms 6550 /usr/bin/dumpcap + + insinto /usr/include/wiretap + doins wiretap/wtap.h + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt + + if use gtk; then + for c in hi lo; do + for d in 16 32 48; do + insinto /usr/share/icons/${c}color/${d}x${d}/apps + newins image/${c}${d}-app-wireshark.png wireshark.png + done + done + insinto /usr/share/applications + doins wireshark.desktop + fi +} + +pkg_postinst() { + echo + ewarn "NOTE: To run wireshark as normal user you have to add yourself into" + ewarn "wireshark group. This security measure ensures that only trusted" + ewarn "users allowed to sniff your traffic." + echo +} diff --git a/net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild deleted file mode 100644 index 6b0ff84a494c..000000000000 --- a/net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.0_rc1.ebuild,v 1.1 2009/05/29 11:53:15 pva Exp $ - -EAPI=2 -inherit autotools libtool flag-o-matic eutils toolchain-funcs - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="http://www.wireshark.org/" - -# _rc versions has different download location. -[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && { -SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz"; -S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \ -SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="adns ares +gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux" - -RDEPEND=">=dev-libs/glib-2.4.0:2 - zlib? ( sys-libs/zlib ) - smi? ( net-libs/libsmi ) - gtk? ( >=x11-libs/gtk+-2.4.0:2 - x11-libs/pango - dev-libs/atk ) - gnutls? ( net-libs/gnutls ) - gcrypt? ( dev-libs/libgcrypt ) - pcap? ( net-libs/libpcap ) - pcre? ( dev-libs/libpcre ) - caps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - portaudio? ( media-libs/portaudio ) - ares? ( >=net-dns/c-ares-1.5 ) - !ares? ( adns? ( net-libs/adns ) ) - geoip? ( dev-libs/geoip ) - lua? ( >=dev-lang/lua-5.1 ) - selinux? ( sec-policy/selinux-wireshark )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.15.0 - dev-lang/perl - sys-devel/bison - sys-devel/flex" - -pkg_setup() { - if ! use gtk; then - ewarn "USE=-gtk will means no gui called wireshark will be created and" - ewarn "only command line utils are available" - fi - - # Add group for users allowed to sniff. - enewgroup wireshark -} - -src_prepare() { - cd "${S}"/epan # our hardened toolchain bug... - epatch "${FILESDIR}/wireshark-except-double-free.diff" - - cd "${S}" - epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch" - eautoreconf -} - -src_configure() { - local myconf - - # optimization bug, see bug #165340, bug #40660 - if [[ $(gcc-version) == 3.4 ]] ; then - elog "Found gcc 3.4, forcing -O3 into CFLAGS" - replace-flags -O? -O3 - elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then - elog "Found <=gcc-3.3, forcing -O into CFLAGS" - replace-flags -O? -O - fi - - if use ares && use adns; then - einfo "You asked for both, ares and adns, but we can use only one of them." - einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)." - myconf="$(use_with ares c-ares) --without-adns" - else - myconf="$(use_with adns) $(use_with ares c-ares)" - fi - - # see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001 - # our hardened toolchain bug - filter-flags -fstack-protector - - # profile and -fomit-frame-pointer are incompatible, bug #215806 - use profile && filter-flags -fomit-frame-pointer - - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos; then - case `krb5-config --libs` in - *-lcrypto*) myconf="${myconf} --with-ssl" ;; - esac - fi - - # dumpcap requires libcap, setuid-install requires dumpcap - econf $(use_enable gtk wireshark) \ - $(use_enable profile profile-build) \ - $(use_with gnutls) \ - $(use_with gcrypt) \ - $(use_enable ipv6) \ - $(use_enable threads) \ - $(use_with lua) \ - $(use_with kerberos krb5) \ - $(use_with smi libsmi) \ - $(use_with pcap) \ - $(use_with zlib) \ - $(use_with pcre) \ - $(use_with geoip) \ - $(use_with portaudio) \ - $(use_with caps libcap) \ - $(use_enable pcap setuid-install) \ - --sysconfdir=/etc/wireshark \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - use pcap && fowners 0:wireshark /usr/bin/dumpcap - use pcap && fperms 6550 /usr/bin/dumpcap - - insinto /usr/include/wiretap - doins wiretap/wtap.h - - # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt - - if use gtk; then - for c in hi lo; do - for d in 16 32 48; do - insinto /usr/share/icons/${c}color/${d}x${d}/apps - newins image/${c}${d}-app-wireshark.png wireshark.png - done - done - insinto /usr/share/applications - doins wireshark.desktop - fi -} - -pkg_postinst() { - echo - ewarn "NOTE: To run wireshark as normal user you have to add yourself into" - ewarn "wireshark group. This security measure ensures that only trusted" - ewarn "users allowed to sniff your traffic." - echo -} -- cgit v1.2.3-65-gdbad