diff --git a/net/wireshark/DESCR b/net/wireshark/DESCR index 88792fa01b1f..ccd6d02b24f6 100644 --- a/net/wireshark/DESCR +++ b/net/wireshark/DESCR @@ -9,5 +9,3 @@ code as Wireshark, and with editcap, which is a program to read capture files and write the packets from that capture file, possibly in a different capture file format, and with some packets possibly removed from the capture. - -This package tracks version 2 stable branch. diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index ab9be9716385..2e967280e705 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.208 2019/05/05 16:44:05 rhialto Exp $ +# $NetBSD: Makefile,v 1.209 2019/05/06 09:36:47 adam Exp $ -DISTNAME= wireshark-2.6.7 -PKGREVISION= 2 +DISTNAME= wireshark-3.0.1 CATEGORIES= net MASTER_SITES= https://www.wireshark.org/download/src/ EXTRACT_SUFX= .tar.xz @@ -11,31 +10,27 @@ HOMEPAGE= https://www.wireshark.org/ COMMENT= Network protocol analyzer LICENSE= gnu-gpl-v2 -CONFLICTS+= ethereal-[0-9]* +CONFLICTS+= ethereal-[0-9]* + +USE_CMAKE= yes +CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release +CMAKE_ARGS+= -DENABLE_APPLICATION_BUNDLE=OFF +CMAKE_ARG_PATH= .. +CONFIGURE_DIRS= build USE_LANGUAGES= c c++ -USE_LIBTOOL= yes USE_TOOLS+= gmake perl pkg-config yacc lex -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-static=no -CONFIGURE_ARGS+= --disable-guides -CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} -CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} -CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc} -CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex} PKGCONFIG_OVERRIDE+= wireshark.pc.in -SHLIBTOOL_OVERRIDE= # empty CHECK_PORTABILITY_SKIP+= packaging/macosx/*/* PTHREAD_OPTS+= require +PYTHON_VERSIONS_INCOMPATIBLE= 27 # Python 2.7 is not supported PYTHON_FOR_BUILD_ONLY= yes REPLACE_PYTHON+= help/faq.py REPLACE_PYTHON+= tools/asn2deb REPLACE_PYTHON+= tools/asn2wrs.py -REPLACE_PYTHON+= tools/dfilter-test.py -REPLACE_PYTHON+= tools/ftsanity.py REPLACE_PYTHON+= tools/html2text.py REPLACE_PYTHON+= tools/idl2deb REPLACE_PYTHON+= tools/indexcap.py @@ -45,6 +40,9 @@ REPLACE_PYTHON+= tools/netscreen2dump.py REPLACE_PYTHON+= tools/pkt-from-core.py REPLACE_PYTHON+= tools/rdps.py +pre-configure: + ${MKDIR} ${WRKSRC}/build + .include "../../mk/bsd.prefs.mk" .include "options.mk" @@ -71,6 +69,7 @@ BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED .include "../../devel/pcre/buildlink3.mk" .include "../../devel/snappy/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../geography/libmaxminddb/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../net/libcares/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST index 3d7b7be6157f..bb3fa8bb3343 100644 --- a/net/wireshark/PLIST +++ b/net/wireshark/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.39 2018/12/03 15:35:15 adam Exp $ +@comment $NetBSD: PLIST,v 1.40 2019/05/06 09:36:47 adam Exp $ bin/capinfos bin/captype bin/dumpcap bin/editcap bin/idl2wrs bin/mergecap +bin/mmdbresolve bin/randpkt bin/rawshark bin/reordercap @@ -12,8 +13,8 @@ bin/sharkd bin/text2pcap bin/tshark ${PLIST.qt}bin/wireshark -${PLIST.gtk3}bin/wireshark-gtk include/wireshark/cfile.h +include/wireshark/cli_main.h include/wireshark/codecs/codecs.h include/wireshark/epan/addr_and_mask.h include/wireshark/epan/addr_resolv.h @@ -49,7 +50,7 @@ include/wireshark/epan/dfilter/drange.h include/wireshark/epan/diam_dict.h include/wireshark/epan/disabled_protos.h include/wireshark/epan/dissector_filters.h -include/wireshark/epan/dissectors/dissectors.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-acp133.h @@ -93,7 +94,6 @@ include/wireshark/epan/dissectors/packet-charging_ase.h include/wireshark/epan/dissectors/packet-chdlc.h include/wireshark/epan/dissectors/packet-cip.h include/wireshark/epan/dissectors/packet-cipsafety.h -include/wireshark/epan/dissectors/packet-clearcase.h include/wireshark/epan/dissectors/packet-cmip.h include/wireshark/epan/dissectors/packet-cmp.h include/wireshark/epan/dissectors/packet-cms.h @@ -104,42 +104,22 @@ include/wireshark/epan/dissectors/packet-csn1.h include/wireshark/epan/dissectors/packet-dap.h include/wireshark/epan/dissectors/packet-dcc.h include/wireshark/epan/dissectors/packet-dccp.h -include/wireshark/epan/dissectors/packet-dcerpc-atsvc.h include/wireshark/epan/dissectors/packet-dcerpc-browser.h include/wireshark/epan/dissectors/packet-dcerpc-budb.h include/wireshark/epan/dissectors/packet-dcerpc-butc.h -include/wireshark/epan/dissectors/packet-dcerpc-clusapi.h include/wireshark/epan/dissectors/packet-dcerpc-dce122.h include/wireshark/epan/dissectors/packet-dcerpc-dcom.h -include/wireshark/epan/dissectors/packet-dcerpc-dfs.h include/wireshark/epan/dissectors/packet-dcerpc-dnsserver.h -include/wireshark/epan/dissectors/packet-dcerpc-drsuapi.h -include/wireshark/epan/dissectors/packet-dcerpc-dssetup.h -include/wireshark/epan/dissectors/packet-dcerpc-efs.h -include/wireshark/epan/dissectors/packet-dcerpc-eventlog.h include/wireshark/epan/dissectors/packet-dcerpc-frsapi.h include/wireshark/epan/dissectors/packet-dcerpc-frsrpc.h -include/wireshark/epan/dissectors/packet-dcerpc-frstrans.h -include/wireshark/epan/dissectors/packet-dcerpc-initshutdown.h -include/wireshark/epan/dissectors/packet-dcerpc-lsa.h -include/wireshark/epan/dissectors/packet-dcerpc-mapi.h -include/wireshark/epan/dissectors/packet-dcerpc-mdssvc.h -include/wireshark/epan/dissectors/packet-dcerpc-misc.h include/wireshark/epan/dissectors/packet-dcerpc-netlogon.h -include/wireshark/epan/dissectors/packet-dcerpc-nspi.h include/wireshark/epan/dissectors/packet-dcerpc-nt.h include/wireshark/epan/dissectors/packet-dcerpc-pnp.h -include/wireshark/epan/dissectors/packet-dcerpc-rfr.h include/wireshark/epan/dissectors/packet-dcerpc-rras.h include/wireshark/epan/dissectors/packet-dcerpc-samr.h include/wireshark/epan/dissectors/packet-dcerpc-spoolss.h -include/wireshark/epan/dissectors/packet-dcerpc-srvsvc.h include/wireshark/epan/dissectors/packet-dcerpc-svcctl.h include/wireshark/epan/dissectors/packet-dcerpc-tapi.h -include/wireshark/epan/dissectors/packet-dcerpc-winreg.h -include/wireshark/epan/dissectors/packet-dcerpc-witness.h -include/wireshark/epan/dissectors/packet-dcerpc-wkssvc.h -include/wireshark/epan/dissectors/packet-dcerpc-wzcsvc.h include/wireshark/epan/dissectors/packet-dcerpc.h include/wireshark/epan/dissectors/packet-dcom-dispatch.h include/wireshark/epan/dissectors/packet-dcom.h @@ -173,7 +153,6 @@ include/wireshark/epan/dissectors/packet-fcels.h include/wireshark/epan/dissectors/packet-fcfcs.h include/wireshark/epan/dissectors/packet-fcfzs.h include/wireshark/epan/dissectors/packet-fclctl.h -include/wireshark/epan/dissectors/packet-fcp.h include/wireshark/epan/dissectors/packet-fcsb3.h include/wireshark/epan/dissectors/packet-fcswils.h include/wireshark/epan/dissectors/packet-ff.h @@ -181,11 +160,11 @@ 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-geonw.h include/wireshark/epan/dissectors/packet-giop.h include/wireshark/epan/dissectors/packet-gluster.h include/wireshark/epan/dissectors/packet-gmr1_common.h include/wireshark/epan/dissectors/packet-gmr1_rr.h -include/wireshark/epan/dissectors/packet-gnutella.h include/wireshark/epan/dissectors/packet-gprscdr.h include/wireshark/epan/dissectors/packet-gre.h include/wireshark/epan/dissectors/packet-gsm_a_common.h @@ -204,6 +183,7 @@ include/wireshark/epan/dissectors/packet-h245.h include/wireshark/epan/dissectors/packet-h248.h include/wireshark/epan/dissectors/packet-h263.h include/wireshark/epan/dissectors/packet-h264.h +include/wireshark/epan/dissectors/packet-h265.h include/wireshark/epan/dissectors/packet-h323.h include/wireshark/epan/dissectors/packet-h450-ros.h include/wireshark/epan/dissectors/packet-hpext.h @@ -214,6 +194,7 @@ include/wireshark/epan/dissectors/packet-iax2.h include/wireshark/epan/dissectors/packet-icmp.h include/wireshark/epan/dissectors/packet-idmp.h include/wireshark/epan/dissectors/packet-idp.h +include/wireshark/epan/dissectors/packet-ieee1609dot2.h include/wireshark/epan/dissectors/packet-ieee80211-radio.h include/wireshark/epan/dissectors/packet-ieee80211-radiotap-defs.h include/wireshark/epan/dissectors/packet-ieee80211-radiotap-iter.h @@ -234,11 +215,13 @@ include/wireshark/epan/dissectors/packet-isis-clv.h include/wireshark/epan/dissectors/packet-isis.h include/wireshark/epan/dissectors/packet-isl.h include/wireshark/epan/dissectors/packet-isup.h +include/wireshark/epan/dissectors/packet-its.h include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h include/wireshark/epan/dissectors/packet-juniper.h include/wireshark/epan/dissectors/packet-jxta.h include/wireshark/epan/dissectors/packet-kerberos.h -include/wireshark/epan/dissectors/packet-klm.h +include/wireshark/epan/dissectors/packet-knxip.h +include/wireshark/epan/dissectors/packet-knxip_decrypt.h include/wireshark/epan/dissectors/packet-l2tp.h include/wireshark/epan/dissectors/packet-lapdm.h include/wireshark/epan/dissectors/packet-lbm.h @@ -249,13 +232,13 @@ include/wireshark/epan/dissectors/packet-lcsap.h include/wireshark/epan/dissectors/packet-ldap.h include/wireshark/epan/dissectors/packet-ldp.h include/wireshark/epan/dissectors/packet-link16.h +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-lpp.h include/wireshark/epan/dissectors/packet-lte-rrc.h include/wireshark/epan/dissectors/packet-mac-lte.h -include/wireshark/epan/dissectors/packet-mac-nr.h include/wireshark/epan/dissectors/packet-mausb.h include/wireshark/epan/dissectors/packet-mbim.h include/wireshark/epan/dissectors/packet-mbtcp.h @@ -265,7 +248,6 @@ include/wireshark/epan/dissectors/packet-mms.h include/wireshark/epan/dissectors/packet-mount.h include/wireshark/epan/dissectors/packet-mp4ves.h include/wireshark/epan/dissectors/packet-mpeg-descriptor.h -include/wireshark/epan/dissectors/packet-mpeg-pmt.h include/wireshark/epan/dissectors/packet-mpeg-sect.h include/wireshark/epan/dissectors/packet-mpls.h include/wireshark/epan/dissectors/packet-mq.h @@ -280,8 +262,8 @@ include/wireshark/epan/dissectors/packet-ndmp.h include/wireshark/epan/dissectors/packet-ndps.h include/wireshark/epan/dissectors/packet-netbios.h include/wireshark/epan/dissectors/packet-netlink.h -include/wireshark/epan/dissectors/packet-netmon.h include/wireshark/epan/dissectors/packet-nfs.h +include/wireshark/epan/dissectors/packet-ngap.h include/wireshark/epan/dissectors/packet-nisplus.h include/wireshark/epan/dissectors/packet-nlm.h include/wireshark/epan/dissectors/packet-nr-rrc.h @@ -290,6 +272,7 @@ include/wireshark/epan/dissectors/packet-ntlmssp.h include/wireshark/epan/dissectors/packet-ntp.h include/wireshark/epan/dissectors/packet-nvme.h include/wireshark/epan/dissectors/packet-ocsp.h +include/wireshark/epan/dissectors/packet-oer.h include/wireshark/epan/dissectors/packet-opensafety.h include/wireshark/epan/dissectors/packet-oscore.h include/wireshark/epan/dissectors/packet-osi-options.h @@ -301,6 +284,7 @@ include/wireshark/epan/dissectors/packet-p772.h include/wireshark/epan/dissectors/packet-pcap_pktdata.h include/wireshark/epan/dissectors/packet-pcnfsd.h include/wireshark/epan/dissectors/packet-pdcp-lte.h +include/wireshark/epan/dissectors/packet-pdcp-nr.h include/wireshark/epan/dissectors/packet-per.h include/wireshark/epan/dissectors/packet-pkcs1.h include/wireshark/epan/dissectors/packet-pkcs12.h @@ -311,12 +295,10 @@ include/wireshark/epan/dissectors/packet-pkixac.h include/wireshark/epan/dissectors/packet-pkixproxy.h include/wireshark/epan/dissectors/packet-pkixqualified.h include/wireshark/epan/dissectors/packet-pkixtsp.h -include/wireshark/epan/dissectors/packet-pktc.h include/wireshark/epan/dissectors/packet-portmap.h include/wireshark/epan/dissectors/packet-ppi-geolocation-common.h include/wireshark/epan/dissectors/packet-ppp.h include/wireshark/epan/dissectors/packet-pres.h -include/wireshark/epan/dissectors/packet-protobuf.h include/wireshark/epan/dissectors/packet-ptp.h include/wireshark/epan/dissectors/packet-ptpip.h include/wireshark/epan/dissectors/packet-pw-atm.h @@ -339,7 +321,6 @@ include/wireshark/epan/dissectors/packet-rohc.h include/wireshark/epan/dissectors/packet-ros.h include/wireshark/epan/dissectors/packet-rpc.h include/wireshark/epan/dissectors/packet-rpcrdma.h -include/wireshark/epan/dissectors/packet-rquota.h include/wireshark/epan/dissectors/packet-rrc.h include/wireshark/epan/dissectors/packet-rsvp.h include/wireshark/epan/dissectors/packet-rtcp.h @@ -348,7 +329,6 @@ include/wireshark/epan/dissectors/packet-rtp.h include/wireshark/epan/dissectors/packet-rtps.h include/wireshark/epan/dissectors/packet-rtse.h include/wireshark/epan/dissectors/packet-rtsp.h -include/wireshark/epan/dissectors/packet-rwall.h include/wireshark/epan/dissectors/packet-rx.h include/wireshark/epan/dissectors/packet-s1ap.h include/wireshark/epan/dissectors/packet-s5066sis.h @@ -380,14 +360,12 @@ include/wireshark/epan/dissectors/packet-smrse.h include/wireshark/epan/dissectors/packet-snmp.h include/wireshark/epan/dissectors/packet-socketcan.h include/wireshark/epan/dissectors/packet-spice.h -include/wireshark/epan/dissectors/packet-spray.h include/wireshark/epan/dissectors/packet-sprt.h include/wireshark/epan/dissectors/packet-sscop.h -include/wireshark/epan/dissectors/packet-ssl-utils.h -include/wireshark/epan/dissectors/packet-ssl.h include/wireshark/epan/dissectors/packet-stat-notify.h include/wireshark/epan/dissectors/packet-stat.h include/wireshark/epan/dissectors/packet-sv.h +include/wireshark/epan/dissectors/packet-syslog.h include/wireshark/epan/dissectors/packet-t124.h include/wireshark/epan/dissectors/packet-t30.h include/wireshark/epan/dissectors/packet-t38.h @@ -395,8 +373,8 @@ include/wireshark/epan/dissectors/packet-tacacs.h include/wireshark/epan/dissectors/packet-tcap.h include/wireshark/epan/dissectors/packet-tcp.h include/wireshark/epan/dissectors/packet-tetra.h -include/wireshark/epan/dissectors/packet-tftp.h -include/wireshark/epan/dissectors/packet-thrift.h +include/wireshark/epan/dissectors/packet-tls-utils.h +include/wireshark/epan/dissectors/packet-tls.h include/wireshark/epan/dissectors/packet-tn3270.h include/wireshark/epan/dissectors/packet-tn5250.h include/wireshark/epan/dissectors/packet-tpkt.h @@ -447,15 +425,6 @@ include/wireshark/epan/dissectors/packet-zbee-zcl.h include/wireshark/epan/dissectors/packet-zbee-zdp.h include/wireshark/epan/dissectors/packet-zbee.h include/wireshark/epan/dissectors/packet-ziop.h -include/wireshark/epan/dissectors/read_keytab_file.h -include/wireshark/epan/dissectors/snort-config.h -include/wireshark/epan/dissectors/x11-declarations.h -include/wireshark/epan/dissectors/x11-enum.h -include/wireshark/epan/dissectors/x11-extension-errors.h -include/wireshark/epan/dissectors/x11-extension-implementation.h -include/wireshark/epan/dissectors/x11-glx-render-enum.h -include/wireshark/epan/dissectors/x11-keysym.h -include/wireshark/epan/dissectors/x11-register-info.h include/wireshark/epan/dtd.h include/wireshark/epan/dtd_parse.h include/wireshark/epan/dvb_chartbl.h @@ -516,7 +485,7 @@ include/wireshark/epan/req_resp_hdrs.h include/wireshark/epan/rtd_table.h include/wireshark/epan/rtp_pt.h include/wireshark/epan/sctpppids.h -include/wireshark/epan/sequence_analysis.h +include/wireshark/epan/secrets.h include/wireshark/epan/show_exception.h include/wireshark/epan/slow_protocol_subtypes.h include/wireshark/epan/sminmpec.h @@ -561,25 +530,25 @@ include/wireshark/epan/xdlc.h include/wireshark/file.h include/wireshark/globals.h include/wireshark/log.h +include/wireshark/version_info.h include/wireshark/wiretap/file_wrappers.h include/wireshark/wiretap/merge.h include/wireshark/wiretap/pcap-encap.h include/wireshark/wiretap/pcapng_module.h +include/wireshark/wiretap/secrets-types.h include/wireshark/wiretap/wtap.h include/wireshark/wiretap/wtap_opttypes.h include/wireshark/ws_attributes.h include/wireshark/ws_compiler_tests.h include/wireshark/ws_diag_control.h include/wireshark/ws_symbol_export.h +include/wireshark/ws_version.h include/wireshark/wsutil/adler32.h include/wireshark/wsutil/base32.h -include/wireshark/wsutil/base64.h include/wireshark/wsutil/bits_count_ones.h include/wireshark/wsutil/bits_ctz.h include/wireshark/wsutil/bitswap.h include/wireshark/wsutil/buffer.h -include/wireshark/wsutil/clopts_common.h -include/wireshark/wsutil/cmdarg_err.h include/wireshark/wsutil/color.h include/wireshark/wsutil/copyright_info.h include/wireshark/wsutil/cpu_info.h @@ -592,17 +561,19 @@ include/wireshark/wsutil/crc32.h include/wireshark/wsutil/crc6.h include/wireshark/wsutil/crc7.h include/wireshark/wsutil/crc8.h +include/wireshark/wsutil/curve25519.h include/wireshark/wsutil/eax.h include/wireshark/wsutil/filesystem.h include/wireshark/wsutil/frequency-utils.h include/wireshark/wsutil/g711.h -include/wireshark/wsutil/glib-compat.h include/wireshark/wsutil/inet_addr.h include/wireshark/wsutil/inet_ipv4.h include/wireshark/wsutil/inet_ipv6.h include/wireshark/wsutil/interface.h include/wireshark/wsutil/jsmn.h +include/wireshark/wsutil/json_dumper.h include/wireshark/wsutil/mpeg-audio.h +include/wireshark/wsutil/netlink.h include/wireshark/wsutil/nstime.h include/wireshark/wsutil/os_version_info.h include/wireshark/wsutil/pint.h @@ -611,7 +582,6 @@ include/wireshark/wsutil/pow2.h include/wireshark/wsutil/privileges.h include/wireshark/wsutil/processes.h include/wireshark/wsutil/report_message.h -include/wireshark/wsutil/rsa.h include/wireshark/wsutil/sign_ext.h include/wireshark/wsutil/sober128.h include/wireshark/wsutil/socket.h @@ -628,35 +598,49 @@ include/wireshark/wsutil/ws_mempbrk.h include/wireshark/wsutil/ws_mempbrk_int.h include/wireshark/wsutil/ws_pipe.h include/wireshark/wsutil/ws_printf.h -include/wireshark/wsutil/wsgcrypt.h -include/wireshark/wsutil/wsgetopt.h -include/wireshark/wsutil/wsjsmn.h -include/wireshark/wsutil/wspcap.h +include/wireshark/wsutil/wsjson.h include/wireshark/wsutil/xtea.h -lib/libwireshark.la -lib/libwiretap.la -lib/libwscodecs.la -lib/libwsutil.la +lib/libwireshark.so +lib/libwireshark.so.12 +lib/libwireshark.so.12.0.1 +lib/libwiretap.so +lib/libwiretap.so.9 +lib/libwiretap.so.9.0.1 +lib/libwscodecs.so +lib/libwscodecs.so.2 +lib/libwscodecs.so.2.0.0 +lib/libwsutil.so +lib/libwsutil.so.10 +lib/libwsutil.so.10.0.0 lib/pkgconfig/wireshark.pc +lib/wireshark/cmake/FindGLIB2.cmake +lib/wireshark/cmake/FindWSWinLibs.cmake +lib/wireshark/cmake/LocatePythonModule.cmake +lib/wireshark/cmake/UseAsn2Wrs.cmake +lib/wireshark/cmake/UseMakePluginReg.cmake +lib/wireshark/cmake/WiresharkConfig.cmake +lib/wireshark/cmake/WiresharkConfigVersion.cmake +lib/wireshark/cmake/WiresharkTargets-release.cmake +lib/wireshark/cmake/WiresharkTargets.cmake lib/wireshark/extcap/androiddump lib/wireshark/extcap/ciscodump lib/wireshark/extcap/randpktdump lib/wireshark/extcap/sshdump lib/wireshark/extcap/udpdump -lib/wireshark/plugins/2.6/codecs/l16mono.la -lib/wireshark/plugins/2.6/epan/ethercat.la -lib/wireshark/plugins/2.6/epan/gryphon.la -lib/wireshark/plugins/2.6/epan/irda.la -lib/wireshark/plugins/2.6/epan/mate.la -lib/wireshark/plugins/2.6/epan/opcua.la -lib/wireshark/plugins/2.6/epan/profinet.la -lib/wireshark/plugins/2.6/epan/stats_tree.la -lib/wireshark/plugins/2.6/epan/transum.la -lib/wireshark/plugins/2.6/epan/unistim.la -lib/wireshark/plugins/2.6/epan/wimax.la -lib/wireshark/plugins/2.6/epan/wimaxasncp.la -lib/wireshark/plugins/2.6/epan/wimaxmacphy.la -lib/wireshark/plugins/2.6/wiretap/usbdump.la +lib/wireshark/plugins/3.0/codecs/l16mono.so +lib/wireshark/plugins/3.0/epan/ethercat.so +lib/wireshark/plugins/3.0/epan/gryphon.so +lib/wireshark/plugins/3.0/epan/irda.so +lib/wireshark/plugins/3.0/epan/mate.so +lib/wireshark/plugins/3.0/epan/opcua.so +lib/wireshark/plugins/3.0/epan/profinet.so +lib/wireshark/plugins/3.0/epan/stats_tree.so +lib/wireshark/plugins/3.0/epan/transum.so +lib/wireshark/plugins/3.0/epan/unistim.so +lib/wireshark/plugins/3.0/epan/wimax.so +lib/wireshark/plugins/3.0/epan/wimaxasncp.so +lib/wireshark/plugins/3.0/epan/wimaxmacphy.so +lib/wireshark/plugins/3.0/wiretap/usbdump.so man/man1/androiddump.1 man/man1/capinfos.1 man/man1/captype.1 @@ -665,6 +649,7 @@ man/man1/dftest.1 man/man1/dumpcap.1 man/man1/editcap.1 man/man1/mergecap.1 +man/man1/mmdbresolve.1 man/man1/randpkt.1 man/man1/randpktdump.1 man/man1/rawshark.1 @@ -673,12 +658,31 @@ man/man1/sshdump.1 man/man1/text2pcap.1 man/man1/tshark.1 man/man1/udpdump.1 -${PLIST.mans}man/man1/wireshark.1 +man/man1/wireshark.1 man/man4/extcap.4 man/man4/wireshark-filter.4 ${PLIST.icons}share/appdata/wireshark.appdata.xml -${PLIST.icons}share/applications/wireshark-gtk.desktop ${PLIST.icons}share/applications/wireshark.desktop +share/doc/wireshark/androiddump.html +share/doc/wireshark/capinfos.html +share/doc/wireshark/captype.html +share/doc/wireshark/ciscodump.html +share/doc/wireshark/dftest.html +share/doc/wireshark/dumpcap.html +share/doc/wireshark/editcap.html +share/doc/wireshark/extcap.html +share/doc/wireshark/mergecap.html +share/doc/wireshark/mmdbresolve.html +share/doc/wireshark/randpkt.html +share/doc/wireshark/randpktdump.html +share/doc/wireshark/rawshark.html +share/doc/wireshark/reordercap.html +share/doc/wireshark/sshdump.html +share/doc/wireshark/text2pcap.html +share/doc/wireshark/tshark.html +share/doc/wireshark/udpdump.html +share/doc/wireshark/wireshark-filter.html +share/doc/wireshark/wireshark.html ${PLIST.icons}share/icons/hicolor/128x128/apps/wireshark.png ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png @@ -760,11 +764,12 @@ share/wireshark/extcap.html share/wireshark/help/capture_filters.txt share/wireshark/help/capturing.txt share/wireshark/help/display_filters.txt -share/wireshark/help/faq.txt +share/wireshark/help/faq.py share/wireshark/help/getting_started.txt share/wireshark/help/overview.txt share/wireshark/help/toc ${PLIST.lua}share/wireshark/init.lua +share/wireshark/ipmap.html share/wireshark/manuf share/wireshark/mergecap.html share/wireshark/mmdbresolve.html @@ -772,6 +777,7 @@ share/wireshark/pdml2html.xsl share/wireshark/profiles/Bluetooth/colorfilters share/wireshark/profiles/Bluetooth/preferences share/wireshark/profiles/Classic/colorfilters +share/wireshark/profiles/No Reassembly/preferences share/wireshark/radius/README.radius_dictionary share/wireshark/radius/custom.includes share/wireshark/radius/dictionary @@ -961,6 +967,7 @@ share/wireshark/radius/dictionary.unix share/wireshark/radius/dictionary.usr share/wireshark/radius/dictionary.utstarcom share/wireshark/radius/dictionary.valemount +share/wireshark/radius/dictionary.verizon share/wireshark/radius/dictionary.versanet share/wireshark/radius/dictionary.vqp share/wireshark/radius/dictionary.walabi diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 30b7201b785b..a7fc6dc0d6fc 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.118 2019/03/07 10:39:52 adam Exp $ +$NetBSD: distinfo,v 1.119 2019/05/06 09:36:47 adam Exp $ -SHA1 (wireshark-2.6.7.tar.xz) = 6d601a140b369618e5ac3acab736a1b8de8d5432 -RMD160 (wireshark-2.6.7.tar.xz) = 4d27f7d67a9b8d11270c6fcf135eb5ad7648d462 -SHA512 (wireshark-2.6.7.tar.xz) = bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677 -Size (wireshark-2.6.7.tar.xz) = 28420060 bytes +SHA1 (wireshark-3.0.1.tar.xz) = 33b880fb76b356dce4713a207c0bb9624f9b2c43 +RMD160 (wireshark-3.0.1.tar.xz) = 27ed3498a1e9a89706c1461736219c4ae4b08085 +SHA512 (wireshark-3.0.1.tar.xz) = 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d +Size (wireshark-3.0.1.tar.xz) = 30903792 bytes +SHA1 (patch-CMakeLists.txt) = c78289d6ded796674b947d6bddd0ba9749ab4569 diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk index 1739c5f28d16..af4278c3a416 100644 --- a/net/wireshark/options.mk +++ b/net/wireshark/options.mk @@ -1,99 +1,62 @@ -# $NetBSD: options.mk,v 1.22 2018/12/03 15:35:15 adam Exp $ +# $NetBSD: options.mk,v 1.23 2019/05/06 09:36:47 adam Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark -PKG_SUPPORTED_OPTIONS= gtk3 http2 lua -PKG_OPTIONS_OPTIONAL_GROUPS= qt -PKG_OPTIONS_GROUP.qt= qt4 qt5 -PKG_SUGGESTED_OPTIONS= qt5 lua +PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark +PKG_SUPPORTED_OPTIONS= http2 lua qt5 +PKG_SUGGESTED_OPTIONS= qt5 lua .include "../../mk/bsd.options.mk" -PLIST_VARS+= gtk3 icons lua mans qt +PLIST_VARS+= icons lua qt -.if empty(PKG_OPTIONS:Mqt4) && empty(PKG_OPTIONS:Mqt5) -CONFIGURE_ARGS+= --without-qt +.if !empty(PKG_OPTIONS:Mhttp2) +. include "../../www/nghttp2/buildlink3.mk" .else -. if !empty(PKG_OPTIONS:Mqt4) -CONFIGURE_ARGS+= --with-qt=4 -BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.8 -. include "../../x11/qt4-tools/buildlink3.mk" -. elif !empty(PKG_OPTIONS:Mqt5) -CONFIGURE_ARGS+= --with-qt=5 -. include "../../x11/qt5-qttools/buildlink3.mk" -. if ${OPSYS} == "Darwin" -. include "../../x11/qt5-qtmacextras/buildlink3.mk" -. else -. include "../../x11/qt5-qtx11extras/buildlink3.mk" -. endif -. endif -CONFIGURE_ENV+= LRELEASE=${QTDIR}/bin/lrelease -CONFIGURE_ENV+= MOC=${QTDIR}/bin/moc -CONFIGURE_ENV+= RCC=${QTDIR}/bin/rcc -CONFIGURE_ENV+= UIC=${QTDIR}/bin/uic -PLIST.qt= yes +CMAKE_ARGS+= -DENABLE_NGHTTP2=OFF .endif -.if !empty(PKG_OPTIONS:Mgtk3) -CONFIGURE_ARGS+= --with-gtk=3 -PLIST.gtk3= yes -POST_INSTALL_TARGETS+= install-gtk-desktop -.include "../../x11/gtk3/buildlink3.mk" -.include "../../graphics/adwaita-icon-theme/buildlink3.mk" - -.PHONY: install-gtk-desktop -install-gtk-desktop: - ${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \ - ${DESTDIR}${PREFIX}/share/applications/ - +.if !empty(PKG_OPTIONS:Mlua) +LUA_VERSIONS_INCOMPATIBLE= 53 +. include "../../lang/lua/buildlink3.mk" +PLIST.lua= yes .else -CONFIGURE_ARGS+= --without-gtk +CMAKE_ARGS+= -DENABLE_LUA=OFF .endif -.if empty(PKG_OPTIONS:Mgtk3) && empty(PKG_OPTIONS:Mqt4) && empty(PKG_OPTIONS:Mqt5) -CONFIGURE_ARGS+= --disable-wireshark -.else -CONFIGURE_ARGS+= --enable-wireshark -PLIST.mans= yes -INSTALLATION_DIRS+= share/applications +.if !empty(PKG_OPTIONS:Mqt5) +. include "../../x11/qt5-qtsvg/buildlink3.mk" +. include "../../x11/qt5-qttools/buildlink3.mk" +PLIST.qt= yes +. if ${OPSYS} == "Darwin" +. include "../../x11/qt5-qtmacextras/buildlink3.mk" +. else PLIST.icons= yes +. include "../../x11/qt5-qtx11extras/buildlink3.mk" POST_INSTALL_TARGETS+= install-icons +INSTALLATION_DIRS+= share/applications INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps ICON_SIZES= 16 32 48 MIMEICON_SIZES= 16 24 32 48 64 128 256 -. for d in ${ICON_SIZES} +. for d in ${ICON_SIZES} INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/apps -. endfor +. endfor -. for d in ${MIMEICON_SIZES} +. for d in ${MIMEICON_SIZES} INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/mimetypes -. endfor +. endfor -.include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +. include "../../sysutils/desktop-file-utils/desktopdb.mk" +. include "../../graphics/hicolor-icon-theme/buildlink3.mk" .PHONY: install-icons install-icons: ${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \ ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg -. for d in ${MIMEICON_SIZES} +. for d in ${MIMEICON_SIZES} ${INSTALL_DATA} ${WRKSRC}/image/WiresharkDoc-${d}.png \ ${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png -. endfor -.endif - -.if !empty(PKG_OPTIONS:Mlua) -LUA_VERSIONS_INCOMPATIBLE= 53 -.include "../../lang/lua/buildlink3.mk" -CONFIGURE_ARGS+= --with-lua=yes -PLIST.lua= yes -.else -CONFIGURE_ARGS+= --with-lua=no -.endif - -.if !empty(PKG_OPTIONS:Mhttp2) -.include "../../www/nghttp2/buildlink3.mk" -CONFIGURE_ARGS+= --with-nghttp2 +. endfor +. endif .else -CONFIGURE_ARGS+= --without-nghttp2 +CMAKE_ARGS+= -DBUILD_wireshark=OFF .endif diff --git a/net/wireshark/patches/patch-CMakeLists.txt b/net/wireshark/patches/patch-CMakeLists.txt new file mode 100644 index 000000000000..d895af287ed7 --- /dev/null +++ b/net/wireshark/patches/patch-CMakeLists.txt @@ -0,0 +1,61 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2019/05/06 09:36:47 adam Exp $ + +Do not make application bundle on Darwin. +Store correct version number in version.h. +Avoid + CMake Error at CMakeLists.txt:3021 (install): + install FILES given directory + "${WRKDIR}/.buildlink/cmake-Modules" to install. + +--- CMakeLists.txt.orig 2019-04-08 18:39:58.000000000 +0000 ++++ CMakeLists.txt +@@ -1319,7 +1319,7 @@ else () + set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir") + endif() + +-if(APPLE) ++if(APPLE AND ENABLE_APPLICATION_BUNDLE) + # + # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html + # says, +@@ -1462,9 +1462,7 @@ gmx_test_large_files(GMX_LARGEFILES) + set( VERSION ${PROJECT_VERSION} ) + add_custom_target(version + BYPRODUCTS version.h +- COMMAND ${PERL_EXECUTABLE} +- ${CMAKE_SOURCE_DIR}/tools/make-version.pl +- ${CMAKE_SOURCE_DIR} ++ COMMAND ${CMAKE_COMMAND} -E echo '\#define VCSVERSION \"${VERSION}\"' > ${CMAKE_BINARY_DIR}/version.h + ) + set_target_properties(version PROPERTIES FOLDER "Auxiliary") + +@@ -2229,7 +2227,11 @@ if(BUILD_wireshark AND QT_FOUND) + $<$:UxTheme.lib> + ) + +- add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES}) ++ if(ENABLE_APPLICATION_BUNDLE) ++ add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES}) ++ else() ++ add_executable(wireshark WIN32 ${wireshark_FILES} ${EXTRA_BUNDLE_FILES}) ++ endif() + set(PROGLIST ${PROGLIST} wireshark) + set_target_properties(wireshark PROPERTIES + LINK_FLAGS "${WS_LINK_FLAGS}" +@@ -3022,11 +3024,11 @@ endif() + + install( + FILES +- ${CMAKE_MODULE_PATH}/FindGLIB2.cmake +- ${CMAKE_MODULE_PATH}/FindWSWinLibs.cmake +- ${CMAKE_MODULE_PATH}/UseAsn2Wrs.cmake +- ${CMAKE_MODULE_PATH}/LocatePythonModule.cmake +- ${CMAKE_MODULE_PATH}/UseMakePluginReg.cmake ++ cmake/modules/FindGLIB2.cmake ++ cmake/modules/FindWSWinLibs.cmake ++ cmake/modules/UseAsn2Wrs.cmake ++ cmake/modules/LocatePythonModule.cmake ++ cmake/modules/UseMakePluginReg.cmake + DESTINATION + ${WIRESHARK_INSTALL_CMAKEDIR} + )