version bump as per security bug (as usual!) - bug #152951. Also fixes dead symlink - bug #145067, wifiscanner & wireshark: File collision /usr/lib/libwiretap.la bug #146286

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 164 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 80ae1c3852a5..f1deaf5245a7 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.32 2006/09/18 11:08:08 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.33 2006/11/01 10:17:59 dragonheart Exp $
+
+*wireshark-0.99.4 (01 Nov 2006)
+
+  01 Nov 2006; Daniel Black <dragonheart@gentoo.org>
+  +wireshark-0.99.4.ebuild:
+  version bump as per security bug #152951. Also fixes dead symlink - bug
+  #145067, wifiscanner & wireshark: File collision /usr/lib/libwiretap.la bug
+  #146286
 
   18 Sep 2006; Benjamin Smee <strerror@gentoo.org> wireshark-0.99.3.ebuild:
   Small change for bug #147814
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 248d4cca4405..2da1ae0717fd 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,13 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST wireshark-0.99.3-extras.tar.bz2 6347 RMD160 013bc5c00f5138e105ad09aa785e85e6a304dea5 SHA1 6ee30b47bcfbc5f035e415e6b9d1fe7caae8b7b5 SHA256 6502d33b6ae06f32727fc8e0db6125d0a2cb9f86d16470390659afc0b77c000d
 DIST wireshark-0.99.3.tar.bz2 10036646 RMD160 60a094b6b2c8d3d289cb7cbc1c01b84d378f9443 SHA1 e037c64ef95153fe06c0439ee5d0f54de4d12d78 SHA256 e669d188e6e9824e3831e2e465cce5a19db404964a8ee648cca0f40bbb902919
+DIST wireshark-0.99.4.tar.bz2 10472441 RMD160 6bf940af951ddfcf66157a8cb299e6342dd3f955 SHA1 696216d794b418da3cb0a1829281ef65bf3e64ff SHA256 a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e
 EBUILD wireshark-0.99.3.ebuild 4033 RMD160 21dcbe14b4994f7a2cb64aceb8b2d7710e2adff4 SHA1 9c66434f8351aef65dc4200ee2dc898d661f7ffa SHA256 71c8f6e0f4f327ce76c62c5d344333cc9a61160aa5bd30a8dd9a0ca4fcf91a28
 MD5 fb2381831c5431c92929e5105b79ce8b wireshark-0.99.3.ebuild 4033
 RMD160 21dcbe14b4994f7a2cb64aceb8b2d7710e2adff4 wireshark-0.99.3.ebuild 4033
 SHA256 71c8f6e0f4f327ce76c62c5d344333cc9a61160aa5bd30a8dd9a0ca4fcf91a28 wireshark-0.99.3.ebuild 4033
