Version bump (bug #552434).

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

3 files changed, 264 insertions, 15 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 1714c1d31421..7e27e05f6612 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.723 2015/06/17 08:51:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.724 2015/06/18 05:18:12 jer Exp $
+
+*wireshark-1.12.6 (18 Jun 2015)
+
+  18 Jun 2015; Jeroen Roovers <jer@gentoo.org> +wireshark-1.12.6.ebuild:
+  Version bump (bug #552434).
 
   17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> wireshark-1.12.5.ebuild:
   Stable for sparc, wrt bug #549432
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 22f7bff2fb34..58c10b19f3c6 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -12,27 +12,19 @@ AUX wireshark-1.99.6-gcc_option.patch 1458 SHA256 7f6e670a2e45ec040f5d2caf900b1a
 AUX wireshark-99999999-pkgconfig.patch 1563 SHA256 30aff5b0264210c823bf892f9c87de4d8ce28cca09ed2f6b22ebae4f58e7bb17 SHA512 4f22ac8c6e0cd4f37428d028810a56e722cdd78bdd24bab7f4686b0fc6179a2105e6436c12785f8430e4c10e76eeb6db17cf5d4dfe2b1cc40ed2041c777a0bda WHIRLPOOL 3f958c87f8957cc364343f2dc9cb4663d6218bb2752a74d4599441c2fdaed73947beda3185824e80128c49ba2a03de63422987a3df9aa6f69b1c5b07574e9cc4
 DIST wireshark-1.12.4.tar.bz2 29257016 SHA256 de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312 SHA512 ceeb6cb4489ce150a6065e586f83cfbcd0fd79cd05cf8ab5b0346baa03eaa5188503b18a1f228458447235d79f765c410e6b52b9aae77547f80b206429c77b24 WHIRLPOOL 31e3bce9d9003140f808b49e263727bb9386530a81a4ccd6e24cb6bc78f95cc5104da360be7edcd3a214de713b65931b4e77054cb1c3480d8e8c892fce57ed9a
 DIST wireshark-1.12.5.tar.bz2 29208507 SHA256 d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82 SHA512 857f0299290d5ca1a34ec4296bf6ef1da82fb59af1aae2c095599e16c4a95a653987d60611d58874dd8cb3271838b0a4ec476a17c52e781cb56607ac39197136 WHIRLPOOL 00592ebba59532acfe8c4b77efe87370573d1084395a27de0bdc92ce7aa1d8567d9b3a10697fb9469c890d724dfed7f1c720408230b6f39ff0a0c09670df00b1
+DIST wireshark-1.12.6.tar.bz2 29166493 SHA256 22ac0cc872f12cef9bb2cacfe0720eed8533dc5cea102d21de511620606cb3b6 SHA512 a8fb576e359d6534fc2df3372f23c1f338aed393749786cde21d8593f50ccec154d05c9298f7ddfcaa3a0dcee921975c6a40070a8d0b84f6fbb7f8df16b2b17b WHIRLPOOL d6c8cc268e46ab59da1d06d73dc5a7e7e16f9b07297f04a6e997fbf72a5a8ceb71847f892ab0fc281e843e3f23e8ed3bf85580b19e76e2103b0cb388c2bc9850
 DIST wireshark-1.99.6.tar.bz2 30046495 SHA256 dfd8800f15a531573700703fee32c97f6c1525615c5d2b92a110fd50b259cc1a SHA512 376d7527c97b44da7460be8089110a0179a1c6b773bb9f82db1dc2f77aaa19d053486abfe0f2819ac8b401a7d1df2d37df5caa53c05e5dbb774ca40f5c41426b WHIRLPOOL a63c03b5c42e50558b1325765fa797f31e19512db5bfd89fbe8edcf40f01ef9bc17b2d48f09bbcbf96f8d506f1c08c1d1d9ec6a4b1d2f0d60434d2c4f703f444
 EBUILD wireshark-1.12.4.ebuild 6244 SHA256 02bc56a450370516854f5724a2f6b0ba0a8f8b07160c8262738c10aae3086dfb SHA512 0fd625acf77240de2115c3dfd853deb6aba2061d000ab89a5deebf432a745a44ab12012087e4b20e560036b600fdccaab9640ef852c52abe5e7b2aed0b88ef5c WHIRLPOOL 99269eae2d3cdb600314bfb6f2503f0cc780eb45742784079368e2af99ac57cd38c7685172964e5d6d2aff24d0811e227c5bc6f486e4a339306d0fb51cebbc0a
 EBUILD wireshark-1.12.5.ebuild 6388 SHA256 de12dc1529b8d1b25c2a55fd00129a4da054af79363dacf1c438ff1486b06977 SHA512 a2227ba42c568d2a4361ceda2e3ec0a63b8205b32ccf7572e80e050963899e62c79e5a2c9412da98576d056c874ba5756083f3f0fbc143ab7a4a42c31f27a31f WHIRLPOOL 4ca10325996473ef1cbaecffdf7861e351fcdc0e78eee6c76d35b7f6921e6b71aa1a5bb02d14d87a07fa34add6cde1352cde6d5b774c6c7392bfc47145b51e12
+EBUILD wireshark-1.12.6.ebuild 6394 SHA256 4f13204d1e767ceaf9e2a9056e7f6ad8025e5e915b246f90610aba8494787052 SHA512 408014e638a6cfd5da1742410f76005787b6aaa9e7c277ee98c7d8f9a5dc5f05a91e401ecd920457a1be2673b1cb61e6260e6098e806fc9fcfc6836c5ac76a6e WHIRLPOOL 44327b2683cfe60cad007ba65ce3fb72e68eb40eab70cfe59e89632bade601be2b00dc87eb5c44d20d8bf4cee28692b22959c5fed2604a9a6e97cabe875998be
 EBUILD wireshark-1.99.6.ebuild 6444 SHA256 4c074a0f883b19bbf7f31ef06d2d6ef49118c1e654fb5edd43491181a1b9d4e2 SHA512 ab06f30d4bb16e1ba9069dd8224d6235393c8bee8dba7bf239594e25351bc6eae77175a5160cc1463bba719788fb104d4aa882e2480b07e17fce3df160e364f0 WHIRLPOOL eb05b26b132c1b77e1f8bd2e77ea32820efd6ecc0d3e0fb66e66894ea3028f88e9f3d13b77a05f5cca1ad625df9cf8e84b39d382ef29d8b1569b22e3ffafe671
 EBUILD wireshark-99999999.ebuild 6439 SHA256 b6434994ec2444c70e67c624386f035a04042a00a9062dfe77cb66f8f9df00b6 SHA512 e506a4939851898526cf9244f673b4452a8dcac6ef4413c270d15b90617a45fb645222f8b29e8751a7eaa805464475800edd27eae672e5023b49e9f645f946b8 WHIRLPOOL c0837d148e071db4b0c76f80b546ac097b0fc6c4af9f6397b4a0e91b329168902b72ceccfffa553f859bdba9367db70e21b8fc439e960649500f227569997948
-MISC ChangeLog 104941 SHA256 cb458944fea9dc96aba7f837fd015b79cbfbf2bb565eeaac60c7820cafc8cdae SHA512 2b3d19d11c496b631de11ec47ca8931c207ef55283ebef0253494889d713c1d3737e4a29d7b65ba9a3e700a11127170835a5754350d16e55dbb7fe4f8cfdb076 WHIRLPOOL 2b736043b1c57eea5b4f3ff171cabb3bfe6a3fbedf5f773e8ea1ce81c2c8b87c3e565511c957d9a6e48971444c63c14d887c06bb75d67d5f7bf6038fbd081cd4
+MISC ChangeLog 105078 SHA256 33c3ef1be98449d3c1de538698e4c25c69110ef13af082e79bf65f5d9edf98b6 SHA512 674a33900dec8b8b414d3824e01a3d1c0f25cac00ad27d261f51502aeacb021585deafa80bb954f7998d72050a0fa32c1746d71e27b64f294950ae2fbee949b0 WHIRLPOOL c895bccfc6e8f23a4c5a2eabc4739a082d3fbb6a69ef165151dbaaf89bb3d3c41cb308f236e44e66f83870580174baedf42676ee444286630b14fe99d57ce1b9
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVgTT1AAoJELp701BxlEWfckkP/R2cidLkpBN6l3h2qHHzHUGi
-VVa4swD83mQmBKsxPmyoEU3uUsXZ9t5dpjo3cVm9AGJn3N5HJsKMq+zexldbIIhq
-u6A7Cssw8ZSRJfpEs6xN6OsDLJ5cqUu4k/3uB5XqKgv9kJFzMMBfeA15MxSm4IPN
-czfd14YFdZ/atmn028UjHOjkDEkAWcFPYgU+HOW+auKvm3P9axpByVh8WZpN0iFB
-2keujL+zaW2IHoGgF4xZ1jt5k4ren4HGr5Zx/Q0yGfhlWlOkEy3EmJ0ibix3P7O6
-mgFJf+e5u8YKwrfBYHVJeKMRT1NOa74GLOlpXfRZefqKY5RxDO7fTXmFoyOMaaea
-qNqHiDiI09A5KaEc1I8BmBTOjETiob64dX1MCK6kAnbv3IRvkDh8Ih+qWR+KvxBt
-cTxiPvEiWmqJoXsWUnZ2y97aib1NYCDoz4sWXiAPkuDQJO6gWrbjo3DLSyAJLY5Q
-XuSsiHLRW3oI6mfynRjJPd5JtzXojLWrHIKS+YdNEymlhUh7xoN74VaHvUYini6k
-TU7uJeA6Ux9A6iTB700e0aFTua42xPZYSSalooyAOxzJask8E6K1o48qvHusxTPi
-jZMu1qQbju2EVzTv3bDFIUzr0SNx63U8B0WRswK7FxFoK4c+yd1nAgeMQH7pCphE
-aDAbNo5TNLEOQ18o5MFu
-=domP
+iEYEAREIAAYFAlWCVJYACgkQVWmRsqeSphM5CQCfalU3G9zW3BfqieTP028xneOl
+mv4AnRRBnJOstS5YpLT8DMzXu+GWmQ4S
+=uYFv
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.6.ebuild b/net-analyzer/wireshark/wireshark-1.12.6.ebuild
new file mode 100644
index 000000000000..f4f9ec6a0ff9
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.12.6.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v 1.1 2015/06/18 05:18:12 jer Exp $
+
+EAPI=5
+inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="
+	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
+	portaudio +qt4 qt5 sbc selinux smi ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+GTK_COMMON_DEPEND="
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	crypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk3? (
+		${GTK_COMMON_DEPEND}
+		x11-libs/gtk+:3
+	)
+	kerberos? ( virtual/krb5 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4[accessibility]
+		x11-misc/xdg-utils
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[accessibility]
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk3? ( virtual/freedesktop-icon-theme )
+	qt4? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
+		"${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \
+		"${FILESDIR}"/${PN}-1.99.0-qt5.patch \
+		"${FILESDIR}"/${PN}-1.99.1-sbc.patch \
+		"${FILESDIR}"/${PN}-1.12.5-cross-compile.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# 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
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk3 || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	use qt4 && export QT_MIN_VERSION=4.6.0
+	use qt5 && export QT_MIN_VERSION=5.3.0
+
+	# 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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use_enable ipv6) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk3) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with qt4) \
+		$(use_with qt5) \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		--disable-profile-build \
+		--disable-usr-local \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		--without-adns \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+	if use doc; then
+		use doc-pdf && addpredict "/root/.java"
+		emake -j1 -C docbook
+	fi
+}
+
+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 \
+		color.h \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	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 gtk3 || use qt4; then
+		local c d
+		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
+	fi
+
+	if use gtk3; then
+		domenu wireshark.desktop
+	fi
+
+	if use qt4; then
+		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
+		domenu wireshark-qt.desktop
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}