diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-02-28 05:40:49 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-02-28 05:40:49 +0000 |
commit | f53c15158d2fa8b447a051c884191dd2e6552254 (patch) | |
tree | b482fe506d5659f6007e3a12c288fe1958e5a9a8 /net/wireshark | |
parent | 7d746b1a5b064143750580a73088ca440b9d47b9 (diff) | |
download | ports-f53c15158d2fa8b447a051c884191dd2e6552254.tar.gz ports-f53c15158d2fa8b447a051c884191dd2e6552254.zip |
Notes
Diffstat (limited to 'net/wireshark')
-rw-r--r-- | net/wireshark/Makefile | 4 | ||||
-rw-r--r-- | net/wireshark/distinfo | 6 | ||||
-rw-r--r-- | net/wireshark/files/patch-Makefile.in | 30 | ||||
-rw-r--r-- | net/wireshark/files/patch-epan_Makefile.in | 14 | ||||
-rw-r--r-- | net/wireshark/files/patch-wiretap_configure | 29 | ||||
-rw-r--r-- | net/wireshark/pkg-plist | 4 |
6 files changed, 31 insertions, 56 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index e1f3cf48c364..61a3b5a9f5a7 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= wireshark -PORTVERSION= 0.99.7 +PORTVERSION= 0.99.8 PORTREVISION?= 0 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ @@ -37,7 +37,7 @@ CFLAGS+= -funit-at-a-time WIRESHARK_LIBS= -.for x in capinfos editcap idl2wrs mergecap text2pcap +.for x in capinfos editcap idl2wrs mergecap rawshark text2pcap .if defined(LITE) PLIST_SUB+= ${x:U}="@comment $x not installed" CONFIGURE_ARGS+= --enable-$x=no diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 14be44d63a11..5d3d7ccae07a 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,3 +1,3 @@ -MD5 (wireshark-0.99.7.tar.bz2) = ef04dfac3e7acc4a9cb2b107dd2a2f8a -SHA256 (wireshark-0.99.7.tar.bz2) = 2cbb3360507d8da13fa108e2fe9a4407a89b61fc0ddb6505d60f906b6c15eb82 -SIZE (wireshark-0.99.7.tar.bz2) = 13179467 +MD5 (wireshark-0.99.8.tar.bz2) = 5e6af49273c9a588ba3abd92a8423136 +SHA256 (wireshark-0.99.8.tar.bz2) = ee9d2e7a75bc1ed80ef5faf9debca51ac238996a544f60314b7028f2f3140c22 +SIZE (wireshark-0.99.8.tar.bz2) = 13243168 diff --git a/net/wireshark/files/patch-Makefile.in b/net/wireshark/files/patch-Makefile.in index 65591b95a180..ecbc8ec61418 100644 --- a/net/wireshark/files/patch-Makefile.in +++ b/net/wireshark/files/patch-Makefile.in @@ -1,24 +1,24 @@ ---- Makefile.in.orig 2007-12-23 15:36:38.000000000 -0500 -+++ Makefile.in 2007-12-23 15:38:47.000000000 -0500 -@@ -159,7 +159,7 @@ am_dumpcap_OBJECTS = $(am__objects_2) ca - ringbuffer.$(OBJEXT) sync_pipe_write.$(OBJEXT) \ - tempfile.$(OBJEXT) version_info.$(OBJEXT) \ - unicode-utils.$(OBJEXT) privileges.$(OBJEXT) +--- Makefile.in.orig 2008-02-27 14:59:53.000000000 -0500 ++++ Makefile.in 2008-02-28 00:00:04.000000000 -0500 +@@ -161,7 +161,7 @@ am_dumpcap_OBJECTS = $(am__objects_2) ca + sync_pipe_write.$(OBJEXT) tempfile.$(OBJEXT) \ + version_info.$(OBJEXT) unicode-utils.$(OBJEXT) \ + privileges.$(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 \ -@@ -200,7 +200,7 @@ am_tshark_OBJECTS = $(am__objects_3) $(a +@@ -211,7 +211,7 @@ am_tshark_OBJECTS = $(am__objects_3) $(a capture_opts.$(OBJEXT) capture_sync.$(OBJEXT) \ tempfile.$(OBJEXT) tshark-tap-register.$(OBJEXT) \ tshark.$(OBJEXT) -tshark_OBJECTS = $(am_tshark_OBJECTS) +tshark_OBJECTS = $(am_tshark_OBJECTS) @INET_NTOP_O@ - tshark_DEPENDENCIES = $(am__DEPENDENCIES_1) wiretap/libwiretap.la \ - epan/libwireshark.la $(am__DEPENDENCIES_2) + tshark_DEPENDENCIES = $(am__DEPENDENCIES_2) wiretap/libwiretap.la \ + epan/libwireshark.la $(am__DEPENDENCIES_1) tshark_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -@@ -885,6 +885,7 @@ wireshark_SOURCES = \ +@@ -905,6 +905,7 @@ wireshark_SOURCES = \ fileset.c \ filters.c \ g711.c \ @@ -26,7 +26,7 @@ merge.c \ proto_hier_stats.c \ summary.c \ -@@ -925,6 +926,7 @@ tshark_SOURCES = \ +@@ -945,6 +946,7 @@ tshark_SOURCES = \ $(TSHARK_TAP_SRC) \ capture_opts.c \ capture_sync.c \ @@ -34,7 +34,7 @@ tempfile.c \ tshark-tap-register.c \ tshark.c -@@ -975,6 +977,7 @@ dumpcap_SOURCES = \ +@@ -1000,6 +1002,7 @@ dumpcap_SOURCES = \ clopts_common.c \ conditions.c \ dumpcap.c \ @@ -42,7 +42,7 @@ pcapio.c \ ringbuffer.c \ sync_pipe_write.c \ -@@ -1030,7 +1033,6 @@ wireshark_LDADD = \ +@@ -1054,7 +1057,6 @@ wireshark_LDADD = \ codecs/libcodec.a \ wiretap/libwiretap.la \ epan/libwireshark.la \ @@ -50,7 +50,7 @@ @SSL_LIBS@ \ $(plugin_ldadd) \ @PCRE_LIBS@ \ -@@ -1049,7 +1051,6 @@ tshark_LDADD = \ +@@ -1073,7 +1075,6 @@ tshark_LDADD = \ $(wireshark_optional_objects) \ wiretap/libwiretap.la \ epan/libwireshark.la \ @@ -58,7 +58,7 @@ @SSL_LIBS@ \ $(plugin_ldadd) \ @PCRE_LIBS@ \ -@@ -1117,7 +1118,6 @@ dftest_LDADD = \ +@@ -1183,7 +1184,6 @@ dftest_LDADD = \ # Libraries with which to link dumpcap. dumpcap_LDADD = \ wiretap/libwiretap.la \ diff --git a/net/wireshark/files/patch-epan_Makefile.in b/net/wireshark/files/patch-epan_Makefile.in index a56deb03bd07..3b79f2ac3a8c 100644 --- a/net/wireshark/files/patch-epan_Makefile.in +++ b/net/wireshark/files/patch-epan_Makefile.in @@ -1,13 +1,13 @@ ---- epan/Makefile.in.orig 2007-12-23 15:39:26.000000000 -0500 -+++ epan/Makefile.in 2007-12-23 15:40:35.000000000 -0500 -@@ -768,8 +768,8 @@ MAINTAINERCLEANFILES = \ +--- epan/Makefile.in.orig 2008-02-27 14:59:48.000000000 -0500 ++++ epan/Makefile.in 2008-02-28 00:01:51.000000000 -0500 +@@ -786,8 +786,8 @@ MAINTAINERCLEANFILES = \ # # Add the object files for missing routines, if any. # --libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @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@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm --libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @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_STRCASECMP_LO@ @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@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm -+libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @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) +-libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm +-libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la libwireshark_asmopt.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_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ libwireshark_generated.la libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm ++libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ libwireshark_generated.la libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) RUNLEX = $(top_srcdir)/tools/runlex.sh LEMON = ../tools/lemon @ENABLE_STATIC_FALSE@@HAVE_PLUGINS_TRUE@plugin_src = diff --git a/net/wireshark/files/patch-wiretap_configure b/net/wireshark/files/patch-wiretap_configure index 6a297fa43b51..e69de29bb2d1 100644 --- a/net/wireshark/files/patch-wiretap_configure +++ b/net/wireshark/files/patch-wiretap_configure @@ -1,29 +0,0 @@ ---- wiretap/configure.orig Thu Jul 5 15:26:36 2007 -+++ wiretap/configure Sat Jul 7 14:40:49 2007 -@@ -20277,7 +20277,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; -- if test "x$GCC" = "xyes" -a "x$enableval" == "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then -+ if test "x$GCC" = "xyes" -a "x$enableval" = "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then - with_warnings_as_errors="yes" - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } -@@ -20570,7 +20570,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" -@@ -20694,7 +20694,7 @@ fi - if test "x$no_glib" = x ; then - { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 - echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } -- CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS -liconv $GLIB_LIBS" - else - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index e1318fae54bc..27f1c1b2951f 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -6,6 +6,7 @@ bin/dumpcap %%IDL2WRS%% %%MERGECAP%% %%RANDPKT%% +%%RAWSHARK%% bin/tshark %%TEXT2PCAP%% lib/wireshark/plugins/%%PORTVERSION%%/agentx.la @@ -80,6 +81,7 @@ lib/libwiretap.so.0 %%DATADIR%%/dfilters %%DATADIR%%/dumpcap.html %%DATADIR%%/diameter/Ericsson.xml +%%DATADIR%%/diameter/TGPPGmb.xml %%DATADIR%%/diameter/TGPPSh.xml %%DATADIR%%/diameter/chargecontrol.xml %%DATADIR%%/diameter/dictionary.dtd @@ -183,8 +185,10 @@ lib/libwiretap.so.0 %%DATADIR%%/radius/dictionary.versanet %%DATADIR%%/radius/dictionary.wispr %%DATADIR%%/radius/dictionary.xedia +%%DATADIR%%/rawshark.html %%DATADIR%%/tshark.html %%DATADIR%%/text2pcap.html +%%DATADIR%%/ws.css @dirrm lib/wireshark/plugins/%%PORTVERSION%% @dirrm lib/wireshark/plugins @dirrm lib/wireshark |