-MISC ChangeLog 4451 RMD160 d5d6dcfcaed05a594f078bcd13eca3d55179f526 SHA1 053bd819c1cac6ad41fb52a34523636ed73d1663 SHA256 08532a7d39c2e6560b5f4824ca15a3b94b9b7f059419edcff7a52948c30b9990
-MD5 c23f61fc70acbaecf813887fb0b6f0b8 ChangeLog 4451
-RMD160 d5d6dcfcaed05a594f078bcd13eca3d55179f526 ChangeLog 4451
-SHA256 08532a7d39c2e6560b5f4824ca15a3b94b9b7f059419edcff7a52948c30b9990 ChangeLog 4451
+EBUILD wireshark-0.99.4.ebuild 4244 RMD160 0dc68a45e7dd27cf6e0afd678f858a004ad9fdcc SHA1 a4f97c97318b6b51332d2dda0d3692c28fcb7cd6 SHA256 e5a4e75cdbcebf09a5802086381bf262a2b3a561349b88f7710dcf225159c9aa
+MD5 165f62a3d961931970254be2bcaa37d9 wireshark-0.99.4.ebuild 4244
+RMD160 0dc68a45e7dd27cf6e0afd678f858a004ad9fdcc wireshark-0.99.4.ebuild 4244
+SHA256 e5a4e75cdbcebf09a5802086381bf262a2b3a561349b88f7710dcf225159c9aa wireshark-0.99.4.ebuild 4244
+MISC ChangeLog 4731 RMD160 4b1847ff7d916a6977e43ebb98862c1a87ac3d39 SHA1 1c06a9e84ff2ccc40dcc3d1e1ebc86d6fbfebd90 SHA256 53d4e75f88a219f9223860e63bc93a6c7a160e18c7008a0fffe9d2b52aff1c0b
+MD5 730a67971b714d856a8d37f041324aa2 ChangeLog 4731
+RMD160 4b1847ff7d916a6977e43ebb98862c1a87ac3d39 ChangeLog 4731
+SHA256 53d4e75f88a219f9223860e63bc93a6c7a160e18c7008a0fffe9d2b52aff1c0b ChangeLog 4731
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
@@ -15,3 +23,13 @@ SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02 metadata
 MD5 11fcb55d67ff8719324ac3bda33805b3 files/digest-wireshark-0.99.3 527
 RMD160 61ab85b45c68272b3420404f7ff926712f51e1f5 files/digest-wireshark-0.99.3 527
 SHA256 dc9dda0e3a29bf53970365f9ff2202b4ce86a3ff5cbcd2993987ece2c05bf5a3 files/digest-wireshark-0.99.3 527
+MD5 68b73f14cc8b3dc15a7c636b7d25e1e4 files/digest-wireshark-0.99.4 259
+RMD160 4f00e810f399b65484275319dfb76055bc71f8ef files/digest-wireshark-0.99.4 259
+SHA256 85ae4fb2135d27ce392f55dc72be383af5985b30a8594268e4065b569a570e4d files/digest-wireshark-0.99.4 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFSHRpmdTrptrqvGERAl1AAJ4nDQL8ZN7c/fZ2f9b82KkBDTGg9ACfbpsi
+rhEJOgxPZPsZS9WSmDWTBFk=
+=JnBR
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.4 b/net-analyzer/wireshark/files/digest-wireshark-0.99.4
new file mode 100644
index 000000000000..361cdfcb7f4d
--- /dev/null
+++ b/net-analyzer/wireshark/files/digest-wireshark-0.99.4
@@ -0,0 +1,3 @@
+MD5 05fada181e12bfa94b52f0b10395b28c wireshark-0.99.4.tar.bz2 10472441
+RMD160 6bf940af951ddfcf66157a8cb299e6342dd3f955 wireshark-0.99.4.tar.bz2 10472441
+SHA256 a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e wireshark-0.99.4.tar.bz2 10472441
diff --git a/net-analyzer/wireshark/wireshark-0.99.4.ebuild b/net-analyzer/wireshark/wireshark-0.99.4.ebuild
new file mode 100644
index 000000000000..710653727020
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-0.99.4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.4.ebuild,v 1.1 2006/11/01 10:17:59 dragonheart Exp $
+
+inherit libtool flag-o-matic eutils autotools
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+#SRC_URI="http://www.wireshark.org/download/src/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/wireshark/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="adns gtk ipv6 portaudio snmp ssl kerberos threads selinux"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
+	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 )
+	!ssl? (	net-libs/gnutls )
+	net-libs/libpcap
+	>=dev-libs/libpcre-4.2
+	adns? ( net-libs/adns )
+	kerberos? ( virtual/krb5 )
+	portaudio? ( media-libs/portaudio )
+	selinux? ( sec-policy/selinux-wireshark )"
+# lua fails with version 5.0 and 5.1 is not in portage yet - 2006-04-25	
+#	lua? ( >=dev-lang/lua-5.1 )"
+
+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_compile() {
+	replace-flags -O? -O
+	filter-flags -fstack-protector # see bug #133092
+
+	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."
+}
+