aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/wireshark/Makefile4
-rw-r--r--net/wireshark/distinfo6
-rw-r--r--net/wireshark/files/patch-Makefile.in60
-rw-r--r--net/wireshark/files/patch-epan_Makefile.in29
-rw-r--r--net/wireshark/pkg-plist2
5 files changed, 47 insertions, 54 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index cb99a7458813..03a547e398bc 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME?= wireshark
-PORTVERSION= 0.99.8
-PORTREVISION?= 2
+PORTVERSION= 1.0.0
+PORTREVISION?= 0
CATEGORIES= net ipv6
MASTER_SITES= http://www.wireshark.org/download/src/
DISTNAME= ${DATADIR_NAME}-${PORTVERSION}
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 5d3d7ccae07a..9652bfdb5d7e 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,3 +1,3 @@
-MD5 (wireshark-0.99.8.tar.bz2) = 5e6af49273c9a588ba3abd92a8423136
-SHA256 (wireshark-0.99.8.tar.bz2) = ee9d2e7a75bc1ed80ef5faf9debca51ac238996a544f60314b7028f2f3140c22
-SIZE (wireshark-0.99.8.tar.bz2) = 13243168
+MD5 (wireshark-1.0.0.tar.bz2) = 90e58c595f082da3ad9390d714f16116
+SHA256 (wireshark-1.0.0.tar.bz2) = b54713e146a7277cf05f309d3c706884b0e0ef5a7794e48a4251c4e17acd9fd0
+SIZE (wireshark-1.0.0.tar.bz2) = 13413951
diff --git a/net/wireshark/files/patch-Makefile.in b/net/wireshark/files/patch-Makefile.in
index a86746165a74..bdf6d359adfa 100644
--- a/net/wireshark/files/patch-Makefile.in
+++ b/net/wireshark/files/patch-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in.orig 2008-02-27 14:59:53.000000000 -0500
-+++ Makefile.in 2008-03-08 12:43:09.000000000 -0500
-@@ -125,7 +125,7 @@ am__capinfos_SOURCES_DIST = capinfos.c e
+--- Makefile.in.orig 2008-03-29 13:27:19.000000000 -0400
++++ Makefile.in 2008-04-01 01:48:45.000000000 -0400
+@@ -126,7 +126,7 @@ am__capinfos_SOURCES_DIST = capinfos.c e
@HAVE_PLUGINS_TRUE@ report_err.$(OBJEXT) privileges.$(OBJEXT) \
@HAVE_PLUGINS_TRUE@ filesystem.$(OBJEXT)
am_capinfos_OBJECTS = capinfos.$(OBJEXT) $(am__objects_1)
-capinfos_OBJECTS = $(am_capinfos_OBJECTS)
+capinfos_OBJECTS = $(am_capinfos_OBJECTS) @INET_NTOP_O@
- @HAVE_PLUGINS_TRUE@am__DEPENDENCIES_1 = plugins/agentx/agentx.la \
- @HAVE_PLUGINS_TRUE@ plugins/artnet/artnet.la \
- @HAVE_PLUGINS_TRUE@ plugins/asn1/asn1.la \
-@@ -161,14 +161,14 @@ am_dumpcap_OBJECTS = $(am__objects_2) ca
+ capinfos_DEPENDENCIES = wiretap/libwiretap.la
+ am_dftest_OBJECTS = dftest.$(OBJEXT) util.$(OBJEXT)
+ dftest_OBJECTS = $(am_dftest_OBJECTS)
+@@ -162,14 +162,14 @@ am_dumpcap_OBJECTS = $(am__objects_2) ca
sync_pipe_write.$(OBJEXT) tempfile.$(OBJEXT) \
version_info.$(OBJEXT) unicode-utils.$(OBJEXT) \
privileges.$(OBJEXT)
@@ -23,17 +23,17 @@
$(am__objects_1)
-editcap_OBJECTS = $(am_editcap_OBJECTS)
+editcap_OBJECTS = $(am_editcap_OBJECTS) @INET_NTOP_O@
- editcap_DEPENDENCIES = wiretap/libwiretap.la epan/libwireshark.la \
- $(am__DEPENDENCIES_1)
+ editcap_DEPENDENCIES = wiretap/libwiretap.la
am_mergecap_OBJECTS = mergecap.$(OBJEXT) merge.$(OBJEXT)
+ mergecap_OBJECTS = $(am_mergecap_OBJECTS)
@@ -185,7 +185,7 @@ am__objects_3 = $(am__objects_2) capture
timestats.$(OBJEXT) util.$(OBJEXT) tap-rtp-common.$(OBJEXT) \
version_info.$(OBJEXT)
am_rawshark_OBJECTS = $(am__objects_3) rawshark.$(OBJEXT)
-rawshark_OBJECTS = $(am_rawshark_OBJECTS)
+rawshark_OBJECTS = $(am_rawshark_OBJECTS) @INET_NTOP_O@
- rawshark_DEPENDENCIES = $(am__DEPENDENCIES_2) wiretap/libwiretap.la \
- epan/libwireshark.la $(am__DEPENDENCIES_1)
+ rawshark_DEPENDENCIES = $(am__DEPENDENCIES_1) wiretap/libwiretap.la \
+ epan/libwireshark.la $(am__DEPENDENCIES_2)
rawshark_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -211,7 +211,7 @@ am_tshark_OBJECTS = $(am__objects_3) $(a
capture_opts.$(OBJEXT) capture_sync.$(OBJEXT) \
@@ -41,10 +41,10 @@
tshark.$(OBJEXT)
-tshark_OBJECTS = $(am_tshark_OBJECTS)
+tshark_OBJECTS = $(am_tshark_OBJECTS) @INET_NTOP_O@
- tshark_DEPENDENCIES = $(am__DEPENDENCIES_2) wiretap/libwiretap.la \
- epan/libwireshark.la $(am__DEPENDENCIES_1)
+ tshark_DEPENDENCIES = $(am__DEPENDENCIES_1) wiretap/libwiretap.la \
+ epan/libwireshark.la $(am__DEPENDENCIES_2)
tshark_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -905,6 +905,7 @@ wireshark_SOURCES = \
+@@ -911,6 +911,7 @@ wireshark_SOURCES = \
fileset.c \
filters.c \
g711.c \
@@ -52,7 +52,7 @@
merge.c \
proto_hier_stats.c \
summary.c \
-@@ -945,6 +946,7 @@ tshark_SOURCES = \
+@@ -951,6 +952,7 @@ tshark_SOURCES = \
$(TSHARK_TAP_SRC) \
capture_opts.c \
capture_sync.c \
@@ -60,7 +60,7 @@
tempfile.c \
tshark-tap-register.c \
tshark.c
-@@ -953,6 +955,7 @@ tshark_SOURCES = \
+@@ -959,6 +961,7 @@ tshark_SOURCES = \
# rawshark specifics
rawshark_SOURCES = \
$(WIRESHARK_COMMON_SRC) \
@@ -68,7 +68,7 @@
rawshark.c
-@@ -973,10 +976,12 @@ mergecap_SOURCES = \
+@@ -979,10 +982,12 @@ mergecap_SOURCES = \
editcap_SOURCES = \
editcap.c \
epan/crypt/crypt-md5.c \
@@ -81,7 +81,7 @@
$(WTAP_PLUGIN_SOURCES)
-@@ -1000,6 +1005,7 @@ dumpcap_SOURCES = \
+@@ -1006,6 +1011,7 @@ dumpcap_SOURCES = \
clopts_common.c \
conditions.c \
dumpcap.c \
@@ -89,7 +89,7 @@
pcapio.c \
ringbuffer.c \
sync_pipe_write.c \
-@@ -1054,7 +1060,6 @@ wireshark_LDADD = \
+@@ -1060,7 +1066,6 @@ wireshark_LDADD = \
codecs/libcodec.a \
wiretap/libwiretap.la \
epan/libwireshark.la \
@@ -97,7 +97,7 @@
@SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
-@@ -1073,7 +1078,6 @@ tshark_LDADD = \
+@@ -1079,7 +1084,6 @@ tshark_LDADD = \
$(wireshark_optional_objects) \
wiretap/libwiretap.la \
epan/libwireshark.la \
@@ -105,7 +105,7 @@
@SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
-@@ -1093,7 +1097,6 @@ rawshark_LDADD = \
+@@ -1099,7 +1103,6 @@ rawshark_LDADD = \
$(wireshark_optional_objects) \
wiretap/libwiretap.la \
epan/libwireshark.la \
@@ -113,23 +113,7 @@
@SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
-@@ -1127,7 +1130,6 @@ mergecap_LDADD = \
- capinfos_LDADD = \
- wiretap/libwiretap.la \
- epan/libwireshark.la \
-- @INET_PTON_LO@ \
- @SSL_LIBS@ \
- $(plugin_ldadd) \
- @PCRE_LIBS@ \
-@@ -1144,7 +1146,6 @@ capinfos_LDADD = \
- editcap_LDADD = \
- wiretap/libwiretap.la \
- epan/libwireshark.la \
-- @INET_PTON_LO@ \
- @SSL_LIBS@ \
- $(plugin_ldadd) \
- @PCRE_LIBS@ \
-@@ -1183,7 +1184,6 @@ dftest_LDADD = \
+@@ -1167,7 +1170,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 3b79f2ac3a8c..66499dc72565 100644
--- a/net/wireshark/files/patch-epan_Makefile.in
+++ b/net/wireshark/files/patch-epan_Makefile.in
@@ -1,13 +1,20 @@
---- 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 = \
- #
+--- epan/Makefile.in.orig 2008-03-29 13:27:14.000000000 -0400
++++ epan/Makefile.in 2008-04-01 01:50:07.000000000 -0400
+@@ -792,7 +792,7 @@ 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 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 =
+ libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ \
+- @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
++ @INET_ATON_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 \
+@@ -801,7 +801,7 @@ libwireshark_la_LIBADD = @G_ASCII_STRCAS
+ @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 \
++ @INET_ATON_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 \
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 27f1c1b2951f..e4cdecf565ff 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -29,6 +29,8 @@ 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%%/infiniband.la
+lib/wireshark/plugins/%%PORTVERSION%%/infiniband.so
lib/wireshark/plugins/%%PORTVERSION%%/irda.la
lib/wireshark/plugins/%%PORTVERSION%%/irda.so
lib/wireshark/plugins/%%PORTVERSION%%/lwres.la
generated by cgit (git 2.34.1) at 2025-01-18 15:24:14 +0800