[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2024-05-31 Thread Sam James 
commit: a90ce0faabc59915fa897150951467e4933ea1f1
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  1 01:27:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  1 01:27:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a90ce0fa

net-analyzer/wireshark: fix tests w/ USE=-http2

Closes: https://bugs.gentoo.org/933290
Signed-off-by: Sam James  gentoo.org>

 .../files/wireshark-4.2.5-http2-test.patch | 31 ++
 net-analyzer/wireshark/wireshark-4.2.5.ebuild  |  7 +
 net-analyzer/wireshark/wireshark-.ebuild   |  7 +
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch 
b/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch
new file mode 100644
index ..f32109237d6d
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch
@@ -0,0 +1,31 @@
+https://gitlab.com/wireshark/wireshark/-/merge_requests/15824
+
+From cc8264d68f638c72ada1e94a9913902462c1a25a Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 1 Jun 2024 02:25:05 +0100
+Subject: [PATCH] test: skip test_sharkd_req_follow_http2 test if no http2
+ support
+
+Originally reported downstream in Gentoo at https://bugs.gentoo.org/933290.
+
+This is the same kind of thing as 
https://gitlab.com/wireshark/wireshark/-/merge_requests/9029.
+--- a/test/suite_sharkd.py
 b/test/suite_sharkd.py
+@@ -1174,7 +1174,13 @@ class TestSharkd:
+ },
+ ))
+ 
+-def test_sharkd_req_follow_http2(self, check_sharkd_session, 
capture_file):
++def test_sharkd_req_follow_http2(self, check_sharkd_session, 
capture_file, features):
++# If we don't have nghttp2, we output the compressed headers.
++# We could test against the expected output in that case, but
++# just skip for now.
++if not features.have_nghttp2:
++pytest.skip('Requires nghttp2.')
++
+ check_sharkd_session((
+ {"jsonrpc":"2.0", "id":1, "method":"load",
+  "params":{"file": capture_file('quic-with-secrets.pcapng')}
+-- 
+2.45.1
+

diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
index c7145d15489e..44fe8772760b 100644
--- a/net-analyzer/wireshark/wireshark-4.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
@@ -141,6 +141,7 @@ fi
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}-4.2.5-http2-test.patch
 )
 
 python_check_deps() {
@@ -269,12 +270,6 @@ src_configure() {
 src_test() {
cmake_build test-programs
 
-   EPYTEST_DESELECT=(
-   # TODO: investigate
-   
suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
-   suite_sharkd.py::TestSharkd::test_sharkd_req_follow_http2
-   )
-
# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
epytest \
--disable-capture \

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index c7145d15489e..44fe8772760b 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -141,6 +141,7 @@ fi
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}-4.2.5-http2-test.patch
 )
 
 python_check_deps() {
@@ -269,12 +270,6 @@ src_configure() {
 src_test() {
cmake_build test-programs
 
-   EPYTEST_DESELECT=(
-   # TODO: investigate
-   
suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
-   suite_sharkd.py::TestSharkd::test_sharkd_req_follow_http2
-   )
-
# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
epytest \
--disable-capture \

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2023-01-29 Thread Florian Schmaus 
commit: e1dbc04410cba085c3587626744c8790d015da0a
Author: Florian Schmaus  gentoo  org>
AuthorDate: Mon Jan 30 07:09:46 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon Jan 30 07:16:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1dbc044

net-analyzer/wireshark: convert ewarn to readme.gentoo

As discussed with sam, the note about the pcap group does not really fit
into the 'warning' category. It also causes noise since it is printed
with every emerge of wireshark. So instead we use the readme.gentoo-r1
eclass now.

Signed-off-by: Florian Schmaus  gentoo.org>

 net-analyzer/wireshark/files/README.gentoo| 3 +++
 net-analyzer/wireshark/wireshark-4.0.3.ebuild | 8 
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/wireshark/files/README.gentoo 
b/net-analyzer/wireshark/files/README.gentoo
new file mode 100644
index ..a26d2c4dcb76
--- /dev/null
+++ b/net-analyzer/wireshark/files/README.gentoo
@@ -0,0 +1,3 @@
+NOTE: To capture traffic with wireshark as normal user you have to
+add yourself to the pcap group. This security measure ensures
+that only trusted users are allowed to sniff your traffic.

diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
index 38a3ce5e8814..ab3fdea34f32 100644
--- a/net-analyzer/wireshark/wireshark-4.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LUA_COMPAT=( lua5-{1..2} )
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/;
@@ -292,6 +292,8 @@ src_install() {
if [[ -d "${ED}"/usr/share/appdata ]] ; then
rm -r "${ED}"/usr/share/appdata || die
fi
+
+   readme.gentoo_create_doc
 }
 
 pkg_postinst() {
@@ -306,7 +308,5 @@ pkg_postinst() {
"${EROOT}"/usr/bin/dumpcap
fi
 
-   ewarn "NOTE: To capture traffic with wireshark as normal user you have 
to"
-   ewarn "add yourself to the pcap group. This security measure ensures"
-   ewarn "that only trusted users are allowed to sniff your traffic."
+   readme.gentoo_print_elog
 }

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2022-02-19 Thread Sam James 
commit: 11d357718ec192403193260fe033e93973c3aa5f
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 20 06:29:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 20 06:30:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d35771

Revert "net-analyzer/wireshark: drop 3.4.10, 3.4.11, 3.6.0-r1"

This reverts commit c2f163b2438b412dffa637ae892000c2913d546f.

Needed by stable libvirt.

Bug: https://bugs.gentoo.org/830343
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest|   3 +
 .../files/wireshark-3.6.0-fix-no-tshark.patch  |  32 +++
 net-analyzer/wireshark/wireshark-3.4.10.ebuild | 283 
 net-analyzer/wireshark/wireshark-3.4.11.ebuild | 285 +
 net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild   | 272 
 5 files changed, 875 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b3b50a90c00b..df169bc81082 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,5 @@
+DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B 
fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563
 SHA512 
8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
+DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 
3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd
 SHA512 
cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
+DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 
17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7
 SHA512 
7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
 DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B 
49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0
 SHA512 
8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
 DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B 
585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156
 SHA512 
cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070

diff --git a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch 
b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
new file mode 100644
index ..dd497c51391c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
@@ -0,0 +1,32 @@
+https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5
+https://gitlab.com/wireshark/wireshark/-/issues/17766
+https://bugs.gentoo.org/823720
+
+From: Gerald Combs 
+Date: Mon, 6 Dec 2021 19:01:10 -0800
+Subject: [PATCH] CMake: Remove the update_tools_help target.
+
+Remove the update_tools_help target. Despite the comment, the weekly
+update job doesn't use it, we don't have targets for our other update
+scripts, and it currently causes issues if BUILD_tshark is disabled.
+Fixes #17766.
+--- a/docbook/CMakeLists.txt
 b/docbook/CMakeLists.txt
+@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS
+ 
+ set(GUIDE_INSTALL_DIRS)
+ 
+-# This is automatically updated each week. You probably don't need to run it
+-# or depend on it.
+-add_custom_target(update_tools_help
+-  COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
+-  ${PYTHON_EXECUTABLE} 
${CMAKE_SOURCE_DIR}/tools/update-tools-help.py
+-  --program-path $
+-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-)
+-set_docbook_target_properties(update_tools_help)
+-
+ set(WSUG_TITLE "Wireshark User's Guide")
+ 
+ set(WSUG_FILES
+GitLab

diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
new file mode 100644
index ..c3e28e4115a4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+   inherit git-r3
+else
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2021-12-06 Thread Sam James 
commit: 86721c622f6e75874b3dc83b0133f5973b5ba84b
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec  7 07:12:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  7 07:12:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86721c62

net-analyzer/wireshark: fix USE=-tshark build for 3.6.0

Bug: https://bugs.gentoo.org/823720
Signed-off-by: Sam James  gentoo.org>

 .../files/wireshark-3.6.0-fix-no-tshark.patch  | 32 ++
 net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild   |  1 +
 2 files changed, 33 insertions(+)

diff --git a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch 
b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
new file mode 100644
index ..dd497c51391c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
@@ -0,0 +1,32 @@
+https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5
+https://gitlab.com/wireshark/wireshark/-/issues/17766
+https://bugs.gentoo.org/823720
+
+From: Gerald Combs 
+Date: Mon, 6 Dec 2021 19:01:10 -0800
+Subject: [PATCH] CMake: Remove the update_tools_help target.
+
+Remove the update_tools_help target. Despite the comment, the weekly
+update job doesn't use it, we don't have targets for our other update
+scripts, and it currently causes issues if BUILD_tshark is disabled.
+Fixes #17766.
+--- a/docbook/CMakeLists.txt
 b/docbook/CMakeLists.txt
+@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS
+ 
+ set(GUIDE_INSTALL_DIRS)
+ 
+-# This is automatically updated each week. You probably don't need to run it
+-# or depend on it.
+-add_custom_target(update_tools_help
+-  COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
+-  ${PYTHON_EXECUTABLE} 
${CMAKE_SOURCE_DIR}/tools/update-tools-help.py
+-  --program-path $
+-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-)
+-set_docbook_target_properties(update_tools_help)
+-
+ set(WSUG_TITLE "Wireshark User's Guide")
+ 
+ set(WSUG_FILES
+GitLab

diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
index 3b3d7769e8ea..cd262a13d500 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -97,6 +97,7 @@ RDEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+   "${FILESDIR}"/${PN}-3.6.0-fix-no-tshark.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2021-03-03 Thread Sam James 
commit: 62f1cb871dbd4acb159060cb2e72344cc208f3c1
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  4 04:54:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  4 04:54:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f1cb87

net-analyzer/wireshark: rename live ebuild

Signed-off-by: Sam James  gentoo.org>

 ...9-ui-needs-wiretap.patch => wireshark--ui-needs-wiretap.patch} | 0
 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 2 +-
 .../wireshark/{wireshark-.ebuild => wireshark-.ebuild}| 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch 
b/net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch
similarity index 100%
rename from 
net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch
rename to net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 311f89608fe..7ff5005db92 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -100,7 +100,7 @@ RESTRICT="test"
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
+   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
 )
 
 pkg_setup() {

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
similarity index 98%
rename from net-analyzer/wireshark/wireshark-.ebuild
rename to net-analyzer/wireshark/wireshark-.ebuild
index 80fb077c9a9..0854e2e8254 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -98,7 +98,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
+   "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/, profiles/

2020-12-20 Thread Marek Szuba 
commit: 6636718bb751bf82e39dd6127a596a4cef54a087
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Dec 20 22:36:37 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Dec 20 22:44:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6636718b

net-analyzer/wireshark: migrate to lua-single.eclass

Both the latest release and the live ebuild. Nothing special, just
the usual version-selection treatment. Compatibility as specified
in the upstream build scripts.

Closes: https://bugs.gentoo.org/752789
Signed-off-by: Marek Szuba  gentoo.org>

 .../files/wireshark-3.4.2-cmake-lua-version.patch  | 11 ++
 ....ebuild => wireshark-3.4.2-r100.ebuild} | 25 --
 net-analyzer/wireshark/wireshark-.ebuild   | 21 +-
 profiles/package.mask  |  1 +
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git 
a/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch 
b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch
new file mode 100644
index 000..18f663b7d81
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch
@@ -0,0 +1,11 @@
+--- a/cmake/modules/FindLUA.cmake
 b/cmake/modules/FindLUA.cmake
+@@ -19,7 +19,7 @@
+ 
+ if(NOT WIN32)
+   find_package(PkgConfig)
+-  pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51)
++  pkg_search_module(LUA lua)
+   if(NOT LUA_FOUND)
+   pkg_search_module(LUA "lua<=5.2.99")
+   endif()

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
similarity index 91%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
index 25d08cbda03..8a5f5b3e6df 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
@@ -2,24 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils xdg-utils 
cmake
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/;
-EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
-   +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+   +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt
+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump 
ssl
sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
 "
-RESTRICT="!test? ( test )"
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="
@@ -35,11 +37,12 @@ CDEPEND="
ilbc? ( media-libs/libilbc )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
-   lua? ( >=dev-lang/lua-5.1:0= )
+   lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4 )
maxminddb? ( dev-libs/libmaxminddb )
minizip? ( sys-libs/zlib[minizip] )
netlink? ( dev-libs/libnl:3 )
+   opus? ( media-libs/opus )
pcap? ( net-libs/libpcap )
qt5? (
dev-qt/qtcore:5
@@ -88,13 +91,20 @@ RDEPEND="
selinux? ( sec-policy/selinux-wireshark )
 "
 REQUIRED_USE="
+   lua? ( ${LUA_REQUIRED_USE} )
plugin-ifdemo? ( plugins )
 "
+RESTRICT="test"
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch
 )
 
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
 src_configure() {
local mycmakeargs
 
@@ -159,6 +169,7 @@ src_configure() {
-DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)
-DENABLE_NGHTTP2=$(usex http2)
+   -DENABLE_OPUS=$(usex opus)
-DENABLE_PCAP=$(usex pcap)
-DENABLE_PLUGINS=$(usex plugins)
-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 25d08cbda03..61860be16a1 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -2,8 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2020-11-15 Thread Sam James 
commit: cf1f049003feaf74580f26c50ad6a91c35056d8e
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 16 06:10:41 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 16 06:10:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf1f0490

net-analyzer/wireshark: security cleanup

Bug: https://bugs.gentoo.org/750692
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest|   1 -
 .../files/wireshark-2.4-androiddump.patch  |  27 ---
 .../files/wireshark-2.9.0-tfshark-libm.patch   |  10 -
 .../wireshark--androiddump-wsutil.patch|  19 --
 .../wireshark/files/wireshark--qtsvg.patch |  10 -
 net-analyzer/wireshark/wireshark-3.2.7-r1.ebuild   | 256 -
 6 files changed, 323 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b08688c3b81..2728ff86217 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1 @@
-DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 
69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad
 SHA512 
c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
 DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 
5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7
 SHA512 
02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649

diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch 
b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
deleted file mode 100644
index 2272ef891c2..000
--- a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
+++ /dev/null
@@ -1,27 +0,0 @@
 a/extcap/androiddump.c
-+++ b/extcap/androiddump.c
-@@ -438,13 +438,13 @@
- pcap = pcap_open_dead_with_tstamp_precision(encap, PACKET_LENGTH, 
PCAP_TSTAMP_PRECISION_NANO);
- extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo);
- if (!extcap_dumper.dumper.pcap) {
--g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap));
-+g_warning("Can't open %s for saving packets: %s", fifo, 
pcap_geterr(pcap));
- pcap_close(pcap);
- exit(EXIT_CODE_CANNOT_SAVE_LIBPCAP_DUMP);
- }
- extcap_dumper.encap = encap;
- if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
--g_warning("Write to %s failed: %s", g_strerror(errno));
-+g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
- }
- #else
- wtap_dump_params params = WTAP_DUMP_PARAMS_INIT;
-@@ -480,7 +480,7 @@
- 
- pcap_dump((u_char *) extcap_dumper.dumper.pcap, _header, buffer);
- if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
--g_warning("Write to %s failed: %s", g_strerror(errno));
-+g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
- }
- #else
- int err = 0;

