Version bump.

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

3 files changed, 231 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index caf5546da81d..cdf605c4cb49 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.467 2013/03/18 19:49:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.468 2013/03/29 16:54:56 jer Exp $
+
+*wireshark-1.9.2 (29 Mar 2013)
+
+  29 Mar 2013; Jeroen Roovers <jer@gentoo.org> +wireshark-1.9.2.ebuild:
+  Version bump.
 
   18 Mar 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.9.1.ebuild:
   Depend on net-libs/libpcap[-netlink] to avoid segmentation fault in libnl.
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 65a89b049f30..0a38023d4f65 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,17 +7,19 @@ AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2fee
 DIST wireshark-1.6.14.tar.bz2 22121915 SHA256 fef159fd04cc1db9ce59209a48a84a808ad43f9d8a2767d47ab151482f75a83b SHA512 855b5ecac33d4b36102420ceffc2ec36fe10679f9233ef4c31fa6492c9b85a38557d987fc037510de6574a7911e9529b836f77b4a6cd673b60c3ff4e32cb1542 WHIRLPOOL 8f4c4a5813503db40efd88bbce931e26f1513496468a86e16438cd84b447e99f67d11591a5873fb7697500a12d9eb62df295d73396c78d25d114f3f3c33020c8
 DIST wireshark-1.8.6.tar.bz2 24250787 SHA256 2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea SHA512 d130c615d950875c3e119edda8a5c6842fe48d57c77bf8cb8751354455fc1bac3c6c6d65b0f76be6a83e4350eed85337ffcad6d006c95fc713db9afe172e9b16 WHIRLPOOL e5de3cea6f011d3f2d27ba468035080aa2cb836a363e027064fa788e969a3b05de8f7b6095bab1a6f5169f5de2ff91620abf271a8e047b4907821bbfc4b04128
 DIST wireshark-1.9.1.tar.bz2 24670028 SHA256 571c15644c5a64442981892134774439e24ac3d06532aee6a13f0681a15fd9a3 SHA512 ac1ce5699de8b3a361d8ea33d930dea76fbff535e87acb3ccc5234f17675746724e916a9451614c3ac15a0b03e6a90a00c8dd8ff6a15b4886a48055e701b41a8 WHIRLPOOL 8303fe8bc22e55aaf140e46d8d6d4dba3ae37c618fd0ea5968458aac32f9be9cd29d01a5029163f3d23726088e5859573416583289c2ac093c89763c419ab297
+DIST wireshark-1.9.2.tar.bz2 26758261 SHA256 753c1687dbbdc4039bd03f138b81189d1528b25a0871b0d769555c6640fcbdeb SHA512 e4796e27ba566b1408f4fd577b32a4cfd8265665dd160bf9e01776dc9dbbd5483b699971fcc50b54935c19d0f6b08019f7fa46ad7e1ea1712703df95ba6a8957 WHIRLPOOL d88b50cdd0a47cabd601ed772463fa2fec17675692910dbbf9d5311ae7da28aab22087ce372ff1432daaa5f833241ca3c22e97cd1254e253e07049f86053ef16
 EBUILD wireshark-1.6.14-r1.ebuild 5520 SHA256 73619fef8f59a503d499ed4319429ceeb4b92bf327ad514aa24105883da62f02 SHA512 2344dda4d1d96199e4bc1b7ef7ffa72a4b5842485429f458f0e283baa7adf221fb2c084021a896924d80be44ef3387d87de577b963ae83271b1faffe0f90b673 WHIRLPOOL 8288eb19322914053ad3a46c8e546ad0401c1461defec093a25bdf6123ca1230c860746edb40b82273629eae943773bd813e62c7916217ffdb27ad26b1117f49
 EBUILD wireshark-1.6.14.ebuild 5372 SHA256 21caac599c2b17557ccedaef8f51397a2d84f91c6af872deecc71d0727fd8486 SHA512 f255f929225912de7f96420d44dda78d90c94ea4f5f8f548ecc0eac502e2a1b350f17f23532919e8ef28df19e208fc95c334ce37b49bba7f7c1bbe694e7c402f WHIRLPOOL 27deefe45944684651c4817e1be0316994c6f8bcd4ca7c7c84491840e3e1dc05fec3dcf872ac23aa84dbcd6031dd1c79aec90bee0e3c0cbf9f1d2eadf205e0d6
 EBUILD wireshark-1.8.6-r1.ebuild 5839 SHA256 3d5e5eb408ac26178e536b780645d176b954106bcb3995e844d76be17552c23a SHA512 76beb77f59ec8d345f454ded8a3c961a6612d7f1ee0ede7511e716ace5906860f06b3dbfb242c803134a286798acbf290ee902691a8071c8de083564c8351512 WHIRLPOOL 975b8577ce5a629a884fc961343203868e5d54564aefb5a70f327c750fc6069e75e6f0875856c82e3a55b562a3df1696d7674064f207a368b97592fe8e75855a
 EBUILD wireshark-1.8.6.ebuild 5691 SHA256 fdecc0cb67487bd310f1c6defd194e1f2b18052964ffb76a5e9855b4c18b0c4c SHA512 0a752104827a64ab0f5ab285d6258a1537c1cbb6ee813ea1e1f462f2a9883101fff2747f88a58915923ffdb5eeb139d6991abad6b254bcef77614e638fa099ea WHIRLPOOL 4505dfd4fe2bffa1321f682884c83d6050e9d795abf2efdf140c40cc1b089c3e022df966d474f7d2eda4490b00ac22e2cace7d0d8cae0050007e4adc859b07d5
 EBUILD wireshark-1.9.1.ebuild 5860 SHA256 bc78f1bd3c5a904abf487b01ae0f83dac7dd3a765d700c96b3114698d01bcfcc SHA512 d9e69d744993af9c8472d10a4e063e8112e704d5f1dd63cc36ea7a62b7c0bcf32060c21b308449f17906055eb76052b555cb4934a08c01d86268a299c6f15c84 WHIRLPOOL e0a898e5dbac77b173fb61dc1a55c955ed54cb5804279a9d5492a00bc2dcace6fc10de519a24befa6b444267aa12ab70a74d3b2a01546d18ce56d78fadb98433
