Security version bump wrt bug #183520

Package-Manager: portage-2.1.3_rc6

4 files changed, 173 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 17dfbf8671e9..81a2b4f009d0 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.55 2007/04/18 11:58:31 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.56 2007/07/06 16:09:31 jokey Exp $
+
+*wireshark-0.99.6 (06 Jul 2007)
+
+  06 Jul 2007; Markus Ullmann <jokey@gentoo.org> +wireshark-0.99.6.ebuild:
+  Security version bump wrt bug #183520
 
   18 Apr 2007; Markus Ullmann <jokey@gentoo.org> -wireshark-0.99.4.ebuild,
   -wireshark-0.99.4-r1.ebuild, wireshark-0.99.5.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7620d167c57f..afeb31720f18 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wireshark-0.99.5-sizet.patch 290 RMD160 f162ca06aab5b3f62269c3690bef965c1eceef95 SHA1 3afbd56f4dbcccda7e74cda158553786f88fd7f4 SHA256 9081276cb7e8ba74e4f9289e89f3e0bced9e1163b4e7e5cefb3cf7b131605375
 MD5 9cf68b2290e19ac343fdc91bbff3620f files/wireshark-0.99.5-sizet.patch 290
 RMD160 f162ca06aab5b3f62269c3690bef965c1eceef95 files/wireshark-0.99.5-sizet.patch 290
@@ -11,14 +14,19 @@ MD5 555b2ee8663c2a28c7ed7423ea9b2299 files/wireshark-except-double-free.diff 664
 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 files/wireshark-except-double-free.diff 664
 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369 files/wireshark-except-double-free.diff 664
 DIST wireshark-0.99.5.tar.bz2 11007039 RMD160 1b3f7bb8e2c73a945fff86fb8ab2aa79481ba809 SHA1 ec9a07f13d5cda3d310d8c8900362f7cb96f4042 SHA256 9801c0c974a646606c56935dfd1aa503c9b007c76a3f1709f69ba038daf5860e
+DIST wireshark-0.99.6.tar.bz2 11826043 RMD160 7c69e71e54d521d942bcbad9894547d9785f0948 SHA1 91f57158a75adca36c79c35525eb3cf57b927075 SHA256 118c4a5bfef00651fbe248e1d5c4e4f907b5e2982f47ccfecca2f7f48ab9d3b8
 EBUILD wireshark-0.99.5.ebuild 4454 RMD160 ced1aed25d5ee385f27e750195078b5b643fefd8 SHA1 6376454189e83f51a6acd761cec16f6a73617c28 SHA256 a2a678dcc39cb3f0cc0556ec18c90e71151dcdde7a47082ebcd0c8209fd56994
 MD5 85cf7bd6d7d47ca660e41d71703eb2f3 wireshark-0.99.5.ebuild 4454
 RMD160 ced1aed25d5ee385f27e750195078b5b643fefd8 wireshark-0.99.5.ebuild 4454
 SHA256 a2a678dcc39cb3f0cc0556ec18c90e71151dcdde7a47082ebcd0c8209fd56994 wireshark-0.99.5.ebuild 4454
-MISC ChangeLog 7881 RMD160 72bed5a2d6bd7bd41554431c51eec8e69ba2463d SHA1 f077e606d6e1681043b04c152fc9cf10e4423f4b SHA256 fe8a6b04fd6bfb3203a3241ddd47ed2f7343be5f6778a82330bce15730751917
-MD5 e58ba6ef114f08f84bcaf5a5597e556a ChangeLog 7881
-RMD160 72bed5a2d6bd7bd41554431c51eec8e69ba2463d ChangeLog 7881
-SHA256 fe8a6b04fd6bfb3203a3241ddd47ed2f7343be5f6778a82330bce15730751917 ChangeLog 7881
+EBUILD wireshark-0.99.6.ebuild 4422 RMD160 94a14d7abe161e1404bd148dc8fc9e25f91c7d1e SHA1 620d8f980df889ee668fef1980df3a4902be38cb SHA256 158dd95a0aab1d63341a18f9110a112b1ac1ee5b9a938e39d4da8e8e46290b19
+MD5 2d52abad34d1d98c7ca0a9dcc5463103 wireshark-0.99.6.ebuild 4422
+RMD160 94a14d7abe161e1404bd148dc8fc9e25f91c7d1e wireshark-0.99.6.ebuild 4422
+SHA256 158dd95a0aab1d63341a18f9110a112b1ac1ee5b9a938e39d4da8e8e46290b19 wireshark-0.99.6.ebuild 4422
+MISC ChangeLog 8030 RMD160 828105100e43dc68f87de030e39b36ce4b53206c SHA1 f02d5e2622e65cc130bd115e447125b3bb26a4a8 SHA256 6e87b08d51d7f28ee54186b5d72f6b72a56bcfa70abd6873a63edc1066d20807
+MD5 f7aa0cee510c14a20000b61e85242f15 ChangeLog 8030
+RMD160 828105100e43dc68f87de030e39b36ce4b53206c ChangeLog 8030
+SHA256 6e87b08d51d7f28ee54186b5d72f6b72a56bcfa70abd6873a63edc1066d20807 ChangeLog 8030
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
@@ -26,3 +34,13 @@ SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02 metadata
 MD5 8c4800c83cacdb6bdaba3dfce8ff2bd2 files/digest-wireshark-0.99.5 259
 RMD160 f10ce49cc68b01414423bb6d5a566088d659f4d9 files/digest-wireshark-0.99.5 259
 SHA256 10ade9a82e7e0d50bed6dac4edce4fccc71c249dc01d40586abc7b94e135bd68 files/digest-wireshark-0.99.5 259
