sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 0.99.7.

Browse source 
See http://www.wireshark.org/docs/relnotes/wireshark-0.99.7.html for a list
of changes.

Security:	See http://www.wireshark.org/security/wnpa-sec-2007-03.html
                for a summary of vulnerabilities fixed in this version
This commit is contained in:
Joe Marcus Clarke 2007-12-20 18:49:27 +00:00
parent c5cc04b727
commit 621d3d16f3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=204225
7 changed files with 66 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/wireshark/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME?= wireshark
PORTVERSION= 0.99.6
PORTVERSION= 0.99.7
PORTREVISION?= 0
CATEGORIES= net ipv6
MASTER_SITES= http://www.wireshark.org/download/src/
@ -26,12 +26,10 @@ USE_GMAKE= yes
USE_GNOME= gnometarget
WANT_GNOME= yes
USE_OPENSSL= yes
CONFIGURE_ENV= MIBDIRS="/dev/null" \
LIBS="${WIRESHARK_LIBS}"
CONFIGURE_ENV= LIBS="${WIRESHARK_LIBS}"
CONFIGURE_ARGS+= --program-transform-name="" \
--with-ssl=${OPENSSLBASE} \
--disable-warnings-as-errors
MAKE_ENV= MIBDIRS="/dev/null"
USE_LDCONFIG= yes
DATADIR= ${PREFIX}/share/${DATADIR_NAME}
LDFLAGS+= -L${LOCALBASE}/lib
@ -129,12 +127,11 @@ WIRESHARK_LIBS+=${PTHREAD_LIBS}
CONFIGURE_ARGS+=--without-portaudio
.endif
.if !defined(WITHOUT_SNMP) && !defined(LITE)
LIB_DEPENDS+= netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp
CONFIGURE_ARGS+= --with-net-snmp=${LOCALBASE}/bin/net-snmp-config \
--without-ucd-snmp
.if !defined(WITHOUT_SMI) && !defined(LITE)
LIB_DEPENDS+= smi.2:${PORTSDIR}/net-mgmt/libsmi
CONFIGURE_ARGS+= --with-libsmi=${LOCALBASE}
.else
CONFIGURE_ARGS+= --with-ucd-snmp=no --with-net-snmp=no
CONFIGURE_ARGS+= --with-libsmi=no
.endif
.if !defined(WITHOUT_ADNS) && !defined(LITE)
@ -159,7 +156,6 @@ MAN4+= wireshark-filter.4
post-patch:
@${REINPLACE_CMD} -e 's|lua5\.1|lua${LUA_VER_STR}|g ; \
s|NETSNMPCNFIG|NETSNMPCONFIG| ; \
s|-llua${LUA_VER_STR}|${LUA_LIBDIR}/liblua.a|g' \
${WRKSRC}/configure

6
net/wireshark/distinfo
View file

@ -1,3 +1,3 @@
MD5 (wireshark-0.99.6.tar.bz2) = e57a8c8b364c38df3da97e2ee9f0d0bc
SHA256 (wireshark-0.99.6.tar.bz2) = 118c4a5bfef00651fbe248e1d5c4e4f907b5e2982f47ccfecca2f7f48ab9d3b8
SIZE (wireshark-0.99.6.tar.bz2) = 11826043
MD5 (wireshark-0.99.7.tar.bz2) = ef04dfac3e7acc4a9cb2b107dd2a2f8a
SHA256 (wireshark-0.99.7.tar.bz2) = 2cbb3360507d8da13fa108e2fe9a4407a89b61fc0ddb6505d60f906b6c15eb82
SIZE (wireshark-0.99.7.tar.bz2) = 13179467

77
net/wireshark/files/patch-Makefile.in
View file

