diff --git a/common/shlibs b/common/shlibs index 5262ef15a0f..334b4c34d6d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1528,9 +1528,9 @@ libnetapi.so.0 samba-3.6.23_1 libsmbsharemodes.so.0 samba-3.6.23_1 libmysqld.so.18 libmariadbclient-5.5.36_1 libwscodecs.so.2 libwireshark-2.6.2_1 -libwiretap.so.8 libwireshark-2.6.2_1 -libwireshark.so.10 libwireshark-2.6.2_1 -libwsutil.so.9 libwireshark-2.6.2_1 +libwiretap.so.9 libwireshark-3.0.0_1 +libwireshark.so.12 libwireshark-3.0.0_1 +libwsutil.so.10 libwireshark-3.0.0_1 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1 libKF5Prison.so.5 prison-5.43.0_1 diff --git a/srcpkgs/wireshark/INSTALL.msg b/srcpkgs/wireshark/INSTALL.msg index 2f040bfbe36..cf5f08cca27 100644 --- a/srcpkgs/wireshark/INSTALL.msg +++ b/srcpkgs/wireshark/INSTALL.msg @@ -1,2 +1,6 @@ -You should also add your user to the 'wireshark' group to be able -to capture traffic. +The wireshark GTK interface is no longer provided by Void Linux, +and it will be fully removed from the repos on 2019-06-09. + +To capture traffic, add your user to the 'wireshark' group. + + # usermod -aG wireshark diff --git a/srcpkgs/wireshark/patches/cross.patch b/srcpkgs/wireshark/patches/cross.patch new file mode 100644 index 00000000000..cf933b64142 --- /dev/null +++ b/srcpkgs/wireshark/patches/cross.patch @@ -0,0 +1,41 @@ +Source: Johannes (@jnbr) +Upstream: no + +--- tools/lemon/CMakeLists.txt 2019-02-28 18:56:38.000000000 +0100 ++++ tools/lemon/CMakeLists.txt 2019-03-11 20:41:14.211616335 +0100 +@@ -7,6 +7,14 @@ + # SPDX-License-Identifier: GPL-2.0-or-later + # + ++if(CMAKE_CROSSCOMPILING) ++ add_custom_target( ++ lemon ++ COMMAND $ENV{CC_FOR_BUILD} -o ${EXECUTABLE_OUTPUT_PATH}/lemon ${CMAKE_CURRENT_SOURCE_DIR}/lemon.c ++ COMMENT "generate lemon for host" ++ ) ++else() ++ + add_executable(lemon lemon.c) + + # To keep lemon.c as close to upstream as possible, deliberately ignore +@@ -62,6 +70,7 @@ + endif() + target_compile_options(lemon PRIVATE ${lemon_cflags}) + ++endif() # CMAKE_CROSSCOMPILING + # + # Editor modelines - https://www.wireshark.org/tools/modelines.html + # + +--- cmake/modules/UseLemon.cmake 2019-02-28 18:56:38.000000000 +0100 ++++ cmake/modules/UseLemon.cmake 2019-03-11 21:19:28.352163076 +0100 +@@ -13,7 +13,7 @@ + # These files are generated as side-effect + ${_out}.h + ${_out}.out +- COMMAND lemon ++ COMMAND ${EXECUTABLE_OUTPUT_PATH}/lemon + -T${_lemonpardir}/lempar.c + -d. + ${_in} + diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index 9edc87fc36a..6c6d6b08e28 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,37 +1,34 @@ # Template file for 'wireshark' pkgname=wireshark -version=2.6.6 +version=3.0.0 revision=1 -build_style=gnu-configure -configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua - --with-krb5 --with-gtk=3 --with-qt=5 --without-portaudio CC_FOR_BUILD=cc" -hostmakedepends="pkg-config flex perl python-devel mit-krb5-devel automake libtool - qt5-host-tools qt5-tools glib-devel" +build_style=cmake +hostmakedepends="pkg-config flex perl python3-devel mit-krb5-devel qt5-tools + qt5-host-tools qt5-qmake" makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel - geoip-devel libgcrypt-devel gtk+3-devel qt5-devel libcap-devel sbc-devel c-ares-devel" + libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-devel + qt5-devel qt5-tools-devel qt5-multimedia-devel qt5-svg-devel" depends="libcap-progs" short_desc="Network protocol analyzer" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.wireshark.org" distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz" -checksum=487933ea075bdbb25d8df06017d9c4f49fc20eb7f6ec80af086718ed5550e863 +checksum=bc4f30f5b2e94f3a696fef9de44673cdf402db90aac5299966da647f708f009e system_groups="wireshark" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" -pre_configure() { - autoreconf -fi - find -type f -name Makefile.in -exec sed -i "s/^LIBS = .*/\0 -ldl/" {} \; -} - post_install() { + rm -f -- "${DESTDIR}/usr/bin/lemon" + rm -f -- "${DESTDIR}/usr/lib/wireshark/cmake/UseLemon.cmake" + local _includeDir=usr/include/wireshark # Headers vmkdir $_includeDir - vcopy "config.h ws_symbol_export.h" $_includeDir + vcopy ws_symbol_export.h $_includeDir for i in wiretap wsutil; do vmkdir $_includeDir/$i @@ -44,8 +41,9 @@ post_install() { libwireshark_package() { short_desc+=" - library" pkg_install() { - vmove usr/lib/*.so.* - vmove usr/lib/wireshark + vmove "usr/lib/*.so.*" + vmove usr/lib/wireshark/extcap + vmove usr/lib/wireshark/plugins } } @@ -55,18 +53,16 @@ libwireshark-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.so + vmove "usr/lib/*.so" + vmove usr/lib/wireshark/cmake } } wireshark-gtk_package() { - depends="${sourcepkg}>=${version}_${revision} hicolor-icon-theme desktop-file-utils" - short_desc+=" - GTK+ frontend" - pkg_install() { - vmove usr/bin/wireshark-gtk - vmove usr/share/icons - vmove usr/share/applications/wireshark-gtk.desktop - } + build_style=meta + archs=noarch + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK+ frontend (removed package)" } wireshark-qt_package() {