Add wireshark and tshark after repocopies from ethereal and tethereal

respectively.  Wireshark is a rename of ethereal after the principal
developer moved companies and lost the Ethereal copyright.

Messenger, don't shoot!

Now the ethereal binary is called wireshark, the tethereal binary is
called tshark, and idl2eth is now idl2wrs.  All other binaries have
kept the same name.

In addition to this name change, I have also changed the PREFIX from X11BASE
to LOCALBASE.

2 files changed, 14 insertions, 213 deletions

diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure
index 87b2baa4bdda..ea1bda2c8ac6 100644
--- a/net/wireshark/files/patch-configure
+++ b/net/wireshark/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed May  4 17:32:34 2005
-+++ configure	Sat May  7 21:07:38 2005
-@@ -21806,6 +21806,7 @@
+--- configure.orig	Tue Jul 18 00:20:03 2006
++++ configure	Tue Jul 18 00:19:03 2006
+@@ -22210,6 +22210,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`
@@ -8,7 +8,7 @@
      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 @@
+@@ -22220,7 +22221,7 @@ echo $ECHO_N "checking for GLIB - versio
        ac_save_CFLAGS="$CFLAGS"
        ac_save_LIBS="$LIBS"
        CFLAGS="$CFLAGS $GLIB_CFLAGS"
@@ -17,7 +17,7 @@
        rm -f conf.glibtest
        if test "$cross_compiling" = yes; then
    echo $ac_n "cross compiling; assumed OK... $ac_c"
-@@ -22452,6 +22453,7 @@
+@@ -22854,6 +22855,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`
@@ -25,16 +25,15 @@
      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"
+@@ -22865,6 +22867,7 @@ echo $ECHO_N "checking for GLIB - versio
        ac_save_LIBS="$LIBS"
        CFLAGS="$CFLAGS $GLIB_CFLAGS"
--      LIBS="$GLIB_LIBS $LIBS"
+       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 @@
+@@ -23084,7 +23087,7 @@ echo $ECHO_N "checking whether GLib supp
  ac_save_CFLAGS="$CFLAGS"
  ac_save_LIBS="$LIBS"
  CFLAGS="$CFLAGS $GLIB_CFLAGS"
@@ -43,7 +42,7 @@
  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 @@
+@@ -28684,7 +28687,7 @@ echo "${ECHO_T}yes" >&6
  	  #
  	  CFLAGS="$CFLAGS -I$krb5_dir/include"
  	  CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
@@ -52,7 +51,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"
-@@ -27618,7 +27620,7 @@
+@@ -28742,7 +28745,7 @@ fi
  
  	  if test -x "$KRB5_CONFIG"
  	  then
@@ -61,7 +60,7 @@
  	    KRB5_LIBS=`"$KRB5_CONFIG" --libs`
  	    CFLAGS="$CFLAGS $KRB5_FLAGS"
  	    CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
-@@ -29121,7 +29123,7 @@
+@@ -30342,7 +30345,7 @@ fi
  
  
  ac_save_LIBS="$LIBS"
@@ -70,12 +69,12 @@
  G_ASCII_STRTOULL_C=""
  G_ASCII_STRTOULL_O=""
  G_ASCII_STRTOULL_LO=""
-@@ -30094,7 +30096,7 @@
+@@ -31509,7 +31512,7 @@ fi
  #
  # The plugin dissectors reside in ./plugins/PROTO/
  #
--PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS"
-+PLUGIN_LIBS="-L../../epan -lethereal -liconv $GLIB_LIBS"
+-PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS"
++PLUGIN_LIBS="-L../../epan -lwireshark -liconv $GLIB_LIBS"
  
  
  #
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 f66df6cb6f14..000000000000
--- a/net/wireshark/files/patch-epan_dissectors_packet-radiotap.c
+++ /dev/null
@@ -1,198 +0,0 @@
---- epan/dissectors/packet-radiotap.c.orig	Mon Apr 17 14:46:52 2006
-+++ epan/dissectors/packet-radiotap.c	Fri Apr 28 19:21:24 2006
-@@ -382,7 +382,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
-     proto_item *ti = NULL;
-     int offset;
-     guint32 version, pad;
--    guint32 length;
-+    guint length, length_remaining;
-     guint32 rate, freq, flags;
-     gint8 dbm;
-     guint8 db, rflags;
-@@ -416,11 +416,13 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 	ti = proto_tree_add_uint(radiotap_tree, hf_radiotap_length,
- 	    tvb, offset + 2, 2, length);
-     }
-+    length_remaining = length;
-+
-     /*
-      * FIXME: This only works if there is exactly 1 it_present
-      *        field in the header
-      */
--    if (length < sizeof(struct ieee80211_radiotap_header)) {
-+    if (length_remaining < sizeof(struct ieee80211_radiotap_header)) {
- 	/*
- 	 * Radiotap header is shorter than the fixed-length portion
- 	 * plus one "present" bitset.
-@@ -435,7 +437,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 	present_tree = proto_item_add_subtree(pt, ett_radiotap_present);
-     }
-     offset += sizeof(struct ieee80211_radiotap_header);
--    length -= sizeof(struct ieee80211_radiotap_header);
-+    length_remaining -= sizeof(struct ieee80211_radiotap_header);
- 
-     rflags = 0;
-     for (; present; present = next_present) {
-@@ -447,7 +449,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 
- 	switch (bit) {
- 	case IEEE80211_RADIOTAP_FLAGS:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
- 	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
-@@ -459,13 +461,12 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 			tvb, 0, 0, (rflags&IEEE80211_RADIOTAP_F_DATAPAD) != 0);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    /* XXX CFP, WEP, FRAG */
- 	    break;
- 	case IEEE80211_RADIOTAP_RATE:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    rate = tvb_get_guint8(tvb, offset) & 0x7f;
- 	    if (check_col(pinfo->cinfo, COL_TX_RATE)) {
- 		col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%d.%d",
-@@ -477,12 +478,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 			"Data Rate: %d.%d Mb/s", rate / 2, rate & 1 ? 5 : 0);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    dbm = (gint8) tvb_get_guint8(tvb, offset);
- 	    if (check_col(pinfo->cinfo, COL_RSSI)) {
- 		col_add_fstr(pinfo->cinfo, COL_RSSI, "%d dBm", dbm);
-@@ -494,12 +494,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					  "SSI Signal: %d dBm", dbm);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    db = tvb_get_guint8(tvb, offset);
- 	    if (check_col(pinfo->cinfo, COL_RSSI)) {
- 		col_add_fstr(pinfo->cinfo, COL_RSSI, "%u dB", db);
-@@ -511,12 +510,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					   "SSI Signal: %u dB", db);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DBM_ANTNOISE:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    dbm = (gint8) tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_int_format(radiotap_tree,
-@@ -525,12 +523,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					  "SSI Noise: %d dBm", dbm);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DB_ANTNOISE:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    db = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_uint_format(radiotap_tree,
-@@ -539,34 +536,31 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					   "SSI Noise: %u dB", db);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_ANTENNA:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_uint(radiotap_tree, hf_radiotap_antenna,
- 				   tvb, offset, 1, tvb_get_guint8(tvb, offset));
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DBM_TX_POWER:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_int(radiotap_tree, hf_radiotap_txpower,
- 				   tvb, offset, 1, tvb_get_guint8(tvb, offset));
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_CHANNEL:
--	    if (length < 4)
-+	    if (length_remaining < 4)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		freq = tvb_get_letohs(tvb, offset);
- 		flags = tvb_get_letohs(tvb, offset+2);
-@@ -577,31 +571,29 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 			tvb, offset+2, 2, flags);
- 	    }
- 	    offset+=4;
--	    length-=4;
-+	    length_remaining-=4;
- 	    break;
- 	case IEEE80211_RADIOTAP_FHSS:
- 	case IEEE80211_RADIOTAP_LOCK_QUALITY:
- 	case IEEE80211_RADIOTAP_TX_ATTENUATION:
- 	case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
--	    if (length < 2)
-+	    if (length_remaining < 2)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- #if 0
- 	    tvb_get_letohs(tvb, offset);
- #endif
- 	    offset+=2;
--	    length-=2;
-+	    length_remaining-=2;
- 	    break;
- 	case IEEE80211_RADIOTAP_TSFT:
--	    if (length < 8)
-+	    if (length_remaining < 8)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_uint64(radiotap_tree, hf_radiotap_mactime,
- 				tvb, offset, 8, tvb_get_letoh64(tvb, offset));
- 	    }
- 	    offset+=8;
--	    length-=8;
-+	    length_remaining-=8;
- 	    break;
- 	default:
- 	    /*