Version bump (bug #549432).

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

5 files changed, 267 insertions, 11 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 52c1eda72b53..6f43a9c77aec 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.711 2015/04/20 04:41:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.712 2015/05/14 07:51:39 jer Exp $
+
+*wireshark-1.12.5 (14 May 2015)
+
+  14 May 2015; Jeroen Roovers <jer@gentoo.org> +wireshark-1.12.5.ebuild:
+  Version bump (bug #549432).
 
   20 Apr 2015; Jeroen Roovers <jer@gentoo.org> wireshark-99999999.ebuild:
   Fix qt4/5 configure logic.
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b494e731a5f2..8bd4a260af72 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -10,16 +10,18 @@ AUX wireshark-1.99.0.1975-sse4_2.patch 555 SHA256 bef93463a257b6154cf55f85e7860b
 AUX wireshark-1.99.1-sbc.patch 665 SHA256 c76afab0f03c59001df597948153bf76bbdc14da30a2de9e93831bed6dc6e898 SHA512 3e71c9ecfb07c96df8330b6a1fa959bde79bf7531f106b7f90acc59a82f3b1ec74ae1643b9b13cd6a642b25766996afa7083ac1daa2bada765134ae8846112a8 WHIRLPOOL 8b53a06ffa03579ed71a558cb475e05bb7152463123089cec80b3f00ae68bab02fcba2fa789471419175965be6af1604e8371b30b9dd04a5b967c995627a5517
 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.99.5.tar.bz2 29806267 SHA256 d2d5dd1367eb05037651daf7355888f5938d5ca45fcd730fe117605adf9e6c7c SHA512 5c951f189a0904c02897ee81101896215332c39f3ae3daaef92c923f020a6bd46b9158329add8d70e7ffbe06175252b8b477e4ca9bc86ae96b198bda20296235 WHIRLPOOL 2b70ea5df6b9c50bef6df9e05158ad8fd8ac106df1600eb51aa5b42002f05853d76ed446ac6f8b4cfad9e5899e1022f296830f6aadc23c41924ceb8f866c5321
 EBUILD wireshark-1.12.4.ebuild 6244 SHA256 02bc56a450370516854f5724a2f6b0ba0a8f8b07160c8262738c10aae3086dfb SHA512 0fd625acf77240de2115c3dfd853deb6aba2061d000ab89a5deebf432a745a44ab12012087e4b20e560036b600fdccaab9640ef852c52abe5e7b2aed0b88ef5c WHIRLPOOL 99269eae2d3cdb600314bfb6f2503f0cc780eb45742784079368e2af99ac57cd38c7685172964e5d6d2aff24d0811e227c5bc6f486e4a339306d0fb51cebbc0a
-EBUILD wireshark-1.99.5.ebuild 6370 SHA256 bc7bbcf5d1b6a52ecc1aff057d4f00360fa92e407752e275cc518a389d21655f SHA512 dd737784ec3791e73b0b0a6b9e33c92f822a15127a9ed5115fbeda2e0234ab285f5076cd964551481afbc85572974686260850865d0ff5dccda06b2c837de4db WHIRLPOOL 76ac5e22410ff6d00fd6c2ac811b1d0289f0341739a69be1f294886e9802602c82f2b292fb94319e3270cbf4c7c6ae5cddbb91eb135c1c92e6e03085f2ea730b
-EBUILD wireshark-99999999.ebuild 6408 SHA256 294d3c013cd6f6dbe1f112cb07b1b0036e2c7f30e08b55e4c0419c8700d61018 SHA512 e2344bdc3bba41d49371209dff7563bca1ca0ab57152180f7644c9e6892e1f61e84cb05b0ec944be44c6939ed93236f5f79a87296dadb9eb01df9dfd2e290d52 WHIRLPOOL f5d69300d554c57854a14360ba4067782ed87e6cf8d5925e315218b2b0259b88a09124bc5ff9d89dd94474fd123e46353463999546ebcfc3e85da6c7eadb0f35
-MISC ChangeLog 103455 SHA256 5e8b836c41f0f434a287d5ac69a171f83f691f9b3fdfb462a8cc0fe48e5a9e13 SHA512 4942f342f83393a8ee2ebc4786d2be6598de69a3bf96834494234b559b7002929493b1c2e7b2eba54e4adaf7a02bdb00be841e4770b627ae70d0b0bb048b45bd WHIRLPOOL 44b0c658680f09bb8afe966d985d41aa4d0ff37f4a515e39cfa34f8e020cc96ab8077307555d07362a81d62986a7f637425d9048d0c077eeba4be2812063c7fb
+EBUILD wireshark-1.12.5.ebuild 6253 SHA256 fbea9ebe426903e502066792ff68f37b51bfcea0fa66ce4c478c1ddacbfe9e31 SHA512 da821ef3345213ff5058ac38f9f3b4ece543101b71ad5643a785ae0d9b77a1b91fee3e56180e2bb87f83dbb15d6ca5b532427cdd028c16fa58c3f307d7bcb2fd WHIRLPOOL b46da36e99c9fc115bf293d5cbd9b47e1362d15db3a3df84ff743323c903065687ac4793d0c63aa5addd6fb72cb9c041b0dc13af7e6d726c5a9db65f58ac8d34
+EBUILD wireshark-1.99.5.ebuild 6372 SHA256 174f69b104d0d08005baadd9a4b14b1b5fbdfc83f9769daaa570f11d7d4638ec SHA512 94fdb4104c692667e2aa77c5614f1ed35cb44f986de2448bcd7267388ffd36d43b96ae9013f51a966a603add0ab1ea711f6e32300210a11b4dee6f6437073180 WHIRLPOOL 4e167885ebebe43c25608633add36d9d2ad0aa9c12786ddbef9e39ee72d956253861d257995131b4d566a164bf56b8fb103e4fe1f4db9f5943153963eff5ee9f
+EBUILD wireshark-99999999.ebuild 6410 SHA256 2e661f057146fc8a4bc364fc93da7b435d89f7769a0faeb0488a0f93883e67d5 SHA512 e80a3b7f08dcffda896ee01d9c08388caf7b6fe59b5756c4954d4041151d99e3b4d85810cc70c5a64ce61598a1c5b58c1369f9d9b4ef49c8570b1b1ff78d9876 WHIRLPOOL 75ddbcdb78932c324c4134e4f5d6f428dbdd2b9ff2453486e7c0d5f41169ac0b97616ab72f48f9448b6f860b3c5a5d5cd8a7892f9ae69fdf34820c0dbcadef8e
+MISC ChangeLog 103592 SHA256 6582232343756fa4a217d699eda43f96f4ab68e25be6b512fa36bff514c32795 SHA512 25b72fc48c9c7655db1a510d713d160f679e702bab12ff893c4ffb649667445c146ae2e52b5f8092e45ab4f1d99a4fb443f9fdeead283a647026a31ed2c814d5 WHIRLPOOL c40effb3e0188500fc32af3fa626d0480a4865b86c4f29f8557929884c40613267a0f9b973c1143ba73c4f3190690d34f2c28114d7cb01f2c1b236cde4c439fd
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlU0g5IACgkQVWmRsqeSphPKMACfS2hM7mqAWkKld0bz9bxDK7PQ
-smoAnjVuna9ffZqjm+X0uSbXJXuyEnTM
-=xra6
+iEYEAREIAAYFAlVUVAwACgkQVWmRsqeSphNeLQCfTBwR/f84Sx8XBei6FPJpHXwv
+2vEAn3ct2cRi5I4ukeITAFb+4Vwi21H4
+=Pp2x
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.5.ebuild b/net-analyzer/wireshark/wireshark-1.12.5.ebuild
new file mode 100644
index 000000000000..777bab6db311
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.12.5.ebuild
@@ -0,0 +1,249 @@
+# 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.5.ebuild,v 1.1 2015/05/14 07:51:39 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
+
+	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 UIC=$(qt4_get_bindir)/uic '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(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."
+}
diff --git a/net-analyzer/wireshark/wireshark-1.99.5.ebuild b/net-analyzer/wireshark/wireshark-1.99.5.ebuild
index dbd707264da1..ea2e7a72c679 100644
--- a/net-analyzer/wireshark/wireshark-1.99.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.5.ebuild
@@ -1,6 +1,6 @@
 # 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.99.5.ebuild,v 1.3 2015/04/11 00:46:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.5.ebuild,v 1.4 2015/05/14 07:51:39 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
@@ -38,7 +38,7 @@ CDEPEND="
 		x11-libs/gtk+:3
 	)
 	kerberos? ( virtual/krb5 )
-	lua? ( >=dev-lang/lua-5.1 )
+	lua? ( >=dev-lang/lua-5.1:* )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
 	qt4? (
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 5b0abc2cfdd7..74d28dfa16bf 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,6 +1,6 @@
 # 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-99999999.ebuild,v 1.12 2015/04/20 04:41:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.13 2015/05/14 07:51:39 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user
@@ -38,7 +38,7 @@ CDEPEND="
 		x11-libs/gtk+:3
 	)
 	kerberos? ( virtual/krb5 )
-	lua? ( >=dev-lang/lua-5.1 )
+	lua? ( >=dev-lang/lua-5.1:* )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
 	qt4? (