@ -1,77 +0,0 @@
--- Makefile.in.orig 2007-08-01 00:02:21.000000000 -0400
+++ Makefile.in 2007-08-01 03:26:05.000000000 -0400
@@ -163,7 +163,7 @@ am_dumpcap_OBJECTS = $(am__objects_2) ca
ringbuffer.$(OBJEXT) sync_pipe_write.$(OBJEXT) \
tempfile.$(OBJEXT) version_info.$(OBJEXT) \
unicode-utils.$(OBJEXT)
-dumpcap_OBJECTS = $(am_dumpcap_OBJECTS)
+dumpcap_OBJECTS = $(am_dumpcap_OBJECTS) @INET_NTOP_O@
dumpcap_DEPENDENCIES = wiretap/libwiretap.la
am__editcap_SOURCES_DIST = editcap.c epan/crypt/crypt-md5.c \
epan/plugins.c epan/report_err.c epan/privileges.c \
@@ -206,7 +206,7 @@ am_tshark_OBJECTS = $(am__objects_3) $(a
capture_opts.$(OBJEXT) capture_loop.$(OBJEXT) \
tempfile.$(OBJEXT) tshark-tap-register.$(OBJEXT) \
tshark.$(OBJEXT)
-tshark_OBJECTS = $(am_tshark_OBJECTS)
+tshark_OBJECTS = $(am_tshark_OBJECTS) @INET_PTON_O@
tshark_DEPENDENCIES = $(am__DEPENDENCIES_1) wiretap/libwiretap.la \
epan/libwireshark.la $(am__DEPENDENCIES_2)
am_wireshark_OBJECTS = $(am__objects_3) airpcap_loader.$(OBJEXT) \
@@ -216,7 +216,7 @@ am_wireshark_OBJECTS = $(am__objects_3)
filters.$(OBJEXT) g711.$(OBJEXT) merge.$(OBJEXT) \
proto_hier_stats.$(OBJEXT) sync_pipe_write.$(OBJEXT) \
summary.$(OBJEXT) tempfile.$(OBJEXT)
-wireshark_OBJECTS = $(am_wireshark_OBJECTS)
+wireshark_OBJECTS = $(am_wireshark_OBJECTS) @INET_PTON_O@
wireshark_DEPENDENCIES = $(am__DEPENDENCIES_1) gtk/libui.a \
codecs/libcodec.a wiretap/libwiretap.la epan/libwireshark.la \
$(am__DEPENDENCIES_2)
@@ -829,6 +829,7 @@ wireshark_SOURCES = \
fileset.c \
filters.c \
g711.c \
+ @INET_PTON_C@ \
merge.c \
proto_hier_stats.c \
sync_pipe_write.c \
@@ -871,6 +872,7 @@ tshark_SOURCES = \
$(TSHARK_TAP_SRC) \
capture_opts.c \
capture_loop.c \
+ @INET_PTON_C@ \
tempfile.c \
tshark-tap-register.c \
tshark.c
@@ -921,6 +923,7 @@ dumpcap_SOURCES = \
clopts_common.c \
conditions.c \
dumpcap.c \
+ @INET_NTOP_C@ \
pcapio.c \
ringbuffer.c \
sync_pipe_write.c \
@@ -963,7 +966,6 @@ wireshark_LDADD = \
codecs/libcodec.a \
wiretap/libwiretap.la \
epan/libwireshark.la \
- @INET_PTON_LO@ \
@SNMP_LIBS@ @SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
@@ -981,7 +983,6 @@ tshark_LDADD = \
$(wireshark_optional_objects) \
wiretap/libwiretap.la \
epan/libwireshark.la \
- @INET_PTON_LO@ \
@SNMP_LIBS@ @SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
@@ -1045,7 +1046,6 @@ dftest_LDADD = \
# Libraries with which to link dumpcap.
dumpcap_LDADD = \
wiretap/libwiretap.la \
- @INET_NTOP_LO@ \
@GLIB_LIBS@ \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ \
@LIBGCRYPT_LIBS@

68
net/wireshark/files/patch-configure
View file

@ -1,6 +1,6 @@
--- configure.orig Thu Jul 5 15:26:25 2007
+++ configure Sat Jul 7 14:38:55 2007
@@ -21771,7 +21771,7 @@ echo $ECHO_N "checking whether we should
--- configure.orig 2007-12-20 02:18:48.000000000 -0500
+++ configure 2007-12-20 02:23:34.000000000 -0500
@@ -22284,7 +22284,7 @@ echo $ECHO_N "checking whether we should
# Check whether --enable-warnings-as-errors was given.
if test "${enable_warnings_as_errors+set}" = set; then
enableval=$enable_warnings_as_errors;
@ -9,7 +9,24 @@
with_warnings_as_errors="yes"
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
@@ -23308,6 +23308,7 @@ echo $ECHO_N "checking for GLIB - versio
@@ -23494,6 +23494,7 @@ echo $ECHO_N "checking for GLIB - versio
GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+ GLIB_LIBS="-liconv $GLIB_LIBS"
glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
@@ -23504,7 +23505,7 @@ echo $ECHO_N "checking for GLIB - versio
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$GLIB_LIBS $LIBS"
+ LIBS="$GLIB_LIBS -liconv $LIBS"
rm -f conf.glibtest
if test "$cross_compiling" = yes; then
echo $ac_n "cross compiling; assumed OK... $ac_c"
@@ -23819,6 +23820,7 @@ echo $ECHO_N "checking for GLIB - versio
else
GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
@ -17,17 +34,32 @@
glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
@@ -23318,7 +23319,8 @@ echo $ECHO_N "checking for GLIB - versio
@@ -24158,6 +24160,7 @@ echo $ECHO_N "checking for GLIB - versio
GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+ GLIB_LIBS="-liconv $GLIB_LIBS"
glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
@@ -24483,6 +24486,7 @@ echo $ECHO_N "checking for GLIB - versio
else
GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+ GLIB_LIBS="-liconv $GLIB_LIBS"
glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
@@ -24493,7 +24497,7 @@ echo $ECHO_N "checking for GLIB - versio
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$GLIB_LIBS $LIBS"
+ LIBS="$GLIB_LIBS -liconv $LIBS"
+ LIBS="$GLIB_LIBS -liconv $LIBS"
rm -f conf.glibtest
if test "$cross_compiling" = yes; then
echo $ac_n "cross compiling; assumed OK... $ac_c"
@@ -24211,7 +24213,7 @@ echo $ECHO_N "checking whether GLib supp
@@ -24722,7 +24726,7 @@ echo $ECHO_N "checking whether GLib supp
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
@ -36,7 +68,7 @@
if test "$cross_compiling" = yes; then
echo $ac_n "cross compiling; assumed OK... $ac_c"
ac_cv_glib_supports_modules=yes
@@ -30140,7 +30142,7 @@ echo "${ECHO_T}yes" >&6; }
@@ -30482,7 +30486,7 @@ echo "${ECHO_T}yes" >&6; }
#
CFLAGS="$CFLAGS -I$krb5_dir/include"
CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
@ -45,7 +77,7 @@
ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
ac_krb5_version="$ac_heimdal_version$ac_mit_version"
if test "x$ac_krb5_version" = "xHEIMDAL"
@@ -30199,7 +30201,7 @@ fi
@@ -30541,7 +30545,7 @@ fi
if test -x "$KRB5_CONFIG"
then
@ -54,21 +86,3 @@
KRB5_LIBS=`"$KRB5_CONFIG" --libs`
CFLAGS="$CFLAGS $KRB5_FLAGS"
CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
@@ -31974,7 +31976,7 @@ fi
ac_save_LIBS="$LIBS"
-LIBS="$GLIB_LIBS $LIBS"
+LIBS="$GLIB_LIBS -liconv $LIBS"
G_ASCII_STRTOULL_C=""
G_ASCII_STRTOULL_O=""
G_ASCII_STRTOULL_LO=""
@@ -33019,7 +33021,7 @@ fi
#
# The plugin dissectors reside in ./plugins/PROTO/
#
-PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS"
+PLUGIN_LIBS="-L../../epan -lwireshark -liconv $GLIB_LIBS"
#

