Index: head/net/wireshark/Makefile =================================================================== --- head/net/wireshark/Makefile (revision 364495) +++ head/net/wireshark/Makefile (revision 364496) @@ -1,172 +1,173 @@ # Created by: Bill Fumerola # $FreeBSD$ PORTNAME?= wireshark -PORTVERSION= 1.10.8 -PORTREVISION= 2 +PORTVERSION= 1.12.0 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ http://wireshark.askapache.com/download/src/all-versions/ \ ftp://ftp.uni-kl.de/pub/wireshark/src/ \ http://prdownloads.sourceforge.net/wireshark/ \ http://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ ftp://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ http://wireshark.zing.org/download/src/ DISTNAME= ${DATADIR_NAME}-${PORTVERSION} MAINTAINER= marcus@FreeBSD.org COMMENT?= Powerful network analyzer/capture tool DATADIR_NAME= wireshark USE_PERL5= build -USE_PYTHON_BUILD=yes -USES= iconv gettext pkgconfig gmake perl5 tar:bzip2 libtool +USES= iconv gettext pkgconfig gmake perl5 tar:bzip2 libtool \ + python:build WANT_GNOME= yes USE_OPENSSL= yes CONFIGURE_ARGS+= --program-transform-name="" \ - --with-ssl=${OPENSSLBASE} + --with-ssl=${OPENSSLBASE} \ + --with-qt=no USE_LDCONFIG= yes DATADIR= ${PREFIX}/share/${DATADIR_NAME} CFLAGS+= -funit-at-a-time LIBS+= -L${LOCALBASE}/lib DESKTOP_ENTRIES= "Wireshark" "Network Protocol Analyzer" \ "${DATADIR}/hi48-app-wireshark.png" \ "wireshark" "System;Monitor;GTK;" true .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ - reordercap + reordercap captype .if defined(LITE) PLIST_SUB+= ${x:tu}="@comment $x not installed" \ ${x:tu}_MAN="@comment $x not installed " CONFIGURE_ARGS+= --enable-$x=no .else PLIST_SUB+= ${x:tu}=bin/$x \ ${x:tu}_MAN="" .endif .endfor .if !defined(LITE) OPTIONS_DEFINE= RTP SNMP ADNS PCRE IPV6 GEOIP LUA CARES GSSAPI X11 \ GNUTLS GCRYPT THREADS OPTIONS_DEFAULT= SNMP ADNS PCRE IPV6 GEOIP GSSAPI X11 RTP_DESC= Enable support for playing back RTP streams ADNS_DESC= Enable asynchronous DNS lookup support .endif .include .if ${PORT_OPTIONS:MX11} USE_XORG= x11 .endif .include .if ${PORT_OPTIONS:MX11} PLIST_SUB+= WIRESHARK=bin/wireshark WIRESHARK_MAN="" -USE_GNOME+= gtk20 +USE_GNOME+= gtk30 +CONFIGURE_ARGS+=--with-gtk3=yes .else PLIST_SUB+= WIRESHARK="@comment wireshark not built" \ WIRESHARK_MAN="@comment wireshark not built " USE_GNOME+= glib20 CONFIGURE_ARGS+= --enable-wireshark=no \ --disable-gtktest .endif GNU_CONFIGURE= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6=yes .else CONFIGURE_ARGS+= --enable-ipv6=no .endif # XXX - untested .if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+= --enable-threads .endif .if ${PORT_OPTIONS:MPCRE} && !defined(LITE) LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --with-pcre=no .endif .if ${PORT_OPTIONS:MLUA} && !defined(LITE) USES+= lua:51 CONFIGURE_ARGS+=--with-lua=${PREFIX} CPPFLAGS+= -I${LUA_INCDIR} PLIST_SUB+= LUA="" .else CONFIGURE_ARGS+=--without-lua PLIST_SUB+= LUA="@comment " .endif .if ${PORT_OPTIONS:MRTP} && !defined(LITE) LIB_DEPENDS+= libportaudio.so:${PORTSDIR}/audio/portaudio CONFIGURE_ARGS+=--with-portaudio=${LOCALBASE} .else CONFIGURE_ARGS+=--without-portaudio .endif .if ${PORT_OPTIONS:MSNMP} && !defined(LITE) LIB_DEPENDS+= libsmi.so:${PORTSDIR}/net-mgmt/libsmi CONFIGURE_ARGS+= --with-libsmi=${LOCALBASE} .else CONFIGURE_ARGS+= --with-libsmi=no .endif .if ${PORT_OPTIONS:MADNS} && !defined(LITE) LIB_DEPENDS+= libadns.so:${PORTSDIR}/dns/adns CONFIGURE_ARGS+= --with-adns=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --with-adns=no .endif .if ${PORT_OPTIONS:MCARES} && !defined(LITE) LIB_DEPENDS+= libcares.so:${PORTSDIR}/dns/c-ares CONFIGURE_ARGS+= --with-c-ares=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --with-c-ares=no .endif .if ${PORT_OPTIONS:MGEOIP} && !defined(LITE) LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP CONFIGURE_ARGS+= --with-geoip=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --with-geoip=no .endif .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} \ --with-gnutls=yes .else CONFIGURE_ARGS+=--with-gnutls=no .endif .if ${PORT_OPTIONS:MGCRYPT} LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} .endif .if ! ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+=--with-krb5=no .endif post-patch: @${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|g ; \ s|-Wl,--as-needed|| ' \ ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/image/hi48-app-wireshark.png \ ${STAGEDIR}${DATADIR} .include Index: head/net/wireshark/distinfo =================================================================== --- head/net/wireshark/distinfo (revision 364495) +++ head/net/wireshark/distinfo (revision 364496) @@ -1,2 +1,2 @@ -SHA256 (wireshark-1.10.8.tar.bz2) = 27d9cf4f0ca1ac436104b7f27caf8ad65f73db09edc8df0742ce9688c7d38763 -SIZE (wireshark-1.10.8.tar.bz2) = 26715025 +SHA256 (wireshark-1.12.0.tar.bz2) = 0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7 +SIZE (wireshark-1.12.0.tar.bz2) = 29033823 Index: head/net/wireshark/files/patch-epan_Makefile.in =================================================================== --- head/net/wireshark/files/patch-epan_Makefile.in (revision 364495) +++ head/net/wireshark/files/patch-epan_Makefile.in (revision 364496) @@ -1,10 +1,10 @@ ---- epan/Makefile.in.orig 2013-06-05 13:27:48.000000000 -0400 -+++ epan/Makefile.in 2013-06-08 17:55:04.000000000 -0400 -@@ -111,6 +111,7 @@ target_triplet = @target@ - DIST_COMMON = $(srcdir)/../Makefile.am.inc $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.common $(srcdir)/Makefile.in \ - $(srcdir)/doxygen.cfg.in -+LIBS = @LUA_LIBS@ +--- epan/Makefile.in.orig 2014-07-31 15:23:19.000000000 -0400 ++++ epan/Makefile.in 2014-08-09 22:55:55.000000000 -0400 +@@ -150,6 +150,7 @@ DIST_COMMON = $(srcdir)/../Makefile.am.i + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/doxygen.cfg.in $(top_srcdir)/depcomp @HAVE_WARNINGS_AS_ERRORS_TRUE@am__append_1 = -Werror - EXTRA_PROGRAMS = reassemble_test$(EXEEXT) ++LIBS = @LUA_LIBS@ + EXTRA_PROGRAMS = reassemble_test$(EXEEXT) tvbtest$(EXEEXT) \ + oids_test$(EXEEXT) subdir = epan Index: head/net/wireshark/pkg-plist =================================================================== --- head/net/wireshark/pkg-plist (revision 364495) +++ head/net/wireshark/pkg-plist (revision 364496) @@ -1,279 +1,286 @@ %%CAPINFOS%% +%%CAPTYPE%% %%DFTEST%% bin/dumpcap %%EDITCAP%% %%WIRESHARK%% %%MERGECAP%% %%RANDPKT%% %%RAWSHARK%% %%REORDERCAP%% bin/tshark %%TEXT2PCAP%% +lib/libfiletap.so +lib/libfiletap.so.0 +lib/libfiletap.so.0.0.0 lib/libwireshark.so -lib/libwireshark.so.3 -lib/libwireshark.so.3.1.8 +lib/libwireshark.so.5 +lib/libwireshark.so.5.0.0 lib/libwiretap.so -lib/libwiretap.so.3 -lib/libwiretap.so.3.0.8 +lib/libwiretap.so.4 +lib/libwiretap.so.4.0.0 lib/libwsutil.so -lib/libwsutil.so.3 -lib/libwsutil.so.3.0.0 -lib/wireshark/plugins/%%PORTVERSION%%/asn1.so +lib/libwsutil.so.4 +lib/libwsutil.so.4.0.0 lib/wireshark/plugins/%%PORTVERSION%%/docsis.so lib/wireshark/plugins/%%PORTVERSION%%/ethercat.so lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so lib/wireshark/plugins/%%PORTVERSION%%/irda.so lib/wireshark/plugins/%%PORTVERSION%%/m2m.so lib/wireshark/plugins/%%PORTVERSION%%/mate.so lib/wireshark/plugins/%%PORTVERSION%%/opcua.so lib/wireshark/plugins/%%PORTVERSION%%/profinet.so lib/wireshark/plugins/%%PORTVERSION%%/stats_tree.so lib/wireshark/plugins/%%PORTVERSION%%/unistim.so lib/wireshark/plugins/%%PORTVERSION%%/wimax.so lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so lib/wireshark/plugins/%%PORTVERSION%%/wimaxmacphy.so %%CAPINFOS_MAN%%man/man1/capinfos.1.gz man/man1/dumpcap.1.gz %%EDITCAP_MAN%%man/man1/editcap.1.gz %%MERGECAP_MAN%%man/man1/mergecap.1.gz %%RAWSHARK_MAN%%man/man1/rawshark.1.gz %%TEXT2PCAP_MAN%%man/man1/text2pcap.1.gz %%DFTEST_MAN%%man/man1/dftest.1.gz %%RANDPKT_MAN%%man/man1/randpkt.1.gz %%REORDERCAP_MAN%%man/man1/reordercap.1.gz man/man1/tshark.1.gz %%WIRESHARK_MAN%%man/man1/wireshark.1.gz man/man4/wireshark-filter.4.gz %%DATADIR%%/AUTHORS-SHORT %%DATADIR%%/COPYING %%DATADIR%%/capinfos.html %%DATADIR%%/cfilters %%DATADIR%%/colorfilters %%LUA%%%%DATADIR%%/console.lua %%DATADIR%%/dfilters %%DATADIR%%/dftest.html %%LUA%%%%DATADIR%%/dtd_gen.lua %%DATADIR%%/dumpcap.html %%DATADIR%%/diameter/AlcatelLucent.xml %%DATADIR%%/diameter/ChinaTelecom.xml %%DATADIR%%/diameter/Cisco.xml +%%DATADIR%%/diameter/Custom.xml %%DATADIR%%/diameter/Ericsson.xml %%DATADIR%%/diameter/Nokia.xml %%DATADIR%%/diameter/NokiaSiemensNetworks.xml %%DATADIR%%/diameter/SKT.xml +%%DATADIR%%/diameter/Starent.xml %%DATADIR%%/diameter/TGPPGmb.xml %%DATADIR%%/diameter/TGPPRx.xml %%DATADIR%%/diameter/TGPPS9.xml %%DATADIR%%/diameter/TGPPSh.xml +%%DATADIR%%/diameter/VerizonWireless.xml %%DATADIR%%/diameter/Vodafone.xml %%DATADIR%%/diameter/chargecontrol.xml %%DATADIR%%/diameter/dictionary.dtd %%DATADIR%%/diameter/dictionary.xml %%DATADIR%%/diameter/eap.xml %%DATADIR%%/diameter/etsie2e4.xml %%DATADIR%%/diameter/gqpolicy.xml %%DATADIR%%/diameter/imscxdx.xml %%DATADIR%%/diameter/mobileipv4.xml %%DATADIR%%/diameter/mobileipv6.xml %%DATADIR%%/diameter/nasreq.xml %%DATADIR%%/diameter/sip.xml %%DATADIR%%/diameter/sunping.xml %%DATADIR%%/dtds/dc.dtd %%DATADIR%%/dtds/itunes.dtd %%DATADIR%%/dtds/mscml.dtd %%DATADIR%%/dtds/pocsettings.dtd %%DATADIR%%/dtds/presence.dtd %%DATADIR%%/dtds/reginfo.dtd %%DATADIR%%/dtds/rlmi.dtd %%DATADIR%%/dtds/rss.dtd %%DATADIR%%/dtds/smil.dtd %%DATADIR%%/dtds/watcherinfo.dtd %%DATADIR%%/dtds/xcap-caps.dtd %%DATADIR%%/dtds/xcap-error.dtd %%DATADIR%%/editcap.html %%LUA%%%%DATADIR%%/init.lua %%DATADIR%%/help/capture_filters.txt %%DATADIR%%/help/capturing.txt %%DATADIR%%/help/display_filters.txt %%DATADIR%%/help/faq.txt %%DATADIR%%/help/getting_started.txt %%DATADIR%%/help/overview.txt %%DATADIR%%/help/toc %%DATADIR%%/hi48-app-wireshark.png %%DATADIR%%/ipmap.html %%DATADIR%%/manuf %%DATADIR%%/mergecap.html %%DATADIR%%/pdml2html.xsl %%DATADIR%%/profiles/Bluetooth/colorfilters %%DATADIR%%/profiles/Classic/colorfilters %%DATADIR%%/radius/README.radius_dictionary %%DATADIR%%/radius/custom.includes %%DATADIR%%/radius/dictionary %%DATADIR%%/radius/dictionary.3com %%DATADIR%%/radius/dictionary.3gpp %%DATADIR%%/radius/dictionary.3gpp2 %%DATADIR%%/radius/dictionary.acc %%DATADIR%%/radius/dictionary.acme %%DATADIR%%/radius/dictionary.airespace %%DATADIR%%/radius/dictionary.alcatel %%DATADIR%%/radius/dictionary.alcatel.esam %%DATADIR%%/radius/dictionary.alcatel.sr +%%DATADIR%%/radius/dictionary.alcatel-lucent.aaa %%DATADIR%%/radius/dictionary.alcatel-lucent.xylan %%DATADIR%%/radius/dictionary.alteon %%DATADIR%%/radius/dictionary.altiga %%DATADIR%%/radius/dictionary.alvarion %%DATADIR%%/radius/dictionary.apc %%DATADIR%%/radius/dictionary.aptis %%DATADIR%%/radius/dictionary.aruba %%DATADIR%%/radius/dictionary.ascend %%DATADIR%%/radius/dictionary.asn %%DATADIR%%/radius/dictionary.audiocodes %%DATADIR%%/radius/dictionary.avaya %%DATADIR%%/radius/dictionary.azaire %%DATADIR%%/radius/dictionary.bay %%DATADIR%%/radius/dictionary.bintec %%DATADIR%%/radius/dictionary.bristol %%DATADIR%%/radius/dictionary.cablelabs %%DATADIR%%/radius/dictionary.cabletron %%DATADIR%%/radius/dictionary.chillispot %%DATADIR%%/radius/dictionary.cisco %%DATADIR%%/radius/dictionary.cisco.bbsm %%DATADIR%%/radius/dictionary.cisco.vpn3000 %%DATADIR%%/radius/dictionary.cisco.vpn5000 %%DATADIR%%/radius/dictionary.clavister %%DATADIR%%/radius/dictionary.colubris %%DATADIR%%/radius/dictionary.columbia_university %%DATADIR%%/radius/dictionary.compat %%DATADIR%%/radius/dictionary.cosine %%DATADIR%%/radius/dictionary.dhcp %%DATADIR%%/radius/dictionary.digium %%DATADIR%%/radius/dictionary.eltex %%DATADIR%%/radius/dictionary.epygi %%DATADIR%%/radius/dictionary.ericsson %%DATADIR%%/radius/dictionary.erx %%DATADIR%%/radius/dictionary.extreme %%DATADIR%%/radius/dictionary.fortinet %%DATADIR%%/radius/dictionary.foundry %%DATADIR%%/radius/dictionary.freeradius %%DATADIR%%/radius/dictionary.freeradius.internal %%DATADIR%%/radius/dictionary.freeswitch %%DATADIR%%/radius/dictionary.gandalf %%DATADIR%%/radius/dictionary.garderos %%DATADIR%%/radius/dictionary.gemtek %%DATADIR%%/radius/dictionary.h3c %%DATADIR%%/radius/dictionary.hp %%DATADIR%%/radius/dictionary.huawei %%DATADIR%%/radius/dictionary.iea %%DATADIR%%/radius/dictionary.infonet %%DATADIR%%/radius/dictionary.ipunplugged %%DATADIR%%/radius/dictionary.issanni %%DATADIR%%/radius/dictionary.itk %%DATADIR%%/radius/dictionary.jradius %%DATADIR%%/radius/dictionary.juniper %%DATADIR%%/radius/dictionary.karlnet %%DATADIR%%/radius/dictionary.lancom %%DATADIR%%/radius/dictionary.livingston %%DATADIR%%/radius/dictionary.localweb %%DATADIR%%/radius/dictionary.lucent %%DATADIR%%/radius/dictionary.manzara %%DATADIR%%/radius/dictionary.merit %%DATADIR%%/radius/dictionary.microsoft %%DATADIR%%/radius/dictionary.mikrotik %%DATADIR%%/radius/dictionary.motorola %%DATADIR%%/radius/dictionary.motorola.wimax %%DATADIR%%/radius/dictionary.navini %%DATADIR%%/radius/dictionary.netscreen %%DATADIR%%/radius/dictionary.networkphysics %%DATADIR%%/radius/dictionary.nexans %%DATADIR%%/radius/dictionary.nokia %%DATADIR%%/radius/dictionary.nokia.conflict %%DATADIR%%/radius/dictionary.nomadix %%DATADIR%%/radius/dictionary.nortel %%DATADIR%%/radius/dictionary.ntua %%DATADIR%%/radius/dictionary.openser %%DATADIR%%/radius/dictionary.packeteer %%DATADIR%%/radius/dictionary.patton %%DATADIR%%/radius/dictionary.propel %%DATADIR%%/radius/dictionary.prosoft %%DATADIR%%/radius/dictionary.quiconnect %%DATADIR%%/radius/dictionary.quintum %%DATADIR%%/radius/dictionary.redback %%DATADIR%%/radius/dictionary.redcreek %%DATADIR%%/radius/dictionary.rfc2865 %%DATADIR%%/radius/dictionary.rfc2866 %%DATADIR%%/radius/dictionary.rfc2867 %%DATADIR%%/radius/dictionary.rfc2868 %%DATADIR%%/radius/dictionary.rfc2869 %%DATADIR%%/radius/dictionary.rfc3162 %%DATADIR%%/radius/dictionary.rfc3576 %%DATADIR%%/radius/dictionary.rfc3580 %%DATADIR%%/radius/dictionary.rfc4072 %%DATADIR%%/radius/dictionary.rfc4372 %%DATADIR%%/radius/dictionary.rfc4603 %%DATADIR%%/radius/dictionary.rfc4675 %%DATADIR%%/radius/dictionary.rfc4679 %%DATADIR%%/radius/dictionary.rfc4818 %%DATADIR%%/radius/dictionary.rfc4849 %%DATADIR%%/radius/dictionary.rfc5090 %%DATADIR%%/radius/dictionary.rfc5176 %%DATADIR%%/radius/dictionary.rfc5447 %%DATADIR%%/radius/dictionary.rfc5580 %%DATADIR%%/radius/dictionary.rfc5607 %%DATADIR%%/radius/dictionary.rfc5904 %%DATADIR%%/radius/dictionary.rfc6519 %%DATADIR%%/radius/dictionary.rfc6572 %%DATADIR%%/radius/dictionary.riverstone %%DATADIR%%/radius/dictionary.roaringpenguin %%DATADIR%%/radius/dictionary.shasta %%DATADIR%%/radius/dictionary.shiva %%DATADIR%%/radius/dictionary.slipstream %%DATADIR%%/radius/dictionary.sofaware %%DATADIR%%/radius/dictionary.sonicwall %%DATADIR%%/radius/dictionary.springtide %%DATADIR%%/radius/dictionary.starent %%DATADIR%%/radius/dictionary.t_systems_nova %%DATADIR%%/radius/dictionary.telebit %%DATADIR%%/radius/dictionary.telkom %%DATADIR%%/radius/dictionary.trapeze %%DATADIR%%/radius/dictionary.tropos %%DATADIR%%/radius/dictionary.ukerna %%DATADIR%%/radius/dictionary.unix %%DATADIR%%/radius/dictionary.usr %%DATADIR%%/radius/dictionary.utstarcom %%DATADIR%%/radius/dictionary.valemount %%DATADIR%%/radius/dictionary.versanet %%DATADIR%%/radius/dictionary.vqp %%DATADIR%%/radius/dictionary.walabi %%DATADIR%%/radius/dictionary.waverider %%DATADIR%%/radius/dictionary.wichorus %%DATADIR%%/radius/dictionary.wimax %%DATADIR%%/radius/dictionary.wimax.wichorus %%DATADIR%%/radius/dictionary.wispr %%DATADIR%%/radius/dictionary.xedia %%DATADIR%%/radius/dictionary.zyxel %%DATADIR%%/randpkt.html %%DATADIR%%/rawshark.html %%DATADIR%%/reordercap.html %%DATADIR%%/services %%DATADIR%%/smi_modules %%DATADIR%%/tshark.html %%DATADIR%%/text2pcap.html %%DATADIR%%/tpncp/tpncp.dat %%DATADIR%%/wimaxasncp/dictionary.dtd %%DATADIR%%/wimaxasncp/dictionary.xml %%DATADIR%%/wireshark-filter.html %%DATADIR%%/wireshark.html %%DATADIR%%/ws.css @dirrm lib/wireshark/plugins/%%PORTVERSION%% @dirrm lib/wireshark/plugins @dirrm lib/wireshark @dirrm %%DATADIR%%/wimaxasncp @dirrm %%DATADIR%%/tpncp @dirrm %%DATADIR%%/radius @dirrm %%DATADIR%%/profiles/Classic @dirrm %%DATADIR%%/profiles/Bluetooth @dirrm %%DATADIR%%/profiles @dirrm %%DATADIR%%/help @dirrm %%DATADIR%%/dtds @dirrm %%DATADIR%%/diameter @dirrm %%DATADIR%%