Date: Thu, 26 Jan 2017 17:07:48 +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: r432519 - head/net/wireshark Message-ID: <201701261707.v0QH7mVu003864@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Thu Jan 26 17:07:48 2017 New Revision: 432519 URL: https://svnweb.freebsd.org/changeset/ports/432519 Log: Update to 2.2.4. See https://www.wireshark.org/docs/relnotes/wireshark-2.2.4.html for a list of what's new. * Remove support for libadns [1] * Make androiddump optional [1] * Fix a Makefile typo [1] PR: 216463 [1] Submitted by: Marcin Gryszkalis <mg@fork.pl> Modified: head/net/wireshark/Makefile head/net/wireshark/distinfo head/net/wireshark/pkg-plist Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Thu Jan 26 16:50:00 2017 (r432518) +++ head/net/wireshark/Makefile Thu Jan 26 17:07:48 2017 (r432519) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= wireshark -PORTVERSION= 2.2.3 +PORTVERSION= 2.2.4 PORTREVISION?= 0 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ @@ -43,14 +43,14 @@ LIBS+= -L${LOCALBASE}/lib PLIST_SUB+= PORTVERSION=${PORTVERSION} .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ - reordercap captype androiddump randpktdump + reordercap captype randpktdump .if defined(LITE) PKGNAMESUFFIX= -lite PLIST_SUB+= ${x:tu}="@comment $x not installed" \ - ${x:tu}_LIB="@comment %x not installed " \ + ${x:tu}_LIB="@comment $x not installed " \ ${x:tu}_MAN="@comment $x not installed " CONFIGURE_ARGS+= --enable-$x=no -OPTIONS_EXCLUDE+= RTP SNMP GEOIP LUA ADNS CARES +OPTIONS_EXCLUDE+= RTP SNMP GEOIP LUA CARES ANDROIDDUMP .else PLIST_SUB+= ${x:tu}=bin/$x \ ${x:tu}_MAN="" \ @@ -58,21 +58,20 @@ PLIST_SUB+= ${x:tu}=bin/$x \ .endif .endfor -OPTIONS_DEFINE= RTP SNMP IPV6 GEOIP LUA DECRYPT +OPTIONS_DEFINE= RTP SNMP IPV6 GEOIP LUA DECRYPT ANDROIDDUMP CARES -OPTIONS_RADIO= ASYNCDNS GUI +OPTIONS_RADIO= GUI OPTIONS_SINGLE= KERBEROS -OPTIONS_RADIO_ASYNCDNS= ADNS CARES OPTIONS_RADIO_GUI= GTK2 GTK3 QT5 OPTIONS_SINGLE_KERBEROS=KRB_BASE KRB_HEIMDAL KRB_MIT KRB_NONE -OPTIONS_DEFAULT?= SNMP ADNS IPV6 GEOIP KRB_BASE GTK3 DECRYPT +OPTIONS_DEFAULT?= SNMP IPV6 GEOIP KRB_BASE GTK3 DECRYPT RTP_DESC= Enable support for playing back RTP streams DECRYPT_DESC= Decryption support for SSL and IPSec -ASYNCDNS_DESC= Asynchronous DNS lookup support -ADNS_DESC= Asynchronous DNS resolution via GNU adns +ANDROIDDUMP_DESC= Build androiddump extcap tool +CARES_DESC= Enable support for asynchronous DNS via c-ares KERBEROS_DESC= Kerberos dissection support KRB_BASE_DESC= Kerberos support via base system KRB_HEIMDAL_DESC= Kerberos support via security/heimdal @@ -91,7 +90,6 @@ KRB_MIT_USES= gssapi:mit RTP_LIB_DEPENDS= libportaudio.so:audio/portaudio RTP_CPPFLAGS= -I${LOCALBASE}/include SNMP_LIB_DEPENDS= libsmi.so:net-mgmt/libsmi -ADNS_LIB_DEPENDS= libadns.so:dns/adns CARES_LIB_DEPENDS= libcares.so:dns/c-ares GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP DECRYPT_LIB_DEPENDS= libgnutls.so:security/gnutls \ @@ -103,16 +101,17 @@ KRB_NONE_CONFIGURE_ON= --without-krb5 KRB_NONE_CONFIGURE_OFF= --with-krb5 KRB_NONE_CONFIGURE_ENV_OFF= KRB5_CONFIG=${KRB5CONFIG} -GTK2_CONFIGURE_WITH= gtk2 -GTK3_CONFIGURE_WITH= gtk3 -QT5_CONFIGURE_WITH= qt +GTK2_CONFIGURE_ON= --with-gtk=2 --with-qt=no +GTK3_CONFIGURE_ON= --with-gtk=3 --with-qt=no +QT5_CONFIGURE_ON= --with-qt=5 --with-gtk=no LUA_CONFIGURE_WITH= lua RTP_CONFIGURE_WITH= portaudio SNMP_CONFIGURE_WITH= libsmi -ADNS_CONFIGURE_WITH= adns CARES_CONFIGURE_WITH= c-ares GEOIP_CONFIGURE_WITH= geoip DECRYPT_CONFIGURE_WITH= gnutls gcrypt +ANDROIDDUMP_CONFIGURE_ON=--enable-androiddump=yes +ANDROIDDUMP_CONFIGURE_OFF=--enable-androiddump=no LUA_CPPFLAGS= -I${LUA_INCDIR} @@ -126,6 +125,12 @@ GTK3_PLIST_SUB= GUI_GTK="" OPTIONS_SUB= LUA +.if defined(LITE) +CONFIGURE_ARGS+=--enable-androiddump=no +PLIST_SUB+= ANDROIDDUMP_LIB="@comment " \ + ANDROIDDUMP_MAN="@comment " +.endif + .include <bsd.port.options.mk> .if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MGTK3) && \ @@ -138,6 +143,16 @@ INSTALLS_ICONS= yes PLIST_SUB+= GUI="" .endif +.if !defined(LITE) +.if ${PORT_OPTIONS:MANDROIDDUMP} +PLIST_SUB+= ANDROIDDUMP_LIB="" \ + ANDROIDDUMP_MAN="" +.else +PLIST_SUB+= ANDROIDDUMP_LIB="@comment " \ + ANDROIDDUMP_MAN="@comment " +.endif +.endif + .if ${PORT_OPTIONS:MKRB_BASE} && exists(${LOCALBASE}/include/krb5.h) IGNORE= cannot build with base Kerberos if krb5 port is installed. \ Use ``make config'' to choose a different option Modified: head/net/wireshark/distinfo ============================================================================== --- head/net/wireshark/distinfo Thu Jan 26 16:50:00 2017 (r432518) +++ head/net/wireshark/distinfo Thu Jan 26 17:07:48 2017 (r432519) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482615606 -SHA256 (wireshark-2.2.3.tar.bz2) = 97bac89e88892054a5848a9f7e0c36aa399a2008900829b078e29cab0ddd593b -SIZE (wireshark-2.2.3.tar.bz2) = 32315857 +TIMESTAMP = 1485381761 +SHA256 (wireshark-2.2.4.tar.bz2) = 42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911 +SIZE (wireshark-2.2.4.tar.bz2) = 32336156 Modified: head/net/wireshark/pkg-plist ============================================================================== --- head/net/wireshark/pkg-plist Thu Jan 26 16:50:00 2017 (r432518) +++ head/net/wireshark/pkg-plist Thu Jan 26 17:07:48 2017 (r432519) @@ -17,10 +17,10 @@ bin/tshark %%TEXT2PCAP%% lib/libwireshark.so lib/libwireshark.so.8 -lib/libwireshark.so.8.1.3 +lib/libwireshark.so.8.1.4 lib/libwiretap.so lib/libwiretap.so.6 -lib/libwiretap.so.6.0.3 +lib/libwiretap.so.6.0.4 %%GUI%%lib/libwscodecs.so %%GUI%%lib/libwscodecs.so.1 %%GUI%%lib/libwscodecs.so.1.0.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701261707.v0QH7mVu003864>