-MISC ChangeLog 67910 SHA256 05a5ef99fd5fee19bf6fa19ff5e6000e2d83f1039997eee9e37a844f711e63b9 SHA512 21f865019b4fe21b1a332f6b3f55c6ce839c2c14e40704882649e2b074e4f66bc176ae2429aa19a8c37a9570730e5d8ecaba3a4258a644af3aff32eafc2a1498 WHIRLPOOL 2d799ff4da8b0ea6d805b60b1c3249863fb8c087935d26431ebfeb50b735a8c00557383155dec05c1076aaf35fc410e9b0c6111eb5240632efb68972e3fed476
+EBUILD wireshark-1.9.2.ebuild 5860 SHA256 274da6bd3870057abeac824ac413151a6de6e172a7ddcc54d1745e798914d934 SHA512 ae68c3abdc10888099c69ccaff734230af20f23e5389142741db94bc385a5e2fda5411b25d28e1e7a1eb333daee50a8327d3eedadb8764405c87569a93184ef8 WHIRLPOOL 6ca4cb2c87f4f551d92d2ec4d1b9bebd8d5b4fb19f243c2e8cd6aee115f4d05aea03bc825cf5e14dd1dbcba8e90fe6978e2866ad02eff88ee855dcfe2b7890be
+MISC ChangeLog 68031 SHA256 83946044eb05fa063742542175bb8deae14133b2193ec7c2fb4d4d9b00e90e18 SHA512 1480bd5164dc38eca5fefd10a643e6f2dfb6460a153196d82c6e7433b09bace9742b0ab9231d2f38ea8ea999c9f66db4feff22987b7c735d90be095e06a62288 WHIRLPOOL f7420a57a7b00007b5406046f01a55dae93f11e6fe666e6d33abe338e7cc3c3da715b7a0b321282b1a3ae25c0dbad19729e5158798adda37cb086948914dbf31
 MISC metadata.xml 2418 SHA256 dd08d4e30f9d896a88e2b0c1fbe7d990e8c73a39d7ec8b884185c06f1108af17 SHA512 4a9fdaac45bf03108db7801ff31facae98605af040e0630001e0add32abcf9eace9f05053fed82bba5eb08a1ad3446c1d74d8d56f67157d71050a3b0924a84a1 WHIRLPOOL 786ff710de3d1c348de4993c07bc4912c1d62f56db353febcb69e295fbb5eb7e6fed9f17e99cfa497d6c50b8686565e806ebbd759dca5519173a0a9b7f891f93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFHb8oACgkQVWmRsqeSphNATwCfad2zv93CceCxozNF1ln0j48l
-l3gAniRFvlX/1XvPodUo+Y4CQ34ALg97
-=aiq3
+iEYEAREIAAYFAlFVx2IACgkQVWmRsqeSphNhDwCfZgAxYuh3wNyhsbDNM8bFEVhv
+9cgAn3XyyDezIrhaZf7p6/26UhkXSbc4
+=dGQr
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.9.2.ebuild b/net-analyzer/wireshark/wireshark-1.9.2.ebuild
new file mode 100644
index 000000000000..cf87d2fb43a0
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.9.2.ebuild
@@ -0,0 +1,219 @@
+# 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.2.ebuild,v 1.1 2013/03/29 16:54:56 jer Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+inherit autotools eutils fcaps flag-o-matic python-single-r1 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 crypt doc doc-pdf +filecaps geoip gtk ipv6 kerberos libadns lua +pcap
+	portaudio profile python selinux smi ssl zlib
+"
+RDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libnl
+	adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
+	crypt? ( dev-libs/libgcrypt )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		>=x11-libs/gtk+-2.4.0:2
+		dev-libs/atk
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libadns? ( net-libs/adns )
+	lua? ( >=dev-lang/lua-5.1 )
+	pcap? ( net-libs/libpcap[-netlink] )
+	portaudio? ( media-libs/portaudio )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-wireshark )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	doc? (
+		app-doc/doxygen
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+	)
+	sys-apps/sed
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+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-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch
+
+	sed -i \
+		-e '/^Icon/s|.png||g' \
+		-e '/^MimeType.*[[:alnum:]]$/s|$|;|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 pcap && use_enable !filecaps setuid-install) \
+		$(use pcap && use_enable filecaps setcap-install) \
+		$(use_enable gtk wireshark) \
+		$(use_enable ipv6) \
+		$(use_enable profile profile-build) \
+		$(use_with crypt gcrypt) \
+		$(use_with filecaps libcap) \
+		$(use_with geoip) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(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 pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237
+
+	if use python; then
+		python_optimize "${ED}"/usr/lib*/wireshark/python
+	fi
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4550 -M 0750 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	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."
+}