Date: Tue, 3 Nov 2020 19:51:55 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554019 - head/net/wireshark Message-ID: <202011031951.0A3JptFa034588@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Tue Nov 3 19:51:55 2020 New Revision: 554019 URL: https://svnweb.freebsd.org/changeset/ports/554019 Log: Update to 3.4.0. See https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html for a list of changes in this release. Modified: head/net/wireshark/Makefile head/net/wireshark/distinfo head/net/wireshark/pkg-plist Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Tue Nov 3 19:50:03 2020 (r554018) +++ head/net/wireshark/Makefile Tue Nov 3 19:51:55 2020 (r554019) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= wireshark -PORTVERSION= 3.2.7 +PORTVERSION= 3.4.0 PORTREVISION?= 0 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ @@ -59,7 +59,7 @@ PLIST_SUB+= ${x:tu}=bin/$x \ .endif .endfor -OPTIONS_DEFINE= GUI RTP SNMP MAXMIND LUA DECRYPT ANDROIDDUMP CARES SSHDUMP CISCODUMP +OPTIONS_DEFINE= GUI RTP SNMP MAXMIND LUA DECRYPT ANDROIDDUMP CARES SSHDUMP CISCODUMP OPUS OPTIONS_SINGLE= GSSAPI @@ -80,6 +80,7 @@ GSSAPI_MIT_DESC= Kerberos support via security/krb5 GSSAPI_NONE_DESC= Disable Kerberos support SSHDUMP_DESC= Build sshdump extcap tool CISCODUMP_DESC= Build ciscodump extcap tool +OPUS_DESC= Build opus decoder plugin GUI_USES= qt:5 GUI_USE= qt=core,gui,multimedia,widgets,printsupport,svg,buildtools_build,linguisttools_build,qmake_build @@ -98,6 +99,8 @@ DECRYPT_LIB_DEPENDS= libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt SSHDUMP_LIB_DEPENDS= libssh.so:security/libssh CISCODUMP_LIB_DEPENDS= libssh.so:security/libssh +OPUS_LIB_DEPENDS= libopus.so:audio/opus +OPUS_CPPFLAGS= -I${LOCALBASE}/include GSSAPI_NONE_CMAKE_ON= -DENABLE_KERBEROS=OFF GSSAPI_NONE_CMAKE_OFF= -DENABLE_KERBEROS=ON @@ -119,6 +122,8 @@ SSHDUMP_CMAKE_ON=-DBUILD_sshdump=ON SSHDUMP_CMAKE_OFF=-DBUILD_sshdump=OFF CISCODUMP_CMAKE_ON=-DBUILD_ciscodump=ON CISCODUMP_CMAKE_OFF=-DBUILD_ciscodump=OFF +OPUS_CMAKE_ON= -DENABLE_OPUS=ON +OPUS_CMAKE_OFF= -DENABLE_OPUS=OFF LUA_CPPFLAGS= -I${LUA_INCDIR} @@ -130,13 +135,15 @@ OPTIONS_SUB= yes .if defined(LITE) CMAKE_ARGS+= -DBUILD_androiddump=OFF \ -DBUILD_sshdump=OFF \ - -DBUILD_ciscodump=OFF + -DBUILD_ciscodump=OFF \ + -DENABLE_OPUS=OFF PLIST_SUB+= ANDROIDDUMP_LIB="@comment " \ ANDROIDDUMP_MAN="@comment " \ SSHDUMP_LIB="@comment " \ SSHDUMP_MAN="@comment " \ CISCODUMP_LIB="@comment " \ - CISCODUMP_MAN="@comment " + CISCODUMP_MAN="@comment " \ + OPUS="@comment " .endif .include <bsd.port.options.mk> @@ -177,6 +184,11 @@ PLIST_SUB+= CISCODUMP_LIB="" \ .else PLIST_SUB+= CISCODUMP_LIB="@comment " \ CISCODUMP_MAN="@comment " +.endif +.if ${PORT_OPTIONS:MOPUS} +PLIST_SUB+= OPUS="" +.else +PLIST_SUB+= OPUS="@comment " .endif .endif Modified: head/net/wireshark/distinfo ============================================================================== --- head/net/wireshark/distinfo Tue Nov 3 19:50:03 2020 (r554018) +++ head/net/wireshark/distinfo Tue Nov 3 19:51:55 2020 (r554019) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600979017 -SHA256 (wireshark-3.2.7.tar.xz) = be832fb86d9c455c5be8b225a755cdc77cb0e92356bdfc1fe4b000d93f7d70da -SIZE (wireshark-3.2.7.tar.xz) = 31659996 +TIMESTAMP = 1604413798 +SHA256 (wireshark-3.4.0.tar.xz) = 67e4ebbd9153fc589fd67dc21b93176674c73adc3d5a43934c3ac69d8594a8ae +SIZE (wireshark-3.4.0.tar.xz) = 32502760 Modified: head/net/wireshark/pkg-plist ============================================================================== --- head/net/wireshark/pkg-plist Tue Nov 3 19:50:03 2020 (r554018) +++ head/net/wireshark/pkg-plist Tue Nov 3 19:51:55 2020 (r554019) @@ -33,6 +33,7 @@ include/wireshark/epan/bridged_pids.h include/wireshark/epan/capture_dissectors.h include/wireshark/epan/charsets.h include/wireshark/epan/chdlctypes.h +include/wireshark/epan/cisco_pid.h include/wireshark/epan/color_filters.h include/wireshark/epan/column-info.h include/wireshark/epan/column-utils.h @@ -55,6 +56,7 @@ include/wireshark/epan/disabled_protos.h include/wireshark/epan/dissectors/file-rbm.h include/wireshark/epan/dissectors/packet-6lowpan.h include/wireshark/epan/dissectors/packet-a21.h +include/wireshark/epan/dissectors/packet-acdr.h include/wireshark/epan/dissectors/packet-acp133.h include/wireshark/epan/dissectors/packet-acse.h include/wireshark/epan/dissectors/packet-actrace.h @@ -84,6 +86,7 @@ include/wireshark/epan/dissectors/packet-btavrcp.h include/wireshark/epan/dissectors/packet-bthci_acl.h include/wireshark/epan/dissectors/packet-bthci_cmd.h include/wireshark/epan/dissectors/packet-bthci_evt.h +include/wireshark/epan/dissectors/packet-bthci_iso.h include/wireshark/epan/dissectors/packet-bthci_sco.h include/wireshark/epan/dissectors/packet-btl2cap.h include/wireshark/epan/dissectors/packet-btle.h @@ -148,6 +151,7 @@ include/wireshark/epan/dissectors/packet-epmd.h include/wireshark/epan/dissectors/packet-erf.h include/wireshark/epan/dissectors/packet-ess.h include/wireshark/epan/dissectors/packet-eth.h +include/wireshark/epan/dissectors/packet-f1ap.h include/wireshark/epan/dissectors/packet-f5ethtrailer.h include/wireshark/epan/dissectors/packet-fc.h include/wireshark/epan/dissectors/packet-fcbls.h @@ -163,6 +167,7 @@ include/wireshark/epan/dissectors/packet-fix.h include/wireshark/epan/dissectors/packet-fmp.h include/wireshark/epan/dissectors/packet-frame.h include/wireshark/epan/dissectors/packet-ftam.h +include/wireshark/epan/dissectors/packet-ftdi-ft.h include/wireshark/epan/dissectors/packet-geonw.h include/wireshark/epan/dissectors/packet-giop.h include/wireshark/epan/dissectors/packet-gluster.h @@ -239,6 +244,7 @@ include/wireshark/epan/dissectors/packet-lisp.h include/wireshark/epan/dissectors/packet-llc.h include/wireshark/epan/dissectors/packet-lnet.h include/wireshark/epan/dissectors/packet-logotypecertextn.h +include/wireshark/epan/dissectors/packet-lppa.h include/wireshark/epan/dissectors/packet-lpp.h include/wireshark/epan/dissectors/packet-lte-rrc.h include/wireshark/epan/dissectors/packet-mac-lte.h @@ -419,6 +425,7 @@ include/wireshark/epan/dissectors/packet-xmpp-jingle.h include/wireshark/epan/dissectors/packet-xmpp-other.h include/wireshark/epan/dissectors/packet-xmpp-utils.h include/wireshark/epan/dissectors/packet-xmpp.h +include/wireshark/epan/dissectors/packet-xnap.h include/wireshark/epan/dissectors/packet-ypbind.h include/wireshark/epan/dissectors/packet-yppasswd.h include/wireshark/epan/dissectors/packet-ypserv.h @@ -570,6 +577,7 @@ include/wireshark/wsutil/crc7.h include/wireshark/wsutil/crc8.h include/wireshark/wsutil/curve25519.h include/wireshark/wsutil/eax.h +include/wireshark/wsutil/epochs.h include/wireshark/wsutil/filesystem.h include/wireshark/wsutil/frequency-utils.h include/wireshark/wsutil/g711.h @@ -609,14 +617,14 @@ include/wireshark/wsutil/ws_pipe.h include/wireshark/wsutil/ws_printf.h include/wireshark/wsutil/xtea.h lib/libwireshark.so -lib/libwireshark.so.13 -lib/libwireshark.so.13.0.7 +lib/libwireshark.so.14 +lib/libwireshark.so.14.0.0 lib/libwiretap.so -lib/libwiretap.so.10 -lib/libwiretap.so.10.0.7 +lib/libwiretap.so.11 +lib/libwiretap.so.11.0.0 lib/libwsutil.so -lib/libwsutil.so.11 -lib/libwsutil.so.11.0.0 +lib/libwsutil.so.12 +lib/libwsutil.so.12.0.0 lib/wireshark/cmake/FindGLIB2.cmake lib/wireshark/cmake/FindWSLibrary.cmake lib/wireshark/cmake/FindWSWinLibs.cmake @@ -632,21 +640,22 @@ lib/wireshark/cmake/WiresharkTargets.cmake %%RANDPKTDUMP_LIB%%lib/wireshark/extcap/randpktdump %%SSHDUMP_LIB%%lib/wireshark/extcap/sshdump %%UDPDUMP_LIB%%lib/wireshark/extcap/udpdump -lib/wireshark/plugins/3.2/codecs/g711.so -lib/wireshark/plugins/3.2/codecs/l16mono.so -lib/wireshark/plugins/3.2/epan/ethercat.so -lib/wireshark/plugins/3.2/epan/gryphon.so -lib/wireshark/plugins/3.2/epan/irda.so -lib/wireshark/plugins/3.2/epan/mate.so -lib/wireshark/plugins/3.2/epan/opcua.so -lib/wireshark/plugins/3.2/epan/profinet.so -lib/wireshark/plugins/3.2/epan/stats_tree.so -lib/wireshark/plugins/3.2/epan/transum.so -lib/wireshark/plugins/3.2/epan/unistim.so -lib/wireshark/plugins/3.2/epan/wimax.so -lib/wireshark/plugins/3.2/epan/wimaxasncp.so -lib/wireshark/plugins/3.2/epan/wimaxmacphy.so -lib/wireshark/plugins/3.2/wiretap/usbdump.so +lib/wireshark/plugins/3.4/codecs/g711.so +lib/wireshark/plugins/3.4/codecs/l16mono.so +%%OPUS%%lib/wireshark/plugins/3.4/codecs/opus_dec.so +lib/wireshark/plugins/3.4/epan/ethercat.so +lib/wireshark/plugins/3.4/epan/gryphon.so +lib/wireshark/plugins/3.4/epan/irda.so +lib/wireshark/plugins/3.4/epan/mate.so +lib/wireshark/plugins/3.4/epan/opcua.so +lib/wireshark/plugins/3.4/epan/profinet.so +lib/wireshark/plugins/3.4/epan/stats_tree.so +lib/wireshark/plugins/3.4/epan/transum.so +lib/wireshark/plugins/3.4/epan/unistim.so +lib/wireshark/plugins/3.4/epan/wimax.so +lib/wireshark/plugins/3.4/epan/wimaxasncp.so +lib/wireshark/plugins/3.4/epan/wimaxmacphy.so +lib/wireshark/plugins/3.4/wiretap/usbdump.so libdata/pkgconfig/wireshark.pc %%ANDROIDDUMP_MAN%%man/man1/androiddump.1.gz %%CAPINFOS_MAN%%man/man1/capinfos.1.gz @@ -708,6 +717,7 @@ man/man4/wireshark-filter.4.gz %%DATADIR%%/diameter/Huawei.xml %%DATADIR%%/diameter/Inovar.xml %%DATADIR%%/diameter/Juniper.xml +%%DATADIR%%/diameter/Metaswitch.xml %%DATADIR%%/diameter/Microsoft.xml %%DATADIR%%/diameter/Nokia.xml %%DATADIR%%/diameter/NokiaSolutionsAndNetworks.xml @@ -818,6 +828,7 @@ man/man4/wireshark-filter.4.gz %%DATADIR%%/radius/dictionary.efficientip %%DATADIR%%/radius/dictionary.eltex %%DATADIR%%/radius/dictionary.epygi +%%DATADIR%%/radius/dictionary.enterasys %%DATADIR%%/radius/dictionary.equallogic %%DATADIR%%/radius/dictionary.ericsson %%DATADIR%%/radius/dictionary.ericsson.ab @@ -838,6 +849,7 @@ man/man4/wireshark-filter.4.gz %%DATADIR%%/radius/dictionary.hp %%DATADIR%%/radius/dictionary.huawei %%DATADIR%%/radius/dictionary.iana +%%DATADIR%%/radius/dictionary.identity_engines %%DATADIR%%/radius/dictionary.iea %%DATADIR%%/radius/dictionary.infoblox %%DATADIR%%/radius/dictionary.infonet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011031951.0A3JptFa034588>