Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Jan 2019 20:34:47 +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: r490315 - head/net/wireshark
Message-ID:  <201901142034.x0EKYlG5084511@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marcus
Date: Mon Jan 14 20:34:47 2019
New Revision: 490315
URL: https://svnweb.freebsd.org/changeset/ports/490315

Log:
  Update to 2.6.6.
  
  * Re-add geolocation support via MaxMind
  * See https://www.wireshark.org/docs/relnotes/wireshark-2.6.6.html
    for a list of other changes in this release.
  
  PR:		234931
  Submitted by:	rkoberman@gmail.com

Modified:
  head/net/wireshark/Makefile
  head/net/wireshark/distinfo
  head/net/wireshark/pkg-plist

Modified: head/net/wireshark/Makefile
==============================================================================
--- head/net/wireshark/Makefile	Mon Jan 14 20:19:13 2019	(r490314)
+++ head/net/wireshark/Makefile	Mon Jan 14 20:34:47 2019	(r490315)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	wireshark
-PORTVERSION=	2.6.5
-PORTREVISION?=	3
+PORTVERSION=	2.6.6
+PORTREVISION?=	0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
 		http://ftp.uni-kl.de/pub/wireshark/src/ \
@@ -65,7 +65,7 @@ PLIST_SUB+=		${x:tu}=bin/$x \
 .endif
 .endfor
 
-OPTIONS_DEFINE=		RTP SNMP LUA DECRYPT ANDROIDDUMP CARES SSHDUMP CISCODUMP
+OPTIONS_DEFINE=		RTP SNMP MAXMIND LUA DECRYPT ANDROIDDUMP CARES SSHDUMP CISCODUMP
 
 OPTIONS_RADIO=		GUI
 OPTIONS_SINGLE=		KERBEROS
@@ -73,11 +73,12 @@ OPTIONS_SINGLE=		KERBEROS
 OPTIONS_RADIO_GUI=	GTK2 GTK3 QT5
 OPTIONS_SINGLE_KERBEROS=KRB_BASE KRB_HEIMDAL KRB_MIT KRB_NONE
 
-OPTIONS_DEFAULT?=	SNMP KRB_BASE GTK3 DECRYPT
+OPTIONS_DEFAULT?=	SNMP MAXMIND KRB_BASE GTK3 DECRYPT
 
 RTP_DESC=		Enable support for playing back RTP streams
 DECRYPT_DESC=		Decryption support for SSL and IPSec
 ANDROIDDUMP_DESC=	Build androiddump extcap tool
+MAXMIND_DESC=		Enable MaxMindDB geolocation support
 CARES_DESC=		Enable support for asynchronous DNS via c-ares
 KERBEROS_DESC=		Kerberos dissection support
 KRB_BASE_DESC=		Kerberos support via base system
@@ -100,6 +101,7 @@ KRB_MIT_USES=		gssapi:mit
 RTP_LIB_DEPENDS=	libportaudio.so:audio/portaudio \
     			libspandsp.so:comms/spandsp
 RTP_CPPFLAGS=		-I${LOCALBASE}/include
+MAXMIND_LIBS=		libmaxminddb.so:net/libmaxminddb
 SNMP_LIB_DEPENDS=	libsmi.so:net-mgmt/libsmi
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 DECRYPT_LIB_DEPENDS=	libgnutls.so:security/gnutls \
@@ -118,6 +120,7 @@ LUA_CONFIGURE_WITH=	lua
 RTP_CONFIGURE_WITH=	portaudio spandsp
 SNMP_CONFIGURE_WITH=	libsmi
 CARES_CONFIGURE_WITH=	c-ares
+MAXMIND_CONFIGURE_WITH=maxminddb
 DECRYPT_CONFIGURE_WITH=	gnutls
 ANDROIDDUMP_CONFIGURE_ON=--enable-androiddump=yes
 ANDROIDDUMP_CONFIGURE_OFF=--enable-androiddump=no

Modified: head/net/wireshark/distinfo
==============================================================================
--- head/net/wireshark/distinfo	Mon Jan 14 20:19:13 2019	(r490314)
+++ head/net/wireshark/distinfo	Mon Jan 14 20:34:47 2019	(r490315)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544215216
-SHA256 (wireshark-2.6.5.tar.xz) = 93155b798544b2f07693920f4ac1b531c952965ee4eb1d98419961240177438a
-SIZE (wireshark-2.6.5.tar.xz) = 28390292
+TIMESTAMP = 1547339518
+SHA256 (wireshark-2.6.6.tar.xz) = 487933ea075bdbb25d8df06017d9c4f49fc20eb7f6ec80af086718ed5550e863
+SIZE (wireshark-2.6.6.tar.xz) = 28407404

Modified: head/net/wireshark/pkg-plist
==============================================================================
--- head/net/wireshark/pkg-plist	Mon Jan 14 20:19:13 2019	(r490314)
+++ head/net/wireshark/pkg-plist	Mon Jan 14 20:34:47 2019	(r490315)
@@ -637,10 +637,10 @@ include/wireshark/wsutil/wspcap.h
 include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
 lib/libwireshark.so.10
-lib/libwireshark.so.10.1.5
+lib/libwireshark.so.10.1.6
 lib/libwiretap.so
 lib/libwiretap.so.8
-lib/libwiretap.so.8.0.5
+lib/libwiretap.so.8.0.6
 %%GUI%%lib/libwscodecs.so
 %%GUI%%lib/libwscodecs.so.2
 %%GUI%%lib/libwscodecs.so.2.0.0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901142034.x0EKYlG5084511>