gentoo resync : 18.03.2018

5 files changed, 269 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f4482c2a68fb..e92621b26887 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,10 +8,12 @@ DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa48739
 DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e SHA512 b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f
+DIST wireshark-2.5.1.tar.xz 28229472 BLAKE2B ac832e3d8727a20754153949d7dfba9cfbc359955e55c06a9181ecbd3c9d9ddac269a745a430c47907b3e205d1b593241e0908b5b6c232613cbd4d23c96c4f61 SHA512 c3e1abb1c8b6a035640d655c59bfb8a9a846c88f49035b8086ae81a6e74cb296419f15bc4969489208fdce6578d279663c6fbc8d6eebff1b6097d1dbd0e71b75
 EBUILD wireshark-2.2.7-r1.ebuild 6481 BLAKE2B 36529064a3216f6c9ae71ae23ec31049c6a0d7862be41c333f369bfdd0cb62ac5315883c465d2be517e2a4ddd780d110e59c413725f791f0cf9ac0380dbe36ce SHA512 cd90dd82e3418c000ff142a207a4f05db6bfdb5f8087b4c7b1f595bede0847277fba43a615972c2222e4261c647849ff3165fba64d67dcd55e4441b76324e3d0
 EBUILD wireshark-2.4.3-r1.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d
 EBUILD wireshark-2.4.4.ebuild 7383 BLAKE2B b3c2fb215055d0ba48c4edd8a2a846f77187ddb1add61477e03d20a817f0bcf5054876eea2180268afeab0e636325d3afc7de553da6a66fe4fbef98fbde94aaa SHA512 79432eeaa844a0984b35087019dd26c99f4f6b0b4195d3f6cb440a4d13017b42d894718d5d90a0c866502a8aef1a0e92684cca61909c13ae9d32f9809fb3b356
-EBUILD wireshark-2.4.5.ebuild 7384 BLAKE2B b721d072b55aa02654819c782bb0612bbbad0e96a08e76ed7aecb7dd305c2e107ff8b14ec197610254957f7d1facf77ae9458e5ed9e328754b9e4936f9ecb7ab SHA512 f04d308bfe6e84274b72f2718082e155030b7ebc3be6f5618b3a0c38129acf7c4092bd366c0a9e543e26e6c8a84825c1558a285997bd8b23228c8b5dfc531f1e
-EBUILD wireshark-2.5.0.ebuild 7109 BLAKE2B b382d712d053dc7003aab929c53724ad86bb6c71811b77e94c246af5b28bca60eb22d58d09d34075c0b0eb572134c03f19593eaf7caec25ffebfdf7607b495f8 SHA512 d36bad8ff3372c18af5be721a7469a66e93e317ba12efe902ddecd033092b233ed4c00c113222ac341579211bbf147b01914b2895bb4ee8fb854cd0d9ec3a428
+EBUILD wireshark-2.4.5.ebuild 7381 BLAKE2B 910684b7eca92816c5414e752dd09ce20ee3308ce46bb6c8fbf17f877be650ee69eb4fe78f114d45bfcb100acc7ec16abf06cd73c77b8870b65b9d6f32a8c1bb SHA512 4ec91ba8bc3cd5d6d630b1968a28fe130e007905238bd058a7e34d7b7462dfdbd4fbaef4ce09a8210c5ca3196bea4b12f48c60d740172fe66b12e1305985f100
+EBUILD wireshark-2.5.0.ebuild 7114 BLAKE2B d252f4e884aec64a208b65153ba6464401e90514fd3f22db01fcad74e72fefc2fc924b5b250017fd33694a14906015ef895509913b6bf2aa20bb017ef7cd657c SHA512 bdab94fcd73685fa84892cc4c9e784a024a3ee462d040aa30b4ccc4bf67f3c9a577c9ea2a5b3bb031ea2aa0f1b893f8ea23d49e2762dad1e391680d2de7babc7
+EBUILD wireshark-2.5.1.ebuild 6630 BLAKE2B 200d42a90d72ffde32c1619dff27bd08c6dca406019f725d811ff80811e2f4643836a6da4ce042e27c69a48590d3c44b50b94769a675aa0a125402582665e030 SHA512 7e00d6f7bcdce34a4443f6198dd020e74de2ba4c66ada506adb9ee4ac5f103ab81249572966749317d060859f146a1362ed869818bcd7b0d84098d4b2401ac7e
 EBUILD wireshark-99999999.ebuild 7128 BLAKE2B 9e7037c3cb3635e0c2e39635f98061bc188dc575053bf54824c9fdfaa8b335b4e7c28dbdc1d11e7aebaac989902c675d8958db0b20829ea0e5bef6fdb6791296 SHA512 692cb84ef62ac6dacc77b7002abe5f15000507d16027fa4dd95146a633ac2ab143847ed97f882bc0bf68e6a67e8fc8f02e7ac336b85148df0764c011c85bde1c
-MISC metadata.xml 4772 BLAKE2B 30bdf52594176cdd8314d5292ed55500f26841c71900acd0d0772e1555f51e9979cce7ff3b301beee21dab10565ccc259596cc78bab455fe8cf42cda40314d86 SHA512 1694eb364cf39049d899d056d209c6fd51cd72b6477132312587de7af4f49bc026d5873e97c3c80e3b99228b3f57da99a00f0a10a6596e4659d2a89d1fd6965b
+MISC metadata.xml 4866 BLAKE2B 924525b4564d387c926456f555360a61c531d6e235fd975aeb3bf947355423de87f00a5f3735db99fa89abd106d0929698fb7998660b8da5f9bfc3933e6925da SHA512 4a978831ac7845604c1cd680140cde27e1f202be9743e5559910fa97eb5b71f3c49199d6512a11599b4c1a9aa87fa5d4bb7cf69d88c50fdd8817f38f2e9d7223
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 9801f150cc4c..1b60471afb82 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -41,6 +41,7 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
 <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
 <flag name="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag>
+<flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag>
 <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
 <flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index b56e421d4d18..f91e77ad25ff 100644
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
 	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
diff --git a/net-analyzer/wireshark/wireshark-2.5.0.ebuild b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
index bcdf2d88a691..0a7fd52a45da 100644
--- a/net-analyzer/wireshark/wireshark-2.5.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +caps +captype ciscodump
 	cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk
diff --git a/net-analyzer/wireshark/wireshark-2.5.1.ebuild b/net-analyzer/wireshark/wireshark-2.5.1.ebuild
new file mode 100644
index 000000000000..e8b30ed44ce1
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.5.1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +caps +captype ciscodump
+	cpu_flags_x86_sse4_2 +dftest doc +dumpcap +editcap gtk kerberos libssh
+	libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap portaudio +qt5
+	+randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp
+	sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	caps? ( sys-libs/libcap )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		|| (
+			media-libs/speexdsp
+			<media-libs/speex-1.2.0
+		)
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	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
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	default
+
+	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 gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
+		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
+		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(use_enable doc guides) \
+		$(use_enable dumpcap) \
+		$(use_enable editcap) \
+		$(use_enable mergecap) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable reordercap) \
+		$(use_enable sharkd) \
+		$(use_enable sshdump) \
+		$(use_enable text2pcap) \
+		$(use_enable tfshark) \
+		$(use_enable tshark) \
+		$(use_enable udpdump) \
+		$(use_with adns c-ares) \
+		$(use_with bcg729) \
+		$(use_with caps libcap) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with lz4) \
+		$(use_with maxminddb) \
+		$(use_with nghttp2) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with snappy) \
+		$(use_with spandsp) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		wiretap/*.h \
+		ws_diag_control.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 gtk || use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	# 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."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}