13
net/wireshark/files/patch-epan_Makefile.in
View file

@ -1,13 +0,0 @@
--- epan/Makefile.in.orig 2007-07-29 17:56:38.000000000 -0400
+++ epan/Makefile.in 2007-07-29 17:58:47.000000000 -0400
@@ -708,8 +708,8 @@ MAINTAINERCLEANFILES = \
#
# Add the object files for missing routines, if any.
#
-libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
-libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
+libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
+libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
LEMON = ../tools/lemon
@ENABLE_STATIC_FALSE@@HAVE_PLUGINS_TRUE@plugin_src =
@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@plugin_src = \

19
net/wireshark/files/patch-epan_dissectors_packet-diameter.c
View file

@ -1,19 +0,0 @@
--- epan/dissectors/packet-diameter.c.orig Thu May 12 03:07:06 2005
+++ epan/dissectors/packet-diameter.c Thu May 12 02:54:14 2005
@@ -2022,13 +2022,13 @@
{ "Flags", "diameter.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
"", HFILL }},
{ &hf_diameter_flags_request,
- { "Request", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R,
+ { "Request ", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R,
"", HFILL }},
{ &hf_diameter_flags_proxyable,
- { "Proxyable", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P,
+ { "Proxyable ", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P,
"", HFILL }},
{ &hf_diameter_flags_error,
- { "Error","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E,
+ { "Error ","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E,
"", HFILL }},
{ &hf_diameter_flags_T,
{ "T(Potentially re-transmitted message)","diameter.flags.T", FT_BOOLEAN, 8, TFS(&flags_set_truth),DIAM_FLAGS_T,

20
net/wireshark/pkg-plist
View file

@ -24,10 +24,10 @@ lib/wireshark/plugins/%%PORTVERSION%%/docsis.la
lib/wireshark/plugins/%%PORTVERSION%%/docsis.so
lib/wireshark/plugins/%%PORTVERSION%%/enttec.la
lib/wireshark/plugins/%%PORTVERSION%%/enttec.so
lib/wireshark/plugins/%%PORTVERSION%%/ethercat.la
lib/wireshark/plugins/%%PORTVERSION%%/ethercat.so
lib/wireshark/plugins/%%PORTVERSION%%/gryphon.la
lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so
lib/wireshark/plugins/%%PORTVERSION%%/h223.la
lib/wireshark/plugins/%%PORTVERSION%%/h223.so
lib/wireshark/plugins/%%PORTVERSION%%/irda.la
lib/wireshark/plugins/%%PORTVERSION%%/irda.so
lib/wireshark/plugins/%%PORTVERSION%%/lwres.la
@ -36,8 +36,6 @@ lib/wireshark/plugins/%%PORTVERSION%%/m2m.la
lib/wireshark/plugins/%%PORTVERSION%%/m2m.so
lib/wireshark/plugins/%%PORTVERSION%%/mate.la
lib/wireshark/plugins/%%PORTVERSION%%/mate.so
lib/wireshark/plugins/%%PORTVERSION%%/mgcp.la
lib/wireshark/plugins/%%PORTVERSION%%/mgcp.so
lib/wireshark/plugins/%%PORTVERSION%%/opcua.la
lib/wireshark/plugins/%%PORTVERSION%%/opcua.so
lib/wireshark/plugins/%%PORTVERSION%%/opsi.la
@ -60,10 +58,14 @@ lib/wireshark/plugins/%%PORTVERSION%%/stats_tree.la
lib/wireshark/plugins/%%PORTVERSION%%/stats_tree.so
lib/wireshark/plugins/%%PORTVERSION%%/tango.la
lib/wireshark/plugins/%%PORTVERSION%%/tango.so
lib/wireshark/plugins/%%PORTVERSION%%/unistim.la
lib/wireshark/plugins/%%PORTVERSION%%/unistim.so
lib/wireshark/plugins/%%PORTVERSION%%/v5ua.la
lib/wireshark/plugins/%%PORTVERSION%%/v5ua.so
lib/wireshark/plugins/%%PORTVERSION%%/wimax.la
lib/wireshark/plugins/%%PORTVERSION%%/wimax.so
lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.la
lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
lib/libwireshark.la
lib/libwireshark.so
lib/libwireshark.so.0
@ -77,10 +79,12 @@ lib/libwiretap.so.0
%%DATADIR%%/colorfilters
%%DATADIR%%/dfilters
%%DATADIR%%/dumpcap.html
%%DATADIR%%/diameter/Ericsson.xml
%%DATADIR%%/diameter/TGPPSh.xml
%%DATADIR%%/diameter/chargecontrol.xml
%%DATADIR%%/diameter/dictionary.dtd
%%DATADIR%%/diameter/dictionary.xml
%%DATADIR%%/diameter/etsie2e4.xml
%%DATADIR%%/diameter/gqpolicy.xml
%%DATADIR%%/diameter/imscxdx.xml
%%DATADIR%%/diameter/mobileipv4.xml
@ -98,7 +102,13 @@ lib/libwiretap.so.0
%%DATADIR%%/dtds/smil.dtd
%%DATADIR%%/dtds/watcherinfo.dtd
%%DATADIR%%/dtds/xcap-caps.dtd
%%DATADIR%%/dtds/xcap-error.dtd
%%DATADIR%%/editcap.html
%%DATADIR%%/services
%%DATADIR%%/smi_modules
%%DATADIR%%/tpncp/tpncp.dat
%%DATADIR%%/wimaxasncp/dictionary.dtd
%%DATADIR%%/wimaxasncp/dictionary.xml
%%DATADIR%%/wireshark-filter.html
%%DATADIR%%/wireshark.html
%%DATADIR%%/help/capture_filters.txt
@ -178,6 +188,8 @@ lib/libwiretap.so.0
@dirrm lib/wireshark/plugins/%%PORTVERSION%%
@dirrm lib/wireshark/plugins
@dirrm lib/wireshark
@dirrm %%DATADIR%%/wimaxasncp
@dirrm %%DATADIR%%/tpncp
@dirrm %%DATADIR%%/radius
@dirrm %%DATADIR%%/help
@dirrm %%DATADIR%%/dtds