Version bump, fixes security issue #271062.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 173 insertions, 2 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index b8928f95c03c..4b0527ad2e30 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # 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.166 2009/05/04 16:24:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.167 2009/05/24 14:17:33 pva Exp $
+
+*wireshark-1.0.8 (24 May 2009)
+
+  24 May 2009; Peter Volkov <pva@gentoo.org> +wireshark-1.0.8.ebuild:
+  Version bump, fixes security issue #271062.
 
   04 May 2009; Peter Volkov <pva@gentoo.org> -wireshark-1.0.6-r1.ebuild,
   wireshark-1.0.7, wireshark-1.1.3:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 56e6f54c7744..d327be4fd798 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,8 +7,10 @@ AUX wireshark-1.1.2-misc-warnings.patch 823 RMD160 20a13891425581b1799c38d946128
 AUX wireshark-1.1.3-misc-warnings.patch 390 RMD160 a3128e2d7a34478999611e6b30d38732e95ffdc8 SHA1 c539da3e579e67eeb2721251efa26412d1d4d091 SHA256 c97cb7ab34552ceb077bb77c1772a7931201728c984ab60d2f1488ef87fb90fe
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.0.7.tar.bz2 13289668 RMD160 cd52704cde4afe57cccb09733c7f0ddfef2363e9 SHA1 ac7253ed010ffe8075de21fde362bb162b59f279 SHA256 dc6d7ce1d9fd576fc75f79c2e541786f33706c03996ab93e5c0056b74bca0021
+DIST wireshark-1.0.8.tar.bz2 13347689 RMD160 a702e78da673435361344ffda13c753386aee1a4 SHA1 cfd4ac05eb9c0d13236003deaeabfffc21f7c9e9 SHA256 c07b7ec145c77be6ca7d011e4340ee283d021052c44958da18e87d55e896f894
 DIST wireshark-1.1.3.tar.gz 18464158 RMD160 9964a6c45569335677b37a4c70637cb3fa93e91e SHA1 38653f4412a948d967eddad33dbba3751290a30a SHA256 410f19fbe262a49174f582934617adb3dfc82a25875780ba929e82d8087a5648
 EBUILD wireshark-1.0.7.ebuild 4899 RMD160 88ab930995e3b4f4137a4bcb56f54aabd55d257d SHA1 90cbd620caae933683f28dedacb124b7b11b9b5b SHA256 5836fa8133ce4014c883bacc99a31d69063bff3a0664cc8487bdd5dbc32a46d8
+EBUILD wireshark-1.0.8.ebuild 4907 RMD160 0dc881b9530827e04a9f0090a0e0a1ff279c8eba SHA1 4262fddaf1c365b0ff0a516378771dd6bdc3ca55 SHA256 066c05e3af49dd215c87432a7d3f5cfa1cb4dc89fc3df2b0d89155df6481cf81
 EBUILD wireshark-1.1.3.ebuild 4765 RMD160 755db1e745be419ffb2010c66290182f326a6f41 SHA1 2c00231fafafc2d0949b06a2982803f4f156c5e7 SHA256 5a542eb77700a24b48a16a8c18af3e2a3bd8519b371789b005359bfa10391714
-MISC ChangeLog 25418 RMD160 6e110d3b72f298e887d863e86886f1b63354a9aa SHA1 d0c8dd86de2bd66564e9d0df101b1fcc8039980c SHA256 37b44371e9ac1200014c1d83d94c5dd7112488ae9d37f98a6ef05f917d53bfb2
+MISC ChangeLog 25567 RMD160 c845b82027338f7db59b90dcad006aa3701c143f SHA1 e40d367e55c46b7a14f993ac6191bbd068c251c5 SHA256 2fe6821cbc22145572ea3d6af1f939467831698fc7f4f3efbeeda0aa85002fbd
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
diff --git a/net-analyzer/wireshark/wireshark-1.0.8.ebuild b/net-analyzer/wireshark/wireshark-1.0.8.ebuild
new file mode 100644
index 000000000000..cd10e7170ee3
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.0.8.ebuild
@@ -0,0 +1,164 @@
+# 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.0.8.ebuild,v 1.1 2009/05/24 14:17:33 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"
+
+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}/${PN}-1.0.5-text2pcap-protos.patch"
+	epatch "${FILESDIR}/wireshark-1.0-sigpipe.patch" #260457
+
+	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}
+
+	emake || die "emake failed"
+}
+
+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
+		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
+}