subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-analyzer\/wireshark\/"

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

2024-06-05 Thread Yixun Lan

commit: 36d37ef0aa1f7188441bc6e77d802291ba8f8c80
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Jun  5 08:38:53 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Jun  5 09:01:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d37ef0

net-analyzer/wireshark: Keyword 4.2.5 riscv, #933292

Signed-off-by: Yixun Lan  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
index ef484db79a7e..111f677c7d23 100644
--- a/net-analyzer/wireshark/wireshark-4.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
@@ -24,7 +24,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 ~arm arm64 ~hppa ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv ~x86"
fi
 fi

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

2024-06-01 Thread Mike Gilbert

commit: cf90a0a162eec88c81a4bba686d688f7784fbe6a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jun  1 19:03:26 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jun  1 19:03:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf90a0a1

net-analyzer/wireshark: force bundled lemon

Closes: https://bugs.gentoo.org/933119
Signed-off-by: Mike Gilbert  gentoo.org>

 net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild | 3 +++
 net-analyzer/wireshark/wireshark-4.2.5.ebuild| 3 +++
 net-analyzer/wireshark/wireshark-.ebuild | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild
index 44d0382c77bb..4b5688aeff54 100644
--- a/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild
@@ -203,6 +203,9 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
 
+   # Force bundled lemon (bug 933119)
+   -DLEMON_EXECUTABLE=
+
$(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
$(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
$(usex gui MOC=$(qt5_get_bindir)/moc '')

diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
index 550be16a4dec..ef484db79a7e 100644
--- a/net-analyzer/wireshark/wireshark-4.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
@@ -204,6 +204,9 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
 
+   # Force bundled lemon (bug 933119)
+   -DLEMON_EXECUTABLE=
+
$(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
$(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
$(usex gui MOC=$(qt5_get_bindir)/moc '')

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 44fe8772760b..173fb4221235 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -204,6 +204,9 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
 
+   # Force bundled lemon (bug 933119)
+   -DLEMON_EXECUTABLE=
+
$(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
$(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
$(usex gui MOC=$(qt5_get_bindir)/moc '')

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

2024-06-01 Thread Arthur Zamarin

commit: 585aec92cd0f7e3a8a9c115459a415465b9e100d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  1 06:22:48 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  1 06:22:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=585aec92

net-analyzer/wireshark: Stabilize 4.2.5 amd64, #933295

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
index ff06b1fef04e..550be16a4dec 100644
--- a/net-analyzer/wireshark/wireshark-4.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
@@ -24,7 +24,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm arm64 ~hppa ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~hppa ~x86"
fi
 fi

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

2024-06-01 Thread Arthur Zamarin

commit: 9ae2ce819aba53287f07442dec3a6a2e9a1c4ab8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  1 06:22:47 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  1 06:22:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae2ce81

net-analyzer/wireshark: Stabilize 4.2.5 arm64, #933295

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
index b2759274ebd0..ff06b1fef04e 100644
--- a/net-analyzer/wireshark/wireshark-4.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
@@ -24,7 +24,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+   KEYWORDS="~amd64 ~arm arm64 ~hppa ~x86"
fi
 fi

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

2024-06-01 Thread Arthur Zamarin

commit: e2a59df138506e56ba97169c09fb31d9a87c02cf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  1 06:22:46 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  1 06:22:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a59df1

net-analyzer/wireshark: Stabilize 4.0.15 amd64, #933294

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.15.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
index fe89289f0fd4..7dfb89f2d31c 100644
--- a/net-analyzer/wireshark/wireshark-4.0.15.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
@@ -23,7 +23,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
 fi

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

2024-06-01 Thread Arthur Zamarin

commit: a8124b44c244e0831ac64aec70d12d6e7385064c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  1 06:22:43 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  1 06:22:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8124b44

net-analyzer/wireshark: Keyword 4.2.5 x86, #933292

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
index 44b984091063..b2759274ebd0 100644
--- a/net-analyzer/wireshark/wireshark-4.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
@@ -24,7 +24,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
fi
 fi

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

2024-06-01 Thread Arthur Zamarin

commit: ce1ecdb79be0ae3c40e0fa0de1e58386c5020afe
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  1 06:22:45 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  1 06:22:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce1ecdb7

net-analyzer/wireshark: Stabilize 4.0.15 x86, #933294

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.15.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
index 7b82178ee815..e78d5be85091 100644
--- a/net-analyzer/wireshark/wireshark-4.0.15.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
@@ -23,7 +23,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
 fi

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

2024-06-01 Thread Arthur Zamarin

commit: 6f63a9779c4b08cda8c8271a0bbd3a7453f96206
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  1 06:22:46 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  1 06:22:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f63a977

net-analyzer/wireshark: Stabilize 4.0.15 arm64, #933294

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.15.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
index e78d5be85091..fe89289f0fd4 100644
--- a/net-analyzer/wireshark/wireshark-4.0.15.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
@@ -23,7 +23,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
 fi

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

2024-06-01 Thread Arthur Zamarin

commit: 91826ba9a219bdf62ce2517fe9502d50908be757
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  1 06:22:44 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  1 06:22:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91826ba9

net-analyzer/wireshark: Stabilize 4.0.15 arm, #933294

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.15.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
index 808132d6248f..7b82178ee815 100644
--- a/net-analyzer/wireshark/wireshark-4.0.15.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
@@ -23,7 +23,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi

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

2024-05-31 Thread Sam James

commit: 7e7684d912ec06d2690755041ec180f3e619516d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  1 03:56:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  1 03:56:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7684d9

net-analyzer/wireshark: Keyword 4.2.5 arm, #933292

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
index 44fe8772760b..44b984091063 100644
--- a/net-analyzer/wireshark/wireshark-4.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
@@ -24,7 +24,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm64 ~hppa"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa"
fi
 fi

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

2024-05-31 Thread Sam James

commit: b22401fd20575ce042b5c2d6beff75d20b756f07
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  1 03:07:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  1 03:07:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22401fd

net-analyzer/wireshark: drop 4.0.14

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

 net-analyzer/wireshark/Manifest|   2 -
 net-analyzer/wireshark/wireshark-4.0.14.ebuild | 344 -
 2 files changed, 346 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index fe102e2510c8..33c4b4ec8a45 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,7 +1,5 @@
 DIST wireshark-4.0.11-signatures.txt 2521 BLAKE2B 
3fce906f2050fb990d80b912919c46d0e6e087c66a36bc18e8c57fa19d7ef7e966a26842770370e1211c4e4644deed31091ec929c53c80bfcdb1e472b149bd7c
 SHA512 
d9b15d14b8e061bf2f4aaf0121c295db1992b7cbbb56e67b48fff4110e897f4f0d40304bdeaced2031bc802796a6f3ea7ba62a730f82d7469658924313f301a4
 DIST wireshark-4.0.11.tar.xz 43153680 BLAKE2B 
1a90b9c20773758dbcfad85ea9a5c180e846307701ce75a471699544507b6dcf7cab611b5d71056d68ec1646a951729d7df416ef1a9a473bf96d9bf5a7066ebc
 SHA512 
c027b279f9bc761c5c701131df9e57d3f2568129f63c919cd744f6626843eb0e000caebc3e01c9a10eedad35874c01c880d2c736b62f8e841da35c375a37c53f
-DIST wireshark-4.0.14-signatures.txt 2521 BLAKE2B 
371bf67dc0f36fe46848fef77194e221879db1ff422420949ba0fce4280fb9ee84ca18363046a0ce6fd1e7879ba336c1c16c9bdea13b8d14f14137f59d76212e
 SHA512 
f084d454d1756be35e1e1ed4636cb994bd9c49bd4666d355ce3719d526bf71f9e3cc929b4dca311231d43b046711b223a379c6d915aa260966f0b7bab8a8e352
-DIST wireshark-4.0.14.tar.xz 43186416 BLAKE2B 
1b67079cc0f9cdc33ce7e2fce0b49deb4d3016db79099a3bd2003099477a3bac43d4e31d4820c72a92135cca14572ac46406f41e477d794a63e96a6329d30199
 SHA512 
e88a4b2f41489f3ffe82c4c79c9c89ec521d931a716a5dacaede28c03b0625a0603935e723d5d869f801cfcab440a7d2f310c910707e15f9b0bca0c131398d73
 DIST wireshark-4.0.15-signatures.txt 2521 BLAKE2B 
2ca4163fff33708288b355978220014707fa8ba84ea2237a9a4dcb9da8cd7986811ee3805416cd82d348968edc9d873fa63b5fd121f40e623f0099ab1fd01716
 SHA512 
e47ad252b260016d7cce60f53c6d308a36c1ae8c194359212fa38ec934d961bba6e1ace53d1ff3c909c5c5cad09ff8c1ded39d9ce7cac10b1b987594c565
 DIST wireshark-4.0.15.tar.xz 43197644 BLAKE2B 
6720ee6c879a0005c37452da32bc8e99051baf3eadd53d42b5e93a7f7e2c3cf63657393fd2d4e2d245f1b33ffc10b52c6e5af9fd527e78497dc8d1ad9405473b
 SHA512 
6f1915c48860f79c25df8ac753aac4391393db9cf6d4b3d4ba11499fafb5cae8c1e56b7f735ea14b9f18560cb4156a3cbb65c567102db52b40e5d1f53e00be7a
 DIST wireshark-4.2.4-signatures.txt 2706 BLAKE2B 
169c7eea2d89f4eedc58e833512cf813dfe76cbb76eb505d47153c1dc55f6d838b7a0187fdee4dae214ea04a3e062dd13f64df460fb16c042a889aac28e4428e
 SHA512 
273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9

diff --git a/net-analyzer/wireshark/wireshark-4.0.14.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.14.ebuild
deleted file mode 100644
index 808132d6248f..
--- a/net-analyzer/wireshark/wireshark-4.0.14.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/;
-
-if [[ ${PV} == ** ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
-   inherit git-r3
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
-   inherit verify-sig
-
-   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
-   S="${WORKDIR}/${P/_/}"
-
-   if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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 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} )
-"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( test ) test"
-
-# bug #753062 for speexdsp
-RDEPEND="
-   acct-group/pcap
-   >=dev-libs/glib-2.50.0:2
-   dev-libs/libpcre2
-

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

2024-05-31 Thread Sam James

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

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

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

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

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

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

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

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

2024-05-31 Thread Sam James

commit: 250ce33c4e5b27a02c60c7320ba60841c2c2c079
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  1 01:14:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  1 01:14:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=250ce33c

net-analyzer/wireshark: skip test_sharkd_req_follow_http2 for now

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

 net-analyzer/wireshark/wireshark-4.2.5.ebuild | 1 +
 net-analyzer/wireshark/wireshark-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
index 0e0d86d74067..c7145d15489e 100644
--- a/net-analyzer/wireshark/wireshark-4.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
@@ -272,6 +272,7 @@ src_test() {
EPYTEST_DESELECT=(
# TODO: investigate

suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
+   suite_sharkd.py::TestSharkd::test_sharkd_req_follow_http2
)
 
# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 0e0d86d74067..c7145d15489e 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -272,6 +272,7 @@ src_test() {
EPYTEST_DESELECT=(
# TODO: investigate

suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
+   suite_sharkd.py::TestSharkd::test_sharkd_req_follow_http2
)
 
# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html

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

2024-05-27 Thread Sam James

commit: 8f5f3d732811d25e94e1104fa05bb1388649a7bd
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Thu May 23 13:45:52 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 28 01:53:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f5f3d73

net-analyzer/wireshark: add 4.0.15, 4.2.5

Bug: https://bugs.gentoo.org/932563
Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/36790
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest|   4 +
 net-analyzer/wireshark/wireshark-4.0.15.ebuild | 344 
 net-analyzer/wireshark/wireshark-4.2.5.ebuild  | 348 +
 3 files changed, 696 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3959fedc5576..fe102e2510c8 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,5 +2,9 @@ DIST wireshark-4.0.11-signatures.txt 2521 BLAKE2B 
3fce906f2050fb990d80b912919c46
 DIST wireshark-4.0.11.tar.xz 43153680 BLAKE2B 
1a90b9c20773758dbcfad85ea9a5c180e846307701ce75a471699544507b6dcf7cab611b5d71056d68ec1646a951729d7df416ef1a9a473bf96d9bf5a7066ebc
 SHA512 
c027b279f9bc761c5c701131df9e57d3f2568129f63c919cd744f6626843eb0e000caebc3e01c9a10eedad35874c01c880d2c736b62f8e841da35c375a37c53f
 DIST wireshark-4.0.14-signatures.txt 2521 BLAKE2B 
371bf67dc0f36fe46848fef77194e221879db1ff422420949ba0fce4280fb9ee84ca18363046a0ce6fd1e7879ba336c1c16c9bdea13b8d14f14137f59d76212e
 SHA512 
f084d454d1756be35e1e1ed4636cb994bd9c49bd4666d355ce3719d526bf71f9e3cc929b4dca311231d43b046711b223a379c6d915aa260966f0b7bab8a8e352
 DIST wireshark-4.0.14.tar.xz 43186416 BLAKE2B 
1b67079cc0f9cdc33ce7e2fce0b49deb4d3016db79099a3bd2003099477a3bac43d4e31d4820c72a92135cca14572ac46406f41e477d794a63e96a6329d30199
 SHA512 
e88a4b2f41489f3ffe82c4c79c9c89ec521d931a716a5dacaede28c03b0625a0603935e723d5d869f801cfcab440a7d2f310c910707e15f9b0bca0c131398d73
+DIST wireshark-4.0.15-signatures.txt 2521 BLAKE2B 
2ca4163fff33708288b355978220014707fa8ba84ea2237a9a4dcb9da8cd7986811ee3805416cd82d348968edc9d873fa63b5fd121f40e623f0099ab1fd01716
 SHA512 
e47ad252b260016d7cce60f53c6d308a36c1ae8c194359212fa38ec934d961bba6e1ace53d1ff3c909c5c5cad09ff8c1ded39d9ce7cac10b1b987594c565
+DIST wireshark-4.0.15.tar.xz 43197644 BLAKE2B 
6720ee6c879a0005c37452da32bc8e99051baf3eadd53d42b5e93a7f7e2c3cf63657393fd2d4e2d245f1b33ffc10b52c6e5af9fd527e78497dc8d1ad9405473b
 SHA512 
6f1915c48860f79c25df8ac753aac4391393db9cf6d4b3d4ba11499fafb5cae8c1e56b7f735ea14b9f18560cb4156a3cbb65c567102db52b40e5d1f53e00be7a
 DIST wireshark-4.2.4-signatures.txt 2706 BLAKE2B 
169c7eea2d89f4eedc58e833512cf813dfe76cbb76eb505d47153c1dc55f6d838b7a0187fdee4dae214ea04a3e062dd13f64df460fb16c042a889aac28e4428e
 SHA512 
273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9
 DIST wireshark-4.2.4.tar.xz 44986232 BLAKE2B 
03806a167a4b055409fadbc54ba338c9d2790df3ac2b9fb547c640c67d7bee6a3f8f19d30549228e494cabf8d303cef42ff098a9e1f45b092589643e568632f5
 SHA512 
963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6
+DIST wireshark-4.2.5-signatures.txt 2706 BLAKE2B 
d10f6e9b4d8bcd8f0a30501bbbfee9ee696d82c7ca95957532f6614905e7836e5865d1b7093ca6aab2ebc1da5365648803f8b20508c95cdf5b42e8ac8e288f65
 SHA512 
050cb90e8958b73428fc7dc6c9801ba3b361f8cf4df8f22505789d759edf7967867915a0cbf351fa251d4d28b211920a3fb34e8fa209d475a10b4bcd2957fcc0
+DIST wireshark-4.2.5.tar.xz 45014156 BLAKE2B 
536743a7e402f7a511d7612454d9770f0e67a0f2ebc1ab49912b12965e605f2082eff37f41f7642b89859257926ce13d88728194b79cbe5dcf6b15d72516c5fc
 SHA512 
92a8fb08af5a1da30ca469fa45bd982638069907d289fa716068ac71141b7d9726ca0b01adc2910da4c928db23760da75a1c6a7c2eb795ac66ba003a90abb87b

diff --git a/net-analyzer/wireshark/wireshark-4.0.15.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
new file mode 100644
index ..808132d6248f
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+   inherit git-r3
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+   inherit verify-sig
+
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
+

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

2024-04-04 Thread Sam James

commit: c44997b20192165b696d06876edcb2bf511bd60e
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Apr  4 14:35:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 05:38:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44997b2

net-analyzer/wireshark: install headers and pkgconfig file

Closes: https://bugs.gentoo.org/928577
Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36100
Signed-off-by: Sam James  gentoo.org>

 .../wireshark/{wireshark-4.2.4.ebuild => wireshark-4.2.4-r1.ebuild}   | 4 +++-
 net-analyzer/wireshark/wireshark-.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-4.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild
similarity index 98%
rename from net-analyzer/wireshark/wireshark-4.2.4.ebuild
rename to net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild
index 4f2a6bd3fbd9..0e0d86d74067 100644
--- a/net-analyzer/wireshark/wireshark-4.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild
@@ -282,7 +282,9 @@ src_test() {
 }
 
 src_install() {
-   cmake_src_install
+   # bug #928577
+   # 
https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd
+   cmake_src_install install-headers
 
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 4f2a6bd3fbd9..0e0d86d74067 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -282,7 +282,9 @@ src_test() {
 }
 
 src_install() {
-   cmake_src_install
+   # bug #928577
+   # 
https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd
+   cmake_src_install install-headers
 
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*

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

2024-04-03 Thread Sam James

commit: 920701567513ffae3792f6e02c5674e2098dc60e
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  4 02:44:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  4 02:44:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92070156

net-analyzer/wireshark: need dev-libs/libxslt for docs too

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

 net-analyzer/wireshark/wireshark-4.2.4.ebuild | 1 +
 net-analyzer/wireshark/wireshark-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-analyzer/wireshark/wireshark-4.2.4.ebuild 
b/net-analyzer/wireshark/wireshark-4.2.4.ebuild
index 85a551d53184..4f2a6bd3fbd9 100644
--- a/net-analyzer/wireshark/wireshark-4.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.4.ebuild
@@ -112,6 +112,7 @@ BDEPEND="
doc? (
app-text/doxygen
dev-ruby/asciidoctor
+   dev-libs/libxslt
)
gui? (
qt6? (

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 17400f26949a..9797505ac225 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -112,6 +112,7 @@ BDEPEND="
doc? (
app-text/doxygen
dev-ruby/asciidoctor
+   dev-libs/libxslt
)
gui? (
qt6? (

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

2024-04-03 Thread Sam James

commit: 1f92fd8808b9d5239fd4961bde6fd04a4107b3ed
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  4 02:44:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  4 02:44:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f92fd88

net-analyzer/wireshark: sync live

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

 net-analyzer/wireshark/wireshark-.ebuild | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 9797505ac225..4f2a6bd3fbd9 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -23,16 +23,15 @@ else
SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
S="${WORKDIR}/${P/_/}"
 
-   # 4.1.x is an experimental release until 4.2
-   #if [[ ${PV} != *_rc* ]] ; then
-   #   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
-   #fi
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~amd64 ~arm64 ~hppa"
+   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 lua lz4 maxminddb"
+IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 
maxminddb"
 IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt"
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
@@ -56,6 +55,7 @@ RDEPEND="
ciscodump? ( >=net-libs/libssh-0.6:= )
filecaps? ( sys-libs/libcap )
http2? ( >=net-libs/nghttp2-1.11.0:= )
+   http3? ( net-libs/nghttp3 )
ilbc? ( media-libs/libilbc:= )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
@@ -249,6 +249,7 @@ src_configure() {
-DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)
-DENABLE_NGHTTP2=$(usex http2)
+   -DENABLE_NGHTTP3=$(usex http3)
-DENABLE_OPUS=$(usex opus)
-DENABLE_PCAP=$(usex pcap)
-DENABLE_PLUGINS=$(usex plugins)

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

2024-04-03 Thread Sam James

commit: 0050375f3b5870a1db7ac065f3a3395e043d748e
Author: Christopher Fore  posteo  net>
AuthorDate: Thu Apr  4 01:28:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  4 02:27:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0050375f

net-analyzer/wireshark: add 4.0.14, 4.2.4, drop 4.1.0

- 4.0.14 security bump, also add 4.2.4
- New USE flag for 4.2.x, http3
- Unkeyword 4.2.4 to match net-libs/http3
- Drop 4.1.0 since it was a dev release

Bug: https://bugs.gentoo.org/921528
Signed-off-by: Christopher Fore  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/34685
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest|  6 --
 net-analyzer/wireshark/metadata.xml|  1 +
 ...eshark-4.1.0.ebuild => wireshark-4.0.14.ebuild} | 24 +++---
 ...reshark-4.1.0.ebuild => wireshark-4.2.4.ebuild} | 11 +-
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d6827f8a458e..3959fedc5576 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,6 @@
 DIST wireshark-4.0.11-signatures.txt 2521 BLAKE2B 
3fce906f2050fb990d80b912919c46d0e6e087c66a36bc18e8c57fa19d7ef7e966a26842770370e1211c4e4644deed31091ec929c53c80bfcdb1e472b149bd7c
 SHA512 
d9b15d14b8e061bf2f4aaf0121c295db1992b7cbbb56e67b48fff4110e897f4f0d40304bdeaced2031bc802796a6f3ea7ba62a730f82d7469658924313f301a4
 DIST wireshark-4.0.11.tar.xz 43153680 BLAKE2B 
1a90b9c20773758dbcfad85ea9a5c180e846307701ce75a471699544507b6dcf7cab611b5d71056d68ec1646a951729d7df416ef1a9a473bf96d9bf5a7066ebc
 SHA512 
c027b279f9bc761c5c701131df9e57d3f2568129f63c919cd744f6626843eb0e000caebc3e01c9a10eedad35874c01c880d2c736b62f8e841da35c375a37c53f
-DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B 
bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34
 SHA512 
ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a
-DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B 
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
 SHA512 
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0
+DIST wireshark-4.0.14-signatures.txt 2521 BLAKE2B 
371bf67dc0f36fe46848fef77194e221879db1ff422420949ba0fce4280fb9ee84ca18363046a0ce6fd1e7879ba336c1c16c9bdea13b8d14f14137f59d76212e
 SHA512 
f084d454d1756be35e1e1ed4636cb994bd9c49bd4666d355ce3719d526bf71f9e3cc929b4dca311231d43b046711b223a379c6d915aa260966f0b7bab8a8e352
+DIST wireshark-4.0.14.tar.xz 43186416 BLAKE2B 
1b67079cc0f9cdc33ce7e2fce0b49deb4d3016db79099a3bd2003099477a3bac43d4e31d4820c72a92135cca14572ac46406f41e477d794a63e96a6329d30199
 SHA512 
e88a4b2f41489f3ffe82c4c79c9c89ec521d931a716a5dacaede28c03b0625a0603935e723d5d869f801cfcab440a7d2f310c910707e15f9b0bca0c131398d73
+DIST wireshark-4.2.4-signatures.txt 2706 BLAKE2B 
169c7eea2d89f4eedc58e833512cf813dfe76cbb76eb505d47153c1dc55f6d838b7a0187fdee4dae214ea04a3e062dd13f64df460fb16c042a889aac28e4428e
 SHA512 
273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9
+DIST wireshark-4.2.4.tar.xz 44986232 BLAKE2B 
03806a167a4b055409fadbc54ba338c9d2790df3ac2b9fb547c640c67d7bee6a3f8f19d30549228e494cabf8d303cef42ff098a9e1f45b092589643e568632f5
 SHA512 
963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index c9327b01fd97..50ce497801f7 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -36,6 +36,7 @@
Install dpauxmon, an external capture 
interface (extcap) that captures DisplayPort AUX channel data from linux kernel 
drivers
Install dumpcap, to dump network traffic 
from inside wireshark
Install editcap, to edit and/or translate 
the format of capture files
+   Install net-libs/nghttp3 for 
enhanced HTTP3 analysis
Build with iLBC support in RTP Player using 
media-libs/libilbc
Use dev-libs/libxml2 for 
handling XML configuration in dissectors
Use dev-libs/libmaxminddb for 
IP address geolocation

diff --git a/net-analyzer/wireshark/wireshark-4.1.0.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.14.ebuild
similarity index 93%
copy from net-analyzer/wireshark/wireshark-4.1.0.ebuild
copy to net-analyzer/wireshark/wireshark-4.0.14.ebuild
index 17400f26949a..808132d6248f 100644
--- a/net-analyzer/wireshark/wireshark-4.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.14.ebuild
@@ -4,10 +4,9 @@
 EAPI=8

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

2023-12-27 Thread Sam James

commit: 13512c2eed433e1b7b8c7261198f0a75d6aa0b1e
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 04:24:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 04:24:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13512c2e

net-analyzer/wireshark: drop 4.0.8, 4.0.10

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

 net-analyzer/wireshark/Manifest|   3 -
 net-analyzer/wireshark/wireshark-4.0.10.ebuild | 341 -
 net-analyzer/wireshark/wireshark-4.0.8.ebuild  | 316 ---
 3 files changed, 660 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6b78fd3b89c6..d6827f8a458e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,7 +1,4 @@
-DIST wireshark-4.0.10-signatures.txt 2521 BLAKE2B 
14ff83e9514b611909a010f750f904c735bc11ecb9fb7f3faebe8e27655c981f8ec9e20481775257c5aa28a1f67e87a708ae4fc0eb6032ebc5c422c1f8ba9e9e
 SHA512 
16dab47407ec56a8e6672404feb50b1a0af7a9e71e761488ad803d6b0c96195edd74387be6b410a40b40c5908923d13d74612228361e3aa388aef0d931ffa023
-DIST wireshark-4.0.10.tar.xz 43124192 BLAKE2B 
f5121ae15df79d7d8e1bf6f65e566a556b848f623e876a3d6e92a501074e987aaa08a0056be5b42131518e89e0d358efd450f6b8399313cf836883ed345dde48
 SHA512 
695a5617100195aad92ecc38a29c3b765018fee49913dd6025b2e19d1ec5c5c4ed4195a79b5caa9cf0e8476db237e74bb602e56e9d2989ae852298767eaffbe5
 DIST wireshark-4.0.11-signatures.txt 2521 BLAKE2B 
3fce906f2050fb990d80b912919c46d0e6e087c66a36bc18e8c57fa19d7ef7e966a26842770370e1211c4e4644deed31091ec929c53c80bfcdb1e472b149bd7c
 SHA512 
d9b15d14b8e061bf2f4aaf0121c295db1992b7cbbb56e67b48fff4110e897f4f0d40304bdeaced2031bc802796a6f3ea7ba62a730f82d7469658924313f301a4
 DIST wireshark-4.0.11.tar.xz 43153680 BLAKE2B 
1a90b9c20773758dbcfad85ea9a5c180e846307701ce75a471699544507b6dcf7cab611b5d71056d68ec1646a951729d7df416ef1a9a473bf96d9bf5a7066ebc
 SHA512 
c027b279f9bc761c5c701131df9e57d3f2568129f63c919cd744f6626843eb0e000caebc3e01c9a10eedad35874c01c880d2c736b62f8e841da35c375a37c53f
-DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
 DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B 
bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34
 SHA512 
ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a
 DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B 
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
 SHA512 
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0

diff --git a/net-analyzer/wireshark/wireshark-4.0.10.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.10.ebuild
deleted file mode 100644
index b93870af7ae4..
--- a/net-analyzer/wireshark/wireshark-4.0.10.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/;
-
-if [[ ${PV} == ** ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
-   inherit git-r3
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
-   inherit verify-sig
-
-   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
-   S="${WORKDIR}/${P/_/}"
-
-   if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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} )
-"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.

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

2023-12-20 Thread Arthur Zamarin

commit: 6ddb00da12829c9be8ecf6655313b9c1ecc44e42
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec 21 07:26:23 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec 21 07:26:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ddb00da

net-analyzer/wireshark: Stabilize 4.0.11 x86, #920211

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.11.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.11.ebuild
index 9be3c33a2f7a..f9e10855f568 100644
--- a/net-analyzer/wireshark/wireshark-4.0.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.11.ebuild
@@ -23,7 +23,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi

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

2023-11-17 Thread Sam James

commit: e7708424b1ed5879c6be30485a1a8d8b9d5a1b3b
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 17 13:57:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 13:58:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7708424

net-analyzer/wireshark: add 4.0.11

I'll be doing 4.2.0 later.

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

 net-analyzer/wireshark/Manifest|   2 +
 net-analyzer/wireshark/wireshark-4.0.11.ebuild | 341 +
 2 files changed, 343 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a8f348ed9664..6b78fd3b89c6 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,7 @@
 DIST wireshark-4.0.10-signatures.txt 2521 BLAKE2B 
14ff83e9514b611909a010f750f904c735bc11ecb9fb7f3faebe8e27655c981f8ec9e20481775257c5aa28a1f67e87a708ae4fc0eb6032ebc5c422c1f8ba9e9e
 SHA512 
16dab47407ec56a8e6672404feb50b1a0af7a9e71e761488ad803d6b0c96195edd74387be6b410a40b40c5908923d13d74612228361e3aa388aef0d931ffa023
 DIST wireshark-4.0.10.tar.xz 43124192 BLAKE2B 
f5121ae15df79d7d8e1bf6f65e566a556b848f623e876a3d6e92a501074e987aaa08a0056be5b42131518e89e0d358efd450f6b8399313cf836883ed345dde48
 SHA512 
695a5617100195aad92ecc38a29c3b765018fee49913dd6025b2e19d1ec5c5c4ed4195a79b5caa9cf0e8476db237e74bb602e56e9d2989ae852298767eaffbe5
+DIST wireshark-4.0.11-signatures.txt 2521 BLAKE2B 
3fce906f2050fb990d80b912919c46d0e6e087c66a36bc18e8c57fa19d7ef7e966a26842770370e1211c4e4644deed31091ec929c53c80bfcdb1e472b149bd7c
 SHA512 
d9b15d14b8e061bf2f4aaf0121c295db1992b7cbbb56e67b48fff4110e897f4f0d40304bdeaced2031bc802796a6f3ea7ba62a730f82d7469658924313f301a4
+DIST wireshark-4.0.11.tar.xz 43153680 BLAKE2B 
1a90b9c20773758dbcfad85ea9a5c180e846307701ce75a471699544507b6dcf7cab611b5d71056d68ec1646a951729d7df416ef1a9a473bf96d9bf5a7066ebc
 SHA512 
c027b279f9bc761c5c701131df9e57d3f2568129f63c919cd744f6626843eb0e000caebc3e01c9a10eedad35874c01c880d2c736b62f8e841da35c375a37c53f
 DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
 DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B 
bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34
 SHA512 
ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a
 DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B 
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
 SHA512 
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0

diff --git a/net-analyzer/wireshark/wireshark-4.0.11.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.11.ebuild
new file mode 100644
index ..b93870af7ae4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.11.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+   inherit git-r3
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+   inherit verify-sig
+
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
+   S="${WORKDIR}/${P/_/}"
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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} )
+"
+
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( test ) test"
+
+# bug #753062 for speexdsp
+RDEPEND="
+   acct-group/pcap
+

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

2023-10-27 Thread Michał Górny

commit: 1b1b86489ebeaa645121554aac453bdc707d113a
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 22 12:50:28 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 27 15:18:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b1b8648

net-analyzer/wireshark: Remove redundant local flag descs

Signed-off-by: Michał Górny  gentoo.org>

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

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 5323edd20117..d39a53050aa9 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -29,7 +29,6 @@

Install androiddump, an extcap 
interface to capture from Android devices
Use media-libs/bcg729 for G.729 
codec support in RTP Player
-   Use app-arch/brotli for 
compression/decompression
Install capinfos, to print information 
about capture files
Install captype, to print the file types 
of capture files
Install ciscodump, extcap interface to 
capture from a remote Cisco router

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

2023-10-05 Thread Sam James

commit: d4eaf2e0e20a2a09ca98b4df81541327e2bd3a26
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  6 04:08:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  6 04:08:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4eaf2e0

net-analyzer/wireshark: add 4.0.10

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

 net-analyzer/wireshark/Manifest|   2 +
 net-analyzer/wireshark/wireshark-4.0.10.ebuild | 341 +
 2 files changed, 343 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 96ecd512a2e7..08df83e70bb9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,5 @@
+DIST wireshark-4.0.10-signatures.txt 2521 BLAKE2B 
14ff83e9514b611909a010f750f904c735bc11ecb9fb7f3faebe8e27655c981f8ec9e20481775257c5aa28a1f67e87a708ae4fc0eb6032ebc5c422c1f8ba9e9e
 SHA512 
16dab47407ec56a8e6672404feb50b1a0af7a9e71e761488ad803d6b0c96195edd74387be6b410a40b40c5908923d13d74612228361e3aa388aef0d931ffa023
+DIST wireshark-4.0.10.tar.xz 43124192 BLAKE2B 
f5121ae15df79d7d8e1bf6f65e566a556b848f623e876a3d6e92a501074e987aaa08a0056be5b42131518e89e0d358efd450f6b8399313cf836883ed345dde48
 SHA512 
695a5617100195aad92ecc38a29c3b765018fee49913dd6025b2e19d1ec5c5c4ed4195a79b5caa9cf0e8476db237e74bb602e56e9d2989ae852298767eaffbe5
 DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
 DIST wireshark-4.0.9-signatures.txt 2503 BLAKE2B 
830d4630826bbf644c3d0b1dbb5df32ba460448c59b07a307987d68354305c6fbe6c4700a38abe493f80883d90425bf9ec330f4155006fca4d1bff37f42df6dd
 SHA512 
d813145850e13a3c77e2edba66f3606667b685d657b04e4ee5bc3b1f6d26a50fb492a2de91447ad07dd358a7c3bbe2b2ccd30ade30da943071daabd006eddffb
 DIST wireshark-4.0.9.tar.xz 43130608 BLAKE2B 
9a7760711e761f382496123ca4578a0e6b834de85999a908f24e16ac48ebd3f3ea17e8c29d422f13f67b168ac7accb2cd394a78714b3c543077909a40029a660
 SHA512 
4700f41f38f23801267c035557b27c151b718542e830460ab895c87d976c44606397b98b9d48b72a7cdd3917aa744794cbccac5babbb6de94a7bd59e8d91e1f0

diff --git a/net-analyzer/wireshark/wireshark-4.0.10.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.10.ebuild
new file mode 100644
index ..b93870af7ae4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.10.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+   inherit git-r3
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+   inherit verify-sig
+
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
+   S="${WORKDIR}/${P/_/}"
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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} )
+"
+
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( 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 )
+

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

2023-10-05 Thread Sam James

commit: 33b6c5807156cea1f6c61b5e61c1800e2f649611
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  6 04:08:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  6 04:08:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b6c580

net-analyzer/wireshark: drop 4.0.9

4.0.9 was a short-lived release. use 4.0.10.

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

 net-analyzer/wireshark/Manifest   |   2 -
 net-analyzer/wireshark/wireshark-4.0.9.ebuild | 341 --
 2 files changed, 343 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 08df83e70bb9..a8f348ed9664 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,7 +1,5 @@
 DIST wireshark-4.0.10-signatures.txt 2521 BLAKE2B 
14ff83e9514b611909a010f750f904c735bc11ecb9fb7f3faebe8e27655c981f8ec9e20481775257c5aa28a1f67e87a708ae4fc0eb6032ebc5c422c1f8ba9e9e
 SHA512 
16dab47407ec56a8e6672404feb50b1a0af7a9e71e761488ad803d6b0c96195edd74387be6b410a40b40c5908923d13d74612228361e3aa388aef0d931ffa023
 DIST wireshark-4.0.10.tar.xz 43124192 BLAKE2B 
f5121ae15df79d7d8e1bf6f65e566a556b848f623e876a3d6e92a501074e987aaa08a0056be5b42131518e89e0d358efd450f6b8399313cf836883ed345dde48
 SHA512 
695a5617100195aad92ecc38a29c3b765018fee49913dd6025b2e19d1ec5c5c4ed4195a79b5caa9cf0e8476db237e74bb602e56e9d2989ae852298767eaffbe5
 DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
-DIST wireshark-4.0.9-signatures.txt 2503 BLAKE2B 
830d4630826bbf644c3d0b1dbb5df32ba460448c59b07a307987d68354305c6fbe6c4700a38abe493f80883d90425bf9ec330f4155006fca4d1bff37f42df6dd
 SHA512 
d813145850e13a3c77e2edba66f3606667b685d657b04e4ee5bc3b1f6d26a50fb492a2de91447ad07dd358a7c3bbe2b2ccd30ade30da943071daabd006eddffb
-DIST wireshark-4.0.9.tar.xz 43130608 BLAKE2B 
9a7760711e761f382496123ca4578a0e6b834de85999a908f24e16ac48ebd3f3ea17e8c29d422f13f67b168ac7accb2cd394a78714b3c543077909a40029a660
 SHA512 
4700f41f38f23801267c035557b27c151b718542e830460ab895c87d976c44606397b98b9d48b72a7cdd3917aa744794cbccac5babbb6de94a7bd59e8d91e1f0
 DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B 
bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34
 SHA512 
ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a
 DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B 
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
 SHA512 
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0

diff --git a/net-analyzer/wireshark/wireshark-4.0.9.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.9.ebuild
deleted file mode 100644
index b93870af7ae4..
--- a/net-analyzer/wireshark/wireshark-4.0.9.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/;
-
-if [[ ${PV} == ** ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
-   inherit git-r3
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
-   inherit verify-sig
-
-   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
-   S="${WORKDIR}/${P/_/}"
-
-   if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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} )
-"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( test ) test"
-
-# bug #753062 for speexdsp
-RDEPEND="
-   acct-group/pcap
-   >=dev-libs/glib-2.50.0:2
-

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

2023-10-05 Thread Sam James

commit: 1c1d3276ca171da1934fcd62618dbdc9d9afe173
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct  5 23:59:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  5 23:59:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1d3276

net-analyzer/wireshark: drop 4.0.6, 4.0.7

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

 net-analyzer/wireshark/Manifest   |   2 -
 net-analyzer/wireshark/wireshark-4.0.6.ebuild | 316 --
 net-analyzer/wireshark/wireshark-4.0.7.ebuild | 316 --
 3 files changed, 634 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 56bb06098da3..267154ecf924 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,3 @@
-DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b
-DIST wireshark-4.0.7.tar.xz 43113752 BLAKE2B 
06d4863fe796da8d3b97144a8b24430741ea8f58a8401a56327e0db37e5a7e81e63ab43325c87195a535565af7cb1265e25f8c62600ae69d549da479951bb9a1
 SHA512 
98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab
 DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
 DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B 
bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34
 SHA512 
ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a
 DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B 
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
 SHA512 
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0

diff --git a/net-analyzer/wireshark/wireshark-4.0.6.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
deleted file mode 100644
index 2a642376f5e0..
--- a/net-analyzer/wireshark/wireshark-4.0.6.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-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="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} )
-"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( 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? (
-

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

2023-10-05 Thread Sam James

commit: ecc355065fbd5135ada8fd0052ea3381afe9f1f3
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  6 00:05:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  6 00:08:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc35506

net-analyzer/wireshark: add 4.0.9 (now with verify-sig)

Backport the verify-sig bits from 4.1.0.

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

 net-analyzer/wireshark/Manifest   |   2 +
 net-analyzer/wireshark/wireshark-4.0.9.ebuild | 341 ++
 2 files changed, 343 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 267154ecf924..96ecd512a2e7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,5 @@
 DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
+DIST wireshark-4.0.9-signatures.txt 2503 BLAKE2B 
830d4630826bbf644c3d0b1dbb5df32ba460448c59b07a307987d68354305c6fbe6c4700a38abe493f80883d90425bf9ec330f4155006fca4d1bff37f42df6dd
 SHA512 
d813145850e13a3c77e2edba66f3606667b685d657b04e4ee5bc3b1f6d26a50fb492a2de91447ad07dd358a7c3bbe2b2ccd30ade30da943071daabd006eddffb
+DIST wireshark-4.0.9.tar.xz 43130608 BLAKE2B 
9a7760711e761f382496123ca4578a0e6b834de85999a908f24e16ac48ebd3f3ea17e8c29d422f13f67b168ac7accb2cd394a78714b3c543077909a40029a660
 SHA512 
4700f41f38f23801267c035557b27c151b718542e830460ab895c87d976c44606397b98b9d48b72a7cdd3917aa744794cbccac5babbb6de94a7bd59e8d91e1f0
 DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B 
bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34
 SHA512 
ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a
 DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B 
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
 SHA512 
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0

diff --git a/net-analyzer/wireshark/wireshark-4.0.9.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.9.ebuild
new file mode 100644
index ..b93870af7ae4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.9.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
+   inherit git-r3
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+   inherit verify-sig
+
+   
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
+   S="${WORKDIR}/${P/_/}"
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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} )
+"
+
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( 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? (

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

2023-09-26 Thread Sam James

commit: 195b83ad53752d4f366adee69f1b26f93b0e2042
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 05:44:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 05:44:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195b83ad

net-analyzer/wireshark: Stabilize 4.0.8 amd64, #914788

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.8.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
index 5e20d33d7ca0..2a642376f5e0 100644
--- a/net-analyzer/wireshark/wireshark-4.0.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi

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

2023-09-26 Thread Sam James

commit: b1895d216217409c59bed0fa3c93d3897b0c432e
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 05:27:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 05:27:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1895d21

net-analyzer/wireshark: Stabilize 4.0.8 x86, #914788

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.8.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
index f60e3340a8e8..5e20d33d7ca0 100644
--- a/net-analyzer/wireshark/wireshark-4.0.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi

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

2023-09-26 Thread Sam James

commit: b9c9d99f89909c72a55de92f3b3a5a8e990d9505
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 05:23:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 05:23:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c9d99f

net-analyzer/wireshark: Stabilize 4.0.8 ppc64, #914788

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.8.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
index d6647dd933c0..f60e3340a8e8 100644
--- a/net-analyzer/wireshark/wireshark-4.0.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
fi
 fi

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

2023-09-26 Thread Sam James

commit: d9d096430d897b2ec1d66465b2c467839b897a86
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 04:46:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 04:46:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d09643

net-analyzer/wireshark: Stabilize 4.0.8 arm64, #914788

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.8.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
index 46a766fba830..d6647dd933c0 100644
--- a/net-analyzer/wireshark/wireshark-4.0.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi

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

2023-09-26 Thread Sam James

commit: 06c85865e312c961fc5e5602df973dcd76263d59
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 04:46:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 04:46:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c85865

net-analyzer/wireshark: Stabilize 4.0.8 arm, #914788

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.8.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
index 7aec333de3c4..46a766fba830 100644
--- a/net-analyzer/wireshark/wireshark-4.0.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi

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

2023-09-13 Thread Michał Górny

commit: 641ec528b58922e5be1af2cc8516a90510232a7f
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 05:31:03 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Sep 14 05:30:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641ec528

net-analyzer/wireshark: add support for verify-sig

Bug: https://bugs.gentoo.org/913394
Closes: https://github.com/gentoo/gentoo/pull/20401
Closes: https://github.com/gentoo/gentoo/pull/32575
Signed-off-by: Sam James  gentoo.org>
Signed-off-by: Michał Górny  gentoo.org>

 net-analyzer/wireshark/Manifest   |  1 +
 net-analyzer/wireshark/wireshark-4.1.0.ebuild | 25 +
 net-analyzer/wireshark/wireshark-.ebuild  | 25 +
 3 files changed, 51 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 84b53db047b2..56bb06098da3 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,5 @@
 DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b
 DIST wireshark-4.0.7.tar.xz 43113752 BLAKE2B 
06d4863fe796da8d3b97144a8b24430741ea8f58a8401a56327e0db37e5a7e81e63ab43325c87195a535565af7cb1265e25f8c62600ae69d549da479951bb9a1
 SHA512 
98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab
 DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
+DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B 
bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34
 SHA512 
ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a
 DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B 
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
 SHA512 
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0

diff --git a/net-analyzer/wireshark/wireshark-4.1.0.ebuild 
b/net-analyzer/wireshark/wireshark-4.1.0.ebuild
index 084bda174c0f..0352bd2a3968 100644
--- a/net-analyzer/wireshark/wireshark-4.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.1.0.ebuild
@@ -16,7 +16,11 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
inherit git-r3
 else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+   inherit verify-sig
+

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
S="${WORKDIR}/${P/_/}"
 
# 4.1.x is an experimental release until 4.2
@@ -130,6 +134,10 @@ RDEPEND="
selinux? ( sec-policy/selinux-wireshark )
 "
 
+if [[ ${PV} != ** ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )"
+fi
+
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 )
@@ -147,6 +155,23 @@ pkg_setup() {
python-any-r1_pkg_setup
 }
 
+src_unpack() {
+   if [[ ${PV} == ** ]] ; then
+   git-r3_src_unpack
+   else
+   if use verify-sig ; then
+   cd "${DISTDIR}" || die
+   verify-sig_verify_signed_checksums \
+   ${P}-signatures.txt \
+   openssl-dgst \
+   ${P}.tar.xz
+   cd "${WORKDIR}" || die
+   fi
+
+   default
+   fi
+}
+
 src_configure() {
local mycmakeargs
 

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 084bda174c0f..0352bd2a3968 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -16,7 +16,11 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
inherit git-r3
 else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+   inherit verify-sig
+

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
S="${WORKDIR}/${P/_/}"
 
#

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

2023-09-01 Thread Sam James

commit: 1b22551efd9dcf34c5aa1775d9c0bd3d6170874c
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  1 07:19:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  1 07:19:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b22551e

Revert "net-analyzer/wireshark: add support for verify-sig"

This reverts commit 7089cafea400d1c7c55f5d2c8f9e558b3be2ddd6.

I'd forgot I had this staged.

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

 net-analyzer/wireshark/Manifest   |  1 -
 net-analyzer/wireshark/wireshark-4.1.0.ebuild | 23 ---
 net-analyzer/wireshark/wireshark-.ebuild  | 22 --
 3 files changed, 46 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 56bb06098da3..84b53db047b2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,4 @@
 DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b
 DIST wireshark-4.0.7.tar.xz 43113752 BLAKE2B 
06d4863fe796da8d3b97144a8b24430741ea8f58a8401a56327e0db37e5a7e81e63ab43325c87195a535565af7cb1265e25f8c62600ae69d549da479951bb9a1
 SHA512 
98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab
 DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
-DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B 
bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34
 SHA512 
ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a
 DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B 
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
 SHA512 
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0

diff --git a/net-analyzer/wireshark/wireshark-4.1.0.ebuild 
b/net-analyzer/wireshark/wireshark-4.1.0.ebuild
index 6747da08152b..084bda174c0f 100644
--- a/net-analyzer/wireshark/wireshark-4.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.1.0.ebuild
@@ -16,11 +16,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
inherit git-r3
 else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
-   inherit verify-sig
-

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
S="${WORKDIR}/${P/_/}"
 
# 4.1.x is an experimental release until 4.2
@@ -134,10 +130,6 @@ RDEPEND="
selinux? ( sec-policy/selinux-wireshark )
 "
 
-if [[ ${PV} != ** ]] ; then
-   BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-wireshark )"
-fi
-
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 )
@@ -155,21 +147,6 @@ pkg_setup() {
python-any-r1_pkg_setup
 }
 
-src_unpack() {
-   if [[ ${PV} == ** ]] ; then
-   git-r3_src_unpack
-   else
-   if use verify-sig ; then
-   verify-sig_verify_signed_checksums \
-   "${DISTDIR}"/${P}-signatures.txt \
-   sha256 \
-   "${DISTDIR}"/${P}.tar.xz
-   fi
-
-   default
-   fi
-}
-
 src_configure() {
local mycmakeargs
 

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 793a8e820343..084bda174c0f 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -16,11 +16,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
inherit git-r3
 else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
-   inherit verify-sig
-

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
-   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
S="${WORKDIR}/${P/_/}"
 
# 4.1.x is an experimental release until 4.2
@@ -133,9 +129,6 @@ RDEPEND="
gui? ( virtual/freedesktop-icon-theme )
selinux? (

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

2023-09-01 Thread Sam James

commit: 7089cafea400d1c7c55f5d2c8f9e558b3be2ddd6
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 05:31:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  1 07:18:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7089cafe

net-analyzer/wireshark: add support for verify-sig

Signed-off-by: Sam James  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/20401
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/Manifest   |  1 +
 net-analyzer/wireshark/wireshark-4.1.0.ebuild | 23 +++
 net-analyzer/wireshark/wireshark-.ebuild  | 22 ++
 3 files changed, 46 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 84b53db047b2..56bb06098da3 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,5 @@
 DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b
 DIST wireshark-4.0.7.tar.xz 43113752 BLAKE2B 
06d4863fe796da8d3b97144a8b24430741ea8f58a8401a56327e0db37e5a7e81e63ab43325c87195a535565af7cb1265e25f8c62600ae69d549da479951bb9a1
 SHA512 
98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab
 DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
+DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B 
bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34
 SHA512 
ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a
 DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B 
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
 SHA512 
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0

diff --git a/net-analyzer/wireshark/wireshark-4.1.0.ebuild 
b/net-analyzer/wireshark/wireshark-4.1.0.ebuild
index 084bda174c0f..6747da08152b 100644
--- a/net-analyzer/wireshark/wireshark-4.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.1.0.ebuild
@@ -16,7 +16,11 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
inherit git-r3
 else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+   inherit verify-sig
+

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
S="${WORKDIR}/${P/_/}"
 
# 4.1.x is an experimental release until 4.2
@@ -130,6 +134,10 @@ RDEPEND="
selinux? ( sec-policy/selinux-wireshark )
 "
 
+if [[ ${PV} != ** ]] ; then
+   BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-wireshark )"
+fi
+
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 )
@@ -147,6 +155,21 @@ pkg_setup() {
python-any-r1_pkg_setup
 }
 
+src_unpack() {
+   if [[ ${PV} == ** ]] ; then
+   git-r3_src_unpack
+   else
+   if use verify-sig ; then
+   verify-sig_verify_signed_checksums \
+   "${DISTDIR}"/${P}-signatures.txt \
+   sha256 \
+   "${DISTDIR}"/${P}.tar.xz
+   fi
+
+   default
+   fi
+}
+
 src_configure() {
local mycmakeargs
 

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 084bda174c0f..793a8e820343 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -16,7 +16,11 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark;
inherit git-r3
 else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+   inherit verify-sig
+

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
+   SRC_URI+=" verify-sig? ( 
https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt 
)"
S="${WORKDIR}/${P/_/}"
 
# 4.1.x is an experimental release until 4.2
@@ -129,6 +133,9 @@ RDEPEND="
gui? ( virtual/freedesktop-icon-theme )
selinux? ( sec-policy/selinux-wireshark )

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

2023-08-25 Thread Sam James

commit: 6b485c6d9180892d5ae4912f35a490999d8a5246
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 04:27:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 04:27:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b485c6d

net-analyzer/wireshark: add 4.1.0 (unkeyworded)

4.1.0 is a preview for 4.2.x.

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

 net-analyzer/wireshark/Manifest   |  1 +
 .../{wireshark-.ebuild => wireshark-4.1.0.ebuild} | 11 ++-
 net-analyzer/wireshark/wireshark-.ebuild  | 11 ++-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f6a6b5738dc5..84b53db047b2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
 DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b
 DIST wireshark-4.0.7.tar.xz 43113752 BLAKE2B 
06d4863fe796da8d3b97144a8b24430741ea8f58a8401a56327e0db37e5a7e81e63ab43325c87195a535565af7cb1265e25f8c62600ae69d549da479951bb9a1
 SHA512 
98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab
 DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
+DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B 
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
 SHA512 
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-4.1.0.ebuild
similarity index 97%
copy from net-analyzer/wireshark/wireshark-.ebuild
copy to net-analyzer/wireshark/wireshark-4.1.0.ebuild
index f2e8832d6897..084bda174c0f 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
 # TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -19,9 +19,10 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
-   fi
+   # 4.1.x is an experimental release until 4.2
+   #if [[ ${PV} != *_rc* ]] ; then
+   #   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   #fi
 fi
 
 LICENSE="GPL-2"
@@ -131,7 +132,6 @@ RDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-   "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
 )
 
 python_check_deps() {
@@ -215,6 +215,7 @@ src_configure() {
-DENABLE_LIBXML2=$(usex libxml2)
-DENABLE_LTO=$(usex lto)
-DENABLE_LUA=$(usex lua)
+   -DLUA_FIND_VERSIONS="${ELUA#lua}"
-DENABLE_LZ4=$(usex lz4)
-DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index f2e8832d6897..084bda174c0f 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
 # TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -19,9 +19,10 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
-   fi
+   # 4.1.x is an experimental release until 4.2
+   #if [[ ${PV} != *_rc* ]] ; then
+   #   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   #fi
 fi
 
 LICENSE="GPL-2"
@@ -131,7 +132,6 @@ RDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-   "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
 )
 
 python_check_deps() {
@@ -215,6 +215,7 @@ src_configure()

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

2023-08-25 Thread Sam James

commit: 50ab85eeaf5b24fc75ccfcdaa2a139a56bbc452b
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 04:20:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 04:20:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ab85ee

net-analyzer/wireshark: add 4.0.8

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

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-4.0.8.ebuild | 316 ++
 2 files changed, 317 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 4ed0e60977c3..f6a6b5738dc5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
 DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b
 DIST wireshark-4.0.7.tar.xz 43113752 BLAKE2B 
06d4863fe796da8d3b97144a8b24430741ea8f58a8401a56327e0db37e5a7e81e63ab43325c87195a535565af7cb1265e25f8c62600ae69d549da479951bb9a1
 SHA512 
98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab
+DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B 
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
 SHA512 
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65

diff --git a/net-analyzer/wireshark/wireshark-4.0.8.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
new file mode 100644
index ..7aec333de3c4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.8.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+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="~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} )
+"
+
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( 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 )
+   snappy? ( app-arch/snappy:= )
+   spandsp? ( media-libs/spandsp:= )
+   sshdump? ( >=net-libs/libssh-0.6:= )
+

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

2023-08-19 Thread Sam James

commit: ae92ea4673c0153227a282158d2580ff38753ed9
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 20 05:41:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 20 05:41:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae92ea46

net-analyzer/wireshark: Stabilize 4.0.7 x86, #912548

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.7.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.7.ebuild
index 8182aa2fb664..2a642376f5e0 100644
--- a/net-analyzer/wireshark/wireshark-4.0.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.7.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi

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

2023-08-19 Thread Sam James

commit: 841709545d7362015091d6d1f2eae04b916ea283
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 06:37:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 06:37:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84170954

net-analyzer/wireshark: Stabilize 4.0.7 arm64, #912548

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.7.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.7.ebuild
index 46a766fba830..d6647dd933c0 100644
--- a/net-analyzer/wireshark/wireshark-4.0.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.7.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi

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

2023-08-19 Thread Sam James

commit: 236815d23c8e5ae064edf33747a74e1d6e44dad4
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 06:34:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 06:34:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=236815d2

net-analyzer/wireshark: Stabilize 4.0.7 arm, #912548

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.7.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.7.ebuild
index 7aec333de3c4..46a766fba830 100644
--- a/net-analyzer/wireshark/wireshark-4.0.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.7.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi

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

2023-08-05 Thread Sam James

commit: 3933ef9be61c03a93003153bad2562350f49d0f4
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug  6 01:29:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug  6 01:30:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3933ef9b

net-analyzer/wireshark: drop irrelevant comment for 

See c542ffc3e5039307ede5f9f150c34e94c23c17e1.

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

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

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index e6c490a67458..f2e8832d6897 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -36,8 +36,6 @@ REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
 "
 
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
 RESTRICT="!test? ( test )"
 
 # bug #753062 for speexdsp

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

2023-07-14 Thread Sam James

commit: dd1dc29662e09caace78b9d9832e7ddb34195b4b
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 14 11:32:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 14 11:56:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1dc296

net-analyzer/wireshark: drop 3.6.13, 3.6.14, 4.0.5

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

 net-analyzer/wireshark/Manifest|   3 -
 net-analyzer/wireshark/metadata.xml|   1 -
 net-analyzer/wireshark/wireshark-3.6.13.ebuild | 276 -
 net-analyzer/wireshark/wireshark-3.6.14.ebuild | 276 -
 net-analyzer/wireshark/wireshark-4.0.5.ebuild  | 316 -
 5 files changed, 872 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 276e7cf51e5b..a0ff2cecd69e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1 @@
-DIST wireshark-3.6.13.tar.xz 39982176 BLAKE2B 
f09005dba37a96a093c4a4ac40ffdf82f929ff25be15bf208ab7f1433b3fb915552151d3a1a95362b7a9ef2e835a21f38c2bb08733e46dca3bf5ad991813286a
 SHA512 
ab6ab6deff410539fe6b5fc9c35a570951719fd040381993e710c3e0447a8ec6d8e94a5f46ce9350ac3aa9e300409c2fb3f83c735a2e0cfa1dd8ffa44edb
-DIST wireshark-3.6.14.tar.xz 40211952 BLAKE2B 
b1e84e7072afc8547b6ed5f0094bfae60d77617c9eef7a1fa55696cc5563ba46b5f2793ba430040a170e7548d6258b44e9a5f99a00eb3b48c2a8890673d1
 SHA512 
b073b5903d12b730614a3751b23641445a517ef565836677c02623e47f1cbf43ff5245e575e650aee66577250512caae4849ce8311cf31823b8349a00f73889d
-DIST wireshark-4.0.5.tar.xz 41401932 BLAKE2B 
932c017eaef6d0758a70bba3beb018e7512c41f9355c0948d744899aa79e5259cbbde6522ed216835781acd8f27d2a2b786aec0fadf33735a5b3cd324ab1a5d1
 SHA512 
fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9
 DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 13b80f4910c7..5323edd20117 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -46,7 +46,6 @@
Build with zip file compression 
support
Use dev-libs/libnl
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

diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
deleted file mode 100644
index 5bcc3eef297d..
--- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/;
-
-if [[ ${PV} == ** ]] ; 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="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 qt5 )"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( 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? (

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

2023-07-14 Thread Sam James

commit: 9436ce4147ce46286587a4f843b7a5a908737e1d
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 14 11:45:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 14 11:56:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9436ce41

net-analyzer/wireshark: add 4.0.7

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

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-4.0.7.ebuild | 316 ++
 2 files changed, 317 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index a0ff2cecd69e..4ed0e60977c3 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b
+DIST wireshark-4.0.7.tar.xz 43113752 BLAKE2B 
06d4863fe796da8d3b97144a8b24430741ea8f58a8401a56327e0db37e5a7e81e63ab43325c87195a535565af7cb1265e25f8c62600ae69d549da479951bb9a1
 SHA512 
98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab

diff --git a/net-analyzer/wireshark/wireshark-4.0.7.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.7.ebuild
new file mode 100644
index ..7aec333de3c4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.7.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+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="~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} )
+"
+
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( 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 )
+   snappy? ( app-arch/snappy:= )
+   spandsp? ( media-libs/spandsp:= )
+   sshdump? ( >=net-libs/libssh-0.6:= )
+   ssl? ( >=net-libs/gnutls-3.5.8:= )
+   wifi? ( >=net-libs/libssh-0.6:= )
+   zlib? ( sys-libs/zlib )
+   zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+   ${RDEPEND}
+   gui? (
+   !qt6? (
+   dev-qt/qtdeclarative:5
+   )
+   )
+"
+# TODO: 4.0.0_rc1

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

2023-06-17 Thread Sam James

commit: a2494b77d21f70b6e1fef71496e23740b550116e
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 17 16:09:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 17 16:09:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2494b77

net-analyzer/wireshark: add missing filter-lto for USE=-lto

Note that USE=lto is masked right now too.

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

 net-analyzer/wireshark/wireshark-3.6.13.ebuild | 2 ++
 net-analyzer/wireshark/wireshark-3.6.14.ebuild | 2 ++
 net-analyzer/wireshark/wireshark-4.0.5.ebuild  | 2 ++
 net-analyzer/wireshark/wireshark-4.0.6.ebuild  | 2 ++
 net-analyzer/wireshark/wireshark-.ebuild   | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
index 0079012cf99c..5bcc3eef297d 100644
--- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
@@ -136,6 +136,8 @@ src_configure() {
append-cxxflags -fPIC -DPIC
fi
 
+   ! use lto && filter-lto
+
python_setup
 
mycmakeargs+=(

diff --git a/net-analyzer/wireshark/wireshark-3.6.14.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
index 1aa6426c7849..883f96d5450c 100644
--- a/net-analyzer/wireshark/wireshark-3.6.14.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
@@ -136,6 +136,8 @@ src_configure() {
append-cxxflags -fPIC -DPIC
fi
 
+   ! use lto && filter-lto
+
python_setup
 
mycmakeargs+=(

diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
index 6039d7e9573b..cd157e078c5f 100644
--- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
@@ -170,6 +170,8 @@ src_configure() {
append-cxxflags -fPIC -DPIC
fi
 
+   ! use lto && filter-lto
+
mycmakeargs+=(
-DPython3_EXECUTABLE="${PYTHON}"
-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)

diff --git a/net-analyzer/wireshark/wireshark-4.0.6.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
index bda06a2c3b77..2a642376f5e0 100644
--- a/net-analyzer/wireshark/wireshark-4.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
@@ -170,6 +170,8 @@ src_configure() {
append-cxxflags -fPIC -DPIC
fi
 
+   ! use lto && filter-lto
+
mycmakeargs+=(
-DPython3_EXECUTABLE="${PYTHON}"
-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 88ddb144b999..e6c490a67458 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -171,6 +171,8 @@ src_configure() {
append-cxxflags -fPIC -DPIC
fi
 
+   ! use lto && filter-lto
+
mycmakeargs+=(
-DPython3_EXECUTABLE="${PYTHON}"
-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)

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

2023-06-14 Thread Arthur Zamarin

commit: 35004b80160322385ebdec7721294d9c5ebf09b6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 14 12:30:59 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 14 12:30:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35004b80

net-analyzer/wireshark: Stabilize 4.0.6 x86, #908475

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.6.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
index 132e89740aeb..c01734e591a1 100644
--- a/net-analyzer/wireshark/wireshark-4.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi

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

2023-06-14 Thread Arthur Zamarin

commit: 908049633e7218adcc836389fad0ad1934c4556d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 14 12:31:00 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 14 12:31:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90804963

net-analyzer/wireshark: Stabilize 4.0.6 amd64, #908475

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.6.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
index c01734e591a1..bda06a2c3b77 100644
--- a/net-analyzer/wireshark/wireshark-4.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi

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

2023-06-14 Thread Arthur Zamarin

commit: 75ae39694022d8cf1225592f20a37314743f8f2b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 14 12:30:57 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 14 12:30:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ae3969

net-analyzer/wireshark: Stabilize 4.0.6 arm64, #908475

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.6.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
index 435da585a5a5..b7f911d2963c 100644
--- a/net-analyzer/wireshark/wireshark-4.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi

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

2023-06-14 Thread Arthur Zamarin

commit: b995872a52594b2b06dd91428c6bd48571edaaaf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 14 12:30:58 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 14 12:30:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b995872a

net-analyzer/wireshark: Stabilize 4.0.6 ppc64, #908475

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.6.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
index b7f911d2963c..30508d99099d 100644
--- a/net-analyzer/wireshark/wireshark-4.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
fi
 fi

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

2023-06-14 Thread Arthur Zamarin

commit: f97929555ed24ada5e853318feaf8af31ece62f3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 14 12:30:56 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 14 12:30:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9792955

net-analyzer/wireshark: Stabilize 3.6.14 ppc64, #908474

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.14.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
index 20b68880572b..1aa6426c7849 100644
--- a/net-analyzer/wireshark/wireshark-3.6.14.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

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

2023-06-14 Thread Arthur Zamarin

commit: 67a2a8c26bb2e2a941a02b3b4a65748d429d478d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 14 12:30:59 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 14 12:30:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a2a8c2

net-analyzer/wireshark: Stabilize 4.0.6 arm, #908475

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.6.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
index 30508d99099d..132e89740aeb 100644
--- a/net-analyzer/wireshark/wireshark-4.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
fi
 fi

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

2023-06-14 Thread Sam James

commit: 4243fe757ab062cd0bea2280f8c696c625328b43
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 14 06:05:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 14 06:05:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4243fe75

net-analyzer/wireshark: Stabilize 3.6.14 x86, #908474

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.14.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
index 4a0d6125aad1..84db5ae939ac 100644
--- a/net-analyzer/wireshark/wireshark-3.6.14.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

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

2023-06-14 Thread Sam James

commit: a345c030e1ef7249472b783eef9fd3b5c811b698
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 14 06:05:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 14 06:05:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a345c030

net-analyzer/wireshark: Stabilize 3.6.14 arm, #908474

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.14.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
index 84db5ae939ac..20b68880572b 100644
--- a/net-analyzer/wireshark/wireshark-3.6.14.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

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

2023-06-14 Thread Sam James

commit: c3446177c613457acb3d5c640f3b72ff3a2b4066
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 14 06:05:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 14 06:05:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3446177

net-analyzer/wireshark: Stabilize 3.6.14 arm64, #908474

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.14.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
index 772f06a55e71..4a0d6125aad1 100644
--- a/net-analyzer/wireshark/wireshark-3.6.14.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

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

2023-06-14 Thread Sam James

commit: 0390b1f233a5526d5537bc4afcb66807c927fa47
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 14 06:04:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 14 06:04:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0390b1f2

net-analyzer/wireshark: Stabilize 3.6.14 amd64, #908474

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.14.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
index 5e752f0c77c0..772f06a55e71 100644
--- a/net-analyzer/wireshark/wireshark-3.6.14.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

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

2023-06-13 Thread Sam James

commit: 30685d57d05df299140cfa76cec875655e591662
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 14 05:26:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 14 05:26:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30685d57

net-analyzer/wireshark: drop 3.6.12-r1, 4.0.4-r1

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

 net-analyzer/wireshark/Manifest   |   2 -
 net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild | 274 ---
 net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild  | 314 --
 3 files changed, 590 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 8b6729606cd1..276e7cf51e5b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,6 +1,4 @@
-DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B 
ca356c0d03d7c82463cc4503d0c1085b80fe621763c1bc369a5944dc6566f25b19fce9615239265b3620f76c92bff7d7c6e958241143c444a1b659b82d319c65
 SHA512 
a6e05e5a6b1027e3f4650a32f186d9a2cff4fb7adb2317bdeb96a7193ab45fa434572f94253a4d6e5589b0790420a445c4bbd788d8ac53e01019bb88130164f8
 DIST wireshark-3.6.13.tar.xz 39982176 BLAKE2B 
f09005dba37a96a093c4a4ac40ffdf82f929ff25be15bf208ab7f1433b3fb915552151d3a1a95362b7a9ef2e835a21f38c2bb08733e46dca3bf5ad991813286a
 SHA512 
ab6ab6deff410539fe6b5fc9c35a570951719fd040381993e710c3e0447a8ec6d8e94a5f46ce9350ac3aa9e300409c2fb3f83c735a2e0cfa1dd8ffa44edb
 DIST wireshark-3.6.14.tar.xz 40211952 BLAKE2B 
b1e84e7072afc8547b6ed5f0094bfae60d77617c9eef7a1fa55696cc5563ba46b5f2793ba430040a170e7548d6258b44e9a5f99a00eb3b48c2a8890673d1
 SHA512 
b073b5903d12b730614a3751b23641445a517ef565836677c02623e47f1cbf43ff5245e575e650aee66577250512caae4849ce8311cf31823b8349a00f73889d
-DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 
4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db
 SHA512 
e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff
 DIST wireshark-4.0.5.tar.xz 41401932 BLAKE2B 
932c017eaef6d0758a70bba3beb018e7512c41f9355c0948d744899aa79e5259cbbde6522ed216835781acd8f27d2a2b786aec0fadf33735a5b3cd324ab1a5d1
 SHA512 
fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9
 DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b

diff --git a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
deleted file mode 100644
index 0079012cf99c..
--- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/;
-
-if [[ ${PV} == ** ]] ; 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="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 qt5 )"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( 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:= )
-

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

2023-05-29 Thread Sam James

commit: 583d85e473a813ba0db00f3e71328926d5b1fa07
Author: Sam James  gentoo  org>
AuthorDate: Mon May 29 20:33:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 29 20:34:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583d85e4

net-analyzer/wireshark: Stabilize 3.6.13 arm64, #907129

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
index fa87ef976fc7..0079012cf99c 100644
--- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

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

2023-05-27 Thread Arthur Zamarin

commit: 3c5f481ca11b3472f881e11345a3fccc14cdd89f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 27 12:06:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 27 12:06:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5f481c

net-analyzer/wireshark: Stabilize 3.6.13 ppc64, #907129

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
index d8cfc572e3f7..fa87ef976fc7 100644
--- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

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

2023-05-25 Thread Arthur Zamarin

commit: 2fd2b190b0d6b48827711ef4c9dbba08f5ae4a53
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May 25 07:46:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May 25 07:46:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd2b190

net-analyzer/wireshark: Stabilize 3.6.13 amd64, #907129

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
index 9851a39de423..e529464a7b7f 100644
--- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

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

2023-05-25 Thread Arthur Zamarin

commit: 241819b1ff25076e1c771c8a7d1474b6702d79e6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May 25 07:46:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May 25 07:46:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=241819b1

net-analyzer/wireshark: Stabilize 3.6.13 x86, #907129

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
index e529464a7b7f..d8cfc572e3f7 100644
--- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

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

2023-05-25 Thread Sam James

commit: fa281fc2f7db7f83802da6ff26ccb55810073602
Author: Sam James  gentoo  org>
AuthorDate: Thu May 25 07:29:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 25 07:29:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa281fc2

net-analyzer/wireshark: Stabilize 3.6.13 arm, #907129

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
index 1e4730af8694..9851a39de423 100644
--- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

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

2023-05-25 Thread Sam James

commit: 91f6f69cad3d8d5872f0d3b22c4ab49f5e63f0a7
Author: Sam James  gentoo  org>
AuthorDate: Thu May 25 06:35:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 25 06:36:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f6f69c

net-analyzer/wireshark: add 4.0.6

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

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-4.0.6.ebuild | 314 ++
 2 files changed, 315 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 9feb38fffd87..8b6729606cd1 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,3 +3,4 @@ DIST wireshark-3.6.13.tar.xz 39982176 BLAKE2B 
f09005dba37a96a093c4a4ac40ffdf82f9
 DIST wireshark-3.6.14.tar.xz 40211952 BLAKE2B 
b1e84e7072afc8547b6ed5f0094bfae60d77617c9eef7a1fa55696cc5563ba46b5f2793ba430040a170e7548d6258b44e9a5f99a00eb3b48c2a8890673d1
 SHA512 
b073b5903d12b730614a3751b23641445a517ef565836677c02623e47f1cbf43ff5245e575e650aee66577250512caae4849ce8311cf31823b8349a00f73889d
 DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 
4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db
 SHA512 
e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff
 DIST wireshark-4.0.5.tar.xz 41401932 BLAKE2B 
932c017eaef6d0758a70bba3beb018e7512c41f9355c0948d744899aa79e5259cbbde6522ed216835781acd8f27d2a2b786aec0fadf33735a5b3cd324ab1a5d1
 SHA512 
fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9
+DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
 SHA512 
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b

diff --git a/net-analyzer/wireshark/wireshark-4.0.6.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
new file mode 100644
index ..435da585a5a5
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.6.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+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="~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} )
+"
+
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( 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
+

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

2023-05-25 Thread Sam James

commit: 9b6ca39b757ff6400ee802d430459d17a38946ad
Author: Sam James  gentoo  org>
AuthorDate: Thu May 25 06:31:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 25 06:36:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6ca39b

net-analyzer/wireshark: add 3.6.14

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

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

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 8b07092805d2..9feb38fffd87 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,5 @@
 DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B 
ca356c0d03d7c82463cc4503d0c1085b80fe621763c1bc369a5944dc6566f25b19fce9615239265b3620f76c92bff7d7c6e958241143c444a1b659b82d319c65
 SHA512 
a6e05e5a6b1027e3f4650a32f186d9a2cff4fb7adb2317bdeb96a7193ab45fa434572f94253a4d6e5589b0790420a445c4bbd788d8ac53e01019bb88130164f8
 DIST wireshark-3.6.13.tar.xz 39982176 BLAKE2B 
f09005dba37a96a093c4a4ac40ffdf82f929ff25be15bf208ab7f1433b3fb915552151d3a1a95362b7a9ef2e835a21f38c2bb08733e46dca3bf5ad991813286a
 SHA512 
ab6ab6deff410539fe6b5fc9c35a570951719fd040381993e710c3e0447a8ec6d8e94a5f46ce9350ac3aa9e300409c2fb3f83c735a2e0cfa1dd8ffa44edb
+DIST wireshark-3.6.14.tar.xz 40211952 BLAKE2B 
b1e84e7072afc8547b6ed5f0094bfae60d77617c9eef7a1fa55696cc5563ba46b5f2793ba430040a170e7548d6258b44e9a5f99a00eb3b48c2a8890673d1
 SHA512 
b073b5903d12b730614a3751b23641445a517ef565836677c02623e47f1cbf43ff5245e575e650aee66577250512caae4849ce8311cf31823b8349a00f73889d
 DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 
4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db
 SHA512 
e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff
 DIST wireshark-4.0.5.tar.xz 41401932 BLAKE2B 
932c017eaef6d0758a70bba3beb018e7512c41f9355c0948d744899aa79e5259cbbde6522ed216835781acd8f27d2a2b786aec0fadf33735a5b3cd324ab1a5d1
 SHA512 
fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9

diff --git a/net-analyzer/wireshark/wireshark-3.6.14.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
new file mode 100644
index ..5e752f0c77c0
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.14.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+HOMEPAGE="https://www.wireshark.org/;
+
+if [[ ${PV} == ** ]] ; 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="~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 qt5 )"
+
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( 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 )
+

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

2023-05-25 Thread Sam James

commit: c542ffc3e5039307ede5f9f150c34e94c23c17e1
Author: Sam James  gentoo  org>
AuthorDate: Thu May 25 06:40:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 25 06:43:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c542ffc3

net-analyzer/wireshark: re-enable tests for live

Upstream now hard-require pytest in master (good!)

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

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

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 2c6116786ce7..88ddb144b999 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..11} )
+# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -37,7 +38,7 @@ REQUIRED_USE="
 
 # Tests restricted for now because rely on pytest internals w/ >=3.11
 # See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
 
 # bug #753062 for speexdsp
 RDEPEND="

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

2023-05-16 Thread Arthur Zamarin

commit: c1c46a0b3d7371d986c4e3ce241c0a2f947702d5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May 16 18:03:07 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May 16 18:03:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c46a0b

net-analyzer/wireshark: Stabilize 4.0.5 ppc64, #906500

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
index 765d3a774d08..6039d7e9573b 100644
--- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi

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

2023-05-15 Thread Sam James

commit: 3ea9fc401dc412e1f939d82a25c6d9c0aec2a61c
Author: Sam James  gentoo  org>
AuthorDate: Tue May 16 03:38:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 16 03:38:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea9fc40

net-analyzer/wireshark: Stabilize 4.0.5 amd64, #906500

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
index 2841613a1186..c88199ff3975 100644
--- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
 fi

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

2023-05-15 Thread Sam James

commit: 339e131b47f0ec9246ae69cb38e659982db8be26
Author: Sam James  gentoo  org>
AuthorDate: Tue May 16 03:38:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 16 03:38:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=339e131b

net-analyzer/wireshark: Stabilize 4.0.5 x86, #906500

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
index 915ed9ac12ec..2841613a1186 100644
--- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
 fi

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

2023-05-15 Thread Sam James

commit: e24eff5251b49cf631c9d5f95f0bf96c1921d641
Author: Sam James  gentoo  org>
AuthorDate: Tue May 16 03:38:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 16 03:38:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24eff52

net-analyzer/wireshark: Stabilize 4.0.5 arm64, #906500

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
index c88199ff3975..765d3a774d08 100644
--- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
 fi

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

2023-05-15 Thread Sam James

commit: 7775633fabe5fa19beb7d8d1c274a4e292c0c562
Author: Sam James  gentoo  org>
AuthorDate: Tue May 16 03:38:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 16 03:38:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7775633f

net-analyzer/wireshark: Stabilize 4.0.5 arm, #906500

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
index 36658422a00e..915ed9ac12ec 100644
--- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi

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

2023-05-01 Thread Sam James

commit: ba8d3ccfbcb2693d480c960c864545f358ac6be7
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 07:59:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 08:00:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba8d3ccf

net-analyzer/wireshark: enable py3.11, restrict tests temporarily

We need to restrict tests for now because Wireshark w/ py3.11 uses pytest
internals that got removed. Unfortunately, when running tests w/ unittest,
some tests end up failing (and it's not easy to skip them), and it's much
slower.

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

 net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild | 6 --
 net-analyzer/wireshark/wireshark-3.6.13.ebuild| 6 --
 net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild  | 6 --
 net-analyzer/wireshark/wireshark-4.0.5.ebuild | 6 --
 net-analyzer/wireshark/wireshark-.ebuild  | 6 --
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
index e037030ee391..0079012cf99c 100644
--- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -32,7 +32,9 @@ IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump 
zlib +zstd"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
plugin-ifdemo? ( plugins qt5 )"
 
-RESTRICT="!test? ( test )"
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( test ) test"
 
 # bug #753062 for speexdsp
 RDEPEND="acct-group/pcap

diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
index 0e8916b20943..1e4730af8694 100644
--- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -32,7 +32,9 @@ IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump 
zlib +zstd"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
plugin-ifdemo? ( plugins qt5 )"
 
-RESTRICT="!test? ( test )"
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( test ) test"
 
 # bug #753062 for speexdsp
 RDEPEND="acct-group/pcap

diff --git a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
index b80599dfacbf..6039d7e9573b 100644
--- a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
 
@@ -35,7 +35,9 @@ REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
 "
 
-RESTRICT="!test? ( test )"
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( test ) test"
 
 # bug #753062 for speexdsp
 RDEPEND="

diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
index f22f7cd62c6b..36658422a00e 100644
--- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
 
@@ -35,7 +35,9 @@ REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
 "
 
-RESTRICT="!test? ( test )"
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( test ) test"
 
 # bug #753062 for speexdsp
 RDEPEND="

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 62593372fe05..2c6116786ce7 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -35,7 +35,9 @@ REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
 "
 
-RESTRICT="!test?

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

2023-05-01 Thread Sam James

commit: 7b6237a870e281dc44043edd89b1b7c3a367f109
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 07:57:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 08:00:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6237a8

net-analyzer/wireshark: drop 3.6.11-r1, 4.0.3-r1

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

 net-analyzer/wireshark/Manifest   |   2 -
 net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild | 272 ---
 net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild  | 312 --
 3 files changed, 586 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 02a43d10ad3d..8b07092805d2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,6 +1,4 @@
-DIST wireshark-3.6.11.tar.xz 39967744 BLAKE2B 
b313be6b2d22f62365f7a840409c49a78ce99d135e6b5f17c73c12dc12a543f5daa298a3df1693dafc79a6f3f1b184de231cc527bca0627e3c37b8ac4ce8e5a3
 SHA512 
f526e6e8f9435b69b5c3ce3a7d271f7b66365bdd84cd155ac434be0ef899cc140f58dfe55e90295bba91a8a99f28a55280366fb028d13f6ff45051a9ed3625e8
 DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B 
ca356c0d03d7c82463cc4503d0c1085b80fe621763c1bc369a5944dc6566f25b19fce9615239265b3620f76c92bff7d7c6e958241143c444a1b659b82d319c65
 SHA512 
a6e05e5a6b1027e3f4650a32f186d9a2cff4fb7adb2317bdeb96a7193ab45fa434572f94253a4d6e5589b0790420a445c4bbd788d8ac53e01019bb88130164f8
 DIST wireshark-3.6.13.tar.xz 39982176 BLAKE2B 
f09005dba37a96a093c4a4ac40ffdf82f929ff25be15bf208ab7f1433b3fb915552151d3a1a95362b7a9ef2e835a21f38c2bb08733e46dca3bf5ad991813286a
 SHA512 
ab6ab6deff410539fe6b5fc9c35a570951719fd040381993e710c3e0447a8ec6d8e94a5f46ce9350ac3aa9e300409c2fb3f83c735a2e0cfa1dd8ffa44edb
-DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 
85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb
 SHA512 
ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c
 DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 
4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db
 SHA512 
e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff
 DIST wireshark-4.0.5.tar.xz 41401932 BLAKE2B 
932c017eaef6d0758a70bba3beb018e7512c41f9355c0948d744899aa79e5259cbbde6522ed216835781acd8f27d2a2b786aec0fadf33735a5b3cd324ab1a5d1
 SHA512 
fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9

diff --git a/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild
deleted file mode 100644
index e037030ee391..
--- a/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-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="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 qt5 )"
-
-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? (
-

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

2023-04-12 Thread Sam James

commit: 22ce413173b7df966c4abb4d451af41282a59cf0
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 13 01:41:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 13 01:48:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ce4131

net-analyzer/wireshark: add 3.6.13

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

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

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 52ba8994abe8..3eeb72336477 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,5 @@
 DIST wireshark-3.6.11.tar.xz 39967744 BLAKE2B 
b313be6b2d22f62365f7a840409c49a78ce99d135e6b5f17c73c12dc12a543f5daa298a3df1693dafc79a6f3f1b184de231cc527bca0627e3c37b8ac4ce8e5a3
 SHA512 
f526e6e8f9435b69b5c3ce3a7d271f7b66365bdd84cd155ac434be0ef899cc140f58dfe55e90295bba91a8a99f28a55280366fb028d13f6ff45051a9ed3625e8
 DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B 
ca356c0d03d7c82463cc4503d0c1085b80fe621763c1bc369a5944dc6566f25b19fce9615239265b3620f76c92bff7d7c6e958241143c444a1b659b82d319c65
 SHA512 
a6e05e5a6b1027e3f4650a32f186d9a2cff4fb7adb2317bdeb96a7193ab45fa434572f94253a4d6e5589b0790420a445c4bbd788d8ac53e01019bb88130164f8
+DIST wireshark-3.6.13.tar.xz 39982176 BLAKE2B 
f09005dba37a96a093c4a4ac40ffdf82f929ff25be15bf208ab7f1433b3fb915552151d3a1a95362b7a9ef2e835a21f38c2bb08733e46dca3bf5ad991813286a
 SHA512 
ab6ab6deff410539fe6b5fc9c35a570951719fd040381993e710c3e0447a8ec6d8e94a5f46ce9350ac3aa9e300409c2fb3f83c735a2e0cfa1dd8ffa44edb
 DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 
85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb
 SHA512 
ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c
 DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 
4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db
 SHA512 
e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff

diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
new file mode 100644
index ..0e8916b20943
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+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="~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 qt5 )"
+
+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 )
+

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

2023-04-12 Thread Sam James

commit: f9feecab8cbfd5b1075dba8a6dc47be003f0b1c4
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 13 01:45:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 13 01:48:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9feecab

net-analyzer/wireshark: add 4.0.5

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

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-4.0.5.ebuild | 312 ++
 2 files changed, 313 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3eeb72336477..02a43d10ad3d 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,3 +3,4 @@ DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B 
ca356c0d03d7c82463cc4503d0c1085b80
 DIST wireshark-3.6.13.tar.xz 39982176 BLAKE2B 
f09005dba37a96a093c4a4ac40ffdf82f929ff25be15bf208ab7f1433b3fb915552151d3a1a95362b7a9ef2e835a21f38c2bb08733e46dca3bf5ad991813286a
 SHA512 
ab6ab6deff410539fe6b5fc9c35a570951719fd040381993e710c3e0447a8ec6d8e94a5f46ce9350ac3aa9e300409c2fb3f83c735a2e0cfa1dd8ffa44edb
 DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 
85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb
 SHA512 
ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c
 DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 
4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db
 SHA512 
e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff
+DIST wireshark-4.0.5.tar.xz 41401932 BLAKE2B 
932c017eaef6d0758a70bba3beb018e7512c41f9355c0948d744899aa79e5259cbbde6522ed216835781acd8f27d2a2b786aec0fadf33735a5b3cd324ab1a5d1
 SHA512 
fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9

diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
new file mode 100644
index ..f22f7cd62c6b
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+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="~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
+   )
+

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

2023-03-25 Thread Arthur Zamarin

commit: 64c98b95656148410c1636b95a931edba120e735
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 25 06:35:00 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 25 06:35:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c98b95

net-analyzer/wireshark: Stabilize 3.6.12-r1 x86, #902701

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
index 922365b2e1df..e037030ee391 100644
--- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

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

2023-03-24 Thread Arthur Zamarin

commit: af729bcd168257ecf354a60abf0fcfa573ed400f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 24 14:22:43 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 24 14:22:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af729bcd

net-analyzer/wireshark: Stabilize 3.6.12-r1 arm64, #902701

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
index 8f3e9b953561..922365b2e1df 100644
--- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

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

2023-03-24 Thread Arthur Zamarin

commit: edeebdace1def247a68a08fb70cb8546cd1e2b5c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 24 14:17:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 24 14:17:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edeebdac

net-analyzer/wireshark: Stabilize 4.0.4-r1 arm64, #902703

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
index a06e8cb1da43..b80599dfacbf 100644
--- a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi

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

2023-03-22 Thread Sam James

commit: a10ba334dea734c75a1bf5b8fabec84efb48e5dd
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 22 09:21:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 22 09:21:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10ba334

net-analyzer/wireshark: Stabilize 4.0.4-r1 ppc64, #902703

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
index df032a655d7c..a06e8cb1da43 100644
--- a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi

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

2023-03-22 Thread Sam James

commit: da0b1b3af0b25110eaaa8ad9972f9f53b43ce13c
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 22 09:21:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 22 09:21:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da0b1b3a

net-analyzer/wireshark: Stabilize 3.6.12-r1 ppc64, #902701

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
index 3cba9f8d78c4..8f3e9b953561 100644
--- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

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

2023-03-22 Thread Sam James

commit: 444e4cb18f06748becb242c92fbbc44468141001
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 22 06:00:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 22 06:00:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444e4cb1

net-analyzer/wireshark: Stabilize 3.6.12-r1 amd64, #902701

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
index fca3a1971ed6..3cba9f8d78c4 100644
--- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

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

2023-03-22 Thread Sam James

commit: 5b7313f00bf52d40ca5f67b459f48021afe3abc3
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 22 06:00:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 22 06:00:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b7313f0

net-analyzer/wireshark: Stabilize 3.6.12-r1 arm, #902701

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
index 0e8916b20943..fca3a1971ed6 100644
--- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

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

2023-03-22 Thread Sam James

commit: 030ae6351f8a3350bc6b1ae0090a019058bfbe30
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 22 06:00:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 22 06:00:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030ae635

net-analyzer/wireshark: Stabilize 4.0.4-r1 amd64, #902703

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
index d2dc92d7a044..79fb540059f4 100644
--- a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi

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

2023-03-22 Thread Sam James

commit: 7756daa0ba7a58468b7a991d968ce96a4dc8094a
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 22 06:00:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 22 06:00:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7756daa0

net-analyzer/wireshark: Stabilize 4.0.4-r1 x86, #902703

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
index 79fb540059f4..df032a655d7c 100644
--- a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
 fi

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

2023-03-22 Thread Sam James

commit: e4a06bda593c4bfd666e631b4387cfa679381f00
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 22 06:00:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 22 06:00:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a06bda

net-analyzer/wireshark: Stabilize 4.0.4-r1 arm, #902703

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
index f22f7cd62c6b..d2dc92d7a044 100644
--- a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi

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

2023-03-20 Thread Sam James

commit: d4074c06a96827673370d19806f1864ba464295b
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 20 07:27:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 20 07:34:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4074c06

net-analyzer/wireshark: drop 3.6.9, 3.6.10

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

 net-analyzer/wireshark/Manifest|   2 -
 net-analyzer/wireshark/wireshark-3.6.10.ebuild | 272 -
 net-analyzer/wireshark/wireshark-3.6.9.ebuild  | 272 -
 3 files changed, 546 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7d46a92aaae6..52ba8994abe8 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,6 +1,4 @@
-DIST wireshark-3.6.10.tar.xz 39956960 BLAKE2B 
5f283caeed4fc9b231331b90b68b25615f8c1df7639accd225590c88cebc86cca7ea95d979db6a60268a5b918f448a9b0878b9f4f8d5dccc847c6dd1fe4fddb7
 SHA512 
dbdba7a29e2b6e6c3bbc0f0d599a2b9b49efcb1540b36f2f8c55ac3850565b68dc1282b1ed1d3cd63709f12e2fe659f93de5f9473c2f23751373f3738b8e766a
 DIST wireshark-3.6.11.tar.xz 39967744 BLAKE2B 
b313be6b2d22f62365f7a840409c49a78ce99d135e6b5f17c73c12dc12a543f5daa298a3df1693dafc79a6f3f1b184de231cc527bca0627e3c37b8ac4ce8e5a3
 SHA512 
f526e6e8f9435b69b5c3ce3a7d271f7b66365bdd84cd155ac434be0ef899cc140f58dfe55e90295bba91a8a99f28a55280366fb028d13f6ff45051a9ed3625e8
 DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B 
ca356c0d03d7c82463cc4503d0c1085b80fe621763c1bc369a5944dc6566f25b19fce9615239265b3620f76c92bff7d7c6e958241143c444a1b659b82d319c65
 SHA512 
a6e05e5a6b1027e3f4650a32f186d9a2cff4fb7adb2317bdeb96a7193ab45fa434572f94253a4d6e5589b0790420a445c4bbd788d8ac53e01019bb88130164f8
-DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B 
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
 SHA512 
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
 DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 
85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb
 SHA512 
ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c
 DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 
4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db
 SHA512 
e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff

diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
deleted file mode 100644
index 06355e3161e7..
--- a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-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="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 qt5 )"
-
-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
-

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

2023-03-20 Thread Sam James

commit: 505e779d343a4fe816b4e41cbf175eb44e3a254d
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 20 07:28:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 20 07:34:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505e779d

net-analyzer/wireshark: add subslot dep on snappy

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

 .../wireshark/{wireshark-3.6.11.ebuild => wireshark-3.6.11-r1.ebuild} | 4 ++--
 .../wireshark/{wireshark-3.6.12.ebuild => wireshark-3.6.12-r1.ebuild} | 4 ++--
 .../wireshark/{wireshark-4.0.3.ebuild => wireshark-4.0.3-r1.ebuild}   | 2 +-
 .../wireshark/{wireshark-4.0.4.ebuild => wireshark-4.0.4-r1.ebuild}   | 2 +-
 net-analyzer/wireshark/wireshark-.ebuild  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild
similarity index 99%
rename from net-analyzer/wireshark/wireshark-3.6.11.ebuild
rename to net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild
index 307f57e83ff0..e037030ee391 100644
--- a/net-analyzer/wireshark/wireshark-3.6.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild
@@ -66,9 +66,9 @@ RDEPEND="acct-group/pcap
sbc? ( media-libs/sbc )
sdjournal? ( sys-apps/systemd )
smi? ( net-libs/libsmi )
-   snappy? ( app-arch/snappy )
+   snappy? ( app-arch/snappy:= )
spandsp? ( media-libs/spandsp )
-   sshdump? ( >=net-libs/libssh-0.6 )
+   sshdump? ( >=net-libs/libssh-0.6:= )
ssl? ( net-libs/gnutls:= )
zlib? ( sys-libs/zlib )
zstd? ( app-arch/zstd:= )"

diff --git a/net-analyzer/wireshark/wireshark-3.6.12.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
similarity index 99%
rename from net-analyzer/wireshark/wireshark-3.6.12.ebuild
rename to net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
index ba3706691296..0e8916b20943 100644
--- a/net-analyzer/wireshark/wireshark-3.6.12.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
@@ -66,9 +66,9 @@ RDEPEND="acct-group/pcap
sbc? ( media-libs/sbc )
sdjournal? ( sys-apps/systemd )
smi? ( net-libs/libsmi )
-   snappy? ( app-arch/snappy )
+   snappy? ( app-arch/snappy:= )
spandsp? ( media-libs/spandsp )
-   sshdump? ( >=net-libs/libssh-0.6 )
+   sshdump? ( >=net-libs/libssh-0.6:= )
ssl? ( net-libs/gnutls:= )
zlib? ( sys-libs/zlib )
zstd? ( app-arch/zstd:= )"

diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild
similarity index 99%
rename from net-analyzer/wireshark/wireshark-4.0.3.ebuild
rename to net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild
index 0d380cae24c9..b80599dfacbf 100644
--- a/net-analyzer/wireshark/wireshark-4.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild
@@ -79,7 +79,7 @@ RDEPEND="
sbc? ( media-libs/sbc )
sdjournal? ( sys-apps/systemd:= )
smi? ( net-libs/libsmi )
-   snappy? ( app-arch/snappy )
+   snappy? ( app-arch/snappy:= )
spandsp? ( media-libs/spandsp:= )
sshdump? ( >=net-libs/libssh-0.6:= )
ssl? ( >=net-libs/gnutls-3.5.8:= )

diff --git a/net-analyzer/wireshark/wireshark-4.0.4.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
similarity index 99%
rename from net-analyzer/wireshark/wireshark-4.0.4.ebuild
rename to net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
index 442aa877d528..f22f7cd62c6b 100644
--- a/net-analyzer/wireshark/wireshark-4.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
@@ -79,7 +79,7 @@ RDEPEND="
sbc? ( media-libs/sbc )
sdjournal? ( sys-apps/systemd:= )
smi? ( net-libs/libsmi )
-   snappy? ( app-arch/snappy )
+   snappy? ( app-arch/snappy:= )
spandsp? ( media-libs/spandsp:= )
sshdump? ( >=net-libs/libssh-0.6:= )
ssl? ( >=net-libs/gnutls-3.5.8:= )

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 042562603805..62593372fe05 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -79,7 +79,7 @@ RDEPEND="
sbc? ( media-libs/sbc )
sdjournal? ( sys-apps/systemd:= )
smi? ( net-libs/libsmi )
-   snappy? ( app-arch/snappy )
+   snappy? ( app-arch/snappy:= )
spandsp? ( media-libs/spandsp:= )
sshdump? ( >=net-libs/libssh-0.6:= )
ssl? ( >=net-libs/gnutls-3.5.8:= )

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

2023-03-16 Thread Arthur Zamarin

commit: 277ec0d9972e0924a482b58c356f60a7aa7d1b3e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Mar 16 17:37:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Mar 16 17:37:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=277ec0d9

net-analyzer/wireshark: Stabilize 3.6.11 ppc64, #892191

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
index 3a2b69d44d14..307f57e83ff0 100644
--- a/net-analyzer/wireshark/wireshark-3.6.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

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

2023-03-03 Thread Sam James

commit: 8f9e7f3df8c9bbcc9ad2d98f0baf30bff5fd1074
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  4 07:38:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  4 07:39:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9e7f3d

net-analyzer/wireshark: drop 4.0.2

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

 net-analyzer/wireshark/Manifest   |   1 -
 net-analyzer/wireshark/wireshark-4.0.2.ebuild | 312 --
 2 files changed, 313 deletions(-)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 0058e3d62490..7d46a92aaae6 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,6 +2,5 @@ DIST wireshark-3.6.10.tar.xz 39956960 BLAKE2B 
5f283caeed4fc9b231331b90b68b25615f
 DIST wireshark-3.6.11.tar.xz 39967744 BLAKE2B 
b313be6b2d22f62365f7a840409c49a78ce99d135e6b5f17c73c12dc12a543f5daa298a3df1693dafc79a6f3f1b184de231cc527bca0627e3c37b8ac4ce8e5a3
 SHA512 
f526e6e8f9435b69b5c3ce3a7d271f7b66365bdd84cd155ac434be0ef899cc140f58dfe55e90295bba91a8a99f28a55280366fb028d13f6ff45051a9ed3625e8
 DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B 
ca356c0d03d7c82463cc4503d0c1085b80fe621763c1bc369a5944dc6566f25b19fce9615239265b3620f76c92bff7d7c6e958241143c444a1b659b82d319c65
 SHA512 
a6e05e5a6b1027e3f4650a32f186d9a2cff4fb7adb2317bdeb96a7193ab45fa434572f94253a4d6e5589b0790420a445c4bbd788d8ac53e01019bb88130164f8
 DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B 
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
 SHA512 
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
-DIST wireshark-4.0.2.tar.xz 41296132 BLAKE2B 
3ca64c5d561fc3262af821a2fed559efc39f9c194d1c03211d27b8154d87fe78c26d390504fc33f80fefbec06aa07d5b4fe27b253a3fc32641ec52292bc0557b
 SHA512 
0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5
 DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 
85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb
 SHA512 
ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c
 DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 
4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db
 SHA512 
e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff

diff --git a/net-analyzer/wireshark/wireshark-4.0.2.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.2.ebuild
deleted file mode 100644
index 042562603805..
--- a/net-analyzer/wireshark/wireshark-4.0.2.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-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="~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? (

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

2023-03-03 Thread Sam James

commit: ad91cfc25113f837574727a0879404127f34d4bb
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  4 07:32:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  4 07:39:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad91cfc2

net-analyzer/wireshark: update DESCRIPTION

It hasn't been ethereal for 15+ years.

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

 net-analyzer/wireshark/wireshark-3.6.10.ebuild | 2 +-
 net-analyzer/wireshark/wireshark-3.6.11.ebuild | 2 +-
 net-analyzer/wireshark/wireshark-3.6.12.ebuild | 2 +-
 net-analyzer/wireshark/wireshark-3.6.9.ebuild  | 2 +-
 net-analyzer/wireshark/wireshark-4.0.2.ebuild  | 2 +-
 net-analyzer/wireshark/wireshark-4.0.3.ebuild  | 2 +-
 net-analyzer/wireshark/wireshark-4.0.4.ebuild  | 2 +-
 net-analyzer/wireshark/wireshark-.ebuild   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
index d5a1cb549567..06355e3161e7 100644
--- a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..10} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+DESCRIPTION="Network protocol analyzer (sniffer)"
 HOMEPAGE="https://www.wireshark.org/;
 
 if [[ ${PV} == ** ]] ; then

diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
index c2cac551b2f3..3a2b69d44d14 100644
--- a/net-analyzer/wireshark/wireshark-3.6.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..10} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+DESCRIPTION="Network protocol analyzer (sniffer)"
 HOMEPAGE="https://www.wireshark.org/;
 
 if [[ ${PV} == ** ]] ; then

diff --git a/net-analyzer/wireshark/wireshark-3.6.12.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.12.ebuild
index e264dd4c9f97..ba3706691296 100644
--- a/net-analyzer/wireshark/wireshark-3.6.12.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..10} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+DESCRIPTION="Network protocol analyzer (sniffer)"
 HOMEPAGE="https://www.wireshark.org/;
 
 if [[ ${PV} == ** ]] ; then

diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
index 1da5179037e6..307f57e83ff0 100644
--- a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..10} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+DESCRIPTION="Network protocol analyzer (sniffer)"
 HOMEPAGE="https://www.wireshark.org/;
 
 if [[ ${PV} == ** ]] ; then

diff --git a/net-analyzer/wireshark/wireshark-4.0.2.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.2.ebuild
index 39b077de3fc9..042562603805 100644
--- a/net-analyzer/wireshark/wireshark-4.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..10} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+DESCRIPTION="Network protocol analyzer (sniffer)"
 HOMEPAGE="https://www.wireshark.org/;
 
 if [[ ${PV} == ** ]] ; then

diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
index f3580ce4781c..0d380cae24c9 100644
--- a/net-analyzer/wireshark/wireshark-4.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..10} )
 
 inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
 
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+DESCRIPTION="Network protocol analyzer (sniffer)"
 HOMEPAGE="https://www.wireshark.org/;
 
 if [[ ${PV} == ** ]] ; then

diff --git a/net-analyzer/wireshark/wireshark-4.0.4.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.4.ebuild
index 31b2e4306298..442aa877d528 100644
--- a/net-analyzer/wireshark/wireshark-4.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..10} )
 
 inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
 
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+DESCRIPTION="Network protocol analyzer (sniffer)"
 HOMEPAGE="https://www.wireshark.org/;
 
 if [[ ${PV} == ** ]] ; then

diff --git

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

2023-03-03 Thread Sam James

commit: 028737b5aa46a1846c30e643a2fd37cc228393c9
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  4 06:57:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  4 07:18:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028737b5

net-analyzer/wireshark: add 3.6.12

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

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

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index e5c73f483bcd..bfbbd0d81641 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,6 @@
 DIST wireshark-3.6.10.tar.xz 39956960 BLAKE2B 
5f283caeed4fc9b231331b90b68b25615f8c1df7639accd225590c88cebc86cca7ea95d979db6a60268a5b918f448a9b0878b9f4f8d5dccc847c6dd1fe4fddb7
 SHA512 
dbdba7a29e2b6e6c3bbc0f0d599a2b9b49efcb1540b36f2f8c55ac3850565b68dc1282b1ed1d3cd63709f12e2fe659f93de5f9473c2f23751373f3738b8e766a
 DIST wireshark-3.6.11.tar.xz 39967744 BLAKE2B 
b313be6b2d22f62365f7a840409c49a78ce99d135e6b5f17c73c12dc12a543f5daa298a3df1693dafc79a6f3f1b184de231cc527bca0627e3c37b8ac4ce8e5a3
 SHA512 
f526e6e8f9435b69b5c3ce3a7d271f7b66365bdd84cd155ac434be0ef899cc140f58dfe55e90295bba91a8a99f28a55280366fb028d13f6ff45051a9ed3625e8
+DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B 
ca356c0d03d7c82463cc4503d0c1085b80fe621763c1bc369a5944dc6566f25b19fce9615239265b3620f76c92bff7d7c6e958241143c444a1b659b82d319c65
 SHA512 
a6e05e5a6b1027e3f4650a32f186d9a2cff4fb7adb2317bdeb96a7193ab45fa434572f94253a4d6e5589b0790420a445c4bbd788d8ac53e01019bb88130164f8
 DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B 
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
 SHA512 
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
 DIST wireshark-4.0.2.tar.xz 41296132 BLAKE2B 
3ca64c5d561fc3262af821a2fed559efc39f9c194d1c03211d27b8154d87fe78c26d390504fc33f80fefbec06aa07d5b4fe27b253a3fc32641ec52292bc0557b
 SHA512 
0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5
 DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 
85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb
 SHA512 
ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c

diff --git a/net-analyzer/wireshark/wireshark-3.6.12.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.12.ebuild
new file mode 100644
index ..e264dd4c9f97
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.12.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+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="~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 qt5 )"
+
+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
+

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

2023-03-03 Thread Sam James

commit: d08b95e6e82d63fee8df4092c2ac49a5ece3581f
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  4 07:00:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  4 07:18:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d08b95e6

net-analyzer/wireshark: add 4.0.4

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

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-4.0.4.ebuild | 312 ++
 2 files changed, 313 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bfbbd0d81641..0058e3d62490 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,3 +4,4 @@ DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B 
ca356c0d03d7c82463cc4503d0c1085b80
 DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B 
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
 SHA512 
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
 DIST wireshark-4.0.2.tar.xz 41296132 BLAKE2B 
3ca64c5d561fc3262af821a2fed559efc39f9c194d1c03211d27b8154d87fe78c26d390504fc33f80fefbec06aa07d5b4fe27b253a3fc32641ec52292bc0557b
 SHA512 
0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5
 DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 
85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb
 SHA512 
ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c
+DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 
4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db
 SHA512 
e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff

diff --git a/net-analyzer/wireshark/wireshark-4.0.4.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.4.ebuild
new file mode 100644
index ..31b2e4306298
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.4.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 
qmake-utils xdg cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/;
+
+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="~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
+

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

2023-02-15 Thread Matt Turner

commit: 490887f088d6881ae1ad53c1b568ddea1c672ef9
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Feb 15 18:10:51 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Feb 15 18:36:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=490887f0

net-analyzer/wireshark: Drop alpha keywords

Signed-off-by: Matt Turner  gentoo.org>

 net-analyzer/wireshark/wireshark-3.6.10.ebuild | 2 +-
 net-analyzer/wireshark/wireshark-3.6.11.ebuild | 2 +-
 net-analyzer/wireshark/wireshark-3.6.9.ebuild  | 2 +-
 net-analyzer/wireshark/wireshark-4.0.2.ebuild  | 2 +-
 net-analyzer/wireshark/wireshark-4.0.3.ebuild  | 2 +-
 net-analyzer/wireshark/wireshark-.ebuild   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
index 4d6d94c0c818..d5a1cb549567 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="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
index e7c5d5f4f5e4..c2cac551b2f3 100644
--- a/net-analyzer/wireshark/wireshark-3.6.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.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 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
index ef30755f517b..1da5179037e6 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="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-analyzer/wireshark/wireshark-4.0.2.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.2.ebuild
index f1193e6c3693..39b077de3fc9 100644
--- a/net-analyzer/wireshark/wireshark-4.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.2.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv 
~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi
 

diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
index 152c11941a11..f3580ce4781c 100644
--- a/net-analyzer/wireshark/wireshark-4.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi
 

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index f1193e6c3693..39b077de3fc9 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv 
~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
fi
 fi

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

2023-02-01 Thread Arthur Zamarin

commit: 0efc3685e1a1a6e853b27f98fdf2cd7d7ea6c3a1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Feb  1 16:47:06 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Feb  1 16:47:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0efc3685

net-analyzer/wireshark: Stabilize 4.0.3 ppc64, #892151

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
index 49d3f5048aa3..152c11941a11 100644
--- a/net-analyzer/wireshark/wireshark-4.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
 fi

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

2023-02-01 Thread Arthur Zamarin

commit: 2ed44f05a1677984ff24d7ed7a18fee843ad4ee1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Feb  1 16:46:43 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Feb  1 16:46:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed44f05

net-analyzer/wireshark: Stabilize 4.0.3 arm64, #892151

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
index ab3fdea34f32..49d3f5048aa3 100644
--- a/net-analyzer/wireshark/wireshark-4.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
 fi

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

2023-02-01 Thread Arthur Zamarin

commit: e7e8cd264432e667e4a7fc130baa3ac181ca5a2b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Feb  1 15:58:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Feb  1 15:58:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e8cd26

net-analyzer/wireshark: Stabilize 3.6.11 arm64, #892191

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
index cfd76089522d..e7c5d5f4f5e4 100644
--- a/net-analyzer/wireshark/wireshark-3.6.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.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 ~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/

2023-01-29 Thread Florian Schmaus

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

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

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

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

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

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

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

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

2023-01-27 Thread Jakov Smolić

commit: 6026c229bb07d54d965add1f32a51d170ad024c4
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan 27 10:10:23 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan 27 10:10:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6026c229

net-analyzer/wireshark: Stabilize 3.6.11 x86, #892191

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
index 022953981d29..cfd76089522d 100644
--- a/net-analyzer/wireshark/wireshark-3.6.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.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 ~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/

2023-01-27 Thread Jakov Smolić

commit: 55fe891de68768369680637b3381031cebb8cbde
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan 27 10:10:12 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan 27 10:10:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55fe891d

net-analyzer/wireshark: Stabilize 4.0.3 x86, #892151

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
index c40f1e13520a..38a3ce5e8814 100644
--- a/net-analyzer/wireshark/wireshark-4.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv 
~x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
 fi

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

2023-01-27 Thread Sam James

commit: 82904ab3d24ec83380a6f98c177ce0761aac0ad3
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 27 08:04:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 27 08:04:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82904ab3

net-analyzer/wireshark: Stabilize 3.6.11 amd64, #892191

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
index 623ea88c2e81..022953981d29 100644
--- a/net-analyzer/wireshark/wireshark-3.6.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.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 ~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/

2023-01-27 Thread Sam James

commit: b8fdbf527a9b85cc5752bca8393236857557c7d4
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 27 08:04:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 27 08:04:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8fdbf52

net-analyzer/wireshark: Stabilize 3.6.11 arm, #892191

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

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

diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
index a71b92ecc0f9..623ea88c2e81 100644
--- a/net-analyzer/wireshark/wireshark-3.6.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.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 ~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/

2023-01-26 Thread Sam James

commit: 78cc80cc0987c60db5a9d6742b1a1a6e43eb3e0f
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 27 06:27:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 27 06:27:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78cc80cc

net-analyzer/wireshark: Stabilize 4.0.3 arm, #892151

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

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

diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
index f1193e6c3693..d807f0bd1401 100644
--- a/net-analyzer/wireshark/wireshark-4.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
@@ -19,7 +19,7 @@ else
S="${WORKDIR}/${P/_/}"
 
if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv 
~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv 
~x86"
fi
 fi

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

2023-01-19 Thread Sam James

commit: 97192ef8ed3db36ab9fa201580dbfcf2c1c8edbc
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 20 03:49:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 20 03:54:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97192ef8

net-analyzer/wireshark: add 3.6.11

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

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

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 62ff0707b62a..066a4394fd0d 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.11.tar.xz 39967744 BLAKE2B 
b313be6b2d22f62365f7a840409c49a78ce99d135e6b5f17c73c12dc12a543f5daa298a3df1693dafc79a6f3f1b184de231cc527bca0627e3c37b8ac4ce8e5a3
 SHA512 
f526e6e8f9435b69b5c3ce3a7d271f7b66365bdd84cd155ac434be0ef899cc140f58dfe55e90295bba91a8a99f28a55280366fb028d13f6ff45051a9ed3625e8
 DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B 
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
 SHA512 
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
 DIST wireshark-4.0.2.tar.xz 41296132 BLAKE2B 
3ca64c5d561fc3262af821a2fed559efc39f9c194d1c03211d27b8154d87fe78c26d390504fc33f80fefbec06aa07d5b4fe27b253a3fc32641ec52292bc0557b
 SHA512 
0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5

diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
new file mode 100644
index ..a71b92ecc0f9
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+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 qt5 )"
+
+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
+

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

2023-01-19 Thread Sam James

commit: 9e5fa97ac4dcb8885d86e736da1f8f0f78ae3a3e
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 20 03:53:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 20 03:54:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5fa97a

net-analyzer/wireshark: add 4.0.3

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

 net-analyzer/wireshark/Manifest   |   1 +
 net-analyzer/wireshark/wireshark-4.0.3.ebuild | 312 ++
 2 files changed, 313 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 066a4394fd0d..e5c73f483bcd 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,3 +2,4 @@ DIST wireshark-3.6.10.tar.xz 39956960 BLAKE2B 
5f283caeed4fc9b231331b90b68b25615f
 DIST wireshark-3.6.11.tar.xz 39967744 BLAKE2B 
b313be6b2d22f62365f7a840409c49a78ce99d135e6b5f17c73c12dc12a543f5daa298a3df1693dafc79a6f3f1b184de231cc527bca0627e3c37b8ac4ce8e5a3
 SHA512 
f526e6e8f9435b69b5c3ce3a7d271f7b66365bdd84cd155ac434be0ef899cc140f58dfe55e90295bba91a8a99f28a55280366fb028d13f6ff45051a9ed3625e8
 DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B 
8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267
 SHA512 
abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
 DIST wireshark-4.0.2.tar.xz 41296132 BLAKE2B 
3ca64c5d561fc3262af821a2fed559efc39f9c194d1c03211d27b8154d87fe78c26d390504fc33f80fefbec06aa07d5b4fe27b253a3fc32641ec52292bc0557b
 SHA512 
0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5
+DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 
85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb
 SHA512 
ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c

diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild 
b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
new file mode 100644
index ..f1193e6c3693
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+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
+

1 2 3 4 5 6 7 8 >

1 - 100 of 701 matches

Mail list logo