* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2024-10-05 7:22 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2024-10-05 7:22 UTC (permalink / raw
To: gentoo-commits
commit: 690de938f65c99ed989b56877bd2c983bf6adec1
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Fri Sep 27 15:42:37 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 07:22:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=690de938
net-analyzer/wireshark: add 4.4.0, fix handling of release notes
Closes: https://bugs.gentoo.org/939195
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 2 +
net-analyzer/wireshark/files/release-notes.html | 6 ++
...shark-4.4.0-fix-filesystem-absolute-paths.patch | 98 ++++++++++++++++++++++
...ireshark-9999.ebuild => wireshark-4.4.0.ebuild} | 24 +++++-
net-analyzer/wireshark/wireshark-9999.ebuild | 20 ++++-
5 files changed, 143 insertions(+), 7 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 90f0c130154f..7612e63f7625 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,3 +8,5 @@ DIST wireshark-4.2.5-signatures.txt 2706 BLAKE2B d10f6e9b4d8bcd8f0a30501bbbfee9e
DIST wireshark-4.2.5.tar.xz 45014156 BLAKE2B 536743a7e402f7a511d7612454d9770f0e67a0f2ebc1ab49912b12965e605f2082eff37f41f7642b89859257926ce13d88728194b79cbe5dcf6b15d72516c5fc SHA512 92a8fb08af5a1da30ca469fa45bd982638069907d289fa716068ac71141b7d9726ca0b01adc2910da4c928db23760da75a1c6a7c2eb795ac66ba003a90abb87b
DIST wireshark-4.2.6-signatures.txt 2706 BLAKE2B b9666d6aaef774e08ec903bbda90067adaa357cee65cdd6b711b6caef7b1cd540290a93d80d2f3f29c861d212c97793303e51fc8f297d7945c379a237acfa3f8 SHA512 287342d1ccb36326a9bab5e50c48442a41b599e258611e9046eedb078a84f2840d16f29f91b1259b3b4d37486e48d85596192ea5c6b9d1fa7ad3e78543193e0b
DIST wireshark-4.2.6.tar.xz 45015272 BLAKE2B 880acf82c7e535b89ce8b41293c90197825ffe1132720337e77b3dcee0eaf476cb3faa6f9b42d3864e9f6892e624d0b286afdaf6bbe7e6b60483296d087a4bc3 SHA512 265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516
+DIST wireshark-4.4.0-signatures.txt 2706 BLAKE2B 46337f24dfe32b1ff39f8a0b1f30c29a43d7a02a4e8e787833dde47a98206f36501b3e7fe449cc874f81733f8a7b2a16b4e5b07a2fae20d7ddae0121adbc8f98 SHA512 1725790d0671d31814b92508079a135d328df58bd94305e2406a3edf9e08bc5e2bb4ac487045b99684acb8cc8343422cececa32319bbcb36712bb3b2c860cb0c
+DIST wireshark-4.4.0.tar.xz 46786568 BLAKE2B 679b774e780201d1d188f5ce2ec1eb21d98250d2dd45b37b741a3cd5d6dc59d983e473a3f87e3ae1b8eef0b0f9b0c02227eecee644697ec19b6c3b2a21a5ad31 SHA512 a00275ffcc7c5bdf546e3e1c95a2fa77b86232d008f77b1b2f3de8e63f1862321d7a439cba2d136be4407131e07e20071d972a4efb7db2bc55388a347f47ce9e
diff --git a/net-analyzer/wireshark/files/release-notes.html b/net-analyzer/wireshark/files/release-notes.html
new file mode 100644
index 000000000000..fae4810cc97c
--- /dev/null
+++ b/net-analyzer/wireshark/files/release-notes.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="refresh" content="0; url='https://www.wireshark.org/docs/relnotes/#VERSION#'" />
+ </head>
+</html>
diff --git a/net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch b/net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch
new file mode 100644
index 000000000000..ff7a8f25591c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch
@@ -0,0 +1,98 @@
+
+Patch from https://gitlab.com/wireshark/wireshark/-/merge_requests/17202
+
+From ac7e2e846ed8cbcaf7938d3bda3e289068af743c Mon Sep 17 00:00:00 2001
+From: John Thacker <johnthacker@gmail.com>
+Date: Mon, 9 Sep 2024 08:49:44 -0400
+Subject: [PATCH] filesystem: Work around CMake absolute paths
+
+CMake recommends that the various CMAKE_INSTALL_<dir> variables
+be relative paths, and we have been assuming that they are.
+Absolute paths are technically allowed.
+
+Work around absolute paths, and just don't look for the doc
+dir, etc. in relocated paths if they are.
+
+Fix #20055
+---
+ wsutil/CMakeLists.txt | 5 +++++
+ wsutil/filesystem.c | 26 +++++++++++++++++++++-----
+ 2 files changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
+index 2daf371ca2f..976446bcfe7 100644
+--- a/wsutil/CMakeLists.txt
++++ b/wsutil/CMakeLists.txt
+@@ -7,6 +7,11 @@
+ # SPDX-License-Identifier: GPL-2.0-or-later
+ #
+
++# CMake says that these paths should be relative to the install prefix
++# https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
++# Things generally work if they're not, but it becomes impossible
++# to relocate paths. Work around that, and just don't try to support
++# relocation.
+ file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}" PATH_INSTALL_PREFIX)
+ string(REPLACE "\\" "\\\\" PATH_INSTALL_PREFIX "${PATH_INSTALL_PREFIX}")
+ file(TO_NATIVE_PATH "${CMAKE_INSTALL_DATADIR}" PATH_DATA_DIR)
+diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
+index bec1cea25b6..942a8c7dcf0 100644
+--- a/wsutil/filesystem.c
++++ b/wsutil/filesystem.c
+@@ -1107,7 +1107,11 @@ get_datafile_dir(void)
+ */
+ datafile_dir = g_strdup(progfile_dir);
+ } else {
+- datafile_dir = g_build_filename(install_prefix, DATA_DIR, CONFIGURATION_NAMESPACE_LOWER, (char *)NULL);
++ if (g_path_is_absolute(DATA_DIR)) {
++ datafile_dir = g_build_filename(DATA_DIR, CONFIGURATION_NAMESPACE_LOWER, (char *)NULL);
++ } else {
++ datafile_dir = g_build_filename(install_prefix, DATA_DIR, CONFIGURATION_NAMESPACE_LOWER, (char *)NULL);
++ }
+ }
+ #endif
+ return datafile_dir;
+@@ -1159,7 +1163,11 @@ get_doc_dir(void)
+ */
+ doc_dir = g_strdup(progfile_dir);
+ } else {
+- doc_dir = g_build_filename(install_prefix, DOC_DIR, (char *)NULL);
++ if (g_path_is_absolute(DOC_DIR)) {
++ doc_dir = g_strdup(DOC_DIR);
++ } else {
++ doc_dir = g_build_filename(install_prefix, DOC_DIR, (char *)NULL);
++ }
+ }
+ #endif
+ return doc_dir;
+@@ -1246,7 +1254,11 @@ init_plugin_dir(void)
+ */
+ plugin_dir = g_build_filename(get_progfile_dir(), "plugins", (char *)NULL);
+ } else {
+- plugin_dir = g_build_filename(install_prefix, PLUGIN_DIR, (char *)NULL);
++ if (g_path_is_absolute(PLUGIN_DIR)) {
++ plugin_dir = g_strdup(PLUGIN_DIR);
++ } else {
++ plugin_dir = g_build_filename(install_prefix, PLUGIN_DIR, (char *)NULL);
++ }
+ }
+ #endif // HAVE_MSYSTEM / _WIN32
+ #endif /* defined(HAVE_PLUGINS) || defined(HAVE_LUA) */
+@@ -1379,8 +1391,12 @@ init_extcap_dir(void)
+ CONFIGURATION_NAMESPACE_LOWER, (char *)NULL);
+ }
+ else {
+- extcap_dir = g_build_filename(install_prefix,
+- is_packet_configuration_namespace() ? EXTCAP_DIR : LOG_EXTCAP_DIR, (char *)NULL);
++ if (g_path_is_absolute(EXTCAP_DIR)) {
++ extcap_dir = g_strdup(is_packet_configuration_namespace() ? EXTCAP_DIR : LOG_EXTCAP_DIR);
++ } else {
++ extcap_dir = g_build_filename(install_prefix,
++ is_packet_configuration_namespace() ? EXTCAP_DIR : LOG_EXTCAP_DIR, (char *)NULL);
++ }
+ }
+ #endif // HAVE_MSYSTEM / _WIN32
+ }
+--
+GitLab
+
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-4.4.0.ebuild
similarity index 92%
copy from net-analyzer/wireshark/wireshark-9999.ebuild
copy to net-analyzer/wireshark/wireshark-4.4.0.ebuild
index 1a49b2ff63b7..475384795063 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.4.0.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-LUA_COMPAT=( lua5-{1..2} )
-# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12
+LUA_COMPAT=( lua5-{3..4} )
PYTHON_COMPAT=( python3_{10..13} )
inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
@@ -24,7 +23,7 @@ else
S="${WORKDIR}/${P/_/}"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
fi
fi
@@ -139,6 +138,8 @@ if [[ ${PV} != *9999* ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )"
fi
+PATCHES=( "${FILESDIR}/wireshark-4.4.0-fix-filesystem-absolute-paths.patch" )
+
python_check_deps() {
use test || return 0
@@ -284,8 +285,23 @@ src_install() {
# https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd
cmake_src_install install-headers
+ # prepare Relase Notes redirector if necessary (bug #939195)
+ local relnotes="doc/release-notes.html"
+
+ if ! use doc; then
+ # by default create a link for our specific version
+ local relversion="wireshark-${PV}.html"
+
+ # for 9999 we link to the release notes index page
+ if [[ ${PV} == *9999* ]] ; then
+ relversion=""
+ fi
+
+ sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die
+ fi
+
# FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+ dodoc AUTHORS ChangeLog README* doc/randpkt.txt doc/README* ${relnotes}
# install headers
insinto /usr/include/wireshark
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 1a49b2ff63b7..ec60ad18b9d9 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-LUA_COMPAT=( lua5-{1..2} )
-# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12
+LUA_COMPAT=( lua5-{3..4} )
PYTHON_COMPAT=( python3_{10..13} )
inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
@@ -284,8 +283,23 @@ src_install() {
# https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd
cmake_src_install install-headers
+ # prepare Relase Notes redirector if necessary (bug #939195)
+ local relnotes="doc/release-notes.html"
+
+ if ! use doc; then
+ # by default create a link for our specific version
+ local relversion="wireshark-${PV}.html"
+
+ # for 9999 we link to the release notes index page
+ if [[ ${PV} == *9999* ]] ; then
+ relversion=""
+ fi
+
+ sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die
+ fi
+
# FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+ dodoc AUTHORS ChangeLog README* doc/randpkt.txt doc/README* ${relnotes}
# install headers
insinto /usr/include/wireshark
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2024-10-11 2:27 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2024-10-11 2:27 UTC (permalink / raw
To: gentoo-commits
commit: 587b4b3dcef7e79d742670755e3c0cdc45469932
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 02:15:55 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 02:15:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587b4b3d
net-analyzer/wireshark: add 4.2.8
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 2 +
.../wireshark/files/wireshark-4.2.8-cares.patch | 48 +++
net-analyzer/wireshark/wireshark-4.2.8.ebuild | 350 +++++++++++++++++++++
3 files changed, 400 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bdf37dad940c..0f7c2a8053e8 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,5 +8,7 @@ DIST wireshark-4.2.6-signatures.txt 2706 BLAKE2B b9666d6aaef774e08ec903bbda90067
DIST wireshark-4.2.6.tar.xz 45015272 BLAKE2B 880acf82c7e535b89ce8b41293c90197825ffe1132720337e77b3dcee0eaf476cb3faa6f9b42d3864e9f6892e624d0b286afdaf6bbe7e6b60483296d087a4bc3 SHA512 265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516
DIST wireshark-4.2.7-signatures.txt 2706 BLAKE2B e209123e0785f7cdda0083c142575a89d5874f647bd5ee3ef3010b9bca558bf90297c1434191d1c199a02035fe3305f38642410e76ee4b00bfa459e950d2fbb8 SHA512 3bc3f0a9e9de25c9e025ba6d91259f038f15444a1c10197a138a7558cfb69e80163e7b1064d6dbd9701ee37b71834caadc9843b2f21a41ec683853e7c5f0f24a
DIST wireshark-4.2.7.tar.xz 45017312 BLAKE2B ab82c4ff9afa0fecb3cddbabc7441c3f457c2ccfc39f8a1e65f5d4df752bbdf7cb3d892db5a3de86ec055b12c512f4d067f6d98626ecd2f58f31052e10415be8 SHA512 22ef36bb18610c36d848277c95df17734ac266ea301e636fd19900da0ac49c3d5ce8b59c3fce3a2ef1e919c70fa4003647cbd417c06248dabe498f5772f62c15
+DIST wireshark-4.2.8-signatures.txt 2706 BLAKE2B 10128023609008d18a502e09ec8f77898db557fe08340bd242c07f0b9802da6c326f7391b363764800debf5e0ef8aa5df73771bad5881f875a32e0faba5907a6 SHA512 031ab84ab1232a74108ad37ae03f8fe1eb3728fc04b20887e89343ebff985a27b7b04653599a4ba03a3e98dfff33a38adbc1671d0519fc73c2677d82702f4542
+DIST wireshark-4.2.8.tar.xz 45032832 BLAKE2B 315926efc0b53b5ca2a35dc2dedf66f14150a6f06eac18816d12defcba2ba9e136abc63fe1042a9d3a93820f5854f8375638bef86c7a95d0315494edda290470 SHA512 4c132d8760ca7bc4976ee5f5b3f4904610d7e2129e10653d3d3fc6ca371b1891c8de2981324bd3113e5bf9302add0370f97b041314b3f6c508da46815a40a562
DIST wireshark-4.4.0-signatures.txt 2706 BLAKE2B 46337f24dfe32b1ff39f8a0b1f30c29a43d7a02a4e8e787833dde47a98206f36501b3e7fe449cc874f81733f8a7b2a16b4e5b07a2fae20d7ddae0121adbc8f98 SHA512 1725790d0671d31814b92508079a135d328df58bd94305e2406a3edf9e08bc5e2bb4ac487045b99684acb8cc8343422cececa32319bbcb36712bb3b2c860cb0c
DIST wireshark-4.4.0.tar.xz 46786568 BLAKE2B 679b774e780201d1d188f5ce2ec1eb21d98250d2dd45b37b741a3cd5d6dc59d983e473a3f87e3ae1b8eef0b0f9b0c02227eecee644697ec19b6c3b2a21a5ad31 SHA512 a00275ffcc7c5bdf546e3e1c95a2fa77b86232d008f77b1b2f3de8e63f1862321d7a439cba2d136be4407131e07e20071d972a4efb7db2bc55388a347f47ce9e
diff --git a/net-analyzer/wireshark/files/wireshark-4.2.8-cares.patch b/net-analyzer/wireshark/files/wireshark-4.2.8-cares.patch
new file mode 100644
index 000000000000..d177bcf06de4
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-4.2.8-cares.patch
@@ -0,0 +1,48 @@
+https://gitlab.com/wireshark/wireshark/-/commit/d27714d748d9f291784fda3e848603ae19a99256
+
+From d27714d748d9f291784fda3e848603ae19a99256 Mon Sep 17 00:00:00 2001
+From: John Thacker <johnthacker@gmail.com>
+Date: Thu, 10 Oct 2024 23:15:35 +0000
+Subject: [PATCH] CMake: Fix our c-ares version discovery
+
+c-ares 1.34.0 and later generate ARES_VERSION_STR using a macro, so
+fetch the version from ARES_VERSION_MAJOR, ARES_VERSION_MINOR, and
+ARES_VERSION_PATCH.
+
+Fixes #20125
+
+
+(cherry picked from commit 7c1418625d2ba5095ef5393abdb2141c990a662c)
+
+Co-authored-by: Gerald Combs <gerald@wireshark.org>
+--- a/cmake/modules/FindCARES.cmake
++++ b/cmake/modules/FindCARES.cmake
+@@ -36,11 +36,22 @@ find_library( CARES_LIBRARY
+ )
+
+ # Try to retrieve version from header if found
++# Adapted from https://stackoverflow.com/a/47084079/82195
+ if(CARES_INCLUDE_DIR)
+- set(_version_regex "^#define[ \t]+ARES_VERSION_STR[ \t]+\"([^\"]+)\".*")
+- file(STRINGS "${CARES_INCLUDE_DIR}/ares_version.h" CARES_VERSION REGEX "${_version_regex}")
+- string(REGEX REPLACE "${_version_regex}" "\\1" CARES_VERSION "${CARES_VERSION}")
+- unset(_version_regex)
++ file(READ "${CARES_INCLUDE_DIR}/ares_version.h" _ares_version_h)
++
++ string(REGEX MATCH "#[\t ]*define[ \t]+ARES_VERSION_MAJOR[ \t]+([0-9]+)" _ ${_ares_version_h})
++ set(_ares_version_major ${CMAKE_MATCH_1})
++ string(REGEX MATCH "#[\t ]*define[ \t]+ARES_VERSION_MINOR[ \t]+([0-9]+)" _ ${_ares_version_h})
++ set(_ares_version_minor ${CMAKE_MATCH_1})
++ string(REGEX MATCH "#[\t ]*define[ \t]+ARES_VERSION_PATCH[ \t]+([0-9]+)" _ ${_ares_version_h})
++ set(_ares_version_patch ${CMAKE_MATCH_1})
++ set(CARES_VERSION ${_ares_version_major}.${_ares_version_minor}.${_ares_version_patch})
++
++ unset(_ares_version_h)
++ unset(_ares_version_major)
++ unset(_ares_version_minor)
++ unset(_ares_version_patch)
+ endif()
+
+ # handle the QUIETLY and REQUIRED arguments and set CARES_FOUND to TRUE if
+--
+GitLab
diff --git a/net-analyzer/wireshark/wireshark-4.2.8.ebuild b/net-analyzer/wireshark/wireshark-4.2.8.ebuild
new file mode 100644
index 000000000000..12fd6eaa2179
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.2.8.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+HOMEPAGE="https://www.wireshark.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
+ inherit git-r3
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+ inherit verify-sig
+
+ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )"
+ S="${WORKDIR}/${P/_/}"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+ fi
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
+IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
+
+REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+# bug #753062 for speexdsp
+RDEPEND="
+ acct-group/pcap
+ >=dev-libs/glib-2.50.0:2
+ dev-libs/libpcre2
+ >=net-dns/c-ares-1.13.0:=
+ >=dev-libs/libgcrypt-1.8.0:=
+ media-libs/speexdsp
+ bcg729? ( media-libs/bcg729 )
+ brotli? ( app-arch/brotli:= )
+ ciscodump? ( >=net-libs/libssh-0.6:= )
+ filecaps? ( sys-libs/libcap )
+ http2? ( >=net-libs/nghttp2-1.11.0:= )
+ http3? ( net-libs/nghttp3 )
+ ilbc? ( media-libs/libilbc:= )
+ kerberos? ( virtual/krb5 )
+ libxml2? ( dev-libs/libxml2 )
+ 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 )
+ gui? (
+ x11-misc/xdg-utils
+ qt6? (
+ dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+ dev-qt/qt5compat:6
+ dev-qt/qtmultimedia:6
+ )
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ )
+ )
+ sbc? ( media-libs/sbc )
+ sdjournal? ( sys-apps/systemd:= )
+ smi? ( net-libs/libsmi )
+ snappy? ( app-arch/snappy:= )
+ spandsp? ( media-libs/spandsp:= )
+ sshdump? ( >=net-libs/libssh-0.6:= )
+ ssl? ( >=net-libs/gnutls-3.5.8:= )
+ wifi? ( >=net-libs/libssh-0.6:= )
+ zlib? ( sys-libs/zlib )
+ zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+ ${RDEPEND}
+ gui? (
+ !qt6? (
+ dev-qt/qtdeclarative:5
+ )
+ )
+"
+# TODO: 4.0.0_rc1 release notes say:
+# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-lang/perl
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? (
+ app-text/doxygen
+ dev-ruby/asciidoctor
+ dev-libs/libxslt
+ )
+ gui? (
+ qt6? (
+ dev-qt/qttools:6[linguist]
+ )
+ !qt6? (
+ dev-qt/linguist-tools:5
+ )
+ )
+ test? (
+ $(python_gen_any_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ ')
+ )
+"
+RDEPEND="
+ ${RDEPEND}
+ gui? ( virtual/freedesktop-icon-theme )
+ selinux? ( sec-policy/selinux-wireshark )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )"
+fi
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cares.patch
+)
+
+python_check_deps() {
+ use test || return 0
+
+ python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]] ; then
+ git-r3_src_unpack
+ else
+ if use verify-sig ; then
+ cd "${DISTDIR}" || die
+ verify-sig_verify_signed_checksums \
+ ${P}-signatures.txt \
+ openssl-dgst \
+ ${P}.tar.xz
+ cd "${WORKDIR}" || die
+ fi
+
+ default
+ fi
+}
+
+src_configure() {
+ local mycmakeargs
+
+ python_setup
+
+ # 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."
+ mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+ ;;
+ esac
+ fi
+
+ if use gui ; then
+ append-cxxflags -fPIC -DPIC
+ fi
+
+ # crashes at runtime
+ # https://bugs.gentoo.org/754021
+ filter-lto
+
+ mycmakeargs+=(
+ -DPython3_EXECUTABLE="${PYTHON}"
+ -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
+
+ # Force bundled lemon (bug 933119)
+ -DLEMON_EXECUTABLE=
+
+ -DRPMBUILD_EXECUTABLE=
+ -DGIT_EXECUTABLE=
+ -DENABLE_CCACHE=OFF
+
+ $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+ $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
+ $(usex gui MOC=$(qt5_get_bindir)/moc '')
+ $(usex gui RCC=$(qt5_get_bindir)/rcc '')
+ $(usex gui UIC=$(qt5_get_bindir)/uic '')
+
+ -DBUILD_androiddump=$(usex androiddump)
+ -DBUILD_capinfos=$(usex capinfos)
+ -DBUILD_captype=$(usex captype)
+ -DBUILD_ciscodump=$(usex ciscodump)
+ -DBUILD_dftest=$(usex dftest)
+ -DBUILD_dpauxmon=$(usex dpauxmon)
+ -DBUILD_dumpcap=$(usex dumpcap)
+ -DBUILD_editcap=$(usex editcap)
+ -DBUILD_mergecap=$(usex mergecap)
+ -DBUILD_mmdbresolve=$(usex maxminddb)
+ -DBUILD_randpkt=$(usex randpkt)
+ -DBUILD_randpktdump=$(usex randpktdump)
+ -DBUILD_reordercap=$(usex reordercap)
+ -DBUILD_sdjournal=$(usex sdjournal)
+ -DBUILD_sharkd=$(usex sharkd)
+ -DBUILD_sshdump=$(usex sshdump)
+ -DBUILD_text2pcap=$(usex text2pcap)
+ -DBUILD_tfshark=$(usex tfshark)
+ -DBUILD_tshark=$(usex tshark)
+ -DBUILD_udpdump=$(usex udpdump)
+
+ -DBUILD_wireshark=$(usex gui)
+ -DUSE_qt6=$(usex qt6)
+
+ -DENABLE_WERROR=OFF
+ -DENABLE_BCG729=$(usex bcg729)
+ -DENABLE_BROTLI=$(usex brotli)
+ -DENABLE_CAP=$(usex filecaps caps)
+ -DENABLE_GNUTLS=$(usex ssl)
+ -DENABLE_ILBC=$(usex ilbc)
+ -DENABLE_KERBEROS=$(usex kerberos)
+ -DENABLE_LIBXML2=$(usex libxml2)
+ # only appends -flto
+ -DENABLE_LTO=OFF
+ -DENABLE_LUA=$(usex lua)
+ -DLUA_FIND_VERSIONS="${ELUA#lua}"
+ -DENABLE_LZ4=$(usex lz4)
+ -DENABLE_MINIZIP=$(usex minizip)
+ -DENABLE_NETLINK=$(usex netlink)
+ -DENABLE_NGHTTP2=$(usex http2)
+ -DENABLE_NGHTTP3=$(usex http3)
+ -DENABLE_OPUS=$(usex opus)
+ -DENABLE_PCAP=$(usex pcap)
+ -DENABLE_PLUGINS=$(usex plugins)
+ -DENABLE_PLUGIN_IFDEMO=OFF
+ -DENABLE_SBC=$(usex sbc)
+ -DENABLE_SMI=$(usex smi)
+ -DENABLE_SNAPPY=$(usex snappy)
+ -DENABLE_SPANDSP=$(usex spandsp)
+ -DBUILD_wifidump=$(usex wifi)
+ -DENABLE_ZLIB=$(usex zlib)
+ -DENABLE_ZSTD=$(usex zstd)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cmake_build test-programs
+
+ # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
+ epytest \
+ --disable-capture \
+ --skip-missing-programs=all \
+ --program-path "${BUILD_DIR}"/run
+}
+
+src_install() {
+ # bug #928577
+ # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd
+ cmake_src_install install-headers
+
+ # FAQ is not required as is installed from help/faq.txt
+ dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+ # install headers
+ insinto /usr/include/wireshark
+ doins "${BUILD_DIR}"/config.h
+
+ # If trying to remove this, try build e.g. libvirt first!
+ # At last check, Fedora is still doing this too.
+ local dir dirs=(
+ epan
+ epan/crypt
+ epan/dfilter
+ epan/dissectors
+ epan/ftypes
+ wiretap
+ wsutil
+ wsutil/wmem
+ )
+
+ for dir in "${dirs[@]}" ; do
+ insinto /usr/include/wireshark/${dir}
+ doins ${dir}/*.h
+ done
+
+ if use gui ; then
+ local s
+
+ for s in 16 32 48 64 128 256 512 1024 ; do
+ insinto /usr/share/icons/hicolor/${s}x${s}/apps
+ newins resources/icons/wsicon${s}.png wireshark.png
+ done
+
+ for s in 16 24 32 48 64 128 256 ; do
+ insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+ newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+ done
+ fi
+
+ if [[ -d "${ED}"/usr/share/appdata ]] ; then
+ rm -r "${ED}"/usr/share/appdata || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ # Add group for users allowed to sniff.
+ chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+ if use dumpcap && use pcap ; then
+ fcaps -o 0 -g pcap -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 pcap group. This security measure ensures"
+ ewarn "that only trusted users are allowed to sniff your traffic."
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2022-04-17 16:44 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-04-17 16:44 UTC (permalink / raw
To: gentoo-commits
commit: 97f63d81a23a21f083ef25fc83ba988f696fbadf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 16:39:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 16:39:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97f63d81
net-analyzer/wireshark: drop 3.6.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 1 -
.../files/wireshark-3.6.1-fix-build-no-zlib.patch | 82 ------
net-analyzer/wireshark/wireshark-3.6.1.ebuild | 274 ---------------------
3 files changed, 357 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d470056c7dad..dc8c2a47fbc4 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd SHA512 cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
-DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B 49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0 SHA512 8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B 585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156 SHA512 cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B 3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd SHA512 4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
diff --git a/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch b/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch
deleted file mode 100644
index 3a935ce89969..000000000000
--- a/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-https://gitlab.com/wireshark/wireshark/-/commit/5dc11653a364975e5cc9a4a994d9d88e138e8385.patch
-https://gitlab.com/wireshark/wireshark/-/issues/17899
-
-From: Guy Harris <gharris@sonic.net>
-Date: Fri, 21 Jan 2022 15:04:28 -0800
-Subject: [PATCH] Fix no-ZLib builds.
-
-Don't use ZLib routines or data types if we're built without ZLib.
-
-Don't support --compress-type=gzip, or a gzip check box in the Output
-pane of the Capture Options dialog, if we're built without ZLib.
-
-Fixes #17899.
-
-
-(cherry picked from commit 125f5cbd881c2e1236d968a3e8fdcf5af2606e77)
---- a/capture_opts.c
-+++ b/capture_opts.c
-@@ -986,9 +986,18 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
- if (strcmp(optarg_str_p, "none") == 0) {
- ;
- } else if (strcmp(optarg_str_p, "gzip") == 0) {
-+#ifdef HAVE_ZLIB
- ;
-+#else
-+ cmdarg_err("'gzip' compression is not supported");
-+ return 1;
-+#endif
- } else {
-+#ifdef HAVE_ZLIB
- cmdarg_err("parameter of --compress-type can be 'none' or 'gzip'");
-+#else
-+ cmdarg_err("parameter of --compress-type can only be 'none'");
-+#endif
- return 1;
- }
- capture_opts->compress_type = g_strdup(optarg_str_p);
---- a/ringbuffer.c
-+++ b/ringbuffer.c
-@@ -124,6 +124,7 @@ static void CleanupOldCap(gchar* name)
- g_mutex_unlock(&rb_data.mutex);
- }
-
-+#ifdef HAVE_ZLIB
- /*
- * compress capture file
- */
-@@ -200,6 +201,7 @@ static int ringbuf_start_compress_file(rb_file* rfile)
- g_thread_new("exec_compress", &exec_compress_thread, name);
- return 0;
- }
-+#endif
-
- /*
- * create the next filename and open a new binary file with that name
-@@ -216,9 +218,11 @@ static int ringbuf_open_file(rb_file *rfile, int *err)
- /* remove old file (if any, so ignore error) */
- ws_unlink(rfile->name);
- }
-+#ifdef HAVE_ZLIB
- else if (rb_data.compress_type != NULL && strcmp(rb_data.compress_type, "gzip") == 0) {
- ringbuf_start_compress_file(rfile);
- }
-+#endif
- g_free(rfile->name);
- }
-
---- a/ui/qt/capture_options_dialog.cpp
-+++ b/ui/qt/capture_options_dialog.cpp
-@@ -486,7 +486,11 @@ void CaptureOptionsDialog::on_gbNewFileAuto_toggled(bool checked)
- ui->stopMBComboBox->setEnabled(checked?false:true);
- ui->gbCompression->setEnabled(checked);
- ui->rbCompressionNone->setEnabled(checked);
-+#ifdef HAVE_ZLIB
- ui->rbCompressionGzip->setEnabled(checked);
-+#else
-+ ui->rbCompressionGzip->setEnabled(false);
-+#endif
- }
-
- void CaptureOptionsDialog::on_cbUpdatePacketsRT_toggled(bool checked)
-GitLab
diff --git a/net-analyzer/wireshark/wireshark-3.6.1.ebuild b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
deleted file mode 100644
index 460b8e001f30..000000000000
--- a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-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} == *9999* ]] ; 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"
- S="${WORKDIR}/${P/_/}"
-
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
- >=dev-libs/glib-2.38:2
- >=net-dns/c-ares-1.5:=
- dev-libs/libgcrypt:=
- media-libs/speexdsp
- bcg729? ( media-libs/bcg729 )
- brotli? ( app-arch/brotli:= )
- ciscodump? ( >=net-libs/libssh-0.6 )
- filecaps? ( sys-libs/libcap )
- http2? ( net-libs/nghttp2:= )
- ilbc? ( media-libs/libilbc )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2 )
- 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
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-misc/xdg-utils
- )
- sbc? ( media-libs/sbc )
- sdjournal? ( sys-apps/systemd )
- 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 )
- zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- dev-lang/perl
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- test? (
- dev-python/pytest
- dev-python/pytest-xdist
- )"
-RDEPEND="${RDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
- "${FILESDIR}"/${P}-fix-build-no-zlib.patch
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5 ; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- python_setup
-
- mycmakeargs+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dpauxmon=$(usex dpauxmon)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sdjournal=$(usex sdjournal)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_BROTLI=$(usex brotli)
- -DENABLE_CAP=$(usex filecaps caps)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_ILBC=$(usex ilbc)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LTO=$(usex lto)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -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)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- -DENABLE_ZSTD=$(usex zstd)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build test-programs
-
- myctestargs=(
- --disable-capture
- --skip-missing-programs=all
- --verbose
-
- # Skip known failing tests
- # extcaps needs a bunch of external programs
- -E "(suite_extcaps)"
- #-E "(suite_decryption|suite_extcaps|suite_nameres)"
- )
-
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h
-
- # If trying to remove this, try build e.g. libvirt first!
- # At last check, Fedora is still doing this too.
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- wiretap
- wsutil
- wsutil/wmem
- )
-
- for dir in "${dirs[@]}" ; do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- done
-
- if use qt5 ; then
- local s
-
- for s in 16 32 48 64 128 256 512 1024 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
-
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- if [[ -d "${ED}"/usr/share/appdata ]] ; then
- rm -r "${ED}"/usr/share/appdata || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap ; then
- fcaps -o 0 -g pcap -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 pcap group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2022-02-20 6:31 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-02-20 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 2d09a146dec49ea5187a2c46959fe5b8ce1388b8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 06:30:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 06:30:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d09a146
net-analyzer/wireshark: drop 3.4.10, 3.6.0-r1
Bug: https://bugs.gentoo.org/830343
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 2 -
.../files/wireshark-3.6.0-fix-no-tshark.patch | 32 ---
net-analyzer/wireshark/wireshark-3.4.10.ebuild | 283 ---------------------
net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 272 --------------------
4 files changed, 589 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index df169bc81082..3ec40d974355 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,3 @@
-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
deleted file mode 100644
index dd497c51391c..000000000000
--- a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5
-https://gitlab.com/wireshark/wireshark/-/issues/17766
-https://bugs.gentoo.org/823720
-
-From: Gerald Combs <gerald@wireshark.org>
-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 $<TARGET_FILE_DIR:tshark>
-- 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
deleted file mode 100644
index c3e28e4115a4..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# 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} == *9999* ]] ; 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"
- S="${WORKDIR}/${P/_/}"
-
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-CDEPEND="
- acct-group/pcap
- >=dev-libs/glib-2.32:2
- >=net-dns/c-ares-1.5:=
- dev-libs/libgcrypt:=
- media-libs/speexdsp
- bcg729? ( media-libs/bcg729 )
- brotli? ( app-arch/brotli:= )
- ciscodump? ( >=net-libs/libssh-0.6 )
- filecaps? ( sys-libs/libcap )
- http2? ( net-libs/nghttp2:= )
- ilbc? ( media-libs/libilbc )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2 )
- 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
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-misc/xdg-utils
- )
- sbc? ( media-libs/sbc )
- sdjournal? ( sys-apps/systemd )
- 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 )
- zstd? ( app-arch/zstd:= )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
- ${CDEPEND}
- ${PYTHON_DEPS}
-"
-BDEPEND="
- dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- test? (
- dev-python/pytest
- dev-python/pytest-xdist
- )
-"
-RDEPEND="
- ${CDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
- "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- python_setup
-
- mycmakeargs+=(
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dpauxmon=$(usex dpauxmon)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sdjournal=$(usex sdjournal)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_BROTLI=$(usex brotli)
- -DENABLE_CAP=$(usex filecaps caps)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_ILBC=$(usex ilbc)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LTO=$(usex lto)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -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)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- -DENABLE_ZSTD=$(usex zstd)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build test-programs
-
- myctestargs=(
- --disable-capture
- --skip-missing-programs=all
- --verbose
-
- # Skip known failing tests
- -E "(suite_decryption|suite_extcaps|suite_nameres)"
- )
-
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- epan/wmem
- wiretap
- wsutil
- )
-
- for dir in "${dirs[@]}" ; do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- 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 qt5; then
- local s
- for s in 16 32 48 64 128 256 512 1024; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- if [[ -d "${ED}"/usr/share/appdata ]]; then
- rm -r "${ED}"/usr/share/appdata || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g pcap -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 pcap group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
deleted file mode 100644
index 520a2dc646a6..000000000000
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# 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..10} )
-
-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} == *9999* ]] ; 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"
- S="${WORKDIR}/${P/_/}"
-
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
- >=dev-libs/glib-2.38:2
- >=net-dns/c-ares-1.5:=
- dev-libs/libgcrypt:=
- media-libs/speexdsp
- bcg729? ( media-libs/bcg729 )
- brotli? ( app-arch/brotli:= )
- ciscodump? ( >=net-libs/libssh-0.6 )
- filecaps? ( sys-libs/libcap )
- http2? ( net-libs/nghttp2:= )
- ilbc? ( media-libs/libilbc )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2 )
- 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
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-misc/xdg-utils
- )
- sbc? ( media-libs/sbc )
- sdjournal? ( sys-apps/systemd )
- 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 )
- zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- dev-lang/perl
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- test? (
- dev-python/pytest
- dev-python/pytest-xdist
- )"
-RDEPEND="${RDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )"
-
-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() {
- use lua && lua-single_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5 ; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- python_setup
-
- mycmakeargs+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dpauxmon=$(usex dpauxmon)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sdjournal=$(usex sdjournal)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_BROTLI=$(usex brotli)
- -DENABLE_CAP=$(usex filecaps caps)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_ILBC=$(usex ilbc)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LTO=$(usex lto)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -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)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- -DENABLE_ZSTD=$(usex zstd)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build test-programs
-
- myctestargs=(
- --disable-capture
- --skip-missing-programs=all
- --verbose
-
- # Skip known failing tests
- -E "(suite_decryption|suite_extcaps|suite_nameres)"
- )
-
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h
-
- # If trying to remove this, try build e.g. libvirt first!
- # At last check, Fedora is still doing this too.
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- wiretap
- wsutil
- wsutil/wmem
- )
-
- for dir in "${dirs[@]}" ; do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- done
-
- if use qt5 ; then
- local s
-
- for s in 16 32 48 64 128 256 512 1024 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
-
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- if [[ -d "${ED}"/usr/share/appdata ]] ; then
- rm -r "${ED}"/usr/share/appdata || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap ; then
- fcaps -o 0 -g pcap -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 pcap group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2022-02-20 5:51 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-02-20 5:51 UTC (permalink / raw
To: gentoo-commits
commit: c2f163b2438b412dffa637ae892000c2913d546f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 05:35:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 05:35:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f163b2
net-analyzer/wireshark: drop 3.4.10, 3.4.11, 3.6.0-r1
Bug: https://bugs.gentoo.org/830343
Signed-off-by: Sam James <sam <AT> 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 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index df169bc81082..b3b50a90c00b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,2 @@
-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
deleted file mode 100644
index dd497c51391c..000000000000
--- a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5
-https://gitlab.com/wireshark/wireshark/-/issues/17766
-https://bugs.gentoo.org/823720
-
-From: Gerald Combs <gerald@wireshark.org>
-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 $<TARGET_FILE_DIR:tshark>
-- 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
deleted file mode 100644
index c3e28e4115a4..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# 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} == *9999* ]] ; 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"
- S="${WORKDIR}/${P/_/}"
-
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-CDEPEND="
- acct-group/pcap
- >=dev-libs/glib-2.32:2
- >=net-dns/c-ares-1.5:=
- dev-libs/libgcrypt:=
- media-libs/speexdsp
- bcg729? ( media-libs/bcg729 )
- brotli? ( app-arch/brotli:= )
- ciscodump? ( >=net-libs/libssh-0.6 )
- filecaps? ( sys-libs/libcap )
- http2? ( net-libs/nghttp2:= )
- ilbc? ( media-libs/libilbc )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2 )
- 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
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-misc/xdg-utils
- )
- sbc? ( media-libs/sbc )
- sdjournal? ( sys-apps/systemd )
- 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 )
- zstd? ( app-arch/zstd:= )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
- ${CDEPEND}
- ${PYTHON_DEPS}
-"
-BDEPEND="
- dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- test? (
- dev-python/pytest
- dev-python/pytest-xdist
- )
-"
-RDEPEND="
- ${CDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
- "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- python_setup
-
- mycmakeargs+=(
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dpauxmon=$(usex dpauxmon)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sdjournal=$(usex sdjournal)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_BROTLI=$(usex brotli)
- -DENABLE_CAP=$(usex filecaps caps)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_ILBC=$(usex ilbc)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LTO=$(usex lto)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -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)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- -DENABLE_ZSTD=$(usex zstd)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build test-programs
-
- myctestargs=(
- --disable-capture
- --skip-missing-programs=all
- --verbose
-
- # Skip known failing tests
- -E "(suite_decryption|suite_extcaps|suite_nameres)"
- )
-
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- epan/wmem
- wiretap
- wsutil
- )
-
- for dir in "${dirs[@]}" ; do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- 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 qt5; then
- local s
- for s in 16 32 48 64 128 256 512 1024; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- if [[ -d "${ED}"/usr/share/appdata ]]; then
- rm -r "${ED}"/usr/share/appdata || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g pcap -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 pcap group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
deleted file mode 100644
index d1c09690a523..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2022 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} == *9999* ]] ; 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"
- S="${WORKDIR}/${P/_/}"
-
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-CDEPEND="
- acct-group/pcap
- >=dev-libs/glib-2.32:2
- >=net-dns/c-ares-1.5:=
- dev-libs/libgcrypt:=
- media-libs/speexdsp
- bcg729? ( media-libs/bcg729 )
- brotli? ( app-arch/brotli:= )
- ciscodump? ( >=net-libs/libssh-0.6 )
- filecaps? ( sys-libs/libcap )
- http2? ( net-libs/nghttp2:= )
- ilbc? ( media-libs/libilbc )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2 )
- 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
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-misc/xdg-utils
- )
- sbc? ( media-libs/sbc )
- sdjournal? ( sys-apps/systemd )
- 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 )
- zstd? ( app-arch/zstd:= )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
- ${CDEPEND}
- ${PYTHON_DEPS}
-"
-BDEPEND="
- dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- test? (
- dev-python/pytest
- dev-python/pytest-xdist
- )
-"
-RDEPEND="
- ${CDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
- "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- python_setup
-
- mycmakeargs+=(
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dpauxmon=$(usex dpauxmon)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sdjournal=$(usex sdjournal)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_BROTLI=$(usex brotli)
- -DENABLE_CAP=$(usex filecaps caps)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_ILBC=$(usex ilbc)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LTO=$(usex lto)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -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)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- -DENABLE_ZSTD=$(usex zstd)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build test-programs
-
- myctestargs=(
- --disable-capture
- --skip-missing-programs=all
- --verbose
-
- # Skip known failing tests
- # extcaps needs a bunch of external programs
- # decryption/nameres seem to be fixed in 3.6.x
- -E "(suite_decryption|suite_extcaps|suite_nameres)"
- )
-
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- epan/wmem
- wiretap
- wsutil
- )
-
- for dir in "${dirs[@]}" ; do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- 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 qt5; then
- local s
- for s in 16 32 48 64 128 256 512 1024; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- if [[ -d "${ED}"/usr/share/appdata ]]; then
- rm -r "${ED}"/usr/share/appdata || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g pcap -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 pcap group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
deleted file mode 100644
index 520a2dc646a6..000000000000
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# 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..10} )
-
-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} == *9999* ]] ; 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"
- S="${WORKDIR}/${P/_/}"
-
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
- >=dev-libs/glib-2.38:2
- >=net-dns/c-ares-1.5:=
- dev-libs/libgcrypt:=
- media-libs/speexdsp
- bcg729? ( media-libs/bcg729 )
- brotli? ( app-arch/brotli:= )
- ciscodump? ( >=net-libs/libssh-0.6 )
- filecaps? ( sys-libs/libcap )
- http2? ( net-libs/nghttp2:= )
- ilbc? ( media-libs/libilbc )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2 )
- 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
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-misc/xdg-utils
- )
- sbc? ( media-libs/sbc )
- sdjournal? ( sys-apps/systemd )
- 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 )
- zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- dev-lang/perl
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- test? (
- dev-python/pytest
- dev-python/pytest-xdist
- )"
-RDEPEND="${RDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )"
-
-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() {
- use lua && lua-single_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5 ; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- python_setup
-
- mycmakeargs+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dpauxmon=$(usex dpauxmon)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sdjournal=$(usex sdjournal)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_BROTLI=$(usex brotli)
- -DENABLE_CAP=$(usex filecaps caps)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_ILBC=$(usex ilbc)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LTO=$(usex lto)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -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)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- -DENABLE_ZSTD=$(usex zstd)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build test-programs
-
- myctestargs=(
- --disable-capture
- --skip-missing-programs=all
- --verbose
-
- # Skip known failing tests
- -E "(suite_decryption|suite_extcaps|suite_nameres)"
- )
-
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h
-
- # If trying to remove this, try build e.g. libvirt first!
- # At last check, Fedora is still doing this too.
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- wiretap
- wsutil
- wsutil/wmem
- )
-
- for dir in "${dirs[@]}" ; do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- done
-
- if use qt5 ; then
- local s
-
- for s in 16 32 48 64 128 256 512 1024 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
-
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- if [[ -d "${ED}"/usr/share/appdata ]] ; then
- rm -r "${ED}"/usr/share/appdata || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap ; then
- fcaps -o 0 -g pcap -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 pcap group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2022-01-22 4:21 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-01-22 4:21 UTC (permalink / raw
To: gentoo-commits
commit: 727aed785bfa82cf4546f02e7d4f8a590c39f035
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 04:21:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 04:21:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727aed78
net-analyzer/wireshark: fix build without zlib
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/wireshark-3.6.1-fix-build-no-zlib.patch | 82 ++++++++++++++++++++++
net-analyzer/wireshark/wireshark-3.6.1.ebuild | 1 +
2 files changed, 83 insertions(+)
diff --git a/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch b/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch
new file mode 100644
index 000000000000..3a935ce89969
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.6.1-fix-build-no-zlib.patch
@@ -0,0 +1,82 @@
+https://gitlab.com/wireshark/wireshark/-/commit/5dc11653a364975e5cc9a4a994d9d88e138e8385.patch
+https://gitlab.com/wireshark/wireshark/-/issues/17899
+
+From: Guy Harris <gharris@sonic.net>
+Date: Fri, 21 Jan 2022 15:04:28 -0800
+Subject: [PATCH] Fix no-ZLib builds.
+
+Don't use ZLib routines or data types if we're built without ZLib.
+
+Don't support --compress-type=gzip, or a gzip check box in the Output
+pane of the Capture Options dialog, if we're built without ZLib.
+
+Fixes #17899.
+
+
+(cherry picked from commit 125f5cbd881c2e1236d968a3e8fdcf5af2606e77)
+--- a/capture_opts.c
++++ b/capture_opts.c
+@@ -986,9 +986,18 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
+ if (strcmp(optarg_str_p, "none") == 0) {
+ ;
+ } else if (strcmp(optarg_str_p, "gzip") == 0) {
++#ifdef HAVE_ZLIB
+ ;
++#else
++ cmdarg_err("'gzip' compression is not supported");
++ return 1;
++#endif
+ } else {
++#ifdef HAVE_ZLIB
+ cmdarg_err("parameter of --compress-type can be 'none' or 'gzip'");
++#else
++ cmdarg_err("parameter of --compress-type can only be 'none'");
++#endif
+ return 1;
+ }
+ capture_opts->compress_type = g_strdup(optarg_str_p);
+--- a/ringbuffer.c
++++ b/ringbuffer.c
+@@ -124,6 +124,7 @@ static void CleanupOldCap(gchar* name)
+ g_mutex_unlock(&rb_data.mutex);
+ }
+
++#ifdef HAVE_ZLIB
+ /*
+ * compress capture file
+ */
+@@ -200,6 +201,7 @@ static int ringbuf_start_compress_file(rb_file* rfile)
+ g_thread_new("exec_compress", &exec_compress_thread, name);
+ return 0;
+ }
++#endif
+
+ /*
+ * create the next filename and open a new binary file with that name
+@@ -216,9 +218,11 @@ static int ringbuf_open_file(rb_file *rfile, int *err)
+ /* remove old file (if any, so ignore error) */
+ ws_unlink(rfile->name);
+ }
++#ifdef HAVE_ZLIB
+ else if (rb_data.compress_type != NULL && strcmp(rb_data.compress_type, "gzip") == 0) {
+ ringbuf_start_compress_file(rfile);
+ }
++#endif
+ g_free(rfile->name);
+ }
+
+--- a/ui/qt/capture_options_dialog.cpp
++++ b/ui/qt/capture_options_dialog.cpp
+@@ -486,7 +486,11 @@ void CaptureOptionsDialog::on_gbNewFileAuto_toggled(bool checked)
+ ui->stopMBComboBox->setEnabled(checked?false:true);
+ ui->gbCompression->setEnabled(checked);
+ ui->rbCompressionNone->setEnabled(checked);
++#ifdef HAVE_ZLIB
+ ui->rbCompressionGzip->setEnabled(checked);
++#else
++ ui->rbCompressionGzip->setEnabled(false);
++#endif
+ }
+
+ void CaptureOptionsDialog::on_cbUpdatePacketsRT_toggled(bool checked)
+GitLab
diff --git a/net-analyzer/wireshark/wireshark-3.6.1.ebuild b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
index c90b5a717962..a4fec6f5c579 100644
--- a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
@@ -96,6 +96,7 @@ RDEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+ "${FILESDIR}"/${P}-fix-build-no-zlib.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2021-03-27 2:58 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-03-27 2:58 UTC (permalink / raw
To: gentoo-commits
commit: ac297875f7971b8421b02e39e550d7662dfd15cd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 01:14:33 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 02:57:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac297875
net-analyzer/wireshark: fix build with >=dev-util/cmake-3.20.0
Using a patch from upstream.
Closes: https://bugs.gentoo.org/775029
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/wireshark-3.4.4-cmake-3.20.patch | 30 ++++++++++++++++++++++
net-analyzer/wireshark/wireshark-3.4.4.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch b/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch
new file mode 100644
index 00000000000..63d62e8e254
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.4.4-cmake-3.20.patch
@@ -0,0 +1,30 @@
+https://gitlab.com/wireshark/wireshark/-/merge_requests/2532?commit_id=6ef6e8f607456e239e5f1a326803846930d34fa8.diff
+https://bugs.gentoo.org/775029
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1115,6 +1115,10 @@ ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD)
+
+ # Build the Qt GUI?
+ if(BUILD_wireshark)
++ set(CMAKE_AUTOMOC ON)
++ set(CMAKE_AUTOUIC ON)
++ set(CMAKE_AUTORCC ON)
++
+ # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten
+ # somewhere. The if WIN32 in this place is annoying as well.
+ if(WIN32)
+diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
+index ff0efeae1614511fbe12ed00d5b82f2714fa55f5..cd36913f10d949a8a701060833b0878086798bf4 100644
+--- a/ui/qt/CMakeLists.txt
++++ b/ui/qt/CMakeLists.txt
+@@ -631,10 +631,6 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+
+-set(CMAKE_AUTOMOC TRUE)
+-set(CMAKE_AUTOUIC TRUE)
+-set(CMAKE_AUTORCC TRUE)
+-
+ if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9")
+ # Drop the file modification time of source files from generated files
+ # to help with reproducible builds. We do not use QFileInfo.lastModified
diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
index cc5aaa6adc5..c37f3c484d2 100644
--- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
@@ -101,6 +101,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
+ "${FILESDIR}"/${P}-cmake-3.20.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2020-06-22 13:41 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2020-06-22 13:41 UTC (permalink / raw
To: gentoo-commits
commit: 3b5465d0f2beddc7805bf550262a145fd087a275
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 13:40:12 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 13:41:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5465d0
net-analyzer/wireshark: Old
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 2 -
...9999-about_dialog-plugins_add_description.patch | 18 --
net-analyzer/wireshark/wireshark-3.2.1.ebuild | 248 --------------------
net-analyzer/wireshark/wireshark-3.2.3.ebuild | 254 ---------------------
4 files changed, 522 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2bce2029c74..31d6a5d49be 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1 @@
-DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1 SHA512 78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530
-DIST wireshark-3.2.3.tar.xz 31572052 BLAKE2B 799c1e139dca90905526f0b04c9c4fbb48baa439d7f660321137c64088d190b9bce70bed4a16a6faf7327c86897825ac4f9c12d9dad465b3d6f6a23868bd9e28 SHA512 6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a
DIST wireshark-3.2.4.tar.xz 31580440 BLAKE2B c40c19fde09726192119efe358892157d17e28ab87afa9a5b91203e11d3079b718d8e200522294886613d63d19283198de1256561eaf83436742db3898019e89 SHA512 67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch b/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch
deleted file mode 100644
index 5506c6ec2ad..00000000000
--- a/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index 83b510b0273..00000000000
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
-IUSE="
- androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
- +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
- +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump
- +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
- +text2pcap tfshark +tshark +udpdump zlib
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
- >=dev-libs/glib-2.32:2
- >=net-dns/c-ares-1.5
- dev-libs/libgcrypt:0
- bcg729? ( media-libs/bcg729 )
- brotli? ( app-arch/brotli )
- ciscodump? ( >=net-libs/libssh-0.6 )
- filecaps? ( sys-libs/libcap )
- http2? ( net-libs/nghttp2 )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2 )
- lua? ( >=dev-lang/lua-5.1:* )
- lz4? ( app-arch/lz4 )
- maxminddb? ( dev-libs/libmaxminddb )
- minizip? ( sys-libs/zlib[minizip] )
- netlink? ( dev-libs/libnl:3 )
- 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 )
- sdjournal? ( sys-apps/systemd )
- 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}
- ${PYTHON_DEPS}
-"
-BDEPEND="
- dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
-"
-RDEPEND="
- ${CDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
- plugin-ifdemo? ( plugins )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.4-androiddump.patch
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
- "${FILESDIR}"/${PN}-99999999-about_dialog-plugins_add_description.patch
- "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
- "${FILESDIR}"/${PN}-99999999-qtsvg.patch
- "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
- enewgroup wireshark
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- python_setup
-
- mycmakeargs+=(
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dpauxmon=$(usex dpauxmon)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sdjournal=$(usex sdjournal)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_BROTLI=$(usex brotli)
- -DENABLE_CAP=$(usex filecaps caps)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -DENABLE_MINIZIP=$(usex minizip)
- -DENABLE_NETLINK=$(usex netlink)
- -DENABLE_NGHTTP2=$(usex http2)
- -DENABLE_PCAP=$(usex pcap)
- -DENABLE_PLUGINS=$(usex plugins)
- -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- epan/wmem
- wiretap
- wsutil
- )
- for dir in "${dirs[@]}"
- do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- 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 qt5; then
- local s
- for s in 16 32 48 64 128 256 512 1024; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- enewgroup wireshark
- chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/dumpcap
- fi
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the wireshark group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.2.3.ebuild b/net-analyzer/wireshark/wireshark-3.2.3.ebuild
deleted file mode 100644
index 9c28437e763..00000000000
--- a/net-analyzer/wireshark/wireshark-3.2.3.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
-IUSE="
- androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
- +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
- +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump
- +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
- test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
- >=dev-libs/glib-2.32:2
- >=net-dns/c-ares-1.5
- dev-libs/libgcrypt:0
- bcg729? ( media-libs/bcg729 )
- brotli? ( app-arch/brotli )
- ciscodump? ( >=net-libs/libssh-0.6 )
- filecaps? ( sys-libs/libcap )
- http2? ( net-libs/nghttp2 )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2 )
- lua? ( >=dev-lang/lua-5.1:* )
- lz4? ( app-arch/lz4 )
- maxminddb? ( dev-libs/libmaxminddb )
- minizip? ( sys-libs/zlib[minizip] )
- netlink? ( dev-libs/libnl:3 )
- 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 )
- sdjournal? ( sys-apps/systemd )
- 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 )
- zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
- ${CDEPEND}
- ${PYTHON_DEPS}
-"
-BDEPEND="
- dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- test? (
- dev-python/pytest
- dev-python/pytest-xdist
- )
-"
-RDEPEND="
- ${CDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
- plugin-ifdemo? ( plugins )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.4-androiddump.patch
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
- "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
- "${FILESDIR}"/${PN}-99999999-qtsvg.patch
- "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
- enewgroup wireshark
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- python_setup
-
- mycmakeargs+=(
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dpauxmon=$(usex dpauxmon)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sdjournal=$(usex sdjournal)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_BROTLI=$(usex brotli)
- -DENABLE_CAP=$(usex filecaps caps)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -DENABLE_MINIZIP=$(usex minizip)
- -DENABLE_NETLINK=$(usex netlink)
- -DENABLE_NGHTTP2=$(usex http2)
- -DENABLE_PCAP=$(usex pcap)
- -DENABLE_PLUGINS=$(usex plugins)
- -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- -DENABLE_ZSTD=$(usex zstd)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build test-programs
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- epan/wmem
- wiretap
- wsutil
- )
- for dir in "${dirs[@]}"
- do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- 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 qt5; then
- local s
- for s in 16 32 48 64 128 256 512 1024; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- enewgroup wireshark
- chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/dumpcap
- fi
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the wireshark group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2019-08-27 3:07 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2019-08-27 3:07 UTC (permalink / raw
To: gentoo-commits
commit: bdca2eea3207dab54937f18140cc124e397fc905
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 03:02:24 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 03:07:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdca2eea
net-analyzer/wireshark: Old
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 2 -
.../files/wireshark-1.99.8-qtchooser.patch | 10 -
.../wireshark/files/wireshark-2.6.2-qtsvg.patch | 17 --
.../files/wireshark-2.6.6-androiddump-wsutil.patch | 18 --
.../files/wireshark-99999999-androiddump.patch | 10 -
net-analyzer/wireshark/wireshark-2.6.7.ebuild | 240 --------------------
net-analyzer/wireshark/wireshark-3.0.2.ebuild | 246 ---------------------
7 files changed, 543 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7bed0dd9b3a..fd1c3a07844 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,3 @@
-DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677
DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae91c09275429c9c9a60dbafcfc91ce79270f09710e8fba7db053565f1afc9786caf22ef21e700dd0f97c2f38b139e31 SHA512 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d
-DIST wireshark-3.0.2.tar.xz 30910100 BLAKE2B ffc8f1c5fc09a387c10ec2bbd91f80dcee2b368108c2d93b3c891773dd1d69259fff351adf991d37ecc52fcb69f5ae60ab91333b5bf7b7a3390de2eb9d4f6d9a SHA512 0dab01b614534c9ddea517d045598029c15f24ab54d59110e6819d43d2479afe9eebe04554d25f3b0806cf8c78ed241b0fb261c2024234297eeb25d032fbb982
DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch
deleted file mode 100644
index 47459515ee7..00000000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2149,7 +2149,6 @@
- # -qt={version} argument, otherwise we look for particular
- # tool versions using tool name suffixes.
- #
-- AC_PATH_PROG(QTCHOOSER, qtchooser)
- if test ! -z "$QTCHOOSER"; then
- #
- # We found qtchooser; we assume that means that
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch
deleted file mode 100644
index 445851090a6..00000000000
--- a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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/files/wireshark-2.6.6-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch
deleted file mode 100644
index 654c2c82db1..00000000000
--- a/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
deleted file mode 100644
index db1c560848e..00000000000
--- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/extcap/Makefile.am
-+++ b/extcap/Makefile.am
-@@ -32,6 +32,7 @@
- ../ui/libui.a \
- ../wiretap/libwiretap.la \
- ../wsutil/libwsutil.la \
-+ @PCAP_LIBS@ \
- @GLIB_LIBS@
-
- randpktdump_SOURCES = \
diff --git a/net-analyzer/wireshark/wireshark-2.6.7.ebuild b/net-analyzer/wireshark/wireshark-2.6.7.ebuild
deleted file mode 100644
index d947b47f07b..00000000000
--- a/net-analyzer/wireshark/wireshark-2.6.7.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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
- )
- 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? ( media-libs/portaudio )
- 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 )
- 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}
- dev-lang/perl
- !<virtual/perl-Pod-Simple-3.170
- !<perl-core/Pod-Simple-3.170
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="
- ${CDEPEND}
- gtk? ( virtual/freedesktop-icon-theme )
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
- "${FILESDIR}"/${PN}-2.4-androiddump.patch
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
- "${FILESDIR}"/${PN}-2.6.6-androiddump-wsutil.patch
- "${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
- enewgroup wireshark
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- mycmakeargs+=(
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DBUILD_wireshark_gtk=$(usex gtk)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_CAP=no
- -DENABLE_CARES=$(usex adns)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -DENABLE_NETLINK=$(usex netlink)
- -DENABLE_NGHTTP2=$(usex nghttp2)
- -DENABLE_PCAP=$(usex pcap)
- -DENABLE_PORTAUDIO=$(usex portaudio)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- epan/wmem
- wiretap
- wsutil
- )
- for dir in "${dirs[@]}"
- do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- done
-
- #with the above this really shouldn't be needed, but things may be looking
- # in wiretap/ instead of wireshark/wiretap/
- insinto /usr/include/wiretap
- doins wiretap/wtap.h
-
- if use gtk || use qt5; then
- local s
- for s in 16 32 48 64 128 256 512 1024; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- prune_libtool_files
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- enewgroup wireshark
- chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/dumpcap
- fi
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the wireshark group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.0.2.ebuild b/net-analyzer/wireshark/wireshark-3.0.2.ebuild
deleted file mode 100644
index 124702089cb..00000000000
--- a/net-analyzer/wireshark/wireshark-3.0.2.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit cmake-utils fcaps flag-o-matic 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 ~arm64 hppa ~ia64 ~ppc64 x86"
-IUSE="
- adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
- +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
- nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
- smi snappy spandsp sshdump ssl sdjournal +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 )
- sdjournal? ( sys-apps/systemd )
- 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}
- ${PYTHON_DEPS}
- !<perl-core/Pod-Simple-3.170
- !<virtual/perl-Pod-Simple-3.170
- dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
-"
-RDEPEND="
- ${CDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.4-androiddump.patch
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
- "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
- "${FILESDIR}"/${PN}-99999999-qtsvg.patch
- "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
- enewgroup wireshark
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- python_setup 'python3*'
-
- mycmakeargs+=(
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dpauxmon=$(usex dpauxmon)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sdjournal=$(usex sdjournal)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_CAP=$(usex filecaps caps)
- -DENABLE_CARES=$(usex adns)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -DENABLE_NETLINK=$(usex netlink)
- -DENABLE_NGHTTP2=$(usex nghttp2)
- -DENABLE_PCAP=$(usex pcap)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- emake -C "${BUILD_DIR}" test-programs
- emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
- cmake-utils_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- epan/wmem
- wiretap
- wsutil
- )
- for dir in "${dirs[@]}"
- do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- 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 qt5; then
- local s
- for s in 16 32 48 64 128 256 512 1024; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- prune_libtool_files
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- enewgroup wireshark
- chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/dumpcap
- fi
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the wireshark group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2019-03-18 20:47 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2019-03-18 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 69727570d677e87bdd408c90a30c40e3ffb5e10f
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 20:46:49 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 20:47:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69727570
net-analyzer/wireshark: Old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Bug: https://bugs.gentoo.org/show_bug.cgi?id=679004
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 2 -
.../files/wireshark-2.6.0-androiddump-wsutil.patch | 26 ---
.../wireshark/files/wireshark-2.6.3-docbook.patch | 56 -----
net-analyzer/wireshark/wireshark-2.6.3.ebuild | 243 ---------------------
net-analyzer/wireshark/wireshark-2.6.6.ebuild | 240 --------------------
5 files changed, 567 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c4ba02e145b..65dd7ac03bf 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,2 @@
-DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
-DIST wireshark-2.6.6.tar.xz 28407404 BLAKE2B 5135789d345b675814a6394d5ba1469585b9eab917885730125b8a007aecd9cb48a510fc9e7479148cadf625807bac9017b854797e4bb2e562d7dc7f76140826 SHA512 b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56
DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677
DIST wireshark-3.0.0.tar.xz 30953760 BLAKE2B ee866966000cf902da6f330eb8a4b281d34a3ca88e9d92a7de1069172c8aeb86f9222e1467c5d3722ee055baf88d8ba0eb6fe27084d0b35f9639bdb9741d25e1 SHA512 917708b5edc25609536c7bd7cf4ae32a901fd99118302138dc0bf6f1ad092a8e5069a917cc8cf6cb77190f54e50623a4eba1ee10ffc225ee3051b50cf02a0963
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
deleted file mode 100644
index e28465e814a..00000000000
--- a/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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/files/wireshark-2.6.3-docbook.patch b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
deleted file mode 100644
index 9e5e8810991..00000000000
--- a/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/docbook/CMakeLists.txt
-+++ b/docbook/CMakeLists.txt
-@@ -61,21 +61,22 @@
- common_graphics/warning.svg
- )
-
--set(WSUG_TOOLS_HELP_COMMANDS
-+set(WSUG_TOOLS_COMMANDS
- capinfos
-+ dumpcap
- editcap
- mergecap
-+ rawshark
- reordercap
- text2pcap
- tshark
- )
-
--if (PCAP_FOUND)
-- list(APPEND WSUG_TOOLS_HELP_COMMANDS
-- dumpcap
-- rawshark
-- )
--endif(PCAP_FOUND)
-+foreach(th_build ${WSUG_TOOLS_COMMANDS})
-+if (TARGET ${th_build})
-+ list(APPEND WSUG_TOOLS_HELP_COMMANDS ${th_build})
-+endif(TARGET ${th_build})
-+endforeach()
-
- # We want the wsug_* targets to depend on the tools help files.
- # We want update_tools_help to be an independent target.
-@@ -92,6 +93,7 @@
-
- foreach(th_command ${WSUG_TOOLS_HELP_COMMANDS})
- set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/${th_command}-h.txt)
-+ add_dependencies(th_file th_command)
- list(APPEND WSUG_TOOLS_HELP_FILES ${th_file})
- add_custom_command(
- OUTPUT ${th_file}
-@@ -103,6 +105,7 @@
- # Extra command output
- # Note that these won't work on Windows unless we make -F and -T write
- # to stdout and return 0 or wrap the commands similar to hhc.exe.
-+if (TARGET editcap)
- set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/editcap-F.txt)
- list(APPEND WSUG_TOOLS_HELP_FILES ${th_file})
- add_custom_command(
-@@ -117,6 +120,7 @@
- COMMAND $<TARGET_FILE:editcap> -T > ${th_file}
- DEPENDS $<TARGET_FILE:editcap>
- )
-+endif(TARGET editcap)
-
- add_custom_target(update_tools_help
- DEPENDS ${WSUG_TOOLS_HELP_FILES}
diff --git a/net-analyzer/wireshark/wireshark-2.6.3.ebuild b/net-analyzer/wireshark/wireshark-2.6.3.ebuild
deleted file mode 100644
index 6043c647518..00000000000
--- a/net-analyzer/wireshark/wireshark-2.6.3.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# 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? ( 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-1.2.0
- media-libs/speexdsp
- 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 )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
- ${CDEPEND}
- dev-lang/perl
- !<virtual/perl-Pod-Simple-3.170
- !<perl-core/Pod-Simple-3.170
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="
- ${CDEPEND}
- gtk? ( virtual/freedesktop-icon-theme )
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
- "${FILESDIR}"/${PN}-2.4-androiddump.patch
- "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
- "${FILESDIR}"/${PN}-2.6.3-docbook.patch
- "${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
- enewgroup wireshark
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- mycmakeargs+=(
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DBUILD_wireshark_gtk=$(usex gtk)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_CAP=no
- -DENABLE_CARES=$(usex adns)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -DENABLE_NETLINK=$(usex netlink)
- -DENABLE_NGHTTP2=$(usex nghttp2)
- -DENABLE_PCAP=$(usex pcap)
- -DENABLE_PORTAUDIO=$(usex portaudio)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- epan/wmem
- wiretap
- wsutil
- )
- for dir in "${dirs[@]}"
- do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- done
-
- #with the above this really shouldn't be needed, but things may be looking
- # in wiretap/ instead of wireshark/wiretap/
- insinto /usr/include/wiretap
- doins wiretap/wtap.h
-
- if use gtk || use qt5; then
- local s
- for s in 16 32 48 64 128 256 512 1024; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- prune_libtool_files
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- enewgroup wireshark
- chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/dumpcap
- fi
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the wireshark group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-2.6.6.ebuild b/net-analyzer/wireshark/wireshark-2.6.6.ebuild
deleted file mode 100644
index 96bfee5f3d8..00000000000
--- a/net-analyzer/wireshark/wireshark-2.6.6.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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
- )
- 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? ( media-libs/portaudio )
- 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 )
- 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}
- dev-lang/perl
- !<virtual/perl-Pod-Simple-3.170
- !<perl-core/Pod-Simple-3.170
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="
- ${CDEPEND}
- gtk? ( virtual/freedesktop-icon-theme )
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
- "${FILESDIR}"/${PN}-2.4-androiddump.patch
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
- "${FILESDIR}"/${PN}-2.6.6-androiddump-wsutil.patch
- "${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
- enewgroup wireshark
-}
-
-src_configure() {
- local mycmakeargs
-
- # 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."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- mycmakeargs+=(
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(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 '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DBUILD_wireshark_gtk=$(usex gtk)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_CAP=no
- -DENABLE_CARES=$(usex adns)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -DENABLE_NETLINK=$(usex netlink)
- -DENABLE_NGHTTP2=$(usex nghttp2)
- -DENABLE_PCAP=$(usex pcap)
- -DENABLE_PORTAUDIO=$(usex portaudio)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- epan/wmem
- wiretap
- wsutil
- )
- for dir in "${dirs[@]}"
- do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- done
-
- #with the above this really shouldn't be needed, but things may be looking
- # in wiretap/ instead of wireshark/wiretap/
- insinto /usr/include/wiretap
- doins wiretap/wtap.h
-
- if use gtk || use qt5; then
- local s
- for s in 16 32 48 64 128 256 512 1024; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- prune_libtool_files
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- enewgroup wireshark
- chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/dumpcap
- fi
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the wireshark group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2019-03-11 16:55 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2019-03-11 16:55 UTC (permalink / raw
To: gentoo-commits
commit: bfbc0055575d1e00111409cb708f011fb62241e3
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 16:49:08 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 16:55:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfbc0055
net-analyzer/wireshark: Old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 1 -
.../files/wireshark-2.1.0-sse4_2-r1.patch | 21 --
.../wireshark/files/wireshark-2.4.3-libsmi.patch | 233 -----------------
net-analyzer/wireshark/metadata.xml | 2 -
net-analyzer/wireshark/wireshark-2.4.5.ebuild | 291 ---------------------
5 files changed, 548 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 9e5bc3e93b8..c4ba02e145b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
-DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
DIST wireshark-2.6.6.tar.xz 28407404 BLAKE2B 5135789d345b675814a6394d5ba1469585b9eab917885730125b8a007aecd9cb48a510fc9e7479148cadf625807bac9017b854797e4bb2e562d7dc7f76140826 SHA512 b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56
DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677
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
deleted file mode 100644
index 8efe5aff6c5..00000000000
--- a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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/files/wireshark-2.4.3-libsmi.patch b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch
deleted file mode 100644
index 288efb7d66f..00000000000
--- a/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-From 72c2e53981a204d746737d8c01c4ad3738cd4880 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
-Date: Sun, 5 Nov 2017 12:05:43 +0000
-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 <j@v6e.pt>
-Tested-by: Petri Dish Buildbot
-Reviewed-by: João Valverde <j@v6e.pt>
----
- 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..0000000
---- 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"
--
--AC_DEFUN([AX_LIBSMI],
--[
-- AC_ARG_WITH([libsmi],
-- AC_HELP_STRING(
-- [--with-libsmi=@<:@DIR@:>@],
-- [use libsmi MIB/PIB library @<:@default=yes@:>@, optionally specify the prefix for libsmi]
-- ),
-- [
-- if test "$withval" = "no"; then
-- WANT_LIBSMI="no"
-- elif test "$withval" = "yes"; then
-- WANT_LIBSMI="yes"
-- ac_libsmi_path=""
-- else
-- WANT_LIBSMI="yes"
-- ac_libsmi_path="$withval"
-- fi
-- ],
-- [WANT_LIBSMI="yes"]
-- )
--
-- libsmi_message="no"
-- LIBSMI_CFLAGS=""
-- LIBSMI_LDFLAGS=""
-- LIBSMI_VERSION=""
--
-- if test "x$WANT_LIBSMI" = "xyes"; then
--
-- ac_libsmi_header="smi.h"
--
-- libsmi_version_req=ifelse([$1], [], [2], [$1])
--
-- AC_MSG_CHECKING([for libsmi >= $libsmi_version_req])
--
-- if test "$ac_libsmi_path" != ""; then
-- ac_libsmi_ldflags="-L$ac_libsmi_path/lib"
-- ac_libsmi_cflags="-I$ac_libsmi_path/include"
-- else
-- for ac_libsmi_path_tmp in /usr /usr/local /opt $prefix; do
-- if test -f "$ac_libsmi_path_tmp/include/$ac_libsmi_header" \
-- && test -r "$ac_libsmi_path_tmp/include/$ac_libsmi_header"; then
-- ac_libsmi_path=$ac_libsmi_path_tmp
-- ac_libsmi_ldflags="-L$ac_libsmi_path_tmp/lib"
-- ac_libsmi_cflags="-I$ac_libsmi_path_tmp/include"
-- break;
-- fi
-- done
-- fi
--
-- ac_libsmi_ldflags="$ac_libsmi_ldflags -lsmi"
--
-- saved_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS $ac_libsmi_cflags"
--
-- AC_LANG_PUSH(C)
-- AC_COMPILE_IFELSE(
-- [
-- AC_LANG_PROGRAM([[@%:@include <smi.h>]],
-- [[
-- int current, revision, age, n;
-- const int required = $libsmi_version_req;
-- if (smiInit(""))
-- exit(1);
-- if (strcmp(SMI_LIBRARY_VERSION, smi_library_version))
-- exit(2);
-- n = sscanf(smi_library_version, "%d:%d:%d", ¤t, &revision, &age);
-- if (n != 3)
-- exit(3);
-- if (required < current - age || required > current)
-- exit(4);
-- ]]
-- )
-- ],
-- [
-- AC_MSG_RESULT([yes])
-- libsmi_message="yes"
-- ],
-- [
-- AC_MSG_RESULT([not found])
-- libsmi_message="no"
-- ]
-- )
-- AC_LANG_POP([C])
--
-- CFLAGS="$saved_CFLAGS"
--
-- if test "$libsmi_message" = "yes"; then
--
-- LIBSMI_CFLAGS="$ac_libsmi_cflags"
-- LIBSMI_LDFLAGS="$ac_libsmi_ldflags"
--
-- ac_libsmi_header_path="$ac_libsmi_path/include/$ac_libsmi_header"
--
-- dnl Retrieve libsmi release version
-- if test "x$ac_libsmi_header_path" != "x"; then
-- ac_libsmi_version=`cat $ac_libsmi_header_path \
-- | grep '#define.*SMI_LIBRARY_VERSION.*\"' | sed -e 's/.* "//' \
-- | sed -e 's/"//'`
-- if test $ac_libsmi_version != ""; then
-- LIBSMI_VERSION=$ac_libsmi_version
-- else
-- AC_MSG_WARN([Can not find SMI_LIBRARY_VERSION macro in smi.h header to retrieve libsmi version!])
-- fi
-- fi
--
-- AC_SUBST(LIBSMI_CFLAGS)
-- AC_SUBST(LIBSMI_LDFLAGS)
-- AC_SUBST(LIBSMI_VERSION)
-- AC_DEFINE(HAVE_LIBSMI, 1, [Define to 1 if you have the `smi' library (-lsmi).])
-- fi
-- fi
--])
---
-2.7.4
-
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 3aea5c6b5d5..754f3279fc5 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -34,11 +34,9 @@ be exported to XML, PostScript®, CSV, or plain text.
<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="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="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</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="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag>
<flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag>
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
deleted file mode 100644
index c1819bafbf8..00000000000
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~arm64 ~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
- 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 )
-"
-
-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:* )
- lz4? ( app-arch/lz4 )
- 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-1.2.0
- media-libs/speexdsp
- 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 )
-"
-# 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
- "${FILESDIR}"/${PN}-2.4.3-libsmi.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
-
- 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) \
- $(use_with libxml2) \
- $(use_with lua) \
- $(use_with lz4) \
- $(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() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- enewgroup wireshark
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/dumpcap
- fi
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the wireshark group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2018-09-02 17:58 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2018-09-02 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 1f2c951b114a1bf4c382dbe7b0055886c19ab5c1
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 2 17:56:44 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Sep 2 17:58:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2c951b
net-analyzer/wireshark: Hopefully fix docbook/
Bug: https://bugs.gentoo.org/665080
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../wireshark/files/wireshark-2.6.3-docbook.patch | 40 ++++++++++++++++++++++
net-analyzer/wireshark/wireshark-2.6.3.ebuild | 1 +
2 files changed, 41 insertions(+)
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
new file mode 100644
index 00000000000..38d223491a6
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
@@ -0,0 +1,40 @@
+--- a/docbook/CMakeLists.txt
++++ b/docbook/CMakeLists.txt
+@@ -61,21 +61,22 @@
+ common_graphics/warning.svg
+ )
+
+-set(WSUG_TOOLS_HELP_COMMANDS
++set(WSUG_TOOLS_COMMANDS
+ capinfos
++ dumpcap
+ editcap
+ mergecap
++ rawshark
+ reordercap
+ text2pcap
+ tshark
+ )
+
+-if (PCAP_FOUND)
+- list(APPEND WSUG_TOOLS_HELP_COMMANDS
+- dumpcap
+- rawshark
+- )
+-endif(PCAP_FOUND)
++foreach(th_build ${WSUG_TOOLS_COMMANDS})
++if (TARGET ${th_build})
++ list(APPEND WSUG_TOOLS_HELP_COMMANDS ${th_build})
++endif(BUILD_${th_build})
++endforeach()
+
+ # We want the wsug_* targets to depend on the tools help files.
+ # We want update_tools_help to be an independent target.
+@@ -92,6 +93,7 @@
+
+ foreach(th_command ${WSUG_TOOLS_HELP_COMMANDS})
+ set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/${th_command}-h.txt)
++ add_dependencies(th_file th_command)
+ list(APPEND WSUG_TOOLS_HELP_FILES ${th_file})
+ add_custom_command(
+ OUTPUT ${th_file}
diff --git a/net-analyzer/wireshark/wireshark-2.6.3.ebuild b/net-analyzer/wireshark/wireshark-2.6.3.ebuild
index b76d96cd942..abfa5bc13ee 100644
--- a/net-analyzer/wireshark/wireshark-2.6.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.3.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
+ "${FILESDIR}"/${PN}-2.6.3-docbook.patch
"${FILESDIR}"/${PN}-99999999-androiddump.patch
)
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2018-06-03 12:12 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2018-06-03 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 1ed92cf1f83756341e962f39e9c6f85cda353ed8
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 3 12:11:25 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jun 3 12:12:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed92cf1
net-analyzer/wireshark: Update live ebuild.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../wireshark-99999999-androiddump-wsutil.patch | 34 ++++++++++++++++++++++
.../wireshark-99999999-ui-needs-wiretap.patch | 11 +++++++
net-analyzer/wireshark/wireshark-99999999.ebuild | 20 ++++---------
3 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
new file mode 100644
index 00000000000..8ceb3ba5488
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
@@ -0,0 +1,34 @@
+--- a/extcap/CMakeLists.txt
++++ b/extcap/CMakeLists.txt
+@@ -68,6 +68,8 @@
+ if(HAVE_LIBPCAP)
+ set(androiddump_LIBS
+ ui
++ wiretap
++ wsutil
+ ${GLIB2_LIBRARIES}
+ ${PCAP_LIBRARIES}
+ )
+@@ -78,6 +80,7 @@
+ set(androiddump_LIBS
+ ui
+ wiretap
++ wsutil
+ ${GLIB2_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${CMAKE_DL_LIBS}
+@@ -89,7 +92,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})
+@@ -212,4 +214,4 @@
+ ${androiddump_FILES}
+ ${sshdump_FILES}
+ ${ciscodump_FILES}
+-)
+\ No newline at end of file
++)
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch
new file mode 100644
index 00000000000..c0bfc3acd5a
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch
@@ -0,0 +1,11 @@
+--- a/ui/CMakeLists.txt
++++ b/ui/CMakeLists.txt
+@@ -76,6 +76,8 @@
+
+ add_library(ui STATIC ${UI_SRC})
+
++set(ui_LIBS wiretap)
++
+ set_target_properties(ui PROPERTIES
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "UI"
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 039381a543b..d1a9875cba3 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -13,8 +13,8 @@ SLOT="0/${PV}"
KEYWORDS=""
IUSE="
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
+ +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
"
@@ -28,12 +28,6 @@ CDEPEND="
adns? ( >=net-dns/c-ares-1.5 )
bcg729? ( media-libs/bcg729 )
caps? ( sys-libs/libcap )
- gtk? (
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/pango
- x11-misc/xdg-utils
- )
kerberos? ( virtual/krb5 )
sshdump? ( >=net-libs/libssh-0.6 )
ciscodump? ( >=net-libs/libssh-0.6 )
@@ -43,7 +37,6 @@ CDEPEND="
maxminddb? ( dev-libs/libmaxminddb )
nghttp2? ( net-libs/nghttp2 )
pcap? ( net-libs/libpcap )
- portaudio? ( media-libs/portaudio )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -81,14 +74,15 @@ DEPEND="
"
RDEPEND="
${CDEPEND}
- gtk? ( virtual/freedesktop-icon-theme )
qt5? ( virtual/freedesktop-icon-theme )
selinux? ( sec-policy/selinux-wireshark )
"
PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
- "${FILESDIR}"/${PN}-99999999-qtsvg.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+ "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+ "${FILESDIR}"/${PN}-99999999-qtsvg.patch
+ "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
)
pkg_setup() {
@@ -141,7 +135,6 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
- -DBUILD_wireshark_gtk=$(usex gtk)
-DDISABLE_WERROR=yes
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_CAP=$(usex caps)
@@ -154,7 +147,6 @@ src_configure() {
-DENABLE_NETLINK=$(usex netlink)
-DENABLE_NGHTTP2=$(usex nghttp2)
-DENABLE_PCAP=$(usex pcap)
- -DENABLE_PORTAUDIO=$(usex portaudio)
-DENABLE_SBC=$(usex sbc)
-DENABLE_SMI=$(usex smi)
-DENABLE_SNAPPY=$(usex snappy)
@@ -204,7 +196,7 @@ src_install() {
insinto /usr/include/wiretap
doins wiretap/wtap.h
- if use gtk || use qt5; then
+ if use qt5; then
local s
for s in 16 32 48 64 128 256 512 1024; do
insinto /usr/share/icons/hicolor/${s}x${s}/apps
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2017-06-30 8:45 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2017-06-30 8:45 UTC (permalink / raw
To: gentoo-commits
commit: a96ce7ec5c6115823fb6b2ad7944a920ebf16a52
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 08:44:25 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 08:45:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96ce7ec
net-analyzer/wireshark: Version bump.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-analyzer/wireshark/Manifest | 1 +
.../files/wireshark-2.4-androiddump.patch | 27 +++
net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild | 267 +++++++++++++++++++++
3 files changed, 295 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 10ee44a2506..f71bdada53c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
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/files/wireshark-2.4-androiddump.patch b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
new file mode 100644
index 00000000000..e67ab21b6a8
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
@@ -0,0 +1,27 @@
+--- a/extcap/androiddump.c
++++ b/extcap/androiddump.c
+@@ -363,13 +363,13 @@
+ pcap = pcap_open_dead_with_tstamp_precision(encap_ext, 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
+ int err = 0;
+@@ -416,7 +416,7 @@
+
+ pcap_dump((u_char *) extcap_dumper.dumper.pcap, &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/wireshark-2.4.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
new file mode 100644
index 00000000000..69dc87248c6
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild
@@ -0,0 +1,267 @@
+# 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}-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 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] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2017-06-08 12:24 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2017-06-08 12:24 UTC (permalink / raw
To: gentoo-commits
commit: f4580cbf465a0506987d8c398432a109271c9ede
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 8 12:24:04 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jun 8 12:24:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4580cbf
net-analyzer/wireshark: Version bump.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-analyzer/wireshark/Manifest | 1 +
.../files/wireshark-99999999-sse4_2.patch | 20 -------------
net-analyzer/wireshark/metadata.xml | 4 +++
...-99999999.ebuild => wireshark-2.4.0_rc1.ebuild} | 35 ++++++++++++----------
net-analyzer/wireshark/wireshark-99999999.ebuild | 25 +++++++++++-----
5 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c41c16adbbb..657a747face 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
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/files/wireshark-99999999-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch
deleted file mode 100644
index daef2a1a7cb..00000000000
--- a/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1101,6 +1101,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"
-@@ -1128,6 +1129,9 @@
- fi
- fi
- WS_CFLAGS="$WS_CFLAGS_saved"
-+],[
-+AC_MSG_RESULT(no)
-+])
-
- if test "x$ac_sse4_2_flag" != x; then
- #
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 286f7d28adb..461d8656cff 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -34,12 +34,16 @@
<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="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</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="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="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="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
</use>
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild
similarity index 88%
copy from net-analyzer/wireshark/wireshark-99999999.ebuild
copy to net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild
index 6b4c32ee842..a7271a99e3f 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.0_rc1.ebuild
@@ -2,31 +2,33 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils user
+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"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~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
+ 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 )
- ssl? ( crypt )
"
+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 )
- crypt? ( dev-libs/libgcrypt:0 )
caps? ( sys-libs/libcap )
geoip? ( dev-libs/geoip )
gtk? (
@@ -37,7 +39,9 @@ CDEPEND="
)
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? (
@@ -51,6 +55,8 @@ CDEPEND="
)
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 )
"
@@ -84,18 +90,14 @@ RDEPEND="
"
PATCHES=(
"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+ "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
"${FILESDIR}"/${PN}-99999999-androiddump.patch
- "${FILESDIR}"/${PN}-99999999-sse4_2.patch
)
pkg_setup() {
enewgroup wireshark
}
-src_unpack() {
- git-r3_src_unpack
-}
-
src_prepare() {
default
@@ -150,17 +152,20 @@ src_configure() {
$(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 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 '') \
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 6b4c32ee842..68d8ab35815 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -5,28 +5,30 @@ EAPI=6
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/"
+HOMEPAGE="https://www.wireshark.org/"
EGIT_REPO_URI="https://code.wireshark.org/review/wireshark"
LICENSE="GPL-2"
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 +qt5 sbc selinux smi
- libssh randpkt randpktdump sshdump ssl tfshark zlib
+ 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 )
- ssl? ( crypt )
"
+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 )
- crypt? ( dev-libs/libgcrypt:0 )
caps? ( sys-libs/libcap )
geoip? ( dev-libs/geoip )
gtk? (
@@ -37,7 +39,9 @@ CDEPEND="
)
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? (
@@ -51,6 +55,8 @@ CDEPEND="
)
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 )
"
@@ -84,8 +90,8 @@ RDEPEND="
"
PATCHES=(
"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+ "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
"${FILESDIR}"/${PN}-99999999-androiddump.patch
- "${FILESDIR}"/${PN}-99999999-sse4_2.patch
)
pkg_setup() {
@@ -150,17 +156,20 @@ src_configure() {
$(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 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 '') \
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2016-12-21 8:49 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2016-12-21 8:49 UTC (permalink / raw
To: gentoo-commits
commit: 5aea03e28794e737e82fd9a9a884f05e31843e21
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 08:48:55 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 08:48:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aea03e2
net-analyzer/wireshark: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-analyzer/wireshark/Manifest | 1 -
.../wireshark/files/wireshark-1.11.0-oldlibs.patch | 20 --
.../wireshark/files/wireshark-1.6.13-ldflags.patch | 14 --
.../files/wireshark-2.0.0-androiddump-pcap.patch | 10 -
.../wireshark/files/wireshark-2.1.0-sse4_2.patch | 20 --
.../files/wireshark-99999999-pkgconfig.patch | 62 -----
net-analyzer/wireshark/wireshark-2.0.6.ebuild | 266 ---------------------
7 files changed, 393 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 62af4df..7ec75cf 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.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/files/wireshark-1.11.0-oldlibs.patch b/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch
deleted file mode 100644
index 24b5c7d..00000000
--- a/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/epan/Makefile.am
-+++ b/epan/Makefile.am
-@@ -137,6 +137,7 @@
- # Add the object files for missing routines, if any.
- #
- libwireshark_la_LIBADD = \
-+ ${top_builddir}/wiretap/libwiretap.la ${top_builddir}/wsutil/libwsutil.la \
- libwireshark_generated.la \
- libwireshark_asmopt.la crypt/libairpdcap.la \
- ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
-@@ -144,8 +145,7 @@
- wmem/libwmem.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
- @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
- @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
-- ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \
-- ${top_builddir}/wsutil/libwsutil.la -lm
-+ @GLIB_LIBS@ -lm
-
- libwireshark_la_DEPENDENCIES = \
- libwireshark_generated.la \
diff --git a/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch b/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch
deleted file mode 100644
index 94554fd..00000000
--- a/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -61,9 +61,9 @@
- # "-R" here.
- #
- AC_DEFUN([AC_WIRESHARK_ADD_DASH_L],
--[$1="$$1 -L$2"
--case "$host_os" in
-+[case "$host_os" in
- solaris*)
-+ $1="$$1 -L$2"
- $1="$$1 -R$2"
- ;;
- esac
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
deleted file mode 100644
index 639e299..00000000
--- a/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/files/wireshark-2.1.0-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch
deleted file mode 100644
index 1f80be9..00000000
--- a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1101,6 +1101,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_CHECKED_CFLAGS_before_simd="$WS_CHECKED_CFLAGS"
- AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
- if test "x$can_add_to_cflags" = "xyes"
-@@ -1132,6 +1133,9 @@
- ac_sse4_2_flag=-xarch=sse4_2
- fi
- fi
-+],[
-+AC_MSG_RESULT(no)
-+])
-
- #
- # All AC_WIRESHARK_COMPILER_FLAGS_CHECK are done, do not call it again!
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
deleted file mode 100644
index 51f3c8f..00000000
--- a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -242,7 +242,7 @@
- # This is referenced via AC_REQUIRE([PKG_PROG_PKG_CONFIG] in some macros
- # like PKG_CHECK_MODULES. If the first call to such a macro is under an
- # "if" statement, it's safer to call PKG_PROG_PKG_CONFIG directly, see
--# the comments in acolocal.m4
-+# the comments in aclocal.m4
- #
- # We want version 0.7 or better. (XXX - explain why. Is that just
- # because our Qt tests were originally based on AM_PATH_GTK, and *it*
-@@ -1910,6 +1910,19 @@
- AC_SUBST(plugins_dir)
-
- #
-+# Find out where to store wireshark.pc and what should be in it
-+#
-+
-+PKG_INSTALLDIR
-+
-+AC_SUBST(CMAKE_INSTALL_PREFIX,[$prefix])
-+AC_SUBST(CMAKE_INSTALL_LIBDIR,[`basename $libdir`])
-+PLUGIN_INSTALL_DIR="\${libdir}/$PACKAGE_NAME/$PACKAGE_VERSION/$plugins_dir"
-+AC_SUBST(PLUGIN_INSTALL_DIR)
-+PROJECT_VERSION="$PACKAGE_VERSION"
-+AC_SUBST(PROJECT_VERSION)
-+
-+#
- # If we have <dlfcn.h>, check whether we have dladdr.
- #
- if test "$ac_cv_header_dlfcn_h" = "yes"
-@@ -3080,10 +3093,15 @@
- sinclude(asn1/Custom.m4) dnl
- ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl
-
-+#
-+# Configuration output
-+#
-+
- AC_CONFIG_HEADERS(config.h)
- AC_OUTPUT(
- Makefile
- doxygen.cfg
-+ wireshark.pc
- asn1/Makefile
- _CUSTOM_ASN1_AC_OUTPUT_
- asn1/acp133/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -56,6 +56,12 @@
- smi_modules ipmap.html pdml2html.xsl
-
- #
-+# Install a pkgconfig file
-+#
-+
-+pkgconfig_DATA = wireshark.pc
-+
-+#
- # Install global profiles in the "profiles" subdirectory
- #
- profilesdir = $(pkgdatadir)
diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
deleted file mode 100644
index 4e96b75..00000000
--- a/net-analyzer/wireshark/wireshark-2.0.6.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] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2016-02-24 8:41 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2016-02-24 8:41 UTC (permalink / raw
To: gentoo-commits
commit: 5c6f0ca77d32472e5973e8652078beeb2b1bb722
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 08:41:18 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 08:41:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c6f0ca7
net-analyzer/wireshark: Update live ebuild patches (bug #575090 by Garri).
Package-Manager: portage-2.2.27
.../files/wireshark-99999999-androiddump.patch | 10 ++++++++++
.../wireshark/files/wireshark-99999999-sse4_2.patch | 20 ++++++++++++++++++++
net-analyzer/wireshark/wireshark-99999999.ebuild | 7 ++-----
3 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
new file mode 100644
index 0000000..7c00d8b
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
@@ -0,0 +1,10 @@
+--- a/extcap/Makefile.am
++++ b/extcap/Makefile.am
+@@ -46,6 +46,7 @@
+ ../wiretap/libwiretap.la \
+ ../wsutil/libwsutil.la \
+ @GLIB_LIBS@ \
++ @PCAP_LIBS@ \
+ @SOCKET_LIBS@
+
+ if ENABLE_STATIC
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch
new file mode 100644
index 0000000..daef2a1
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1101,6 +1101,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"
+@@ -1128,6 +1129,9 @@
+ fi
+ fi
+ WS_CFLAGS="$WS_CFLAGS_saved"
++],[
++AC_MSG_RESULT(no)
++])
+
+ if test "x$ac_sse4_2_flag" != x; then
+ #
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 786f1b1..b0ab8fd 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -97,11 +97,10 @@ 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}-2.1.0-sse4_2.patch
+ "${FILESDIR}"/${PN}-99999999-sse4_2.patch \
+ "${FILESDIR}"/${PN}-99999999-androiddump.patch
epatch_user
@@ -155,7 +154,6 @@ 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) \
@@ -212,7 +210,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] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2015-12-25 11:56 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2015-12-25 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 189c9e43fcd26e41ab4e8958c2d90e55246e159c
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 11:55:43 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 11:56:00 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=189c9e43
net-analyzer/wireshark: Update sse4_2 patch.
Package-Manager: portage-2.2.26
.../wireshark/files/wireshark-2.1.0-sse4_2.patch | 20 ++++++++++++++++++++
net-analyzer/wireshark/wireshark-99999999.ebuild | 8 ++++----
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch
new file mode 100644
index 0000000..1f80be9
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1101,6 +1101,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_CHECKED_CFLAGS_before_simd="$WS_CHECKED_CFLAGS"
+ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
+ if test "x$can_add_to_cflags" = "xyes"
+@@ -1132,6 +1133,9 @@
+ ac_sse4_2_flag=-xarch=sse4_2
+ fi
+ fi
++],[
++AC_MSG_RESULT(no)
++])
+
+ #
+ # All AC_WIRESHARK_COMPILER_FLAGS_CHECK are done, do not call it again!
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 4a25e68..26e146c 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -13,8 +13,8 @@ LICENSE="GPL-2"
SLOT="0/${PV}"
KEYWORDS=""
IUSE="
- adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
- portaudio +qt4 qt5 sbc selinux smi cpu_flags_x86_sse4_2 ssl zlib
+ 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
"
REQUIRED_USE="
ssl? ( crypt )
@@ -97,9 +97,9 @@ 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.99.8-qtchooser.patch \
+ "${FILESDIR}"/${PN}-2.1.0-sse4_2.patch
epatch_user
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2015-10-15 10:01 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2015-10-15 10:01 UTC (permalink / raw
To: gentoo-commits
commit: e75103aae62cab076e708faebb27f6c5cef4200b
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 09:05:35 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 10:01:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75103aa
net-analyzer/wireshark: Old.
Package-Manager: portage-2.2.23
net-analyzer/wireshark/Manifest | 1 -
.../files/wireshark-1.99.6-gcc_option.patch | 40 ----
net-analyzer/wireshark/wireshark-1.99.9.ebuild | 264 ---------------------
3 files changed, 305 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bdbbfbc..9754278 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +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-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/files/wireshark-1.99.6-gcc_option.patch b/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch
deleted file mode 100644
index e7124ad..0000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1735,15 +1735,15 @@
- CXXFLAGS_saved="$CXXFLAGS"
- if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
- then
-- CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error $GCC_OPTION"
-+ CXXFLAGS="$GCC_OPTION $CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error"
- elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null
- then
-- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
-+ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror"
- elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null
- then
-- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
-+ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror"
- else
-- CXXFLAGS="$CXXFLAGS $GCC_OPTION"
-+ CXXFLAGS="$GCC_OPTION $CXXFLAGS"
- fi
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(
-@@ -1773,7 +1773,7 @@
- # added them, by setting CXXFLAGS to the saved value plus
- # just the new option.
- #
-- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
-+ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved"
- ],
- [
- AC_MSG_RESULT(yes)
-@@ -1785,7 +1785,7 @@
- # added them, by setting CXXFLAGS to the saved value plus
- # just the new option.
- #
-- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
-+ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved"
- fi
- ],
- [
diff --git a/net-analyzer/wireshark/wireshark-1.99.9.ebuild b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
deleted file mode 100644
index 348d4e4..0000000
--- a/net-analyzer/wireshark/wireshark-1.99.9.ebuild
+++ /dev/null
@@ -1,264 +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=""
-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 )
-"
-
-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.6-gcc_option.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
-
- 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,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 || 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] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
@ 2015-10-15 5:55 Jeroen Roovers
0 siblings, 0 replies; 20+ messages in thread
From: Jeroen Roovers @ 2015-10-15 5:55 UTC (permalink / raw
To: gentoo-commits
commit: 024936abda782334459138ec5cc899438085a53f
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 05:55:07 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 05:55:07 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024936ab
net-analyzer/wireshark: Version bump (bug #563096).
Package-Manager: portage-2.2.23
net-analyzer/wireshark/Manifest | 1 +
.../wireshark-1.12.8-gtk-deprecated-warnings.patch | 28 +++
net-analyzer/wireshark/wireshark-1.12.8.ebuild | 258 +++++++++++++++++++++
3 files changed, 287 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 5ff66fb..6e74530 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +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-1.99.9.tar.bz2 30495072 SHA256 be7ac8f8eb2c08e0e3d62da9f781db0dc5322a9cbcb024d3f86a66a06185e182 SHA512 d08348df7951ddc9c441bf9e80ab7ea281ccb92c7aa837dcae172037ee3486dcefaa28e8286a5e1654404a57bc0e004320f01c32c55af6f771dc20814d322066 WHIRLPOOL 09708dbe954dd72ae7b9295b57bcc420f36a5ae76ba27ace6c50cf85b19f295a2a10ffe3039018d0dbbba3c72cc3b0e4689512511b48a6ec706eab89f549e94c
diff --git a/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch
new file mode 100644
index 0000000..24ecf9f
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch
@@ -0,0 +1,28 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1536,25 +1536,6 @@
+ wireshark_man=""
+ fi
+
+-if test "$have_gtk" = "yes" ; then
+- # If we have GTK then add flags for it.
+-
+- 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.8.ebuild b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
new file mode 100644
index 0000000..17cc95a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.12.8.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.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
+
+ 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 || 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] 20+ messages in thread
end of thread, other threads:[~2024-10-11 2:27 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-05 7:22 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-10-11 2:27 Sam James
2022-04-17 16:44 Sam James
2022-02-20 6:31 Sam James
2022-02-20 5:51 Sam James
2022-01-22 4:21 Sam James
2021-03-27 2:58 Sam James
2020-06-22 13:41 Jeroen Roovers
2019-08-27 3:07 Jeroen Roovers
2019-03-18 20:47 Jeroen Roovers
2019-03-11 16:55 Jeroen Roovers
2018-09-02 17:58 Jeroen Roovers
2018-06-03 12:12 Jeroen Roovers
2017-06-30 8:45 Jeroen Roovers
2017-06-08 12:24 Jeroen Roovers
2016-12-21 8:49 Jeroen Roovers
2016-02-24 8:41 Jeroen Roovers
2015-12-25 11:56 Jeroen Roovers
2015-10-15 10:01 Jeroen Roovers
2015-10-15 5:55 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox