Version bump (bug #542206).

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

3 files changed, 259 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 66902b1f9a44..58d32803f2b6 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.694 2015/02/05 09:34:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.695 2015/03/05 08:13:31 jer Exp $
+
+*wireshark-1.12.4 (05 Mar 2015)
+
+  05 Mar 2015; Jeroen Roovers <jer@gentoo.org> +wireshark-1.12.4.ebuild:
+  Version bump (bug #542206).
 
 *wireshark-1.99.2 (05 Feb 2015)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index cef009d0cf11..51fb08a8e625 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -9,16 +9,18 @@ AUX wireshark-1.99.0.1975-gcc_option.patch 2939 SHA256 4d534da5b4a45f311a622108a
 AUX wireshark-1.99.0.1975-sse4_2.patch 555 SHA256 bef93463a257b6154cf55f85e7860b373264e2a89f212f6db773ad02f3a6bedf SHA512 5086b36ecf9b1dd3292011602c8824a572dc759a0e35049a39f0da8045a93738a8f2c2b4c053a0f1d999dc8cdb7bfec3b33f2780d8795135dd65984355485578 WHIRLPOOL 55301e3ff688fbe7df405d40dd8a6e942d1613ee0e4543f46fa83ac6f0688170753fe1cfc67bbe00b9bd7a46cf73513530cc746ee29ba7845e3a45d12ed07743
 AUX wireshark-1.99.1-sbc.patch 665 SHA256 c76afab0f03c59001df597948153bf76bbdc14da30a2de9e93831bed6dc6e898 SHA512 3e71c9ecfb07c96df8330b6a1fa959bde79bf7531f106b7f90acc59a82f3b1ec74ae1643b9b13cd6a642b25766996afa7083ac1daa2bada765134ae8846112a8 WHIRLPOOL 8b53a06ffa03579ed71a558cb475e05bb7152463123089cec80b3f00ae68bab02fcba2fa789471419175965be6af1604e8371b30b9dd04a5b967c995627a5517
 DIST wireshark-1.12.3.tar.bz2 29211228 SHA256 69950b9dcb1a630982b5f680554d73d27ee0dc856fc6aeef88c8d04eb5ac33ea SHA512 370ae828a638edac378242a996b0279747a2f54689387fe415f1f66e267a4b52c71a1a369755f3eaa6a2db0e970913dab0b5d3704af3461aa9d7d64abb3a49c6 WHIRLPOOL 4152abb29cc02236449844526207c404628c24a680e059cf8352a8ba8d50003dffca606fca8bf3a157b9970a1fba6943e0d06f51afaa847c4103ebbcbc4aeb44
+DIST wireshark-1.12.4.tar.bz2 29257016 SHA256 de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312 SHA512 ceeb6cb4489ce150a6065e586f83cfbcd0fd79cd05cf8ab5b0346baa03eaa5188503b18a1f228458447235d79f765c410e6b52b9aae77547f80b206429c77b24 WHIRLPOOL 31e3bce9d9003140f808b49e263727bb9386530a81a4ccd6e24cb6bc78f95cc5104da360be7edcd3a214de713b65931b4e77054cb1c3480d8e8c892fce57ed9a
 DIST wireshark-1.99.2.tar.bz2 30265896 SHA256 02152530b2748cb8012f685c81bed152242e15ecb0c61224ae6ed11491fc0711 SHA512 33c39a7b118ab5c33c137615e0494da9b08a2112243e9bece4df5c2da9d12c7fb42830a4d022f0d5d4c184282b52633b05197a6c6ae5fea34a2544f86e01f731 WHIRLPOOL a551bfada396e88198b633b9f7c31b95cc21acad85e50c4915a8d54257851f16c4c3e0a9be291c874d5bf966e699f5ca20f3b096ffb982f2645b030132658642
 EBUILD wireshark-1.12.3.ebuild 6160 SHA256 15bfcb8012983ff5c18948554c4762eb0a75d9ae61e9cbb34ec489881423a7b3 SHA512 58b8805b3b4f02f9c6debfe479e159718c383d8518b5231fe9ef5c02c04b0b92703e33d776ffe7c37cbee035abfa5c41c9a3d7d4aae90a68e43c4da906e91ce1 WHIRLPOOL 40c5c8b0904dee397fc59a1cd5e3c42c3b64ed40381fe35128f2a1f8b9bba2166d2b2735df331ea71ec955655bf1b7b1a89f5d464ca95dd0a5ea9c4e9798bc60
+EBUILD wireshark-1.12.4.ebuild 6167 SHA256 b44f82e4522ae566b40fbfcbbbcd91b20add728d1de2ce146d8ec47907971c0f SHA512 78ad3d37f535fe839130b94336fa3bccf0b63e065682f11b94a375decf123ee94b1da86976a99cb6a44810ddf2e1027bc3e22f4c9c941caa31555aac0fce04bb WHIRLPOOL e1ab42f72492c4df545cdf4fc6cb035a527029ddef34ae8355fda5bf9477a66f048b5cf13c3dddcc7b9e62344dd45141411f4da318ce752083dc955ebc1304d7
 EBUILD wireshark-1.99.2.ebuild 6237 SHA256 c2c40d36582f6876bb38c3b2fa21a969c7ae281ead466c5a398ccab1bc3d81ed SHA512 38534b5d79d48d946899e4dbe32bb9a82ed790619fc728da966c01ba60a450240bc086e8bf7566ce0b0c25efac8e28166f0ef9992d4ddcdf811b68ee468e4eba WHIRLPOOL da2f75f8e4c74f7a4dbcace23ee4fea093c29ea329f24f8379047df4eab9354e950ec9670fb610c435e84f560520fcbe98ddb35b963b799f958a3c4d25a0290f
 EBUILD wireshark-99999999.ebuild 6286 SHA256 e843ecbc9e5ecfb03f3457bf66e0db317c50453c8fcab03da252c8ec377f290e SHA512 5c1b420d80c38e7f14748ca4023a6774530ef72ee864281fb56f4c9a3474f9935772281038e63b5cd03afb0611f9f934211066e1be9b7df01799a590749ebdc1 WHIRLPOOL 1841d27f0bec41c2e0d412967c13c3b12168f95a64b9e3fbffa8fe397ac7cc5f2d2a8a449d7e9a94ba0995629acb44612c0489241b4845ac0d57ecf4127586a9
-MISC ChangeLog 101114 SHA256 4793761b6aecfc5ac9559feb9a47af4cb25ef478b77f895c1e3f07121bb4556f SHA512 4a917b1bdbe6bccde6696b75fcf995df789bef289f6abd0dfecc99af1a8b1e3c7d9dd40589f85f4ca191e5fd4659047cf0f8b1546708aa93c20a534378def77f WHIRLPOOL f400877952bb9b2ca58114aa55b3a58c864b51eb99a21ad19958044128e0e9774a86f960b8564d883334b04e4f5e2276ef9e42725368e7aae20ec0ab4924b9c5
+MISC ChangeLog 101251 SHA256 e3426071d9d91c26b787c2467f13d6beb2d2f889781d9025da9f8dc585f33db2 SHA512 9122b4d2c1a1b52fcea7e34ab4f9db5e0b5c749f1f0b5b8088967653717dfde1738047aa1887d24fefbdd6926040affa7734eef3d468edad32b686cedc57461a WHIRLPOOL 64e8e08d6dbae3097a37452b5b0953acf0dba89ec82ceca748306f22b833243b22a24cacb806c2db3f3506b6fc95d2e5c99be9418855d03df35a119d6c41313d
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTTOSIACgkQVWmRsqeSphMKBwCfc48XwSv+CZttOrJRclQMUCuE
-PI0AniQHdsMbFG+qt2FOP2MpH/dF/Z15
-=eNBh
+iEYEAREIAAYFAlT4ECwACgkQVWmRsqeSphMNywCfUiGJ++HUzS8N2uAzCh191Hnp
+1UIAnjh6yC+dI6eR/irlrh6tYXm++dep
+=Y5nC
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.4.ebuild b/net-analyzer/wireshark/wireshark-1.12.4.ebuild
new file mode 100644
index 000000000000..9c5f0849de0f
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.12.4.ebuild
@@ -0,0 +1,247 @@
+# 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.4.ebuild,v 1.1 2015/03/05 08:13:31 jer Exp $
+
+EAPI=5
+inherit autotools eutils fcaps multilib 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 qt5 MOC=/usr/$(get_libdir)/qt5/bin/moc '') \
+		$(usex qt5 UIC=/usr/$(get_libdir)/qt5/bin/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."
+}