Version bump.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 213 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 9c1084ef0785..48bf77b646eb 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.447 2013/02/16 12:48:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.448 2013/02/22 15:56:14 jer Exp $
+
+*wireshark-1.9.0 (22 Feb 2013)
+
+  22 Feb 2013; Jeroen Roovers <jer@gentoo.org> +wireshark-1.9.0.ebuild:
+  Version bump.
 
   16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #96436
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 23bd3b58072e..9f8eabd98943 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,16 +6,18 @@ AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b
 AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2feea59c8c709eb7065e0c4d9bf741967 SHA512 8c37c020e1addcff70f631b710a15de040eb7af5fa43c0faad6729a090be180fb9d52ebd10a3aac6ad6e49344f795d27e093b9e7e3f591c835a0883ad9066ee6 WHIRLPOOL 59646ef16e7042cbcfa827525cae0f0de7e8cd7f9ccc01324e73b91c1dfd454ca7f7156bc477bdd601bd908969d217c251a33d91d9f6b334b0737035b5d55b66
 DIST wireshark-1.6.13.tar.bz2 22077778 SHA256 32f4811bb7a259612aac04be5722da51f145fcf66fcf69f358e98d4cb78dd091 SHA512 addb42d7630c4c382099cad696581c73a43ebc31727d1838926cb306ff13641b6b586063fa9186a7c0f24522690fa8955844b228ea9b79b7a71ae893730dba45 WHIRLPOOL 72a91fb14529db5e737980b816bd70175b2b0245e387e0fb3d0e937bdddc46085f01bfab75c34663f768b119270bd676367ecc3b0ffa8872e43679bfeb05152f
 DIST wireshark-1.8.5.tar.bz2 24196532 SHA256 d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372 SHA512 3378310870e2e11cd4caf91e0571e2a52bd81bc76f1715997338d867a4d98ad7bb34e0f4443220386b498aeebce15c02d9825e50cf587587f573a5a0c578b039 WHIRLPOOL a9ca0f7cf14efcc4c56f7a2ab16ed0962998bc1467602d3f201e569513b0dde1363a7507e7a3f53535b8878ed2fd4a469699c88dcc1a3c4ce90461ac2c7a3c00
+DIST wireshark-1.9.0.tar.bz2 24592626 SHA256 0a21aa84e78de2ae2f758e5f21edf2ec5c26a372fbfbb30a53a9b67a128e4538 SHA512 b1e6ad9a2320c9a73de57dd4f37189f3319c67e95559648587395fbd20a0ec86f98b6674e77f450df3ac39ebe5b92a4105afa3d6d222ee6ac03a7b6bb5e4bc8c WHIRLPOOL 429322185e44f5dced728d6945ada7abba08328f8e0d3bb22a853cb730df611d9218315ac009987348993c1a3fff53f14b2f5133c67530d3fa92f835fad273fd
 EBUILD wireshark-1.6.13-r1.ebuild 5295 SHA256 063ea6ae0a34d71f3c64b2d4e7edeabd99ac9eb1d5f94223ab738781e062e035 SHA512 25c173b855d01d506b0ec032caa293c5bc0e5362f56d12bc80d79d46bb3928cc5dd2fde7cf5a5a6cf9de6ea6830f84e530e8aeaf8c7098754abc457fe04f7b7c WHIRLPOOL 4a5e13c4bd6497e651aae48dbce72b3ec49e808b43c83d76910fe047c6031995d4de143e8af915d131e6dcbe4ed575cac90479fad59f2c3c127901aba83078e2
 EBUILD wireshark-1.6.13.ebuild 6409 SHA256 2084d4b6fbe051f2954e0e70f43e8b69bc4415f7843511d0778a982ab08185c5 SHA512 06e5ed612d116caa105a9c0713cf8cc9af2f7c81bdc07d2cddf5dfcab4d0f0bd15ba86c8902d251369448e8998091d413e24a22a9fe813aeb1fe571a85bcf29f WHIRLPOOL aa1752218035641aacc74fa0ef553908ed13a219c29268d7eb37833b3dd0bb2e26d845056b45901826427d8b8a4a31c9b00b4b68d2be43bfaafeee89e1833eaa
 EBUILD wireshark-1.8.5-r1.ebuild 5682 SHA256 0152c2ad5950d5baf2f5ad0beebb4bb93b7202b787a8b1170d386803b05c9a13 SHA512 b6a447760f4a67f187fbf95b80904eb57937dfca49037c72c945971cd1f7c491cd9aa46e8040dd75018f6375638b02265ba22d8f1661bb896ba95b2ed85f6166 WHIRLPOOL 4342e097f6c2f559be7edbd7ae284b7d494c974b8b97c7af701bd62e9d6cc4d4acc270e047e1a0a93f6e5a953211cf4fff932e84d72f55c9ef133857d43671a8
 EBUILD wireshark-1.8.5.ebuild 6796 SHA256 f6b50852f4c03692aa88a9d98f3f7edc8131d7cb8f490e483b50358180472630 SHA512 b389b70836ad0e3539e9f1e7eca73362e9ebc87a078422def834559818b0145defca90539284c98657ef704d73b94da14253c90c95f4e6f96c408826a8e2537a WHIRLPOOL 61054a9accda9ac0661bdee3d35c2e7281fcf5c867f1d0f3c789acb86188153507e13a91b3e442f58da69cf5ea9eb548f7c314803ffb3d21eb4c4bd6945c1f77