+MD5 0f2ef8290367ddf5a0c84810711dbae3 files/digest-wireshark-0.99.6 259
+RMD160 9531098dc7d8a6d421c0134393f003096beeb983 files/digest-wireshark-0.99.6 259
+SHA256 256e77c1d2b8df2a47d22fb56cf29354fb4cc4603d71a342b23f0958db43c4ac files/digest-wireshark-0.99.6 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGjmlGz974XjDVpbkRAsX+AJwL/HLz5h0U8t/mlWQ62QKFqe6vUACfRJrv
+jhpYOfiUJJGSMtayhxGds1w=
+=zENB
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.6 b/net-analyzer/wireshark/files/digest-wireshark-0.99.6
new file mode 100644
index 000000000000..1593025f3afe
--- /dev/null
+++ b/net-analyzer/wireshark/files/digest-wireshark-0.99.6
@@ -0,0 +1,3 @@
+MD5 e57a8c8b364c38df3da97e2ee9f0d0bc wireshark-0.99.6.tar.bz2 11826043
+RMD160 7c69e71e54d521d942bcbad9894547d9785f0948 wireshark-0.99.6.tar.bz2 11826043
+SHA256 118c4a5bfef00651fbe248e1d5c4e4f907b5e2982f47ccfecca2f7f48ab9d3b8 wireshark-0.99.6.tar.bz2 11826043
diff --git a/net-analyzer/wireshark/wireshark-0.99.6.ebuild b/net-analyzer/wireshark/wireshark-0.99.6.ebuild
new file mode 100644
index 000000000000..b7103303f222
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-0.99.6.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.6.ebuild,v 1.1 2007/07/06 16:09:31 jokey Exp $
+
+inherit libtool flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="mirror://sourceforge/wireshark/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="adns gtk ipv6 portaudio snmp ssl kerberos threads selinux"
+
+RDEPEND="sys-libs/zlib
+	snmp? ( net-analyzer/net-snmp )
+	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 )
+	!ssl? (	net-libs/gnutls )
+	net-libs/libpcap
+	dev-libs/libpcre
+	adns? ( net-libs/adns )
+	kerberos? ( virtual/krb5 )
+	portaudio? ( media-libs/portaudio )
+	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() {
+	# bug 119208
+	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
+		ewarn "wireshark will not build if dev-lang/perl is compiled with"
+		ewarn "USE=minimal. Rebuild dev-lang/perl with USE=-minimal and try again."
+		ebeep 5
+		die "dev-lang/perl compiled with USE=minimal"
+	fi
+
+	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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/epan
+	epatch "${FILESDIR}"/wireshark-except-double-free.diff
+	epatch "${FILESDIR}"/wireshark-epan_dissectors_packet-diameter.diff
+}
+
+src_compile() {
+	# optimization bug, see bug #165340
+	if [[ "$(gcc-version)" == "3.4" ]] ; then
+		elog "Found gcc 3.4, forcing -O3 into CFLAGS"
+		replace-flags -O? -O3
+	else
+		elog "Forcing -O into CFLAGS"
+		replace-flags -O? -O
+	fi
+
+	# see bug #133092
+	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"
+		# 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
+
+	#	$(use_with lua) \
+	econf $(use_with ssl) \
+		$(use_enable ipv6) \
+		$(use_with adns) \
+		$(use_with kerberos krb5) \
+		$(use_with snmp net-snmp) \
+		$(use_with portaudio) \
+		$(use_enable gtk gtk2) \
+		$(use_enable threads) \
+		--without-ucd-snmp \
+		--enable-dftest \
+		--enable-randpkt \
+		--sysconfdir=/etc/wireshark \
+		--enable-editcap \
+		--enable-capinfos \
+		--enable-text2pcap \
+		--enable-dftest \
+		--enable-randpkt \
+		${myconf} || die "econf failed"
+
+	# fixes an access violation caused by libnetsnmp - see bug 79068
+	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	dodoc AUTHORS ChangeLog NEWS README*
+
+	insinto /usr/share/icons/hicolor/16x16/apps
+	newins "${S}"/image/hi16-app-wireshark.png wireshark.png
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins "${S}"/image/hi32-app-wireshark.png wireshark.png
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins "${S}"/image/hi48-app-wireshark.png wireshark.png
+	make_desktop_entry wireshark "Wireshark" wireshark
+	dosym tshark /usr/bin/tethereal
+	use gtk && dosym wireshark /usr/bin/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 wireshark in an untrusted environment:"
+	ewarn "do not 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 running wireshark as a least privileged user;"
+	ewarn "and subscribe to wireshark's announce list to be notified of newly discovered vulnerabilities."
+}