Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
Date: Thu, 18 Aug 2022 03:34:09
Message-Id: 1660793639.bf006a3ff0c3c58adf4ab9697c9e73b66152c64e.sam@gentoo
1 commit: bf006a3ff0c3c58adf4ab9697c9e73b66152c64e
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 18 03:33:19 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 18 03:33:59 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf006a3f
7
8 net-analyzer/wireshark: add 4.0.0_rc1 (unkeyworded)
9
10 Still need to polish off the wifidump/libssh bit (need to
11 decide really what to do about the huge number of USE flags here)
12 but may as well commit what got so far given it works fine.
13
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 net-analyzer/wireshark/Manifest | 1 +
17 ...hark-9999.ebuild => wireshark-4.0.0_rc1.ebuild} | 22 ++++++++++++++--------
18 net-analyzer/wireshark/wireshark-9999.ebuild | 22 ++++++++++++++--------
19 3 files changed, 29 insertions(+), 16 deletions(-)
20
21 diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
22 index 816d4f92d449..c9f0a82a4ac0 100644
23 --- a/net-analyzer/wireshark/Manifest
24 +++ b/net-analyzer/wireshark/Manifest
25 @@ -4,3 +4,4 @@ DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B 3b636867d946f0cf748eb719874e815c919
26 DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B 4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0 SHA512 9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
27 DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1 SHA512 c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
28 DIST wireshark-3.6.7.tar.xz 39967312 BLAKE2B 0539130aec2c7d8fdfec536114144a0b761addb8006d146a5e08d0a58e95d5d6b0db67ef32ceae4143de9836f25a3497802706f0a0eb633f29e1f24a47819e4b SHA512 caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac
29 +DIST wireshark-4.0.0rc1.tar.xz 41291340 BLAKE2B 96dc9616702c67f47517cf5fc575bf555d5f7e83cc90284301e3ef26476ca6292f8aba3c7230c3ca7e6404a9b953861247a448826b339fa586d5a8206c787989 SHA512 16d4f3d39198bb208d4ad58059c38a40f21352186abf2cafb4140674d048e5bd29e5dbc079ed50f28f1dde150733bba6a26c6fc7d10e524e4556bd20c6ae2856
30
31 diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
32 similarity index 92%
33 copy from net-analyzer/wireshark/wireshark-9999.ebuild
34 copy to net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
35 index 68dc99e8c15c..0bdf2a0c919a 100644
36 --- a/net-analyzer/wireshark/wireshark-9999.ebuild
37 +++ b/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
38 @@ -18,7 +18,9 @@ else
39 SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
40 S="${WORKDIR}/${P/_/}"
41
42 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
43 + if [[ ${PV} != *_rc* ]] ; then
44 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
45 + fi
46 fi
47
48 LICENSE="GPL-2"
49 @@ -34,17 +36,19 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
50
51 RESTRICT="!test? ( test )"
52
53 +# TODO: wifidump/libssh automagic?
54 # bug #753062 for speexdsp
55 RDEPEND="acct-group/pcap
56 - >=dev-libs/glib-2.38:2
57 - >=net-dns/c-ares-1.5:=
58 - dev-libs/libgcrypt:=
59 + >=dev-libs/glib-2.50.0:2
60 + dev-libs/libpcre2
61 + >=net-dns/c-ares-1.14.0:=
62 + >=dev-libs/libgcrypt-1.8.0:=
63 media-libs/speexdsp
64 bcg729? ( media-libs/bcg729 )
65 brotli? ( app-arch/brotli:= )
66 ciscodump? ( >=net-libs/libssh-0.6 )
67 filecaps? ( sys-libs/libcap )
68 - http2? ( net-libs/nghttp2:= )
69 + http2? ( >=net-libs/nghttp2-1.11.0:= )
70 ilbc? ( media-libs/libilbc )
71 kerberos? ( virtual/krb5 )
72 libxml2? ( dev-libs/libxml2 )
73 @@ -69,10 +73,12 @@ RDEPEND="acct-group/pcap
74 snappy? ( app-arch/snappy )
75 spandsp? ( media-libs/spandsp )
76 sshdump? ( >=net-libs/libssh-0.6 )
77 - ssl? ( net-libs/gnutls:= )
78 + ssl? ( >=net-libs/gnutls-3.5.8:= )
79 zlib? ( sys-libs/zlib )
80 zstd? ( app-arch/zstd:= )"
81 DEPEND="${RDEPEND}"
82 +# TODO: 4.0.0_rc1 release notes say:
83 +# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
84 BDEPEND="${PYTHON_DEPS}
85 dev-lang/perl
86 sys-devel/flex
87 @@ -130,7 +136,7 @@ src_configure() {
88 fi
89
90 if use qt5 ; then
91 - export QT_MIN_VERSION=5.3.0
92 + #export QT_MIN_VERSION=5.3.0
93 append-cxxflags -fPIC -DPIC
94 fi
95
96 @@ -164,7 +170,7 @@ src_configure() {
97 -DBUILD_tshark=$(usex tshark)
98 -DBUILD_udpdump=$(usex udpdump)
99 -DBUILD_wireshark=$(usex qt5)
100 - -DDISABLE_WERROR=ON
101 + -DENABLE_WERROR=OFF
102 -DENABLE_BCG729=$(usex bcg729)
103 -DENABLE_BROTLI=$(usex brotli)
104 -DENABLE_CAP=$(usex filecaps caps)
105
106 diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
107 index 68dc99e8c15c..0bdf2a0c919a 100644
108 --- a/net-analyzer/wireshark/wireshark-9999.ebuild
109 +++ b/net-analyzer/wireshark/wireshark-9999.ebuild
110 @@ -18,7 +18,9 @@ else
111 SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
112 S="${WORKDIR}/${P/_/}"
113
114 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
115 + if [[ ${PV} != *_rc* ]] ; then
116 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
117 + fi
118 fi
119
120 LICENSE="GPL-2"
121 @@ -34,17 +36,19 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
122
123 RESTRICT="!test? ( test )"
124
125 +# TODO: wifidump/libssh automagic?
126 # bug #753062 for speexdsp
127 RDEPEND="acct-group/pcap
128 - >=dev-libs/glib-2.38:2
129 - >=net-dns/c-ares-1.5:=
130 - dev-libs/libgcrypt:=
131 + >=dev-libs/glib-2.50.0:2
132 + dev-libs/libpcre2
133 + >=net-dns/c-ares-1.14.0:=
134 + >=dev-libs/libgcrypt-1.8.0:=
135 media-libs/speexdsp
136 bcg729? ( media-libs/bcg729 )
137 brotli? ( app-arch/brotli:= )
138 ciscodump? ( >=net-libs/libssh-0.6 )
139 filecaps? ( sys-libs/libcap )
140 - http2? ( net-libs/nghttp2:= )
141 + http2? ( >=net-libs/nghttp2-1.11.0:= )
142 ilbc? ( media-libs/libilbc )
143 kerberos? ( virtual/krb5 )
144 libxml2? ( dev-libs/libxml2 )
145 @@ -69,10 +73,12 @@ RDEPEND="acct-group/pcap
146 snappy? ( app-arch/snappy )
147 spandsp? ( media-libs/spandsp )
148 sshdump? ( >=net-libs/libssh-0.6 )
149 - ssl? ( net-libs/gnutls:= )
150 + ssl? ( >=net-libs/gnutls-3.5.8:= )
151 zlib? ( sys-libs/zlib )
152 zstd? ( app-arch/zstd:= )"
153 DEPEND="${RDEPEND}"
154 +# TODO: 4.0.0_rc1 release notes say:
155 +# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
156 BDEPEND="${PYTHON_DEPS}
157 dev-lang/perl
158 sys-devel/flex
159 @@ -130,7 +136,7 @@ src_configure() {
160 fi
161
162 if use qt5 ; then
163 - export QT_MIN_VERSION=5.3.0
164 + #export QT_MIN_VERSION=5.3.0
165 append-cxxflags -fPIC -DPIC
166 fi
167
168 @@ -164,7 +170,7 @@ src_configure() {
169 -DBUILD_tshark=$(usex tshark)
170 -DBUILD_udpdump=$(usex udpdump)
171 -DBUILD_wireshark=$(usex qt5)
172 - -DDISABLE_WERROR=ON
173 + -DENABLE_WERROR=OFF
174 -DENABLE_BCG729=$(usex bcg729)
175 -DENABLE_BROTLI=$(usex brotli)
176 -DENABLE_CAP=$(usex filecaps caps)
Report Message
Find on MARC Find on Google Groups