public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-08-14  5:04 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-08-14  5:04 UTC (permalink / raw
  To: gentoo-commits

commit:     ec6b413fb9250619c0989149c70f716121ac2ddd
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 05:03:55 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 05:03:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec6b413f

net-analyzer/wireshark: Version bump (bug #557522).

Package-Manager: portage-2.2.20.1

 net-analyzer/wireshark/Manifest                |   1 +
 net-analyzer/wireshark/wireshark-1.12.7.ebuild | 258 +++++++++++++++++++++++++
 2 files changed, 259 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 643bb47..a5546b7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-1.12.6.tar.bz2 29166493 SHA256 22ac0cc872f12cef9bb2cacfe0720eed8533dc5cea102d21de511620606cb3b6 SHA512 a8fb576e359d6534fc2df3372f23c1f338aed393749786cde21d8593f50ccec154d05c9298f7ddfcaa3a0dcee921975c6a40070a8d0b84f6fbb7f8df16b2b17b WHIRLPOOL d6c8cc268e46ab59da1d06d73dc5a7e7e16f9b07297f04a6e997fbf72a5a8ceb71847f892ab0fc281e843e3f23e8ed3bf85580b19e76e2103b0cb388c2bc9850
+DIST wireshark-1.12.7.tar.bz2 29202490 SHA256 c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c SHA512 a4012fa56e8b99e5fb072c1fb82c783a547395ddb013a9473858fdf9fa99270313d6059f9ee210d56c00f420bbad9cab30bdd3c45e9ff07d4f5967c18d1d0f38 WHIRLPOOL 84c60871fb1d8022885108c97323a892bc9ee035fc421e1e96b76819291337e8d0026be6c77e62f03582fb854188535e5fceb50eb17830f5b1a3ff69b3474d4c
 DIST wireshark-1.99.8.tar.bz2 30291568 SHA256 6e03021a82cbc6b039210d37694ae51de101b7ffd4eb0e92a65ff84b4499e211 SHA512 daee99e9619b10900479c5f99ae4d33e12a2fbbc1a3065e88a77d907443e4b79a401206cf7c2dd81ffede7f1b55e97cc19faf232437334606d0cdbf0bafc98bf WHIRLPOOL 24f9270ba1ad38ef0a9a74e4c394208f27f5a05f98fc04fcc7223c92ae7259fb7022ca96867815c060ca9a76d5e76b1fb53a4757bd0cd6a1aedcfcb71649da4c

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
new file mode 100644
index 0000000..abb5bdb
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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
+		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 \
+		"${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
+		"${FILESDIR}"/${PN}-1.12.6-rcc.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
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-08-14 22:21 Mikle Kolyada
  0 siblings, 0 replies; 673+ messages in thread
From: Mikle Kolyada @ 2015-08-14 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7b620d58a6edeffc99332754f5824ca2964e33a5
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 22:17:53 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 22:18:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b620d58

net-analyzer/wireshark: amd64 stable wrt bug #557522

Package-Manager: portage-2.2.20.1

 net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index abb5bdb..71dbf50 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-08-15  9:31 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-08-15  9:31 UTC (permalink / raw
  To: gentoo-commits

commit:     ddb4a51c089fdab8d1552870188f8d7ffc674bc2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 09:30:01 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 09:30:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddb4a51c

net-analyzer/wireshark: Stable for PPC64 (bug #557522).

Package-Manager: portage-2.2.20.1

 net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index 71dbf50..f95b0a3 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-08-16 12:13 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-08-16 12:13 UTC (permalink / raw
  To: gentoo-commits

commit:     c405f0e1e60442ce46f7d2d5c65ef58dc20a1df3
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 12:12:34 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 12:12:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c405f0e1

net-analyzer/wireshark: Stable for HPPA (bug #557522).

Package-Manager: portage-2.2.20.1

 net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index f95b0a3..a0578c3 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-08-16 14:37 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2015-08-16 14:37 UTC (permalink / raw
  To: gentoo-commits

commit:     5e535ab740d949d0b3c7cfc5789a9ce73a40ef4c
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 14:37:36 2015 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 14:37:36 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e535ab7

net-analyzer/wireshark: add alpha keyword

Gentoo-Bug: 557522

Package-Manager: portage-2.2.20.1

 net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index a0578c3..3fac5b5 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-08-16 17:48 Mikle Kolyada
  0 siblings, 0 replies; 673+ messages in thread
From: Mikle Kolyada @ 2015-08-16 17:48 UTC (permalink / raw
  To: gentoo-commits

commit:     b8d9c80347de5fa81297c29f36e2ea6d0e318670
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 17:46:10 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 17:46:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8d9c803

net-analyzer/wireshark: ia64 stable wrt bug #557510

Package-Manager: portage-2.2.20.1

 net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index 3fac5b5..454219e 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-08-26  7:28 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2015-08-26  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     e2cb520e1944c5097e006a38c7a37c50dee52c69
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 07:27:36 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 07:27:36 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2cb520e

net-analyzer/wireshark: ppc stable wrt bug #557522

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index 454219e..3293a5d 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-09-04  4:13 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-09-04  4:13 UTC (permalink / raw
  To: gentoo-commits

commit:     524fbd471ca8ef3623b77e895fd6e93feca49a84
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 04:11:40 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 04:13:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524fbd47

net-analyzer/wireshark: Version bump.

Package-Manager: portage-2.2.20.1

 net-analyzer/wireshark/Manifest                                         | 2 +-
 .../wireshark/{wireshark-1.99.8.ebuild => wireshark-1.99.9.ebuild}      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a5546b7..f88a3e9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,3 @@
 DIST wireshark-1.12.6.tar.bz2 29166493 SHA256 22ac0cc872f12cef9bb2cacfe0720eed8533dc5cea102d21de511620606cb3b6 SHA512 a8fb576e359d6534fc2df3372f23c1f338aed393749786cde21d8593f50ccec154d05c9298f7ddfcaa3a0dcee921975c6a40070a8d0b84f6fbb7f8df16b2b17b WHIRLPOOL d6c8cc268e46ab59da1d06d73dc5a7e7e16f9b07297f04a6e997fbf72a5a8ceb71847f892ab0fc281e843e3f23e8ed3bf85580b19e76e2103b0cb388c2bc9850
 DIST wireshark-1.12.7.tar.bz2 29202490 SHA256 c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c SHA512 a4012fa56e8b99e5fb072c1fb82c783a547395ddb013a9473858fdf9fa99270313d6059f9ee210d56c00f420bbad9cab30bdd3c45e9ff07d4f5967c18d1d0f38 WHIRLPOOL 84c60871fb1d8022885108c97323a892bc9ee035fc421e1e96b76819291337e8d0026be6c77e62f03582fb854188535e5fceb50eb17830f5b1a3ff69b3474d4c
-DIST wireshark-1.99.8.tar.bz2 30291568 SHA256 6e03021a82cbc6b039210d37694ae51de101b7ffd4eb0e92a65ff84b4499e211 SHA512 daee99e9619b10900479c5f99ae4d33e12a2fbbc1a3065e88a77d907443e4b79a401206cf7c2dd81ffede7f1b55e97cc19faf232437334606d0cdbf0bafc98bf WHIRLPOOL 24f9270ba1ad38ef0a9a74e4c394208f27f5a05f98fc04fcc7223c92ae7259fb7022ca96867815c060ca9a76d5e76b1fb53a4757bd0cd6a1aedcfcb71649da4c
+DIST wireshark-1.99.9.tar.bz2 30495072 SHA256 be7ac8f8eb2c08e0e3d62da9f781db0dc5322a9cbcb024d3f86a66a06185e182 SHA512 d08348df7951ddc9c441bf9e80ab7ea281ccb92c7aa837dcae172037ee3486dcefaa28e8286a5e1654404a57bc0e004320f01c32c55af6f771dc20814d322066 WHIRLPOOL 09708dbe954dd72ae7b9295b57bcc420f36a5ae76ba27ace6c50cf85b19f295a2a10ffe3039018d0dbbba3c72cc3b0e4689512511b48a6ec706eab89f549e94c

diff --git a/net-analyzer/wireshark/wireshark-1.99.8.ebuild b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
similarity index 100%
rename from net-analyzer/wireshark/wireshark-1.99.8.ebuild
rename to net-analyzer/wireshark/wireshark-1.99.9.ebuild


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-09-06  8:32 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2015-09-06  8:32 UTC (permalink / raw
  To: gentoo-commits

commit:     e59658b79da7d65443edade013024b5225f5ef61
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 08:32:02 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 08:32:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e59658b7

net-analyzer/wireshark: sparc stable wrt bug #557522

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="sparc"

 net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index 3293a5d..9b712da 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-09-27 15:49 Mikle Kolyada
  0 siblings, 0 replies; 673+ messages in thread
From: Mikle Kolyada @ 2015-09-27 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     b60f34489823358478011d08b49a62e16fb91585
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 15:46:37 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 15:46:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60f3448

net-analyzer/wireshark: x86 stable wrt bug #557522

Package-Manager: portage-2.2.20.1

 net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index 9b712da..47ff12c 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-07  5:42 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-10-07  5:42 UTC (permalink / raw
  To: gentoo-commits

commit:     4e516d316bfa68c96cba91aa0dac30f354343a8c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  7 05:39:33 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 05:42:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e516d31

net-analyzer/wireshark: Install a desktop file with USE=qt5 (bug #562022 by Paolo Pedroni).

Package-Manager: portage-2.2.22

 net-analyzer/wireshark/wireshark-1.12.7.ebuild   | 2 +-
 net-analyzer/wireshark/wireshark-1.99.9.ebuild   | 2 +-
 net-analyzer/wireshark/wireshark-99999999.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index 47ff12c..e227f75 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -234,7 +234,7 @@ src_install() {
 		domenu wireshark.desktop
 	fi
 
-	if use qt4; then
+	if use qt4 || use qt5; then
 		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
 		domenu wireshark-qt.desktop
 	fi

diff --git a/net-analyzer/wireshark/wireshark-1.99.9.ebuild b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
index 1479231..591f9fe 100644
--- a/net-analyzer/wireshark/wireshark-1.99.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
@@ -240,7 +240,7 @@ src_install() {
 		domenu wireshark.desktop
 	fi
 
-	if use qt4; then
+	if use qt4 || use qt5; then
 		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
 		domenu wireshark-qt.desktop
 	fi

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 02e46af..bd4b947 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -243,7 +243,7 @@ src_install() {
 		domenu wireshark.desktop
 	fi
 
-	if use qt4; then
+	if use qt4 || use qt5; then
 		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
 		domenu wireshark-qt.desktop
 	fi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-09  3:29 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-10-09  3:29 UTC (permalink / raw
  To: gentoo-commits

commit:     6fb5f690b12668abb5921f35092ee592b6a952ed
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  9 03:29:09 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 03:29:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb5f690

net-analyzer/wireshark: Install icons with USE=qt5 too (bug #562022).

 net-analyzer/wireshark/wireshark-1.12.7.ebuild   | 2 +-
 net-analyzer/wireshark/wireshark-1.99.9.ebuild   | 2 +-
 net-analyzer/wireshark/wireshark-99999999.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index e227f75..d7c8afd 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -220,7 +220,7 @@ src_install() {
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
-	if use gtk3 || use qt4; then
+	if use gtk3 || use qt4 || use qt5; then
 		local c d
 		for c in hi lo; do
 			for d in 16 32 48; do

diff --git a/net-analyzer/wireshark/wireshark-1.99.9.ebuild b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
index 591f9fe..348d4e4 100644
--- a/net-analyzer/wireshark/wireshark-1.99.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
@@ -226,7 +226,7 @@ src_install() {
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
-	if use gtk3 || use qt4; then
+	if use gtk3 || use qt4 || use qt5; then
 		local c d
 		for c in hi lo; do
 			for d in 16 32 48; do

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index bd4b947..6c12e53 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -229,7 +229,7 @@ src_install() {
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
-	if use gtk3 || use qt4; then
+	if use gtk3 || use qt4 || use qt5; then
 		local c d
 		for c in hi lo; do
 			for d in 16 32 48; do


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-15 10:01 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-10-15 10:01 UTC (permalink / raw
  To: gentoo-commits

commit:     d4b14d7ad81407b402440b9bf0f76030b06c203b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 09:03:33 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 10:01:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b14d7a

net-analyzer/wireshark: Version bump.

Package-Manager: portage-2.2.23

 net-analyzer/wireshark/Manifest                   |   1 +
 net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild | 265 ++++++++++++++++++++++
 2 files changed, 266 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6e74530..bdbbfbc 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-1.12.7.tar.bz2 29202490 SHA256 c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c SHA512 a4012fa56e8b99e5fb072c1fb82c783a547395ddb013a9473858fdf9fa99270313d6059f9ee210d56c00f420bbad9cab30bdd3c45e9ff07d4f5967c18d1d0f38 WHIRLPOOL 84c60871fb1d8022885108c97323a892bc9ee035fc421e1e96b76819291337e8d0026be6c77e62f03582fb854188535e5fceb50eb17830f5b1a3ff69b3474d4c
 DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5 WHIRLPOOL ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9
 DIST wireshark-1.99.9.tar.bz2 30495072 SHA256 be7ac8f8eb2c08e0e3d62da9f781db0dc5322a9cbcb024d3f86a66a06185e182 SHA512 d08348df7951ddc9c441bf9e80ab7ea281ccb92c7aa837dcae172037ee3486dcefaa28e8286a5e1654404a57bc0e004320f01c32c55af6f771dc20814d322066 WHIRLPOOL 09708dbe954dd72ae7b9295b57bcc420f36a5ae76ba27ace6c50cf85b19f295a2a10ffe3039018d0dbbba3c72cc3b0e4689512511b48a6ec706eab89f549e94c
+DIST wireshark-2.0.0rc1.tar.bz2 30779877 SHA256 a201938913f770cb1f022165574d312b66b97efaa6ad7a9c90daf325f7806582 SHA512 95b1995a1d6684ab8a0a93c86cd1101c9df6ee1f6d0c76d663ec32396d3ad10d4765b598c19a068bd95994ac6568060c64461a3de58d1d582ebec8f953e868f9 WHIRLPOOL a64cd0be0a145e461c9c2e4b7e495f30a72521ef0069809b1bf5da048c2e75e08516eef49eff838e328fb8aad91c41c5814f3986af1641270ae6495d3b9647a6

diff --git a/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild
new file mode 100644
index 0000000..74ed55f
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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=""
+IUSE="
+	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
+	portaudio +qt4 qt5 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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
+		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.99.0.1975-sse4_2.patch \
+		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
+		"${FILESDIR}"/${PN}-1.99.8-qtchooser.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
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --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) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(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) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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 || use qt5; 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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-15 10:31 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-10-15 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     b68773a2ffd43500f54bd8f00d33e94cba5679c6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 10:31:35 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 10:31:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b68773a2

net-analyzer/wireshark: Port applicable 2.0.0_rc1 changes to live ebuild

Package-Manager: portage-2.2.23

 net-analyzer/wireshark/wireshark-99999999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 6c12e53..c17f5f2 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -99,7 +99,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
 		"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
 		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
 		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
 
 	epatch_user
@@ -197,7 +196,7 @@ src_install() {
 		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
+			doins docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
 		fi
 	fi
 


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-16  5:20 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-10-16  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     dff780180ee25aa771c6d37dfc0f2655ff5d5336
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 05:20:13 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 05:20:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff78018

net-analyzer/wireshark: Stable for HPPA PPC64 (bug #563096).

Package-Manager: portage-2.2.23
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-1.12.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.8.ebuild b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
index 17cc95a..c3e104a 100644
--- a/net-analyzer/wireshark/wireshark-1.12.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-16  6:59 Mikle Kolyada
  0 siblings, 0 replies; 673+ messages in thread
From: Mikle Kolyada @ 2015-10-16  6:59 UTC (permalink / raw
  To: gentoo-commits

commit:     f4666e0cb9914763dac931cff90b6d8b223b19cf
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 06:56:09 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 06:56:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4666e0c

net-analyzer/wireshark: amd64 stable wrt bug #563096

Package-Manager: portage-2.2.20.1

 net-analyzer/wireshark/wireshark-1.12.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.8.ebuild b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
index c3e104a..f250189 100644
--- a/net-analyzer/wireshark/wireshark-1.12.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-16  8:09 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2015-10-16  8:09 UTC (permalink / raw
  To: gentoo-commits

commit:     8e9994757900168d84dfd58340fef27e9a3288ff
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 08:09:07 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 08:09:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e999475

net-analyzer/wireshark: x86 stable wrt bug #563096

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 net-analyzer/wireshark/wireshark-1.12.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.8.ebuild b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
index f250189..6e885f1 100644
--- a/net-analyzer/wireshark/wireshark-1.12.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-21 17:39 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2015-10-21 17:39 UTC (permalink / raw
  To: gentoo-commits

commit:     f2f72835deaa4bdcd3e79d76b201f1f77a6419ac
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 17:38:22 2015 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 17:39:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2f72835

net-analyzer/wireshark: add alpha keyword

Gentoo-Bug: 563096

Package-Manager: portage-2.2.23

 net-analyzer/wireshark/wireshark-1.12.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.8.ebuild b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
index 6e885f1..b571087 100644
--- a/net-analyzer/wireshark/wireshark-1.12.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-23  5:19 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-10-23  5:19 UTC (permalink / raw
  To: gentoo-commits

commit:     c5f30611b1cd0ffb13295d45262628b43e3e8c5a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 05:18:50 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 05:19:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f30611

net-analyzer/wireshark: Install pcap icons, explicitly name Qt variant in desktop file by miflab (bug #563246).

Package-Manager: portage-2.2.23

 ...2.0.0_rc1.ebuild => wireshark-1.12.8-r1.ebuild} | 43 +++++++++++-----------
 ....0_rc1.ebuild => wireshark-2.0.0_rc1-r1.ebuild} | 10 ++++-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild
similarity index 86%
copy from net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild
copy to net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild
index 74ed55f..730e6ee 100644
--- a/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild
@@ -7,22 +7,20 @@ inherit autotools eutils fcaps flag-o-matic 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"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS=""
+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 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib
+	portaudio +qt4 qt5 sbc selinux smi ssl zlib
 "
 REQUIRED_USE="
 	ssl? ( crypt )
 	?? ( qt4 qt5 )
 "
 
-S=${WORKDIR}/${P/_/}
-
 GTK_COMMON_DEPEND="
 	x11-libs/gdk-pixbuf
 	x11-libs/pango
@@ -95,9 +93,12 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
 		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-		"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
-		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+		"${FILESDIR}"/${PN}-1.12.8-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 \
+		"${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
+		"${FILESDIR}"/${PN}-1.12.6-rcc.patch
 
 	epatch_user
 
@@ -127,13 +128,7 @@ src_configure() {
 		myconf+=( "--disable-wireshark" )
 	fi
 
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
+	use qt4 && export QT_MIN_VERSION=4.6.0
 
 	if use qt5; then
 		export QT_MIN_VERSION=5.3.0
@@ -158,8 +153,8 @@ src_configure() {
 		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
+		$(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 '') \
@@ -171,7 +166,6 @@ src_configure() {
 		$(use_with ssl gnutls) \
 		$(use_with zlib) \
 		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
 		--disable-profile-build \
 		--disable-usr-local \
 		--disable-warnings-as-errors \
@@ -190,12 +184,11 @@ src_compile() {
 
 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-{a4,us}.pdf docbook/release-notes.pdf
+			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
 		fi
 	fi
 
@@ -235,6 +228,10 @@ src_install() {
 				newins image/${c}${d}-app-wireshark.png wireshark.png
 			done
 		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
 	fi
 
 	if use gtk3; then
@@ -242,7 +239,11 @@ src_install() {
 	fi
 
 	if use qt4 || use qt5; then
-		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
+		sed \
+			-e '/Exec=/s|wireshark|&-qt|g' \
+			-e 's|^Name.*=Wireshark|& (Qt)|g' \
+			wireshark.desktop > wireshark-qt.desktop \
+			|| die
 		domenu wireshark-qt.desktop
 	fi
 

diff --git a/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild
similarity index 95%
rename from net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild
rename to net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild
index 74ed55f..a7fa989 100644
--- a/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild
@@ -235,6 +235,10 @@ src_install() {
 				newins image/${c}${d}-app-wireshark.png wireshark.png
 			done
 		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
 	fi
 
 	if use gtk3; then
@@ -242,7 +246,11 @@ src_install() {
 	fi
 
 	if use qt4 || use qt5; then
-		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
+		sed \
+			-e '/Exec=/s|wireshark|&-qt|g' \
+			-e 's|^Name.*=Wireshark|& (Qt)|g' \
+			wireshark.desktop > wireshark-qt.desktop \
+			|| die
 		domenu wireshark-qt.desktop
 	fi
 


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-23  5:42 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-10-23  5:42 UTC (permalink / raw
  To: gentoo-commits

commit:     4a7332f9759b415194639ddf1585940cd78c37ac
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 05:41:54 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 05:42:31 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a7332f9

net-analyzer/wireshark: Install pcap icons, explicitly name Qt variant in desktop file by miflab (bug #563246).

Package-Manager: portage-2.2.23

 net-analyzer/wireshark/wireshark-99999999.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index c17f5f2..4a25e68 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -236,6 +236,10 @@ src_install() {
 				newins image/${c}${d}-app-wireshark.png wireshark.png
 			done
 		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
 	fi
 
 	if use gtk3; then
@@ -243,7 +247,11 @@ src_install() {
 	fi
 
 	if use qt4 || use qt5; then
-		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
+		sed \
+			-e '/Exec=/s|wireshark|&-qt|g' \
+			-e 's|^Name.*=Wireshark|& (Qt)|g' \
+			wireshark.desktop > wireshark-qt.desktop \
+			|| die
 		domenu wireshark-qt.desktop
 	fi
 


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-10-31  5:02 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-10-31  5:02 UTC (permalink / raw
  To: gentoo-commits

commit:     4ed3e9c503a03fb33d81e546cc8d9d9ec4c6b099
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 05:02:28 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 05:02:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed3e9c5

net-analyzer/wireshark: Version bump.

Package-Manager: portage-2.2.23

 net-analyzer/wireshark/Manifest                                         | 2 +-
 .../{wireshark-2.0.0_rc1-r1.ebuild => wireshark-2.0.0_rc2.ebuild}       | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 9754278..4eccaea 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,3 @@
 DIST wireshark-1.12.7.tar.bz2 29202490 SHA256 c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c SHA512 a4012fa56e8b99e5fb072c1fb82c783a547395ddb013a9473858fdf9fa99270313d6059f9ee210d56c00f420bbad9cab30bdd3c45e9ff07d4f5967c18d1d0f38 WHIRLPOOL 84c60871fb1d8022885108c97323a892bc9ee035fc421e1e96b76819291337e8d0026be6c77e62f03582fb854188535e5fceb50eb17830f5b1a3ff69b3474d4c
 DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5 WHIRLPOOL ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9
-DIST wireshark-2.0.0rc1.tar.bz2 30779877 SHA256 a201938913f770cb1f022165574d312b66b97efaa6ad7a9c90daf325f7806582 SHA512 95b1995a1d6684ab8a0a93c86cd1101c9df6ee1f6d0c76d663ec32396d3ad10d4765b598c19a068bd95994ac6568060c64461a3de58d1d582ebec8f953e868f9 WHIRLPOOL a64cd0be0a145e461c9c2e4b7e495f30a72521ef0069809b1bf5da048c2e75e08516eef49eff838e328fb8aad91c41c5814f3986af1641270ae6495d3b9647a6
+DIST wireshark-2.0.0rc2.tar.bz2 30838572 SHA256 b1d2139bd1e1b008337546059beece59e24387e7b96c3d691203f0ce1881b6c8 SHA512 120bad8bd75c37dc1b12f3878aee68669843f779b6f440e07f106faa354ba5a5b436d8076d9f8e68508c5f23e92e0e30c8e4ce094bca0954cad6502eb24f5451 WHIRLPOOL de476509e20ca457a7ea06e31f3e8708f085e6c7e584a91d88a81f5a6b43249fa612b5e01d464a18356b91da238dcb66d5529c8826277d0d1e2ba117a0d48eee

diff --git a/net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild b/net-analyzer/wireshark/wireshark-2.0.0_rc2.ebuild
similarity index 100%
rename from net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild
rename to net-analyzer/wireshark/wireshark-2.0.0_rc2.ebuild


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-11-04 14:26 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2015-11-04 14:26 UTC (permalink / raw
  To: gentoo-commits

commit:     31e8703b6181c338b476c2c5c08ea5fc18e0b507
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 14:26:38 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 14:26:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e8703b

net-analyzer/wireshark: ppc stable wrt bug #563096

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 net-analyzer/wireshark/wireshark-1.12.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.8.ebuild b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
index b571087..30f69b6 100644
--- a/net-analyzer/wireshark/wireshark-1.12.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-11-05 10:58 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2015-11-05 10:58 UTC (permalink / raw
  To: gentoo-commits

commit:     fc5ca24e324e3714bda43a11521bd8e06496f131
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  5 10:58:22 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Nov  5 10:58:22 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5ca24e

net-analyzer/wireshark: sparc stable wrt bug #563096

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="sparc"

 net-analyzer/wireshark/wireshark-1.12.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.8.ebuild b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
index 30f69b6..eb60a9b 100644
--- a/net-analyzer/wireshark/wireshark-1.12.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-11-07 23:51 Mikle Kolyada
  0 siblings, 0 replies; 673+ messages in thread
From: Mikle Kolyada @ 2015-11-07 23:51 UTC (permalink / raw
  To: gentoo-commits

commit:     4672ae9961fcc2fd15a479d032db6513139c390a
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 23:48:20 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 23:48:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4672ae99

net-analyzer/wireshark: ia64 stable wrt bug #563096

Package-Manager: portage-2.2.20.1

 net-analyzer/wireshark/wireshark-1.12.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.8.ebuild b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
index eb60a9b..14f4796 100644
--- a/net-analyzer/wireshark/wireshark-1.12.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
@@ -11,7 +11,7 @@ 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"
+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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-11-12  7:35 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-11-12  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     d8b32261265a31de25fcfbcdc02783055480191c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 07:33:55 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 07:33:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b32261

net-analyzer/wireshark: Version bump.

Package-Manager: portage-2.2.24

 net-analyzer/wireshark/Manifest                                         | 2 +-
 .../{wireshark-2.0.0_rc2.ebuild => wireshark-2.0.0_rc3.ebuild}          | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 4eccaea..40505a0 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,3 @@
 DIST wireshark-1.12.7.tar.bz2 29202490 SHA256 c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c SHA512 a4012fa56e8b99e5fb072c1fb82c783a547395ddb013a9473858fdf9fa99270313d6059f9ee210d56c00f420bbad9cab30bdd3c45e9ff07d4f5967c18d1d0f38 WHIRLPOOL 84c60871fb1d8022885108c97323a892bc9ee035fc421e1e96b76819291337e8d0026be6c77e62f03582fb854188535e5fceb50eb17830f5b1a3ff69b3474d4c
 DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5 WHIRLPOOL ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9
-DIST wireshark-2.0.0rc2.tar.bz2 30838572 SHA256 b1d2139bd1e1b008337546059beece59e24387e7b96c3d691203f0ce1881b6c8 SHA512 120bad8bd75c37dc1b12f3878aee68669843f779b6f440e07f106faa354ba5a5b436d8076d9f8e68508c5f23e92e0e30c8e4ce094bca0954cad6502eb24f5451 WHIRLPOOL de476509e20ca457a7ea06e31f3e8708f085e6c7e584a91d88a81f5a6b43249fa612b5e01d464a18356b91da238dcb66d5529c8826277d0d1e2ba117a0d48eee
+DIST wireshark-2.0.0rc3.tar.bz2 30951707 SHA256 11f46b2d202f923c87a0b8e1a07bd9910bbcc5c265c69de3a23dde82e0f647e3 SHA512 42c914ff600306a81616d7fb7dda90e0c11af05ff226c23fee0c21b62ad8db63f3cbe4201c93bc265a797dcd9927c0e0201602d2af7a869167f015232f149782 WHIRLPOOL 97a133a0cc8862cb9bebe29eae14c01ab0d7a5146256d54604a88a170ed7ed86658989e616b99d62d920866f8f5a120fc633c38b81114132a18795c61e037d9d

diff --git a/net-analyzer/wireshark/wireshark-2.0.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-2.0.0_rc3.ebuild
similarity index 100%
rename from net-analyzer/wireshark/wireshark-2.0.0_rc2.ebuild
rename to net-analyzer/wireshark/wireshark-2.0.0_rc3.ebuild


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-11-21  4:53 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-11-21  4:53 UTC (permalink / raw
  To: gentoo-commits

commit:     76079176be6a22502c25090057341fa96c93feb8
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 04:52:48 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 04:53:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76079176

net-analyzer/wireshark: Version bump (bug #566180 by Pavel Půlpán).

Package-Manager: portage-2.2.25

 net-analyzer/wireshark/Manifest                                         | 2 +-
 .../wireshark/{wireshark-2.0.0_rc3.ebuild => wireshark-2.0.0.ebuild}    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 4459e4c..c5bad4f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,2 @@
 DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5 WHIRLPOOL ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9
-DIST wireshark-2.0.0rc3.tar.bz2 30951707 SHA256 11f46b2d202f923c87a0b8e1a07bd9910bbcc5c265c69de3a23dde82e0f647e3 SHA512 42c914ff600306a81616d7fb7dda90e0c11af05ff226c23fee0c21b62ad8db63f3cbe4201c93bc265a797dcd9927c0e0201602d2af7a869167f015232f149782 WHIRLPOOL 97a133a0cc8862cb9bebe29eae14c01ab0d7a5146256d54604a88a170ed7ed86658989e616b99d62d920866f8f5a120fc633c38b81114132a18795c61e037d9d
+DIST wireshark-2.0.0.tar.bz2 30976957 SHA256 90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd SHA512 ba3b8b5fa7b441c0494e833da887566c70ec30c20a161bcb6a77ec1deff0503e00f9cf6cf7d892f2cbb189dcf21b548844abe8106dfd29c565868944c10aa7c0 WHIRLPOOL 82d6563fdc40680bb4b79af779e844cb76524305350f19c0ea85892ceaf9db4cf9383ac9f46e0033fcfc1782b02ba7ceb8307bfc84759f9e60be6f0b57fbaf15

diff --git a/net-analyzer/wireshark/wireshark-2.0.0_rc3.ebuild b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
similarity index 98%
rename from net-analyzer/wireshark/wireshark-2.0.0_rc3.ebuild
rename to net-analyzer/wireshark/wireshark-2.0.0.ebuild
index a7fa989..cf83481 100644
--- a/net-analyzer/wireshark/wireshark-2.0.0_rc3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS=""
+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 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-12-25 15:02 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-12-25 15:02 UTC (permalink / raw
  To: gentoo-commits

commit:     0731c5fbc2b3bc9f0438cab3540f0eeaa1f4d9b6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 15:01:43 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 15:02:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0731c5fb

net-analyzer/wireshark: Add USE=androiddump, USE=tfshark.

Package-Manager: portage-2.2.26

 net-analyzer/wireshark/wireshark-99999999.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 26e146c..7915579 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -13,8 +13,9 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-	adns +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk3 ipv6 kerberos
-	lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl zlib
+	adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk3
+	ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl
+	tfshark zlib
 "
 REQUIRED_USE="
 	ssl? ( crypt )
@@ -151,7 +152,10 @@ src_configure() {
 	# dumpcap requires libcap
 	# --disable-profile-build bugs #215806, #292991, #479602
 	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
 		$(use_enable ipv6) \
+		$(use_enable tfshark) \
 		$(use_with adns c-ares) \
 		$(use_with caps libcap) \
 		$(use_with crypt gcrypt) \


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-12-25 15:13 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2015-12-25 15:13 UTC (permalink / raw
  To: gentoo-commits

commit:     bc7de33235abaf92271d51259b7254ab6d30cba0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 15:12:42 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 15:12:42 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc7de332

net-analyzer/wireshark: amd64 stable wrt bug #569592

Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.0.ebuild b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
index cf83481..45582b0 100644
--- a/net-analyzer/wireshark/wireshark-2.0.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-12-25 15:41 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-12-25 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e940176cbce89111aecdeb2a29c3081a04b3fc1c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 15:40:24 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 15:41:45 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e940176c

net-analyzer/wireshark: Stable for PPC64 (bug #569592).

Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.0.ebuild b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
index 45582b0..0b4b242 100644
--- a/net-analyzer/wireshark/wireshark-2.0.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-12-25 19:44 Mikle Kolyada
  0 siblings, 0 replies; 673+ messages in thread
From: Mikle Kolyada @ 2015-12-25 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     5ba8cf18aa046f3f6ce37d9e204ecbc3ff6f44c3
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 19:41:06 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 19:41:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba8cf18

net-analyzer/wireshark: sparc stable wrt bug #569592

Package-Manager: portage-2.2.24

 net-analyzer/wireshark/wireshark-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.0.ebuild b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
index 2dea6ce..09212a2 100644
--- a/net-analyzer/wireshark/wireshark-2.0.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-12-26  9:46 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-12-26  9:46 UTC (permalink / raw
  To: gentoo-commits

commit:     a480161b05b69047044fa03c8eeac26fbef89f6b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 09:46:18 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 09:46:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a480161b

net-analyzer/wireshark: Stable for HPPA (bug #569592).

Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.0.ebuild b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
index 09212a2..738d0ba 100644
--- a/net-analyzer/wireshark/wireshark-2.0.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2015-12-27  7:55 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2015-12-27  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     ba698c844abaa9c11e969ec4d9fdef297cf28821
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 07:55:41 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 07:55:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba698c84

net-analyzer/wireshark: With USE=qt5, depend on dev-qt/qtmultimedia:5 (bug #569838 by Alex Xu (Hello71)).

Package-Manager: portage-2.2.26

 net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild | 1 +
 net-analyzer/wireshark/wireshark-2.0.0.ebuild    | 1 +
 net-analyzer/wireshark/wireshark-99999999.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild
index bf934d2..7d7f825 100644
--- a/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild
@@ -52,6 +52,7 @@ CDEPEND="
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
 		x11-misc/xdg-utils

diff --git a/net-analyzer/wireshark/wireshark-2.0.0.ebuild b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
index 725a55c..f0bae7c 100644
--- a/net-analyzer/wireshark/wireshark-2.0.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
@@ -51,6 +51,7 @@ CDEPEND="
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
 		x11-misc/xdg-utils

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 7915579..786f1b1 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -50,6 +50,7 @@ CDEPEND="
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
 		x11-misc/xdg-utils


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-01-02  7:06 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-01-02  7:06 UTC (permalink / raw
  To: gentoo-commits

commit:     e8bb387b7f4d1631ceb8a20b7e89283beec4063a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 07:03:50 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 07:05:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8bb387b

net-analyzer/wireshark: Version bump (bug #570564).

Package-Manager: portage-2.2.26

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 279 ++++++++++++++++++++++++++
 2 files changed, 280 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c5bad4f..effdccf 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5 WHIRLPOOL ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9
 DIST wireshark-2.0.0.tar.bz2 30976957 SHA256 90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd SHA512 ba3b8b5fa7b441c0494e833da887566c70ec30c20a161bcb6a77ec1deff0503e00f9cf6cf7d892f2cbb189dcf21b548844abe8106dfd29c565868944c10aa7c0 WHIRLPOOL 82d6563fdc40680bb4b79af779e844cb76524305350f19c0ea85892ceaf9db4cf9383ac9f46e0033fcfc1782b02ba7ceb8307bfc84759f9e60be6f0b57fbaf15
+DIST wireshark-2.0.1.tar.bz2 31016295 SHA256 c9bd07dd0d0045d6ca7537390a1afbcdf33716d193ea7d7084ae4f6c30b683ab SHA512 fc029759cecd10d20bd323d6ea41d6bd1326a1a0f8d847d681ce218eb0e7ece84fba4e91709adab556e9495812bf0fa8bcb40318053e6403c3d5c9d899d544ca WHIRLPOOL 45a1a37ef3fb229d762e85a2833b4760428e91caa0b6958d3c6b79bbea76acae6f8685ecd1190ac1ef9daffd49bee9276391ac09653d75f61e6e6dc20de52789

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
new file mode 100644
index 0000000..66c2681
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
+	cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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
+		dev-qt/qtmultimedia:5
+		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}-99999999-pkgconfig.patch \
+		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ipv6) \
+		$(use_enable tfshark) \
+		$(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) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(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) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if use gtk3; then
+		domenu wireshark.desktop
+	fi
+
+	if use qt4 || use qt5; then
+		sed \
+			-e '/Exec=/s|wireshark|&-qt|g' \
+			-e 's|^Name.*=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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-01-02  7:06 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-01-02  7:06 UTC (permalink / raw
  To: gentoo-commits

commit:     d5a1900e78dbd48ad93e28f7a5369cc96d81e5fe
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 07:05:18 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 07:05:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a1900e

net-analyzer/wireshark: Whitespace.

Package-Manager: portage-2.2.26

 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
index 66c2681..8427afa 100644
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -100,7 +100,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
 		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
 		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2.patch
 
 	epatch_user
 


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-01-02 14:48 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-01-02 14:48 UTC (permalink / raw
  To: gentoo-commits

commit:     c0b2b95356b4cc94a5d8cb1e03aefa02ec2d2564
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 14:47:47 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 14:47:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b2b953

net-analyzer/wireshark: Stable for PPC64 (bug #570564).

Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
index 8427afa..88caeb3 100644
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-01-02 17:52 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-01-02 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     8d229336d42c98f88dbdb6ad5923c67071c4bde8
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 17:51:52 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 17:52:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d229336

net-analyzer/wireshark: Stable for HPPA (bug #570564).

Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
index 88caeb3..479c692 100644
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-01-02 18:53 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-01-02 18:53 UTC (permalink / raw
  To: gentoo-commits

commit:     4089a553b70d9991416fd508ef5d17cc84777f8f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 18:53:24 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 18:53:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4089a553

net-analyzer/wireshark: amd64 stable wrt bug #570564

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
index 479c692..22b0810 100644
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-01-09  7:10 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-01-09  7:10 UTC (permalink / raw
  To: gentoo-commits

commit:     6fe976818f5ef5c77bcd1b918eaeb5d9bd12a63c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 07:08:48 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 07:08:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe97681

net-analyzer/wireshark: sparc stable wrt bug #570564

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
index 22b0810..a742e70 100644
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-01-10 11:22 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-01-10 11:22 UTC (permalink / raw
  To: gentoo-commits

commit:     a5190cc84eefb5406d1fb0e4cbd5c6bb73e70d8d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 11:19:47 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 11:19:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5190cc8

net-analyzer/wireshark: alpha stable wrt bug #570564

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="alpha"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
index a742e70..4f97618 100644
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-01-11  9:56 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-01-11  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     8f43a82bf40394c100dc0ad4689ea31d37602868
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 09:54:30 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 09:54:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f43a82b

net-analyzer/wireshark: ia64 stable wrt bug #570564

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
index 4f97618..575eba8 100644
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-01-17 17:24 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-01-17 17:24 UTC (permalink / raw
  To: gentoo-commits

commit:     438b5bebcfa7497ac64898dff8ac3a1446497ceb
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 17:23:22 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 17:23:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438b5beb

net-analyzer/wireshark: ppc stable wrt bug #570564

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
index 575eba8..d08b432 100644
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-01-19 16:00 Andreas Schuerch
  0 siblings, 0 replies; 673+ messages in thread
From: Andreas Schuerch @ 2016-01-19 16:00 UTC (permalink / raw
  To: gentoo-commits

commit:     0a849863d4140d9888d79e256835a4d6552fec65
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 16:00:09 2016 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 16:00:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a849863

net-analyzer/wireshark: 2.0.1 stable on x86, see bug 570564

Package-Manager: portage-2.2.26

 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
index d08b432..08b4571 100644
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-02-24 19:10 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-02-24 19:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b4e91d3ef09926b53c1598d5266a72d0e42c2863
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 19:06:50 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 19:10:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e91d3e

net-analyzer/wireshark: Drop obsolete patch (bug #575090 by Garri).

Package-Manager: portage-2.2.27

 net-analyzer/wireshark/wireshark-99999999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index b0ab8fd..21cfa15 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -97,7 +97,6 @@ src_unpack() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
 		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
 		"${FILESDIR}"/${PN}-99999999-sse4_2.patch \
 		"${FILESDIR}"/${PN}-99999999-androiddump.patch


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-02-27  7:27 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-02-27  7:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4fad9fa3c412df5056a4e1deece91280185adeb2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 07:26:41 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 07:27:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fad9fa3

net-analyzer/wireshark: Version bump (bug #575780).

Package-Manager: portage-2.2.27

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.0.2.ebuild | 279 ++++++++++++++++++++++++++
 2 files changed, 280 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6bf61e7..05a0479 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-2.0.1.tar.bz2 31016295 SHA256 c9bd07dd0d0045d6ca7537390a1afbcdf33716d193ea7d7084ae4f6c30b683ab SHA512 fc029759cecd10d20bd323d6ea41d6bd1326a1a0f8d847d681ce218eb0e7ece84fba4e91709adab556e9495812bf0fa8bcb40318053e6403c3d5c9d899d544ca WHIRLPOOL 45a1a37ef3fb229d762e85a2833b4760428e91caa0b6958d3c6b79bbea76acae6f8685ecd1190ac1ef9daffd49bee9276391ac09653d75f61e6e6dc20de52789
+DIST wireshark-2.0.2.tar.bz2 31073440 SHA256 e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1 SHA512 a3645f0c2600091d3af76d12db4b73f83e6af4686a1bd7a336a420e4d7505ed281dfabb05c05cd6f58084fa3f25b6b9014b6f273b875c713ee39c77b4c5c715f WHIRLPOOL 4041698412d96ce495e2b564c897b4d770eea1851e431b43b2ef1bc6834bf57460ace5cc2e3f9ae6e05babbbec85e096ee1a87bc68211677202215c4dd0b53e5

diff --git a/net-analyzer/wireshark/wireshark-2.0.2.ebuild b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
new file mode 100644
index 0000000..8427afa
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
+	cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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
+		dev-qt/qtmultimedia:5
+		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}-99999999-pkgconfig.patch \
+		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ipv6) \
+		$(use_enable tfshark) \
+		$(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) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(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) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if use gtk3; then
+		domenu wireshark.desktop
+	fi
+
+	if use qt4 || use qt5; then
+		sed \
+			-e '/Exec=/s|wireshark|&-qt|g' \
+			-e 's|^Name.*=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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-02-27 12:07 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-02-27 12:07 UTC (permalink / raw
  To: gentoo-commits

commit:     78fd6a269fcb8ce777a144b397fc330cee83af16
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 12:07:05 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 12:07:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fd6a26

net-analyzer/wireshark: Stable for PPC64 (bug #575780).

Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.2.ebuild b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
index 8427afa..88caeb3 100644
--- a/net-analyzer/wireshark/wireshark-2.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-02-27 13:35 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-02-27 13:35 UTC (permalink / raw
  To: gentoo-commits

commit:     e3452f8f2b7d35ddbdcb0f861300ba1db596d2a2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 13:35:27 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 13:35:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3452f8f

net-analyzer/wireshark: Stable for HPPA (bug #575780).

Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.2.ebuild b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
index 88caeb3..479c692 100644
--- a/net-analyzer/wireshark/wireshark-2.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-03-02 13:58 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-03-02 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     36ae0bb97cfc5f331992286f6843d544d8607d6a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  2 13:58:26 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 13:58:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ae0bb9

net-analyzer/wireshark: amd64 stable wrt bug #575780

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.2.ebuild b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
index 479c692..22b0810 100644
--- a/net-analyzer/wireshark/wireshark-2.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-03-09  2:29 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-03-09  2:29 UTC (permalink / raw
  To: gentoo-commits

commit:     778ca6884a42ec08621e7ec2c918ef77f9086d2d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 02:28:28 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 02:29:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778ca688

net-analyzer/wireshark: Use upstream .desktop files (bug #576442 by Jan Chren (rindeal)).

Package-Manager: portage-2.2.27

 ...k-99999999.ebuild => wireshark-2.0.2-r1.ebuild} | 59 +++++++++-------------
 net-analyzer/wireshark/wireshark-99999999.ebuild   | 13 -----
 2 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-2.0.2-r1.ebuild
similarity index 87%
copy from net-analyzer/wireshark/wireshark-99999999.ebuild
copy to net-analyzer/wireshark/wireshark-2.0.2-r1.ebuild
index 21cfa15..6ac1120 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.2-r1.ebuild
@@ -3,25 +3,27 @@
 # $Id$
 
 EAPI=5
-inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils qt4-r2 user
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
-EGIT_REPO_URI="https://code.wireshark.org/review/wireshark"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk3
-	ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl
-	tfshark zlib
+	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
+	cpu_flags_x86_sse4_2 ssl zlib
 "
 REQUIRED_USE="
 	ssl? ( crypt )
 	?? ( qt4 qt5 )
 "
 
+S=${WORKDIR}/${P/_/}
+
 GTK_COMMON_DEPEND="
 	x11-libs/gdk-pixbuf
 	x11-libs/pango
@@ -91,15 +93,14 @@ pkg_setup() {
 	enewgroup wireshark
 }
 
-src_unpack() {
-	git-r3_src_unpack
-}
-
 src_prepare() {
 	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
+		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
 		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-99999999-sse4_2.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.patch
+		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2.patch
 
 	epatch_user
 
@@ -129,7 +130,13 @@ src_configure() {
 		myconf+=( "--disable-wireshark" )
 	fi
 
-	use qt4 && export QT_MIN_VERSION=4.6.0
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
 
 	if use qt5; then
 		export QT_MIN_VERSION=5.3.0
@@ -140,19 +147,12 @@ src_configure() {
 	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
 	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
 
-	if use qt4; then
-		myconf+=" --with-qt=4"
-	elif use qt5; then
-		myconf+=" --with-qt=5"
-	else
-		myconf+=" --with-qt=no"
-	fi
-
 	# dumpcap requires libcap
 	# --disable-profile-build bugs #215806, #292991, #479602
 	econf \
 		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
 		$(use_enable androiddump) \
+		$(use_enable ipv6) \
 		$(use_enable tfshark) \
 		$(use_with adns c-ares) \
 		$(use_with caps libcap) \
@@ -164,6 +164,8 @@ src_configure() {
 		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
 		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
 		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
 		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
@@ -194,6 +196,7 @@ src_compile() {
 
 src_install() {
 	default
+
 	if use doc; then
 		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
 		if use doc-pdf; then
@@ -209,6 +212,7 @@ src_install() {
 	# install headers
 	local wsheader
 	for wsheader in \
+		color.h \
 		config.h \
 		epan/*.h \
 		epan/crypt/*.h \
@@ -243,19 +247,6 @@ src_install() {
 		done
 	fi
 
-	if use gtk3; then
-		domenu wireshark.desktop
-	fi
-
-	if use qt4 || use qt5; then
-		sed \
-			-e '/Exec=/s|wireshark|&-qt|g' \
-			-e 's|^Name.*=Wireshark|& (Qt)|g' \
-			wireshark.desktop > wireshark-qt.desktop \
-			|| die
-		domenu wireshark-qt.desktop
-	fi
-
 	prune_libtool_files
 }
 

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 21cfa15..7284d2f 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -243,19 +243,6 @@ src_install() {
 		done
 	fi
 
-	if use gtk3; then
-		domenu wireshark.desktop
-	fi
-
-	if use qt4 || use qt5; then
-		sed \
-			-e '/Exec=/s|wireshark|&-qt|g' \
-			-e 's|^Name.*=Wireshark|& (Qt)|g' \
-			wireshark.desktop > wireshark-qt.desktop \
-			|| die
-		domenu wireshark-qt.desktop
-	fi
-
 	prune_libtool_files
 }
 


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-03-15 16:39 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-03-15 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     1c7bf04a77ccd31e214df4cee6a86ca2a178d694
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 16:37:15 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 16:38:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7bf04a

net-analyzer/wireshark: x86 stable wrt bug #575780

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.2.ebuild b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
index 22b0810..c1d5b0d 100644
--- a/net-analyzer/wireshark/wireshark-2.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-03-15 20:50 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2016-03-15 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     b8c1f686218e1b9b5c0d7d4a7d8ac188f898710d
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 20:49:40 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 20:49:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c1f686

net-analyzer/wireshark-2.0.2-r0: add alpha keyword

Gentoo-Bug: 575780

Package-Manager: portage-2.2.28

 net-analyzer/wireshark/wireshark-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.2.ebuild b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
index c1d5b0d..64a9682 100644
--- a/net-analyzer/wireshark/wireshark-2.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-03-20 11:53 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-03-20 11:53 UTC (permalink / raw
  To: gentoo-commits

commit:     0e8b0d9bd949510af861b8a1188e4dceff076527
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 11:50:52 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 11:50:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8b0d9b

net-analyzer/wireshark: ia64 stable wrt bug #575780

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.2.ebuild b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
index a42ec2b..08b4571 100644
--- a/net-analyzer/wireshark/wireshark-2.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-03-26  7:38 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-03-26  7:38 UTC (permalink / raw
  To: gentoo-commits

commit:     4155f4f9d40afe0411d3a1df38a63bffb06b9b9e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 07:15:19 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 07:15:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4155f4f9

net-analyzer/wireshark: Old.

Package-Manager: portage-2.2.28

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.0.1.ebuild | 279 --------------------------
 2 files changed, 280 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 05a0479..b35335a 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1 @@
-DIST wireshark-2.0.1.tar.bz2 31016295 SHA256 c9bd07dd0d0045d6ca7537390a1afbcdf33716d193ea7d7084ae4f6c30b683ab SHA512 fc029759cecd10d20bd323d6ea41d6bd1326a1a0f8d847d681ce218eb0e7ece84fba4e91709adab556e9495812bf0fa8bcb40318053e6403c3d5c9d899d544ca WHIRLPOOL 45a1a37ef3fb229d762e85a2833b4760428e91caa0b6958d3c6b79bbea76acae6f8685ecd1190ac1ef9daffd49bee9276391ac09653d75f61e6e6dc20de52789
 DIST wireshark-2.0.2.tar.bz2 31073440 SHA256 e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1 SHA512 a3645f0c2600091d3af76d12db4b73f83e6af4686a1bd7a336a420e4d7505ed281dfabb05c05cd6f58084fa3f25b6b9014b6f273b875c713ee39c77b4c5c715f WHIRLPOOL 4041698412d96ce495e2b564c897b4d770eea1851e431b43b2ef1bc6834bf57460ace5cc2e3f9ae6e05babbbec85e096ee1a87bc68211677202215c4dd0b53e5

diff --git a/net-analyzer/wireshark/wireshark-2.0.1.ebuild b/net-analyzer/wireshark/wireshark-2.0.1.ebuild
deleted file mode 100644
index 08b4571..0000000
--- a/net-analyzer/wireshark/wireshark-2.0.1.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
-	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
-	cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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
-		dev-qt/qtmultimedia:5
-		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}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ipv6) \
-		$(use_enable tfshark) \
-		$(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) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
-		$(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) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if use gtk3; then
-		domenu wireshark.desktop
-	fi
-
-	if use qt4 || use qt5; then
-		sed \
-			-e '/Exec=/s|wireshark|&-qt|g' \
-			-e 's|^Name.*=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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-04-23 12:20 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-04-23 12:20 UTC (permalink / raw
  To: gentoo-commits

commit:     c229a1ea54de5ede49e0aba2e08380da05bbca06
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 12:19:28 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 12:20:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c229a1ea

net-analyzer/wireshark: Version bump (bug #580882 by Frank Krömmelbein).

Package-Manager: portage-2.2.28

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.0.3.ebuild | 266 ++++++++++++++++++++++++++
 2 files changed, 267 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b35335a..da24a94 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-2.0.2.tar.bz2 31073440 SHA256 e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1 SHA512 a3645f0c2600091d3af76d12db4b73f83e6af4686a1bd7a336a420e4d7505ed281dfabb05c05cd6f58084fa3f25b6b9014b6f273b875c713ee39c77b4c5c715f WHIRLPOOL 4041698412d96ce495e2b564c897b4d770eea1851e431b43b2ef1bc6834bf57460ace5cc2e3f9ae6e05babbbec85e096ee1a87bc68211677202215c4dd0b53e5
+DIST wireshark-2.0.3.tar.bz2 31110988 SHA256 e196376e75fe21fdef41b4eaa27ce2e1b2b561e7f7b20328a8e96657cc4465fc SHA512 37d64b5f84249f263eae3159794450f642857c91d4fffe483cd562fa8abc93cc8a3152f66ca6b6230b2990e36c28a4ffbf696ff630058990154946eed457f076 WHIRLPOOL 7bb07556b047e9bee0ef7eac7a42dd47c32d93a44dde4abc0bff946e06f8f3685c273707246f9429f32a4d8802a1912a29078aceb78a712a171691ccdccf2831

diff --git a/net-analyzer/wireshark/wireshark-2.0.3.ebuild b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
new file mode 100644
index 0000000..6ac1120
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
+	cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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
+		dev-qt/qtmultimedia:5
+		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}-99999999-pkgconfig.patch \
+		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ipv6) \
+		$(use_enable tfshark) \
+		$(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) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(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) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-04-24 11:28 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-04-24 11:28 UTC (permalink / raw
  To: gentoo-commits

commit:     9719b785d87bb186b48271f28a45eb982129f194
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 11:22:24 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 11:28:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9719b785

net-analyzer/wireshark: Stable for HPPA (bug #580882).

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.3.ebuild b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
index 6ac1120..ba34310 100644
--- a/net-analyzer/wireshark/wireshark-2.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-04-24 19:40 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-04-24 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     e9a26a543cfd3471dc9ce529c887b50c27310982
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 19:37:13 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 19:40:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a26a54

net-analyzer/wireshark: Stable for PPC64 (bug #580882).

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.3.ebuild b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
index ba34310..3b460f4 100644
--- a/net-analyzer/wireshark/wireshark-2.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-04-26 11:19 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-04-26 11:19 UTC (permalink / raw
  To: gentoo-commits

commit:     a3da459de0f581eb311d5b9b26e7d8a076fb0571
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 11:19:51 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 11:19:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3da459d

net-analyzer/wireshark: amd64 stable wrt bug #580882

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.3.ebuild b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
index 3b460f4..d6f60f6 100644
--- a/net-analyzer/wireshark/wireshark-2.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-05-20 18:26 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2016-05-20 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     4b09def50087f49f1c1ab966ea76e4c4ca36129a
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 18:26:07 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Fri May 20 18:26:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b09def5

net-analyzer/wireshark-2.0.3-r0: add alpha keyword

Gentoo-Bug: 580882

Package-Manager: portage-2.3.0_rc1

 net-analyzer/wireshark/wireshark-2.0.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.3.ebuild b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
index d6f60f6..0b71dab 100644
--- a/net-analyzer/wireshark/wireshark-2.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-06-08  7:48 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-06-08  7:48 UTC (permalink / raw
  To: gentoo-commits

commit:     ee1797bfe00e250323e7d76c765182e0a1886596
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 07:48:12 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 07:48:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1797bf

net-analyzer/wireshark: Version bump (bug #585348).

Package-Manager: portage-2.3.0_rc1

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.0.4.ebuild | 266 ++++++++++++++++++++++++++
 2 files changed, 267 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index da24a94..f8b92b2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-2.0.2.tar.bz2 31073440 SHA256 e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1 SHA512 a3645f0c2600091d3af76d12db4b73f83e6af4686a1bd7a336a420e4d7505ed281dfabb05c05cd6f58084fa3f25b6b9014b6f273b875c713ee39c77b4c5c715f WHIRLPOOL 4041698412d96ce495e2b564c897b4d770eea1851e431b43b2ef1bc6834bf57460ace5cc2e3f9ae6e05babbbec85e096ee1a87bc68211677202215c4dd0b53e5
 DIST wireshark-2.0.3.tar.bz2 31110988 SHA256 e196376e75fe21fdef41b4eaa27ce2e1b2b561e7f7b20328a8e96657cc4465fc SHA512 37d64b5f84249f263eae3159794450f642857c91d4fffe483cd562fa8abc93cc8a3152f66ca6b6230b2990e36c28a4ffbf696ff630058990154946eed457f076 WHIRLPOOL 7bb07556b047e9bee0ef7eac7a42dd47c32d93a44dde4abc0bff946e06f8f3685c273707246f9429f32a4d8802a1912a29078aceb78a712a171691ccdccf2831
+DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b

diff --git a/net-analyzer/wireshark/wireshark-2.0.4.ebuild b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
new file mode 100644
index 0000000..eed093c
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
+	cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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
+		dev-qt/qtmultimedia:5
+		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}-99999999-pkgconfig.patch \
+		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ipv6) \
+		$(use_enable tfshark) \
+		$(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) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(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) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-06-08  7:53 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-06-08  7:53 UTC (permalink / raw
  To: gentoo-commits

commit:     bbedd5e9ff7c475bc07b0b8d1dd6cf65a5faa0c7
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 07:53:06 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 07:53:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbedd5e9

net-analyzer/wireshark: Old.

Package-Manager: portage-2.3.0_rc1

 net-analyzer/wireshark/wireshark-2.0.2-r1.ebuild | 266 -----------------------
 1 file changed, 266 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.2-r1.ebuild b/net-analyzer/wireshark/wireshark-2.0.2-r1.ebuild
deleted file mode 100644
index 6ac1120..0000000
--- a/net-analyzer/wireshark/wireshark-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
-	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
-	cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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
-		dev-qt/qtmultimedia:5
-		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}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ipv6) \
-		$(use_enable tfshark) \
-		$(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) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
-		$(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) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-06-08 10:24 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2016-06-08 10:24 UTC (permalink / raw
  To: gentoo-commits

commit:     8985bfb4b1b53e3e9d529522c4cd45d932da099b
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 10:24:14 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 10:24:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8985bfb4

net-analyzer/wireshark-2.0.4-r0: add alpha keyword

Gentoo-Bug: 585348

Package-Manager: portage-2.3.0_rc1

 net-analyzer/wireshark/wireshark-2.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.4.ebuild b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
index eed093c..b13666d 100644
--- a/net-analyzer/wireshark/wireshark-2.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-06-09 16:26 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-06-09 16:26 UTC (permalink / raw
  To: gentoo-commits

commit:     f210ec979c8c7b59e52e2bdf46426d7400db670b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 16:26:28 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 16:26:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f210ec97

net-analyzer/wireshark: Stable for PPC64 (bug #585348).

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.4.ebuild b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
index b13666d..2e15dbc 100644
--- a/net-analyzer/wireshark/wireshark-2.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-06-10 13:01 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-06-10 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     068c62d4210f2823f8a597d8dd8df0e1b7829ce9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 13:00:52 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 13:00:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=068c62d4

net-analyzer/wireshark: amd64 stable wrt bug #585348

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.4.ebuild b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
index 2e15dbc..5477b96 100644
--- a/net-analyzer/wireshark/wireshark-2.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-06-30 19:24 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-06-30 19:24 UTC (permalink / raw
  To: gentoo-commits

commit:     9068aefb08bec0483959fd25e870f1e877b0adbf
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 19:23:30 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 19:24:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9068aefb

net-analyzer/wireshark: Drop color.h.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/wireshark-2.1.0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.1.0.ebuild b/net-analyzer/wireshark/wireshark-2.1.0.ebuild
index 3b74b0b..f3c3d54 100644
--- a/net-analyzer/wireshark/wireshark-2.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.1.0.ebuild
@@ -213,7 +213,6 @@ src_install() {
 	# install headers
 	local wsheader
 	for wsheader in \
-		color.h \
 		config.h \
 		epan/*.h \
 		epan/crypt/*.h \


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-02  9:05 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-02  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c65bd396c01b10267db670ef06668eee6575afc0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 08:59:40 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 08:59:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65bd396

net-analyzer/wireshark: Stable for HPPA (bug #585348).

Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.4.ebuild b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
index 6e30933..d4909fd 100644
--- a/net-analyzer/wireshark/wireshark-2.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-02 11:08 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-02 11:08 UTC (permalink / raw
  To: gentoo-commits

commit:     92fca5862f98e2021541cabf8f5e453c4465a124
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 09:08:44 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 11:08:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92fca586

net-analyzer/wireshark: Old.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.0.3.ebuild | 266 --------------------------
 2 files changed, 267 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7d5f2d5..53cdf92 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.0.2.tar.bz2 31073440 SHA256 e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1 SHA512 a3645f0c2600091d3af76d12db4b73f83e6af4686a1bd7a336a420e4d7505ed281dfabb05c05cd6f58084fa3f25b6b9014b6f273b875c713ee39c77b4c5c715f WHIRLPOOL 4041698412d96ce495e2b564c897b4d770eea1851e431b43b2ef1bc6834bf57460ace5cc2e3f9ae6e05babbbec85e096ee1a87bc68211677202215c4dd0b53e5
-DIST wireshark-2.0.3.tar.bz2 31110988 SHA256 e196376e75fe21fdef41b4eaa27ce2e1b2b561e7f7b20328a8e96657cc4465fc SHA512 37d64b5f84249f263eae3159794450f642857c91d4fffe483cd562fa8abc93cc8a3152f66ca6b6230b2990e36c28a4ffbf696ff630058990154946eed457f076 WHIRLPOOL 7bb07556b047e9bee0ef7eac7a42dd47c32d93a44dde4abc0bff946e06f8f3685c273707246f9429f32a4d8802a1912a29078aceb78a712a171691ccdccf2831
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
 DIST wireshark-2.1.0.tar.bz2 32605482 SHA256 f73bd7660056c0910c8a89f480f61ab9fe62866eadf1af49e3374da3fe16b4cc SHA512 9882014f4cb4f78034c4471f7667f9accdc32dd4c22b8ea799da7a0f2ad1bb7aaa47308ece503cd4e1955903138c06f219f309c8c6216f64d1e9c8747f118154 WHIRLPOOL 0ba0cca898bf4f302fabbe0f8dbc0fb7ff050c4dfb988d9d9622b97ae48fc3ca342f260136b1d2fc667407633817c09f5b5d7624081c2c59bdf7559339f03164

diff --git a/net-analyzer/wireshark/wireshark-2.0.3.ebuild b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
deleted file mode 100644
index 0b71dab..0000000
--- a/net-analyzer/wireshark/wireshark-2.0.3.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
-	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
-	cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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
-		dev-qt/qtmultimedia:5
-		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}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ipv6) \
-		$(use_enable tfshark) \
-		$(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) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
-		$(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) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-05  8:32 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-05  8:32 UTC (permalink / raw
  To: gentoo-commits

commit:     1ab9f82575f6a4997534944704bada56c5a38bb2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 08:31:47 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 08:32:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab9f825

net-analyzer/wireshark: Clean up USE flags / configure options (bug #587922).

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/wireshark-2.1.0.ebuild    | 32 ++++++++-----------
 net-analyzer/wireshark/wireshark-99999999.ebuild | 40 +++++++++++++-----------
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-2.1.0.ebuild b/net-analyzer/wireshark/wireshark-2.1.0.ebuild
index f3c3d54..66e32b8 100644
--- a/net-analyzer/wireshark/wireshark-2.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.1.0.ebuild
@@ -13,9 +13,9 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
-	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
-	cpu_flags_x86_sse4_2 ssl zlib
+	adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk
+	kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl tfshark
+	zlib
 "
 REQUIRED_USE="
 	ssl? ( crypt )
@@ -24,11 +24,6 @@ REQUIRED_USE="
 
 S=${WORKDIR}/${P/_/}
 
-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 )
@@ -36,9 +31,11 @@ CDEPEND="
 	crypt? ( dev-libs/libgcrypt:0 )
 	caps? ( sys-libs/libcap )
 	geoip? ( dev-libs/geoip )
-	gtk3? (
-		${GTK_COMMON_DEPEND}
+	gtk? (
+		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
 	)
 	kerberos? ( virtual/krb5 )
 	lua? ( >=dev-lang/lua-5.1:* )
@@ -83,7 +80,7 @@ DEPEND="
 "
 RDEPEND="
 	${CDEPEND}
-	gtk3? ( virtual/freedesktop-icon-theme )
+	gtk? ( virtual/freedesktop-icon-theme )
 	qt4? ( virtual/freedesktop-icon-theme )
 	qt5? ( virtual/freedesktop-icon-theme )
 	selinux? ( sec-policy/selinux-wireshark )
@@ -121,7 +118,7 @@ src_configure() {
 	fi
 
 	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk3 || use qt4 || use qt5; then
+	if use gtk || use qt4 || use qt5; then
 		myconf+=( "--enable-wireshark" )
 	else
 		myconf+=( "--disable-wireshark" )
@@ -149,23 +146,22 @@ src_configure() {
 	econf \
 		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
 		$(use_enable androiddump) \
-		$(use_enable ipv6) \
 		$(use_enable tfshark) \
 		$(use_with adns c-ares) \
 		$(use_with caps libcap) \
 		$(use_with crypt gcrypt) \
 		$(use_with geoip) \
-		$(use_with gtk3) \
+		$(use_with gtk gtk 3) \
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
 		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
 		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
 		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
 		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
 		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(usex qt5 --with-qt=5 '') \
 		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
 		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
 		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
@@ -176,15 +172,14 @@ src_configure() {
 		$(usex netlink --with-libnl=3 --without-libnl) \
 		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
 		--disable-profile-build \
-		--disable-usr-local \
 		--disable-warnings-as-errors \
 		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--without-adns \
 		${myconf[@]}
 }
 
 src_compile() {
 	default
+
 	if use doc; then
 		emake -j1 -C docbook
 		if use doc-pdf; then
@@ -192,7 +187,6 @@ src_compile() {
 			emake -C docbook all-pdf
 		fi
 	fi
-
 }
 
 src_install() {
@@ -233,7 +227,7 @@ src_install() {
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
-	if use gtk3 || use qt4 || use qt5; then
+	if use gtk || use qt4 || use qt5; then
 		local c d
 		for c in hi lo; do
 			for d in 16 32 48; do

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 7284d2f..fd9b8c9 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,20 +13,15 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-	adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk3
-	ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl
-	tfshark zlib
+	adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk
+	kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl tfshark
+	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 )
@@ -34,9 +29,11 @@ CDEPEND="
 	crypt? ( dev-libs/libgcrypt:0 )
 	caps? ( sys-libs/libcap )
 	geoip? ( dev-libs/geoip )
-	gtk3? (
-		${GTK_COMMON_DEPEND}
+	gtk? (
+		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
 	)
 	kerberos? ( virtual/krb5 )
 	lua? ( >=dev-lang/lua-5.1:* )
@@ -57,7 +54,7 @@ CDEPEND="
 	)
 	sbc? ( media-libs/sbc )
 	smi? ( net-libs/libsmi )
-	ssl? ( net-libs/gnutls )
+	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
@@ -81,7 +78,7 @@ DEPEND="
 "
 RDEPEND="
 	${CDEPEND}
-	gtk3? ( virtual/freedesktop-icon-theme )
+	gtk? ( virtual/freedesktop-icon-theme )
 	qt4? ( virtual/freedesktop-icon-theme )
 	qt5? ( virtual/freedesktop-icon-theme )
 	selinux? ( sec-policy/selinux-wireshark )
@@ -123,7 +120,7 @@ src_configure() {
 	fi
 
 	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk3 || use qt4 || use qt5; then
+	if use gtk || use qt4 || use qt5; then
 		myconf+=( "--enable-wireshark" )
 	else
 		myconf+=( "--disable-wireshark" )
@@ -158,15 +155,17 @@ src_configure() {
 		$(use_with caps libcap) \
 		$(use_with crypt gcrypt) \
 		$(use_with geoip) \
-		$(use_with gtk3) \
+		$(use_with gtk gtk 3) \
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
 		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
+		$(usex qt4 --with-qt=4 '') \
 		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
 		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
 		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(usex qt5 --with-qt=5 '') \
 		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
 		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
 		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
@@ -177,23 +176,26 @@ src_configure() {
 		$(usex netlink --with-libnl=3 --without-libnl) \
 		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
 		--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
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
 	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
@@ -229,7 +231,7 @@ src_install() {
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
-	if use gtk3 || use qt4 || use qt5; then
+	if use gtk || use qt4 || use qt5; then
 		local c d
 		for c in hi lo; do
 			for d in 16 32 48; do


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-15  6:44 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-15  6:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c45e6254cb8e1e55eeddf3fb164d8d05653fce6c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 06:43:37 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 06:44:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c45e6254

net-analyzer/wireshark: Old.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest               |   2 -
 net-analyzer/wireshark/wireshark-2.0.2.ebuild | 279 --------------------------
 net-analyzer/wireshark/wireshark-2.1.0.ebuild | 260 ------------------------
 3 files changed, 541 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index df5f9e9..fe4ab54 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,2 @@
-DIST wireshark-2.0.2.tar.bz2 31073440 SHA256 e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1 SHA512 a3645f0c2600091d3af76d12db4b73f83e6af4686a1bd7a336a420e4d7505ed281dfabb05c05cd6f58084fa3f25b6b9014b6f273b875c713ee39c77b4c5c715f WHIRLPOOL 4041698412d96ce495e2b564c897b4d770eea1851e431b43b2ef1bc6834bf57460ace5cc2e3f9ae6e05babbbec85e096ee1a87bc68211677202215c4dd0b53e5
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
-DIST wireshark-2.1.0.tar.bz2 32605482 SHA256 f73bd7660056c0910c8a89f480f61ab9fe62866eadf1af49e3374da3fe16b4cc SHA512 9882014f4cb4f78034c4471f7667f9accdc32dd4c22b8ea799da7a0f2ad1bb7aaa47308ece503cd4e1955903138c06f219f309c8c6216f64d1e9c8747f118154 WHIRLPOOL 0ba0cca898bf4f302fabbe0f8dbc0fb7ff050c4dfb988d9d9622b97ae48fc3ca342f260136b1d2fc667407633817c09f5b5d7624081c2c59bdf7559339f03164
 DIST wireshark-2.1.1.tar.bz2 32212684 SHA256 8f5e604e8e0bc1f5562b166818f7a247f1b4d1f2ed15614138cc82fedad607e5 SHA512 216a0f661d271361d6388c74d52add917ec8701f58ae1a7b0ea115c4028240ad1c911fd74e9d8fe78bca4088228afcbcfb5a610827683552b3bc2bc1c77a249e WHIRLPOOL 83f1941146b8487f1644b1e8e8b8ced8ded1b16d53db9c4316808474f11121acd704f66c2f97d456a0a817f5b127380c834ed9924f58421ad3c9ef2b0e9cd70f

diff --git a/net-analyzer/wireshark/wireshark-2.0.2.ebuild b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
deleted file mode 100644
index 08b4571..0000000
--- a/net-analyzer/wireshark/wireshark-2.0.2.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
-	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
-	cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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
-		dev-qt/qtmultimedia:5
-		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}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ipv6) \
-		$(use_enable tfshark) \
-		$(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) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
-		$(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) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if use gtk3; then
-		domenu wireshark.desktop
-	fi
-
-	if use qt4 || use qt5; then
-		sed \
-			-e '/Exec=/s|wireshark|&-qt|g' \
-			-e 's|^Name.*=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-2.1.0.ebuild b/net-analyzer/wireshark/wireshark-2.1.0.ebuild
deleted file mode 100644
index 66e32b8..0000000
--- a/net-analyzer/wireshark/wireshark-2.1.0.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk
-	kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl tfshark
-	zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	gtk? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	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
-		dev-qt/qtmultimedia:5
-		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}
-	gtk? ( 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.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(usex qt5 --with-qt=5 '') \
-		$(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) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--disable-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	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-{a4,us}.pdf docbook/release-notes.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 \
-		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 gtk || use qt4 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-15  6:44 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-15  6:44 UTC (permalink / raw
  To: gentoo-commits

commit:     75c4f1a702738177389f591c8311df708ff70bd0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 06:42:31 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 06:43:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c4f1a7

net-analyzer/wireshark: Version bump.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.1.1.ebuild | 260 ++++++++++++++++++++++++++
 2 files changed, 261 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 53cdf92..df5f9e9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-2.0.2.tar.bz2 31073440 SHA256 e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1 SHA512 a3645f0c2600091d3af76d12db4b73f83e6af4686a1bd7a336a420e4d7505ed281dfabb05c05cd6f58084fa3f25b6b9014b6f273b875c713ee39c77b4c5c715f WHIRLPOOL 4041698412d96ce495e2b564c897b4d770eea1851e431b43b2ef1bc6834bf57460ace5cc2e3f9ae6e05babbbec85e096ee1a87bc68211677202215c4dd0b53e5
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
 DIST wireshark-2.1.0.tar.bz2 32605482 SHA256 f73bd7660056c0910c8a89f480f61ab9fe62866eadf1af49e3374da3fe16b4cc SHA512 9882014f4cb4f78034c4471f7667f9accdc32dd4c22b8ea799da7a0f2ad1bb7aaa47308ece503cd4e1955903138c06f219f309c8c6216f64d1e9c8747f118154 WHIRLPOOL 0ba0cca898bf4f302fabbe0f8dbc0fb7ff050c4dfb988d9d9622b97ae48fc3ca342f260136b1d2fc667407633817c09f5b5d7624081c2c59bdf7559339f03164
+DIST wireshark-2.1.1.tar.bz2 32212684 SHA256 8f5e604e8e0bc1f5562b166818f7a247f1b4d1f2ed15614138cc82fedad607e5 SHA512 216a0f661d271361d6388c74d52add917ec8701f58ae1a7b0ea115c4028240ad1c911fd74e9d8fe78bca4088228afcbcfb5a610827683552b3bc2bc1c77a249e WHIRLPOOL 83f1941146b8487f1644b1e8e8b8ced8ded1b16d53db9c4316808474f11121acd704f66c2f97d456a0a817f5b127380c834ed9924f58421ad3c9ef2b0e9cd70f

diff --git a/net-analyzer/wireshark/wireshark-2.1.1.ebuild b/net-analyzer/wireshark/wireshark-2.1.1.ebuild
new file mode 100644
index 0000000..66e32b8
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.1.1.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk
+	kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl tfshark
+	zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	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
+		dev-qt/qtmultimedia:5
+		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}
+	gtk? ( 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.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
+		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(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) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	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-{a4,us}.pdf docbook/release-notes.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 \
+		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 gtk || use qt4 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-15 10:47 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-15 10:47 UTC (permalink / raw
  To: gentoo-commits

commit:     e8d42b7bc3d46c5ed2e4322cff76a7d591e2c468
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 10:46:44 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 10:46:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d42b7b

net-analyzer/wireshark: Override LRELEASE (bug #588876 by marienz).

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/wireshark-2.1.1.ebuild    | 2 ++
 net-analyzer/wireshark/wireshark-99999999.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-analyzer/wireshark/wireshark-2.1.1.ebuild b/net-analyzer/wireshark/wireshark-2.1.1.ebuild
index 66e32b8..3c16eb1 100644
--- a/net-analyzer/wireshark/wireshark-2.1.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.1.1.ebuild
@@ -158,10 +158,12 @@ src_configure() {
 		$(use_with pcap) \
 		$(use_with portaudio) \
 		$(usex qt4 --with-qt=4 '') \
+		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
 		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
 		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
 		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
 		$(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 '') \

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index fd9b8c9..d78ed47 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -162,10 +162,12 @@ src_configure() {
 		$(use_with pcap) \
 		$(use_with portaudio) \
 		$(usex qt4 --with-qt=4 '') \
+		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
 		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
 		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
 		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
 		$(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 '') \


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-17 18:33 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-17 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     634de1f944aed10bfb5194d5754ed53828fb899d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 18:32:41 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 18:32:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634de1f9

net-analyzer/wireshark: DEPEND on dev-qt/linguist-tools (bug #588876).

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/wireshark-2.1.1.ebuild    | 3 +++
 net-analyzer/wireshark/wireshark-99999999.ebuild | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/net-analyzer/wireshark/wireshark-2.1.1.ebuild b/net-analyzer/wireshark/wireshark-2.1.1.ebuild
index 3c16eb1..28bc094 100644
--- a/net-analyzer/wireshark/wireshark-2.1.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.1.1.ebuild
@@ -74,6 +74,9 @@ DEPEND="
 		doc-pdf? ( dev-java/fop )
 		www-client/lynx
 	)
+	qt5? (
+		dev-qt/linguist-tools:5=
+	)
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index d78ed47..259d68d 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -72,6 +72,9 @@ DEPEND="
 		doc-pdf? ( dev-java/fop )
 		www-client/lynx
 	)
+	qt5? (
+		dev-qt/linguist-tools:5=
+	)
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-17 18:37 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-17 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     f1ebdfd06626b6ae33269c02bf726ed06647ad21
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 18:37:33 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 18:37:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ebdfd0

net-analyzer/wireshark: Drop sub-SLOT on dev-qt/linguist-tools.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/wireshark-2.1.1.ebuild    | 2 +-
 net-analyzer/wireshark/wireshark-99999999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-2.1.1.ebuild b/net-analyzer/wireshark/wireshark-2.1.1.ebuild
index 28bc094..e503392 100644
--- a/net-analyzer/wireshark/wireshark-2.1.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.1.1.ebuild
@@ -75,7 +75,7 @@ DEPEND="
 		www-client/lynx
 	)
 	qt5? (
-		dev-qt/linguist-tools:5=
+		dev-qt/linguist-tools:5
 	)
 	sys-devel/bison
 	sys-devel/flex

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 259d68d..18f33bd 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 		www-client/lynx
 	)
 	qt5? (
-		dev-qt/linguist-tools:5=
+		dev-qt/linguist-tools:5
 	)
 	sys-devel/bison
 	sys-devel/flex


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-28 18:30 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-28 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     de46ad92804d0890f890bb0a04a3c65909c05583
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 18:29:39 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 18:29:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de46ad92

net-analyzer/wireshark: Version bump (bug #589926).

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.0.5.ebuild | 266 ++++++++++++++++++++++++++
 2 files changed, 267 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index fe4ab54..b70531e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
+DIST wireshark-2.0.5.tar.bz2 31124989 SHA256 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b SHA512 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c WHIRLPOOL 1f1a7dafa92c244534bd938f2b9290e33d6b2990a729a7e08aada81a3e935ccb93bbb42e0b952474b7d1c21588bf04057c40c2786ada1722f424a47dda8e192d
 DIST wireshark-2.1.1.tar.bz2 32212684 SHA256 8f5e604e8e0bc1f5562b166818f7a247f1b4d1f2ed15614138cc82fedad607e5 SHA512 216a0f661d271361d6388c74d52add917ec8701f58ae1a7b0ea115c4028240ad1c911fd74e9d8fe78bca4088228afcbcfb5a610827683552b3bc2bc1c77a249e WHIRLPOOL 83f1941146b8487f1644b1e8e8b8ced8ded1b16d53db9c4316808474f11121acd704f66c2f97d456a0a817f5b127380c834ed9924f58421ad3c9ef2b0e9cd70f

diff --git a/net-analyzer/wireshark/wireshark-2.0.5.ebuild b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
new file mode 100644
index 0000000..eed093c
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
+	cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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
+		dev-qt/qtmultimedia:5
+		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}-99999999-pkgconfig.patch \
+		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ipv6) \
+		$(use_enable tfshark) \
+		$(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) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(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) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-28 21:00 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-28 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     dc38184d420eb3b3e2fafdbb8eea0eeee6a476f3
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 21:00:01 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 21:00:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc38184d

net-analyzer/wireshark: Stable for PPC64 (bug #589926).

Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.5.ebuild b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
index eed093c..8fc24c7 100644
--- a/net-analyzer/wireshark/wireshark-2.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-07-29  6:07 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-07-29  6:07 UTC (permalink / raw
  To: gentoo-commits

commit:     ea7189064f69158799583aa5918ced716a1ddab8
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 06:06:55 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 06:06:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea718906

net-analyzer/wireshark: Stable for HPPA (bug #589926).

Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.5.ebuild b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
index 8fc24c7..b822575 100644
--- a/net-analyzer/wireshark/wireshark-2.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-08-07 10:45 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-08-07 10:45 UTC (permalink / raw
  To: gentoo-commits

commit:     15a5ad86a2a54ff1ff999af1ee5ddbcf758d46d5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  7 10:45:33 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 10:45:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a5ad86

net-analyzer/wireshark: amd64 stable wrt bug #589926

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.5.ebuild b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
index b822575..c5f1ed4 100644
--- a/net-analyzer/wireshark/wireshark-2.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-08-10 19:40 Markus Meier
  0 siblings, 0 replies; 673+ messages in thread
From: Markus Meier @ 2016-08-10 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     2263253e7a35bce80329f85b4ac2881db5fcf00d
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 19:40:06 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 19:40:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2263253e

net-analyzer/wireshark: arm stable, bug #589926

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="arm"

 net-analyzer/wireshark/wireshark-2.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.5.ebuild b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
index c5f1ed4..c86ceba 100644
--- a/net-analyzer/wireshark/wireshark-2.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-08-23 12:17 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-08-23 12:17 UTC (permalink / raw
  To: gentoo-commits

commit:     e29df767bc9b6e2afa65602dc60bcb390f1c936e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 12:17:12 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 12:17:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29df767

net-analyzer/wireshark: Version bump.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest                   |   1 +
 net-analyzer/wireshark/metadata.xml               |   5 +
 net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild | 273 ++++++++++++++++++++++
 3 files changed, 279 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b70531e..49ddcf1 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
 DIST wireshark-2.0.5.tar.bz2 31124989 SHA256 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b SHA512 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c WHIRLPOOL 1f1a7dafa92c244534bd938f2b9290e33d6b2990a729a7e08aada81a3e935ccb93bbb42e0b952474b7d1c21588bf04057c40c2786ada1722f424a47dda8e192d
 DIST wireshark-2.1.1.tar.bz2 32212684 SHA256 8f5e604e8e0bc1f5562b166818f7a247f1b4d1f2ed15614138cc82fedad607e5 SHA512 216a0f661d271361d6388c74d52add917ec8701f58ae1a7b0ea115c4028240ad1c911fd74e9d8fe78bca4088228afcbcfb5a610827683552b3bc2bc1c77a249e WHIRLPOOL 83f1941146b8487f1644b1e8e8b8ced8ded1b16d53db9c4316808474f11121acd704f66c2f97d456a0a817f5b127380c834ed9924f58421ad3c9ef2b0e9cd70f
+DIST wireshark-2.2.0rc1.tar.bz2 32130789 SHA256 af5475523e050d2c207d356788ed633fd26a0c35b9198195c7d3a60aaa6f3dc4 SHA512 10fefa558c253b9bbc46a8f6f7baf08cc39df4f61f833b7045b9fb0f0c6363aba78eaefca930a67b25a1beb5ba4223b71f5870af68888a7a5bd908d53d527cdb WHIRLPOOL e0f2f0d77cf79ca7595d79daa5142732c97e2c9980d6632627114f11654e1bf222ce7d0c12968f466fd8477cb161fb59fc3bcbf2c55fa8b160d4a831ec9015d7

diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 4bd8140..430ba1f 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -30,14 +30,19 @@
 <use>
 <flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
 <flag name="androiddump">Install androiddump</flag>
+<flag name="ciscodump">Install ciscodump</flag>
 <flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
 <flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
 <flag name="gtk3">Build the wireshark executable with a GTK+ UI version 3.</flag>
+<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
 <flag name="qt4">Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag>
+<flag name="randpkt">Install randpkt</flag>
+<flag name="randpktdump">Install randpktdump</flag>
 <flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
 <flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
+<flag name="sshdump">Install sshdump</flag>
 <flag name="tfshark">Install tfshark</flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild
new file mode 100644
index 0000000..3407135
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	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
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	libssh? ( >=net-libs/libssh-0.6 )
+	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
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( 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.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
+		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	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-{a4,us}.pdf docbook/release-notes.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 \
+		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 gtk || use qt4 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-08-23 12:30 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-08-23 12:30 UTC (permalink / raw
  To: gentoo-commits

commit:     7192b69068084dc3ba8cfdec9170c4662af5e600
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 12:27:46 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 12:27:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7192b690

net-analyzer/wireshark: Update live ebuild.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild |  4 +--
 net-analyzer/wireshark/wireshark-99999999.ebuild  | 44 +++++++++++++----------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild
index 3407135..a67c17a 100644
--- a/net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild
@@ -18,10 +18,10 @@ IUSE="
 	libssh randpkt randpktdump sshdump ssl tfshark zlib
 "
 REQUIRED_USE="
-	ssl? ( crypt )
 	?? ( qt4 qt5 )
 	ciscodump? ( libssh )
 	sshdump? ( libssh )
+	ssl? ( crypt )
 "
 
 S=${WORKDIR}/${P/_/}
@@ -40,6 +40,7 @@ CDEPEND="
 		x11-misc/xdg-utils
 	)
 	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
 	lua? ( >=dev-lang/lua-5.1:* )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
@@ -58,7 +59,6 @@ CDEPEND="
 	)
 	sbc? ( media-libs/sbc )
 	smi? ( net-libs/libsmi )
-	libssh? ( >=net-libs/libssh-0.6 )
 	ssl? ( net-libs/gnutls:= )
 	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
 "

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 18f33bd..231c33f 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -13,13 +13,15 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-	adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk
-	kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl tfshark
-	zlib
+	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
 "
 REQUIRED_USE="
-	ssl? ( crypt )
 	?? ( qt4 qt5 )
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
 "
 
 CDEPEND="
@@ -36,6 +38,7 @@ CDEPEND="
 		x11-misc/xdg-utils
 	)
 	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
 	lua? ( >=dev-lang/lua-5.1:* )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
@@ -129,7 +132,13 @@ src_configure() {
 		myconf+=( "--disable-wireshark" )
 	fi
 
-	use qt4 && export QT_MIN_VERSION=4.6.0
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
 
 	if use qt5; then
 		export QT_MIN_VERSION=5.3.0
@@ -140,19 +149,15 @@ src_configure() {
 	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
 	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
 
-	if use qt4; then
-		myconf+=" --with-qt=4"
-	elif use qt5; then
-		myconf+=" --with-qt=5"
-	else
-		myconf+=" --with-qt=no"
-	fi
-
 	# dumpcap requires libcap
 	# --disable-profile-build bugs #215806, #292991, #479602
 	econf \
 		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
 		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
 		$(use_enable tfshark) \
 		$(use_with adns c-ares) \
 		$(use_with caps libcap) \
@@ -160,10 +165,17 @@ src_configure() {
 		$(use_with geoip) \
 		$(use_with gtk gtk 3) \
 		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
 		$(use_with lua) \
 		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
 		$(usex qt4 --with-qt=4 '') \
 		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
 		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
@@ -174,12 +186,6 @@ src_configure() {
 		$(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) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
 		--disable-profile-build \
 		--disable-warnings-as-errors \
 		--sysconfdir="${EPREFIX}"/etc/wireshark \


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-08-23 12:30 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-08-23 12:30 UTC (permalink / raw
  To: gentoo-commits

commit:     0a1f37465afbec51dfcd887f23724b0c45fab4f0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 12:28:44 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 12:28:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1f3746

net-analyzer/wireshark: Old.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.1.1.ebuild | 265 --------------------------
 2 files changed, 266 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 49ddcf1..7e25b32 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
 DIST wireshark-2.0.5.tar.bz2 31124989 SHA256 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b SHA512 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c WHIRLPOOL 1f1a7dafa92c244534bd938f2b9290e33d6b2990a729a7e08aada81a3e935ccb93bbb42e0b952474b7d1c21588bf04057c40c2786ada1722f424a47dda8e192d
-DIST wireshark-2.1.1.tar.bz2 32212684 SHA256 8f5e604e8e0bc1f5562b166818f7a247f1b4d1f2ed15614138cc82fedad607e5 SHA512 216a0f661d271361d6388c74d52add917ec8701f58ae1a7b0ea115c4028240ad1c911fd74e9d8fe78bca4088228afcbcfb5a610827683552b3bc2bc1c77a249e WHIRLPOOL 83f1941146b8487f1644b1e8e8b8ced8ded1b16d53db9c4316808474f11121acd704f66c2f97d456a0a817f5b127380c834ed9924f58421ad3c9ef2b0e9cd70f
 DIST wireshark-2.2.0rc1.tar.bz2 32130789 SHA256 af5475523e050d2c207d356788ed633fd26a0c35b9198195c7d3a60aaa6f3dc4 SHA512 10fefa558c253b9bbc46a8f6f7baf08cc39df4f61f833b7045b9fb0f0c6363aba78eaefca930a67b25a1beb5ba4223b71f5870af68888a7a5bd908d53d527cdb WHIRLPOOL e0f2f0d77cf79ca7595d79daa5142732c97e2c9980d6632627114f11654e1bf222ce7d0c12968f466fd8477cb161fb59fc3bcbf2c55fa8b160d4a831ec9015d7

diff --git a/net-analyzer/wireshark/wireshark-2.1.1.ebuild b/net-analyzer/wireshark/wireshark-2.1.1.ebuild
deleted file mode 100644
index e503392..0000000
--- a/net-analyzer/wireshark/wireshark-2.1.1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk
-	kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl tfshark
-	zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	gtk? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	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
-		dev-qt/qtmultimedia:5
-		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
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( 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.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(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 '') \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--disable-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	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-{a4,us}.pdf docbook/release-notes.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 \
-		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 gtk || use qt4 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-01 16:19 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-09-01 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     38837cfa6c2f1546ac1f74e85f4832a293f90a7f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 16:18:38 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 16:19:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38837cfa

net-analyzer/wireshark: Old.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest                   |   1 -
 net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild | 273 ----------------------
 2 files changed, 274 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 5bda68a..9e441aa 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
 DIST wireshark-2.0.5.tar.bz2 31124989 SHA256 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b SHA512 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c WHIRLPOOL 1f1a7dafa92c244534bd938f2b9290e33d6b2990a729a7e08aada81a3e935ccb93bbb42e0b952474b7d1c21588bf04057c40c2786ada1722f424a47dda8e192d
-DIST wireshark-2.2.0rc1.tar.bz2 32130789 SHA256 af5475523e050d2c207d356788ed633fd26a0c35b9198195c7d3a60aaa6f3dc4 SHA512 10fefa558c253b9bbc46a8f6f7baf08cc39df4f61f833b7045b9fb0f0c6363aba78eaefca930a67b25a1beb5ba4223b71f5870af68888a7a5bd908d53d527cdb WHIRLPOOL e0f2f0d77cf79ca7595d79daa5142732c97e2c9980d6632627114f11654e1bf222ce7d0c12968f466fd8477cb161fb59fc3bcbf2c55fa8b160d4a831ec9015d7
 DIST wireshark-2.2.0rc2.tar.bz2 32109255 SHA256 a508f23ccab41261a3b3426e642b5a2a9ad83731bedca3a520fe7ea399839bf8 SHA512 3de625e127dcf87450b4ba90ab9764d2c64dad561e6fea6f26cab34239d21257f316dc6120e1c5ee3df3bc963a0216263d2d19747a645d64f063be655608f8d9 WHIRLPOOL 951e124fdfa77ec14f9cfe284087c8e16104133d3fe4c1bb54a04ec957f17b662840082711af7503bd7c8a24bf8a8ab80cf81b74a9f250f86a99e033a4fb8c45

diff --git a/net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild
deleted file mode 100644
index a67c17a..00000000
--- a/net-analyzer/wireshark/wireshark-2.2.0_rc1.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	?? ( qt4 qt5 )
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	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
-		dev-qt/qtmultimedia:5
-		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
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( 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.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	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-{a4,us}.pdf docbook/release-notes.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 \
-		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 gtk || use qt4 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-01 16:19 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-09-01 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     6f513c3ca95e5ae93e7e2e1e1435dadac217e296
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 16:16:18 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 16:18:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f513c3c

net-analyzer/wireshark: Version bump.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest                   |   1 +
 net-analyzer/wireshark/wireshark-2.2.0_rc2.ebuild | 273 ++++++++++++++++++++++
 2 files changed, 274 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7e25b32..5bda68a 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
 DIST wireshark-2.0.5.tar.bz2 31124989 SHA256 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b SHA512 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c WHIRLPOOL 1f1a7dafa92c244534bd938f2b9290e33d6b2990a729a7e08aada81a3e935ccb93bbb42e0b952474b7d1c21588bf04057c40c2786ada1722f424a47dda8e192d
 DIST wireshark-2.2.0rc1.tar.bz2 32130789 SHA256 af5475523e050d2c207d356788ed633fd26a0c35b9198195c7d3a60aaa6f3dc4 SHA512 10fefa558c253b9bbc46a8f6f7baf08cc39df4f61f833b7045b9fb0f0c6363aba78eaefca930a67b25a1beb5ba4223b71f5870af68888a7a5bd908d53d527cdb WHIRLPOOL e0f2f0d77cf79ca7595d79daa5142732c97e2c9980d6632627114f11654e1bf222ce7d0c12968f466fd8477cb161fb59fc3bcbf2c55fa8b160d4a831ec9015d7
+DIST wireshark-2.2.0rc2.tar.bz2 32109255 SHA256 a508f23ccab41261a3b3426e642b5a2a9ad83731bedca3a520fe7ea399839bf8 SHA512 3de625e127dcf87450b4ba90ab9764d2c64dad561e6fea6f26cab34239d21257f316dc6120e1c5ee3df3bc963a0216263d2d19747a645d64f063be655608f8d9 WHIRLPOOL 951e124fdfa77ec14f9cfe284087c8e16104133d3fe4c1bb54a04ec957f17b662840082711af7503bd7c8a24bf8a8ab80cf81b74a9f250f86a99e033a4fb8c45

diff --git a/net-analyzer/wireshark/wireshark-2.2.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-2.2.0_rc2.ebuild
new file mode 100644
index 00000000..a67c17a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.0_rc2.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	?? ( qt4 qt5 )
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	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
+		dev-qt/qtmultimedia:5
+		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
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( 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.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
+		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	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-{a4,us}.pdf docbook/release-notes.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 \
+		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 gtk || use qt4 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-02 19:15 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2016-09-02 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     a36b5a9485142820746644319c11bc6f2e85ec3c
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 19:15:05 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 19:15:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36b5a94

net-analyzer/wireshark-2.0.5-r0: add alpha keyword

Gentoo-Bug: 589926

 net-analyzer/wireshark/wireshark-2.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.5.ebuild b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
index c86ceba..1f24f75 100644
--- a/net-analyzer/wireshark/wireshark-2.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-08 11:43 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-09-08 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     443db090602923b37ca53d33bd864e5c6807dfdd
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 11:08:17 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 11:08:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443db090

net-analyzer/wireshark: Version bump.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.2.0.ebuild | 273 ++++++++++++++++++++++++++
 2 files changed, 274 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 9e441aa..1ce1fcd 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
 DIST wireshark-2.0.5.tar.bz2 31124989 SHA256 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b SHA512 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c WHIRLPOOL 1f1a7dafa92c244534bd938f2b9290e33d6b2990a729a7e08aada81a3e935ccb93bbb42e0b952474b7d1c21588bf04057c40c2786ada1722f424a47dda8e192d
+DIST wireshark-2.2.0.tar.bz2 32141141 SHA256 a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104 SHA512 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326 WHIRLPOOL bac335d03f919a079d3192af4e94998ee6a73e90e6f73512a3a5353b62af27967ebdf1d921689493d83315610f25cc8aeac62b8b4574aa3bb82d44e5275065c9
 DIST wireshark-2.2.0rc2.tar.bz2 32109255 SHA256 a508f23ccab41261a3b3426e642b5a2a9ad83731bedca3a520fe7ea399839bf8 SHA512 3de625e127dcf87450b4ba90ab9764d2c64dad561e6fea6f26cab34239d21257f316dc6120e1c5ee3df3bc963a0216263d2d19747a645d64f063be655608f8d9 WHIRLPOOL 951e124fdfa77ec14f9cfe284087c8e16104133d3fe4c1bb54a04ec957f17b662840082711af7503bd7c8a24bf8a8ab80cf81b74a9f250f86a99e033a4fb8c45

diff --git a/net-analyzer/wireshark/wireshark-2.2.0.ebuild b/net-analyzer/wireshark/wireshark-2.2.0.ebuild
new file mode 100644
index 00000000..a67c17a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.0.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	?? ( qt4 qt5 )
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	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
+		dev-qt/qtmultimedia:5
+		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
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( 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.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
+		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	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-{a4,us}.pdf docbook/release-notes.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 \
+		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 gtk || use qt4 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-08 11:43 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-09-08 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     5eb9910e214d05bae28257b49ce01afcf931450f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 11:42:33 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 11:42:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb9910e

net-analyzer/wireshark: Old.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest                   |   1 -
 net-analyzer/wireshark/wireshark-2.2.0_rc2.ebuild | 273 ----------------------
 2 files changed, 274 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1ce1fcd..88dd349 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
 DIST wireshark-2.0.5.tar.bz2 31124989 SHA256 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b SHA512 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c WHIRLPOOL 1f1a7dafa92c244534bd938f2b9290e33d6b2990a729a7e08aada81a3e935ccb93bbb42e0b952474b7d1c21588bf04057c40c2786ada1722f424a47dda8e192d
 DIST wireshark-2.2.0.tar.bz2 32141141 SHA256 a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104 SHA512 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326 WHIRLPOOL bac335d03f919a079d3192af4e94998ee6a73e90e6f73512a3a5353b62af27967ebdf1d921689493d83315610f25cc8aeac62b8b4574aa3bb82d44e5275065c9
-DIST wireshark-2.2.0rc2.tar.bz2 32109255 SHA256 a508f23ccab41261a3b3426e642b5a2a9ad83731bedca3a520fe7ea399839bf8 SHA512 3de625e127dcf87450b4ba90ab9764d2c64dad561e6fea6f26cab34239d21257f316dc6120e1c5ee3df3bc963a0216263d2d19747a645d64f063be655608f8d9 WHIRLPOOL 951e124fdfa77ec14f9cfe284087c8e16104133d3fe4c1bb54a04ec957f17b662840082711af7503bd7c8a24bf8a8ab80cf81b74a9f250f86a99e033a4fb8c45

diff --git a/net-analyzer/wireshark/wireshark-2.2.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-2.2.0_rc2.ebuild
deleted file mode 100644
index a67c17a..00000000
--- a/net-analyzer/wireshark/wireshark-2.2.0_rc2.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	?? ( qt4 qt5 )
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	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
-		dev-qt/qtmultimedia:5
-		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
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( 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.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	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-{a4,us}.pdf docbook/release-notes.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 \
-		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 gtk || use qt4 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-09  8:35 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-09-09  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     1140039ac0e4a5945c7bb2ff1dd3228c9477ce0c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 08:33:49 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep  9 08:35:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1140039a

net-analyzer/wireshark: Version bump (bug #593258).

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.0.6.ebuild | 266 ++++++++++++++++++++++++++
 2 files changed, 267 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 88dd349..c00bf12 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
 DIST wireshark-2.0.5.tar.bz2 31124989 SHA256 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b SHA512 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c WHIRLPOOL 1f1a7dafa92c244534bd938f2b9290e33d6b2990a729a7e08aada81a3e935ccb93bbb42e0b952474b7d1c21588bf04057c40c2786ada1722f424a47dda8e192d
+DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5
 DIST wireshark-2.2.0.tar.bz2 32141141 SHA256 a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104 SHA512 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326 WHIRLPOOL bac335d03f919a079d3192af4e94998ee6a73e90e6f73512a3a5353b62af27967ebdf1d921689493d83315610f25cc8aeac62b8b4574aa3bb82d44e5275065c9

diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
new file mode 100644
index 00000000..eed093c
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
+	cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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
+		dev-qt/qtmultimedia:5
+		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}-99999999-pkgconfig.patch \
+		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ipv6) \
+		$(use_enable tfshark) \
+		$(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) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(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) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-10  7:33 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-09-10  7:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a11a3ad2e5b348207e36fabb128c90ea282a40df
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 07:33:06 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 07:33:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a11a3ad2

net-analyzer/wireshark: Stable for PPC64 (bug #593258).

Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
index eed093c..8fc24c7 100644
--- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-10 12:40 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-09-10 12:40 UTC (permalink / raw
  To: gentoo-commits

commit:     0c30df3799f8ae4c63113ccf5b888773302704b5
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 12:39:58 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 12:39:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c30df37

net-analyzer/wireshark: Stable for HPPA (bug #593258).

Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
index 8fc24c7..b822575 100644
--- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-10 12:48 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-09-10 12:48 UTC (permalink / raw
  To: gentoo-commits

commit:     4ae4a2293b5747694219fc07a8182d8e9563b9d8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 12:48:12 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 12:48:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae4a229

net-analyzer/wireshark: amd64 stable wrt bug #593258

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
index b822575..c5f1ed4 100644
--- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-16 17:15 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2016-09-16 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     a72b02ab32575eaaca009ca75c77f547f20202ad
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 17:15:07 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 17:15:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a72b02ab

net-analyzer/wireshark-2.0.6-r0: add alpha keyword

Gentoo-Bug: 593258

 net-analyzer/wireshark/wireshark-2.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
index c5f1ed4..ed245df 100644
--- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-24 19:22 Markus Meier
  0 siblings, 0 replies; 673+ messages in thread
From: Markus Meier @ 2016-09-24 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     ed7fad3b4a5a287916e593e0413e714de60e69df
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 19:22:45 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 19:22:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed7fad3b

net-analyzer/wireshark: arm stable, bug #593258

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="arm"

 net-analyzer/wireshark/wireshark-2.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
index ed245df..1f24f75 100644
--- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-29  8:40 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-09-29  8:40 UTC (permalink / raw
  To: gentoo-commits

commit:     b19110f01a9de4c0da5e4093e272a5047de03670
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 08:39:46 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 08:39:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19110f0

net-analyzer/wireshark: x86 stable wrt bug #593258

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
index 1f24f75..640425b 100644
--- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-29  9:35 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-09-29  9:35 UTC (permalink / raw
  To: gentoo-commits

commit:     3537cdb82f17d88c3664b3a634837b60b7d206cb
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 09:33:43 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 09:33:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3537cdb8

net-analyzer/wireshark: sparc stable wrt bug #593258

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
index 640425b..d5d27eb 100644
--- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-29 12:35 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-09-29 12:35 UTC (permalink / raw
  To: gentoo-commits

commit:     cfea59b8e47d2a8a5d859086666d509c991bb4af
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 12:35:19 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 12:35:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfea59b8

net-analyzer/wireshark: ppc stable wrt bug #593258

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
index d5d27eb..b00d26c 100644
--- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-29 13:27 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-09-29 13:27 UTC (permalink / raw
  To: gentoo-commits

commit:     61fbe39aab2b4ddcc7c8771377892e732b68a938
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 10:48:01 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 13:27:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61fbe39a

net-analyzer/wireshark: Old.

Package-Manager: portage-2.3.1

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.0.5.ebuild | 266 --------------------------
 2 files changed, 267 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c00bf12..ed188b4 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
-DIST wireshark-2.0.5.tar.bz2 31124989 SHA256 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b SHA512 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c WHIRLPOOL 1f1a7dafa92c244534bd938f2b9290e33d6b2990a729a7e08aada81a3e935ccb93bbb42e0b952474b7d1c21588bf04057c40c2786ada1722f424a47dda8e192d
 DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5
 DIST wireshark-2.2.0.tar.bz2 32141141 SHA256 a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104 SHA512 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326 WHIRLPOOL bac335d03f919a079d3192af4e94998ee6a73e90e6f73512a3a5353b62af27967ebdf1d921689493d83315610f25cc8aeac62b8b4574aa3bb82d44e5275065c9

diff --git a/net-analyzer/wireshark/wireshark-2.0.5.ebuild b/net-analyzer/wireshark/wireshark-2.0.5.ebuild
deleted file mode 100644
index 1f24f75..00000000
--- a/net-analyzer/wireshark/wireshark-2.0.5.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
-	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
-	cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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
-		dev-qt/qtmultimedia:5
-		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}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ipv6) \
-		$(use_enable tfshark) \
-		$(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) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
-		$(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) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-29 13:28 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-09-29 13:28 UTC (permalink / raw
  To: gentoo-commits

commit:     eb604dc8ddde0699f4b0601bacfda0a90ff6474e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 13:28:09 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 13:28:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb604dc8

net-analyzer/wireshark: ia64 stable wrt bug #593258

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
index b00d26c..4e96b75 100644
--- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-09-29 17:53 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-09-29 17:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d4b855b7a51169b7d48d4ddf2891fd4e7b16bcdb
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 17:52:59 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 17:52:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b855b7

net-analyzer/wireshark: Old.

Package-Manager: portage-2.3.1

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.0.4.ebuild | 266 --------------------------
 2 files changed, 267 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ed188b4..ac522cb 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
-DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
 DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5
 DIST wireshark-2.2.0.tar.bz2 32141141 SHA256 a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104 SHA512 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326 WHIRLPOOL bac335d03f919a079d3192af4e94998ee6a73e90e6f73512a3a5353b62af27967ebdf1d921689493d83315610f25cc8aeac62b8b4574aa3bb82d44e5275065c9

diff --git a/net-analyzer/wireshark/wireshark-2.0.4.ebuild b/net-analyzer/wireshark/wireshark-2.0.4.ebuild
deleted file mode 100644
index e39c5a9..00000000
--- a/net-analyzer/wireshark/wireshark-2.0.4.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
-	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
-	cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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
-		dev-qt/qtmultimedia:5
-		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}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ipv6) \
-		$(use_enable tfshark) \
-		$(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) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
-		$(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) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-10-05  6:30 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-10-05  6:30 UTC (permalink / raw
  To: gentoo-commits

commit:     b3ca34e11008884ed62507f6d10add8215e17d26
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  5 06:29:58 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct  5 06:30:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ca34e1

net-analyzer/wireshark: Old (bug #596190).

Package-Manager: portage-2.3.1

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.2.0.ebuild | 273 --------------------------
 2 files changed, 274 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b414aa5..7159e7b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5
 DIST wireshark-2.0.7.tar.bz2 31194949 SHA256 e7d161e147679fb0a2bf81efe7297988fd908155b9835cb0825083afae89e6d4 SHA512 2227cb66db77a480125399439658d345ce9387640512de9074539c056179aedf79f6a8e0be278e7c92a3d94058d1a6d461ba7409fa866e576f3e94cf3fd3baa9 WHIRLPOOL 74187e747c7bdacd8efc4b43fa2025aa77621a3f5115d5684c2638c02aa94d2294ca6b1572320396b57a6d62fdc4e68de0603f464c4e9240021c4afb9ad0fd40
-DIST wireshark-2.2.0.tar.bz2 32141141 SHA256 a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104 SHA512 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326 WHIRLPOOL bac335d03f919a079d3192af4e94998ee6a73e90e6f73512a3a5353b62af27967ebdf1d921689493d83315610f25cc8aeac62b8b4574aa3bb82d44e5275065c9
 DIST wireshark-2.2.1.tar.bz2 32154087 SHA256 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 SHA512 11f09853f5640cdd9003f2f0f309346cf76366edec2e4c24b5493dfc198a0f3e8918d21a38cf50ee5a1516bfdae853d364cda53338baef58f50cde0a929deae6 WHIRLPOOL e72460efee91d0013df40ae797f01f7331f27f15c0d159e3b1b1ee4aaaad30c07232e731ec2773c208e334879223337267f6c09684acfc44fa9d676cbf451994

diff --git a/net-analyzer/wireshark/wireshark-2.2.0.ebuild b/net-analyzer/wireshark/wireshark-2.2.0.ebuild
deleted file mode 100644
index a67c17a..00000000
--- a/net-analyzer/wireshark/wireshark-2.2.0.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	?? ( qt4 qt5 )
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	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
-		dev-qt/qtmultimedia:5
-		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
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( 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.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	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-{a4,us}.pdf docbook/release-notes.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 \
-		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 gtk || use qt4 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-10-05  6:30 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-10-05  6:30 UTC (permalink / raw
  To: gentoo-commits

commit:     a05a36c816705f878dde3c30f15553d6aa424f9a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  5 06:29:17 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct  5 06:30:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05a36c8

net-analyzer/wireshark: Version bump (bug #596190).

Package-Manager: portage-2.3.1

 net-analyzer/wireshark/Manifest               |   2 +
 net-analyzer/wireshark/wireshark-2.0.7.ebuild | 266 +++++++++++++++++++++++++
 net-analyzer/wireshark/wireshark-2.2.1.ebuild | 273 ++++++++++++++++++++++++++
 3 files changed, 541 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ac522cb..b414aa5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,4 @@
 DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5
+DIST wireshark-2.0.7.tar.bz2 31194949 SHA256 e7d161e147679fb0a2bf81efe7297988fd908155b9835cb0825083afae89e6d4 SHA512 2227cb66db77a480125399439658d345ce9387640512de9074539c056179aedf79f6a8e0be278e7c92a3d94058d1a6d461ba7409fa866e576f3e94cf3fd3baa9 WHIRLPOOL 74187e747c7bdacd8efc4b43fa2025aa77621a3f5115d5684c2638c02aa94d2294ca6b1572320396b57a6d62fdc4e68de0603f464c4e9240021c4afb9ad0fd40
 DIST wireshark-2.2.0.tar.bz2 32141141 SHA256 a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104 SHA512 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326 WHIRLPOOL bac335d03f919a079d3192af4e94998ee6a73e90e6f73512a3a5353b62af27967ebdf1d921689493d83315610f25cc8aeac62b8b4574aa3bb82d44e5275065c9
+DIST wireshark-2.2.1.tar.bz2 32154087 SHA256 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 SHA512 11f09853f5640cdd9003f2f0f309346cf76366edec2e4c24b5493dfc198a0f3e8918d21a38cf50ee5a1516bfdae853d364cda53338baef58f50cde0a929deae6 WHIRLPOOL e72460efee91d0013df40ae797f01f7331f27f15c0d159e3b1b1ee4aaaad30c07232e731ec2773c208e334879223337267f6c09684acfc44fa9d676cbf451994

diff --git a/net-analyzer/wireshark/wireshark-2.0.7.ebuild b/net-analyzer/wireshark/wireshark-2.0.7.ebuild
new file mode 100644
index 00000000..eed093c
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.7.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
+	cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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
+		dev-qt/qtmultimedia:5
+		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}-99999999-pkgconfig.patch \
+		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ipv6) \
+		$(use_enable tfshark) \
+		$(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) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(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) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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-2.2.1.ebuild b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
new file mode 100644
index 00000000..a67c17a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	?? ( qt4 qt5 )
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	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
+		dev-qt/qtmultimedia:5
+		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
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( 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.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
+		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	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-{a4,us}.pdf docbook/release-notes.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 \
+		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 gtk || use qt4 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-10-05 16:31 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-10-05 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     178e39e15e93b098ff91b8e7ffdc1447ada94c9b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  5 16:31:10 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct  5 16:31:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=178e39e1

net-analyzer/wireshark: Stable for PPC64 (bug #596190).

Package-Manager: portage-2.3.1
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.1.ebuild b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
index a67c17a..d796e26 100644
--- a/net-analyzer/wireshark/wireshark-2.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-10-05 16:44 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-10-05 16:44 UTC (permalink / raw
  To: gentoo-commits

commit:     8b1993a2a75897c3453213b51b557ae52fe9e84c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  5 16:44:38 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct  5 16:44:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1993a2

net-analyzer/wireshark: Stable for HPPA (bug #596190).

Package-Manager: portage-2.3.1
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.1.ebuild b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
index d796e26..e96a048 100644
--- a/net-analyzer/wireshark/wireshark-2.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-10-07  8:59 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-10-07  8:59 UTC (permalink / raw
  To: gentoo-commits

commit:     7002d2a0ee8ae39b3813104329b45fefc8d920c8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 08:59:16 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 08:59:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7002d2a0

net-analyzer/wireshark: amd64 stable wrt bug #596190

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.1.ebuild b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
index e96a048..257b54e 100644
--- a/net-analyzer/wireshark/wireshark-2.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-10-07  9:01 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-10-07  9:01 UTC (permalink / raw
  To: gentoo-commits

commit:     34174845d151533df594dfb0bb110cbb597d66ae
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 09:01:15 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 09:01:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34174845

net-analyzer/wireshark: x86 stable wrt bug #596190

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.1.ebuild b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
index 257b54e..33cf04a 100644
--- a/net-analyzer/wireshark/wireshark-2.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-10-08  7:18 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-10-08  7:18 UTC (permalink / raw
  To: gentoo-commits

commit:     a8dc2b5d849c471de85aa69fe7b98b33fa8b7cc3
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 07:18:41 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 07:18:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8dc2b5d

net-analyzer/wireshark: Improve USE flag descriptions by Mike Auty (bug #596494).

Package-Manager: portage-2.3.1

 net-analyzer/wireshark/metadata.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 430ba1f..a09a6b4 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -29,8 +29,8 @@
 </longdescription>
 <use>
 <flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
-<flag name="androiddump">Install androiddump</flag>
-<flag name="ciscodump">Install ciscodump</flag>
+<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
+<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
 <flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
 <flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
 <flag name="gtk3">Build the wireshark executable with a GTK+ UI version 3.</flag>
@@ -38,11 +38,11 @@
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
 <flag name="qt4">Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag>
-<flag name="randpkt">Install randpkt</flag>
-<flag name="randpktdump">Install randpktdump</flag>
+<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
+<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
 <flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
 <flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
-<flag name="sshdump">Install sshdump</flag>
-<flag name="tfshark">Install tfshark</flag>
+<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
+<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
 </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-10-11 14:18 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2016-10-11 14:18 UTC (permalink / raw
  To: gentoo-commits

commit:     e5d7145335a2b52bd0aba2a3f25abe78d637bb09
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 14:18:16 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 14:18:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d71453

net-analyzer/wireshark-2.2.1-r0: stable on alpha

Gentoo-Bug: 596190

 net-analyzer/wireshark/wireshark-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.1.ebuild b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
index 33cf04a..0860e09 100644
--- a/net-analyzer/wireshark/wireshark-2.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-10-18 20:03 Markus Meier
  0 siblings, 0 replies; 673+ messages in thread
From: Markus Meier @ 2016-10-18 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     417d4ef38ebd93209b3ab0089e3acde4b0c4b1ee
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 20:02:48 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 20:03:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417d4ef3

net-analyzer/wireshark: arm stable, bug #596190

Package-Manager: portage-2.3.1
RepoMan-Options: --include-arches="arm"

 net-analyzer/wireshark/wireshark-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.1.ebuild b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
index 0860e09..e42e9cb 100644
--- a/net-analyzer/wireshark/wireshark-2.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-11-10 18:19 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-11-10 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     aa62f57ad703f6c28bdfa82b71045220d048736c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 18:19:33 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 18:19:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa62f57a

net-analyzer/wireshark: Install ws_diag_control.h by Anton Bolshakov (bug #599216).

Package-Manager: portage-2.3.2

 ...ireshark-99999999.ebuild => wireshark-2.2.1-r1.ebuild} | 15 +++++++--------
 net-analyzer/wireshark/wireshark-99999999.ebuild          |  1 +
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild
similarity index 95%
copy from net-analyzer/wireshark/wireshark-99999999.ebuild
copy to net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild
index 231c33f..86dcffc 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild
@@ -3,15 +3,15 @@
 # $Id$
 
 EAPI=5
-inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils qt4-r2 user
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
-EGIT_REPO_URI="https://code.wireshark.org/review/wireshark"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
@@ -24,6 +24,8 @@ REQUIRED_USE="
 	ssl? ( crypt )
 "
 
+S=${WORKDIR}/${P/_/}
+
 CDEPEND="
 	>=dev-libs/glib-2.14:2
 	netlink? ( dev-libs/libnl:3 )
@@ -94,14 +96,10 @@ pkg_setup() {
 	enewgroup wireshark
 }
 
-src_unpack() {
-	git-r3_src_unpack
-}
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-99999999-sse4_2.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
 		"${FILESDIR}"/${PN}-99999999-androiddump.patch
 
 	epatch_user
@@ -231,6 +229,7 @@ src_install() {
 		epan/wmem/*.h \
 		register.h \
 		wiretap/*.h \
+		ws_diag_control.h \
 		ws_symbol_export.h \
 		wsutil/*.h
 	do

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 231c33f..e62bacc 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -231,6 +231,7 @@ src_install() {
 		epan/wmem/*.h \
 		register.h \
 		wiretap/*.h \
+		ws_diag_control.h \
 		ws_symbol_export.h \
 		wsutil/*.h
 	do


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-11-17 10:29 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-11-17 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     aab244515a3b564218bb93da4db47224e1be328b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 10:28:58 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 10:29:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aab24451

net-analyzer/wireshark: Old.

Package-Manager: portage-2.3.2

 net-analyzer/wireshark/Manifest                  |   1 -
 net-analyzer/wireshark/wireshark-2.0.7.ebuild    | 266 ----------------------
 net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild | 274 -----------------------
 3 files changed, 541 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b94b20c..0b66fba 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5
-DIST wireshark-2.0.7.tar.bz2 31194949 SHA256 e7d161e147679fb0a2bf81efe7297988fd908155b9835cb0825083afae89e6d4 SHA512 2227cb66db77a480125399439658d345ce9387640512de9074539c056179aedf79f6a8e0be278e7c92a3d94058d1a6d461ba7409fa866e576f3e94cf3fd3baa9 WHIRLPOOL 74187e747c7bdacd8efc4b43fa2025aa77621a3f5115d5684c2638c02aa94d2294ca6b1572320396b57a6d62fdc4e68de0603f464c4e9240021c4afb9ad0fd40
 DIST wireshark-2.2.1.tar.bz2 32154087 SHA256 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 SHA512 11f09853f5640cdd9003f2f0f309346cf76366edec2e4c24b5493dfc198a0f3e8918d21a38cf50ee5a1516bfdae853d364cda53338baef58f50cde0a929deae6 WHIRLPOOL e72460efee91d0013df40ae797f01f7331f27f15c0d159e3b1b1ee4aaaad30c07232e731ec2773c208e334879223337267f6c09684acfc44fa9d676cbf451994
 DIST wireshark-2.2.2.tar.bz2 32230208 SHA256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 SHA512 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0 WHIRLPOOL 52e81a2529a49f0f206e96c48e67fd235a6a3e7ab654cdf44107b90af269863b4c10f34ed4473966082bc025102eed18d690613fbdd2231fc7d177f5e77030a3

diff --git a/net-analyzer/wireshark/wireshark-2.0.7.ebuild b/net-analyzer/wireshark/wireshark-2.0.7.ebuild
deleted file mode 100644
index eed093c..00000000
--- a/net-analyzer/wireshark/wireshark-2.0.7.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
-	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
-	cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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
-		dev-qt/qtmultimedia:5
-		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}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2.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
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ipv6) \
-		$(use_enable tfshark) \
-		$(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) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
-		$(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) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--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-{a4,us}.pdf docbook/release-notes.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 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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-2.2.1-r1.ebuild b/net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild
deleted file mode 100644
index 86dcffc..00000000
--- a/net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	?? ( qt4 qt5 )
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	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
-		dev-qt/qtmultimedia:5
-		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
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( 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.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	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-{a4,us}.pdf docbook/release-notes.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 \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.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 qt4 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-11-17 10:29 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-11-17 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     8086a778bd23d0a2196bf13b29b8cfcafaabc4dc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 10:27:41 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 10:29:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8086a778

net-analyzer/wireshark: Version bump (bug #600086).

Package-Manager: portage-2.3.2

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.2.2.ebuild | 274 ++++++++++++++++++++++++++
 2 files changed, 275 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7159e7b..b94b20c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5
 DIST wireshark-2.0.7.tar.bz2 31194949 SHA256 e7d161e147679fb0a2bf81efe7297988fd908155b9835cb0825083afae89e6d4 SHA512 2227cb66db77a480125399439658d345ce9387640512de9074539c056179aedf79f6a8e0be278e7c92a3d94058d1a6d461ba7409fa866e576f3e94cf3fd3baa9 WHIRLPOOL 74187e747c7bdacd8efc4b43fa2025aa77621a3f5115d5684c2638c02aa94d2294ca6b1572320396b57a6d62fdc4e68de0603f464c4e9240021c4afb9ad0fd40
 DIST wireshark-2.2.1.tar.bz2 32154087 SHA256 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 SHA512 11f09853f5640cdd9003f2f0f309346cf76366edec2e4c24b5493dfc198a0f3e8918d21a38cf50ee5a1516bfdae853d364cda53338baef58f50cde0a929deae6 WHIRLPOOL e72460efee91d0013df40ae797f01f7331f27f15c0d159e3b1b1ee4aaaad30c07232e731ec2773c208e334879223337267f6c09684acfc44fa9d676cbf451994
+DIST wireshark-2.2.2.tar.bz2 32230208 SHA256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 SHA512 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0 WHIRLPOOL 52e81a2529a49f0f206e96c48e67fd235a6a3e7ab654cdf44107b90af269863b4c10f34ed4473966082bc025102eed18d690613fbdd2231fc7d177f5e77030a3

diff --git a/net-analyzer/wireshark/wireshark-2.2.2.ebuild b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
new file mode 100644
index 00000000..86dcffc
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	?? ( qt4 qt5 )
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	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
+		dev-qt/qtmultimedia:5
+		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
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( 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.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
+		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	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-{a4,us}.pdf docbook/release-notes.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 \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.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 qt4 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-11-17 12:43 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-11-17 12:43 UTC (permalink / raw
  To: gentoo-commits

commit:     edac6dce5d951c256311c6402f4add3ee1084f99
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 12:43:17 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 12:43:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edac6dce

net-analyzer/wireshark: amd64 stable wrt bug #600086

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.2.ebuild b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
index 86dcffc..9671964 100644
--- a/net-analyzer/wireshark/wireshark-2.2.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-11-17 12:44 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2016-11-17 12:44 UTC (permalink / raw
  To: gentoo-commits

commit:     875570f3dff09ef73759a5147d2f7bb785fc145b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 12:44:19 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 12:44:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875570f3

net-analyzer/wireshark: x86 stable wrt bug #600086

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.2.ebuild b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
index 9671964..15a88a8 100644
--- a/net-analyzer/wireshark/wireshark-2.2.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-11-19  8:35 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-11-19  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     8f8b2cba767640ce8b07683bf9b9b2a9e2e9dab1
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 08:32:53 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 08:32:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8b2cba

net-analyzer/wireshark: Stable for HPPA PPC64 (bug #600086).

Package-Manager: portage-2.3.2
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.2.ebuild b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
index 15a88a8..fee52d1 100644
--- a/net-analyzer/wireshark/wireshark-2.2.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-11-23  9:20 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2016-11-23  9:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2a31c832fb299d9d550bf48091cd243aa5003179
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 09:20:01 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 09:20:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a31c832

net-analyzer/wireshark-2.2.2-r0: stable on alpha

Gentoo-Bug: 600086

 net-analyzer/wireshark/wireshark-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.2.ebuild b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
index fee52d1..5f8f42a 100644
--- a/net-analyzer/wireshark/wireshark-2.2.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-11-29 17:45 Markus Meier
  0 siblings, 0 replies; 673+ messages in thread
From: Markus Meier @ 2016-11-29 17:45 UTC (permalink / raw
  To: gentoo-commits

commit:     89ec447f6d3c059057c362ddc0c082b93a73fe36
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 17:45:06 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 17:45:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ec447f

net-analyzer/wireshark: arm stable, bug #600086

Package-Manager: portage-2.3.2
RepoMan-Options: --include-arches="arm"

 net-analyzer/wireshark/wireshark-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.2.ebuild b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
index 5f8f42a..34a009c 100644
--- a/net-analyzer/wireshark/wireshark-2.2.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-12-11 10:50 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-12-11 10:50 UTC (permalink / raw
  To: gentoo-commits

commit:     c1d042174957159770d03eddeabc89288e720db8
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 10:49:50 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 10:49:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d04217

net-analyzer/wireshark: Old.

Package-Manager: portage-2.3.3

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.2.1.ebuild | 273 --------------------------
 2 files changed, 274 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 0b66fba..815eb13 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
 DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5
-DIST wireshark-2.2.1.tar.bz2 32154087 SHA256 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 SHA512 11f09853f5640cdd9003f2f0f309346cf76366edec2e4c24b5493dfc198a0f3e8918d21a38cf50ee5a1516bfdae853d364cda53338baef58f50cde0a929deae6 WHIRLPOOL e72460efee91d0013df40ae797f01f7331f27f15c0d159e3b1b1ee4aaaad30c07232e731ec2773c208e334879223337267f6c09684acfc44fa9d676cbf451994
 DIST wireshark-2.2.2.tar.bz2 32230208 SHA256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 SHA512 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0 WHIRLPOOL 52e81a2529a49f0f206e96c48e67fd235a6a3e7ab654cdf44107b90af269863b4c10f34ed4473966082bc025102eed18d690613fbdd2231fc7d177f5e77030a3

diff --git a/net-analyzer/wireshark/wireshark-2.2.1.ebuild b/net-analyzer/wireshark/wireshark-2.2.1.ebuild
deleted file mode 100644
index e42e9cb..00000000
--- a/net-analyzer/wireshark/wireshark-2.2.1.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	?? ( qt4 qt5 )
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	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
-		dev-qt/qtmultimedia:5
-		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
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( 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.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	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-{a4,us}.pdf docbook/release-notes.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 \
-		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 gtk || use qt4 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-12-15 11:42 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-12-15 11:42 UTC (permalink / raw
  To: gentoo-commits

commit:     d170f10b95903c9b48d91fefa43d252afefb3053
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 11:42:29 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 11:42:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d170f10b

net-analyzer/wireshark: Version bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.2.3.ebuild | 274 ++++++++++++++++++++++++++
 2 files changed, 275 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 815eb13..62af4df 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5
 DIST wireshark-2.2.2.tar.bz2 32230208 SHA256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 SHA512 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0 WHIRLPOOL 52e81a2529a49f0f206e96c48e67fd235a6a3e7ab654cdf44107b90af269863b4c10f34ed4473966082bc025102eed18d690613fbdd2231fc7d177f5e77030a3
+DIST wireshark-2.2.3.tar.bz2 32315857 SHA256 97bac89e88892054a5848a9f7e0c36aa399a2008900829b078e29cab0ddd593b SHA512 a067cc5e4683a70deb301b50d57e5543f265b4fd9eef6a55a9c31e078da0d03aa89322012b9b8b7689af1720e36fe3a17a20689d657c7dca5aa7aa7f51d0701c WHIRLPOOL d11f66fa5cf2cb777bcf3f178da83e9cbddf8ab84aba75239a3669bf5563b108840ef8154014077d414c55129caa7d2ed7c702dea71b72f753099399c99fa7f5

diff --git a/net-analyzer/wireshark/wireshark-2.2.3.ebuild b/net-analyzer/wireshark/wireshark-2.2.3.ebuild
new file mode 100644
index 00000000..86dcffc
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.3.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	?? ( qt4 qt5 )
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	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
+		dev-qt/qtmultimedia:5
+		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
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( 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.99.8-qtchooser.patch \
+		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
+		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	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
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	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-{a4,us}.pdf docbook/release-notes.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 \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.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 qt4 || use qt5; 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-12-21 11:20 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-12-21 11:20 UTC (permalink / raw
  To: gentoo-commits

commit:     c1e94fa40b657baa8f793278823446af6159629d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 11:19:53 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 11:19:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e94fa4

net-analyzer/wireshark: Drop USE=gtk3 description.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/wireshark/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index a09a6b4..b539ed3 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -33,7 +33,6 @@
 <flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
 <flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
 <flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
-<flag name="gtk3">Build the wireshark executable with a GTK+ UI version 3.</flag>
 <flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2016-12-23 20:59 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2016-12-23 20:59 UTC (permalink / raw
  To: gentoo-commits

commit:     57fd3e443c10d76d00a060e627c38bc6be93b2c8
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 20:58:52 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 20:59:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57fd3e44

net-analyzer/wireshark: Drop Qt4.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/wireshark/wireshark-99999999.ebuild | 26 +++++-------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index e62bacc..87ee793 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils qt4-r2 user
+inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils user
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
@@ -14,11 +14,10 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
 	libssh randpkt randpktdump sshdump ssl tfshark zlib
 "
 REQUIRED_USE="
-	?? ( qt4 qt5 )
 	ciscodump? ( libssh )
 	sshdump? ( libssh )
 	ssl? ( crypt )
@@ -42,11 +41,6 @@ CDEPEND="
 	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
@@ -85,7 +79,6 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	gtk? ( virtual/freedesktop-icon-theme )
-	qt4? ( virtual/freedesktop-icon-theme )
 	qt5? ( virtual/freedesktop-icon-theme )
 	selinux? ( sec-policy/selinux-wireshark )
 "
@@ -126,20 +119,16 @@ src_configure() {
 	fi
 
 	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk || use qt4 || use qt5; then
+	if use gtk || use qt5; then
 		myconf+=( "--enable-wireshark" )
 	else
 		myconf+=( "--disable-wireshark" )
 	fi
 
-	if ! use qt4 && ! use qt5; then
+	if ! use qt5; then
 		myconf+=( "--with-qt=no" )
 	fi
 
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
 	if use qt5; then
 		export QT_MIN_VERSION=5.3.0
 		append-cxxflags -fPIC -DPIC
@@ -176,11 +165,6 @@ src_configure() {
 		$(use_with zlib) \
 		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
 		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
 		$(usex qt5 --with-qt=5 '') \
 		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
 		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
@@ -243,7 +227,7 @@ src_install() {
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
-	if use gtk || use qt4 || use qt5; then
+	if use gtk || use qt5; then
 		local c d
 		for c in hi lo; do
 			for d in 16 32 48; do


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-05 19:26 Justin Lecher
  0 siblings, 0 replies; 673+ messages in thread
From: Justin Lecher @ 2017-01-05 19:26 UTC (permalink / raw
  To: gentoo-commits

commit:     855460449379abdc9c33dc1dabc833ef13e5192c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 12:44:32 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 19:26:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85546044

net-analyzer/wireshark: Explicitely depend on media-libs/speex with USE=qt5

Configure checks for speex presents when using QT and automatically uses
it without control via USE. This results in 'preserved libs' when
removing speex

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 net-analyzer/wireshark/metadata.xml              | 44 ++++++++++++------------
 net-analyzer/wireshark/wireshark-2.2.3.ebuild    |  3 +-
 net-analyzer/wireshark/wireshark-99999999.ebuild |  3 +-
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index b539ed3..b72cb57 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<longdescription>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
 	Wireshark is the world's foremost network protocol analyzer, and is the de
 	facto (and often de jure) standard across many industries and educational
 	institutions. Wireshark has a rich feature set which includes 1) deep
@@ -27,21 +27,21 @@
 	intuitive analysis, 12) output can be exported to XML, PostScript®, CSV, or
 	plain text 
 </longdescription>
-<use>
-<flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
-<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
-<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
-<flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
-<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
-<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
-<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
-<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
-<flag name="qt4">Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag>
-<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
-<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
-<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
-<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
-<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
-<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
-</use>
+	<use>
+		<flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
+		<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
+		<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
+		<flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
+		<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
+		<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
+		<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
+		<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
+		<flag name="qt4">Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag>
+		<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
+		<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
+		<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
+		<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
+		<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
+		<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
+	</use>
 </pkgmetadata>

diff --git a/net-analyzer/wireshark/wireshark-2.2.3.ebuild b/net-analyzer/wireshark/wireshark-2.2.3.ebuild
index 86dcffc..e550ae2 100644
--- a/net-analyzer/wireshark/wireshark-2.2.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -55,6 +55,7 @@ CDEPEND="
 		dev-qt/qtmultimedia:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
+		media-libs/speex
 		x11-misc/xdg-utils
 	)
 	sbc? ( media-libs/sbc )

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 87ee793..671d50c 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -47,6 +47,7 @@ CDEPEND="
 		dev-qt/qtmultimedia:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
+		media-libs/speex
 		x11-misc/xdg-utils
 	)
 	sbc? ( media-libs/sbc )


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-22 12:14 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-01-22 12:14 UTC (permalink / raw
  To: gentoo-commits

commit:     1bd5bcd19f91a6268d4dbbb3d6c3c0c2d3421ff0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 12:13:52 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 12:14:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd5bcd1

net-analyzer/wireshark: EAPI=6, Drop IUSE=qt4.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...k-99999999.ebuild => wireshark-2.2.3-r1.ebuild} | 26 ++++++++++------------
 net-analyzer/wireshark/wireshark-99999999.ebuild   | 14 ++++++------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild
similarity index 93%
copy from net-analyzer/wireshark/wireshark-99999999.ebuild
copy to net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild
index 671d50c..05996ad 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils user
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
-EGIT_REPO_URI="https://code.wireshark.org/review/wireshark"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
@@ -23,6 +23,8 @@ REQUIRED_USE="
 	ssl? ( crypt )
 "
 
+S=${WORKDIR}/${P/_/}
+
 CDEPEND="
 	>=dev-libs/glib-2.14:2
 	netlink? ( dev-libs/libnl:3 )
@@ -83,22 +85,18 @@ RDEPEND="
 	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}-99999999-androiddump.patch
+)
 
 pkg_setup() {
 	enewgroup wireshark
 }
 
-src_unpack() {
-	git-r3_src_unpack
-}
-
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-99999999-sse4_2.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.patch
-
-	epatch_user
+	default
 
 	eautoreconf
 }

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 671d50c..bab62ea 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils user
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
@@ -83,6 +83,11 @@ RDEPEND="
 	qt5? ( virtual/freedesktop-icon-theme )
 	selinux? ( sec-policy/selinux-wireshark )
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+	"${FILESDIR}"/${PN}-99999999-sse4_2.patch
+)
 
 pkg_setup() {
 	enewgroup wireshark
@@ -93,12 +98,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-99999999-sse4_2.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.patch
-
-	epatch_user
+	default
 
 	eautoreconf
 }


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-24  6:46 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-01-24  6:46 UTC (permalink / raw
  To: gentoo-commits

commit:     e59a07595170491f6b844769b94a672fd2cd11d6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 06:46:01 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 06:46:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e59a0759

net-analyzer/wireshark: Version bump (bug #606984).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.2.4.ebuild | 260 ++++++++++++++++++++++++++
 2 files changed, 261 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7ec75cf..4e3a76c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-2.2.2.tar.bz2 32230208 SHA256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 SHA512 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0 WHIRLPOOL 52e81a2529a49f0f206e96c48e67fd235a6a3e7ab654cdf44107b90af269863b4c10f34ed4473966082bc025102eed18d690613fbdd2231fc7d177f5e77030a3
 DIST wireshark-2.2.3.tar.bz2 32315857 SHA256 97bac89e88892054a5848a9f7e0c36aa399a2008900829b078e29cab0ddd593b SHA512 a067cc5e4683a70deb301b50d57e5543f265b4fd9eef6a55a9c31e078da0d03aa89322012b9b8b7689af1720e36fe3a17a20689d657c7dca5aa7aa7f51d0701c WHIRLPOOL d11f66fa5cf2cb777bcf3f178da83e9cbddf8ab84aba75239a3669bf5563b108840ef8154014077d414c55129caa7d2ed7c702dea71b72f753099399c99fa7f5
+DIST wireshark-2.2.4.tar.bz2 32336156 SHA256 42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911 SHA512 f3ff6979fdd1c7cf6abe386ec476fee12045ae6df3c8162568d521532045d5eb6ad689262c38b1766c75c9fc1068f480fcd64f0aa077b3a0ceea7c16dbdabc65 WHIRLPOOL 826f88d9df625809309728c2a60cc90e52d4586b9b933548c9594e9521b8aefb619deac00320f09b2180f97816dd4856aa4439322eb64982adc28c71614fe164

diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
new file mode 100644
index 00000000..7f0a159
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	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/speex
+		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
+	)
+	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}-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
+
+	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# 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 \
+		register.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 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-24  6:49 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-01-24  6:49 UTC (permalink / raw
  To: gentoo-commits

commit:     fa62b80e664d4cbe1d4c6d8512b6500e70382f23
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 06:47:19 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 06:47:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa62b80e

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/wireshark/Manifest                  |   1 -
 net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild | 259 ---------------------
 net-analyzer/wireshark/wireshark-2.2.3.ebuild    | 275 -----------------------
 3 files changed, 535 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 4e3a76c..cdc323c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
 DIST wireshark-2.2.2.tar.bz2 32230208 SHA256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 SHA512 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0 WHIRLPOOL 52e81a2529a49f0f206e96c48e67fd235a6a3e7ab654cdf44107b90af269863b4c10f34ed4473966082bc025102eed18d690613fbdd2231fc7d177f5e77030a3
-DIST wireshark-2.2.3.tar.bz2 32315857 SHA256 97bac89e88892054a5848a9f7e0c36aa399a2008900829b078e29cab0ddd593b SHA512 a067cc5e4683a70deb301b50d57e5543f265b4fd9eef6a55a9c31e078da0d03aa89322012b9b8b7689af1720e36fe3a17a20689d657c7dca5aa7aa7f51d0701c WHIRLPOOL d11f66fa5cf2cb777bcf3f178da83e9cbddf8ab84aba75239a3669bf5563b108840ef8154014077d414c55129caa7d2ed7c702dea71b72f753099399c99fa7f5
 DIST wireshark-2.2.4.tar.bz2 32336156 SHA256 42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911 SHA512 f3ff6979fdd1c7cf6abe386ec476fee12045ae6df3c8162568d521532045d5eb6ad689262c38b1766c75c9fc1068f480fcd64f0aa077b3a0ceea7c16dbdabc65 WHIRLPOOL 826f88d9df625809309728c2a60cc90e52d4586b9b933548c9594e9521b8aefb619deac00320f09b2180f97816dd4856aa4439322eb64982adc28c71614fe164

diff --git a/net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild b/net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild
deleted file mode 100644
index 05996ad..00000000
--- a/net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	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/speex
-		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
-	)
-	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}-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
-
-	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	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-{a4,us}.pdf docbook/release-notes.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 \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.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 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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-2.2.3.ebuild b/net-analyzer/wireshark/wireshark-2.2.3.ebuild
deleted file mode 100644
index e550ae2..00000000
--- a/net-analyzer/wireshark/wireshark-2.2.3.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	?? ( qt4 qt5 )
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	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
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		media-libs/speex
-		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
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( 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.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	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-{a4,us}.pdf docbook/release-notes.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 \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.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 qt4 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-24  6:49 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-01-24  6:49 UTC (permalink / raw
  To: gentoo-commits

commit:     4091dc8905d9896cc6040999ebdfb37c5f7d19fc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 06:48:47 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 06:48:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4091dc89

net-analyzer/wireshark: Replace dohtml in live ebuild.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/wireshark/wireshark-99999999.ebuild | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index bab62ea..5471dbc 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -192,18 +192,19 @@ src_compile() {
 src_install() {
 	default
 
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
 	if use doc; then
-		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		docinto /usr/share/doc/${PF}/html
+		dodoc -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-{a4,us}.pdf docbook/release-notes.pdf
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.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 \


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-24  9:06 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2017-01-24  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     0fc5daf5ae5acfb14d388320e614c5af2740328a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 09:06:03 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 09:06:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc5daf5

net-analyzer/wireshark: amd64 stable wrt bug #606984

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
index 7f0a159..6602466 100644
--- a/net-analyzer/wireshark/wireshark-2.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-24 10:56 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2017-01-24 10:56 UTC (permalink / raw
  To: gentoo-commits

commit:     64d59cd037d95ae039f3d373860dbe99d9318558
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 10:56:48 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 10:56:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d59cd0

net-analyzer/wireshark: x86 stable wrt bug #606984

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
index 6602466..7f63d79 100644
--- a/net-analyzer/wireshark/wireshark-2.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-25 21:09 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2017-01-25 21:09 UTC (permalink / raw
  To: gentoo-commits

commit:     1f4ae9e93d6dd2a5f12538bbb773a12a8914adcd
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 21:09:27 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 21:09:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f4ae9e9

net-analyzer/wireshark-2.2.4-r0: stable on alpha

Gentoo-Bug: 606984

 net-analyzer/wireshark/wireshark-2.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
index 52a61a9..3c66af3 100644
--- a/net-analyzer/wireshark/wireshark-2.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-26 10:22 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2017-01-26 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     9e196017861651e202d4ad732dd9e89bac6281f7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 10:21:17 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 10:21:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e196017

net-analyzer/wireshark: sparc stable wrt bug #606984

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
index 3c66af3..f3d5a48 100644
--- a/net-analyzer/wireshark/wireshark-2.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-26 15:28 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2017-01-26 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     609235c5b97b7715d67ccfda031d1305be90c43a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 15:27:29 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 15:27:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609235c5

net-analyzer/wireshark: ia64 stable wrt bug #606984

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
index 0b22d11..6e0e2f5 100644
--- a/net-analyzer/wireshark/wireshark-2.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-01-29  9:45 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-01-29  9:45 UTC (permalink / raw
  To: gentoo-commits

commit:     a8d465fe8c48141166ca9401ae8e6e3f193c9305
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 09:45:22 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 09:45:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d465fe

net-analyzer/wireshark: Stable for HPPA (bug #606984).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
index 6e0e2f5..8216af3 100644
--- a/net-analyzer/wireshark/wireshark-2.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-02-12 20:06 Markus Meier
  0 siblings, 0 replies; 673+ messages in thread
From: Markus Meier @ 2017-02-12 20:06 UTC (permalink / raw
  To: gentoo-commits

commit:     286db8802bf30de8b566bf9e846d5b7af92c638d
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 20:06:19 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 20:06:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=286db880

net-analyzer/wireshark: arm stable, bug #606984

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 net-analyzer/wireshark/wireshark-2.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
index 8216af3310..4dd425a089 100644
--- a/net-analyzer/wireshark/wireshark-2.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-02-14 13:36 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-02-14 13:36 UTC (permalink / raw
  To: gentoo-commits

commit:     6e96fc7ddfff8abf609d6c78ddeaf95cf371559a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 13:36:39 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 13:36:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e96fc7d

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/metadata.xml           |   1 -
 net-analyzer/wireshark/wireshark-2.2.2.ebuild | 274 --------------------------
 3 files changed, 276 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index cdc323c22e..f2e9ebdf50 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1 @@
-DIST wireshark-2.2.2.tar.bz2 32230208 SHA256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 SHA512 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0 WHIRLPOOL 52e81a2529a49f0f206e96c48e67fd235a6a3e7ab654cdf44107b90af269863b4c10f34ed4473966082bc025102eed18d690613fbdd2231fc7d177f5e77030a3
 DIST wireshark-2.2.4.tar.bz2 32336156 SHA256 42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911 SHA512 f3ff6979fdd1c7cf6abe386ec476fee12045ae6df3c8162568d521532045d5eb6ad689262c38b1766c75c9fc1068f480fcd64f0aa077b3a0ceea7c16dbdabc65 WHIRLPOOL 826f88d9df625809309728c2a60cc90e52d4586b9b933548c9594e9521b8aefb619deac00320f09b2180f97816dd4856aa4439322eb64982adc28c71614fe164

diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index b72cb57da0..286f7d28ad 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -36,7 +36,6 @@
 		<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
 		<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
 		<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
-		<flag name="qt4">Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag>
 		<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
 		<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
 		<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>

diff --git a/net-analyzer/wireshark/wireshark-2.2.2.ebuild b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
deleted file mode 100644
index 9bfec9229e..0000000000
--- a/net-analyzer/wireshark/wireshark-2.2.2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic 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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	?? ( qt4 qt5 )
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	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
-		dev-qt/qtmultimedia:5
-		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
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( 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.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \
-		"${FILESDIR}"/${PN}-99999999-androiddump.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 gtk || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	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
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	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-{a4,us}.pdf docbook/release-notes.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 \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.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 qt4 || use qt5; 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-03-04 12:11 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-03-04 12:11 UTC (permalink / raw
  To: gentoo-commits

commit:     2a6a39552364f462996fce206b3b1ab34a19c79f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 12:10:56 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 12:11:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a6a3955

net-analyzer/wireshark: Version bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.2.5.ebuild | 259 ++++++++++++++++++++++++++
 2 files changed, 260 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f2e9ebdf509..07789feccd6 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-2.2.4.tar.bz2 32336156 SHA256 42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911 SHA512 f3ff6979fdd1c7cf6abe386ec476fee12045ae6df3c8162568d521532045d5eb6ad689262c38b1766c75c9fc1068f480fcd64f0aa077b3a0ceea7c16dbdabc65 WHIRLPOOL 826f88d9df625809309728c2a60cc90e52d4586b9b933548c9594e9521b8aefb619deac00320f09b2180f97816dd4856aa4439322eb64982adc28c71614fe164
+DIST wireshark-2.2.5.tar.bz2 32297102 SHA256 75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 SHA512 c419950683eb399f851e10cc268d541cbd6e75a957f412650fa9564760908864fcd0d5d6c3520e656d93c31cd5f1216a514be154dfa950fcfd2804e66155985e WHIRLPOOL 2c65d7806673adb550dcdd8fa032a4dce8e1087e5c57b132c9ac53d6d93d6fb0da3219573bc2ecb12df7865a9a32a1a28378e03b3e3439853200186d42f18e7d

diff --git a/net-analyzer/wireshark/wireshark-2.2.5.ebuild b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
new file mode 100644
index 00000000000..e6842e6fd3b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	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/speex
+		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
+	)
+	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}-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
+
+	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# 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 \
+		register.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 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-03-05 12:35 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-03-05 12:35 UTC (permalink / raw
  To: gentoo-commits

commit:     e2243d8cc4eba8e09c635d02e22d3b0ab0afdd1a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  5 12:33:51 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Mar  5 12:33:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2243d8c

net-analyzer/wireshark: Stable for HPPA PPC64 (bug #609646).

Package-Manager: Portage-2.3.4, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.5.ebuild b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
index e6842e6fd3b..c3ef0fc115e 100644
--- a/net-analyzer/wireshark/wireshark-2.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-03-08  5:56 Markus Meier
  0 siblings, 0 replies; 673+ messages in thread
From: Markus Meier @ 2017-03-08  5:56 UTC (permalink / raw
  To: gentoo-commits

commit:     3138b7ff6539197ad24a79e2c53f107898e888a1
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  8 05:56:38 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 05:56:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3138b7ff

net-analyzer/wireshark: arm stable, bug #609646

Package-Manager: Portage-2.3.4, Repoman-2.3.2
RepoMan-Options: --include-arches="arm"

 net-analyzer/wireshark/wireshark-2.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.5.ebuild b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
index 3ac046e7714..6065607aa29 100644
--- a/net-analyzer/wireshark/wireshark-2.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-03-11 17:07 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2017-03-11 17:07 UTC (permalink / raw
  To: gentoo-commits

commit:     0aa0a446919fe0d03d7ff360d4eeec65ea7060b2
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 17:05:59 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 17:05:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa0a446

net-analyzer/wireshark: ia64 stable wrt bug #609646

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.5.ebuild b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
index afe1607b42c..04c1c4aa6a4 100644
--- a/net-analyzer/wireshark/wireshark-2.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-03-12  8:15 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-03-12  8:15 UTC (permalink / raw
  To: gentoo-commits

commit:     37afd6a0d488f3d0f26463151569ff45f4eb7093
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 08:14:26 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 08:14:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37afd6a0

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.2.4.ebuild | 259 --------------------------
 2 files changed, 260 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 07789feccd6..8378ab30175 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1 @@
-DIST wireshark-2.2.4.tar.bz2 32336156 SHA256 42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911 SHA512 f3ff6979fdd1c7cf6abe386ec476fee12045ae6df3c8162568d521532045d5eb6ad689262c38b1766c75c9fc1068f480fcd64f0aa077b3a0ceea7c16dbdabc65 WHIRLPOOL 826f88d9df625809309728c2a60cc90e52d4586b9b933548c9594e9521b8aefb619deac00320f09b2180f97816dd4856aa4439322eb64982adc28c71614fe164
 DIST wireshark-2.2.5.tar.bz2 32297102 SHA256 75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 SHA512 c419950683eb399f851e10cc268d541cbd6e75a957f412650fa9564760908864fcd0d5d6c3520e656d93c31cd5f1216a514be154dfa950fcfd2804e66155985e WHIRLPOOL 2c65d7806673adb550dcdd8fa032a4dce8e1087e5c57b132c9ac53d6d93d6fb0da3219573bc2ecb12df7865a9a32a1a28378e03b3e3439853200186d42f18e7d

diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
deleted file mode 100644
index e0aadc7230b..00000000000
--- a/net-analyzer/wireshark/wireshark-2.2.4.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	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/speex
-		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
-	)
-	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}-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
-
-	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# 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 \
-		register.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 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-03-16  7:29 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-03-16  7:29 UTC (permalink / raw
  To: gentoo-commits

commit:     b1ba7427d28d915a5c659fd8bf5ae102e6ef12c9
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 16 07:27:37 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 07:29:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ba7427

net-analyzer/wireshark: Stable for PPC too.

Package-Manager: Portage-2.3.4, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.5.ebuild b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
index 04c1c4aa6a4..e0aadc7230b 100644
--- a/net-analyzer/wireshark/wireshark-2.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-04-13 17:07 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-04-13 17:07 UTC (permalink / raw
  To: gentoo-commits

commit:     c1ffcc1b5beb6e28e126cda85017976656a70e15
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 17:06:31 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 17:07:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ffcc1b

net-analyzer/wireshark: Version bump (bug #615462).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.2.6.ebuild | 259 ++++++++++++++++++++++++++
 2 files changed, 260 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 8378ab30175..f24538cbd3f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-2.2.5.tar.bz2 32297102 SHA256 75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 SHA512 c419950683eb399f851e10cc268d541cbd6e75a957f412650fa9564760908864fcd0d5d6c3520e656d93c31cd5f1216a514be154dfa950fcfd2804e66155985e WHIRLPOOL 2c65d7806673adb550dcdd8fa032a4dce8e1087e5c57b132c9ac53d6d93d6fb0da3219573bc2ecb12df7865a9a32a1a28378e03b3e3439853200186d42f18e7d
+DIST wireshark-2.2.6.tar.bz2 32317335 SHA256 f627d51eda85f5ae5f5c8c9fc1f6539ffc2a270dd7500dc7f67490a8534ca849 SHA512 d373254801b2d9ae248ff45be09ac36e1916b832430b8f57271421cbd2113c1ffa914ef23c7a1e704d8d5f666f0d4de5bcd9ef9d3801686a35511a5f2a230f3f WHIRLPOOL 859588103ea21fa4e8511a873af81d50e053c5a8b3a92bca2fca317e2ab3e8c4e0e37d89102b887d88a0ef7c6fc90ca45667a43466ac0d71f4ffeec4b9bbf0e0

diff --git a/net-analyzer/wireshark/wireshark-2.2.6.ebuild b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
new file mode 100644
index 00000000000..e6842e6fd3b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	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/speex
+		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
+	)
+	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}-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
+
+	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# 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 \
+		register.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 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-04-15  8:54 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-04-15  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     94a02604bfb78f0345fdf4c0819632aaf75dea14
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 08:53:04 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 08:54:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a02604

net-analyzer/wireshark: Stable for HPPA (bug #615462).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.6.ebuild b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
index e6842e6fd3b..5ee23006124 100644
--- a/net-analyzer/wireshark/wireshark-2.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-04-18  6:45 Michael Weber
  0 siblings, 0 replies; 673+ messages in thread
From: Michael Weber @ 2017-04-18  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     b1fd079339ab3e3026462835b2183ca14de818d6
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 06:42:34 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 06:43:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1fd0793

net-analyzer/wireshark: arm ppc stable (bug 615462).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/wireshark/wireshark-2.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.6.ebuild b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
index 5ee23006124..1b7018006e4 100644
--- a/net-analyzer/wireshark/wireshark-2.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-05-13 22:50 Michael Weber
  0 siblings, 0 replies; 673+ messages in thread
From: Michael Weber @ 2017-05-13 22:50 UTC (permalink / raw
  To: gentoo-commits

commit:     539741da56dfbf74848bd1030441bef4538f2f27
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 22:48:46 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat May 13 22:48:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539741da

net-analyzer/wireshark: ppc64 stable (bug 615462).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="ppc64"

 net-analyzer/wireshark/wireshark-2.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.6.ebuild b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
index 1b7018006e4..93120948f82 100644
--- a/net-analyzer/wireshark/wireshark-2.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-05-18  8:11 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-05-18  8:11 UTC (permalink / raw
  To: gentoo-commits

commit:     fe7f28a7121a303ec910a1c2c221834e66c1d308
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 08:11:17 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu May 18 08:11:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7f28a7

net-analyzer/wireshark: Stable for AMD64 x86 (bug #615462).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 net-analyzer/wireshark/wireshark-2.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.6.ebuild b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
index 93120948f82..08d37e1d710 100644
--- a/net-analyzer/wireshark/wireshark-2.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-05-21 18:15 Tobias Klausmann
  0 siblings, 0 replies; 673+ messages in thread
From: Tobias Klausmann @ 2017-05-21 18:15 UTC (permalink / raw
  To: gentoo-commits

commit:     9daa9aff610bf317fc5b3cd2a41b5ee6a35d2d91
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 18:14:47 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sun May 21 18:15:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9daa9aff

net-analyzer/wireshark-2.2.6-r0: add alpha keyword

Gentoo-Bug: 615462

 net-analyzer/wireshark/wireshark-2.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.6.ebuild b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
index 08d37e1d710..dec0e3d42b7 100644
--- a/net-analyzer/wireshark/wireshark-2.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-06-01 22:07 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-06-01 22:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6a1a17d9f0c256c712c8edba6c165883cce1f23f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  1 22:06:51 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jun  1 22:06:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a1a17d9

net-analyzer/wireshark: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.2.7.ebuild | 259 ++++++++++++++++++++++++++
 2 files changed, 260 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f24538cbd3f..c41c16adbbb 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-2.2.5.tar.bz2 32297102 SHA256 75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 SHA512 c419950683eb399f851e10cc268d541cbd6e75a957f412650fa9564760908864fcd0d5d6c3520e656d93c31cd5f1216a514be154dfa950fcfd2804e66155985e WHIRLPOOL 2c65d7806673adb550dcdd8fa032a4dce8e1087e5c57b132c9ac53d6d93d6fb0da3219573bc2ecb12df7865a9a32a1a28378e03b3e3439853200186d42f18e7d
 DIST wireshark-2.2.6.tar.bz2 32317335 SHA256 f627d51eda85f5ae5f5c8c9fc1f6539ffc2a270dd7500dc7f67490a8534ca849 SHA512 d373254801b2d9ae248ff45be09ac36e1916b832430b8f57271421cbd2113c1ffa914ef23c7a1e704d8d5f666f0d4de5bcd9ef9d3801686a35511a5f2a230f3f WHIRLPOOL 859588103ea21fa4e8511a873af81d50e053c5a8b3a92bca2fca317e2ab3e8c4e0e37d89102b887d88a0ef7c6fc90ca45667a43466ac0d71f4ffeec4b9bbf0e0
+DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44

diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
new file mode 100644
index 00000000000..e6842e6fd3b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	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/speex
+		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
+	)
+	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}-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
+
+	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# 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 \
+		register.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 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-06-12 12:41 Agostino Sarubbo
  0 siblings, 0 replies; 673+ messages in thread
From: Agostino Sarubbo @ 2017-06-12 12:41 UTC (permalink / raw
  To: gentoo-commits

commit:     69d1da5efb2173a8e52a7cd59e9406c54ef106e4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 12:41:37 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 12:41:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d1da5e

net-analyzer/wireshark: amd64 stable wrt bug #620858

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/wireshark/wireshark-2.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
index e6842e6fd3b..f7152fd9278 100644
--- a/net-analyzer/wireshark/wireshark-2.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-06-13 18:22 Markus Meier
  0 siblings, 0 replies; 673+ messages in thread
From: Markus Meier @ 2017-06-13 18:22 UTC (permalink / raw
  To: gentoo-commits

commit:     621c0a1892e0f421459894c4782d74aa9c9f0e72
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 18:22:18 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 18:22:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621c0a18

net-analyzer/wireshark: arm stable, bug #620858

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 net-analyzer/wireshark/wireshark-2.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
index 656e7a726c8..741d97fd54e 100644
--- a/net-analyzer/wireshark/wireshark-2.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-06-22 10:11 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-06-22 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     ec35de853bc3f1331de3fd5cc6611390d6824b3c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 10:11:13 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 10:11:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec35de85

net-analyzer/wireshark: I have definitely been channeling my evil twin yesterday, indeed.
Mwahahahaha... though I'm not sure I'll let him out of the basement soon
again. The neighbours, you know, and cleaning up the mess afterwards.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/wireshark/wireshark-2.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
index 1838fe91c9f..dec0e3d42b7 100644
--- a/net-analyzer/wireshark/wireshark-2.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-06-22 10:13 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-06-22 10:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2c1277732d778f8c68e3a9290e522aa20d227f37
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 10:13:27 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 10:13:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c127773

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.2.5.ebuild |   2 +-
 net-analyzer/wireshark/wireshark-2.2.6.ebuild | 259 --------------------------
 3 files changed, 1 insertion(+), 261 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 657a747face..10ee44a2506 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.2.5.tar.bz2 32297102 SHA256 75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 SHA512 c419950683eb399f851e10cc268d541cbd6e75a957f412650fa9564760908864fcd0d5d6c3520e656d93c31cd5f1216a514be154dfa950fcfd2804e66155985e WHIRLPOOL 2c65d7806673adb550dcdd8fa032a4dce8e1087e5c57b132c9ac53d6d93d6fb0da3219573bc2ecb12df7865a9a32a1a28378e03b3e3439853200186d42f18e7d
-DIST wireshark-2.2.6.tar.bz2 32317335 SHA256 f627d51eda85f5ae5f5c8c9fc1f6539ffc2a270dd7500dc7f67490a8534ca849 SHA512 d373254801b2d9ae248ff45be09ac36e1916b832430b8f57271421cbd2113c1ffa914ef23c7a1e704d8d5f666f0d4de5bcd9ef9d3801686a35511a5f2a230f3f WHIRLPOOL 859588103ea21fa4e8511a873af81d50e053c5a8b3a92bca2fca317e2ab3e8c4e0e37d89102b887d88a0ef7c6fc90ca45667a43466ac0d71f4ffeec4b9bbf0e0
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.4.0rc1.tar.xz 29097628 SHA256 902aa0f7dc9e14af98dbfa1669fe6ee049caeb763571ace426949d52df1dbfde SHA512 0222e7bd6237a0d1d0c2b21c66aed3995787f5cbc623db40df11ab5e6640fdfebcdd78e1960ee2ebc14cb26b700beefa4e1164504f5aa5424cbd6d62202bc888 WHIRLPOOL 988d4643c3f413541106d686aefb4622c780b026d5b97d7dc2872540ff4ce7947ba988e4b03b92d3d26c2dc1bbf681122930be4af01888ee8534d70dbe9842c6

diff --git a/net-analyzer/wireshark/wireshark-2.2.5.ebuild b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
index e0aadc7230b..324e1ffb5d9 100644
--- a/net-analyzer/wireshark/wireshark-2.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="ia64"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi

diff --git a/net-analyzer/wireshark/wireshark-2.2.6.ebuild b/net-analyzer/wireshark/wireshark-2.2.6.ebuild
deleted file mode 100644
index dec0e3d42b7..00000000000
--- a/net-analyzer/wireshark/wireshark-2.2.6.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	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/speex
-		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
-	)
-	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}-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
-
-	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# 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 \
-		register.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 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-06-30  7:32 Sergei Trofimovich
  0 siblings, 0 replies; 673+ messages in thread
From: Sergei Trofimovich @ 2017-06-30  7:32 UTC (permalink / raw
  To: gentoo-commits

commit:     b88ca3c6881bd854fc873de1914c5c98343482aa
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 07:11:34 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 07:11:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88ca3c6

net-analyzer/wireshark: ia64 stable, bug #620858

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/wireshark/wireshark-2.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
index dec0e3d42b7..de6d31e197f 100644
--- a/net-analyzer/wireshark/wireshark-2.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-06-30  9:22 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-06-30  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     378bb3556692362ea71f268bfcc1131ad90d66da
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 09:21:42 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 09:21:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378bb355

net-analyzer/wireshark: Add more USE flags, update live ebuild.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/wireshark/metadata.xml               | 11 +++++++++++
 net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild | 20 ++++++++++++++++----
 net-analyzer/wireshark/wireshark-99999999.ebuild  | 21 +++++++++++++++++----
 3 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 461d8656cff..e88111bc335 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -30,21 +30,32 @@
 	<use>
 		<flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
 		<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
+		<flag name="capinfos">Install capinfos, to print information about capture files</flag>
+		<flag name="captype">Install captype, to print the file types of capture files</flag>
 		<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
 		<flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
+		<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag>
 		<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
+		<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
+		<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
 		<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="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>
 		<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
 		<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
 		<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
+		<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
 		<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
+		<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
 		<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
 		<flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag>
 		<flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag>
 		<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
+		<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
 		<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
+		<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
+		<flag name="udpdump">Install udpdumpi, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
index 69dc87248c6..566d8052d7e 100644
--- a/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
@@ -12,10 +12,11 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="
-	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 doc doc-pdf
-	geoip gtk kerberos lua +netlink nghttp2 +pcap portaudio +qt5 sbc selinux
-	smi libssh libxml2 randpkt randpktdump snappy spandsp sshdump ssl tfshark
-	zlib
+	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
+	+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 )
@@ -146,11 +147,22 @@ src_configure() {
 	econf \
 		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
 		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
 		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(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 caps libcap) \
 		$(use_with geoip) \

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 68d8ab35815..7304f25144e 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -12,10 +12,11 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 doc doc-pdf
-	geoip gtk kerberos lua +netlink nghttp2 +pcap portaudio +qt5 sbc selinux
-	smi libssh libxml2 randpkt randpktdump snappy spandsp sshdump ssl tfshark
-	zlib
+	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
+	+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 )
@@ -91,6 +92,7 @@ RDEPEND="
 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
 )
 
@@ -149,11 +151,22 @@ src_configure() {
 	econf \
 		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
 		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
 		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(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 caps libcap) \
 		$(use_with geoip) \


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-06-30  9:50 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-06-30  9:50 UTC (permalink / raw
  To: gentoo-commits

commit:     75471ad17e395d55435321577184685e6bc81c44
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 09:50:22 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 09:50:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75471ad1

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.2.5.ebuild | 259 --------------------------
 2 files changed, 260 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f71bdada53c..b467df14167 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
-DIST wireshark-2.2.5.tar.bz2 32297102 SHA256 75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 SHA512 c419950683eb399f851e10cc268d541cbd6e75a957f412650fa9564760908864fcd0d5d6c3520e656d93c31cd5f1216a514be154dfa950fcfd2804e66155985e WHIRLPOOL 2c65d7806673adb550dcdd8fa032a4dce8e1087e5c57b132c9ac53d6d93d6fb0da3219573bc2ecb12df7865a9a32a1a28378e03b3e3439853200186d42f18e7d
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.4.0rc1.tar.xz 29097628 SHA256 902aa0f7dc9e14af98dbfa1669fe6ee049caeb763571ace426949d52df1dbfde SHA512 0222e7bd6237a0d1d0c2b21c66aed3995787f5cbc623db40df11ab5e6640fdfebcdd78e1960ee2ebc14cb26b700beefa4e1164504f5aa5424cbd6d62202bc888 WHIRLPOOL 988d4643c3f413541106d686aefb4622c780b026d5b97d7dc2872540ff4ce7947ba988e4b03b92d3d26c2dc1bbf681122930be4af01888ee8534d70dbe9842c6
 DIST wireshark-2.4.0rc2.tar.xz 28744512 SHA256 cb2a1dd25f0eb05c1f2a95012d08b704789b4bf016dfd4b86daa34e2afb7c99e SHA512 2df36aa6465256d63d95e69137a9e8bb828940c629dacec5afc4f9ceab158bd023d006bf5c44a50e7f6d1d94d704a7c5f7ecf4bf5d34ddfcb9af9ca1abd7887d WHIRLPOOL c5061779ee6146e5e4ea68e88713bd8bd92bd7a70a8ddf4d63d616db151a162e0e9fe529b6a2563690925a1c8ce4878a109310808304232086b42a1e9b86d502

diff --git a/net-analyzer/wireshark/wireshark-2.2.5.ebuild b/net-analyzer/wireshark/wireshark-2.2.5.ebuild
deleted file mode 100644
index 324e1ffb5d9..00000000000
--- a/net-analyzer/wireshark/wireshark-2.2.5.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="ia64"
-IUSE="
-	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	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/speex
-		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
-	)
-	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}-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
-
-	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# 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 \
-		register.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 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-07-07 17:45 Alexis Ballier
  0 siblings, 0 replies; 673+ messages in thread
From: Alexis Ballier @ 2017-07-07 17:45 UTC (permalink / raw
  To: gentoo-commits

commit:     eebaeb61321004deb4cf26ea8fed79a75ea3ea5b
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 17:32:03 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 17:45:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eebaeb61

net-analyzer/wireshark: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
index 566d8052d7e..fddf07a8ff2 100644
--- a/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-07-19 18:33 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-07-19 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a9ad726a98f0aa9dae317cee08b789effe1cbffb
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 18:33:05 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 18:33:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ad726a

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/wireshark/Manifest                   |   1 -
 net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild | 266 ----------------------
 2 files changed, 267 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index dfec7295585..02811d37e39 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.2.8.tar.bz2 32331209 SHA256 ecf02c148c9ab6e809026ad5743fe9be1739a9840ef6fece6837a7ddfbdf7edc SHA512 71af39c8c212bfb78ec978bbeddb4af41aa142643e2a27e05827b3b46d34ff85772321cb63d863270bee75ef6a6eb3e29d0e6052fca6b072f9981ad1eb924c07 WHIRLPOOL f74083fafd2c3956e11905cf982250f3553a0d091bc1191be7b938b86373ab9dc5e11c34ebf56324bca27424c1652e57e43d0d358f903a65416ab96695552400
-DIST wireshark-2.4.0rc1.tar.xz 29097628 SHA256 902aa0f7dc9e14af98dbfa1669fe6ee049caeb763571ace426949d52df1dbfde SHA512 0222e7bd6237a0d1d0c2b21c66aed3995787f5cbc623db40df11ab5e6640fdfebcdd78e1960ee2ebc14cb26b700beefa4e1164504f5aa5424cbd6d62202bc888 WHIRLPOOL 988d4643c3f413541106d686aefb4622c780b026d5b97d7dc2872540ff4ce7947ba988e4b03b92d3d26c2dc1bbf681122930be4af01888ee8534d70dbe9842c6
 DIST wireshark-2.4.0rc2.tar.xz 28744512 SHA256 cb2a1dd25f0eb05c1f2a95012d08b704789b4bf016dfd4b86daa34e2afb7c99e SHA512 2df36aa6465256d63d95e69137a9e8bb828940c629dacec5afc4f9ceab158bd023d006bf5c44a50e7f6d1d94d704a7c5f7ecf4bf5d34ddfcb9af9ca1abd7887d WHIRLPOOL c5061779ee6146e5e4ea68e88713bd8bd92bd7a70a8ddf4d63d616db151a162e0e9fe529b6a2563690925a1c8ce4878a109310808304232086b42a1e9b86d502

diff --git a/net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild
deleted file mode 100644
index a7271a99e3f..00000000000
--- a/net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
-
-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 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="
-	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 doc doc-pdf
-	geoip gtk kerberos lua +netlink nghttp2 +pcap portaudio +qt5 sbc selinux
-	smi libssh libxml2 randpkt randpktdump snappy spandsp sshdump ssl tfshark
-	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 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	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:* )
-	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/speex
-		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
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	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}-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
-
-	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with libxml2) \
-		$(use_with lua) \
-		$(use_with nghttp2) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# 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 \
-		register.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 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-07-19 18:33 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-07-19 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     364b06f781967644d67680b64f6cc248997873cc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 18:32:26 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 18:32:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364b06f7

net-analyzer/wireshark: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.2.8.ebuild | 259 ++++++++++++++++++++++++++
 2 files changed, 260 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b467df14167..dfec7295585 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
+DIST wireshark-2.2.8.tar.bz2 32331209 SHA256 ecf02c148c9ab6e809026ad5743fe9be1739a9840ef6fece6837a7ddfbdf7edc SHA512 71af39c8c212bfb78ec978bbeddb4af41aa142643e2a27e05827b3b46d34ff85772321cb63d863270bee75ef6a6eb3e29d0e6052fca6b072f9981ad1eb924c07 WHIRLPOOL f74083fafd2c3956e11905cf982250f3553a0d091bc1191be7b938b86373ab9dc5e11c34ebf56324bca27424c1652e57e43d0d358f903a65416ab96695552400
 DIST wireshark-2.4.0rc1.tar.xz 29097628 SHA256 902aa0f7dc9e14af98dbfa1669fe6ee049caeb763571ace426949d52df1dbfde SHA512 0222e7bd6237a0d1d0c2b21c66aed3995787f5cbc623db40df11ab5e6640fdfebcdd78e1960ee2ebc14cb26b700beefa4e1164504f5aa5424cbd6d62202bc888 WHIRLPOOL 988d4643c3f413541106d686aefb4622c780b026d5b97d7dc2872540ff4ce7947ba988e4b03b92d3d26c2dc1bbf681122930be4af01888ee8534d70dbe9842c6
 DIST wireshark-2.4.0rc2.tar.xz 28744512 SHA256 cb2a1dd25f0eb05c1f2a95012d08b704789b4bf016dfd4b86daa34e2afb7c99e SHA512 2df36aa6465256d63d95e69137a9e8bb828940c629dacec5afc4f9ceab158bd023d006bf5c44a50e7f6d1d94d704a7c5f7ecf4bf5d34ddfcb9af9ca1abd7887d WHIRLPOOL c5061779ee6146e5e4ea68e88713bd8bd92bd7a70a8ddf4d63d616db151a162e0e9fe529b6a2563690925a1c8ce4878a109310808304232086b42a1e9b86d502

diff --git a/net-analyzer/wireshark/wireshark-2.2.8.ebuild b/net-analyzer/wireshark/wireshark-2.2.8.ebuild
new file mode 100644
index 00000000000..e6842e6fd3b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.8.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	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/speex
+		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
+	)
+	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}-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
+
+	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# 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 \
+		register.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 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-07-20  6:41 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-07-20  6:41 UTC (permalink / raw
  To: gentoo-commits

commit:     57dd7164b202a24ddd925aacfe53e05b53eb4c47
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 06:41:27 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 06:41:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57dd7164

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-analyzer/wireshark/Manifest                   |   1 -
 net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild | 279 ----------------------
 2 files changed, 280 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2134130664a..81ccb710cc6 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.2.8.tar.bz2 32331209 SHA256 ecf02c148c9ab6e809026ad5743fe9be1739a9840ef6fece6837a7ddfbdf7edc SHA512 71af39c8c212bfb78ec978bbeddb4af41aa142643e2a27e05827b3b46d34ff85772321cb63d863270bee75ef6a6eb3e29d0e6052fca6b072f9981ad1eb924c07 WHIRLPOOL f74083fafd2c3956e11905cf982250f3553a0d091bc1191be7b938b86373ab9dc5e11c34ebf56324bca27424c1652e57e43d0d358f903a65416ab96695552400
 DIST wireshark-2.4.0.tar.xz 28755596 SHA256 890bb41b826ff04e98fb089446ab37e5871e16205278bfeffc2a7c7364de3b04 SHA512 1bac69c6582c05db05cf9fbe818baa62308e531ee3c304bcf0fe7a81aa84c41dc647ebd221f9b98d823557180097b6c239b05841ddc7ca7ede47ee2936715ab9 WHIRLPOOL 5cdbd48f372fe01b4d1b93e4564c1ae00481c1323997375254605ba0aa7f0a3c540e2d073457558152805f0340631d82cb3a0ac301099088d5b73252ffc98709
-DIST wireshark-2.4.0rc2.tar.xz 28744512 SHA256 cb2a1dd25f0eb05c1f2a95012d08b704789b4bf016dfd4b86daa34e2afb7c99e SHA512 2df36aa6465256d63d95e69137a9e8bb828940c629dacec5afc4f9ceab158bd023d006bf5c44a50e7f6d1d94d704a7c5f7ecf4bf5d34ddfcb9af9ca1abd7887d WHIRLPOOL c5061779ee6146e5e4ea68e88713bd8bd92bd7a70a8ddf4d63d616db151a162e0e9fe529b6a2563690925a1c8ce4878a109310808304232086b42a1e9b86d502

diff --git a/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
deleted file mode 100644
index fddf07a8ff2..00000000000
--- a/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
-
-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 ~arm ~arm64 ~hppa ~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
-	+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 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	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:* )
-	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/speex
-		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
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	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
-
-	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable capinfos) \
-		$(use_enable captype) \
-		$(use_enable ciscodump) \
-		$(use_enable dftest) \
-		$(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 caps libcap) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with libxml2) \
-		$(use_with lua) \
-		$(use_with nghttp2) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# 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 \
-		register.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 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-07-20  6:41 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-07-20  6:41 UTC (permalink / raw
  To: gentoo-commits

commit:     5437b5bcba1d230539932d99b3071eda46f6ff5d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 06:40:55 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 06:41:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5437b5bc

net-analyzer/wireshark: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-analyzer/wireshark/Manifest               |   1 +
 net-analyzer/wireshark/wireshark-2.4.0.ebuild | 279 ++++++++++++++++++++++++++
 2 files changed, 280 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 02811d37e39..2134130664a 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.2.8.tar.bz2 32331209 SHA256 ecf02c148c9ab6e809026ad5743fe9be1739a9840ef6fece6837a7ddfbdf7edc SHA512 71af39c8c212bfb78ec978bbeddb4af41aa142643e2a27e05827b3b46d34ff85772321cb63d863270bee75ef6a6eb3e29d0e6052fca6b072f9981ad1eb924c07 WHIRLPOOL f74083fafd2c3956e11905cf982250f3553a0d091bc1191be7b938b86373ab9dc5e11c34ebf56324bca27424c1652e57e43d0d358f903a65416ab96695552400
+DIST wireshark-2.4.0.tar.xz 28755596 SHA256 890bb41b826ff04e98fb089446ab37e5871e16205278bfeffc2a7c7364de3b04 SHA512 1bac69c6582c05db05cf9fbe818baa62308e531ee3c304bcf0fe7a81aa84c41dc647ebd221f9b98d823557180097b6c239b05841ddc7ca7ede47ee2936715ab9 WHIRLPOOL 5cdbd48f372fe01b4d1b93e4564c1ae00481c1323997375254605ba0aa7f0a3c540e2d073457558152805f0340631d82cb3a0ac301099088d5b73252ffc98709
 DIST wireshark-2.4.0rc2.tar.xz 28744512 SHA256 cb2a1dd25f0eb05c1f2a95012d08b704789b4bf016dfd4b86daa34e2afb7c99e SHA512 2df36aa6465256d63d95e69137a9e8bb828940c629dacec5afc4f9ceab158bd023d006bf5c44a50e7f6d1d94d704a7c5f7ecf4bf5d34ddfcb9af9ca1abd7887d WHIRLPOOL c5061779ee6146e5e4ea68e88713bd8bd92bd7a70a8ddf4d63d616db151a162e0e9fe529b6a2563690925a1c8ce4878a109310808304232086b42a1e9b86d502

diff --git a/net-analyzer/wireshark/wireshark-2.4.0.ebuild b/net-analyzer/wireshark/wireshark-2.4.0.ebuild
new file mode 100644
index 00000000000..fddf07a8ff2
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.0.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+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 ~arm ~arm64 ~hppa ~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
+	+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 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	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:* )
+	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/speex
+		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
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	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
+
+	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
+		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(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 caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with nghttp2) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# 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 \
+		register.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 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-07-22  8:14 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-07-22  8:14 UTC (permalink / raw
  To: gentoo-commits

commit:     95d3c864e0dd8599e544dc805f5fe8a184566759
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 22 08:14:29 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jul 22 08:14:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d3c864

net-analyzer/wireshark: Set dumpcap-group for dumpcap only when USE=dumpcap (bug #625732).

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-analyzer/wireshark/wireshark-2.4.0.ebuild    | 2 +-
 net-analyzer/wireshark/wireshark-99999999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-2.4.0.ebuild b/net-analyzer/wireshark/wireshark-2.4.0.ebuild
index fddf07a8ff2..91c6cd5751a 100644
--- a/net-analyzer/wireshark/wireshark-2.4.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.0.ebuild
@@ -146,6 +146,7 @@ src_configure() {
 	# --disable-profile-build bugs #215806, #292991, #479602
 	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) \
@@ -172,7 +173,6 @@ src_configure() {
 		$(use_with libxml2) \
 		$(use_with lua) \
 		$(use_with nghttp2) \
-		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
 		$(use_with sbc) \

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 7304f25144e..7d9cd1a57a7 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -150,6 +150,7 @@ src_configure() {
 	# --disable-profile-build bugs #215806, #292991, #479602
 	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) \
@@ -176,7 +177,6 @@ src_configure() {
 		$(use_with libxml2) \
 		$(use_with lua) \
 		$(use_with nghttp2) \
-		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
 		$(use_with sbc) \


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-08-29 22:52 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-08-29 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     775aa95ae2b9983f0c460571811964b41ecfc471
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 22:52:06 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 22:52:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775aa95a

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/wireshark/Manifest               |   2 -
 net-analyzer/wireshark/wireshark-2.2.8.ebuild | 259 ------------------------
 net-analyzer/wireshark/wireshark-2.4.0.ebuild | 279 --------------------------
 3 files changed, 540 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c4d440cfe1a..40c72c80708 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,3 @@
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
-DIST wireshark-2.2.8.tar.bz2 32331209 SHA256 ecf02c148c9ab6e809026ad5743fe9be1739a9840ef6fece6837a7ddfbdf7edc SHA512 71af39c8c212bfb78ec978bbeddb4af41aa142643e2a27e05827b3b46d34ff85772321cb63d863270bee75ef6a6eb3e29d0e6052fca6b072f9981ad1eb924c07 WHIRLPOOL f74083fafd2c3956e11905cf982250f3553a0d091bc1191be7b938b86373ab9dc5e11c34ebf56324bca27424c1652e57e43d0d358f903a65416ab96695552400
 DIST wireshark-2.2.9.tar.bz2 32341866 SHA256 c8b32c0e7d44a277e737c53d9d142ad3fe4265338f25a7fd8c891f58a7633fc2 SHA512 ee680ee5da66e251b4bb647296da2c8b9d6ec6b1b74d41d8ac05fd77ce8bec7cd9a5a83bf3769bec4a53e0b50086c6674c0c6fa659b752569d1508f57d0c07c8 WHIRLPOOL fc6b954a432f9994c214fbb3fbccca6d53c09c0ecdf8727fb262d687713f3d6b9b858799853d9e2746686bb7d29be46629f423fb513c57d1abf0b6da3065e638
-DIST wireshark-2.4.0.tar.xz 28755596 SHA256 890bb41b826ff04e98fb089446ab37e5871e16205278bfeffc2a7c7364de3b04 SHA512 1bac69c6582c05db05cf9fbe818baa62308e531ee3c304bcf0fe7a81aa84c41dc647ebd221f9b98d823557180097b6c239b05841ddc7ca7ede47ee2936715ab9 WHIRLPOOL 5cdbd48f372fe01b4d1b93e4564c1ae00481c1323997375254605ba0aa7f0a3c540e2d073457558152805f0340631d82cb3a0ac301099088d5b73252ffc98709
 DIST wireshark-2.4.1.tar.xz 28780384 SHA256 02ddbcf9b10f9dfa1e36eec00fe00cb5b5ce8e07203843baf056ac7909911fcd SHA512 66f3f9abecc00c4c153c61f42739522b091ba06cc68b6bd79fe45a1064192fbb88e38e96d4df6722255b06a3520f23d2db6c5fa5e4faf5e8641cf2f5dce10056 WHIRLPOOL 3cdf5b1a3fe95bfaf2416f1ea1310999dd6d34babd5c040797ae4b2ea5faee7b90797a6507fed9be77e6038e90acd052484982b2dc62d9da67ac1e2520ef94c2

diff --git a/net-analyzer/wireshark/wireshark-2.2.8.ebuild b/net-analyzer/wireshark/wireshark-2.2.8.ebuild
deleted file mode 100644
index e6842e6fd3b..00000000000
--- a/net-analyzer/wireshark/wireshark-2.2.8.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	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/speex
-		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
-	)
-	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}-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
-
-	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# 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 \
-		register.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 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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-2.4.0.ebuild b/net-analyzer/wireshark/wireshark-2.4.0.ebuild
deleted file mode 100644
index 91c6cd5751a..00000000000
--- a/net-analyzer/wireshark/wireshark-2.4.0.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
-
-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 ~arm ~arm64 ~hppa ~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
-	+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 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	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:* )
-	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/speex
-		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
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	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
-
-	# 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 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 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 caps libcap) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with libxml2) \
-		$(use_with lua) \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# 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 \
-		register.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 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-08-29 22:52 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-08-29 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     49dbcfc98bb509a879edd58bf7e9f16bf0449dde
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 22:51:06 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 22:52:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49dbcfc9

net-analyzer/wireshark: Version bump.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/wireshark/Manifest               |   2 +
 net-analyzer/wireshark/wireshark-2.2.9.ebuild | 259 ++++++++++++++++++++++++
 net-analyzer/wireshark/wireshark-2.4.1.ebuild | 279 ++++++++++++++++++++++++++
 3 files changed, 540 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 81ccb710cc6..c4d440cfe1a 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,5 @@
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.2.8.tar.bz2 32331209 SHA256 ecf02c148c9ab6e809026ad5743fe9be1739a9840ef6fece6837a7ddfbdf7edc SHA512 71af39c8c212bfb78ec978bbeddb4af41aa142643e2a27e05827b3b46d34ff85772321cb63d863270bee75ef6a6eb3e29d0e6052fca6b072f9981ad1eb924c07 WHIRLPOOL f74083fafd2c3956e11905cf982250f3553a0d091bc1191be7b938b86373ab9dc5e11c34ebf56324bca27424c1652e57e43d0d358f903a65416ab96695552400
+DIST wireshark-2.2.9.tar.bz2 32341866 SHA256 c8b32c0e7d44a277e737c53d9d142ad3fe4265338f25a7fd8c891f58a7633fc2 SHA512 ee680ee5da66e251b4bb647296da2c8b9d6ec6b1b74d41d8ac05fd77ce8bec7cd9a5a83bf3769bec4a53e0b50086c6674c0c6fa659b752569d1508f57d0c07c8 WHIRLPOOL fc6b954a432f9994c214fbb3fbccca6d53c09c0ecdf8727fb262d687713f3d6b9b858799853d9e2746686bb7d29be46629f423fb513c57d1abf0b6da3065e638
 DIST wireshark-2.4.0.tar.xz 28755596 SHA256 890bb41b826ff04e98fb089446ab37e5871e16205278bfeffc2a7c7364de3b04 SHA512 1bac69c6582c05db05cf9fbe818baa62308e531ee3c304bcf0fe7a81aa84c41dc647ebd221f9b98d823557180097b6c239b05841ddc7ca7ede47ee2936715ab9 WHIRLPOOL 5cdbd48f372fe01b4d1b93e4564c1ae00481c1323997375254605ba0aa7f0a3c540e2d073457558152805f0340631d82cb3a0ac301099088d5b73252ffc98709
+DIST wireshark-2.4.1.tar.xz 28780384 SHA256 02ddbcf9b10f9dfa1e36eec00fe00cb5b5ce8e07203843baf056ac7909911fcd SHA512 66f3f9abecc00c4c153c61f42739522b091ba06cc68b6bd79fe45a1064192fbb88e38e96d4df6722255b06a3520f23d2db6c5fa5e4faf5e8641cf2f5dce10056 WHIRLPOOL 3cdf5b1a3fe95bfaf2416f1ea1310999dd6d34babd5c040797ae4b2ea5faee7b90797a6507fed9be77e6038e90acd052484982b2dc62d9da67ac1e2520ef94c2

diff --git a/net-analyzer/wireshark/wireshark-2.2.9.ebuild b/net-analyzer/wireshark/wireshark-2.2.9.ebuild
new file mode 100644
index 00000000000..e6842e6fd3b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.9.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+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 )
+	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 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	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/speex
+		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
+	)
+	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}-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
+
+	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# 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 \
+		register.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 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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-2.4.1.ebuild b/net-analyzer/wireshark/wireshark-2.4.1.ebuild
new file mode 100644
index 00000000000..91c6cd5751a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+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 ~arm ~arm64 ~hppa ~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
+	+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 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	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:* )
+	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/speex
+		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
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	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
+
+	# 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 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 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 caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(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-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# 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 \
+		register.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 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
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	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."
+}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-08-30  5:50 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-08-30  5:50 UTC (permalink / raw
  To: gentoo-commits

commit:     804e51e6b4b5dbd6e51bb06c1ce267945e1f7c10
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 05:50:35 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 05:50:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804e51e6

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/wireshark/Manifest               |   1 -
 net-analyzer/wireshark/wireshark-2.2.9.ebuild | 259 --------------------------
 2 files changed, 260 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 40c72c80708..9b783365f9f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
-DIST wireshark-2.2.9.tar.bz2 32341866 SHA256 c8b32c0e7d44a277e737c53d9d142ad3fe4265338f25a7fd8c891f58a7633fc2 SHA512 ee680ee5da66e251b4bb647296da2c8b9d6ec6b1b74d41d8ac05fd77ce8bec7cd9a5a83bf3769bec4a53e0b50086c6674c0c6fa659b752569d1508f57d0c07c8 WHIRLPOOL fc6b954a432f9994c214fbb3fbccca6d53c09c0ecdf8727fb262d687713f3d6b9b858799853d9e2746686bb7d29be46629f423fb513c57d1abf0b6da3065e638
 DIST wireshark-2.4.1.tar.xz 28780384 SHA256 02ddbcf9b10f9dfa1e36eec00fe00cb5b5ce8e07203843baf056ac7909911fcd SHA512 66f3f9abecc00c4c153c61f42739522b091ba06cc68b6bd79fe45a1064192fbb88e38e96d4df6722255b06a3520f23d2db6c5fa5e4faf5e8641cf2f5dce10056 WHIRLPOOL 3cdf5b1a3fe95bfaf2416f1ea1310999dd6d34babd5c040797ae4b2ea5faee7b90797a6507fed9be77e6038e90acd052484982b2dc62d9da67ac1e2520ef94c2

diff --git a/net-analyzer/wireshark/wireshark-2.2.9.ebuild b/net-analyzer/wireshark/wireshark-2.2.9.ebuild
deleted file mode 100644
index e6842e6fd3b..00000000000
--- a/net-analyzer/wireshark/wireshark-2.2.9.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
-	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
-	libssh randpkt randpktdump sshdump ssl tfshark zlib
-"
-REQUIRED_USE="
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-	ssl? ( crypt )
-"
-
-S=${WORKDIR}/${P/_/}
-
-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 )
-	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 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	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/speex
-		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
-	)
-	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}-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
-
-	# 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 androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ciscodump) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable sshdump) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(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-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# 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 \
-		register.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 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
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	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."
-}


^ permalink raw reply related	[flat|nested] 673+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
@ 2017-08-30  8:27 Jeroen Roovers
  0 siblings, 0 replies; 673+ messages in thread
From: Jeroen Roovers @ 2017-08-30  8:27 UTC (permalink / raw
  To: gentoo-commits

commit:     a5f44d0c5c70918eaad08ea0e25160d9656c5959
Author:     Jeroen R