diff --git a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch 
b/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
deleted file mode 100644
index 40082c43501..000
--- a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2314,6 +2314,7 @@
- 
- if(BUILD_tfshark)
-   set(tfshark_LIBS
-+  m
-   ui
-   wiretap
-   epan

diff --git 
a/net-analyzer/wireshark/files/wireshark--androiddump-wsutil.patch 
b/net-analyzer/wireshark/files/wireshark--androiddump-wsutil.patch
deleted file mode 100644
index 3d3a2a9c932..000
--- a/net-analyzer/wireshark/files/wireshark--androiddump-wsutil.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 a/extcap/CMakeLists.txt
-+++ b/extcap/CMakeLists.txt
-@@ -91,6 +91,8 @@ if(BUILD_androiddump)
-   if(HAVE_LIBPCAP)
-   set(androiddump_LIBS
-   ui
-+  wiretap
-+  wsutil
-   ${GLIB2_LIBRARIES}
-   ${WIN_WS2_32_LIBRARY}
-   $<$:pcap::pcap>
-@@ -102,6 +104,7 @@ if(BUILD_androiddump)
-   set(androiddump_LIBS
-   ui
-   wiretap
-+  wsutil
-   ${GLIB2_LIBRARIES}
-   ${ZLIB_LIBRARIES}
-   ${CMAKE_DL_LIBS}

diff --git a/net-analyzer/wireshark/files/wireshark--qtsvg.patch 
b/net-analyzer/wireshark/files/wireshark--qtsvg.patch
deleted file mode 100644
index 8cff4bdd075..000
---

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2020-01-17 Thread Jeroen Roovers 
commit: d457c61eaff3a06ce2a2c6903f4f389330d7b8a4
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jan 17 12:28:22 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jan 17 12:29:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d457c61e

net-analyzer/wireshark: Fix USE='-lua -plugins'

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Closes: https://bugs.gentoo.org/705656
Signed-off-by: Jeroen Roovers  gentoo.org>

 ...-about_dialog-plugins_add_description.patch | 18 ++
 net-analyzer/wireshark/wireshark-3.2.1.ebuild  |  1 +
 net-analyzer/wireshark/wireshark-.ebuild   |  1 +
 3 files changed, 20 insertions(+)

diff --git 
a/net-analyzer/wireshark/files/wireshark--about_dialog-plugins_add_description.patch
 
b/net-analyzer/wireshark/files/wireshark--about_dialog-plugins_add_description.patch
new file mode 100644
index 000..5506c6ec2ad
--- /dev/null
+++ 
b/net-analyzer/wireshark/files/wireshark--about_dialog-plugins_add_description.patch
@@ -0,0 +1,18 @@
+--- a/ui/qt/about_dialog.cpp
 b/ui/qt/about_dialog.cpp
+@@ -112,7 +112,6 @@ QStringList AuthorListModel::headerColumns() const
+ return QStringList() << tr("Name") << tr("Email");
+ }
+ 
+-#if defined(HAVE_PLUGINS) || defined(HAVE_LUA)
+ static void plugins_add_description(const char *name, const char *version,
+ const char *types, const char *filename,
+ void *user_data)
+@@ -121,7 +120,6 @@ static void plugins_add_description(const char *name, 
const char *version,
+ QStringList plugin_row = QStringList() << name << version << types << 
filename;
+ *plugin_data << plugin_row;
+ }
+-#endif
+ 
+ PluginListModel::PluginListModel(QObject * parent) : 
AStringListListModel(parent)
+ {

diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild 
b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index d55d1f311ef..521ee2a97f0 100644
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -86,6 +86,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+   "${FILESDIR}"/${PN}--about_dialog-plugins_add_description.patch
"${FILESDIR}"/${PN}--androiddump-wsutil.patch
"${FILESDIR}"/${PN}--qtsvg.patch
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index a228b3f00e2..eb3257e5fc4 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -86,6 +86,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+   "${FILESDIR}"/${PN}--about_dialog-plugins_add_description.patch
"${FILESDIR}"/${PN}--androiddump-wsutil.patch
"${FILESDIR}"/${PN}--qtsvg.patch
"${FILESDIR}"/${PN}--ui-needs-wiretap.patch

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2019-01-09 Thread Jeroen Roovers 
commit: 38dc7a9478ce7f84b9a3553f44187b493b73d405
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jan  9 12:13:35 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jan  9 12:13:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38dc7a94

net-analyzer/wireshark: Version 2.6.6

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Bug: https://bugs.gentoo.org/674980
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest|   1 +
 .../files/wireshark-2.6.6-androiddump-wsutil.patch |  18 ++
 net-analyzer/wireshark/wireshark-2.6.6.ebuild  | 240 +
 3 files changed, 259 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ea58cc3f377..ef6b8f0b406 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,4 +2,5 @@ DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 
797540daca259a2d5d7dc6e637f2b504b6d
 DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B 
f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b
 SHA512 
87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
 DIST wireshark-2.6.4.tar.xz 28218232 BLAKE2B 
d54d7661801667f78f0c3248f4099c77ef016222ae942dc7a5776af2c5c18f7b00305556ac84df6afd19cf3d2bd59e78365067dd9402f978ae0a7db76c1730ca
 SHA512 
bc740548901b30f2e44c2b0933717288615fa38edc5e092607a8b12c60ecfacaa5aa7c59d7644cf29238d0d636fbe03d85559a0f2de81a3bf8ceac55fcf9ff07
 DIST wireshark-2.6.5.tar.xz 28390292 BLAKE2B 
f9847ef113b0c63e739be305603b42c5112da2e94b3110b9b104325af97801bd2b3d9d89cd334b59d460433520069cc2ba726e96aa9f22af112a28a653b9e29c
 SHA512 
fed2d08bb0ba06496c22a5d45946faf2ff4ca19c59faf758c668c583193faeec3c4379b64750478469fede91562891e9b6991591a09a3da8d2193cb64718d02f
+DIST wireshark-2.6.6.tar.xz 28407404 BLAKE2B 
5135789d345b675814a6394d5ba1469585b9eab917885730125b8a007aecd9cb48a510fc9e7479148cadf625807bac9017b854797e4bb2e562d7dc7f76140826
 SHA512 
b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56
 DIST wireshark-2.9.0.tar.xz 29438416 BLAKE2B 
17bbffe6e079133c4319a49a3672a4359b9e8eed1493b7440a2924c4bd57c45a1cbeee2ee50d4f3d96cbda436fa48eb6ba66bc61061f5fdbf71d1711c5467b43
 SHA512 
f24d873d75510488e0e60f75abce5820457786ff540ede3fb19fd45fea269527323ef5b5157ff83d2aaeabd60d03bac0a3dfc14495468d9478a8e5d7a30ad47b

diff --git 
a/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch 
b/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch
new file mode 100644
index 000..654c2c82db1
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -2843,6 +2843,7 @@
+   if(HAVE_LIBPCAP)
+   set(androiddump_LIBS
+   ui
++  wsutil
+   ${GLIB2_LIBRARIES}
+   ${PCAP_LIBRARIES}
+   )
+@@ -2853,6 +2854,7 @@
+   set(androiddump_LIBS
+   ui
+   wiretap
++  wsutil
+   ${GLIB2_LIBRARIES}
+   ${ZLIB_LIBRARIES}
+   ${CMAKE_DL_LIBS}

diff --git a/net-analyzer/wireshark/wireshark-2.6.6.ebuild 
b/net-analyzer/wireshark/wireshark-2.6.6.ebuild
new file mode 100644
index 000..852878b84a7
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.6.6.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib 
qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
+   +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap 
+netlink
+   nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc 
selinux
+   +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark 
+udpdump
+   zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.14:2
+   dev-libs/libgcrypt:0
+   netlink? ( dev-libs/libnl:3 )
+   adns? ( >=net-dns/c-ares-1.5 )
+   bcg729? ( media-libs/bcg729 )
+   filecaps? ( sys-libs/libcap )
+   gtk? (
+   x11-libs/gdk-pixbuf
+   x11-libs/gtk+:3
+   x11-libs/pango
+   x11-misc/xdg-utils
+   )
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2018-12-13 Thread Jeroen Roovers 
commit: 376bfd241e5e710bc83c2a65e33ce6e388cc4458
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Dec 13 14:19:47 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Dec 13 14:20:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376bfd24

net-analyzer/wireshark: Version 2.9.0

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-analyzer/wireshark/Manifest|   1 +
 .../files/wireshark-2.9.0-tfshark-libm.patch   |  10 +
 net-analyzer/wireshark/wireshark-2.9.0.ebuild  | 240 +
 3 files changed, 251 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1fcf5e0930c..ea58cc3f377 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,3 +2,4 @@ DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 
797540daca259a2d5d7dc6e637f2b504b6d
 DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B 
f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b
 SHA512 
87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
 DIST wireshark-2.6.4.tar.xz 28218232 BLAKE2B 
d54d7661801667f78f0c3248f4099c77ef016222ae942dc7a5776af2c5c18f7b00305556ac84df6afd19cf3d2bd59e78365067dd9402f978ae0a7db76c1730ca
 SHA512 
bc740548901b30f2e44c2b0933717288615fa38edc5e092607a8b12c60ecfacaa5aa7c59d7644cf29238d0d636fbe03d85559a0f2de81a3bf8ceac55fcf9ff07
 DIST wireshark-2.6.5.tar.xz 28390292 BLAKE2B 
f9847ef113b0c63e739be305603b42c5112da2e94b3110b9b104325af97801bd2b3d9d89cd334b59d460433520069cc2ba726e96aa9f22af112a28a653b9e29c
 SHA512 
fed2d08bb0ba06496c22a5d45946faf2ff4ca19c59faf758c668c583193faeec3c4379b64750478469fede91562891e9b6991591a09a3da8d2193cb64718d02f
+DIST wireshark-2.9.0.tar.xz 29438416 BLAKE2B 
17bbffe6e079133c4319a49a3672a4359b9e8eed1493b7440a2924c4bd57c45a1cbeee2ee50d4f3d96cbda436fa48eb6ba66bc61061f5fdbf71d1711c5467b43
 SHA512 
f24d873d75510488e0e60f75abce5820457786ff540ede3fb19fd45fea269527323ef5b5157ff83d2aaeabd60d03bac0a3dfc14495468d9478a8e5d7a30ad47b

diff --git a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch 
b/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
new file mode 100644
index 000..40082c43501
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -2314,6 +2314,7 @@
+ 
+ if(BUILD_tfshark)
+   set(tfshark_LIBS
++  m
+   ui
+   wiretap
+   epan

diff --git a/net-analyzer/wireshark/wireshark-2.9.0.ebuild 
b/net-analyzer/wireshark/wireshark-2.9.0.ebuild
new file mode 100644
index 000..e060d7fd222
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.9.0.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib 
python-r1 qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc 
+dumpcap
+   +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2
+   +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi 
snappy
+   spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.32:2
+   dev-libs/libgcrypt:0
+   adns? ( >=net-dns/c-ares-1.5 )
+   bcg729? ( media-libs/bcg729 )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   filecaps? ( sys-libs/libcap )
+   kerberos? ( virtual/krb5 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   netlink? ( dev-libs/libnl:3 )
+   nghttp2? ( net-libs/nghttp2 )
+   pcap? ( net-libs/libpcap )
+   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 )
+   snappy? ( app-arch/snappy )
+   spandsp? ( media-libs/spandsp )
+   sshdump? ( >=net-libs/libssh-0.6 )
+   ssl? ( net-libs/gnutls:= )
+   zlib? ( sys-libs/zlib )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+   ${CDEPEND}
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2018-07-24 Thread Jeroen Roovers 
commit: e8fe71341eb7f6a169d62dcad74a7650423eef24
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Jul 24 08:56:23 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Jul 24 08:57:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8fe7134

net-analyzer/wireshark: Old.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-analyzer/wireshark/Manifest|   1 -
 .../wireshark/files/wireshark-2.6.0-qtsvg.patch|  29 ---
 .../wireshark/files/wireshark-2.6.1-Qt-5.11.patch  |  54 -
 net-analyzer/wireshark/wireshark-2.6.1.ebuild  | 243 -
 4 files changed, 327 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f21c28363cc..251aec24554 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 
797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258
 SHA512 
2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
-DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B 
fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486
 SHA512 
e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
 DIST wireshark-2.6.2.tar.xz 28392140 BLAKE2B 
08fb59061f618494ee07ca19cd97ab2ebe7c483419c1932e185dd42a0fe2b6d0070834ae5b7aaea4981f6fbc4baeaadb7c9eee8bf32b823af77e753c468257ce
 SHA512 
e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch 
b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
deleted file mode 100644
index 63327727590..000
--- a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -926,14 +926,12 @@
-   Qt5LinguistTools
-   Qt5Multimedia
-   Qt5PrintSupport
--  Qt5Svg
-   Qt5Widgets
-   )
-   set(Qt5Core_OPTIONS REQUIRED)
-   set(Qt5LinguistTools_OPTIONS REQUIRED)
-   set(Qt5Multimedia_OPTIONS REQUIRED)
-   set(Qt5PrintSupport_OPTIONS REQUIRED)
--  set(Qt5Svg_OPTIONS REQUIRED)
-   set(Qt5Widgets_OPTIONS REQUIRED)
-   if (APPLE)
-   set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
-@@ -1229,11 +1227,6 @@
-   # That's the name autofoo uses
-   set(QT_MULTIMEDIA_LIB 1)
-   endif()
--  if(Qt5Svg_FOUND)
--  set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
--  # That's the name autofoo uses
--  set(QT_SVG_LIB 1)
--  endif()
-   if(Qt5MacExtras_FOUND)
-   set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
-   # That's the name autofoo uses

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch 
b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
deleted file mode 100644
index c8d8bb9ce9c..000
--- a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b8e8aa87f43c12ad564426b3359f593305cd45a1 Mon Sep 17 00:00:00 2001
-From: Roland Knall 
-Date: Wed, 25 Apr 2018 10:28:30 +0200
-Subject: [PATCH] Qt: Fix various missing header includes
-
-Qt 5.11 seems to have changed the include dependencies, so adding those, that 
are missing
-
-Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976
-Reviewed-on: https://code.wireshark.org/review/27145
-Petri-Dish: Roland Knall 
-Tested-by: Petri Dish Buildbot
-Reviewed-by: Roland Knall 

- ui/qt/packet_format_group_box.cpp | 1 +
- ui/qt/time_shift_dialog.cpp   | 1 +
- ui/qt/wireless_frame.cpp  | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/ui/qt/packet_format_group_box.cpp 
b/ui/qt/packet_format_group_box.cpp
-index 
a80a71aaaddfce2798ececcbb27a4d9e75382c1b..3c0fff28aa4cd91d344f2e70db1e66123bc17f41
 100644
 a/ui/qt/packet_format_group_box.cpp
-+++ b/ui/qt/packet_format_group_box.cpp
-@@ -10,6 +10,7 @@
- #include 
- 
- #include 
-+#include 
- 
- PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
- QGroupBox(parent),
-diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
-index 
93882c09a377a5630e8bb09b4e80d7f6a84f7293..8460db2e966a0f572478de7430b8b63f4473dd16
 100644
 a/ui/qt/time_shift_dialog.cpp
-+++ b/ui/qt/time_shift_dialog.cpp
-@@ -14,6 +14,7 @@
- #include 
- #include 
- 
-+#include 
- 
- TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2018-07-19 Thread Jeroen Roovers 
commit: b41bd2658265ac01a59336363d8ebe0e84e62693
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Jul 19 11:57:56 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Jul 19 12:07:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41bd265

net-analyzer/wireshark: Version 2.6.2.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-analyzer/wireshark/Manifest|   1 +
 .../wireshark/files/wireshark-2.6.2-qtsvg.patch|  17 ++
 net-analyzer/wireshark/wireshark-2.6.2.ebuild  | 242 +
 3 files changed, 260 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d946c88db42..498d65d3794 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 
797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258
 SHA512 
2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 
19a69d077b794ab07fbfb22b7cf9e61ff54ded5dcd0396ba97d1cbd99addaeb9670d5a870f5e83c39384230def04c078d676580bded81746753716cb392ee05a
 SHA512 
171047fa36a6cb29d1edb8e28086e24075f8b77581d9f3142fa39af8ae3d6dfe0c2e41a9335ca5d9851578b54ac9e6e74ff5bd92a96af262a5cc7a73857b8b81
 DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B 
fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486
 SHA512 
e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
+DIST wireshark-2.6.2.tar.xz 28392140 BLAKE2B 
08fb59061f618494ee07ca19cd97ab2ebe7c483419c1932e185dd42a0fe2b6d0070834ae5b7aaea4981f6fbc4baeaadb7c9eee8bf32b823af77e753c468257ce
 SHA512 
e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch 
b/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch
new file mode 100644
index 000..445851090a6
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch
@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -939,14 +939,12 @@
+   Qt5LinguistTools
+   Qt5Multimedia
+   Qt5PrintSupport
+-  Qt5Svg
+   Qt5Widgets
+   )
+   set(Qt5Core_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+   set(Qt5LinguistTools_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+   set(Qt5Multimedia_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+   set(Qt5PrintSupport_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+-  set(Qt5Svg_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+   set(Qt5Widgets_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+   if (APPLE)
+   set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)

diff --git a/net-analyzer/wireshark/wireshark-2.6.2.ebuild 
b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
new file mode 100644
index 000..a2a55523293
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib 
qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+   adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
+   +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap 
+netlink
+   nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc 
selinux
+   +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark 
+udpdump
+   zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+   >=dev-libs/glib-2.14:2
+   dev-libs/libgcrypt:0
+   netlink? ( dev-libs/libnl:3 )
+   adns? ( >=net-dns/c-ares-1.5 )
+   bcg729? ( media-libs/bcg729 )
+   filecaps? ( sys-libs/libcap )
+   gtk? (
+   x11-libs/gdk-pixbuf
+   x11-libs/gtk+:3
+   x11-libs/pango
+   x11-misc/xdg-utils
+   )
+   kerberos? ( virtual/krb5 )
+   sshdump? ( >=net-libs/libssh-0.6 )
+   ciscodump? ( >=net-libs/libssh-0.6 )
+   libxml2? ( dev-libs/libxml2 )
+   lua? ( >=dev-lang/lua-5.1:* )
+   lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
+   nghttp2? ( net-libs/nghttp2 )
+   pcap? ( net-libs/libpcap )
+   portaudio?

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2018-06-03 Thread Jeroen Roovers 
commit: d66c707eef1fa2e8fe400d0c7897feb4ebd6783c
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun  3 11:05:59 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun  3 11:05:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66c707e

net-analyzer/wireshark: Update live ebuild.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../wireshark/files/wireshark--qtsvg.patch | 29 ++
 net-analyzer/wireshark/wireshark-.ebuild   |  3 +--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/files/wireshark--qtsvg.patch 
b/net-analyzer/wireshark/files/wireshark--qtsvg.patch
new file mode 100644
index 000..4f151dbba21
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark--qtsvg.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -910,14 +910,12 @@
+   Qt5LinguistTools
+   Qt5Multimedia
+   Qt5PrintSupport
+-  Qt5Svg
+   Qt5Widgets
+   )
+   set(Qt5Core_OPTIONS REQUIRED)
+   set(Qt5LinguistTools_OPTIONS REQUIRED)
+   set(Qt5Multimedia_OPTIONS REQUIRED)
+   set(Qt5PrintSupport_OPTIONS REQUIRED)
+-  set(Qt5Svg_OPTIONS REQUIRED)
+   set(Qt5Widgets_OPTIONS REQUIRED)
+   if (APPLE)
+   set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
+@@ -1187,11 +1185,6 @@
+   # That's the name autotools used
+   set(QT_MULTIMEDIA_LIB 1)
+   endif()
+-  if(Qt5Svg_FOUND)
+-  set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
+-  # That's the name autotools used
+-  set(QT_SVG_LIB 1)
+-  endif()
+   if(Qt5MacExtras_FOUND)
+   set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+   # That's the name autotools used

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 7ca08d8b924..039381a543b 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -87,8 +87,7 @@ RDEPEND="
 "
 PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
-   "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
-   "${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
+   "${FILESDIR}"/${PN}--qtsvg.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 )

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2018-06-03 Thread Jeroen Roovers 
commit: bd310499ec0055ecb7fb91b69cffa1fabdfe02ba
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun  3 10:50:23 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun  3 10:51:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd310499

net-analyzer/wireshark: Fix building against Qt 5.11 (bug #656832).

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../wireshark/files/wireshark-2.6.1-Qt-5.11.patch  | 54 ++
 net-analyzer/wireshark/wireshark-2.6.1.ebuild  |  1 +
 2 files changed, 55 insertions(+)

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch 
b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
new file mode 100644
index 000..c8d8bb9ce9c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
@@ -0,0 +1,54 @@
+From b8e8aa87f43c12ad564426b3359f593305cd45a1 Mon Sep 17 00:00:00 2001
+From: Roland Knall 
+Date: Wed, 25 Apr 2018 10:28:30 +0200
+Subject: [PATCH] Qt: Fix various missing header includes
+
+Qt 5.11 seems to have changed the include dependencies, so adding those, that 
are missing
+
+Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976
+Reviewed-on: https://code.wireshark.org/review/27145
+Petri-Dish: Roland Knall 
+Tested-by: Petri Dish Buildbot
+Reviewed-by: Roland Knall 
+---
+ ui/qt/packet_format_group_box.cpp | 1 +
+ ui/qt/time_shift_dialog.cpp   | 1 +
+ ui/qt/wireless_frame.cpp  | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/ui/qt/packet_format_group_box.cpp 
b/ui/qt/packet_format_group_box.cpp
+index 
a80a71aaaddfce2798ececcbb27a4d9e75382c1b..3c0fff28aa4cd91d344f2e70db1e66123bc17f41
 100644
+--- a/ui/qt/packet_format_group_box.cpp
 b/ui/qt/packet_format_group_box.cpp
+@@ -10,6 +10,7 @@
+ #include 
+ 
+ #include 
++#include 
+ 
+ PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
+ QGroupBox(parent),
+diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
+index 
93882c09a377a5630e8bb09b4e80d7f6a84f7293..8460db2e966a0f572478de7430b8b63f4473dd16
 100644
+--- a/ui/qt/time_shift_dialog.cpp
 b/ui/qt/time_shift_dialog.cpp
+@@ -14,6 +14,7 @@
+ #include 
+ #include 
+ 
++#include 
+ 
+ TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
+ QDialog(parent),
+diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
+index 
bd9076abcf4a5d7b6fd73d2bc0b63b4fff8c256a..46fb2dd2f3054f66380239106fb2e27058196447
 100644
+--- a/ui/qt/wireless_frame.cpp
 b/ui/qt/wireless_frame.cpp
+@@ -23,6 +23,7 @@
+ #include 
+ 
+ #include 
++#include 
+ 
+ // To do:
+ // - Disable or hide invalid channel types.

diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild 
b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
index 0303f97755a..1efd67dc6fe 100644
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
"${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+   "${FILESDIR}"/${PN}-2.6.1-Qt-5.11.patch
"${FILESDIR}"/${PN}--androiddump.patch
 )

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2018-05-04 Thread Jeroen Roovers 
commit: 3614f5d49b3123f7a627e27bcb085d1d58c890b0
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri May  4 17:53:50 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri May  4 18:01:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3614f5d4

net-analyzer/wireshark: #654714, #654690.

Package-Manager: Portage-2.3.33, Repoman-2.3.9

 .../wireshark/files/wireshark-2.6.0-qtsvg.patch| 29 ++
 .../wireshark/files/wireshark-2.6.0-redhat.patch   | 11 
 net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild   |  2 ++
 net-analyzer/wireshark/wireshark-.ebuild   |  2 ++
 4 files changed, 44 insertions(+)

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch 
b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
new file mode 100644
index 000..63327727590
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -926,14 +926,12 @@
+   Qt5LinguistTools
+   Qt5Multimedia
+   Qt5PrintSupport
+-  Qt5Svg
+   Qt5Widgets
+   )
+   set(Qt5Core_OPTIONS REQUIRED)
+   set(Qt5LinguistTools_OPTIONS REQUIRED)
+   set(Qt5Multimedia_OPTIONS REQUIRED)
+   set(Qt5PrintSupport_OPTIONS REQUIRED)
+-  set(Qt5Svg_OPTIONS REQUIRED)
+   set(Qt5Widgets_OPTIONS REQUIRED)
+   if (APPLE)
+   set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
+@@ -1229,11 +1227,6 @@
+   # That's the name autofoo uses
+   set(QT_MULTIMEDIA_LIB 1)
+   endif()
+-  if(Qt5Svg_FOUND)
+-  set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
+-  # That's the name autofoo uses
+-  set(QT_SVG_LIB 1)
+-  endif()
+   if(Qt5MacExtras_FOUND)
+   set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+   # That's the name autofoo uses

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch 
b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch
new file mode 100644
index 000..fe17609bf61
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -3019,7 +3019,7 @@
+ 
+ endif()
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
++if(CMAKE_SYSTEM_NAME STREQUAL "Red Hat")
+   find_program(RPMBUILD_EXECUTABLE rpmbuild)
+   find_program(GIT_EXECUTABLE git)
+ endif()

diff --git a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild 
b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
index 40b8f06bf92..23ffa310a9e 100644
--- a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
@@ -89,6 +89,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
"${FILESDIR}"/${PN}-2.4-androiddump.patch
"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+   "${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
+   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}--androiddump.patch
 )
 

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index c216e52d33d..7ca08d8b924 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -88,6 +88,8 @@ RDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+   "${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
+   "${FILESDIR}"/${PN}-2.6.0-redhat.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2018-05-02 Thread Jeroen Roovers 
commit: 433e897529f5a41682189da5dba5a9f853c39456
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed May  2 18:37:26 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed May  2 18:37:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433e8975

net-analyzer/wireshark: Switch to cmake (bug #545688).

Package-Manager: Portage-2.3.32, Repoman-2.3.9

 .../files/wireshark-2.6.0-androiddump-wsutil.patch |  26 +++
 ...k-.ebuild => wireshark-2.6.0-r1.ebuild} | 192 -
 net-analyzer/wireshark/wireshark-.ebuild   | 190 
 3 files changed, 176 insertions(+), 232 deletions(-)

diff --git 
a/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch 
b/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch
new file mode 100644
index 000..e28465e814a
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -2841,6 +2841,7 @@
+   if(HAVE_LIBPCAP)
+   set(androiddump_LIBS
+   ui
++  wsutil
+   ${GLIB2_LIBRARIES}
+   ${PCAP_LIBRARIES}
+   )
+@@ -2851,6 +2852,7 @@
+   set(androiddump_LIBS
+   ui
+   wiretap
++  wsutil
+   ${GLIB2_LIBRARIES}
+   ${ZLIB_LIBRARIES}
+   ${CMAKE_DL_LIBS}
+@@ -2862,7 +2864,6 @@
+   )
+ 
+   add_executable(androiddump WIN32 ${androiddump_FILES})
+-  # XXX Shouldn't we add wsutil to androiddump_LIBS instead?
+   set_extcap_executable_properties(androiddump)
+   target_link_libraries(androiddump ${androiddump_LIBS})
+   install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR})

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
similarity index 55%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
index e39d7345ef9..1efad019372 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
@@ -2,25 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils fcaps flag-o-matic git-r3 gnome2-utils multilib 
qmake-utils user xdg-utils
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib 
qmake-utils user xdg-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/;
-EGIT_REPO_URI="https://code.wireshark.org/review/wireshark;
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
-   adns androiddump bcg729 +capinfos +caps +captype ciscodump
-   cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk
-   kerberos libssh libxml2 lua lz4 +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 )
+   adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc
+   +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap 
+netlink
+   nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc 
selinux
+   +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark 
+udpdump
+   zlib
 "
 
 S=${WORKDIR}/${P/_/}
@@ -32,7 +28,6 @@ CDEPEND="
adns? ( >=net-dns/c-ares-1.5 )
bcg729? ( media-libs/bcg729 )
caps? ( sys-libs/libcap )
-   geoip? ( dev-libs/geoip )
gtk? (
x11-libs/gdk-pixbuf
x11-libs/gtk+:3
@@ -40,10 +35,12 @@ CDEPEND="
x11-misc/xdg-utils
)
kerberos? ( virtual/krb5 )
-   libssh? ( >=net-libs/libssh-0.6 )
+   sshdump? ( >=net-libs/libssh-0.6 )
+   ciscodump? ( >=net-libs/libssh-0.6 )
libxml2? ( dev-libs/libxml2 )
lua? ( >=dev-lang/lua-5.1:* )
lz4? ( app-arch/lz4 )
+   maxminddb? ( dev-libs/libmaxminddb )
nghttp2? ( net-libs/nghttp2 )
pcap? ( net-libs/libpcap )
portaudio? ( media-libs/portaudio )
@@ -64,7 +61,7 @@ CDEPEND="
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
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
 # and broken installs. #455122
 DEPEND="
${CDEPEND}
@@ -73,11 +70,7 @@ DEPEND="
!https://www.wireshark.org/;

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2018-01-16 Thread Jeroen Roovers 
commit: e0e175a627ca55478fb4ffae9349eb607a18b64f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Jan 16 09:56:13 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Jan 16 09:56:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e175a6

net-analyzer/wireshark: Add upstream patch for libsmi configure check (bug 
#644734 by Bob Johnson).

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../wireshark/files/wireshark-2.4.3-libsmi.patch   | 233 +
 net-analyzer/wireshark/wireshark-2.4.3.ebuild  |   1 +
 net-analyzer/wireshark/wireshark-2.4.4.ebuild  |   1 +
 3 files changed, 235 insertions(+)

diff --git a/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch 
b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch
new file mode 100644
index 000..288efb7d66f
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch
@@ -0,0 +1,233 @@
+From 72c2e53981a204d746737d8c01c4ad3738cd4880 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Jo=C3=A3o=20Valverde?= 
+Date: Sun, 5 Nov 2017 12:05:43 +
+Subject: [PATCH 1/1] autotools: Use pkg-config to configure Libsmi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Icecea743739aa7e1a65753f623f311514260d373
+Reviewed-on: https://code.wireshark.org/review/24252
+Petri-Dish: João Valverde 
+Tested-by: Petri Dish Buildbot
+Reviewed-by: João Valverde 
+---
+ Makefile.am  |   2 +-
+ configure.ac |  27 +---
+ epan/Makefile.am |   2 +-
+ m4/libsmi.m4 | 125 ---
+ 4 files changed, 24 insertions(+), 132 deletions(-)
+ delete mode 100644 m4/libsmi.m4
+
+diff --git a/Makefile.am b/Makefile.am
+index a2851e0..e6ed5eb 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -422,7 +422,7 @@ EPAN_EXTRA_LIBS = \
+   @KRB5_LIBS@ \
+   @LIBGCRYPT_LIBS@\
+   @LIBGNUTLS_LIBS@\
+-  @LIBSMI_LDFLAGS@
++  @LIBSMI_LIBS@
+ 
+ # Libraries and plugin flags with which to link wireshark.
+ #
+diff --git a/configure.ac b/configure.ac
+index 3b3475b..326561c 100644
+--- a/configure.ac
 b/configure.ac
+@@ -432,10 +432,6 @@ linux*)
+   fi
+ esac
+ 
+-# libsmi
+-# FIXME: currently the path argument to with-libsmi is being ignored
+-AX_LIBSMI
+-
+ #
+ # Check if we should build the Wireshark User's Guide
+ #
+@@ -2427,6 +2423,27 @@ else
+ fi
+ AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
+ 
++#
++# Libsmi check
++#
++AC_ARG_WITH(libsmi,
++  AC_HELP_STRING([--with-libsmi=@<:@yes/no@:>@],
++   [use libsmi MIB/PIB library @<:@default=yes, if 
available@:>@]),
++   [], [with_libsmi="if_available"])
++
++have_libsmi=no
++if test "x$with_libsmi" != "xno"; then
++  PKG_CHECK_MODULES(LIBSMI, libsmi,
++  [have_libsmi=yes
++   AC_DEFINE(HAVE_LIBSMI, 1, [Define if you have libsmi])
++  ],
++  [if test "x$with_libsmi" = "xyes"; then
++  # Error out if the user explicitly requested libsmi
++  AC_MSG_ERROR([Libsmi was requested, but is not 
installed for development])
++   fi
++  ]
++  )
++fi
+ 
+ dnl
+ dnl check whether plugins should be enabled
+@@ -3012,7 +3029,7 @@ echo "   Use pcap library : $want_pcap"
+ echo "   Use zlib library : $zlib_message"
+ echo "   Use kerberos library : $krb5_message"
+ echo " Use c-ares library : $c_ares_message"
+-echo "Use SMI MIB library : $libsmi_message"
++echo "Use SMI MIB library : $have_libsmi"
+ echo " Use GNU gcrypt library : yes"
+ echo " Use GnuTLS library : $tls_message"
+ echo " Use POSIX capabilities library : $libcap_message"
+diff --git a/epan/Makefile.am b/epan/Makefile.am
+index 9f7de62..e85f97b 100644
+--- a/epan/Makefile.am
 b/epan/Makefile.am
+@@ -330,7 +330,7 @@ libwireshark_la_LIBADD = \
+   @KRB5_LIBS@ \
+   @LIBGCRYPT_LIBS@\
+   @LIBGNUTLS_LIBS@\
+-  @LIBSMI_LDFLAGS@\
++  @LIBSMI_LIBS@   \
+   @LZ4_LIBS@  \
+   @NGHTTP2_LIBS@  \
+   @SNAPPY_LIBS@   \
+diff --git a/m4/libsmi.m4 b/m4/libsmi.m4
+deleted file mode 100644
+index d719438..000
+--- a/m4/libsmi.m4
 /dev/null
+@@ -1,125 +0,0 @@
+-# Configure paths for libsmi
+-# Shamelessly stolen from http://autoconf-archive.cryp.to/ax_lib_sqlite3.html
+-
+-# Synopsis: AX_LIBSMI([minimum library version])
+-# The default minimum library version is 2
+-
+-# This macro sets/substitutes the following:
+-# AC_DEFINE(HAVE_LIBSMI)
+-# AC_SUBST(LIBSMI_CFLAGS)
+-# AC_SUBST(LIBSMI_LDFLAGS)
+-# AC_SUBST(LIBSMI_VERSION)
+-# $libsmi_message is set to "yes" or "no"
+-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2017-11-26 Thread Jeroen Roovers 
commit: 5f1fdf39a7d536af29a578d167a44cc50d8544c2
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Nov 27 07:52:28 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Nov 27 07:52:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1fdf39

net-analyzer/wireshark: Fix header install (bug #638866 by Garri), configure 
options, androiddump patch.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-analyzer/wireshark/Manifest   | 4 ++--
 net-analyzer/wireshark/files/wireshark--androiddump.patch | 6 +++---
 net-analyzer/wireshark/wireshark-.ebuild  | 6 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c15d386eaf9..8be664a29b2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,2 @@
-DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 
689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 
417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
 WHIRLPOOL 
0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
-DIST wireshark-2.4.2.tar.xz 28791712 SHA256 
d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 
212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417
 WHIRLPOOL 
245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177
+DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B 
a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea
 SHA512 
417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
+DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 
64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91
 SHA512 
212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417

diff --git a/net-analyzer/wireshark/files/wireshark--androiddump.patch 
b/net-analyzer/wireshark/files/wireshark--androiddump.patch
index 124a9b8b00b..db1c560848e 100644
--- a/net-analyzer/wireshark/files/wireshark--androiddump.patch
+++ b/net-analyzer/wireshark/files/wireshark--androiddump.patch
@@ -1,10 +1,10 @@
 --- a/extcap/Makefile.am
 +++ b/extcap/Makefile.am
-@@ -49,6 +49,7 @@
- androiddump_LDADD = \
+@@ -32,6 +32,7 @@
+   ../ui/libui.a   \
../wiretap/libwiretap.la\
../wsutil/libwsutil.la  \
 +  @PCAP_LIBS@ \
@GLIB_LIBS@
  
- if ENABLE_STATIC
+ randpktdump_SOURCES = \

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 5d11c1bd60e..f8b854c9dc0 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -146,8 +146,6 @@ src_configure() {
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) \
@@ -173,7 +171,7 @@ src_configure() {
$(use_with geoip) \
$(use_with gtk gtk 3) \
$(use_with kerberos krb5) \
-   $(use_with libssh ssh) \
+   $(use_with libssh) \
$(use_with libxml2) \
$(use_with lua) \
$(use_with nghttp2) \
@@ -192,7 +190,6 @@ src_configure() {
$(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[@]}
@@ -236,7 +233,6 @@ src_install() {
epan/dissectors/*.h \
epan/ftypes/*.h \
epan/wmem/*.h \
-   register.h \
wiretap/*.h \
ws_diag_control.h \
ws_symbol_export.h \

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2016-06-30 Thread Jeroen Roovers 
commit: 5edb4955a5eda3a8e56786f5a4f543e14b5710a5
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Jun 30 19:13:09 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Jun 30 19:23:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5edb4955

net-analyzer/wireshark: Version bump.

Package-Manager: portage-2.3.0

 net-analyzer/wireshark/Manifest|   1 +
 .../files/wireshark-2.1.0-sse4_2-r1.patch  |  21 ++
 net-analyzer/wireshark/wireshark-2.1.0.ebuild  | 267 +
 3 files changed, 289 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f8b92b2..7d5f2d5 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.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/files/wireshark-2.1.0-sse4_2-r1.patch 
b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch
new file mode 100644
index 000..8efe5af
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
 b/configure.ac
+@@ -818,6 +818,7 @@
+ AC_SUBST(PIE_CFLAGS)
+ AC_SUBST(PIE_LDFLAGS)
+ 
++AC_ARG_ENABLE(sse4_2,[  --enable-sse4_2 Support SSE4.2 (Streaming 
SIMD Extensions 4.2) instructions],[
+ WS_CFLAGS_saved="$WS_CFLAGS"
+ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
+ if test "x$can_add_to_cflags" = "xyes"
+@@ -844,6 +845,10 @@
+   ac_sse4_2_flag=-xarch=sse4_2
+   fi
+ fi
++],[
++AC_MSG_RESULT(no)
++])
++
+ WS_CFLAGS="$WS_CFLAGS_saved"
+ 
+ if test "x$ac_sse4_2_flag" != x; then

diff --git a/net-analyzer/wireshark/wireshark-2.1.0.ebuild 
b/net-analyzer/wireshark/wireshark-2.1.0.ebuild
new file mode 100644
index 000..3b74b0b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.1.0.ebuild
@@ -0,0 +1,267 @@
+# 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
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2016-01-19 Thread Jeroen Roovers 
commit: c1824deb29b36aab08897e7201e5bfd0bd98
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jan 20 06:04:33 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jan 20 06:06:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c182

net-analyzer/wireshark: Old.

Package-Manager: portage-2.2.27

 net-analyzer/wireshark/Manifest|   2 -
 .../files/wireshark-1.12.5-cross-compile.patch |  51 
 .../wireshark/files/wireshark-1.12.6-rcc.patch |  52 
 .../wireshark-1.12.8-gtk-deprecated-warnings.patch |  28 ---
 .../wireshark/files/wireshark-1.99.0-qt5.patch |  88 ---
 .../files/wireshark-1.99.0.1975-sse4_2.patch   |  20 --
 .../wireshark/files/wireshark-1.99.1-sbc.patch |  18 --
 .../wireshark/files/wireshark-1.99.7-qt-pie.patch  |  11 -
 net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild  | 266 
 net-analyzer/wireshark/wireshark-1.12.8.ebuild | 258 ---
 net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild   | 279 -
 net-analyzer/wireshark/wireshark-2.0.0.ebuild  | 274 
 12 files changed, 1347 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index effdccf..6bf61e7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1 @@
-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/files/wireshark-1.12.5-cross-compile.patch 
b/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch
deleted file mode 100644
index 3118178..000
--- a/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://code.wireshark.org/review/8481
-
-From edefd74591d8f7010024a31576c2cb51eb1526ad Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Sat, 16 May 2015 05:08:53 -0400
-Subject: [PATCH] switch to AC_PATH_TOOL
-
-The TOOL variant will automatically search for host prefixed scripts
-(e.g. armv7a-unknown-linux-gnueabi-pcap-config) before falling back
-to the default (i.e. pcap-config).  This makes cross-compiling a bit
-simpler.
-
-Change-Id: Ia450839693b5550f798634a7e8b82c2a661b088c

- acinclude.m4 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index ffb1cac..c79c427 100644
 a/acinclude.m4
-+++ b/acinclude.m4
-@@ -380,7 +380,7 @@ AC_DEFUN([AC_WIRESHARK_PCAP_CHECK],
- # The user didn't specify a directory in which libpcap resides.
- # First, look for a pcap-config script.
- #
--AC_PATH_PROG(PCAP_CONFIG, pcap-config)
-+AC_PATH_TOOL(PCAP_CONFIG, pcap-config)
- 
- if test -n "$PCAP_CONFIG" ; then
-   #
-@@ -1217,7 +1217,7 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK],
-   AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
- fi
-   else
--AC_PATH_PROG(KRB5_CONFIG, krb5-config)
-+AC_PATH_TOOL(KRB5_CONFIG, krb5-config)
- if test -x "$KRB5_CONFIG"
- then
-   KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
-@@ -2033,7 +2033,7 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK],
- [
-   no_qt=""
- 
--  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
- 
-   if test x$PKG_CONFIG != xno ; then
-   if pkg-config --atleast-pkgconfig-version 0.7 ; then
--- 
-2.4.0
-

diff --git a/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch 
b/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch
deleted file mode 100644
index b8290d0..000
--- a/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -1609,11 +1609,37 @@
-   # we don't know whether they'll

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2015-12-24 Thread Jeroen Roovers 
commit: b83fca33acfbe7f82760feeead0f6f5937984f20
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Dec 24 11:22:39 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Dec 24 12:50:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b83fca33

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

Package-Manager: portage-2.2.26

 .../files/wireshark-2.0.0-androiddump-pcap.patch   |  10 +
 net-analyzer/wireshark/metadata.xml|   2 +
 net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild   | 278 +
 3 files changed, 290 insertions(+)

diff --git 
a/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch 
b/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch
new file mode 100644
index 000..639e299
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.am
 b/Makefile.am
+@@ -549,6 +549,7 @@
+   wiretap/libwiretap.la   \
+   wsutil/libwsutil.la \
+   @GLIB_LIBS@ \
++  @PCAP_LIBS@ \
+   @SOCKET_LIBS@
+ 
+ androiddump_CFLAGS = $(AM_CLEAN_CFLAGS)

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 2707e56..9b808bb 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -26,6 +26,7 @@
 
 
 Use the GNU net-dns/c-ares library to resolve DNS 
names
+Install androiddump
 Use dev-libs/libgcrypt to decrypt traffic
 Build documentation in pdf format (US and a4 paper 
sizes)
 Build the wireshark executable with a GTK+ UI version 
3.
@@ -34,5 +35,6 @@
 Build the wireshark executable with an experimental Qt UI 
instead of GTK+.
 Use media-libs/sbc for playing back SBC encoded 
packets
 Use net-libs/libsmi to resolve numeric OIDs into 
human readable format
+Install tfshark
 
 

diff --git a/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild 
b/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild
new file mode 100644
index 000..bf934d2
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild
@@ -0,0 +1,278 @@
+# 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/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
+   ! 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."
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2015-11-11 Thread Jeroen Roovers 
commit: 23f9b505007a260c5ebb966aacf3108e10968e90
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Nov 12 07:42:13 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Nov 12 07:42:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23f9b505

net-analyzer/wireshark: Old.

Package-Manager: portage-2.2.24

 net-analyzer/wireshark/Manifest|   1 -
 .../wireshark-1.11.3-gtk-deprecated-warnings.patch |  29 ---
 net-analyzer/wireshark/wireshark-1.12.7.ebuild | 258 -
 3 files changed, 288 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 40505a0..4459e4c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
-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.0rc3.tar.bz2 30951707 SHA256 
11f46b2d202f923c87a0b8e1a07bd9910bbcc5c265c69de3a23dde82e0f647e3 SHA512 
42c914ff600306a81616d7fb7dda90e0c11af05ff226c23fee0c21b62ad8db63f3cbe4201c93bc265a797dcd9927c0e0201602d2af7a869167f015232f149782
 WHIRLPOOL 
97a133a0cc8862cb9bebe29eae14c01ab0d7a5146256d54604a88a170ed7ed86658989e616b99d62d920866f8f5a120fc633c38b81114132a18795c61e037d9d

diff --git 
a/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch 
b/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch
deleted file mode 100644
index 1e87ce6..000
--- 
a/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch
+++ /dev/null
@@ -1,29 +0,0 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -1491,26 +1491,6 @@
-   wireshark_man=""
- fi
- 
--if test "$have_gtk" = "yes" ; then
--  # If we have GTK then add flags for it.
--
--  CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
--  CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
--  if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version 
-ge 10 \) ; then
--  ## Allow use of deprecated & disable deprecated warnings if Gtk 
>= 3.10;
--  ##  The deprecations in Gtk 3.10 will not be fixed ...
--  CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS"
--  else
--  CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
--  fi
--  CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
--  if test ! \( $gtk_config_major_version -eq 2 -a 
$gtk_config_minor_version -lt 20 \) ; then
--  # Enable GSEAL when building with GTK > 2.20
--  # (Versions prior to 2.22 lacked some necessary accessors.)
--  CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
--  fi
--fi
--
- # XXX - Is this really necessary?  When we build with both Gtk+ and Qt it 
works...
- if test "$use_glib_cflags" = "true"; then
-   # Use GLIB_CFLAGS

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild 
b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
deleted file mode 100644
index d7c8afd..000
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ /dev/null
@@ -1,258 +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 +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? (