[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 0603c9396cec1b17d3c5d3e91e584ec54b667d8b
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Jan 13 13:37:01 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jan 13 13:37:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0603c939
net-analyzer/wireshark: Stabilize 3.6.10 arm, #887801
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
index 0307c097a39d..e4a91cba071f 100644
--- a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 9ff877dc85d181af884fc268e8859189b909cc25
Author: hololeap users noreply github com>
AuthorDate: Mon Dec 12 23:41:10 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 24 07:01:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff877dc
net-analyzer/wireshark: Update REQUIRED_USE on v3
plugin-ifdemo requires the qt5 USE flag or the package will fail on the
configure stage (note this has not been tested on wireshark-4):
CMake Error at plugins/epan/pluginifdemo/CMakeLists.txt:55
(target_link_libraries):
Target "pluginifdemo" links to:
Qt5::Multimedia
but the target was not found. Possible reasons include:
* There is a typo in the target name.
* A find_package call is missing for an IMPORTED target.
* An ALIAS target is missing.
Closes: https://github.com/gentoo/gentoo/pull/28707
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.10.ebuild | 2 +-
net-analyzer/wireshark/wireshark-3.6.9.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
index 9dc957fabde9..7e3a61ee7902 100644
--- a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
@@ -30,7 +30,7 @@ IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi
snappy spandsp sshdump
IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )"
+ plugin-ifdemo? ( plugins qt5 )"
RESTRICT="!test? ( test )"
diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
index d4345cd1e3bb..a6b3b00ce71e 100644
--- a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
@@ -30,7 +30,7 @@ IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi
snappy spandsp sshdump
IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )"
+ plugin-ifdemo? ( plugins qt5 )"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: ca12b4077d3f2bb00a14e60cf18d0fe6fce9c034
Author: Sam James gentoo org>
AuthorDate: Wed Dec 21 23:09:41 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 21 23:09:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca12b407
net-analyzer/wireshark: Stabilize 3.6.10 arm64, #887801
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
index 535f46aab957..f5aa30927abd 100644
--- a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 916da9b5233b653c336e9d023ff148b89591d76a
Author: Sam James gentoo org>
AuthorDate: Wed Dec 21 23:09:42 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 21 23:09:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916da9b5
net-analyzer/wireshark: Stabilize 3.6.10 amd64, #887801
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
index f5aa30927abd..9dc957fabde9 100644
--- a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 7814072b4a0dc56280577325b92df5cd56f4d627
Author: Sam James gentoo org>
AuthorDate: Wed Dec 21 22:49:12 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 21 22:49:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7814072b
net-analyzer/wireshark: drop 4.0.1
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 -
net-analyzer/wireshark/wireshark-4.0.1.ebuild | 312 --
2 files changed, 313 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b5f6121946bd..62ff0707b62a 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
DIST wireshark-3.6.10.tar.xz 39956960 BLAKE2B
5f283caeed4fc9b231331b90b68b25615f8c1df7639accd225590c88cebc86cca7ea95d979db6a60268a5b918f448a9b0878b9f4f8d5dccc847c6dd1fe4fddb7
SHA512
dbdba7a29e2b6e6c3bbc0f0d599a2b9b49efcb1540b36f2f8c55ac3850565b68dc1282b1ed1d3cd63709f12e2fe659f93de5f9473c2f23751373f3738b8e766a
DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
SHA512
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
-DIST wireshark-4.0.1.tar.xz 41282116 BLAKE2B
63984c5722fe0cbcf2a756efdd0cf44304e3ce25eb1aea87758a28576ba3416b0a8226079a413084e46724fcd4ed9b0f4cbf82cbabbf48f2febe0fbc8446a054
SHA512
10ac8e738b4bd70ba4a1a9124e8c8e6238feb7c5a4cef79a03dae6adef08230700bb8ba700d2f89a5aad28cabdaf06b8825a1124d9d466de4e2e10cc55968525
DIST wireshark-4.0.2.tar.xz 41296132 BLAKE2B
3ca64c5d561fc3262af821a2fed559efc39f9c194d1c03211d27b8154d87fe78c26d390504fc33f80fefbec06aa07d5b4fe27b253a3fc32641ec52292bc0557b
SHA512
0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5
diff --git a/net-analyzer/wireshark/wireshark-4.0.1.ebuild
b/net-analyzer/wireshark/wireshark-4.0.1.ebuild
deleted file mode 100644
index 318d2b7f27d5..
--- a/net-analyzer/wireshark/wireshark-4.0.1.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-
-if [[ ${PV} == ** ]] ; then
- EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
- inherit git-r3
-else
-
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
- S="${WORKDIR}/${P/_/}"
-
- if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ilbc kerberos libxml2 lto 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:= )
- 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? (
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: a974312c47c04399c97ab6e3b0f5d06db3f7b1f0
Author: Sam James gentoo org>
AuthorDate: Tue Dec 13 04:08:17 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 13 04:08:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a974312c
net-analyzer/wireshark: respect selected Python choice
Closes: https://bugs.gentoo.org/885703
Closes: https://bugs.gentoo.org/884819
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.10.ebuild | 3 +++
net-analyzer/wireshark/wireshark-3.6.9.ebuild | 3 +++
net-analyzer/wireshark/wireshark-4.0.1.ebuild | 3 +++
net-analyzer/wireshark/wireshark-4.0.2.ebuild | 3 +++
net-analyzer/wireshark/wireshark-.ebuild | 3 +++
5 files changed, 15 insertions(+)
diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
index fffca9343012..535f46aab957 100644
--- a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
@@ -137,12 +137,15 @@ src_configure() {
python_setup
mycmakeargs+=(
+ -DPython3_EXECUTABLE="${PYTHON}"
-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)
diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
index 4116451fbbfc..d4345cd1e3bb 100644
--- a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
@@ -137,12 +137,15 @@ src_configure() {
python_setup
mycmakeargs+=(
+ -DPython3_EXECUTABLE="${PYTHON}"
-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)
diff --git a/net-analyzer/wireshark/wireshark-4.0.1.ebuild
b/net-analyzer/wireshark/wireshark-4.0.1.ebuild
index 08b136066287..318d2b7f27d5 100644
--- a/net-analyzer/wireshark/wireshark-4.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.1.ebuild
@@ -169,12 +169,15 @@ src_configure() {
fi
mycmakeargs+=(
+ -DPython3_EXECUTABLE="${PYTHON}"
-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
+
$(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)
diff --git a/net-analyzer/wireshark/wireshark-4.0.2.ebuild
b/net-analyzer/wireshark/wireshark-4.0.2.ebuild
index 08b136066287..318d2b7f27d5 100644
--- a/net-analyzer/wireshark/wireshark-4.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.2.ebuild
@@ -169,12 +169,15 @@ src_configure() {
fi
mycmakeargs+=(
+ -DPython3_EXECUTABLE="${PYTHON}"
-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
+
$(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)
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 08b136066287..318d2b7f27d5 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -169,12 +169,15 @@ src_configure() {
fi
mycmakeargs+=(
+ -DPython3_EXECUTABLE="${PYTHON}"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 896c785ed42c204e91a92e5a27a570f7035ee0e3
Author: Sam James gentoo org>
AuthorDate: Mon Dec 12 16:01:41 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 12 16:01:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=896c785e
net-analyzer/wireshark: add 3.6.10
Bug: https://bugs.gentoo.org/885511
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest| 1 +
net-analyzer/wireshark/wireshark-3.6.10.ebuild | 269 +
2 files changed, 270 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index e4e55cdd56df..da501ae8be82 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
+DIST wireshark-3.6.10.tar.xz 39956960 BLAKE2B
5f283caeed4fc9b231331b90b68b25615f8c1df7639accd225590c88cebc86cca7ea95d979db6a60268a5b918f448a9b0878b9f4f8d5dccc847c6dd1fe4fddb7
SHA512
dbdba7a29e2b6e6c3bbc0f0d599a2b9b49efcb1540b36f2f8c55ac3850565b68dc1282b1ed1d3cd63709f12e2fe659f93de5f9473c2f23751373f3738b8e766a
DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
SHA512
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
DIST wireshark-4.0.1.tar.xz 41282116 BLAKE2B
63984c5722fe0cbcf2a756efdd0cf44304e3ce25eb1aea87758a28576ba3416b0a8226079a413084e46724fcd4ed9b0f4cbf82cbabbf48f2febe0fbc8446a054
SHA512
10ac8e738b4bd70ba4a1a9124e8c8e6238feb7c5a4cef79a03dae6adef08230700bb8ba700d2f89a5aad28cabdaf06b8825a1124d9d466de4e2e10cc55968525
diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
new file mode 100644
index ..fffca9343012
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+ inherit git-r3
+else
+
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+ 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? (
+ $(python_gen_any_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 352d4b3e9ed26031a20cd27f32b1f61b88a0896c
Author: Sam James gentoo org>
AuthorDate: Mon Dec 12 16:13:53 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 12 16:13:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=352d4b3e
net-analyzer/wireshark: add 4.0.2
Bug: https://bugs.gentoo.org/885511
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
net-analyzer/wireshark/wireshark-4.0.2.ebuild | 309 ++
2 files changed, 310 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index da501ae8be82..b5f6121946bd 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
DIST wireshark-3.6.10.tar.xz 39956960 BLAKE2B
5f283caeed4fc9b231331b90b68b25615f8c1df7639accd225590c88cebc86cca7ea95d979db6a60268a5b918f448a9b0878b9f4f8d5dccc847c6dd1fe4fddb7
SHA512
dbdba7a29e2b6e6c3bbc0f0d599a2b9b49efcb1540b36f2f8c55ac3850565b68dc1282b1ed1d3cd63709f12e2fe659f93de5f9473c2f23751373f3738b8e766a
DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
SHA512
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
DIST wireshark-4.0.1.tar.xz 41282116 BLAKE2B
63984c5722fe0cbcf2a756efdd0cf44304e3ce25eb1aea87758a28576ba3416b0a8226079a413084e46724fcd4ed9b0f4cbf82cbabbf48f2febe0fbc8446a054
SHA512
10ac8e738b4bd70ba4a1a9124e8c8e6238feb7c5a4cef79a03dae6adef08230700bb8ba700d2f89a5aad28cabdaf06b8825a1124d9d466de4e2e10cc55968525
+DIST wireshark-4.0.2.tar.xz 41296132 BLAKE2B
3ca64c5d561fc3262af821a2fed559efc39f9c194d1c03211d27b8154d87fe78c26d390504fc33f80fefbec06aa07d5b4fe27b253a3fc32641ec52292bc0557b
SHA512
0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5
diff --git a/net-analyzer/wireshark/wireshark-4.0.2.ebuild
b/net-analyzer/wireshark/wireshark-4.0.2.ebuild
new file mode 100644
index ..08b136066287
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.2.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+ inherit git-r3
+else
+
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+ S="${WORKDIR}/${P/_/}"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ilbc kerberos libxml2 lto 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:= )
+ 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? (
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: ebb910bf51dc2d2d4745d43d5b7568765bb1da60
Author: Sam James gentoo org>
AuthorDate: Mon Dec 12 02:02:05 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 12 15:55:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb910bf
net-analyzer/wireshark: drop 3.6.8
Bug: https://bugs.gentoo.org/878421
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 -
net-analyzer/wireshark/wireshark-3.6.8.ebuild | 269 --
2 files changed, 270 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2178058af5a9..e4e55cdd56df 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
-DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B
8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db
SHA512
c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
SHA512
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
DIST wireshark-4.0.1.tar.xz 41282116 BLAKE2B
63984c5722fe0cbcf2a756efdd0cf44304e3ce25eb1aea87758a28576ba3416b0a8226079a413084e46724fcd4ed9b0f4cbf82cbabbf48f2febe0fbc8446a054
SHA512
10ac8e738b4bd70ba4a1a9124e8c8e6238feb7c5a4cef79a03dae6adef08230700bb8ba700d2f89a5aad28cabdaf06b8825a1124d9d466de4e2e10cc55968525
diff --git a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
deleted file mode 100644
index 4116451fbbfc..
--- a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-
-if [[ ${PV} == ** ]] ; then
- EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
- inherit git-r3
-else
-
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
- 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? (
- $(python_gen_any_dep '
- dev-python/pytest[${PYTHON_USEDEP}]
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 68393ba82d209eabd7ff47b1c38ce5018c48b379
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 10 18:38:57 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 10 18:38:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68393ba8
net-analyzer/wireshark: Stabilize 3.6.9 arm64, #885125
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
index b5f562deaee1..4116451fbbfc 100644
--- a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 0fdd7b89fbba566c429c6a593e629f4caf89125c
Author: Sam James gentoo org>
AuthorDate: Sat Dec 10 17:37:33 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 10 17:37:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fdd7b89
net-analyzer/wireshark: Stabilize 3.6.9 x86, #885125
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
index 493028a6d544..b5f562deaee1 100644
--- a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: d3e061b35a43cb635d97f9035bb9cfc81c4b28f9
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 10 08:49:48 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 10 08:49:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e061b3
net-analyzer/wireshark: Stabilize 3.6.9 amd64, #885125
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
index fffca9343012..28ec48a90ab7 100644
--- a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: e36f15c3c195d9b8416f4eea89d02d591c3057d2
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 10 08:49:49 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 10 08:49:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e36f15c3
net-analyzer/wireshark: Stabilize 3.6.9 ppc64, #885125
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
index 28ec48a90ab7..007cb2bf2884 100644
--- a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 5188c51734854eb17140fb1c7a905dbe14ee29b4
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 10 08:49:49 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 10 08:49:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5188c517
net-analyzer/wireshark: Stabilize 3.6.9 arm, #885125
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
index 007cb2bf2884..493028a6d544 100644
--- a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: b1e6f20a082751fe1c19386ae1daa4da164a4e83
Author: Sam James gentoo org>
AuthorDate: Fri Oct 28 19:29:00 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 28 19:50:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1e6f20a
net-analyzer/wireshark: drop 4.0.0-r2
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 -
net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild | 309 ---
2 files changed, 310 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 491f5c7aa8dd..2178058af5a9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,3 @@
DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B
8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db
SHA512
c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
SHA512
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
-DIST wireshark-4.0.0.tar.xz 41323336 BLAKE2B
a3e619dae784d28ed659acf6b2f4710e320806ebbf7c700370558ae81eb0cfdd68ec6cce4c8ae90f43c449e118b7993a78d02bbb1dc7a259a437d34ef6299d60
SHA512
d16b67bacca479af419f47e000800bbc33098a00cdb56c789e6c0f354fbd4f13c3d25c496239a8836c4e5754af2e36d4baf5e8ae55eae71f80c93630b78128bc
DIST wireshark-4.0.1.tar.xz 41282116 BLAKE2B
63984c5722fe0cbcf2a756efdd0cf44304e3ce25eb1aea87758a28576ba3416b0a8226079a413084e46724fcd4ed9b0f4cbf82cbabbf48f2febe0fbc8446a054
SHA512
10ac8e738b4bd70ba4a1a9124e8c8e6238feb7c5a4cef79a03dae6adef08230700bb8ba700d2f89a5aad28cabdaf06b8825a1124d9d466de4e2e10cc55968525
diff --git a/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild
deleted file mode 100644
index 08b136066287..
--- a/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-
-if [[ ${PV} == ** ]] ; then
- EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
- inherit git-r3
-else
-
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
- S="${WORKDIR}/${P/_/}"
-
- if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ilbc kerberos libxml2 lto 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:= )
- 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?
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: ec649eefdc84f50a24c2c0b5184a05e2a496cb00 Author: Sam James gentoo org> AuthorDate: Thu Oct 27 05:09:48 2022 + Commit: Sam James gentoo org> CommitDate: Thu Oct 27 05:19:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec649eef net-analyzer/wireshark: add changelog metadata Signed-off-by: Sam James gentoo.org> net-analyzer/wireshark/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index bd841198d5ad..ec41cfa2b014 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -69,6 +69,7 @@ Install wifidump, to dump and analyse 802.11 traffic + https://www.wireshark.org/news/ wireshark/wireshark wireshark/wireshark
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 75d7a4df1f394cccaab1efdfeda3bb57f527fb00
Author: Sam James gentoo org>
AuthorDate: Thu Oct 27 05:25:20 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Oct 27 05:25:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d7a4df
net-analyzer/wireshark: add 4.0.1
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
net-analyzer/wireshark/wireshark-4.0.1.ebuild | 309 ++
2 files changed, 310 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f72f3c6952b9..491f5c7aa8dd 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B
8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db
SHA512
c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
SHA512
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
DIST wireshark-4.0.0.tar.xz 41323336 BLAKE2B
a3e619dae784d28ed659acf6b2f4710e320806ebbf7c700370558ae81eb0cfdd68ec6cce4c8ae90f43c449e118b7993a78d02bbb1dc7a259a437d34ef6299d60
SHA512
d16b67bacca479af419f47e000800bbc33098a00cdb56c789e6c0f354fbd4f13c3d25c496239a8836c4e5754af2e36d4baf5e8ae55eae71f80c93630b78128bc
+DIST wireshark-4.0.1.tar.xz 41282116 BLAKE2B
63984c5722fe0cbcf2a756efdd0cf44304e3ce25eb1aea87758a28576ba3416b0a8226079a413084e46724fcd4ed9b0f4cbf82cbabbf48f2febe0fbc8446a054
SHA512
10ac8e738b4bd70ba4a1a9124e8c8e6238feb7c5a4cef79a03dae6adef08230700bb8ba700d2f89a5aad28cabdaf06b8825a1124d9d466de4e2e10cc55968525
diff --git a/net-analyzer/wireshark/wireshark-4.0.1.ebuild
b/net-analyzer/wireshark/wireshark-4.0.1.ebuild
new file mode 100644
index ..08b136066287
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.1.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+ inherit git-r3
+else
+
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+ S="${WORKDIR}/${P/_/}"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ilbc kerberos libxml2 lto 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:= )
+ 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 )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: b7aa3dba653168eac02da600ae3ade63da4f7b77
Author: Sam James gentoo org>
AuthorDate: Thu Oct 27 05:17:50 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Oct 27 05:19:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7aa3dba
net-analyzer/wireshark: add 3.6.9
Bug: https://bugs.gentoo.org/878421
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
net-analyzer/wireshark/wireshark-3.6.9.ebuild | 269 ++
2 files changed, 270 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1907695ba429..f72f3c6952b9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B
8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db
SHA512
c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
+DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
SHA512
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
DIST wireshark-4.0.0.tar.xz 41323336 BLAKE2B
a3e619dae784d28ed659acf6b2f4710e320806ebbf7c700370558ae81eb0cfdd68ec6cce4c8ae90f43c449e118b7993a78d02bbb1dc7a259a437d34ef6299d60
SHA512
d16b67bacca479af419f47e000800bbc33098a00cdb56c789e6c0f354fbd4f13c3d25c496239a8836c4e5754af2e36d4baf5e8ae55eae71f80c93630b78128bc
diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
new file mode 100644
index ..fffca9343012
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+ inherit git-r3
+else
+
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+ 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? (
+ $(python_gen_any_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/
commit: 91636e316a2b8c9af9107d04f716f1cd9cc7a066
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Oct 15 08:00:36 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Oct 15 19:33:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91636e31
net-analyzer/wireshark: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27788
Signed-off-by: Conrad Kostecki gentoo.org>
.../wireshark/files/wireshark--ui-needs-wiretap.patch | 11 ---
1 file changed, 11 deletions(-)
diff --git a/net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch
b/net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch
deleted file mode 100644
index c0bfc3acd5a6..
--- a/net-analyzer/wireshark/files/wireshark--ui-needs-wiretap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
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"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 6d4d9292ab25548e9dbd30beedf3dbda38b19d67
Author: Sam James gentoo org>
AuthorDate: Mon Oct 10 16:30:07 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 10 16:30:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4d9292
net-analyzer/wireshark: shuffle deps again
qtdeclarative should be pure DEPEND here, not RDEPEND.
Closes: https://bugs.gentoo.org/876265
Signed-off-by: Sam James gentoo.org>
...reshark-4.0.0-r1.ebuild => wireshark-4.0.0-r2.ebuild} | 16 +---
net-analyzer/wireshark/wireshark-.ebuild | 16 +---
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild
similarity index 99%
rename from net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
rename to net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild
index f402d1fc68c0..08b136066287 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild
@@ -87,7 +87,14 @@ RDEPEND="
zlib? ( sys-libs/zlib )
zstd? ( app-arch/zstd:= )
"
-DEPEND="${RDEPEND}"
+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="
@@ -117,12 +124,7 @@ BDEPEND="
"
RDEPEND="
${RDEPEND}
- gui? (
- virtual/freedesktop-icon-theme
- !qt6? (
- dev-qt/qtdeclarative:5
- )
- )
+ gui? ( virtual/freedesktop-icon-theme )
selinux? ( sec-policy/selinux-wireshark )
"
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index f402d1fc68c0..08b136066287 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -87,7 +87,14 @@ RDEPEND="
zlib? ( sys-libs/zlib )
zstd? ( app-arch/zstd:= )
"
-DEPEND="${RDEPEND}"
+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="
@@ -117,12 +124,7 @@ BDEPEND="
"
RDEPEND="
${RDEPEND}
- gui? (
- virtual/freedesktop-icon-theme
- !qt6? (
- dev-qt/qtdeclarative:5
- )
- )
+ gui? ( virtual/freedesktop-icon-theme )
selinux? ( sec-policy/selinux-wireshark )
"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 9774304300267d61722e6f74a32ff3824d4f7c57
Author: Sam James gentoo org>
AuthorDate: Mon Oct 10 16:11:48 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 10 16:18:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97743043
net-analyzer/wireshark: add missing Qt deps
Closes: https://bugs.gentoo.org/876265
Signed-off-by: Sam James gentoo.org>
.../{wireshark-4.0.0.ebuild => wireshark-4.0.0-r1.ebuild} | 10 --
net-analyzer/wireshark/wireshark-.ebuild | 8 +++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-4.0.0.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
similarity index 98%
rename from net-analyzer/wireshark/wireshark-4.0.0.ebuild
rename to net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
index 34d454166c63..96b63b7190c2 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
media-libs/speexdsp
bcg729? ( media-libs/bcg729 )
brotli? ( app-arch/brotli:= )
- ciscodump? ( >=net-libs/libssh-0.6 )
+ ciscodump? ( >=net-libs/libssh-0.6:= )
filecaps? ( sys-libs/libcap )
http2? ( >=net-libs/nghttp2-1.11.0:= )
ilbc? ( media-libs/libilbc:= )
@@ -70,6 +70,7 @@ RDEPEND="
)
!qt6? (
dev-qt/qtcore:5
+ dev-qt/qtconcurrent:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
@@ -116,7 +117,12 @@ BDEPEND="
"
RDEPEND="
${RDEPEND}
- gui? ( virtual/freedesktop-icon-theme )
+ gui? (
+ virtual/freedesktop-icon-theme
+ !qt6? (
+ dev-qt/qtdeclarative:5
+ )
+ )
selinux? ( sec-policy/selinux-wireshark )
"
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 34d454166c63..bf6499163094 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
)
!qt6? (
dev-qt/qtcore:5
+ dev-qt/qtconcurrent:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
@@ -116,7 +117,12 @@ BDEPEND="
"
RDEPEND="
${RDEPEND}
- gui? ( virtual/freedesktop-icon-theme )
+ gui? (
+ virtual/freedesktop-icon-theme
+ !qt6? (
+ dev-qt/qtdeclarative:5
+ )
+ )
selinux? ( sec-policy/selinux-wireshark )
"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 1cddeb3f7e1449529d4f979304ab9e20b979403b
Author: Sam James gentoo org>
AuthorDate: Mon Oct 10 16:18:37 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 10 16:18:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cddeb3f
net-analyzer/wireshark: fix automagic libssh dep for wifidump
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/metadata.xml | 1 +
net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild | 5 +++--
net-analyzer/wireshark/wireshark-.ebuild | 7 ---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/net-analyzer/wireshark/metadata.xml
b/net-analyzer/wireshark/metadata.xml
index ceb09bd64731..bd841198d5ad 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -66,6 +66,7 @@
Install tfshark, a terminal-based version
of the FileShark capability
Install tshark, to dump and analyzer
network traffic from the command line
Install udpdump, to get packets exported
from a source (like a network device or a GSMTAP producer) that are dumped to a
pcap file
+ Install wifidump, to dump and analyse 802.11
traffic
wireshark/wireshark
diff --git a/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
index 96b63b7190c2..f402d1fc68c0 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild
@@ -29,7 +29,7 @@ IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump
+dftest doc dpauxmo
IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto 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 zlib +zstd"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
@@ -37,7 +37,6 @@ REQUIRED_USE="
RESTRICT="!test? ( test )"
-# TODO: wifidump/libssh automagic?
# bug #753062 for speexdsp
RDEPEND="
acct-group/pcap
@@ -84,6 +83,7 @@ RDEPEND="
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:= )
"
@@ -219,6 +219,7 @@ src_configure() {
-DENABLE_SMI=$(usex smi)
-DENABLE_SNAPPY=$(usex snappy)
-DENABLE_SPANDSP=$(usex spandsp)
+ -DBUILD_wifidump=$(usex wifi)
-DENABLE_ZLIB=$(usex zlib)
-DENABLE_ZSTD=$(usex zstd)
)
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index bf6499163094..f402d1fc68c0 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -29,7 +29,7 @@ IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump
+dftest doc dpauxmo
IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto 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 zlib +zstd"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
@@ -37,7 +37,6 @@ REQUIRED_USE="
RESTRICT="!test? ( test )"
-# TODO: wifidump/libssh automagic?
# bug #753062 for speexdsp
RDEPEND="
acct-group/pcap
@@ -48,7 +47,7 @@ RDEPEND="
media-libs/speexdsp
bcg729? ( media-libs/bcg729 )
brotli? ( app-arch/brotli:= )
- ciscodump? ( >=net-libs/libssh-0.6 )
+ ciscodump? ( >=net-libs/libssh-0.6:= )
filecaps? ( sys-libs/libcap )
http2? ( >=net-libs/nghttp2-1.11.0:= )
ilbc? ( media-libs/libilbc:= )
@@ -84,6 +83,7 @@ RDEPEND="
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:= )
"
@@ -219,6 +219,7 @@ src_configure() {
-DENABLE_SMI=$(usex smi)
-DENABLE_SNAPPY=$(usex snappy)
-DENABLE_SPANDSP=$(usex spandsp)
+ -DBUILD_wifidump=$(usex wifi)
-DENABLE_ZLIB=$(usex zlib)
-DENABLE_ZSTD=$(usex zstd)
)
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 8efc0e6128d196453d205efc85925349919535b6
Author: Sam James gentoo org>
AuthorDate: Mon Oct 10 16:09:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 10 16:18:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efc0e61
net-analyzer/wireshark: Drop USE=plugin-ifdemo (which needs Qt 6)
No real point and we have too many USE flags for Wireshark anyway.
Closes: https://bugs.gentoo.org/835962
Closes: https://bugs.gentoo.org/876304
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-4.0.0.ebuild | 9 +
net-analyzer/wireshark/wireshark-.ebuild | 9 +
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-4.0.0.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0.ebuild
index 04f139078c66..34d454166c63 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0.ebuild
@@ -27,12 +27,13 @@ LICENSE="GPL-2"
SLOT="0/${PV}"
IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
dpauxmon"
IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4
maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap qt6
+randpkt"
+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 zlib +zstd"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )"
+REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
+"
RESTRICT="!test? ( test )"
@@ -207,7 +208,7 @@ src_configure() {
-DENABLE_OPUS=$(usex opus)
-DENABLE_PCAP=$(usex pcap)
-DENABLE_PLUGINS=$(usex plugins)
- -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+ -DENABLE_PLUGIN_IFDEMO=OFF
-DENABLE_SBC=$(usex sbc)
-DENABLE_SMI=$(usex smi)
-DENABLE_SNAPPY=$(usex snappy)
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 04f139078c66..34d454166c63 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -27,12 +27,13 @@ LICENSE="GPL-2"
SLOT="0/${PV}"
IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
dpauxmon"
IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4
maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap qt6
+randpkt"
+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 zlib +zstd"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )"
+REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
+"
RESTRICT="!test? ( test )"
@@ -207,7 +208,7 @@ src_configure() {
-DENABLE_OPUS=$(usex opus)
-DENABLE_PCAP=$(usex pcap)
-DENABLE_PLUGINS=$(usex plugins)
- -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+ -DENABLE_PLUGIN_IFDEMO=OFF
-DENABLE_SBC=$(usex sbc)
-DENABLE_SMI=$(usex smi)
-DENABLE_SNAPPY=$(usex snappy)
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 97d0d735c5cd87bd92649af92ac9813441500ad6
Author: Sam James gentoo org>
AuthorDate: Sat Oct 8 20:46:55 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 8 20:46:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d0d735
net-analyzer/wireshark: drop 3.4.11
Bug: https://bugs.gentoo.org/869140
Bug: https://bugs.gentoo.org/833294
Bug: https://bugs.gentoo.org/802216
Bug: https://bugs.gentoo.org/830343
Bug: https://bugs.gentoo.org/824474
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest| 1 -
net-analyzer/wireshark/wireshark-3.4.11.ebuild | 285 -
2 files changed, 286 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f47b5a53549c..1907695ba429 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
-DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B
3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd
SHA512
cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B
8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db
SHA512
c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
DIST wireshark-4.0.0.tar.xz 41323336 BLAKE2B
a3e619dae784d28ed659acf6b2f4710e320806ebbf7c700370558ae81eb0cfdd68ec6cce4c8ae90f43c449e118b7993a78d02bbb1dc7a259a437d34ef6299d60
SHA512
d16b67bacca479af419f47e000800bbc33098a00cdb56c789e6c0f354fbd4f13c3d25c496239a8836c4e5754af2e36d4baf5e8ae55eae71f80c93630b78128bc
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..
--- 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} == ** ]] ; 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? (
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: f7d43999c2ea431af359797e7cd2a221bfa4cdc7
Author: Sam James gentoo org>
AuthorDate: Sat Oct 8 20:43:30 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 8 20:43:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d43999
net-analyzer/wireshark: Stabilize 3.6.8 ppc64, #873049
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
index 373d120f39a6..4116451fbbfc 100644
--- a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: e3d3daeddc9c5690c9482b49626e8b4bdf20bcfa
Author: Sam James gentoo org>
AuthorDate: Sat Oct 8 20:43:54 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 8 20:43:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d3daed
net-analyzer/wireshark: drop 3.6.3, 3.6.6
Bug: https://bugs.gentoo.org/833294
Bug: https://bugs.gentoo.org/869140
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 2 -
net-analyzer/wireshark/wireshark-3.6.3.ebuild | 265 -
net-analyzer/wireshark/wireshark-3.6.6.ebuild | 269 --
3 files changed, 536 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c1f87360fc7f..f47b5a53549c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,3 @@
DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B
3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd
SHA512
cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
-DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B
3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd
SHA512
4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
-DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B
cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1
SHA512
c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B
8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db
SHA512
c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
DIST wireshark-4.0.0.tar.xz 41323336 BLAKE2B
a3e619dae784d28ed659acf6b2f4710e320806ebbf7c700370558ae81eb0cfdd68ec6cce4c8ae90f43c449e118b7993a78d02bbb1dc7a259a437d34ef6299d60
SHA512
d16b67bacca479af419f47e000800bbc33098a00cdb56c789e6c0f354fbd4f13c3d25c496239a8836c4e5754af2e36d4baf5e8ae55eae71f80c93630b78128bc
diff --git a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
deleted file mode 100644
index 4d449ccaf2ea..
--- a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/;
-
-if [[ ${PV} == ** ]] ; then
- EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
- inherit git-r3
-else
-
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
- 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? (
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 5c2d309a94e6ace706f37b5373973e16b98946ef
Author: Sam James gentoo org>
AuthorDate: Sat Oct 8 20:43:27 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 8 20:43:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2d309a
net-analyzer/wireshark: Stabilize 3.6.6 ppc64, #856028
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
index 373d120f39a6..4116451fbbfc 100644
--- a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: dff02e765ac5419416f8e97ce6a26c76a189e2ee
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Sep 27 16:01:25 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Sep 27 16:01:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff02e76
net-analyzer/wireshark: Stabilize 3.6.8 arm64, #873049
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
index 38bd8ecc25ad..373d120f39a6 100644
--- a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 2e5badb17a71735b1f3b3b88199c2641438703f1
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Sep 26 15:28:44 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Sep 26 15:28:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5badb1
net-analyzer/wireshark: Stabilize 3.6.8 arm, #873049
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
index 62acf1376b81..38bd8ecc25ad 100644
--- a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: e47353c877e13878e23a82f6837dc0526a93da67
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Sep 26 15:05:48 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Sep 26 15:05:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47353c8
net-analyzer/wireshark: Stabilize 3.6.8 x86, #873049
Signed-off-by: Jakov Smolić gentoo.org>
net-analyzer/wireshark/wireshark-3.6.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
index 28ec48a90ab7..62acf1376b81 100644
--- a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 4c4a6f14d049e730059aa70ce1c422458e2b0c97
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Sep 26 15:05:23 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Sep 26 15:05:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c4a6f14
net-analyzer/wireshark: Stabilize 3.6.8 amd64, #873049
Signed-off-by: Jakov Smolić gentoo.org>
net-analyzer/wireshark/wireshark-3.6.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
index fffca9343012..28ec48a90ab7 100644
--- a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: f11609876eb0b199a27dcdd072b488ae28d1dbdc
Author: Sam James gentoo org>
AuthorDate: Fri Sep 23 01:29:03 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 23 01:35:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1160987
net-analyzer/wireshark: drop 3.6.2, 3.6.5, 3.6.7
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 3 -
net-analyzer/wireshark/wireshark-3.6.2.ebuild | 273 --
net-analyzer/wireshark/wireshark-3.6.5.ebuild | 269 -
net-analyzer/wireshark/wireshark-3.6.7.ebuild | 269 -
4 files changed, 814 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ac6e9b0afbc2..4bdd30fffb51 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,8 +1,5 @@
DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B
3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd
SHA512
cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
-DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B
585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156
SHA512
cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B
3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd
SHA512
4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
-DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B
4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0
SHA512
9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B
cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1
SHA512
c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
-DIST wireshark-3.6.7.tar.xz 39967312 BLAKE2B
0539130aec2c7d8fdfec536114144a0b761addb8006d146a5e08d0a58e95d5d6b0db67ef32ceae4143de9836f25a3497802706f0a0eb633f29e1f24a47819e4b
SHA512
caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac
DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B
8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db
SHA512
c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
DIST wireshark-4.0.0rc2.tar.xz 41318448 BLAKE2B
e4f3a9aca102a2f9fa519e429ad262f24df6a67fbd6debf9a9320ae0eb1e8753f65783ca19b5e4b224cf7af368af2a2cedc8065c7cc97216b4ced224fa9ffcaf
SHA512
524722f7093af3d9cbb1e355fdeafb653917eabfb1d8d7d7c480a35853b0a777c8f5043d367955d01b7ca16b3f90569dcbafc1025bbeeb57a29ff486066840b8
diff --git a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
deleted file mode 100644
index 760d4c694ac1..
--- a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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} == ** ]] ; 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
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 0f8a13ebe53b06a6eb7bff496ab344e9a24121e9 Author: Sam James gentoo org> AuthorDate: Fri Sep 16 01:47:00 2022 + Commit: Sam James gentoo org> CommitDate: Fri Sep 16 01:47:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8a13eb net-analyzer/wireshark: describe USE=qt6 Signed-off-by: Sam James gentoo.org> net-analyzer/wireshark/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index eb55f5b7f3ea..ceb09bd64731 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -52,6 +52,7 @@ Use net-libs/libpcap for network packet capturing (build dumpcap, rawshark) Install plugin interface demo Install plugins + Build with Qt6 support instead of the default Qt5 for GUI support Install randpkt, a utility for creating pcap trace files full of random packets Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt) Install reordercap, to reorder input file by timestamp into output file
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: a4d7174bdbf5c0652836aeb13c839e3a41382888
Author: Sam James gentoo org>
AuthorDate: Fri Sep 16 01:27:18 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 16 01:27:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d7174b
net-analyzer/wireshark: rename USE=qt5 -> USE=gui for >=4.0.0_rc2
Per QA policy at
https://projects.gentoo.org/qa/policy-guide/use-flags.html#pg0802.
Also makes it easier to then introduce optional, non-preferred-for-now
Qt 6 support later.
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild | 24 +++
net-analyzer/wireshark/wireshark-.ebuild | 24 +++
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
index 0bdf2a0c919a..cffd36841184 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
@@ -26,8 +26,8 @@ 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+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4
maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +randpkt"
IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp
sshdump ssl"
IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
@@ -59,7 +59,7 @@ RDEPEND="acct-group/pcap
netlink? ( dev-libs/libnl:3 )
opus? ( media-libs/opus )
pcap? ( net-libs/libpcap )
- qt5? (
+ gui? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
@@ -88,7 +88,7 @@ BDEPEND="${PYTHON_DEPS}
app-doc/doxygen
dev-ruby/asciidoctor
)
- qt5? (
+ gui? (
dev-qt/linguist-tools:5
)
test? (
@@ -98,7 +98,7 @@ BDEPEND="${PYTHON_DEPS}
')
)"
RDEPEND="${RDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
+ gui? ( virtual/freedesktop-icon-theme )
selinux? ( sec-policy/selinux-wireshark )"
PATCHES=(
@@ -135,7 +135,7 @@ src_configure() {
esac
fi
- if use qt5 ; then
+ if use gui ; then
#export QT_MIN_VERSION=5.3.0
append-cxxflags -fPIC -DPIC
fi
@@ -145,10 +145,10 @@ src_configure() {
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 '')
+ $(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)
@@ -169,7 +169,7 @@ src_configure() {
-DBUILD_tfshark=$(usex tfshark)
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
+ -DBUILD_wireshark=$(usex gui)
-DENABLE_WERROR=OFF
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_BROTLI=$(usex brotli)
@@ -237,7 +237,7 @@ src_install() {
doins ${dir}/*.h
done
- if use qt5 ; then
+ if use gui ; then
local s
for s in 16 32 48 64 128 256 512 1024 ; do
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 0bdf2a0c919a..cffd36841184 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -26,8 +26,8 @@ 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+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4
maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +randpkt"
IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp
sshdump ssl"
IUSE+=" sdjournal test +text2pcap tfshark +tshark
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 9690c43f7d2a2cf3e5145a3f3a8e9f1042fcdd0a
Author: Sam James gentoo org>
AuthorDate: Fri Sep 16 01:45:30 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 16 01:45:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9690c43f
net-analyzer/wireshark: add preliminary Qt 6 support for >=4.0.0_rc2
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild | 60 +++
net-analyzer/wireshark/wireshark-.ebuild | 60 +++
2 files changed, 80 insertions(+), 40 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
index cffd36841184..9110abbac9e4 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
@@ -27,7 +27,7 @@ LICENSE="GPL-2"
SLOT="0/${PV}"
IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
dpauxmon"
IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4
maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +randpkt"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap qt6
+randpkt"
IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp
sshdump ssl"
IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
@@ -38,7 +38,8 @@ RESTRICT="!test? ( test )"
# TODO: wifidump/libssh automagic?
# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
+RDEPEND="
+ acct-group/pcap
>=dev-libs/glib-2.50.0:2
dev-libs/libpcre2
>=net-dns/c-ares-1.14.0:=
@@ -49,7 +50,7 @@ RDEPEND="acct-group/pcap
ciscodump? ( >=net-libs/libssh-0.6 )
filecaps? ( sys-libs/libcap )
http2? ( >=net-libs/nghttp2-1.11.0:= )
- ilbc? ( media-libs/libilbc )
+ ilbc? ( media-libs/libilbc:= )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
lua? ( ${LUA_DEPS} )
@@ -60,26 +61,35 @@ RDEPEND="acct-group/pcap
opus? ( media-libs/opus )
pcap? ( net-libs/libpcap )
gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
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/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ )
)
sbc? ( media-libs/sbc )
- sdjournal? ( sys-apps/systemd )
+ sdjournal? ( sys-apps/systemd:= )
smi? ( net-libs/libsmi )
snappy? ( app-arch/snappy )
- spandsp? ( media-libs/spandsp )
- sshdump? ( >=net-libs/libssh-0.6 )
+ spandsp? ( media-libs/spandsp:= )
+ sshdump? ( >=net-libs/libssh-0.6:= )
ssl? ( >=net-libs/gnutls-3.5.8:= )
zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd:= )"
+ zstd? ( app-arch/zstd:= )
+"
DEPEND="${RDEPEND}"
# 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}
+BDEPEND="
+ ${PYTHON_DEPS}
dev-lang/perl
sys-devel/flex
sys-devel/gettext
@@ -89,17 +99,25 @@ BDEPEND="${PYTHON_DEPS}
dev-ruby/asciidoctor
)
gui? (
- dev-qt/linguist-tools:5
+ 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}
+ )
+"
+RDEPEND="
+ ${RDEPEND}
gui? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )"
+ selinux? ( sec-policy/selinux-wireshark )
+"
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -122,6 +140,8 @@ pkg_setup() {
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
@@ -136,12 +156,9 @@ src_configure() {
fi
if use gui ; then
- #export QT_MIN_VERSION=5.3.0
append-cxxflags -fPIC -DPIC
fi
- python_setup
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 90d9bc10330aec4b049a78635278f32e992b8b07
Author: Sam James gentoo org>
AuthorDate: Fri Sep 16 01:22:43 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 16 01:22:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d9bc10
net-analyzer/wireshark: add 4.0.0_rc2, drop 4.0.0_rc1
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 2 +-
.../{wireshark-4.0.0_rc1.ebuild => wireshark-4.0.0_rc2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 8914f018742a..ac6e9b0afbc2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,4 +5,4 @@ DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B
4df1abce2563f20e91fac169ef1ab65851a
DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B
cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1
SHA512
c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
DIST wireshark-3.6.7.tar.xz 39967312 BLAKE2B
0539130aec2c7d8fdfec536114144a0b761addb8006d146a5e08d0a58e95d5d6b0db67ef32ceae4143de9836f25a3497802706f0a0eb633f29e1f24a47819e4b
SHA512
caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac
DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B
8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db
SHA512
c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
-DIST wireshark-4.0.0rc1.tar.xz 41291340 BLAKE2B
96dc9616702c67f47517cf5fc575bf555d5f7e83cc90284301e3ef26476ca6292f8aba3c7230c3ca7e6404a9b953861247a448826b339fa586d5a8206c787989
SHA512
16d4f3d39198bb208d4ad58059c38a40f21352186abf2cafb4140674d048e5bd29e5dbc079ed50f28f1dde150733bba6a26c6fc7d10e524e4556bd20c6ae2856
+DIST wireshark-4.0.0rc2.tar.xz 41318448 BLAKE2B
e4f3a9aca102a2f9fa519e429ad262f24df6a67fbd6debf9a9320ae0eb1e8753f65783ca19b5e4b224cf7af368af2a2cedc8065c7cc97216b4ced224fa9ffcaf
SHA512
524722f7093af3d9cbb1e355fdeafb653917eabfb1d8d7d7c480a35853b0a777c8f5043d367955d01b7ca16b3f90569dcbafc1025bbeeb57a29ff486066840b8
diff --git a/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
similarity index 100%
rename from net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
rename to net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 6ac0fae51f8558ef4d01861ae4b396039e1e9fcd
Author: Sam James gentoo org>
AuthorDate: Thu Sep 8 04:31:06 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 8 04:31:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ac0fae5
net-analyzer/wireshark: add 3.6.8
Bug: https://bugs.gentoo.org/869140
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
net-analyzer/wireshark/wireshark-3.6.8.ebuild | 269 ++
2 files changed, 270 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c9f0a82a4ac0..8914f018742a 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,4 +4,5 @@ DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B
3b636867d946f0cf748eb719874e815c919
DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B
4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0
SHA512
9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B
cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1
SHA512
c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
DIST wireshark-3.6.7.tar.xz 39967312 BLAKE2B
0539130aec2c7d8fdfec536114144a0b761addb8006d146a5e08d0a58e95d5d6b0db67ef32ceae4143de9836f25a3497802706f0a0eb633f29e1f24a47819e4b
SHA512
caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac
+DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B
8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db
SHA512
c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
DIST wireshark-4.0.0rc1.tar.xz 41291340 BLAKE2B
96dc9616702c67f47517cf5fc575bf555d5f7e83cc90284301e3ef26476ca6292f8aba3c7230c3ca7e6404a9b953861247a448826b339fa586d5a8206c787989
SHA512
16d4f3d39198bb208d4ad58059c38a40f21352186abf2cafb4140674d048e5bd29e5dbc079ed50f28f1dde150733bba6a26c6fc7d10e524e4556bd20c6ae2856
diff --git a/net-analyzer/wireshark/wireshark-3.6.8.ebuild
b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
new file mode 100644
index ..fffca9343012
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.8.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+ inherit git-r3
+else
+
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+ 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? (
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: bf006a3ff0c3c58adf4ab9697c9e73b66152c64e
Author: Sam James gentoo org>
AuthorDate: Thu Aug 18 03:33:19 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Aug 18 03:33:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf006a3f
net-analyzer/wireshark: add 4.0.0_rc1 (unkeyworded)
Still need to polish off the wifidump/libssh bit (need to
decide really what to do about the huge number of USE flags here)
but may as well commit what got so far given it works fine.
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest| 1 +
...hark-.ebuild => wireshark-4.0.0_rc1.ebuild} | 22 ++
net-analyzer/wireshark/wireshark-.ebuild | 22 ++
3 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 816d4f92d449..c9f0a82a4ac0 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,3 +4,4 @@ DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B
3b636867d946f0cf748eb719874e815c919
DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B
4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0
SHA512
9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B
cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1
SHA512
c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
DIST wireshark-3.6.7.tar.xz 39967312 BLAKE2B
0539130aec2c7d8fdfec536114144a0b761addb8006d146a5e08d0a58e95d5d6b0db67ef32ceae4143de9836f25a3497802706f0a0eb633f29e1f24a47819e4b
SHA512
caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac
+DIST wireshark-4.0.0rc1.tar.xz 41291340 BLAKE2B
96dc9616702c67f47517cf5fc575bf555d5f7e83cc90284301e3ef26476ca6292f8aba3c7230c3ca7e6404a9b953861247a448826b339fa586d5a8206c787989
SHA512
16d4f3d39198bb208d4ad58059c38a40f21352186abf2cafb4140674d048e5bd29e5dbc079ed50f28f1dde150733bba6a26c6fc7d10e524e4556bd20c6ae2856
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
similarity index 92%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
index 68dc99e8c15c..0bdf2a0c919a 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
@@ -18,7 +18,9 @@ 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"
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv
~x86"
+ fi
fi
LICENSE="GPL-2"
@@ -34,17 +36,19 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
RESTRICT="!test? ( test )"
+# TODO: wifidump/libssh automagic?
# bug #753062 for speexdsp
RDEPEND="acct-group/pcap
- >=dev-libs/glib-2.38:2
- >=net-dns/c-ares-1.5:=
- dev-libs/libgcrypt:=
+ >=dev-libs/glib-2.50.0:2
+ dev-libs/libpcre2
+ >=net-dns/c-ares-1.14.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:= )
+ http2? ( >=net-libs/nghttp2-1.11.0:= )
ilbc? ( media-libs/libilbc )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
@@ -69,10 +73,12 @@ RDEPEND="acct-group/pcap
snappy? ( app-arch/snappy )
spandsp? ( media-libs/spandsp )
sshdump? ( >=net-libs/libssh-0.6 )
- ssl? ( net-libs/gnutls:= )
+ ssl? ( >=net-libs/gnutls-3.5.8:= )
zlib? ( sys-libs/zlib )
zstd? ( app-arch/zstd:= )"
DEPEND="${RDEPEND}"
+# 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
sys-devel/flex
@@ -130,7 +136,7 @@ src_configure() {
fi
if use qt5 ; then
- export QT_MIN_VERSION=5.3.0
+ #export QT_MIN_VERSION=5.3.0
append-cxxflags -fPIC -DPIC
fi
@@ -164,7 +170,7 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
- -DDISABLE_WERROR=ON
+ -DENABLE_WERROR=OFF
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 2c9759df47e7585d8c141f182caae2f4af45c2a2 Author: Sam James gentoo org> AuthorDate: Thu Jul 28 03:28:10 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jul 28 05:34:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c9759df net-analyzer/wireshark: add remote-ids, shuffle maintainers It's easier to be assigned bugs given I'm the main one looking at this atm. Signed-off-by: Sam James gentoo.org> net-analyzer/wireshark/metadata.xml | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index e18c5673c9ef..e83c5a1a2c03 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -1,6 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd;> + + s...@gentoo.org + Sam James + zlog...@gentoo.org Mikle Kolyada @@ -9,10 +13,6 @@ b...@gentoo.org Aaron Bauman - - s...@gentoo.org - Sam James - Wireshark is the world's foremost network protocol analyzer, and is the de facto (and often de jure) standard across many industries and educational @@ -70,4 +70,8 @@ Install tshark, to dump and analyzer network traffic from the command line Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file + + wireshark/wireshark + wireshark/wireshark +
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 724c385ac3c5a9332e1be789fb440126eb1cd545
Author: Sam James gentoo org>
AuthorDate: Thu Jul 28 05:34:52 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jul 28 05:34:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724c385a
net-analyzer/wireshark: add 3.6.7
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
net-analyzer/wireshark/wireshark-3.6.7.ebuild | 269 ++
2 files changed, 270 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 85502d80dcab..816d4f92d449 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,3 +3,4 @@ DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B
585cf925892ec9d5b6413ccc53c49035eba
DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B
3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd
SHA512
4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B
4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0
SHA512
9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B
cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1
SHA512
c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
+DIST wireshark-3.6.7.tar.xz 39967312 BLAKE2B
0539130aec2c7d8fdfec536114144a0b761addb8006d146a5e08d0a58e95d5d6b0db67ef32ceae4143de9836f25a3497802706f0a0eb633f29e1f24a47819e4b
SHA512
caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac
diff --git a/net-analyzer/wireshark/wireshark-3.6.7.ebuild
b/net-analyzer/wireshark/wireshark-3.6.7.ebuild
new file mode 100644
index ..fffca9343012
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.7.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+ inherit git-r3
+else
+
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+ 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 9dbafb5358afea52f0abca8c2536b1643f3cec82
Author: Sam James gentoo org>
AuthorDate: Sun Jul 10 23:51:47 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jul 10 23:51:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dbafb53
net-analyzer/wireshark: Stabilize 3.6.6 arm64, #856028
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
index 38bd8ecc25ad..373d120f39a6 100644
--- a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: f800b587f1bd2b63ae074aea92e468f80bdf0582
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Jul 3 12:23:01 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Jul 3 12:23:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f800b587
net-analyzer/wireshark: Stabilize 3.6.6 arm, #856028
Signed-off-by: Jakov Smolić gentoo.org>
net-analyzer/wireshark/wireshark-3.6.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
index 62acf1376b81..38bd8ecc25ad 100644
--- a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: ffc92add78d4f01881420eb1d29f37f19d7fdc31
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Jul 3 10:51:16 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Jul 3 10:51:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc92add
net-analyzer/wireshark: x86 stable wrt bug #856028
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-analyzer/wireshark/wireshark-3.6.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
index 28ec48a90ab7..62acf1376b81 100644
--- a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 1fd9fbd15662b5da65ea1c8ece4a1e56c5ee1fa8
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Jul 3 08:58:45 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Jul 3 08:58:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd9fbd1
net-analyzer/wireshark: amd64 stable wrt bug #856028
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-analyzer/wireshark/wireshark-3.6.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
index fffca9343012..28ec48a90ab7 100644
--- a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: d83ef14669d8a0d1400f38639a10b3b6b28b25ef
Author: matoro users noreply github com>
AuthorDate: Mon Jun 27 23:35:27 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 28 09:38:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83ef146
net-analyzer/wireshark: Stabilize 3.6.3 ppc64, #841533
Signed-off-by: matoro users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/26101
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
index 7ac210542945..4d449ccaf2ea 100644
--- a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: af2fed23e13da5b2f6db1c8dc2dcee9cfc089c65
Author: Sam James gentoo org>
AuthorDate: Thu Jun 16 17:14:27 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 16 17:14:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2fed23
net-analyzer/wireshark: add 3.6.6
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
net-analyzer/wireshark/wireshark-3.6.6.ebuild | 269 ++
2 files changed, 270 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bd4a9d691d3e..85502d80dcab 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,3 +2,4 @@ DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B
3e08d01f2d89f5ddd74c4e2215e6852f30
DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B
585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156
SHA512
cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B
3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd
SHA512
4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B
4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0
SHA512
9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
+DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B
cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1
SHA512
c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
diff --git a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
new file mode 100644
index ..fffca9343012
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+ inherit git-r3
+else
+
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+ 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 83298719593bc8a55b806e1c1e797f175a64744e
Author: Sam James gentoo org>
AuthorDate: Tue May 31 06:50:23 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue May 31 06:54:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83298719
net-analyzer/wireshark: add 3.6.5
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest| 1 +
...ireshark-.ebuild => wireshark-3.6.5.ebuild} | 41 --
net-analyzer/wireshark/wireshark-.ebuild | 34 ++
3 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index dc8c2a47fbc4..bd4a9d691d3e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B
3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd
SHA512
cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B
585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156
SHA512
cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B
3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd
SHA512
4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
+DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B
4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0
SHA512
9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-3.6.5.ebuild
similarity index 90%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-3.6.5.ebuild
index 3c9c26865ea3..fffca9343012 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.5.ebuild
@@ -86,8 +86,10 @@ BDEPEND="${PYTHON_DEPS}
dev-qt/linguist-tools:5
)
test? (
- dev-python/pytest
- dev-python/pytest-xdist
+ $(python_gen_any_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ ')
)"
RDEPEND="${RDEPEND}
qt5? ( virtual/freedesktop-icon-theme )
@@ -98,8 +100,17 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.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_configure() {
@@ -153,7 +164,7 @@ src_configure() {
-DBUILD_tshark=$(usex tshark)
-DBUILD_udpdump=$(usex udpdump)
-DBUILD_wireshark=$(usex qt5)
- -DDISABLE_WERROR=yes
+ -DDISABLE_WERROR=ON
-DENABLE_BCG729=$(usex bcg729)
-DENABLE_BROTLI=$(usex brotli)
-DENABLE_CAP=$(usex filecaps caps)
@@ -185,18 +196,11 @@ 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
+ # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
+ epytest \
+ --disable-capture \
+ --skip-missing-programs=all \
+ --program-path "${BUILD_DIR}"/run
}
src_install() {
@@ -207,7 +211,8 @@ src_install() {
# install headers
insinto /usr/include/wireshark
- doins "${BUILD_DIR}"/config.h
+ 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.
@@ -232,12 +237,12 @@ src_install() {
for s in 16 32 48 64 128 256 512 1024 ; do
insinto /usr/share/icons/hicolor/${s}x${s}/apps
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 45a3ce89a00bc5c67be304e0bafdd30440158a43
Author: Jakov Smolić gentoo org>
AuthorDate: Thu May 5 09:50:27 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu May 5 09:50:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a3ce89
net-analyzer/wireshark: Stabilize 3.6.3 arm64, #841533
Signed-off-by: Jakov Smolić gentoo.org>
net-analyzer/wireshark/wireshark-3.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
index 87826eae3a76..7ac210542945 100644
--- a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: f795db12999c00adbf0095a03f3949874ec19686
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue May 3 18:11:43 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue May 3 18:11:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f795db12
net-analyzer/wireshark: Stabilize 3.6.3 arm, #841533
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
index de4ac40f..87826eae3a76 100644
--- a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 05996d193d2e72239716280afdc3494feceff077
Author: Jakov Smolić gentoo org>
AuthorDate: Fri Apr 29 08:29:05 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Fri Apr 29 08:29:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05996d19
net-analyzer/wireshark: Stabilize 3.6.3 x86, #841533
Signed-off-by: Jakov Smolić gentoo.org>
net-analyzer/wireshark/wireshark-3.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
index b50c7b22053d..de4ac40f 100644
--- a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 38be64c9d01f645447689d686a9349ee85841370
Author: Jakov Smolić gentoo org>
AuthorDate: Fri Apr 29 08:27:57 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Fri Apr 29 08:27:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38be64c9
net-analyzer/wireshark: Stabilize 3.6.3 amd64, #841533
Signed-off-by: Jakov Smolić gentoo.org>
net-analyzer/wireshark/wireshark-3.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
index 76a4a4ef4420..b50c7b22053d 100644
--- a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
commit: 97f63d81a23a21f083ef25fc83ba988f696fbadf
Author: Sam James gentoo org>
AuthorDate: Sun Apr 17 16:39:53 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 17 16:39:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97f63d81
net-analyzer/wireshark: drop 3.6.1
Signed-off-by: Sam James 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..
--- 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
-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(_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", _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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: bbd323c44e6eb0de78cbed3106cf0adb7fdeaecd
Author: Sam James gentoo org>
AuthorDate: Sat Mar 26 21:37:20 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 26 21:37:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd323c4
net-analyzer/wireshark: fix paths in live ebuild
Closes: https://bugs.gentoo.org/835860
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.3.ebuild | 12 ++--
net-analyzer/wireshark/wireshark-.ebuild | 19 +--
2 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
index 7d40549271cb..76a4a4ef4420 100644
--- a/net-analyzer/wireshark/wireshark-3.6.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
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
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/;
@@ -248,9 +248,7 @@ src_install() {
}
pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
+ xdg_pkg_postinst
# Add group for users allowed to sniff.
chgrp pcap "${EROOT}"/usr/bin/dumpcap
@@ -265,9 +263,3 @@ pkg_postinst() {
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-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 7d40549271cb..3c9c26865ea3 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -6,7 +6,7 @@ EAPI=8
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
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/;
@@ -207,8 +207,7 @@ src_install() {
# install headers
insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h
+ 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.
@@ -233,12 +232,12 @@ src_install() {
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
+ 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 image/WiresharkDoc-${s}.png
application-vnd.tcpdump.pcap.png
+ newins resources/icons//WiresharkDoc-${s}.png
application-vnd.tcpdump.pcap.png
done
fi
@@ -248,9 +247,7 @@ src_install() {
}
pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
+ xdg_pkg_postinst
# Add group for users allowed to sniff.
chgrp pcap "${EROOT}"/usr/bin/dumpcap
@@ -265,9 +262,3 @@ pkg_postinst() {
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
-}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 3292ae0a322f47e8c57dfb8cec99d44a521b3249
Author: Sam James gentoo org>
AuthorDate: Sat Mar 26 21:09:03 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 26 21:21:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3292ae0a
net-analyzer/wireshark: add 3.6.3
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
net-analyzer/wireshark/wireshark-3.6.3.ebuild | 273 ++
2 files changed, 274 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3ec40d974355..d470056c7dad 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
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/wireshark-3.6.3.ebuild
b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
new file mode 100644
index ..7d40549271cb
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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} == ** ]] ; 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
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: d01351a55782f694574c4d67fa2ce8897eb57f9a
Author: Sam James gentoo org>
AuthorDate: Fri Feb 25 21:06:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 25 21:07:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d01351a5
net-analyzer/wireshark: Stabilize 3.6.2 arm64, #833632
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
index b34c3442c2d4..760d4c694ac1 100644
--- a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/
commit: 11d357718ec192403193260fe033e93973c3aa5f
Author: Sam James gentoo org>
AuthorDate: Sun Feb 20 06:29:48 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 20 06:30:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d35771
Revert "net-analyzer/wireshark: drop 3.4.10, 3.4.11, 3.6.0-r1"
This reverts commit c2f163b2438b412dffa637ae892000c2913d546f.
Needed by stable libvirt.
Bug: https://bugs.gentoo.org/830343
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest| 3 +
.../files/wireshark-3.6.0-fix-no-tshark.patch | 32 +++
net-analyzer/wireshark/wireshark-3.4.10.ebuild | 283
net-analyzer/wireshark/wireshark-3.4.11.ebuild | 285 +
net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 272
5 files changed, 875 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b3b50a90c00b..df169bc81082 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,5 @@
+DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B
fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563
SHA512
8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
+DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B
3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd
SHA512
cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
+DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B
17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7
SHA512
7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B
49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0
SHA512
8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B
585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156
SHA512
cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
diff --git a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
new file mode 100644
index ..dd497c51391c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
@@ -0,0 +1,32 @@
+https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5
+https://gitlab.com/wireshark/wireshark/-/issues/17766
+https://bugs.gentoo.org/823720
+
+From: Gerald Combs
+Date: Mon, 6 Dec 2021 19:01:10 -0800
+Subject: [PATCH] CMake: Remove the update_tools_help target.
+
+Remove the update_tools_help target. Despite the comment, the weekly
+update job doesn't use it, we don't have targets for our other update
+scripts, and it currently causes issues if BUILD_tshark is disabled.
+Fixes #17766.
+--- a/docbook/CMakeLists.txt
b/docbook/CMakeLists.txt
+@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS
+
+ set(GUIDE_INSTALL_DIRS)
+
+-# This is automatically updated each week. You probably don't need to run it
+-# or depend on it.
+-add_custom_target(update_tools_help
+- COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
+- ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/tools/update-tools-help.py
+- --program-path $
+- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-)
+-set_docbook_target_properties(update_tools_help)
+-
+ set(WSUG_TITLE "Wireshark User's Guide")
+
+ set(WSUG_FILES
+GitLab
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
new file mode 100644
index ..c3e28e4115a4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+ inherit git-r3
+else
+
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
commit: 2d09a146dec49ea5187a2c46959fe5b8ce1388b8
Author: Sam James gentoo org>
AuthorDate: Sun Feb 20 06:30:52 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 20 06:30:52 2022 +
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 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..
--- 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
-Date: Mon, 6 Dec 2021 19:01:10 -0800
-Subject: [PATCH] CMake: Remove the update_tools_help target.
-
-Remove the update_tools_help target. Despite the comment, the weekly
-update job doesn't use it, we don't have targets for our other update
-scripts, and it currently causes issues if BUILD_tshark is disabled.
-Fixes #17766.
a/docbook/CMakeLists.txt
-+++ b/docbook/CMakeLists.txt
-@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS
-
- set(GUIDE_INSTALL_DIRS)
-
--# This is automatically updated each week. You probably don't need to run it
--# or depend on it.
--add_custom_target(update_tools_help
-- COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
-- ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/tools/update-tools-help.py
-- --program-path $
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
--)
--set_docbook_target_properties(update_tools_help)
--
- set(WSUG_TITLE "Wireshark User's Guide")
-
- set(WSUG_FILES
-GitLab
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
deleted file mode 100644
index c3e28e4115a4..
--- 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} == ** ]] ; 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
commit: c2f163b2438b412dffa637ae892000c2913d546f
Author: Sam James gentoo org>
AuthorDate: Sun Feb 20 05:35:47 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 20 05:35:47 2022 +
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 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..
--- 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
-Date: Mon, 6 Dec 2021 19:01:10 -0800
-Subject: [PATCH] CMake: Remove the update_tools_help target.
-
-Remove the update_tools_help target. Despite the comment, the weekly
-update job doesn't use it, we don't have targets for our other update
-scripts, and it currently causes issues if BUILD_tshark is disabled.
-Fixes #17766.
a/docbook/CMakeLists.txt
-+++ b/docbook/CMakeLists.txt
-@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS
-
- set(GUIDE_INSTALL_DIRS)
-
--# This is automatically updated each week. You probably don't need to run it
--# or depend on it.
--add_custom_target(update_tools_help
-- COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
-- ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/tools/update-tools-help.py
-- --program-path $
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
--)
--set_docbook_target_properties(update_tools_help)
--
- set(WSUG_TITLE "Wireshark User's Guide")
-
- set(WSUG_FILES
-GitLab
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
deleted file mode 100644
index c3e28e4115a4..
--- 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} == ** ]] ; 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: c6f00d17550b26140a1ba9d83e386041cfdce5ee
Author: Sam James gentoo org>
AuthorDate: Sun Feb 20 02:33:34 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 20 02:33:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f00d17
net-analyzer/wireshark: Stabilize 3.6.2 x86, #833632
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
index 14090e9e978e..b34c3442c2d4 100644
--- a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 4a268c2f8927cfdac717d83505916ec855e1ae74
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Feb 19 13:54:31 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Feb 19 13:54:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a268c2f
net-analyzer/wireshark: Stabilize 3.6.2 ppc64, #833632
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
index 8b7e24a4af87..14090e9e978e 100644
--- a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: fdcf305f06e38b6dbd686e54835f27c613ff1d4b
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Feb 19 08:27:32 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Feb 19 08:27:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdcf305f
net-analyzer/wireshark: Stabilize 3.6.2 arm, #833632
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
index c7e0b18c7326..8b7e24a4af87 100644
--- a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 2b8cd63dda7d28da6dfef8f34457cf0a29dc99af
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Feb 19 07:00:01 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Feb 19 07:00:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8cd63d
net-analyzer/wireshark: Stabilize 3.6.2 amd64, #833632
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
index 7d40549271cb..c7e0b18c7326 100644
--- a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: f1130370af81679e2eed1571942b00ca2d30736c
Author: Sam James gentoo org>
AuthorDate: Sun Feb 13 21:25:26 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 13 21:27:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1130370
net-analyzer/wireshark: add 3.6.2
Closes: https://bugs.gentoo.org/833294
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
.../wireshark/{wireshark-.ebuild => wireshark-3.6.2.ebuild} | 2 +-
net-analyzer/wireshark/wireshark-.ebuild| 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6e13f800ccfd..df169bc81082 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,3 +2,4 @@ DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B
fe2ececd4a02530176725d62524fe00081
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/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
similarity index 99%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-3.6.2.ebuild
index 98c2b9131b7c..7d40549271cb 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..2} )
PYTHON_COMPAT=( python3_{8..10} )
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 98c2b9131b7c..7d40549271cb 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..2} )
PYTHON_COMPAT=( python3_{8..10} )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: bb935a979e6ed4a1dcc5ef0e038d1c95dc6e6e7c
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Jan 28 19:07:27 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jan 28 19:07:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb935a97
net-analyzer/wireshark: Stabilize 3.6.1 arm64, #831577
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
index b77616001320..460b8e001f30 100644
--- a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: b1298d3b2ab1ce013788348f604e2eb4048725f1
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Jan 26 19:38:06 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Jan 26 19:38:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1298d3b
net-analyzer/wireshark: Stabilize 3.6.1 arm, #831577
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
index a4fec6f5c579..b77616001320 100644
--- a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/
commit: 727aed785bfa82cf4546f02e7d4f8a590c39f035
Author: Sam James gentoo org>
AuthorDate: Sat Jan 22 04:21:31 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 22 04:21:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727aed78
net-analyzer/wireshark: fix build without zlib
Signed-off-by: Sam James 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 ..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
+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(_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", _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() {
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 4b2df77a96c9de0fc55d05ad066e435784953fdb
Author: Sam James gentoo org>
AuthorDate: Thu Jan 20 18:49:47 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 20 18:49:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b2df77a
net-analyzer/wireshark: Stabilize 3.6.1 x86, #831577
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
index 27a80c085108..c90b5a717962 100644
--- a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: ce827d24e2c7ecf953c467f51b4a760d48842d68
Author: Jakov Smolić gentoo org>
AuthorDate: Thu Jan 20 13:07:55 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu Jan 20 13:07:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce827d24
net-analyzer/wireshark: Stabilize 3.6.1 amd64, #831577
Signed-off-by: Jakov Smolić gentoo.org>
net-analyzer/wireshark/wireshark-3.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
index 98c2b9131b7c..27a80c085108 100644
--- a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: ec94264f49a6f4897b6c81ff26f827ca5c2ab7bf
Author: Sam James gentoo org>
AuthorDate: Tue Jan 18 22:14:35 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 18 22:14:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec94264f
net-analyzer/wireshark: Stabilize 3.4.11 arm, #830569
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.4.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
index 509b6ba57993..d1c09690a523 100644
--- a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 068e4cf449505028e6c0f41c30917381db3e1403
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Jan 10 08:39:59 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Jan 10 08:39:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=068e4cf4
net-analyzer/wireshark: x86 stable wrt bug #830569
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-analyzer/wireshark/wireshark-3.4.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
index 5690c5198e92..509b6ba57993 100644
--- a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: b2e3e71c9e2e949a481753b76ff60c9cef0522e5
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Jan 10 08:38:27 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Jan 10 08:38:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e3e71c
net-analyzer/wireshark: amd64 stable wrt bug #830569
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-analyzer/wireshark/wireshark-3.4.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
index 274997e1e66d..5690c5198e92 100644
--- a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 44d3cb29dbf898f833da8b7ed8f0b010fe4bf301
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Jan 9 12:39:18 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Jan 9 12:39:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d3cb29
net-analyzer/wireshark: Stabilize 3.4.11 ppc64, #830569
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.4.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
index 0b1bde33daa2..274997e1e66d 100644
--- a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 736593d99a7d23662a3a77abcee0bbf9469fc411
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Jan 9 11:54:24 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Jan 9 11:54:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736593d9
net-analyzer/wireshark: Stabilize 3.4.11 arm64, #830569
Signed-off-by: Arthur Zamarin gentoo.org>
net-analyzer/wireshark/wireshark-3.4.11.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
index 6ea541c8b477..0b1bde33daa2 100644
--- a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 1e9149320bdc41b6b90e801826955bb7b312047f
Author: Sam James gentoo org>
AuthorDate: Mon Jan 3 08:50:31 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 4 04:53:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e914932
net-analyzer/wireshark: add 3.6.1
Bug: https://bugs.gentoo.org/830343
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
net-analyzer/wireshark/wireshark-3.6.1.ebuild | 273 ++
2 files changed, 274 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bf6d4db9e8d2..7ac98cb6122d 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B
fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563
SHA512
8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B
17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7
SHA512
7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
+DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B
49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0
SHA512
8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
diff --git a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
new file mode 100644
index ..98c2b9131b7c
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.1.ebuild
@@ -0,0 +1,273 @@
+# 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} == ** ]] ; 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 1f00e52ac2350fa49e214f88ae1fecca9f8eed01
Author: Sam James gentoo org>
AuthorDate: Mon Jan 3 08:56:11 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 4 04:53:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f00e52a
net-analyzer/wireshark: sync live
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-.ebuild | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 01d79e76e7b1..98c2b9131b7c 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
@@ -191,7 +191,9 @@ src_test() {
--verbose
# Skip known failing tests
- -E "(suite_decryption|suite_extcaps|suite_nameres)"
+ # extcaps needs a bunch of external programs
+ -E "(suite_extcaps)"
+ #-E "(suite_decryption|suite_extcaps|suite_nameres)"
)
cmake_src_test
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 3caad1cbd744874cbfa34c4ae41f0ded2b75311e
Author: Sam James gentoo org>
AuthorDate: Mon Jan 3 08:55:51 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 4 04:53:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3caad1cb
net-analyzer/wireshark: add 3.4.11
Bug: https://bugs.gentoo.org/830343
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest| 1 +
net-analyzer/wireshark/wireshark-3.4.11.ebuild | 285 +
2 files changed, 286 insertions(+)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7ac98cb6122d..6e13f800ccfd 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
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
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
new file mode 100644
index ..6ea541c8b477
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+ inherit git-r3
+else
+
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+ 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
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 16e19c0faf27c85361f4129f2130add18b4c864c
Author: Yongxiang Liang gmail com>
AuthorDate: Wed Dec 29 15:02:13 2021 +
Commit: Yixun Lan gentoo org>
CommitDate: Fri Dec 31 03:40:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e19c0f
net-analyzer/wireshark: keyword ~riscv
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yongxiang Liang gmail.com>
Signed-off-by: Yixun Lan gentoo.org>
net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
index 4d5832c71e75..520a2dc646a6 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 06eb3e1a2d8234b725d8c8962c235a97cb65e9b1
Author: Sam James gentoo org>
AuthorDate: Mon Dec 13 05:17:04 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 13 05:17:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06eb3e1a
net-analyzer/wireshark: drop 3.4.9
Bug: https://bugs.gentoo.org/824474
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 -
net-analyzer/wireshark/wireshark-3.4.9.ebuild | 280 --
2 files changed, 281 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 06a07db80201..bf6d4db9e8d2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,2 @@
DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B
fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563
SHA512
8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
-DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B
95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de
SHA512
479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb
DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B
17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7
SHA512
7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
deleted file mode 100644
index 68cb4ab7a929..
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ /dev/null
@@ -1,280 +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} == ** ]] ; 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"
-
-# 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? (
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 2879f277ac7f1ee44ee427d026177367a406428d
Author: Sam James gentoo org>
AuthorDate: Mon Dec 13 05:15:22 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 13 05:15:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2879f277
net-analyzer/wireshark: Stabilize 3.4.10 arm64, #827866
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.4.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
index 6380c0c2f9ab..c3e28e4115a4 100644
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 8bdc56e50cbdc681c1079c1fa4b55689ad99a0fc
Author: Sam James gentoo org>
AuthorDate: Fri Dec 10 00:12:24 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 10 00:12:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdc56e5
net-analyzer/wireshark: fix automagic doc generation
Bug: https://bugs.gentoo.org/828612
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 1 +
net-analyzer/wireshark/wireshark-.ebuild | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
index a9bf284be3dc..4d5832c71e75 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -127,6 +127,7 @@ src_configure() {
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 '')
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 3b3d7769e8ea..01d79e76e7b1 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -18,8 +18,7 @@ else
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
- # Seems to break libvirt?
- #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
fi
LICENSE="GPL-2"
@@ -127,6 +126,7 @@ src_configure() {
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 '')
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 9ae466e4c209e9be30c04bb650f294cdfb027d1a
Author: Sam James gentoo org>
AuthorDate: Wed Dec 8 05:44:04 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 8 05:44:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae466e4
net-analyzer/wireshark: keyword 3.6.0-r1
Closes: https://bugs.gentoo.org/823720
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
index cd262a13d500..a9bf284be3dc 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -18,8 +18,7 @@ else
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
- # Seems to break libvirt?
- #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 6ee48442f400b3d264873062440793b81e7b7f04
Author: Sam James gentoo org>
AuthorDate: Tue Dec 7 07:14:58 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 7 07:14:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee48442
net-analyzer/wireshark: drop 3.4.7-r1, 3.4.8
Bug: https://bugs.gentoo.org/802216
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 2 -
net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild | 278 --
net-analyzer/wireshark/wireshark-3.4.8.ebuild| 280 ---
3 files changed, 560 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index aed666cce349..06a07db80201 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.7.tar.xz 32311140 BLAKE2B
0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5
SHA512
26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
-DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B
bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5
SHA512
962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B
95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de
SHA512
479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb
DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B
17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7
SHA512
7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
diff --git a/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
b/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
deleted file mode 100644
index f0021c067742..
--- a/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
+++ /dev/null
@@ -1,278 +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} == ** ]] ; 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"
-
-CDEPEND="
- acct-group/pcap
- >=dev-libs/glib-2.32:2
- >=net-dns/c-ares-1.5:=
- dev-libs/libgcrypt:=
- 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 )
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/
commit: 86721c622f6e75874b3dc83b0133f5973b5ba84b
Author: Sam James gentoo org>
AuthorDate: Tue Dec 7 07:12:47 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 7 07:12:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86721c62
net-analyzer/wireshark: fix USE=-tshark build for 3.6.0
Bug: https://bugs.gentoo.org/823720
Signed-off-by: Sam James gentoo.org>
.../files/wireshark-3.6.0-fix-no-tshark.patch | 32 ++
net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 1 +
2 files changed, 33 insertions(+)
diff --git a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
new file mode 100644
index ..dd497c51391c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
@@ -0,0 +1,32 @@
+https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5
+https://gitlab.com/wireshark/wireshark/-/issues/17766
+https://bugs.gentoo.org/823720
+
+From: Gerald Combs
+Date: Mon, 6 Dec 2021 19:01:10 -0800
+Subject: [PATCH] CMake: Remove the update_tools_help target.
+
+Remove the update_tools_help target. Despite the comment, the weekly
+update job doesn't use it, we don't have targets for our other update
+scripts, and it currently causes issues if BUILD_tshark is disabled.
+Fixes #17766.
+--- a/docbook/CMakeLists.txt
b/docbook/CMakeLists.txt
+@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS
+
+ set(GUIDE_INSTALL_DIRS)
+
+-# This is automatically updated each week. You probably don't need to run it
+-# or depend on it.
+-add_custom_target(update_tools_help
+- COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
+- ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/tools/update-tools-help.py
+- --program-path $
+- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-)
+-set_docbook_target_properties(update_tools_help)
+-
+ set(WSUG_TITLE "Wireshark User's Guide")
+
+ set(WSUG_FILES
+GitLab
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
index 3b3d7769e8ea..cd262a13d500 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -97,6 +97,7 @@ RDEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+ "${FILESDIR}"/${PN}-3.6.0-fix-no-tshark.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 7911d3783040e5827d1d3a1ce9a29748989c5add
Author: Sam James gentoo org>
AuthorDate: Tue Dec 7 02:05:14 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 7 02:06:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7911d378
net-analyzer/wireshark: modernise 3.6.0 a bit
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 49 ++--
net-analyzer/wireshark/wireshark-.ebuild | 49 ++--
2 files changed, 40 insertions(+), 58 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
index 145ec1e5d572..3b3d7769e8ea 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -30,12 +30,14 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins
plugin-ifdemo +pcap +qt5 +rand
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
-CDEPEND="
- acct-group/pcap
- >=dev-libs/glib-2.32:2
+RDEPEND="acct-group/pcap
+ >=dev-libs/glib-2.38:2
>=net-dns/c-ares-1.5:=
dev-libs/libgcrypt:=
media-libs/speexdsp
@@ -70,18 +72,12 @@ CDEPEND="
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="
+ zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
dev-lang/perl
- sys-devel/bison
sys-devel/flex
+ sys-devel/gettext
virtual/pkgconfig
doc? (
app-doc/doxygen
@@ -93,17 +89,10 @@ BDEPEND="
test? (
dev-python/pytest
dev-python/pytest-xdist
- )
-"
-RDEPEND="
- ${CDEPEND}
+ )"
+RDEPEND="${RDEPEND}
qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )
-"
+ selinux? ( sec-policy/selinux-wireshark )"
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -119,7 +108,7 @@ src_configure() {
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
# --with-ssl to ./configure. (Mimics code from acinclude.m4).
- if use kerberos; then
+ if use kerberos ; then
case $(krb5-config --libs) in
*-lcrypto*)
ewarn "Kerberos was built with ssl support:
linkage with openssl is enabled."
@@ -130,7 +119,7 @@ src_configure() {
esac
fi
- if use qt5; then
+ if use qt5 ; then
export QT_MIN_VERSION=5.3.0
append-cxxflags -fPIC -DPIC
fi
@@ -237,19 +226,21 @@ src_install() {
doins ${dir}/*.h
done
- if use qt5; then
+ if use qt5 ; then
local s
- for s in 16 32 48 64 128 256 512 1024; do
+
+ 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
+ if [[ -d "${ED}"/usr/share/appdata ]] ; then
rm -r "${ED}"/usr/share/appdata || die
fi
}
@@ -262,7 +253,7 @@ pkg_postinst() {
# Add group for users allowed to sniff.
chgrp pcap "${EROOT}"/usr/bin/dumpcap
- if use dumpcap && use pcap; then
+ 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
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 145ec1e5d572..3b3d7769e8ea 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -30,12 +30,14 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins
plugin-ifdemo +pcap +qt5 +rand
IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp
sshdump ssl"
IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: e6d802669913fc41481038403d0b32ff0f8be375
Author: Sam James gentoo org>
AuthorDate: Sat Dec 4 01:31:21 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 4 01:31:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d80266
net-analyzer/wireshark: Stabilize 3.4.10 arm, #827866
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.4.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
index 3d3502f644b9..6380c0c2f9ab 100644
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: b2b35a691c839a7f102abbe7d03413592da2a357
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Dec 1 13:31:01 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Dec 1 13:31:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2b35a69
net-analyzer/wireshark: ppc64 stable wrt bug #827866
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-analyzer/wireshark/wireshark-3.4.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
index f2e5695b8d1f..3d3502f644b9 100644
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 52f67cd04a84c14e8c542b39668d217b1a16328f
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Dec 1 09:02:30 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Dec 1 09:02:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f67cd0
net-analyzer/wireshark: x86 stable wrt bug #827866
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-analyzer/wireshark/wireshark-3.4.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
index f776fb853f78..f2e5695b8d1f 100644
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: f340fe2d4876606f329b54ad9877c45701017636
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Nov 30 14:49:37 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Nov 30 14:49:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f340fe2d
net-analyzer/wireshark: amd64 stable wrt bug #827866
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-analyzer/wireshark/wireshark-3.4.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
index 9d120d24bcf1..f776fb853f78 100644
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 340e1575a9c5ccf8554e44db273d4c2771bda037
Author: Sam James gentoo org>
AuthorDate: Wed Nov 24 03:00:52 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 24 03:00:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=340e1575
net-analyzer/wireshark: fix DoubleEmptyLine
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 1 -
net-analyzer/wireshark/wireshark-.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
index 87ec81e02281..145ec1e5d572 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -214,7 +214,6 @@ 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 \
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 87ec81e02281..145ec1e5d572 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -214,7 +214,6 @@ 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 \
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 3c00b1f3cd54cf0c5cd5e2c7d03d7a099892e12b
Author: Sam James gentoo org>
AuthorDate: Wed Nov 24 02:59:17 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 24 02:59:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c00b1f3
net-analyzer/wireshark: drop 3.6.0 keywords for now (breaks libvirt?)
libvirt fails to build for me right now with `wmem_alloc` undefined errors.
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 11 +--
net-analyzer/wireshark/wireshark-.ebuild | 11 +--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
index a850f1953b70..87ec81e02281 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -18,7 +18,8 @@ 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"
+ # Seems to break libvirt?
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
fi
LICENSE="GPL-2"
@@ -213,6 +214,12 @@ 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=(
@@ -221,9 +228,9 @@ src_install() {
epan/dfilter
epan/dissectors
epan/ftypes
- epan/wmem
wiretap
wsutil
+ wsutil/wmem
)
for dir in "${dirs[@]}" ; do
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index a850f1953b70..87ec81e02281 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -18,7 +18,8 @@ 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"
+ # Seems to break libvirt?
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
fi
LICENSE="GPL-2"
@@ -213,6 +214,12 @@ 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=(
@@ -221,9 +228,9 @@ src_install() {
epan/dfilter
epan/dissectors
epan/ftypes
- epan/wmem
wiretap
wsutil
+ wsutil/wmem
)
for dir in "${dirs[@]}" ; do
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 25ab9cdb6716966705de45e0a44610f6685fa90d
Author: Sam James gentoo org>
AuthorDate: Wed Nov 24 02:37:24 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 24 02:37:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ab9cdb
net-analyzer/wireshark: restore non-obsolete others headers
I'd mistakenly thought this lot were obsolete but it seems not.
Signed-off-by: Sam James gentoo.org>
...ireshark-3.6.0.ebuild => wireshark-3.6.0-r1.ebuild} | 18 ++
net-analyzer/wireshark/wireshark-.ebuild | 18 ++
2 files changed, 36 insertions(+)
diff --git a/net-analyzer/wireshark/wireshark-3.6.0.ebuild
b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
similarity index 95%
rename from net-analyzer/wireshark/wireshark-3.6.0.ebuild
rename to net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
index 07df8f9a5dfd..a850f1953b70 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -213,6 +213,24 @@ src_install() {
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+ # 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
+ epan/wmem
+ wiretap
+ wsutil
+ )
+
+ 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
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 07df8f9a5dfd..a850f1953b70 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -213,6 +213,24 @@ src_install() {
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+ # 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
+ epan/wmem
+ wiretap
+ wsutil
+ )
+
+ 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 2eeab8b454a4bd85bb378a2e53413c2dd0489f56
Author: Sam James gentoo org>
AuthorDate: Wed Nov 24 01:47:03 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 24 01:47:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eeab8b4
net-analyzer/wireshark: add Python 3.10
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.6.0.ebuild | 2 +-
net-analyzer/wireshark/wireshark-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.6.0.ebuild
b/net-analyzer/wireshark/wireshark-3.6.0.ebuild
index 77c36361aafe..07df8f9a5dfd 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0.ebuild
@@ -4,7 +4,7 @@
EAPI=7
LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 77c36361aafe..07df8f9a5dfd 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: b2d0c75fce89f9157d296fd2cc647a6c69712844
Author: Sam James gentoo org>
AuthorDate: Wed Nov 24 01:42:40 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 24 01:43:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d0c75f
net-analyzer/wireshark: add 3.6.0
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest| 1 +
...ireshark-.ebuild => wireshark-3.6.0.ebuild} | 27 --
net-analyzer/wireshark/wireshark-.ebuild | 27 --
3 files changed, 1 insertion(+), 54 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index beb51ec249d5..aed666cce349 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,3 +2,4 @@ DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B
fe2ececd4a02530176725d62524fe00081
DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B
0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5
SHA512
26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B
bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5
SHA512
962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B
95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de
SHA512
479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb
+DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B
17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7
SHA512
7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-3.6.0.ebuild
similarity index 92%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-3.6.0.ebuild
index 9d120d24bcf1..77c36361aafe 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0.ebuild
@@ -107,7 +107,6 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
- "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
)
pkg_setup() {
@@ -214,32 +213,6 @@ 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
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 9d120d24bcf1..77c36361aafe 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -107,7 +107,6 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
- "${FILESDIR}"/${PN}--ui-needs-wiretap.patch
)
pkg_setup() {
@@ -214,32 +213,6 @@ 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 24c053bdd87724044f752e800bd426abe4a8e50d
Author: Sam James gentoo org>
AuthorDate: Thu Nov 18 09:03:40 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 18 09:03:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c053bd
net-analyzer/wireshark: Stabilize 3.4.9 arm, #823677
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.4.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
index 55cf51710bae..843f0ac4a8f0 100644
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 81551e0c1f854850c74f0fc38daa0b535f931c70
Author: Sam James gentoo org>
AuthorDate: Thu Nov 18 09:03:44 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 18 09:03:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81551e0c
net-analyzer/wireshark: Stabilize 3.4.9 x86, #823677
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.4.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
index 843f0ac4a8f0..68cb4ab7a929 100644
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: bb31040ef449b5666bd0c5c6bf8fe8ba5393b06d
Author: Sam James gentoo org>
AuthorDate: Thu Nov 18 09:03:37 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 18 09:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb31040e
net-analyzer/wireshark: Stabilize 3.4.9 amd64, #823677
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.4.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
index 119c5a3c00cc..55cf51710bae 100644
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: dccb1adb48ff777b2beac6bb3c1b5a62d7e1ced5 Author: Sam James gentoo org> AuthorDate: Thu Nov 18 09:03:10 2021 + Commit: Sam James gentoo org> CommitDate: Thu Nov 18 09:03:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccb1adb net-analyzer/wireshark: fix MissingTestRestrict Signed-off-by: Sam James gentoo.org> net-analyzer/wireshark/wireshark-3.4.10.ebuild | 2 ++ net-analyzer/wireshark/wireshark-.ebuild | 2 ++ 2 files changed, 4 insertions(+) diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild b/net-analyzer/wireshark/wireshark-3.4.10.ebuild index a684bf49242d..9d120d24bcf1 100644 --- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild +++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild @@ -29,6 +29,8 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +rand 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 diff --git a/net-analyzer/wireshark/wireshark-.ebuild b/net-analyzer/wireshark/wireshark-.ebuild index a684bf49242d..9d120d24bcf1 100644 --- a/net-analyzer/wireshark/wireshark-.ebuild +++ b/net-analyzer/wireshark/wireshark-.ebuild @@ -29,6 +29,8 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +rand 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 41315217e84013c8c4e501d69b9c27370c66b3f2
Author: Sam James gentoo org>
AuthorDate: Thu Nov 18 09:02:01 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 18 09:02:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41315217
net-analyzer/wireshark: Stabilize 3.4.9 arm64, #823677
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.4.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
index 9725dcaddb0a..119c5a3c00cc 100644
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86"
fi
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: 87d6a9904b211382bff874f539e96268369f81ac
Author: Sam James gentoo org>
AuthorDate: Thu Nov 18 08:56:49 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 18 08:59:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d6a990
net-analyzer/wireshark: add 3.4.10
Now with tests! Restricted known-failing ones.
Bug: https://bugs.gentoo.org/824474
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
.../wireshark/{wireshark-.ebuild => wireshark-3.4.10.ebuild} | 5 +++--
net-analyzer/wireshark/wireshark-.ebuild | 5 +++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a36dea5ccec4..beb51ec249d5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
+DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B
fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563
SHA512
8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B
0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5
SHA512
26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B
bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5
SHA512
962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B
95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de
SHA512
479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
similarity index 98%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-3.4.10.ebuild
index 4871d3fcafeb..a684bf49242d 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -102,8 +102,6 @@ REQUIRED_USE="
plugin-ifdemo? ( plugins )
"
-RESTRICT="test"
-
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
@@ -200,6 +198,9 @@ src_test() {
--disable-capture
--skip-missing-programs=all
--verbose
+
+ # Skip known failing tests
+ -E "(suite_decryption|suite_extcaps|suite_nameres)"
)
cmake_src_test
diff --git a/net-analyzer/wireshark/wireshark-.ebuild
b/net-analyzer/wireshark/wireshark-.ebuild
index 4871d3fcafeb..a684bf49242d 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -102,8 +102,6 @@ REQUIRED_USE="
plugin-ifdemo? ( plugins )
"
-RESTRICT="test"
-
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
@@ -200,6 +198,9 @@ src_test() {
--disable-capture
--skip-missing-programs=all
--verbose
+
+ # Skip known failing tests
+ -E "(suite_decryption|suite_extcaps|suite_nameres)"
)
cmake_src_test
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
commit: df2a3805baa71da4bcb45eb031f015ac1e202dfc
Author: Sam James gentoo org>
AuthorDate: Sun Nov 14 08:38:23 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 14 08:38:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2a3805
net-analyzer/wireshark: Stabilize 3.4.9 ppc64, #823677
Signed-off-by: Sam James gentoo.org>
net-analyzer/wireshark/wireshark-3.4.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
index 4871d3fcafeb..9725dcaddb0a 100644
--- a/net-analyzer/wireshark/wireshark-3.4.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.9.ebuild
@@ -18,7 +18,7 @@ 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"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 ~x86"
fi
LICENSE="GPL-2"
