| 1 |
commit: 433e897529f5a41682189da5dba5a9f853c39456 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 2 18:37:26 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 2 18:37:41 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433e8975 |
| 7 |
|
| 8 |
net-analyzer/wireshark: Switch to cmake (bug #545688). |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.32, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../files/wireshark-2.6.0-androiddump-wsutil.patch | 26 +++ |
| 13 |
...k-99999999.ebuild => wireshark-2.6.0-r1.ebuild} | 192 ++++++++------------- |
| 14 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 190 ++++++++------------ |
| 15 |
3 files changed, 176 insertions(+), 232 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..e28465e814a |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch |
| 22 |
@@ -0,0 +1,26 @@ |
| 23 |
+--- a/CMakeLists.txt |
| 24 |
++++ b/CMakeLists.txt |
| 25 |
+@@ -2841,6 +2841,7 @@ |
| 26 |
+ if(HAVE_LIBPCAP) |
| 27 |
+ set(androiddump_LIBS |
| 28 |
+ ui |
| 29 |
++ wsutil |
| 30 |
+ ${GLIB2_LIBRARIES} |
| 31 |
+ ${PCAP_LIBRARIES} |
| 32 |
+ ) |
| 33 |
+@@ -2851,6 +2852,7 @@ |
| 34 |
+ set(androiddump_LIBS |
| 35 |
+ ui |
| 36 |
+ wiretap |
| 37 |
++ wsutil |
| 38 |
+ ${GLIB2_LIBRARIES} |
| 39 |
+ ${ZLIB_LIBRARIES} |
| 40 |
+ ${CMAKE_DL_LIBS} |
| 41 |
+@@ -2862,7 +2864,6 @@ |
| 42 |
+ ) |
| 43 |
+ |
| 44 |
+ add_executable(androiddump WIN32 ${androiddump_FILES}) |
| 45 |
+- # XXX Shouldn't we add wsutil to androiddump_LIBS instead? |
| 46 |
+ set_extcap_executable_properties(androiddump) |
| 47 |
+ target_link_libraries(androiddump ${androiddump_LIBS}) |
| 48 |
+ install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR}) |
| 49 |
|
| 50 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild |
| 51 |
similarity index 55% |
| 52 |
copy from net-analyzer/wireshark/wireshark-99999999.ebuild |
| 53 |
copy to net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild |
| 54 |
index e39d7345ef9..1efad019372 100644 |
| 55 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 56 |
+++ b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild |
| 57 |
@@ -2,25 +2,21 @@ |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
|
| 60 |
EAPI=6 |
| 61 |
-inherit autotools eutils fcaps flag-o-matic git-r3 gnome2-utils multilib qmake-utils user xdg-utils |
| 62 |
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils |
| 63 |
|
| 64 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
| 65 |
HOMEPAGE="https://www.wireshark.org/" |
| 66 |
-EGIT_REPO_URI="https://code.wireshark.org/review/wireshark" |
| 67 |
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" |
| 68 |
|
| 69 |
LICENSE="GPL-2" |
| 70 |
SLOT="0/${PV}" |
| 71 |
-KEYWORDS="" |
| 72 |
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86" |
| 73 |
IUSE=" |
| 74 |
- adns androiddump bcg729 +capinfos +caps +captype ciscodump |
| 75 |
- cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk |
| 76 |
- kerberos libssh libxml2 lua lz4 +mergecap +netlink nghttp2 +pcap portaudio |
| 77 |
- +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy |
| 78 |
- spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib |
| 79 |
-" |
| 80 |
-REQUIRED_USE=" |
| 81 |
- ciscodump? ( libssh ) |
| 82 |
- sshdump? ( libssh ) |
| 83 |
+ adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc |
| 84 |
+ +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink |
| 85 |
+ nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux |
| 86 |
+ +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump |
| 87 |
+ zlib |
| 88 |
" |
| 89 |
|
| 90 |
S=${WORKDIR}/${P/_/} |
| 91 |
@@ -32,7 +28,6 @@ CDEPEND=" |
| 92 |
adns? ( >=net-dns/c-ares-1.5 ) |
| 93 |
bcg729? ( media-libs/bcg729 ) |
| 94 |
caps? ( sys-libs/libcap ) |
| 95 |
- geoip? ( dev-libs/geoip ) |
| 96 |
gtk? ( |
| 97 |
x11-libs/gdk-pixbuf |
| 98 |
x11-libs/gtk+:3 |
| 99 |
@@ -40,10 +35,12 @@ CDEPEND=" |
| 100 |
x11-misc/xdg-utils |
| 101 |
) |
| 102 |
kerberos? ( virtual/krb5 ) |
| 103 |
- libssh? ( >=net-libs/libssh-0.6 ) |
| 104 |
+ sshdump? ( >=net-libs/libssh-0.6 ) |
| 105 |
+ ciscodump? ( >=net-libs/libssh-0.6 ) |
| 106 |
libxml2? ( dev-libs/libxml2 ) |
| 107 |
lua? ( >=dev-lang/lua-5.1:* ) |
| 108 |
lz4? ( app-arch/lz4 ) |
| 109 |
+ maxminddb? ( dev-libs/libmaxminddb ) |
| 110 |
nghttp2? ( net-libs/nghttp2 ) |
| 111 |
pcap? ( net-libs/libpcap ) |
| 112 |
portaudio? ( media-libs/portaudio ) |
| 113 |
@@ -64,7 +61,7 @@ CDEPEND=" |
| 114 |
ssl? ( net-libs/gnutls:= ) |
| 115 |
zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) |
| 116 |
" |
| 117 |
-# We need perl for `pod2html`. The rest of the perl stuff is to block older |
| 118 |
+# We need perl for `pod2html`. The rest of the perl stuff is to block older |
| 119 |
# and broken installs. #455122 |
| 120 |
DEPEND=" |
| 121 |
${CDEPEND} |
| 122 |
@@ -73,11 +70,7 @@ DEPEND=" |
| 123 |
!<perl-core/Pod-Simple-3.170 |
| 124 |
doc? ( |
| 125 |
app-doc/doxygen |
| 126 |
- app-text/asciidoc |
| 127 |
- dev-libs/libxml2 |
| 128 |
- dev-libs/libxslt |
| 129 |
- doc-pdf? ( dev-java/fop ) |
| 130 |
- www-client/lynx |
| 131 |
+ dev-ruby/asciidoctor |
| 132 |
) |
| 133 |
qt5? ( |
| 134 |
dev-qt/linguist-tools:5 |
| 135 |
@@ -94,8 +87,8 @@ RDEPEND=" |
| 136 |
" |
| 137 |
PATCHES=( |
| 138 |
"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch |
| 139 |
- "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch |
| 140 |
"${FILESDIR}"/${PN}-2.4-androiddump.patch |
| 141 |
+ "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch |
| 142 |
"${FILESDIR}"/${PN}-99999999-androiddump.patch |
| 143 |
) |
| 144 |
|
| 145 |
@@ -103,18 +96,8 @@ pkg_setup() { |
| 146 |
enewgroup wireshark |
| 147 |
} |
| 148 |
|
| 149 |
-src_unpack() { |
| 150 |
- git-r3_src_unpack |
| 151 |
-} |
| 152 |
- |
| 153 |
-src_prepare() { |
| 154 |
- default |
| 155 |
- |
| 156 |
- eautoreconf |
| 157 |
-} |
| 158 |
- |
| 159 |
src_configure() { |
| 160 |
- local myconf |
| 161 |
+ local mycmakeargs |
| 162 |
|
| 163 |
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
| 164 |
# --with-ssl to ./configure. (Mimics code from acinclude.m4). |
| 165 |
@@ -124,109 +107,75 @@ src_configure() { |
| 166 |
ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." |
| 167 |
ewarn "Note there are annoying license incompatibilities between the OpenSSL" |
| 168 |
ewarn "license and the GPL, so do your check before distributing such package." |
| 169 |
- myconf+=( "--with-ssl" ) |
| 170 |
+ mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) |
| 171 |
;; |
| 172 |
esac |
| 173 |
fi |
| 174 |
|
| 175 |
- # Enable wireshark binary with any supported GUI toolkit (bug #473188) |
| 176 |
- if use gtk || use qt5; then |
| 177 |
- myconf+=( "--enable-wireshark" ) |
| 178 |
- else |
| 179 |
- myconf+=( "--disable-wireshark" ) |
| 180 |
- fi |
| 181 |
- |
| 182 |
- if ! use qt5; then |
| 183 |
- myconf+=( "--with-qt=no" ) |
| 184 |
- fi |
| 185 |
- |
| 186 |
if use qt5; then |
| 187 |
export QT_MIN_VERSION=5.3.0 |
| 188 |
append-cxxflags -fPIC -DPIC |
| 189 |
fi |
| 190 |
|
| 191 |
- # Hack around inability to disable doxygen/fop doc generation |
| 192 |
- use doc || export ac_cv_prog_HAVE_DOXYGEN=false |
| 193 |
- use doc-pdf || export ac_cv_prog_HAVE_FOP=false |
| 194 |
- |
| 195 |
- econf \ |
| 196 |
- $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ |
| 197 |
- $(use dumpcap && use_with pcap dumpcap-group wireshark) \ |
| 198 |
- $(use_enable androiddump) \ |
| 199 |
- $(use_enable capinfos) \ |
| 200 |
- $(use_enable captype) \ |
| 201 |
- $(use_enable ciscodump) \ |
| 202 |
- $(use_enable dftest) \ |
| 203 |
- $(use_enable dumpcap) \ |
| 204 |
- $(use_enable editcap) \ |
| 205 |
- $(use_enable mergecap) \ |
| 206 |
- $(use_enable randpkt) \ |
| 207 |
- $(use_enable randpktdump) \ |
| 208 |
- $(use_enable reordercap) \ |
| 209 |
- $(use_enable sharkd) \ |
| 210 |
- $(use_enable sshdump) \ |
| 211 |
- $(use_enable text2pcap) \ |
| 212 |
- $(use_enable tfshark) \ |
| 213 |
- $(use_enable tshark) \ |
| 214 |
- $(use_enable udpdump) \ |
| 215 |
- $(use_with adns c-ares) \ |
| 216 |
- $(use_with bcg729) \ |
| 217 |
- $(use_with caps libcap) \ |
| 218 |
- $(use_with geoip) \ |
| 219 |
- $(use_with gtk gtk 3) \ |
| 220 |
- $(use_with kerberos krb5) \ |
| 221 |
- $(use_with libssh) \ |
| 222 |
- $(use_with libxml2) \ |
| 223 |
- $(use_with lua) \ |
| 224 |
- $(use_with lz4) \ |
| 225 |
- $(use_with nghttp2) \ |
| 226 |
- $(use_with pcap) \ |
| 227 |
- $(use_with portaudio) \ |
| 228 |
- $(use_with sbc) \ |
| 229 |
- $(use_with smi libsmi) \ |
| 230 |
- $(use_with snappy) \ |
| 231 |
- $(use_with spandsp) \ |
| 232 |
- $(use_with ssl gnutls) \ |
| 233 |
- $(use_with zlib) \ |
| 234 |
- $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \ |
| 235 |
- $(usex netlink --with-libnl=3 --without-libnl) \ |
| 236 |
- $(usex qt5 --with-qt=5 '') \ |
| 237 |
- $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \ |
| 238 |
- $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ |
| 239 |
- $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ |
| 240 |
- $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ |
| 241 |
- --disable-warnings-as-errors \ |
| 242 |
- --sysconfdir="${EPREFIX}"/etc/wireshark \ |
| 243 |
- ${myconf[@]} |
| 244 |
-} |
| 245 |
- |
| 246 |
-src_compile() { |
| 247 |
- default |
| 248 |
+ mycmakeargs+=( |
| 249 |
+ -DBUILD_androiddump=$(usex androiddump) |
| 250 |
+ -DBUILD_capinfos=$(usex capinfos) |
| 251 |
+ -DBUILD_captype=$(usex captype) |
| 252 |
+ -DBUILD_ciscodump=$(usex ciscodump) |
| 253 |
+ -DBUILD_dftest=$(usex dftest) |
| 254 |
+ -DBUILD_dumpcap=$(usex dumpcap) |
| 255 |
+ -DBUILD_editcap=$(usex editcap) |
| 256 |
+ -DBUILD_mergecap=$(usex mergecap) |
| 257 |
+ -DBUILD_mmdbresolve=$(usex maxminddb) |
| 258 |
+ -DBUILD_randpkt=$(usex randpkt) |
| 259 |
+ -DBUILD_randpktdump=$(usex randpktdump) |
| 260 |
+ -DBUILD_reordercap=$(usex reordercap) |
| 261 |
+ -DBUILD_sharkd=$(usex sharkd) |
| 262 |
+ -DBUILD_sshdump=$(usex sshdump) |
| 263 |
+ -DBUILD_text2pcap=$(usex text2pcap) |
| 264 |
+ -DBUILD_tfshark=$(usex tfshark) |
| 265 |
+ -DBUILD_tshark=$(usex tshark) |
| 266 |
+ -DBUILD_udpdump=$(usex udpdump) |
| 267 |
+ -DBUILD_wireshark=$(usex qt5) |
| 268 |
+ -DBUILD_wireshark_gtk=$(usex gtk) |
| 269 |
+ -DENABLE_BCG729=$(usex bcg729) |
| 270 |
+ -DENABLE_CARES=$(usex adns) |
| 271 |
+ -DENABLE_GNUTLS=$(usex ssl) |
| 272 |
+ -DENABLE_KERBEROS=$(usex kerberos) |
| 273 |
+ -DENABLE_LIBXML2=$(usex libxml2) |
| 274 |
+ -DENABLE_LUA=$(usex lua) |
| 275 |
+ -DENABLE_LZ4=$(usex lz4) |
| 276 |
+ -DENABLE_NGHTTP2=$(usex nghttp2) |
| 277 |
+ -DENABLE_PCAP=$(usex pcap) |
| 278 |
+ -DENABLE_PORTAUDIO=$(usex portaudio) |
| 279 |
+ -DENABLE_SBC=$(usex sbc) |
| 280 |
+ -DENABLE_SMI=$(usex smi) |
| 281 |
+ -DENABLE_SNAPPY=$(usex snappy) |
| 282 |
+ -DENABLE_SPANDSP=$(usex spandsp) |
| 283 |
+ -DENABLE_ZLIB=$(usex zlib) |
| 284 |
+ -DENABLE_NETLINK=$(usex netlink) |
| 285 |
+ $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) |
| 286 |
+ -DENABLE_CAP=$(usex caps) |
| 287 |
+ -DDUMPCAP_INSTALL_OPTION=$(usex caps capabilities suid) |
| 288 |
+ -DDISABLE_WERROR=yes |
| 289 |
+ $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') |
| 290 |
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') |
| 291 |
+ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') |
| 292 |
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') |
| 293 |
+ ) |
| 294 |
|
| 295 |
- if use doc; then |
| 296 |
- emake -j1 -C docbook |
| 297 |
- if use doc-pdf; then |
| 298 |
- addpredict "/root/.java" |
| 299 |
- emake -C docbook all-pdf |
| 300 |
- fi |
| 301 |
- fi |
| 302 |
+ cmake-utils_src_configure |
| 303 |
} |
| 304 |
|
| 305 |
src_install() { |
| 306 |
- default |
| 307 |
+ cmake-utils_src_install |
| 308 |
|
| 309 |
# FAQ is not required as is installed from help/faq.txt |
| 310 |
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* |
| 311 |
|
| 312 |
- if use doc-pdf; then |
| 313 |
- docinto /usr/share/doc/${PF}/pdf/ |
| 314 |
- dodoc docbook/{developer,user}-guide.pdf |
| 315 |
- fi |
| 316 |
- |
| 317 |
# install headers |
| 318 |
local wsheader |
| 319 |
for wsheader in \ |
| 320 |
- config.h \ |
| 321 |
epan/*.h \ |
| 322 |
epan/crypt/*.h \ |
| 323 |
epan/dfilter/*.h \ |
| 324 |
@@ -238,11 +187,22 @@ src_install() { |
| 325 |
ws_symbol_export.h \ |
| 326 |
wsutil/*.h |
| 327 |
do |
| 328 |
+ echo "Installing ${wsheader}" |
| 329 |
insinto /usr/include/wireshark/$( dirname ${wsheader} ) |
| 330 |
doins ${wsheader} |
| 331 |
done |
| 332 |
|
| 333 |
- #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/ |
| 334 |
+ for wsheader in \ |
| 335 |
+ ../${P}_build/config.h \ |
| 336 |
+ ../${P}_build/version.h |
| 337 |
+ do |
| 338 |
+ echo "Installing ${wsheader}" |
| 339 |
+ insinto /usr/include/wireshark |
| 340 |
+ doins ${wsheader} |
| 341 |
+ done |
| 342 |
+ |
| 343 |
+ #with the above this really shouldn't be needed, but things may be looking |
| 344 |
+ # in wiretap/ instead of wireshark/wiretap/ |
| 345 |
insinto /usr/include/wiretap |
| 346 |
doins wiretap/wtap.h |
| 347 |
|
| 348 |
|
| 349 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 350 |
index e39d7345ef9..c658f9ec1c6 100644 |
| 351 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 352 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 353 |
@@ -2,7 +2,7 @@ |
| 354 |
# Distributed under the terms of the GNU General Public License v2 |
| 355 |
|
| 356 |
EAPI=6 |
| 357 |
-inherit autotools eutils fcaps flag-o-matic git-r3 gnome2-utils multilib qmake-utils user xdg-utils |
| 358 |
+inherit cmake-utils eutils fcaps flag-o-matic git-r3 gnome2-utils ltprune multilib qmake-utils user xdg-utils |
| 359 |
|
| 360 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
| 361 |
HOMEPAGE="https://www.wireshark.org/" |
| 362 |
@@ -12,15 +12,11 @@ LICENSE="GPL-2" |
| 363 |
SLOT="0/${PV}" |
| 364 |
KEYWORDS="" |
| 365 |
IUSE=" |
| 366 |
- adns androiddump bcg729 +capinfos +caps +captype ciscodump |
| 367 |
- cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk |
| 368 |
- kerberos libssh libxml2 lua lz4 +mergecap +netlink nghttp2 +pcap portaudio |
| 369 |
- +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy |
| 370 |
- spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib |
| 371 |
-" |
| 372 |
-REQUIRED_USE=" |
| 373 |
- ciscodump? ( libssh ) |
| 374 |
- sshdump? ( libssh ) |
| 375 |
+ adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc |
| 376 |
+ +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink |
| 377 |
+ nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux |
| 378 |
+ +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump |
| 379 |
+ zlib |
| 380 |
" |
| 381 |
|
| 382 |
S=${WORKDIR}/${P/_/} |
| 383 |
@@ -32,7 +28,6 @@ CDEPEND=" |
| 384 |
adns? ( >=net-dns/c-ares-1.5 ) |
| 385 |
bcg729? ( media-libs/bcg729 ) |
| 386 |
caps? ( sys-libs/libcap ) |
| 387 |
- geoip? ( dev-libs/geoip ) |
| 388 |
gtk? ( |
| 389 |
x11-libs/gdk-pixbuf |
| 390 |
x11-libs/gtk+:3 |
| 391 |
@@ -40,10 +35,12 @@ CDEPEND=" |
| 392 |
x11-misc/xdg-utils |
| 393 |
) |
| 394 |
kerberos? ( virtual/krb5 ) |
| 395 |
- libssh? ( >=net-libs/libssh-0.6 ) |
| 396 |
+ sshdump? ( >=net-libs/libssh-0.6 ) |
| 397 |
+ ciscodump? ( >=net-libs/libssh-0.6 ) |
| 398 |
libxml2? ( dev-libs/libxml2 ) |
| 399 |
lua? ( >=dev-lang/lua-5.1:* ) |
| 400 |
lz4? ( app-arch/lz4 ) |
| 401 |
+ maxminddb? ( dev-libs/libmaxminddb ) |
| 402 |
nghttp2? ( net-libs/nghttp2 ) |
| 403 |
pcap? ( net-libs/libpcap ) |
| 404 |
portaudio? ( media-libs/portaudio ) |
| 405 |
@@ -64,7 +61,7 @@ CDEPEND=" |
| 406 |
ssl? ( net-libs/gnutls:= ) |
| 407 |
zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) |
| 408 |
" |
| 409 |
-# We need perl for `pod2html`. The rest of the perl stuff is to block older |
| 410 |
+# We need perl for `pod2html`. The rest of the perl stuff is to block older |
| 411 |
# and broken installs. #455122 |
| 412 |
DEPEND=" |
| 413 |
${CDEPEND} |
| 414 |
@@ -73,11 +70,7 @@ DEPEND=" |
| 415 |
!<perl-core/Pod-Simple-3.170 |
| 416 |
doc? ( |
| 417 |
app-doc/doxygen |
| 418 |
- app-text/asciidoc |
| 419 |
- dev-libs/libxml2 |
| 420 |
- dev-libs/libxslt |
| 421 |
- doc-pdf? ( dev-java/fop ) |
| 422 |
- www-client/lynx |
| 423 |
+ dev-ruby/asciidoctor |
| 424 |
) |
| 425 |
qt5? ( |
| 426 |
dev-qt/linguist-tools:5 |
| 427 |
@@ -93,28 +86,16 @@ RDEPEND=" |
| 428 |
selinux? ( sec-policy/selinux-wireshark ) |
| 429 |
" |
| 430 |
PATCHES=( |
| 431 |
- "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch |
| 432 |
- "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch |
| 433 |
"${FILESDIR}"/${PN}-2.4-androiddump.patch |
| 434 |
- "${FILESDIR}"/${PN}-99999999-androiddump.patch |
| 435 |
+ "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch |
| 436 |
) |
| 437 |
|
| 438 |
pkg_setup() { |
| 439 |
enewgroup wireshark |
| 440 |
} |
| 441 |
|
| 442 |
-src_unpack() { |
| 443 |
- git-r3_src_unpack |
| 444 |
-} |
| 445 |
- |
| 446 |
-src_prepare() { |
| 447 |
- default |
| 448 |
- |
| 449 |
- eautoreconf |
| 450 |
-} |
| 451 |
- |
| 452 |
src_configure() { |
| 453 |
- local myconf |
| 454 |
+ local mycmakeargs |
| 455 |
|
| 456 |
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
| 457 |
# --with-ssl to ./configure. (Mimics code from acinclude.m4). |
| 458 |
@@ -124,109 +105,75 @@ src_configure() { |
| 459 |
ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." |
| 460 |
ewarn "Note there are annoying license incompatibilities between the OpenSSL" |
| 461 |
ewarn "license and the GPL, so do your check before distributing such package." |
| 462 |
- myconf+=( "--with-ssl" ) |
| 463 |
+ mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) |
| 464 |
;; |
| 465 |
esac |
| 466 |
fi |
| 467 |
|
| 468 |
- # Enable wireshark binary with any supported GUI toolkit (bug #473188) |
| 469 |
- if use gtk || use qt5; then |
| 470 |
- myconf+=( "--enable-wireshark" ) |
| 471 |
- else |
| 472 |
- myconf+=( "--disable-wireshark" ) |
| 473 |
- fi |
| 474 |
- |
| 475 |
- if ! use qt5; then |
| 476 |
- myconf+=( "--with-qt=no" ) |
| 477 |
- fi |
| 478 |
- |
| 479 |
if use qt5; then |
| 480 |
export QT_MIN_VERSION=5.3.0 |
| 481 |
append-cxxflags -fPIC -DPIC |
| 482 |
fi |
| 483 |
|
| 484 |
- # Hack around inability to disable doxygen/fop doc generation |
| 485 |
- use doc || export ac_cv_prog_HAVE_DOXYGEN=false |
| 486 |
- use doc-pdf || export ac_cv_prog_HAVE_FOP=false |
| 487 |
- |
| 488 |
- econf \ |
| 489 |
- $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ |
| 490 |
- $(use dumpcap && use_with pcap dumpcap-group wireshark) \ |
| 491 |
- $(use_enable androiddump) \ |
| 492 |
- $(use_enable capinfos) \ |
| 493 |
- $(use_enable captype) \ |
| 494 |
- $(use_enable ciscodump) \ |
| 495 |
- $(use_enable dftest) \ |
| 496 |
- $(use_enable dumpcap) \ |
| 497 |
- $(use_enable editcap) \ |
| 498 |
- $(use_enable mergecap) \ |
| 499 |
- $(use_enable randpkt) \ |
| 500 |
- $(use_enable randpktdump) \ |
| 501 |
- $(use_enable reordercap) \ |
| 502 |
- $(use_enable sharkd) \ |
| 503 |
- $(use_enable sshdump) \ |
| 504 |
- $(use_enable text2pcap) \ |
| 505 |
- $(use_enable tfshark) \ |
| 506 |
- $(use_enable tshark) \ |
| 507 |
- $(use_enable udpdump) \ |
| 508 |
- $(use_with adns c-ares) \ |
| 509 |
- $(use_with bcg729) \ |
| 510 |
- $(use_with caps libcap) \ |
| 511 |
- $(use_with geoip) \ |
| 512 |
- $(use_with gtk gtk 3) \ |
| 513 |
- $(use_with kerberos krb5) \ |
| 514 |
- $(use_with libssh) \ |
| 515 |
- $(use_with libxml2) \ |
| 516 |
- $(use_with lua) \ |
| 517 |
- $(use_with lz4) \ |
| 518 |
- $(use_with nghttp2) \ |
| 519 |
- $(use_with pcap) \ |
| 520 |
- $(use_with portaudio) \ |
| 521 |
- $(use_with sbc) \ |
| 522 |
- $(use_with smi libsmi) \ |
| 523 |
- $(use_with snappy) \ |
| 524 |
- $(use_with spandsp) \ |
| 525 |
- $(use_with ssl gnutls) \ |
| 526 |
- $(use_with zlib) \ |
| 527 |
- $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \ |
| 528 |
- $(usex netlink --with-libnl=3 --without-libnl) \ |
| 529 |
- $(usex qt5 --with-qt=5 '') \ |
| 530 |
- $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \ |
| 531 |
- $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ |
| 532 |
- $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ |
| 533 |
- $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ |
| 534 |
- --disable-warnings-as-errors \ |
| 535 |
- --sysconfdir="${EPREFIX}"/etc/wireshark \ |
| 536 |
- ${myconf[@]} |
| 537 |
-} |
| 538 |
- |
| 539 |
-src_compile() { |
| 540 |
- default |
| 541 |
+ mycmakeargs+=( |
| 542 |
+ -DBUILD_androiddump=$(usex androiddump) |
| 543 |
+ -DBUILD_capinfos=$(usex capinfos) |
| 544 |
+ -DBUILD_captype=$(usex captype) |
| 545 |
+ -DBUILD_ciscodump=$(usex ciscodump) |
| 546 |
+ -DBUILD_dftest=$(usex dftest) |
| 547 |
+ -DBUILD_dumpcap=$(usex dumpcap) |
| 548 |
+ -DBUILD_editcap=$(usex editcap) |
| 549 |
+ -DBUILD_mergecap=$(usex mergecap) |
| 550 |
+ -DBUILD_mmdbresolve=$(usex maxminddb) |
| 551 |
+ -DBUILD_randpkt=$(usex randpkt) |
| 552 |
+ -DBUILD_randpktdump=$(usex randpktdump) |
| 553 |
+ -DBUILD_reordercap=$(usex reordercap) |
| 554 |
+ -DBUILD_sharkd=$(usex sharkd) |
| 555 |
+ -DBUILD_sshdump=$(usex sshdump) |
| 556 |
+ -DBUILD_text2pcap=$(usex text2pcap) |
| 557 |
+ -DBUILD_tfshark=$(usex tfshark) |
| 558 |
+ -DBUILD_tshark=$(usex tshark) |
| 559 |
+ -DBUILD_udpdump=$(usex udpdump) |
| 560 |
+ -DBUILD_wireshark=$(usex qt5) |
| 561 |
+ -DBUILD_wireshark_gtk=$(usex gtk) |
| 562 |
+ -DENABLE_BCG729=$(usex bcg729) |
| 563 |
+ -DENABLE_CARES=$(usex adns) |
| 564 |
+ -DENABLE_GNUTLS=$(usex ssl) |
| 565 |
+ -DENABLE_KERBEROS=$(usex kerberos) |
| 566 |
+ -DENABLE_LIBXML2=$(usex libxml2) |
| 567 |
+ -DENABLE_LUA=$(usex lua) |
| 568 |
+ -DENABLE_LZ4=$(usex lz4) |
| 569 |
+ -DENABLE_NGHTTP2=$(usex nghttp2) |
| 570 |
+ -DENABLE_PCAP=$(usex pcap) |
| 571 |
+ -DENABLE_PORTAUDIO=$(usex portaudio) |
| 572 |
+ -DENABLE_SBC=$(usex sbc) |
| 573 |
+ -DENABLE_SMI=$(usex smi) |
| 574 |
+ -DENABLE_SNAPPY=$(usex snappy) |
| 575 |
+ -DENABLE_SPANDSP=$(usex spandsp) |
| 576 |
+ -DENABLE_ZLIB=$(usex zlib) |
| 577 |
+ -DENABLE_NETLINK=$(usex netlink) |
| 578 |
+ $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) |
| 579 |
+ -DENABLE_CAP=$(usex caps) |
| 580 |
+ -DDUMPCAP_INSTALL_OPTION=$(usex caps capabilities suid) |
| 581 |
+ -DDISABLE_WERROR=yes |
| 582 |
+ $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') |
| 583 |
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') |
| 584 |
+ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') |
| 585 |
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') |
| 586 |
+ ) |
| 587 |
|
| 588 |
- if use doc; then |
| 589 |
- emake -j1 -C docbook |
| 590 |
- if use doc-pdf; then |
| 591 |
- addpredict "/root/.java" |
| 592 |
- emake -C docbook all-pdf |
| 593 |
- fi |
| 594 |
- fi |
| 595 |
+ cmake-utils_src_configure |
| 596 |
} |
| 597 |
|
| 598 |
src_install() { |
| 599 |
- default |
| 600 |
+ cmake-utils_src_install |
| 601 |
|
| 602 |
# FAQ is not required as is installed from help/faq.txt |
| 603 |
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* |
| 604 |
|
| 605 |
- if use doc-pdf; then |
| 606 |
- docinto /usr/share/doc/${PF}/pdf/ |
| 607 |
- dodoc docbook/{developer,user}-guide.pdf |
| 608 |
- fi |
| 609 |
- |
| 610 |
# install headers |
| 611 |
local wsheader |
| 612 |
for wsheader in \ |
| 613 |
- config.h \ |
| 614 |
epan/*.h \ |
| 615 |
epan/crypt/*.h \ |
| 616 |
epan/dfilter/*.h \ |
| 617 |
@@ -238,11 +185,22 @@ src_install() { |
| 618 |
ws_symbol_export.h \ |
| 619 |
wsutil/*.h |
| 620 |
do |
| 621 |
+ echo "Installing ${wsheader}" |
| 622 |
insinto /usr/include/wireshark/$( dirname ${wsheader} ) |
| 623 |
doins ${wsheader} |
| 624 |
done |
| 625 |
|
| 626 |
- #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/ |
| 627 |
+ for wsheader in \ |
| 628 |
+ ../${P}_build/config.h \ |
| 629 |
+ ../${P}_build/version.h |
| 630 |
+ do |
| 631 |
+ echo "Installing ${wsheader}" |
| 632 |
+ insinto /usr/include/wireshark |
| 633 |
+ doins ${wsheader} |
| 634 |
+ done |
| 635 |
+ |
| 636 |
+ #with the above this really shouldn't be needed, but things may be looking |
| 637 |
+ # in wiretap/ instead of wireshark/wiretap/ |
| 638 |
insinto /usr/include/wiretap |
| 639 |
doins wiretap/wtap.h |
Archives