summaryrefslogtreecommitdiff
path: root/net-analyzer/wireshark
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /net-analyzer/wireshark
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r--net-analyzer/wireshark/Manifest18
-rw-r--r--net-analyzer/wireshark/wireshark-3.0.3.ebuild4
-rw-r--r--net-analyzer/wireshark/wireshark-3.0.6.ebuild245
-rw-r--r--net-analyzer/wireshark/wireshark-3.0.7.ebuild (renamed from net-analyzer/wireshark/wireshark-3.0.4.ebuild)6
-rw-r--r--net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild (renamed from net-analyzer/wireshark/wireshark-3.1.0.ebuild)21
-rw-r--r--net-analyzer/wireshark/wireshark-3.2.0_rc2.ebuild (renamed from net-analyzer/wireshark/wireshark-3.0.5.ebuild)34
-rw-r--r--net-analyzer/wireshark/wireshark-99999999.ebuild17
7 files changed, 47 insertions, 298 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6a0ec1be14d9..725e8616347c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,14 +5,12 @@ AUX wireshark-99999999-androiddump-wsutil.patch 343 BLAKE2B 665e3329615524fa145b
AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
-DIST wireshark-3.0.4.tar.xz 30938336 BLAKE2B ab97cbfd9999a4e326787639debb67f0d0b8509572fb85297385a461dbaf081691d59fc2cb16b4a69baee8ca0ef873503f85f0238bf0fbedfcb3e0755749d3df SHA512 eb9ddc8ba3d78bc6c1f2e1d277e81c00939638793ed21b98999310231d13a0fc8a6149dc5e78f58026778b8137e954ad7f67069f8cb80465078ca2d9795b25d1
-DIST wireshark-3.0.5.tar.xz 30929864 BLAKE2B 0e3d8eb37e6d1d1976e8084176fc9c75dab43a74f65f8247c9b18b85cdd82d207791b839743a59c4ad299d63f5f41a94f931901e9245dbfb3d4a239046c874c4 SHA512 237ee66cfe0a7073f0e3623f327f7eb7204d1cd274e006dcc6890972d4135c2baa6c9d2426ea03ee64b7fc6dc45cb4cfe823e5cfc6f90e252d35b3ad7750884e
-DIST wireshark-3.0.6.tar.xz 30846672 BLAKE2B c20bef980edb470564dff15e0133e6d65c3273e400a136faeabf92f6e4b907236f88f025baad6d4d592703d2063e56b42de28849c84ce7babeeece950e4afdb8 SHA512 fcd621c1434db69e6319e5932e2dcc378e004055378123f86bdce8dec095bbffbf2b85a880c7f46c69555fe3c9ddb7c79ee59ca2576e0fdf2cfb7eb6ce775b25
-DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9
-EBUILD wireshark-3.0.3.ebuild 6581 BLAKE2B b9caaad314347dc3a02cd2994344f3113c604487b36c6b785018c0683a11dcf5e1714871431e1305ca9e1ba2eb3b542d91044f5b2c5afd0419a13b53c3f256c2 SHA512 154f303dc3c9c84088db981d00218cdf9dc7bb6dd5719d25201b9460b9dd9998093d179475c97cdc54aaf27da659acc5609ad333f0cccea3ba23f13cd837bf91
-EBUILD wireshark-3.0.4.ebuild 6585 BLAKE2B 06d39f7d056b73ea4d7180cd7373975831dbb1f1d5a4b28faa5d9ab37452d70f78247a4727cfd7acb15879917a7be703733fa42dc77ac4b61b26c5b46b383e06 SHA512 b627ce7283791654aeec6f7400b5d12e309ba98548f382256cb5732e171811637462af036c676b936217f00f24a3f0ad566a1ed9a95ca4eb8f9504a48a2d74dd
-EBUILD wireshark-3.0.5.ebuild 6588 BLAKE2B f76ebf3af16e8f11f97af85b599b7555b3c85db8cb7c37698252be645622623cc8549aa591bf627909ebd04b9008c1581f607376a6fdf849783e31cb57294d74 SHA512 348cf90f7c319ab19a4befc74ca261c286eb9b778a6c21d65a4b462d422e7d382741102260d2155d5e415b2348499d1dbd3ea7bedc91e4f81596331d337c5263
-EBUILD wireshark-3.0.6.ebuild 6588 BLAKE2B f76ebf3af16e8f11f97af85b599b7555b3c85db8cb7c37698252be645622623cc8549aa591bf627909ebd04b9008c1581f607376a6fdf849783e31cb57294d74 SHA512 348cf90f7c319ab19a4befc74ca261c286eb9b778a6c21d65a4b462d422e7d382741102260d2155d5e415b2348499d1dbd3ea7bedc91e4f81596331d337c5263
-EBUILD wireshark-3.1.0.ebuild 6790 BLAKE2B 7acc05ba1e54b2a9b68d775c639c60d19ad98e7f0d35caa70cf42400618cef1306de4514d21bc249e19ffda36ee6e96a8425a57bfb72de44ea439565eca2b98d SHA512 e1bcccdf1ca7fa2e97fb55591c6d067e3bb2d4a03188254b8decd6e277b8ff584f2c8590c578109fc3045b908d46a76892d952c1c264665c36cd02fa4b36ebfd
-EBUILD wireshark-99999999.ebuild 6795 BLAKE2B 615b65c6838e00c5b0c54a05508d0758f761387dd0a9488ad39608054c4940fc3d5b557a370bc1e14b9b70734ea9c0ac4df4cd8a06a84b1854c41cab12b96182 SHA512 0d5b143ad8f104f4ddb66195a000bc94fe26997ef5c9269f967e20c9832deafe31443ac53558046aa7f300bf036194c23fb6a9a5611237bf31d039ebfc567978
+DIST wireshark-3.0.7.tar.xz 30851928 BLAKE2B 98d31a260b2f5f74a567161e9dc0c136bb6bb29bcd4fc303f099c8b1379668194c2463e0661041061fe4c462db20c846694beae9286d322ce887332cce45341b SHA512 64e242510865ca69e688677e3ee1f72d3efa2155f07bc1aacc6de19ffab06f26b1ef8a3f91a90e91a6612b10d75651aea6400f8c5852e6a7e82e5d3f3e88e031
+DIST wireshark-3.2.0rc1.tar.xz 31426064 BLAKE2B e7fd605701aec50bf982f3775902ca6289862422a2e69dc42308f5955b8a74c3b059553fd187de66b2c771f27062517c6b690fd9af787dfdea44e589759f856a SHA512 6dfc1f46f8555798dbb1d1e6ba49cdebb497155559af6733e38819882059aa6db6fc0e72a84e30b5255ec46dda5b2245de905035415c0ef24b71a616c4b94111
+DIST wireshark-3.2.0rc2.tar.xz 31454312 BLAKE2B 41c25634d89c4e107a65278d679a17c7b21f8b9c566b394ae8b410a8ed38c4ccce4244b12f95c24c2d50c21bba05077cf068ec1e59f3d9c29bc58207c7020afc SHA512 c24bc0358127105f00efe9c79b012eb4f5b5fafd987f3cd47bf5079cb4d4f92810fd5fda207385d031ebe5afd2b26804f911509b85cbc672fa5c2d1d8e69130d
+EBUILD wireshark-3.0.3.ebuild 6594 BLAKE2B 92f6526f2ce0313b1013dc70a4b369c04ed58dfffb7577e041652e73b0a15436d07dbdff098e8561fbed72aa33b1e0510b2cc2203b19e76d60789506c93bd50e SHA512 3bb758b5ed50c51c2cbd6bf0e8e93ca68be079d51dd82dcfeac4fd599048cf087b23f9a7854348a912d9d8c422468193d4c341948c07f4cfa9c678e2806241fc
+EBUILD wireshark-3.0.7.ebuild 6596 BLAKE2B 127a3d8748f3fa9af8963d79870480f20c3e2d5aad306e19d558520155b2d07f789df84e6430338af984c3bd5a608de26f4edff3e340a0ef2c40216a81f2eb95 SHA512 c3d5917d949cf501b59fe4de8239faa8d52be95394d5a21c7361b70e7bee4b5ca0d906062da2b658a96b35671a1ee1114837d7c86ebdac487f9e3f17610a6312
+EBUILD wireshark-3.2.0_rc1.ebuild 6744 BLAKE2B c01c85d65aac4bb522aa4382f4a82a5915c6739bb53e570e2c827df7cc05e82837df48f6b0f1573336970fbae84ff0db02947689931242185fd0b78a0c80198d SHA512 15b9e6adf6dceb859652116a3cfa4a0428e4b52ae42f552a2b33a44a50cc4055f808873b955788684e96478d86d9d1f7a23efe983096c1b396138b5283689b9f
+EBUILD wireshark-3.2.0_rc2.ebuild 6744 BLAKE2B c01c85d65aac4bb522aa4382f4a82a5915c6739bb53e570e2c827df7cc05e82837df48f6b0f1573336970fbae84ff0db02947689931242185fd0b78a0c80198d SHA512 15b9e6adf6dceb859652116a3cfa4a0428e4b52ae42f552a2b33a44a50cc4055f808873b955788684e96478d86d9d1f7a23efe983096c1b396138b5283689b9f
+EBUILD wireshark-99999999.ebuild 6685 BLAKE2B 522b1a0ab6ee888263297fdd52751d3d4026d1725005086b0aa7825bebdca430bc8bd2b5ad871da51a3b2929e5401026208a457d7d04ec45cca557ff87224a33 SHA512 485eefc016acafe5cd0f85208569d52e5170ab9494e175579a5fed7ecdbb5b7f4bf807ae9858e49e3c26baf8c3a962a00d12ad28c1430afba22c6513a719d500
MISC metadata.xml 4963 BLAKE2B b3c0a51c2ffc96313fe46be2f4b970c0a22d7b479a3701a717531f7b9c46ff5b00b1d3a29a54295abb90989226afb679f2d4842c2ade5f4f1c2d7923121591b8 SHA512 03cdfa1a78a23ae572eb0eacf787b1edba135541ab94d899dad77c6f0d482d9303fa0168033a3a60a8e12dd54506999ea5bd323dc0a90c58d87d8640bda139d2
diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
index 0fcd75a867a0..73cc78d498c1 100644
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -7,7 +7,7 @@ inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-u
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
LICENSE="GPL-2"
SLOT="0/${PV}"
@@ -146,7 +146,7 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
- -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+ -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
-DDISABLE_WERROR=yes
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_CAP=$(usex filecaps caps)
diff --git a/net-analyzer/wireshark/wireshark-3.0.6.ebuild b/net-analyzer/wireshark/wireshark-3.0.6.ebuild
deleted file mode 100644
index f4fbb9dc3bcd..000000000000
--- a/net-analyzer/wireshark/wireshark-3.0.6.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-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 http2 kerberos libxml2 lua lz4 maxminddb +mergecap
- +netlink +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 )
- 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 )
- 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 )
- ${PYTHON_DEPS}
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
- ${CDEPEND}
-"
-BDEPEND="
- !<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="${EROOT%/}/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 http2)
- -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() {
- cmake-utils_src_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
-}
-
-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.0.4.ebuild b/net-analyzer/wireshark/wireshark-3.0.7.ebuild
index 61e8bd7a288c..173425dd9486 100644
--- a/net-analyzer/wireshark/wireshark-3.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.7.ebuild
@@ -7,11 +7,11 @@ inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-u
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc64 x86"
IUSE="
adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
@@ -146,7 +146,7 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
- -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+ -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
-DDISABLE_WERROR=yes
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_CAP=$(usex filecaps caps)
diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild
index 4d9324a7a9b8..3252cadf725c 100644
--- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild
@@ -7,24 +7,24 @@ inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cma
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
IUSE="
- adns 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
+ 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
- adns? ( >=net-dns/c-ares-1.5 )
bcg729? ( media-libs/bcg729 )
brotli? ( app-arch/brotli )
ciscodump? ( >=net-libs/libssh-0.6 )
@@ -62,8 +62,6 @@ DEPEND="
${PYTHON_DEPS}
"
BDEPEND="
- !<perl-core/Pod-Simple-3.170
- !<virtual/perl-Pod-Simple-3.170
dev-lang/perl
sys-devel/bison
sys-devel/flex
@@ -147,12 +145,11 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
- -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+ -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_CARES=$(usex adns)
-DENABLE_GNUTLS=$(usex ssl)
-DENABLE_KERBEROS=$(usex kerberos)
-DENABLE_LIBXML2=$(usex libxml2)
diff --git a/net-analyzer/wireshark/wireshark-3.0.5.ebuild b/net-analyzer/wireshark/wireshark-3.2.0_rc2.ebuild
index f4fbb9dc3bcd..3252cadf725c 100644
--- a/net-analyzer/wireshark/wireshark-3.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.0_rc2.ebuild
@@ -3,30 +3,30 @@
EAPI=7
PYTHON_COMPAT=( python3_{5,6,7} )
-inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake-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"
-
+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="
- adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+ androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
- +netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
- smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
- +udpdump zlib
+ +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
- adns? ( >=net-dns/c-ares-1.5 )
bcg729? ( media-libs/bcg729 )
+ brotli? ( app-arch/brotli )
ciscodump? ( >=net-libs/libssh-0.6 )
filecaps? ( sys-libs/libcap )
http2? ( net-libs/nghttp2 )
@@ -35,6 +35,7 @@ CDEPEND="
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? (
@@ -53,16 +54,14 @@ CDEPEND="
sshdump? ( >=net-libs/libssh-0.6 )
ssl? ( net-libs/gnutls:= )
zlib? ( sys-libs/zlib )
- ${PYTHON_DEPS}
"
# We need perl for `pod2html`. The rest of the perl stuff is to block older
# and broken installs. #455122
DEPEND="
${CDEPEND}
+ ${PYTHON_DEPS}
"
BDEPEND="
- !<perl-core/Pod-Simple-3.170
- !<virtual/perl-Pod-Simple-3.170
dev-lang/perl
sys-devel/bison
sys-devel/flex
@@ -81,7 +80,7 @@ RDEPEND="
selinux? ( sec-policy/selinux-wireshark )
"
REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
+ plugin-ifdemo? ( plugins )
"
PATCHES=(
"${FILESDIR}"/${PN}-2.4-androiddump.patch
@@ -117,7 +116,7 @@ src_configure() {
append-cxxflags -fPIC -DPIC
fi
- python_setup 'python3*'
+ python_setup
mycmakeargs+=(
$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
@@ -146,19 +145,22 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
- -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+ -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_CARES=$(usex adns)
-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)
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 7ecaa00c8eec..18b738bc9381 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -13,18 +13,18 @@ LICENSE="GPL-2"
SLOT="0/${PV}"
KEYWORDS=""
IUSE="
- adns 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
+ 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
- adns? ( >=net-dns/c-ares-1.5 )
bcg729? ( media-libs/bcg729 )
brotli? ( app-arch/brotli )
ciscodump? ( >=net-libs/libssh-0.6 )
@@ -62,8 +62,6 @@ DEPEND="
${PYTHON_DEPS}
"
BDEPEND="
- !<perl-core/Pod-Simple-3.170
- !<virtual/perl-Pod-Simple-3.170
dev-lang/perl
sys-devel/bison
sys-devel/flex
@@ -147,12 +145,11 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
- -DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+ -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_CARES=$(usex adns)
-DENABLE_GNUTLS=$(usex ssl)
-DENABLE_KERBEROS=$(usex kerberos)
-DENABLE_LIBXML2=$(usex libxml2)