-MISC ChangeLog 64876 SHA256 7954accc17d973fc9e21576d3b369c7f64f78d7a69fe9043e7ae0a7649d2e0b6 SHA512 5532b937b3822f36bb49fc0205c3f366f99d4fe5ad0c3f20dc7e3a13dd7c45fff2c723fecc3c237f66cd9f951d58ba0b6e6f67d0176d8d2f3fe35cb55a8b686b WHIRLPOOL c1a53349e1ac2f7d57b1659094b773bb0a47326c0074c5609456e732e9ec3c1958c5458cb7d727bfe4ee5c699c3248ff14db12609f9df6c1498085fff5ae4866
+EBUILD wireshark-1.9.0.ebuild 5585 SHA256 1a21d6137d4e5fa526366f948b9ef3875ce1be98b5693504aa11128586e54f8c SHA512 172c7b19ea8d1d4301baaa2c4ce731cb117099057d54acfd956be1df61135bb1e25a88cbfd2f86aa8095d56ed4d236f2169dd3ccc0b1dc4f2e06a3928d06f19c WHIRLPOOL 13188448999125633033375bb6446030d6ab9bba923e767666782a370cd13e1f69fb00e336598179f351a24222c1ee969670840bc8c63c46be946c9bed3b14f8
+MISC ChangeLog 64995 SHA256 58ff4d0a677c61742dd36b43de2e704ddb37486d6c9982470554fefca98e1fb5 SHA512 425fb50371372c9d2a833cff893056e42da73190e28d396a5550b45a84d6c0cd229dc108efed86a3605ffb634b64754576b0bb44724d220b49d39e0e20fed955 WHIRLPOOL 6e123b35f6b90d62c5c1de28fc4434aa262cafbf1b13c8ecc1d2f6a6126d4490133fe6b9abb89ffbc26afc9d78c81504c6f9d559da094ff5b2e0b9abe27d4f3d
 MISC metadata.xml 2418 SHA256 dd08d4e30f9d896a88e2b0c1fbe7d990e8c73a39d7ec8b884185c06f1108af17 SHA512 4a9fdaac45bf03108db7801ff31facae98605af040e0630001e0add32abcf9eace9f05053fed82bba5eb08a1ad3446c1d74d8d56f67157d71050a3b0924a84a1 WHIRLPOOL 786ff710de3d1c348de4993c07bc4912c1d62f56db353febcb69e295fbb5eb7e6fed9f17e99cfa497d6c50b8686565e806ebbd759dca5519173a0a9b7f891f93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEfgAsACgkQCaWpQKGI+9TkFwCdEVW0J7oVioZng0PFrevFsESv
