diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index aa8caa1e737..9b42788ee85 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,17 +1,15 @@ -# $OpenBSD: Makefile,v 1.56 2017/08/30 11:10:59 sthen Exp $ +# $OpenBSD: Makefile,v 1.57 2017/08/30 12:42:34 sthen Exp $ BROKEN-alpha = .got subsegment exceeds 64K (size 101480) BROKEN-sparc64 = cc: Internal error: Illegal instruction (program cc1) COMMENT-main = graphical network protocol analyzer, Qt user-interface -COMMENT-gtk = graphical network protocol analyzer, Gtk+3 user-interface COMMENT-text = network protocol analyzer -WVER = 2.2.9 +WVER = 2.4.1 PORTROACH = limitw:1,even DISTNAME = wireshark-${WVER} PKGNAME-main = wireshark-${WVER} -PKGNAME-gtk = wireshark-gtk-${WVER} PKGNAME-text = tshark-${WVER} SHARED_LIBS += wscodecs 0.0 # 0.0 @@ -23,7 +21,7 @@ CATEGORIES = net security x11 HOMEPAGE = http://www.wireshark.org/ -EXTRACT_SUFX = .tar.bz2 +EXTRACT_SUFX = .tar.xz # Mostly GPLv2 or later. Some files are less restrictive. # tools/pidl is GPLv3 or later. See COPYING. @@ -33,7 +31,7 @@ cWANTLIB += c glib-2.0 m pcap z MAINTAINER = Stuart Henderson -MULTI_PACKAGES = -text -main -gtk +MULTI_PACKAGES = -text -main MODLUA_VERSION = 5.2 MODULES = lang/lua \ @@ -44,16 +42,13 @@ MODLUA_RUNDEP = No MODPY_RUNDEP = No WANTLIB-text = ${cWANTLIB} ${MODLUA_WANTLIB} -WANTLIB-text += GeoIP cares gcrypt gmodule-2.0 gnutls gpg-error smi ssh +WANTLIB-text += GeoIP cares gcrypt gmodule-2.0 gnutls gpg-error lz4 +WANTLIB-text += nghttp2 smi spandsp ssh xml2 WANTLIB-main = ${cWANTLIB} ${COMPILER_LIBCXX} WANTLIB-main += pthread wireshark wiretap wscodecs wsutil WANTLIB-main += Qt5Core Qt5Gui Qt5Multimedia Qt5PrintSupport Qt5Widgets -WANTLIB-gtk = ${cWANTLIB} wireshark wiretap wscodecs wsutil -WANTLIB-gtk += cairo gdk_pixbuf-2.0 gdk-3 gio-2.0 gobject-2.0 gtk-3 -WANTLIB-gtk += pango-1.0 pangocairo-1.0 portaudio - MASTER_SITES = http://www.wireshark.org/download/src/all-versions/ \ http://www.wireshark.org/download/automated/src/ @@ -72,13 +67,17 @@ RUN_DEPENDS-main = ${RUN_DEPENDS} \ x11/gtk+3,-guic LIB_DEPENDS-text = ${MODLUA_LIB_DEPENDS} \ + archivers/lz4 \ devel/glib2 \ net/libcares \ net/libsmi \ net/GeoIP \ security/gnutls \ security/libgcrypt \ - security/libssh + security/libssh \ + telephony/spandsp \ + textproc/libxml \ + www/nghttp2 LIB_DEPENDS-main += ${LIB_DEPENDS} \ tshark-${WVER}:${BUILD_PKGPATH:S/,$//},-text \ @@ -90,10 +89,6 @@ LIB_DEPENDS-main += ${LIB_DEPENDS} \ # an "Extra" (that may later change to a real WANTLIB) than failing builds. WANTLIB-main += Qt5Svg -LIB_DEPENDS-gtk += tshark-${WVER}:${BUILD_PKGPATH:S/,$//},-text \ - x11/gtk+3 \ - audio/portaudio-svn - MODULES += devel/cmake CONFIGURE_STYLE = cmake CONFIGURE_ARGS = -DDUMPCAP_INST_VALS=suid \ diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 410bf95111e..3cd92a61be0 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,2 +1,2 @@ -SHA256 (wireshark-2.2.9.tar.bz2) = yLMsDn1EonfnN8U9nRQq0/5CZTOPJaf9jIkfWKdjP8I= -SIZE (wireshark-2.2.9.tar.bz2) = 32341866 +SHA256 (wireshark-2.4.1.tar.xz) = At28+bEPnfoeNu7AD+AMtbXOjgcgOEO68FaseQmRH80= +SIZE (wireshark-2.4.1.tar.xz) = 28780384 diff --git a/net/wireshark/patches/patch-CMakeLists_txt b/net/wireshark/patches/patch-CMakeLists_txt index 1611762f0d3..135ed6d5a0b 100644 --- a/net/wireshark/patches/patch-CMakeLists_txt +++ b/net/wireshark/patches/patch-CMakeLists_txt @@ -1,4 +1,4 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.1 2017/08/22 22:39:38 sthen Exp $ +$OpenBSD: patch-CMakeLists_txt,v 1.2 2017/08/30 12:42:34 sthen Exp $ Avoid the broken libwsutil.so that gets generated with -pie -shared (probably following tools/clang/lib/Driver/Tools.cpp r1.13 "push back @@ -7,7 +7,7 @@ Avoid the broken libwsutil.so that gets generated with -pie -shared Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -612,11 +612,11 @@ set(WIRESHARK_LD_FLAGS +@@ -706,11 +706,11 @@ set(WIRESHARK_LD_FLAGS # XXX - are there other compilers that don't support -pie? It's # not as if the only platforms we support are Windows and Linux.... # diff --git a/net/wireshark/patches/patch-ui_qt_capture_filter_syntax_worker_cpp b/net/wireshark/patches/patch-ui_qt_capture_filter_syntax_worker_cpp index 1406ce63d0e..9f4847d747a 100644 --- a/net/wireshark/patches/patch-ui_qt_capture_filter_syntax_worker_cpp +++ b/net/wireshark/patches/patch-ui_qt_capture_filter_syntax_worker_cpp @@ -1,13 +1,13 @@ -$OpenBSD: patch-ui_qt_capture_filter_syntax_worker_cpp,v 1.3 2017/06/02 01:52:01 sthen Exp $ +$OpenBSD: patch-ui_qt_capture_filter_syntax_worker_cpp,v 1.4 2017/08/30 12:42:34 sthen Exp $ cope with old libpcap Index: ui/qt/capture_filter_syntax_worker.cpp --- ui/qt/capture_filter_syntax_worker.cpp.orig +++ ui/qt/capture_filter_syntax_worker.cpp -@@ -89,11 +89,14 @@ void CaptureFilterSyntaxWorker::start() { - if (device.if_info.extcap == NULL || strlen(device.if_info.extcap) == 0) - { +@@ -96,11 +96,14 @@ void CaptureFilterSyntaxWorker::start() { + #ifdef HAVE_EXTCAP + if (device.if_info.extcap == NULL || strlen(device.if_info.extcap) == 0) { #endif +#ifdef DLT_USER0 if (device.active_dlt >= DLT_USER0 && device.active_dlt <= DLT_USER15) { @@ -21,7 +21,7 @@ Index: ui/qt/capture_filter_syntax_worker.cpp active_dlts.insert(device.active_dlt); } #ifdef HAVE_EXTCAP -@@ -117,7 +120,7 @@ void CaptureFilterSyntaxWorker::start() { +@@ -122,7 +125,7 @@ void CaptureFilterSyntaxWorker::start() { #ifdef PCAP_NETMASK_UNKNOWN pc_err = pcap_compile(pd, &fcode, filter.toUtf8().constData(), 1 /* Do optimize */, PCAP_NETMASK_UNKNOWN); #else diff --git a/net/wireshark/patches/patch-ui_qt_compiled_filter_output_cpp b/net/wireshark/patches/patch-ui_qt_compiled_filter_output_cpp index 30a6e96b765..b46ce0271e7 100644 --- a/net/wireshark/patches/patch-ui_qt_compiled_filter_output_cpp +++ b/net/wireshark/patches/patch-ui_qt_compiled_filter_output_cpp @@ -1,11 +1,11 @@ -$OpenBSD: patch-ui_qt_compiled_filter_output_cpp,v 1.3 2017/06/02 01:52:01 sthen Exp $ +$OpenBSD: patch-ui_qt_compiled_filter_output_cpp,v 1.4 2017/08/30 12:42:34 sthen Exp $ cope with old libpcap Index: ui/qt/compiled_filter_output.cpp --- ui/qt/compiled_filter_output.cpp.orig +++ ui/qt/compiled_filter_output.cpp -@@ -89,7 +89,7 @@ void CompiledFilterOutput::compileFilter() +@@ -92,7 +92,7 @@ void CompiledFilterOutput::compileFilter() if (pd == NULL) break; g_mutex_lock(pcap_compile_mtx); diff --git a/net/wireshark/pkg/DESCR-gtk b/net/wireshark/pkg/DESCR-gtk deleted file mode 100644 index ef43239d1a3..00000000000 --- a/net/wireshark/pkg/DESCR-gtk +++ /dev/null @@ -1,4 +0,0 @@ -Wireshark is a network capture tool and protocol analyzer, including -decoders for very many common and less-common protocols. - -This package contains the legacy Gtk+3 graphical user interface. diff --git a/net/wireshark/pkg/PLIST-gtk b/net/wireshark/pkg/PLIST-gtk deleted file mode 100644 index 4b919da35a0..00000000000 --- a/net/wireshark/pkg/PLIST-gtk +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PLIST-gtk,v 1.1 2015/12/30 15:42:24 sthen Exp $ -@bin bin/wireshark-gtk diff --git a/net/wireshark/pkg/PLIST-main b/net/wireshark/pkg/PLIST-main index 4de84e686a5..8512ee7fa00 100644 --- a/net/wireshark/pkg/PLIST-main +++ b/net/wireshark/pkg/PLIST-main @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST-main,v 1.7 2016/01/03 14:59:33 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.8 2017/08/30 12:42:34 sthen Exp $ +@pkgpath net/wireshark,-gtk @bin bin/wireshark @man man/man1/wireshark.1 share/applications/wireshark.desktop diff --git a/net/wireshark/pkg/PLIST-text b/net/wireshark/pkg/PLIST-text index 69a8be4cba3..5940a35d32d 100644 --- a/net/wireshark/pkg/PLIST-text +++ b/net/wireshark/pkg/PLIST-text @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-text,v 1.6 2016/11/12 16:15:31 sthen Exp $ +@comment $OpenBSD: PLIST-text,v 1.7 2017/08/30 12:42:34 sthen Exp $ @newgroup _wireshark:735 @bin bin/capinfos @bin bin/captype @@ -13,6 +13,7 @@ @bin bin/randpkt @bin bin/rawshark @bin bin/reordercap +@bin bin/sharkd @bin bin/text2pcap @bin bin/tfshark @bin bin/tshark @@ -35,6 +36,7 @@ lib/wireshark/extcap/ @bin lib/wireshark/extcap/ciscodump @bin lib/wireshark/extcap/randpktdump @bin lib/wireshark/extcap/sshdump +@bin lib/wireshark/extcap/udpdump lib/wireshark/plugins/ lib/wireshark/plugins/${WVER}/ lib/wireshark/plugins/${WVER}/docsis.so @@ -46,6 +48,7 @@ lib/wireshark/plugins/${WVER}/mate.so lib/wireshark/plugins/${WVER}/opcua.so lib/wireshark/plugins/${WVER}/profinet.so lib/wireshark/plugins/${WVER}/stats_tree.so +lib/wireshark/plugins/${WVER}/transum.so lib/wireshark/plugins/${WVER}/unistim.so lib/wireshark/plugins/${WVER}/wimax.so lib/wireshark/plugins/${WVER}/wimaxasncp.so @@ -68,6 +71,7 @@ lib/wireshark/plugins/${WVER}/wimaxmacphy.so @man man/man1/sshdump.1 @man man/man1/text2pcap.1 @man man/man1/tshark.1 +@man man/man1/udpdump.1 @man man/man4/extcap.4 @man man/man4/wireshark-filter.4 share/wireshark/ @@ -91,6 +95,8 @@ share/wireshark/diameter/Custom.make share/wireshark/diameter/Custom.xml share/wireshark/diameter/Ericsson.xml share/wireshark/diameter/HP.xml +share/wireshark/diameter/Inovar.xml +share/wireshark/diameter/Juniper.xml share/wireshark/diameter/Nokia.xml share/wireshark/diameter/NokiaSolutionsAndNetworks.xml share/wireshark/diameter/Oracle.xml @@ -140,6 +146,11 @@ share/wireshark/ipmap.html share/wireshark/manuf share/wireshark/mergecap.html share/wireshark/pdml2html.xsl +share/wireshark/profiles/ +share/wireshark/profiles/Bluetooth/ +share/wireshark/profiles/Bluetooth/colorfilters +share/wireshark/profiles/Classic/ +share/wireshark/profiles/Classic/colorfilters share/wireshark/radius/ share/wireshark/radius/Custom.make share/wireshark/radius/README.radius_dictionary @@ -189,12 +200,14 @@ share/wireshark/radius/dictionary.cisco.vpn3000 share/wireshark/radius/dictionary.cisco.vpn5000 share/wireshark/radius/dictionary.citrix share/wireshark/radius/dictionary.clavister +share/wireshark/radius/dictionary.cnergee share/wireshark/radius/dictionary.colubris share/wireshark/radius/dictionary.columbia_university share/wireshark/radius/dictionary.compat share/wireshark/radius/dictionary.compatible share/wireshark/radius/dictionary.cosine share/wireshark/radius/dictionary.dante +share/wireshark/radius/dictionary.dellemc share/wireshark/radius/dictionary.dhcp share/wireshark/radius/dictionary.digium share/wireshark/radius/dictionary.dlink @@ -206,7 +219,6 @@ share/wireshark/radius/dictionary.equallogic share/wireshark/radius/dictionary.ericsson share/wireshark/radius/dictionary.ericsson.ab share/wireshark/radius/dictionary.ericsson.packet.core.networks -share/wireshark/radius/dictionary.erx share/wireshark/radius/dictionary.extreme share/wireshark/radius/dictionary.f5 share/wireshark/radius/dictionary.fdxtended @@ -241,6 +253,7 @@ share/wireshark/radius/dictionary.manzara share/wireshark/radius/dictionary.meinberg share/wireshark/radius/dictionary.merit share/wireshark/radius/dictionary.meru +share/wireshark/radius/dictionary.microsemi share/wireshark/radius/dictionary.microsoft share/wireshark/radius/dictionary.mikrotik share/wireshark/radius/dictionary.motorola @@ -297,6 +310,7 @@ share/wireshark/radius/dictionary.rfc7055 share/wireshark/radius/dictionary.rfc7155 share/wireshark/radius/dictionary.rfc7268 share/wireshark/radius/dictionary.rfc7499 +share/wireshark/radius/dictionary.rfc7930 share/wireshark/radius/dictionary.riverbed share/wireshark/radius/dictionary.riverstone share/wireshark/radius/dictionary.roaringpenguin @@ -323,6 +337,7 @@ share/wireshark/radius/dictionary.trapeze share/wireshark/radius/dictionary.travelping share/wireshark/radius/dictionary.tropos share/wireshark/radius/dictionary.ukerna +share/wireshark/radius/dictionary.unisphere share/wireshark/radius/dictionary.unix share/wireshark/radius/dictionary.usr share/wireshark/radius/dictionary.utstarcom @@ -353,6 +368,7 @@ share/wireshark/text2pcap.html share/wireshark/tpncp/ share/wireshark/tpncp/tpncp.dat share/wireshark/tshark.html +share/wireshark/udpdump.html share/wireshark/wimaxasncp/ share/wireshark/wimaxasncp/dictionary.dtd share/wireshark/wimaxasncp/dictionary.xml