cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.4.6.

Browse Source 
See
https://www.wireshark.org/docs/relnotes/wireshark-2.4.6.html for a list of
changes in this release.

Additionally, fix the following issues in the Makefile [1]:

* Add missing --with-* for lz4, snappy, and nghttp2
* Remove obsolete --with-* for IPv6 and gcrypt
* Use localbase

PR:		227131 [1]
Submitted by:	Greg V <greg@unrelenting.technology> [1]
This commit is contained in:
Joe Marcus Clarke 2018-04-08 15:47:15 +00:00
parent 7c95466d81
commit 13aef22796
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=466804
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/wireshark/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= wireshark
PORTVERSION= 2.4.5
PORTVERSION= 2.4.6
PORTREVISION?= 0
CATEGORIES= net ipv6
MASTER_SITES= http://www.wireshark.org/download/src/ \
@ -27,12 +27,15 @@ DATADIR_NAME= wireshark
DATADIR= ${PREFIX}/share/${DATADIR_NAME}
GNU_CONFIGURE= yes
USES= alias cpe gettext-runtime gmake libtool pathfix perl5 \
pkgconfig python:build ssl tar:xz
USES= alias cpe gettext-runtime gmake libtool localbase pathfix \
perl5 pkgconfig python:build ssl tar:xz
USE_PERL5= build
USE_GNOME= glib20 libxml2
CONFIGURE_ARGS+= --program-transform-name="" \
--with-ssl=${OPENSSLBASE}
--with-ssl=${OPENSSLBASE} \
--with-lz4 \
--with-nghttp2 \
--with-snappy
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
@ -43,7 +46,6 @@ LIB_DEPENDS+= libgpg-error.so:security/libgpg-error \
libsnappy.so:archivers/snappy
CFLAGS+= -funit-at-a-time
LIBS+= -L${LOCALBASE}/lib
PLIST_SUB+= PORTVERSION=${PORTVERSION}
.for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
@ -62,7 +64,7 @@ PLIST_SUB+= ${x:tu}=bin/$x \
.endif
.endfor
OPTIONS_DEFINE= RTP SNMP IPV6 GEOIP LUA DECRYPT ANDROIDDUMP CARES
OPTIONS_DEFINE= RTP SNMP GEOIP LUA DECRYPT ANDROIDDUMP CARES
OPTIONS_RADIO= GUI
OPTIONS_SINGLE= KERBEROS
@ -100,8 +102,6 @@ GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
DECRYPT_LIB_DEPENDS= libgnutls.so:security/gnutls \
libgcrypt.so:security/libgcrypt
IPV6_CONFIGURE_ENABLE= ipv6
KRB_NONE_CONFIGURE_ON= --without-krb5
KRB_NONE_CONFIGURE_OFF= --with-krb5
KRB_NONE_CONFIGURE_ENV_OFF= KRB5_CONFIG=${KRB5CONFIG}
@ -114,7 +114,7 @@ RTP_CONFIGURE_WITH= portaudio spandsp
SNMP_CONFIGURE_WITH= libsmi
CARES_CONFIGURE_WITH= c-ares
GEOIP_CONFIGURE_WITH= geoip
DECRYPT_CONFIGURE_WITH= gnutls gcrypt
DECRYPT_CONFIGURE_WITH= gnutls
ANDROIDDUMP_CONFIGURE_ON=--enable-androiddump=yes
ANDROIDDUMP_CONFIGURE_OFF=--enable-androiddump=no

6
net/wireshark/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1519488062
SHA256 (wireshark-2.4.5.tar.xz) = b3b2ec29fba0f4a3a590438abe4054e56f19108d440fc2d61492db9d8ff16fd7
SIZE (wireshark-2.4.5.tar.xz) = 28836740
TIMESTAMP = 1523200453
SHA256 (wireshark-2.4.6.tar.xz) = 8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01b90bc893d5fe
SIZE (wireshark-2.4.6.tar.xz) = 28851192

4
net/wireshark/pkg-plist
View File

@ -18,10 +18,10 @@ bin/tshark
%%TEXT2PCAP%%
lib/libwireshark.so
lib/libwireshark.so.9
lib/libwireshark.so.9.1.5
lib/libwireshark.so.9.1.6
lib/libwiretap.so
lib/libwiretap.so.7
lib/libwiretap.so.7.0.5
lib/libwiretap.so.7.0.6
%%GUI%%lib/libwscodecs.so
%%GUI%%lib/libwscodecs.so.1
%%GUI%%lib/libwscodecs.so.1.1.0