-vaQAn3tUoFryuh1w1nAZwk9J0B/6byYJ
-=+Na6
+iEYEAREIAAYFAlEnlR8ACgkQVWmRsqeSphMZxgCfa8g7UDZljDQYSs4SM+7TewLf
+15sAmgOl5MbDaJ0ak08+5d+s7uENboAA
+=AfV/
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.9.0.ebuild b/net-analyzer/wireshark/wireshark-1.9.0.ebuild
new file mode 100644
index 000000000000..1bb6991f78cc
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.9.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v 1.1 2013/02/22 15:56:14 jer Exp $
+
+EAPI="5"
+PYTHON_DEPEND="python? 2"
+inherit autotools eutils fcaps flag-o-matic python toolchain-funcs user
+
+[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="
+	adns doc doc-pdf geoip +filecaps gtk crypt ipv6 kerberos libadns lua
+	portaudio profile python selinux smi ssl zlib
+"
+RDEPEND="
+	>=dev-libs/glib-2.14:2
+	zlib? ( sys-libs/zlib
+		!=sys-libs/zlib-1.2.4 )
+	smi? ( net-libs/libsmi )
+	gtk? ( >=x11-libs/gtk+-2.4.0:2
+		x11-libs/pango
+		dev-libs/atk
+		x11-misc/xdg-utils )
+	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
+	crypt? ( dev-libs/libgcrypt )
+	kerberos? ( virtual/krb5 )
+	portaudio? ( media-libs/portaudio )
+	adns? (
+		!libadns? ( >=net-dns/c-ares-1.5 )
+	)
+	libadns? ( net-libs/adns )
+	geoip? ( dev-libs/geoip )
+	lua? ( >=dev-lang/lua-5.1 )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-libs/libxslt
+		dev-libs/libxml2
+		app-doc/doxygen
+		doc-pdf? ( dev-java/fop ) )
+	virtual/pkgconfig
+	dev-lang/perl
+	sys-devel/bison
+	sys-apps/sed
+	sys-devel/flex
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 3 || ( $(gcc-major-version) -eq 3 &&
+		$(gcc-minor-version) -le 4 ) ]] ; then
+		die "Unsupported compiler version, please upgrade."
+	fi
+}
+
+pkg_setup() {
+	if ! use gtk; then
+		ewarn "USE=-gtk disables gtk-based gui called wireshark."
+		ewarn "Only command line utils will be built available"
+	fi
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch
+	sed -i -e 's|.png||g' ${PN}.desktop || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# profile and pie are incompatible #215806, #292991
+	if use profile; then
+		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
+		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
+		append-flags $(test-flags-CC -nopie)
+	fi
+
+	if use adns; then
+		if use libadns; then
+			myconf+=( "--with-adns --without-c-ares" )
+		else
+			myconf+=( "--without-adns --with-c-ares" )
+		fi
+	else
+		if use libadns; then
+			myconf+=( "--with-adns --without-c-ares" )
+		else
+			myconf+=( "--without-adns --without-c-ares" )
+		fi
+	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*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap, setuid-install requires dumpcap
+	econf \
+		$(use_enable !filecaps setuid-install) \
+		$(use_enable filecaps setcap-install) \
+		$(use_enable gtk wireshark) \
+		$(use_enable ipv6) \
+		$(use_enable profile profile-build) \
+		$(use_with crypt gcrypt) \
+		$(use_with filecaps dumpcap-group wireshark) \
+		$(use_with filecaps libcap) \
+		$(use_with filecaps pcap) \
+		$(use_with geoip) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with portaudio) \
+		$(use_with python) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		--disable-extra-gcc-checks \
+		--disable-usr-local \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+	use doc && emake -C docbook
+}
+
+src_install() {
+	default
+	if use doc; then
+		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			insinto /usr/share/doc/${PF}/pdf/
+			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
+		fi
+	fi
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	# install headers
+	local wsheader
+	for wsheader in $( echo $(< debian/wireshark-dev.header-files ) ); do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk; then
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		domenu wireshark.desktop
+	fi
+	use filecaps && chmod o-x "${ED}"/usr/bin/dumpcap #357237
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	fcaps -o 0 -g wireshark -m 0750 -M 550 \
+		cap_dac_read_search,cap_net_raw,cap_net_admin \
+		"${EROOT}"/usr/bin/dumpcap
+
+	ewarn "NOTE: To run wireshark as normal user you have to add yourself to"
+	ewarn "the wireshark group. This security measure ensures that only trusted"
+	ewarn "users are allowed to sniff your traffic."
+}