aboutsummaryrefslogtreecommitdiff
path: root/net/wireshark
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireshark')
-rw-r--r--net/wireshark/Makefile120
-rw-r--r--net/wireshark/distinfo3
-rw-r--r--net/wireshark/files/extra-patch-capture_loop.h11
-rw-r--r--net/wireshark/files/patch-configure81
-rw-r--r--net/wireshark/files/patch-epan_dissectors_packet-diameter.c19
-rw-r--r--net/wireshark/files/patch-epan_dissectors_packet-ieee80211.c235
-rw-r--r--net/wireshark/files/patch-epan_dissectors_packet-radiotap.c206
-rw-r--r--net/wireshark/files/patch-wiretap_configure20
-rw-r--r--net/wireshark/pkg-descr7
-rw-r--r--net/wireshark/pkg-plist171
10 files changed, 0 insertions, 873 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
deleted file mode 100644
index 1cc0e2d38e47..000000000000
--- a/net/wireshark/Makefile
+++ /dev/null
@@ -1,120 +0,0 @@
-# New ports collection makefile for: ethereal
-# Date created: 10 August 1998
-# Whom: Bill Fumerola <billf@chc-chimes.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= ethereal
-PORTVERSION= 0.10.14
-PORTREVISION= 1
-CATEGORIES= net ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- ftp://ftp.ethereal.com/pub/ethereal/all-versions/
-MASTER_SITE_SUBDIR= ${PORTNAME}
-
-MAINTAINER= marcus@FreeBSD.org
-COMMENT?= A powerful network analyzer/capture tool
-
-USE_PERL5_BUILD=yes
-USE_PYTHON_BUILD=yes
-USE_ICONV= yes
-#USE_BZIP2= yes
-USE_GNOME= gnometarget
-WANT_GNOME= yes
-CONFIGURE_ENV= MIBDIRS="/dev/null"
-CONFIGURE_ARGS+= --program-transform-name=""
-MAKE_ENV= MIBDIRS="/dev/null"
-INSTALLS_SHLIB= yes
-
-.for x in capinfos editcap idl2eth mergecap text2pcap
-.if defined(LITE)
-PLIST_SUB+= ${x:U}="@comment $x not installed"
-CONFIGURE_ARGS+= --enable-$x=no
-.else
-PLIST_SUB+= ${x:U}=bin/$x
-MAN1+= $x.1
-.endif
-.endfor
-
-.for x in dftest randpkt
-.if defined(LITE)
-PLIST_SUB+= ${x:U}="@comment $x not installed"
-CONFIGURE_ARGS+= --enable-$x=no
-.else
-PLIST_SUB+= ${x:U}=bin/$x
-.endif
-.endfor
-
-.if !defined(WITHOUT_X11)
-USE_X_PREFIX= yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_X11)
-MAN1+= ethereal.1
-PLIST_SUB+= ETHEREAL=bin/ethereal
-.if defined(WITHOUT_GTK2)
-USE_GNOME+= gtk12
-CONFIGURE_ARGS+= --disable-gtk2
-.else
-USE_GNOME+= gtk20
-.endif
-.else
-PLIST_SUB+= ETHEREAL="@comment ethereal not built"
-USE_GNOME+= glib12
-CONFIGURE_ARGS+= --enable-ethereal=no \
- --disable-gtktest \
- --with-gtk-prefix=/nonexistent \
- --disable-gtk2
-.endif
-
-GNU_CONFIGURE= yes
-LIBTOOLFILES= configure wiretap/configure
-PLIST_SUB+= PORTVERSION=${PORTVERSION}
-
-.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+= --enable-ipv6=yes
-.else
-CONFIGURE_ARGS+= --enable-ipv6=no
-.endif
-
-.if ${OSVERSION} < 504103
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-capture_loop.h
-.endif
-
-.if exists(/usr/include/openssl/crypto.h)
-CONFIGURE_ARGS+= --with-ssl=/usr
-.endif
-
-# XXX - untested
-.if defined(WITH_THREADS)
-CONFIGURE_ARGS+= --enable-threads
-.endif
-
-.if !defined(WITHOUT_PCRE) && !defined(LITE)
-LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+= --with-pcre=no
-.endif
-
-.if !defined(WITHOUT_SNMP) && !defined(LITE)
-LIB_DEPENDS+= netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
-CONFIGURE_ARGS+= --with-net-snmp=${LOCALBASE}/bin/net-snmp-config
-.else
-CONFIGURE_ARGS+= --enable-snmp=no --with-ucd-snmp=no --with-net-snmp=no
-.endif
-
-.if !defined(WITHOUT_ADNS) && !defined(LITE)
-LIB_DEPENDS+= adns.1:${PORTSDIR}/dns/adns
-CONFIGURE_ARGS+= --with-adns=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+= --with-adns=no
-.endif
-
-MAN1+= tethereal.1
-MAN4+= ethereal-filter.4
-
-.include <bsd.port.post.mk>
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
deleted file mode 100644
index 019263953ecf..000000000000
--- a/net/wireshark/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ethereal-0.10.14.tar.gz) = 44e7418a9a820d6e6dce6315c70fa6e2
-SHA256 (ethereal-0.10.14.tar.gz) = 323e62471d224cf33bbcfa7877ed3586a4fc510a4e23843b1d52e28eb98f8bfc
-SIZE (ethereal-0.10.14.tar.gz) = 10909355
diff --git a/net/wireshark/files/extra-patch-capture_loop.h b/net/wireshark/files/extra-patch-capture_loop.h
deleted file mode 100644
index 157b80dba806..000000000000
--- a/net/wireshark/files/extra-patch-capture_loop.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- capture_loop.h.orig Sat Dec 31 01:44:43 2005
-+++ capture_loop.h Sat Dec 31 01:45:19 2005
-@@ -68,7 +68,7 @@ extern void capture_loop_stop(void);
- * XXX - the various BSDs appear to define BSD in <sys/param.h>; we don't
- * want to include it if it's not present on this platform, however.
- */
--#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && \
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && \
- !defined(__bsdi__) && !defined(__APPLE__) && !defined(_WIN32) && \
- !defined(__CYGWIN__)
- # define MUST_DO_SELECT
diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure
deleted file mode 100644
index 87b2baa4bdda..000000000000
--- a/net/wireshark/files/patch-configure
+++ /dev/null
@@ -1,81 +0,0 @@
---- configure.orig Wed May 4 17:32:34 2005
-+++ configure Sat May 7 21:07:38 2005
-@@ -21806,6 +21806,7 @@
- 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 | \
-@@ -21816,7 +21817,7 @@
- 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"
-@@ -22452,6 +22453,7 @@
- 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 | \
-@@ -22462,7 +22464,7 @@
- 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"
-@@ -22683,7 +22685,7 @@
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
--LIBS="$GLIB_LIBS $LIBS"
-+LIBS="$GLIB_LIBS -liconv $LIBS"
- if test "$cross_compiling" = yes; then
- echo $ac_n "cross compiling; assumed OK... $ac_c"
- ac_cv_glib_supports_modules=yes
-@@ -27560,7 +27562,7 @@
- #
- CFLAGS="$CFLAGS -I$krb5_dir/include"
- CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
-- ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
-+ ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'`
- 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"
-@@ -27618,7 +27620,7 @@
-
- if test -x "$KRB5_CONFIG"
- then
-- KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
-+ KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'`
- KRB5_LIBS=`"$KRB5_CONFIG" --libs`
- CFLAGS="$CFLAGS $KRB5_FLAGS"
- CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
-@@ -29121,7 +29123,7 @@
-
-
- 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=""
-@@ -30094,7 +30096,7 @@
- #
- # The plugin dissectors reside in ./plugins/PROTO/
- #
--PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS"
-+PLUGIN_LIBS="-L../../epan -lethereal -liconv $GLIB_LIBS"
-
-
- #
diff --git a/net/wireshark/files/patch-epan_dissectors_packet-diameter.c b/net/wireshark/files/patch-epan_dissectors_packet-diameter.c
deleted file mode 100644
index 4fc63bb0d227..000000000000
--- a/net/wireshark/files/patch-epan_dissectors_packet-diameter.c
+++ /dev/null
@@ -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,
diff --git a/net/wireshark/files/patch-epan_dissectors_packet-ieee80211.c b/net/wireshark/files/patch-epan_dissectors_packet-ieee80211.c
deleted file mode 100644
index 3eebfaf9daac..000000000000
--- a/net/wireshark/files/patch-epan_dissectors_packet-ieee80211.c
+++ /dev/null
@@ -1,235 +0,0 @@
---- epan/dissectors/packet-ieee80211.c.orig Mon Dec 26 21:21:13 2005
-+++ epan/dissectors/packet-ieee80211.c Thu Dec 29 17:44:58 2005
-@@ -74,6 +74,10 @@
- #include <ctype.h>
- #include "isprint.h"
-
-+#ifndef roundup2
-+#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
-+#endif
-+
- /* Defragment fragmented 802.11 datagrams */
- static gboolean wlan_defragment = TRUE;
-
-@@ -636,7 +640,7 @@ find_header_length (guint16 fcf)
- case DATA_FRAME:
- len = (COOK_ADDR_SELECTOR(fcf) == DATA_ADDR_T4) ? DATA_LONG_HDR_LEN :
- DATA_SHORT_HDR_LEN;
-- if( IS_DATA_QOS(COMPOSE_FRAME_TYPE(fcf)))
-+ if(COMPOSE_FRAME_TYPE(fcf) & 0x80)
- return len + 2;
- else
- return len;
-@@ -1958,6 +1962,23 @@ set_dst_addr_cols(packet_info *pinfo, co
- ether_to_str(addr));
- }
-
-+static guint32
-+crc32_802_tvb_padded(tvbuff_t *tvb, guint hdr_len, guint hdr_size, guint len)
-+{
-+ guint32 c_crc;
-+
-+ c_crc = crc32_ccitt_tvb(tvb, hdr_len);
-+ c_crc = crc32_ccitt_seed(tvb_get_ptr(tvb, hdr_size, len), len, ~c_crc);
-+
-+ /* Byte reverse. */
-+ c_crc = ((unsigned char)(c_crc>>0)<<24) |
-+ ((unsigned char)(c_crc>>8)<<16) |
-+ ((unsigned char)(c_crc>>16)<<8) |
-+ ((unsigned char)(c_crc>>24)<<0);
-+
-+ return ( c_crc );
-+}
-+
- typedef enum {
- ENCAP_802_2,
- ENCAP_IPX,
-@@ -1971,7 +1992,7 @@ static void
- dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
- proto_tree * tree, gboolean fixed_length_header,
- gboolean has_radio_information, gint fcs_len,
-- gboolean wlan_broken_fc)
-+ gboolean wlan_broken_fc, gboolean datapad)
- {
- guint16 fcf, flags, frame_type_subtype;
- guint16 seq_control;
-@@ -1986,7 +2007,7 @@ dissect_ieee80211_common (tvbuff_t * tvb
- proto_tree *hdr_tree = NULL;
- proto_tree *flag_tree;
- proto_tree *fc_tree;
-- guint16 hdr_len;
-+ guint16 hdr_len, ohdr_len;
- gboolean has_fcs;
- gint len, reported_len, ivlen;
- gboolean save_fragmented;
-@@ -2030,6 +2051,9 @@ dissect_ieee80211_common (tvbuff_t * tvb
- hdr_len = DATA_LONG_HDR_LEN;
- else
- hdr_len = find_header_length (fcf);
-+ ohdr_len = hdr_len;
-+ if (datapad)
-+ hdr_len = roundup2(hdr_len, 4);
- frame_type_subtype = COMPOSE_FRAME_TYPE(fcf);
-
- if (check_col (pinfo->cinfo, COL_PROTOCOL))
-@@ -2526,9 +2550,13 @@ dissect_ieee80211_common (tvbuff_t * tvb
- reported_len -= 4;
- if (tree)
- {
-- guint32 fcs = crc32_802_tvb(tvb, hdr_len + len);
- guint32 sent_fcs = tvb_get_ntohl(tvb, hdr_len + len);
-+ guint32 fcs;
-
-+ if (datapad)
-+ fcs = crc32_802_tvb_padded(tvb, ohdr_len, hdr_len, len);
-+ else
-+ fcs = crc32_802_tvb(tvb, hdr_len + len);
- if (fcs == sent_fcs)
- proto_tree_add_uint_format(hdr_tree, hf_fcs, tvb,
- hdr_len + len, 4, sent_fcs,
-@@ -2561,35 +2589,46 @@ dissect_ieee80211_common (tvbuff_t * tvb
- proto_item *qos_fields;
- proto_tree *qos_tree;
-
-+ guint16 qosoff;
- guint16 qos_control;
- guint16 qos_priority;
- guint16 qos_ack_policy;
- guint16 qos_eosp;
- guint16 qos_field_content;
-
-- qos_fields = proto_tree_add_text(hdr_tree, tvb, hdr_len - 2, 2,
-+ /*
-+ * We calculate the offset to the QoS header data as
-+ * an offset relative to the end of the header. But
-+ * when the header has been padded to align the data
-+ * this must be done relative to true header size, not
-+ * the padded/aligned value. To simplify this work we
-+ * stash the original header size in ohdr_len instead
-+ * of recalculating it.
-+ */
-+ qosoff = ohdr_len - 2;
-+ qos_fields = proto_tree_add_text(hdr_tree, tvb, qosoff, 2,
- "QoS parameters");
- qos_tree = proto_item_add_subtree (qos_fields, ett_qos_parameters);
-
-- qos_control = tvb_get_letohs(tvb, hdr_len - 2);
-+ qos_control = tvb_get_letohs(tvb, qosoff + 0);
- qos_priority = COOK_QOS_PRIORITY(qos_control);
- qos_ack_policy = COOK_QOS_ACK_POLICY(qos_control);
- qos_eosp = COOK_QOS_EOSP(qos_control);
- qos_field_content = COOK_QOS_FIELD_CONTENT( qos_control);
-
- proto_tree_add_uint_format (qos_tree, hf_qos_priority, tvb,
-- hdr_len - 2, 2, qos_priority,
-+ qosoff, 2, qos_priority,
- "Priority: %d (%s) (%s)",
- qos_priority, qos_tags[qos_priority], qos_acs[qos_priority]);
-
- if(flags & FLAG_FROM_DS) {
- proto_tree_add_boolean (qos_tree, hf_qos_eosp, tvb,
-- hdr_len - 2, 1, qos_eosp);
-+ qosoff, 1, qos_eosp);
-
- if(IS_DATA_CF_POLL(frame_type_subtype)) {
- /* txop limit */
- proto_tree_add_uint_format (qos_tree, hf_qos_field_content, tvb,
-- hdr_len - 1, 1, qos_field_content, "TXOP Limit: %d ", qos_field_content);
-+ qosoff + 1, 1, qos_field_content, "TXOP Limit: %d ", qos_field_content);
-
- }else {
- /* qap ps buffer state */
-@@ -2603,7 +2642,7 @@ dissect_ieee80211_common (tvbuff_t * tvb
- buf_ac = COOK_PS_BUF_AC(qos_field_content); /*access category */
- buf_load = COOK_PS_BUF_LOAD(qos_field_content);
-
-- qos_ps_buf_state_fields = proto_tree_add_text(qos_tree, tvb, hdr_len - 1, 1,
-+ qos_ps_buf_state_fields = proto_tree_add_text(qos_tree, tvb, qosoff + 1, 1,
- "QAP PS Buffer State: 0x%x", qos_field_content);
- qos_ps_buf_state_tree = proto_item_add_subtree (qos_ps_buf_state_fields, ett_qos_ps_buf_state);
-
-@@ -2612,25 +2651,25 @@ dissect_ieee80211_common (tvbuff_t * tvb
- 1, 1, buf_state);
-
- proto_tree_add_uint_format (qos_ps_buf_state_tree, hf_qos_buf_ac, tvb,
-- hdr_len - 1, 1, buf_ac, "Priority: %d (%s)",
-+ qosoff + 1, 1, buf_ac, "Priority: %d (%s)",
- buf_ac, wme_acs[buf_ac]);
-
- proto_tree_add_uint_format (qos_ps_buf_state_tree, hf_qos_buf_load, tvb,
-- hdr_len - 1, 1, buf_load, "Buffered load: %d ", (buf_load * 4096));
-+ qosoff + 1, 1, buf_load, "Buffered load: %d ", (buf_load * 4096));
- */
-
- }
- } else if(qos_eosp) {
- /* txop limit requested */
- proto_tree_add_uint_format (qos_tree, hf_qos_field_content, tvb,
-- hdr_len - 1, 1, qos_field_content, "Queue Size: %d ", (qos_field_content * 254));
-+ qosoff + 1, 1, qos_field_content, "Queue Size: %d ", (qos_field_content * 254));
- } else {
- /* queue size */
- proto_tree_add_uint_format (qos_tree, hf_qos_field_content, tvb,
-- hdr_len - 1, 1, qos_field_content, "TXOP Limit Requested: %d ", qos_field_content);
-+ qosoff + 1, 1, qos_field_content, "TXOP Limit Requested: %d ", qos_field_content);
- }
-
-- proto_tree_add_uint (qos_tree, hf_qos_ack_policy, tvb, hdr_len - 2, 1,
-+ proto_tree_add_uint (qos_tree, hf_qos_ack_policy, tvb, qosoff, 1,
- qos_ack_policy);
-
- } /* end of qos control field */
-@@ -2988,7 +3027,17 @@ static void
- dissect_ieee80211 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
- {
- dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE,
-- pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE);
-+ pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE, FALSE);
-+}
-+
-+/*
-+ * Dissect 802.11 with a variable-length link-layer header and data padding.
-+ */
-+static void
-+dissect_ieee80211_datapad (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
-+{
-+ dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE,
-+ pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE, TRUE);
- }
-
- /*
-@@ -2999,7 +3048,7 @@ static void
- dissect_ieee80211_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
- {
- dissect_ieee80211_common (tvb, pinfo, tree, FALSE, TRUE,
-- pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE);
-+ pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE, FALSE);
- }
-
- /*
-@@ -3010,7 +3059,7 @@ dissect_ieee80211_radio (tvbuff_t * tvb,
- static void
- dissect_ieee80211_bsfc (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
- {
-- dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE, 0, TRUE);
-+ dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE, 0, TRUE, FALSE);
- }
-
- /*
-@@ -3020,7 +3069,7 @@ dissect_ieee80211_bsfc (tvbuff_t * tvb,
- static void
- dissect_ieee80211_fixed (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
- {
-- dissect_ieee80211_common (tvb, pinfo, tree, TRUE, FALSE, 0, FALSE);
-+ dissect_ieee80211_common (tvb, pinfo, tree, TRUE, FALSE, 0, FALSE, FALSE);
- }
-
- static void
-@@ -3809,6 +3858,7 @@ proto_register_ieee80211 (void)
- register_dissector("wlan", dissect_ieee80211, proto_wlan);
- register_dissector("wlan_fixed", dissect_ieee80211_fixed, proto_wlan);
- register_dissector("wlan_bsfc", dissect_ieee80211_bsfc, proto_wlan);
-+ register_dissector("wlan_datapad", dissect_ieee80211_datapad, proto_wlan);
- register_init_routine(wlan_defragment_init);
-
- wlan_tap = register_tap("wlan");
diff --git a/net/wireshark/files/patch-epan_dissectors_packet-radiotap.c b/net/wireshark/files/patch-epan_dissectors_packet-radiotap.c
deleted file mode 100644
index ece82f94e19e..000000000000
--- a/net/wireshark/files/patch-epan_dissectors_packet-radiotap.c
+++ /dev/null
@@ -1,206 +0,0 @@
---- epan/dissectors/packet-radiotap.c.orig Mon Oct 10 06:23:07 2005
-+++ epan/dissectors/packet-radiotap.c Tue Dec 6 18:34:19 2005
-@@ -73,7 +73,6 @@
- IEEE80211_RADIOTAP_ANTENNA = 11,
- IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
- IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
-- IEEE80211_RADIOTAP_FCS = 14,
- IEEE80211_RADIOTAP_EXT = 31
- };
-
-@@ -121,6 +120,11 @@
- #define IEEE80211_RADIOTAP_F_FRAG 0x08 /* sent/received
- * with fragmentation
- */
-+#define IEEE80211_RADIOTAP_F_FCS 0x10 /* frame includes FCS */
-+#define IEEE80211_RADIOTAP_F_DATAPAD 0x20 /* frame has padding between
-+ * 802.11 header and payload
-+ * (to 32-bit boundary)
-+ */
-
- /* protocol */
- static int proto_radiotap = -1;
-@@ -140,11 +144,14 @@
- static int hf_radiotap_db_antnoise = -1;
- static int hf_radiotap_txpower = -1;
- static int hf_radiotap_preamble = -1;
-+static int hf_radiotap_fcs = -1;
-+static int hf_radiotap_datapad = -1;
-
- static gint ett_radiotap = -1;
- static gint ett_radiotap_present = -1;
-
- static dissector_handle_t ieee80211_handle;
-+static dissector_handle_t ieee80211_datapad_handle;
-
- static void
- dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-@@ -190,6 +197,12 @@
- { 0, NULL },
- };
-
-+ static const value_string truefalse_type[] = {
-+ { 0, "False" },
-+ { 1, "True" },
-+ { 0, NULL },
-+ };
-+
- static hf_register_info hf[] = {
- { &hf_radiotap_version,
- { "Header revision", "radiotap.version",
-@@ -208,6 +221,14 @@
- { "Preamble", "radiotap.flags.preamble",
- FT_UINT32, BASE_DEC, VALS(preamble_type), 0x0, "", HFILL } },
-
-+ /* XXX for debugging */
-+ { &hf_radiotap_fcs,
-+ { "FCS", "radiotap.flags.fcs",
-+ FT_UINT32, BASE_DEC, VALS(truefalse_type), 0x0, "", HFILL } },
-+ { &hf_radiotap_datapad,
-+ { "DATAPAD", "radiotap.flags.datapad",
-+ FT_UINT32, BASE_DEC, VALS(truefalse_type), 0x0, "", HFILL } },
-+
- { &hf_radiotap_mactime,
- { "MAC timestamp", "radiotap.mactime",
- FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL } },
-@@ -257,6 +278,7 @@
- static int
- ieee80211_mhz2ieee(int freq, int flags)
- {
-+#define IS_CHAN_IN_PUBLIC_SAFETY_BAND(_c) ((_c) > 4940 && (_c) < 4990)
- if (flags & IEEE80211_CHAN_2GHZ) { /* 2GHz band */
- if (freq == 2484)
- return 14;
-@@ -265,16 +287,28 @@
- else
- return 15 + ((freq - 2512) / 20);
- } else if (flags & IEEE80211_CHAN_5GHZ) { /* 5Ghz band */
-- return (freq - 5000) / 5;
-+ if (IS_CHAN_IN_PUBLIC_SAFETY_BAND(freq))
-+ return ((freq * 10) + (((freq % 5) == 2) ? 5 : 0) - 49400) / 5;
-+ if (freq <= 5000)
-+ return (freq - 4000) / 5;
-+ else
-+ return (freq - 5000) / 5;
- } else { /* either, guess */
- if (freq == 2484)
- return 14;
- if (freq < 2484)
- return (freq - 2407) / 5;
-- if (freq < 5000)
-- return 15 + ((freq - 2512) / 20);
-+ if (freq < 5000) {
-+ if (IS_CHAN_IN_PUBLIC_SAFETY_BAND(freq))
-+ return ((freq * 10) + (((freq % 5) == 2) ? 5 : 0) - 49400)/5;
-+ else if (freq > 4900)
-+ return (freq - 4000) / 5;
-+ else
-+ return 15 + ((freq - 2512) / 20);
-+ }
- return (freq - 5000) / 5;
- }
-+#undef IS_CHAN_IN_PUBLIC_SAFETY_BAND
- }
-
- static void
-@@ -294,7 +328,7 @@
- guint32 length;
- guint32 rate, freq, flags;
- gint8 dbm;
-- guint8 db;
-+ guint8 db, rflags;
- guint32 present, next_present;
- int bit;
-
-@@ -334,6 +368,7 @@
- */
- offset += sizeof(struct ieee80211_radiotap_header);
-
-+ rflags = 0;
- for (; present; present = next_present) {
- /* clear the least significant bit that is set */
- next_present = present & (present - 1);
-@@ -344,45 +379,16 @@
- switch (bit) {
- case IEEE80211_RADIOTAP_FLAGS:
- if (tree) {
-+ rflags = tvb_get_guint8(tvb, offset);
- proto_tree_add_uint(radiotap_tree, hf_radiotap_preamble,
-- tvb, 0, 0, (tvb_get_guint8(tvb, offset) &
-- IEEE80211_RADIOTAP_F_SHORTPRE) != 0);
-+ tvb, 0, 0, (rflags&IEEE80211_RADIOTAP_F_SHORTPRE) != 0);
-+ proto_tree_add_uint(radiotap_tree, hf_radiotap_fcs,
-+ tvb, 0, 0, (rflags&IEEE80211_RADIOTAP_F_FCS) != 0);
-+ proto_tree_add_uint(radiotap_tree, hf_radiotap_datapad,
-+ tvb, 0, 0, (rflags&IEEE80211_RADIOTAP_F_DATAPAD) != 0);
- }
- offset++;
- /* XXX CFP, WEP, FRAG */
--#if 0
-- capability = tvb_get_letohs (tvb, offset);
--
-- cap_item = proto_tree_add_uint_format (tree, ff_capture,
-- tvb, offset, 2,
-- capability,
-- "Capability Information: 0x%04X",
-- capability);
-- cap_tree = proto_item_add_subtree (cap_item, ett_cap_tree);
-- proto_tree_add_boolean (cap_tree, ff_cf_ess, tvb, offset, 2,
-- capability);
-- proto_tree_add_boolean (cap_tree, ff_cf_ibss, tvb, offset, 2,
-- capability);
-- if (ESS_SET (capability) != 0) /* This is an AP */
-- proto_tree_add_uint (cap_tree, ff_cf_ap_poll, tvb, offset, 2,
-- capability);
--
-- else /* This is a STA */
-- proto_tree_add_uint (cap_tree, ff_cf_sta_poll, tvb, offset, 2,
-- capability);
-- proto_tree_add_boolean (cap_tree, ff_cf_privacy, tvb, offset, 2,
-- capability);
-- proto_tree_add_boolean (cap_tree, ff_cf_preamble, tvb, offset, 2,
-- capability);
-- proto_tree_add_boolean (cap_tree, ff_cf_pbcc, tvb, offset, 2,
-- capability);
-- proto_tree_add_boolean (cap_tree, ff_cf_agility, tvb, offset, 2,
-- capability);
-- proto_tree_add_boolean (cap_tree, ff_short_slot_time, tvb, offset, 2,
-- capability);
-- proto_tree_add_boolean (cap_tree, ff_dsss_ofdm, tvb, offset, 2,
-- capability);
--#endif
- break;
- case IEEE80211_RADIOTAP_RATE:
- rate = tvb_get_guint8(tvb, offset) & 0x7f;
-@@ -480,8 +486,8 @@
- break;
- case IEEE80211_RADIOTAP_TSFT:
- if (tree) {
-- proto_tree_add_item(radiotap_tree, hf_radiotap_mactime,
-- tvb, offset, 8, FALSE);
-+ proto_tree_add_uint64(radiotap_tree, hf_radiotap_mactime,
-+ tvb, offset, 8, tvb_get_letoh64(tvb, offset));
- }
- offset+=8;
- break;
-@@ -495,8 +501,11 @@
- }
- }
-
-+ if (rflags & IEEE80211_RADIOTAP_F_FCS)
-+ pinfo->pseudo_header->ieee_802_11.fcs_len = 4;
- /* dissect the 802.11 header next */
-- call_dissector(ieee80211_handle,
-+ call_dissector((rflags & IEEE80211_RADIOTAP_F_DATAPAD) ?
-+ ieee80211_datapad_handle : ieee80211_handle,
- tvb_new_subset(tvb, length, -1, -1), pinfo, tree);
- #undef BITNO_32
- #undef BITNO_16
-@@ -513,6 +522,7 @@
-
- /* handle for 802.11 dissector */
- ieee80211_handle = find_dissector("wlan");
-+ ieee80211_datapad_handle = find_dissector("wlan_datapad");
-
- radiotap_handle = create_dissector_handle(dissect_radiotap, proto_radiotap);
-
diff --git a/net/wireshark/files/patch-wiretap_configure b/net/wireshark/files/patch-wiretap_configure
deleted file mode 100644
index 420db3bf111d..000000000000
--- a/net/wireshark/files/patch-wiretap_configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- wiretap/configure.orig Sat May 7 21:04:37 2005
-+++ wiretap/configure Sat May 7 21:05:31 2005
-@@ -20092,7 +20092,7 @@
- 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"
-@@ -20206,7 +20206,7 @@
- if test "x$no_glib" = x ; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&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-descr b/net/wireshark/pkg-descr
deleted file mode 100644
index fd7658ffd4b6..000000000000
--- a/net/wireshark/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-A network analyzer that lets you capture and interactively browse the
-contents of Ethernet frames. Packet data can be read from a file, or
-live from a local network interface.
-
-WWW: http://www.ethereal.com/
-
-Bill Fumerola <billf@chc-chimes.com>
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
deleted file mode 100644
index 9e122c401675..000000000000
--- a/net/wireshark/pkg-plist
+++ /dev/null
@@ -1,171 +0,0 @@
-%%CAPINFOS%%
-%%DFTEST%%
-%%EDITCAP%%
-%%ETHEREAL%%
-%%IDL2ETH%%
-%%MERGECAP%%
-%%RANDPKT%%
-bin/tethereal
-%%TEXT2PCAP%%
-lib/ethereal/plugins/%%PORTVERSION%%/acn.la
-lib/ethereal/plugins/%%PORTVERSION%%/acn.so
-lib/ethereal/plugins/%%PORTVERSION%%/agentx.la
-lib/ethereal/plugins/%%PORTVERSION%%/agentx.so
-lib/ethereal/plugins/%%PORTVERSION%%/artnet.la
-lib/ethereal/plugins/%%PORTVERSION%%/artnet.so
-lib/ethereal/plugins/%%PORTVERSION%%/asn1.la
-lib/ethereal/plugins/%%PORTVERSION%%/asn1.so
-lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.la
-lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.so
-lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.la
-lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.so
-lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.la
-lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.so
-lib/ethereal/plugins/%%PORTVERSION%%/docsis.la
-lib/ethereal/plugins/%%PORTVERSION%%/docsis.so
-lib/ethereal/plugins/%%PORTVERSION%%/enttec.la
-lib/ethereal/plugins/%%PORTVERSION%%/enttec.so
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.la
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so
-lib/ethereal/plugins/%%PORTVERSION%%/h223.la
-lib/ethereal/plugins/%%PORTVERSION%%/h223.so
-lib/ethereal/plugins/%%PORTVERSION%%/irda.la
-lib/ethereal/plugins/%%PORTVERSION%%/irda.so
-lib/ethereal/plugins/%%PORTVERSION%%/lwres.la
-lib/ethereal/plugins/%%PORTVERSION%%/lwres.so
-lib/ethereal/plugins/%%PORTVERSION%%/mate.la
-lib/ethereal/plugins/%%PORTVERSION%%/mate.so
-lib/ethereal/plugins/%%PORTVERSION%%/megaco.la
-lib/ethereal/plugins/%%PORTVERSION%%/megaco.so
-lib/ethereal/plugins/%%PORTVERSION%%/mgcp.la
-lib/ethereal/plugins/%%PORTVERSION%%/mgcp.so
-lib/ethereal/plugins/%%PORTVERSION%%/opsi.la
-lib/ethereal/plugins/%%PORTVERSION%%/opsi.so
-lib/ethereal/plugins/%%PORTVERSION%%/parlay.la
-lib/ethereal/plugins/%%PORTVERSION%%/parlay.so
-lib/ethereal/plugins/%%PORTVERSION%%/pcli.la
-lib/ethereal/plugins/%%PORTVERSION%%/pcli.so
-lib/ethereal/plugins/%%PORTVERSION%%/profinet.la
-lib/ethereal/plugins/%%PORTVERSION%%/profinet.so
-lib/ethereal/plugins/%%PORTVERSION%%/rdm.la
-lib/ethereal/plugins/%%PORTVERSION%%/rdm.so
-lib/ethereal/plugins/%%PORTVERSION%%/rlm.la
-lib/ethereal/plugins/%%PORTVERSION%%/rlm.so
-lib/ethereal/plugins/%%PORTVERSION%%/rtnet.la
-lib/ethereal/plugins/%%PORTVERSION%%/rtnet.so
-lib/ethereal/plugins/%%PORTVERSION%%/rudp.la
-lib/ethereal/plugins/%%PORTVERSION%%/rudp.so
-lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.la
-lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.so
-lib/ethereal/plugins/%%PORTVERSION%%/tango.la
-lib/ethereal/plugins/%%PORTVERSION%%/tango.so
-lib/ethereal/plugins/%%PORTVERSION%%/v5ua.la
-lib/ethereal/plugins/%%PORTVERSION%%/v5ua.so
-lib/libethereal.la
-lib/libethereal.so
-lib/libethereal.so.0
-lib/libwiretap.la
-lib/libwiretap.so
-lib/libwiretap.so.0
-%%DATADIR%%/AUTHORS-SHORT
-%%DATADIR%%/capinfos.html
-%%DATADIR%%/cfilters
-%%DATADIR%%/colorfilters
-%%DATADIR%%/dfilters
-%%DATADIR%%/diameter/TGPPSh.xml
-%%DATADIR%%/diameter/chargecontrol.xml
-%%DATADIR%%/diameter/dictionary.dtd
-%%DATADIR%%/diameter/dictionary.xml
-%%DATADIR%%/diameter/imscxdx.xml
-%%DATADIR%%/diameter/mobileipv4.xml
-%%DATADIR%%/diameter/nasreq.xml
-%%DATADIR%%/diameter/sunping.xml
-%%DATADIR%%/dtds/dc.dtd
-%%DATADIR%%/dtds/itunes.dtd
-%%DATADIR%%/dtds/rss.dtd
-%%DATADIR%%/dtds/smil.dtd
-%%DATADIR%%/editcap.html
-%%DATADIR%%/ethereal-filter.html
-%%DATADIR%%/ethereal.html
-%%DATADIR%%/help/capture_filters.txt
-%%DATADIR%%/help/capturing.txt
-%%DATADIR%%/help/display_filters.txt
-%%DATADIR%%/help/faq.txt
-%%DATADIR%%/help/getting_started.txt
-%%DATADIR%%/help/overview.txt
-%%DATADIR%%/help/toc
-%%DATADIR%%/idl2eth.html
-%%DATADIR%%/manuf
-%%DATADIR%%/mergecap.html
-%%DATADIR%%/radius/dictionary
-%%DATADIR%%/radius/dictionary.3com
-%%DATADIR%%/radius/dictionary.3gpp
-%%DATADIR%%/radius/dictionary.3gpp2
-%%DATADIR%%/radius/dictionary.acc
-%%DATADIR%%/radius/dictionary.alcatel
-%%DATADIR%%/radius/dictionary.alteon
-%%DATADIR%%/radius/dictionary.altiga
-%%DATADIR%%/radius/dictionary.aptis
-%%DATADIR%%/radius/dictionary.ascend
-%%DATADIR%%/radius/dictionary.bay
-%%DATADIR%%/radius/dictionary.bintec
-%%DATADIR%%/radius/dictionary.bristol
-%%DATADIR%%/radius/dictionary.cablelabs
-%%DATADIR%%/radius/dictionary.cabletron
-%%DATADIR%%/radius/dictionary.cisco
-%%DATADIR%%/radius/dictionary.cisco.bbsm
-%%DATADIR%%/radius/dictionary.cisco.vpn3000
-%%DATADIR%%/radius/dictionary.cisco.vpn5000
-%%DATADIR%%/radius/dictionary.colubris
-%%DATADIR%%/radius/dictionary.columbia_university
-%%DATADIR%%/radius/dictionary.compat
-%%DATADIR%%/radius/dictionary.cosine
-%%DATADIR%%/radius/dictionary.ericsson
-%%DATADIR%%/radius/dictionary.erx
-%%DATADIR%%/radius/dictionary.extreme
-%%DATADIR%%/radius/dictionary.foundry
-%%DATADIR%%/radius/dictionary.freeradius
-%%DATADIR%%/radius/dictionary.gandalf
-%%DATADIR%%/radius/dictionary.garderos
-%%DATADIR%%/radius/dictionary.gemtek
-%%DATADIR%%/radius/dictionary.itk
-%%DATADIR%%/radius/dictionary.juniper
-%%DATADIR%%/radius/dictionary.karlnet
-%%DATADIR%%/radius/dictionary.livingston
-%%DATADIR%%/radius/dictionary.localweb
-%%DATADIR%%/radius/dictionary.merit
-%%DATADIR%%/radius/dictionary.microsoft
-%%DATADIR%%/radius/dictionary.mikrotik
-%%DATADIR%%/radius/dictionary.navini
-%%DATADIR%%/radius/dictionary.netscreen
-%%DATADIR%%/radius/dictionary.nokia
-%%DATADIR%%/radius/dictionary.nomadix
-%%DATADIR%%/radius/dictionary.propel
-%%DATADIR%%/radius/dictionary.quintum
-%%DATADIR%%/radius/dictionary.redback
-%%DATADIR%%/radius/dictionary.redcreek
-%%DATADIR%%/radius/dictionary.shasta
-%%DATADIR%%/radius/dictionary.shiva
-%%DATADIR%%/radius/dictionary.sonicwall
-%%DATADIR%%/radius/dictionary.springtide
-%%DATADIR%%/radius/dictionary.t_systems_nova
-%%DATADIR%%/radius/dictionary.telebit
-%%DATADIR%%/radius/dictionary.trapeze
-%%DATADIR%%/radius/dictionary.tunnel
-%%DATADIR%%/radius/dictionary.unisphere
-%%DATADIR%%/radius/dictionary.unix
-%%DATADIR%%/radius/dictionary.usr
-%%DATADIR%%/radius/dictionary.valemount
-%%DATADIR%%/radius/dictionary.versanet
-%%DATADIR%%/radius/dictionary.wispr
-%%DATADIR%%/radius/dictionary.xedia
-%%DATADIR%%/tethereal.html
-%%DATADIR%%/text2pcap.html
-@dirrm lib/ethereal/plugins/%%PORTVERSION%%
-@dirrm lib/ethereal/plugins
-@dirrm lib/ethereal
-@dirrm %%DATADIR%%/radius
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/dtds
-@dirrm %%DATADIR%%/diameter
-@dirrm %%DATADIR%%