1.0.2 version bump for security bug 231587. Thanks to 7v5w7go9ub0o

<7v5w7go9ub0o at gmail dot com>.
Package-Manager: portage-2.1.4.4

3 files changed, 180 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index f71b1eb9f73b..5272aae2ca66 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # 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.106 2008/07/05 16:05:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.107 2008/07/12 20:02:02 vanquirius Exp $
+
+*wireshark-1.0.2 (12 Jul 2008)
+
+  12 Jul 2008; Marcelo Goes <vanquirius@gentoo.org> +wireshark-1.0.2.ebuild:
+  1.0.2 version bump for security bug 231587. Thanks to 7v5w7go9ub0o
+  <7v5w7go9ub0o at gmail dot com>.
 
   05 Jul 2008; Markus Meier <maekke@gentoo.org> wireshark-1.0.1.ebuild:
   amd64 stable, bug #230411
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 8d22c6760463..973fd6ea9ef7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,14 +6,16 @@ AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.0.0.tar.bz2 13413951 RMD160 12016f80d30954bdc89163958e7d007543b3327e SHA1 4f53f526359a072665812deca980999bd26e6ab0 SHA256 b54713e146a7277cf05f309d3c706884b0e0ef5a7794e48a4251c4e17acd9fd0
 DIST wireshark-1.0.1.tar.bz2 13087502 RMD160 2e53cfda4cd7b831c19463ebfa88c74cb625b1a1 SHA1 828efc186bc7eb4872628952598cd38389d8d5b0 SHA256 6a0419bc7e5c0f0a5610007a050a50b0fd796a2c99efbf0bdf0608e19e23bb87
+DIST wireshark-1.0.2.tar.bz2 13064896 RMD160 bd42952c87c412b4395485cbaaf8698d26e03137 SHA1 6d5736096efde3507a900942bfb21c492a42a057 SHA256 5ca4175be433e6b16658763f4f914787e09d6ed0141af13109989bf5544d26eb
 EBUILD wireshark-1.0.0.ebuild 4916 RMD160 04fff36a3a4f0e5ecd093406c2dde1bedcfd49a2 SHA1 aaacde6cb8dcd1ad90cc6f529e997178703fb011 SHA256 bc7a1b43d38e12db18c0623f74720e37e26a475fa2ac6ba63e74ae8dc5e64616
 EBUILD wireshark-1.0.1.ebuild 4981 RMD160 89a76f98d39320b90cd38e5af1c5332b243d77ce SHA1 81e3b75ff9db38ed8b65634d7182adf7b29b24a6 SHA256 13c2634c5dc3e576d8cb05656966e664472c16d0b6e8213af72a8929842d9833
-MISC ChangeLog 16883 RMD160 041bb1386db303560843807ea797c65f3e1b7bd1 SHA1 5235c2623d004b68607915b8141162243c7f5585 SHA256 120a40ca1375fd6df7ab103307e52b9f0e65e3a8099ca8d4514e5b47dfbd1417
+EBUILD wireshark-1.0.2.ebuild 4993 RMD160 315f5b1dd4e63dbbf9fb4ae7da11c3ade3f2d028 SHA1 7e9e7e55d75e98f2fd0d85965c778684839be53f SHA256 f498a7294bfab369c03714ca298d9a38cf731ee41a00770ee4466a74b541379d
+MISC ChangeLog 17101 RMD160 06948afe41a3b004a728fda18eb31d68e7698274 SHA1 631bf839790c776ef4010b166e5c04b4d0605ed2 SHA256 d32d724d8ec57f5f97b9de256024e7a8426603704772802aadc5d44294c28076
 MISC metadata.xml 1730 RMD160 0c29f85b78106162ac35419f8bc01d1539c3eb6d SHA1 93881ba93a2f1fb8b153887ce7e6a022ce95085f SHA256 d722982a52a578876257954779aa8e14dbf4c0eff0dba0e4b82db551f4a964bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhvnAEACgkQkKaRLQcq0GK3YACgsnkJCOjJ6IPYdUEuTHmUqxYN
-pD4AnRxQXZai8sQ6LbpzwmsZmi8Bak6U
-=8K2n
+iEYEARECAAYFAkh4430ACgkQ0axuTq83etoChwCgq8afNB2VHPcDnivOLXmWAe+q
+6QMAoJ28O0UXAF/gTs/dbn3oAi1jJgSU
+=rQJl
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.0.2.ebuild b/net-analyzer/wireshark/wireshark-1.0.2.ebuild
new file mode 100644
index 000000000000..080351cbdb8d
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.0.2.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.2.ebuild,v 1.1 2008/07/12 20:02:02 vanquirius 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
+}