From 370a2d6afe2fa835e4f12faef6b7e7802142f2f0 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Thu, 3 Jul 2008 09:51:17 +0000 Subject: Version bump, bug #230411, thank 7v5w7go9ub0o for report. Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-ovz005 i686 --- net-analyzer/wireshark/ChangeLog | 9 +- net-analyzer/wireshark/Manifest | 7 +- .../files/wireshark-0.99.8-libpcap-compile.patch | 34 ----- net-analyzer/wireshark/wireshark-0.99.8.ebuild | 163 -------------------- net-analyzer/wireshark/wireshark-1.0.1.ebuild | 167 +++++++++++++++++++++ 5 files changed, 178 insertions(+), 202 deletions(-) delete mode 100644 net-analyzer/wireshark/files/wireshark-0.99.8-libpcap-compile.patch delete mode 100644 net-analyzer/wireshark/wireshark-0.99.8.ebuild create mode 100644 net-analyzer/wireshark/wireshark-1.0.1.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index 7ca008a81a2e..57b81b881fd8 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.100 2008/04/10 05:54:31 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.101 2008/07/03 09:51:16 pva Exp $ + +*wireshark-1.0.1 (03 Jul 2008) + + 03 Jul 2008; Peter Volkov + -files/wireshark-0.99.8-libpcap-compile.patch, -wireshark-0.99.8.ebuild, + +wireshark-1.0.1.ebuild: + Version bump, bug #230411, thank 7v5w7go9ub0o for report. 10 Apr 2008; Peter Volkov wireshark-1.0.0.ebuild: cap_kill is not required in wireshark-1.0.0, bug #217061, thank Justin diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 61e177864ec9..f2a7028fe096 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,10 +1,9 @@ AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478 AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9 -AUX wireshark-0.99.8-libpcap-compile.patch 892 RMD160 29548906e6ffe619c45deee1378953c63fa57a06 SHA1 f892354fc96f5bd009e8123ab14ac3d338029d8b SHA256 9e19ee7518dd3e1dcd9dbf37485590a7b42de727da301472decc15125241bb2f AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369 -DIST wireshark-0.99.8.tar.bz2 13243168 RMD160 3d7a4fdd9e2c9b9abaa0c9fe0c3e76fa86ec9aea SHA1 a33c7fd8d73bcbf843d3e3a96fd44489212c51e5 SHA256 ee9d2e7a75bc1ed80ef5faf9debca51ac238996a544f60314b7028f2f3140c22 DIST wireshark-1.0.0.tar.bz2 13413951 RMD160 12016f80d30954bdc89163958e7d007543b3327e SHA1 4f53f526359a072665812deca980999bd26e6ab0 SHA256 b54713e146a7277cf05f309d3c706884b0e0ef5a7794e48a4251c4e17acd9fd0 -EBUILD wireshark-0.99.8.ebuild 4757 RMD160 002d57f5a347e72f97d432cf4344785050aee11a SHA1 b9b45f7a7d95367974bf7d2fcb3a344686c4b40e SHA256 3fa8c2a19e0b52fc131f9c99944e54d6cb04f82f312b63cab241fd3278f4ecf3 +DIST wireshark-1.0.1.tar.bz2 13087502 RMD160 2e53cfda4cd7b831c19463ebfa88c74cb625b1a1 SHA1 828efc186bc7eb4872628952598cd38389d8d5b0 SHA256 6a0419bc7e5c0f0a5610007a050a50b0fd796a2c99efbf0bdf0608e19e23bb87 EBUILD wireshark-1.0.0.ebuild 4916 RMD160 04fff36a3a4f0e5ecd093406c2dde1bedcfd49a2 SHA1 aaacde6cb8dcd1ad90cc6f529e997178703fb011 SHA256 bc7a1b43d38e12db18c0623f74720e37e26a475fa2ac6ba63e74ae8dc5e64616 -MISC ChangeLog 16090 RMD160 38d9245df0660745560fd99f1227197f9a04b280 SHA1 4178efd1817491668c10a733a7742a04110ee51b SHA256 7cf620578a5439387a7ddaa3419d382b37e7a340a0301f2f3e3d0d472e16d41f +EBUILD wireshark-1.0.1.ebuild 4986 RMD160 eaee321c14650c5e6e4d35ddca3c4d6cf7edcbc1 SHA1 5222b1c290440e47b5ec5e476baf132c1cfc8c2b SHA256 41de79be3bccaaa71f1bb95e7e10bc93234024efa0749414305154989150e113 +MISC ChangeLog 16330 RMD160 3a573c395f3c91f6b28054ef9aef10b9d02cdb06 SHA1 6c9e70815076fccd245a5fa1be7d74ef21f04e73 SHA256 7553f23c317a2d6306b4e32ff3c0b297888aa663c2a323f85a0656315073c19d MISC metadata.xml 1730 RMD160 0c29f85b78106162ac35419f8bc01d1539c3eb6d SHA1 93881ba93a2f1fb8b153887ce7e6a022ce95085f SHA256 d722982a52a578876257954779aa8e14dbf4c0eff0dba0e4b82db551f4a964bd diff --git a/net-analyzer/wireshark/files/wireshark-0.99.8-libpcap-compile.patch b/net-analyzer/wireshark/files/wireshark-0.99.8-libpcap-compile.patch deleted file mode 100644 index 287b36f040e7..000000000000 --- a/net-analyzer/wireshark/files/wireshark-0.99.8-libpcap-compile.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: gtk/packet_list.c -=================================================================== ---- gtk/packet_list.c (revision 24415) -+++ gtk/packet_list.c (revision 24416) -@@ -790,11 +790,11 @@ - if (adj->value >= adj->upper - adj->page_size) { - at_end = TRUE; - } -- -+#ifdef HAVE_LIBPCAP - if (adj->value > 0 && at_end != last_at_end && at_end != auto_scroll_live) { - menu_auto_scroll_live_changed(at_end); - } -- -+#endif - last_at_end = at_end; - return at_end; - } -Index: gtk/main.c -=================================================================== ---- gtk/main.c (revision 24415) -+++ gtk/main.c (revision 24416) -@@ -3048,9 +3048,10 @@ - packet_list_set_column_titles(); - - menu_recent_read_finished(); -+#ifdef HAVE_LIBPCAP - menu_auto_scroll_live_changed(auto_scroll_live); -+#endif - -- - switch (user_font_apply()) { - case FA_SUCCESS: - break; diff --git a/net-analyzer/wireshark/wireshark-0.99.8.ebuild b/net-analyzer/wireshark/wireshark-0.99.8.ebuild deleted file mode 100644 index f01b0515ed0d..000000000000 --- a/net-analyzer/wireshark/wireshark-0.99.8.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.8.ebuild,v 1.10 2008/03/19 11:44:57 corsair Exp $ - -EAPI=1 -WANT_AUTOMAKE="1.9" -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/all-versions/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="adns gtk ipv6 lua portaudio gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux" - -RDEPEND="zlib? ( sys-libs/zlib ) - smi? ( net-libs/libsmi ) - gtk? ( >=dev-libs/glib-2.0.4 - =x11-libs/gtk+-2* - x11-libs/pango - dev-libs/atk ) - !gtk? ( =dev-libs/glib-1.2* ) - gnutls? ( net-libs/gnutls ) - gcrypt? ( dev-libs/libgcrypt ) - pcap? ( net-libs/libpcap ) - pcre? ( dev-libs/libpcre ) - caps? ( sys-libs/libcap ) - adns? ( net-libs/adns ) - kerberos? ( virtual/krb5 ) - portaudio? ( media-libs/portaudio ) - 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 - sys-apps/sed" - -pkg_setup() { - if ! use gtk; then - ewarn "USE=-gtk will mean 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 || die "Failed to create wireshark group" -} - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch - epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch - epatch "${FILESDIR}"/${P}-libpcap-compile.patch - - cd "${S}"/epan - epatch "${FILESDIR}"/wireshark-except-double-free.diff - - cd "${S}" - AT_M4DIR="${S}/aclocal-fallback" - eautoreconf -} - -src_compile() { - # 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 - - # see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001 - # our hardened toolchain bug - filter-flags -fstack-protector - - local myconf - if use gtk; then - einfo "Building with gtk support" - else - einfo "Building without gtk support" - myconf="${myconf} --disable-wireshark" - fi - - # 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 gtk2) \ - $(use_enable profile profile-build) \ - $(use_with gnutls) \ - $(use_with gcrypt) \ - $(use_enable gtk wireshark) \ - $(use_enable ipv6) \ - $(use_enable threads) \ - $(use_with lua) \ - $(use_with adns) \ - $(use_with kerberos krb5) \ - $(use_with smi libsmi) \ - $(use_with pcap) \ - $(use_with zlib) \ - $(use_with pcre) \ - $(use_with portaudio) \ - $(use_with caps libcap) \ - $(use_enable pcap setuid-install) \ - --sysconfdir=/etc/wireshark \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - fowners 0:wireshark /usr/bin/tshark - fperms 6550 /usr/bin/tshark - use pcap && fowners 0:wireshark /usr/bin/dumpcap - use pcap && fperms 6550 /usr/bin/dumpcap - - insinto /usr/include/wiretap - doins wiretap/wtap.h - - dodoc AUTHORS ChangeLog NEWS README* - - if use gtk ; then - insinto /usr/share/icons/hicolor/16x16/apps - newins image/hi16-app-wireshark.png wireshark.png - insinto /usr/share/icons/hicolor/32x32/apps - newins image/hi32-app-wireshark.png wireshark.png - insinto /usr/share/icons/hicolor/48x48/apps - newins image/hi48-app-wireshark.png wireshark.png - insinto /usr/share/applications - doins wireshark.desktop - fi -} - -pkg_postinst() { - echo - ewarn "With version 0.99.7, all function calls that require elevated privileges" - ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE" - ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT." - ewarn - 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.0.1.ebuild b/net-analyzer/wireshark/wireshark-1.0.1.ebuild new file mode 100644 index 000000000000..2219af47ade7 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-1.0.1.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.1.ebuild,v 1.1 2008/07/03 09:51:16 pva Exp $ + +EAPI=1 +WANT_AUTOMAKE="1.9" +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/all-versions/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="adns gtk ipv6 lua portaudio gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux" + +RDEPEND="zlib? ( sys-libs/zlib ) + smi? ( net-libs/libsmi ) + gtk? ( >=dev-libs/glib-2.0.4 + =x11-libs/gtk+-2* + x11-libs/pango + dev-libs/atk ) + !gtk? ( =dev-libs/glib-1.2* ) + gnutls? ( net-libs/gnutls ) + gcrypt? ( dev-libs/libgcrypt ) + pcap? ( net-libs/libpcap ) + pcre? ( dev-libs/libpcre ) + caps? ( sys-libs/libcap ) + adns? ( net-libs/adns ) + kerberos? ( virtual/krb5 ) + portaudio? ( media-libs/portaudio ) + 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 + sys-apps/sed" + +pkg_setup() { + if ! use gtk; then + ewarn "USE=-gtk will mean 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 || die "Failed to create wireshark group" +} + +src_unpack() { + unpack ${A} + + # Try to drop --as-needed patches for 1.0.1. All problems are supposed to be + # fixed there... + cd "${S}" + epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch + epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch + + cd "${S}"/epan + epatch "${FILESDIR}"/wireshark-except-double-free.diff + + cd "${S}" + eautoreconf +} + +src_compile() { + # 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 + + # 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 + + local myconf + if use gtk; then + einfo "Building with gtk support" + else + einfo "Building without gtk support" + myconf="${myconf} --disable-wireshark" + fi + + # 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 gtk2) \ + $(use_enable profile profile-build) \ + $(use_with gnutls) \ + $(use_with gcrypt) \ + $(use_enable gtk wireshark) \ + $(use_enable ipv6) \ + $(use_enable threads) \ + $(use_with lua) \ + $(use_with adns) \ + $(use_with kerberos krb5) \ + $(use_with smi libsmi) \ + $(use_with pcap) \ + $(use_with zlib) \ + $(use_with pcre) \ + $(use_with portaudio) \ + $(use_with caps libcap) \ + $(use_enable pcap setuid-install) \ + --sysconfdir=/etc/wireshark \ + ${myconf} || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + fowners 0:wireshark /usr/bin/tshark + fperms 6550 /usr/bin/tshark + 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 + insinto /usr/share/icons/hicolor/16x16/apps + newins image/hi16-app-wireshark.png wireshark.png + insinto /usr/share/icons/hicolor/32x32/apps + newins image/hi32-app-wireshark.png wireshark.png + insinto /usr/share/icons/hicolor/48x48/apps + newins image/hi48-app-wireshark.png wireshark.png + insinto /usr/share/applications + doins wireshark.desktop + fi +} + +pkg_postinst() { + echo + ewarn "With version 0.99.7, all function calls that require elevated privileges" + ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE" + ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT." + ewarn + 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