Menu
▾
▴
[Libmage-cvs] SF.net SVN: libmage:[416] gentoo-portage-overlay/trunk
|
From: <za...@us...> - 2008-07-23 12:57:26
|
Revision: 416
http://libmage.svn.sourceforge.net/libmage/?rev=416&view=rev
Author: zaufi
Date: 2008-07-23 12:57:22 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
cleanup
Modified Paths:
--------------
gentoo-portage-overlay/trunk/net-analyzer/wireshark/Manifest
gentoo-portage-overlay/trunk/net-analyzer/wireshark/wireshark-9999.ebuild
Removed Paths:
-------------
gentoo-portage-overlay/trunk/dev-libs/
gentoo-portage-overlay/trunk/dev-util/
gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-rate-response-packet-fix.patch
gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-ssi-server-ack-decode.patch
gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-ssi-snacs-05-0f-14-15-enh-dissectors.patch
gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch
gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch
gentoo-portage-overlay/trunk/net-analyzer/wireshark/wireshark-1.0.0.ebuild
Modified: gentoo-portage-overlay/trunk/net-analyzer/wireshark/Manifest
===================================================================
--- gentoo-portage-overlay/trunk/net-analyzer/wireshark/Manifest 2008-07-23 12:43:49 UTC (rev 415)
+++ gentoo-portage-overlay/trunk/net-analyzer/wireshark/Manifest 2008-07-23 12:57:22 UTC (rev 416)
@@ -1,9 +1,2 @@
-AUX aim-rate-response-packet-fix.patch 5152 RMD160 d1543b3791a09e59c6e2b339d5f1d0b76f0f12eb SHA1 dcd118a7b819655eb70b26c0053f4051c616f509 SHA256 b7ce401cdad97315dfdbe651e7f71baf780f30b1cd196f81bf66ee78fc2f5192
-AUX aim-ssi-server-ack-decode.patch 5146 RMD160 5f36eb8da6912bfc9c165f9598c87b2882b2547f SHA1 642086f286e531a929dcd59aecafc87901a58b25 SHA256 76b85b766dbbb403fa878f522c51f025a7632c2680e5ecdbe3678765b15c7423
-AUX aim-ssi-snacs-05-0f-14-15-enh-dissectors.patch 4981 RMD160 e613436ec346dbb827b33db98ebede1c0ad003dc SHA1 af46d7f97e02ffbe6c45d4652c2a64f88e521676 SHA256 87b76fdfae1aa03ebe249806b55f7aa7d3641b566a7d86a88542a3fd45b67d45
-AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
-AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9
AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
-DIST wireshark-1.0.0.tar.bz2 13413951 RMD160 12016f80d30954bdc89163958e7d007543b3327e SHA1 4f53f526359a072665812deca980999bd26e6ab0 SHA256 b54713e146a7277cf05f309d3c706884b0e0ef5a7794e48a4251c4e17acd9fd0
-EBUILD wireshark-1.0.0.ebuild 5123 RMD160 446db46aff162e24f6446ad66b7eb36e84da270c SHA1 7f57da9a03dd5fdb460a8961df9a736ec1645a04 SHA256 b09499709b1e0a449e90c3f8ddfdc4215ef0c79a5b6560619f04d53114221cd1
-EBUILD wireshark-9999.ebuild 5393 RMD160 2c557e70663afdce8eb717fa547140b604d2f26f SHA1 85db56bbc959edb8ccdbb2ad700c74174ae24b05 SHA256 765ee8c3a5c3579db56cb29c407271865fb1bbeb7bd5b8a3976f46fe55701bc9
+EBUILD wireshark-9999.ebuild 5470 RMD160 0dfa2394dc365c2850dd9301429db75a5754fb85 SHA1 cd938fedf2a15a60a45db459e5a7ad9be2ee646f SHA256 50103cab31adea57cfb1d49b74c430d2de70dd43c6a94d4c289d989811b1bbf6
Deleted: gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-rate-response-packet-fix.patch
===================================================================
--- gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-rate-response-packet-fix.patch 2008-07-23 12:43:49 UTC (rev 415)
+++ gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-rate-response-packet-fix.patch 2008-07-23 12:57:22 UTC (rev 416)
@@ -1,85 +0,0 @@
---- packet-aim-generic.c.original 2008-05-22 23:58:08.000000000 +0400
-+++ packet-aim-generic.c 2008-05-22 23:59:03.000000000 +0400
-@@ -150,41 +150,40 @@
- static gint ett_generic_rateinfo_groups = -1;
- static gint ett_generic_rateinfo_group = -1;
-
--static int dissect_rate_class(tvbuff_t *tvb, packet_info *pinfo _U_, int offset,
-- proto_tree *class_tree)
-+static int dissect_rate_class(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *class_tree)
- {
- proto_tree_add_uint(class_tree, hf_generic_rateinfo_classid, tvb, offset, 2, tvb_get_ntohs(tvb, offset));offset+=2;
-- proto_tree_add_uint(class_tree, hf_generic_rateinfo_windowsize, tvb, offset, 4, tvb_get_ntoh24(tvb, offset));offset+=4;
-- proto_tree_add_uint(class_tree, hf_generic_rateinfo_clearlevel, tvb, offset, 4, tvb_get_ntoh24(tvb, offset));offset+=4;
-- proto_tree_add_uint(class_tree, hf_generic_rateinfo_alertlevel, tvb, offset, 4, tvb_get_ntoh24(tvb, offset));offset+=4;
-- proto_tree_add_uint(class_tree, hf_generic_rateinfo_limitlevel, tvb, offset, 4, tvb_get_ntoh24(tvb, offset));offset+=4;
-- proto_tree_add_uint(class_tree, hf_generic_rateinfo_disconnectlevel, tvb, offset, 4, tvb_get_ntoh24(tvb, offset));offset+=4;
-- proto_tree_add_uint(class_tree, hf_generic_rateinfo_currentlevel, tvb, offset, 4, tvb_get_ntoh24(tvb, offset));offset+=4;
-- proto_tree_add_uint(class_tree, hf_generic_rateinfo_maxlevel, tvb, offset, 4, tvb_get_ntoh24(tvb, offset));offset+=4;
-- proto_tree_add_uint(class_tree, hf_generic_rateinfo_lasttime, tvb, offset, 4, tvb_get_ntoh24(tvb, offset));offset+=4;
-+ proto_tree_add_uint(class_tree, hf_generic_rateinfo_windowsize, tvb, offset, 4, tvb_get_ntohl(tvb, offset));offset+=4;
-+ proto_tree_add_uint(class_tree, hf_generic_rateinfo_clearlevel, tvb, offset, 4, tvb_get_ntohl(tvb, offset));offset+=4;
-+ proto_tree_add_uint(class_tree, hf_generic_rateinfo_alertlevel, tvb, offset, 4, tvb_get_ntohl(tvb, offset));offset+=4;
-+ proto_tree_add_uint(class_tree, hf_generic_rateinfo_limitlevel, tvb, offset, 4, tvb_get_ntohl(tvb, offset));offset+=4;
-+ proto_tree_add_uint(class_tree, hf_generic_rateinfo_disconnectlevel, tvb, offset, 4, tvb_get_ntohl(tvb, offset));offset+=4;
-+ proto_tree_add_uint(class_tree, hf_generic_rateinfo_currentlevel, tvb, offset, 4, tvb_get_ntohl(tvb, offset));offset+=4;
-+ proto_tree_add_uint(class_tree, hf_generic_rateinfo_maxlevel, tvb, offset, 4, tvb_get_ntohl(tvb, offset));offset+=4;
-+ proto_tree_add_uint(class_tree, hf_generic_rateinfo_lasttime, tvb, offset, 4, tvb_get_ntohl(tvb, offset));offset+=4;
- proto_tree_add_uint(class_tree, hf_generic_rateinfo_curstate, tvb, offset, 1, tvb_get_guint8(tvb, offset));offset+=1;
- return offset;
- }
-
--static int dissect_generic_rateinfo(tvbuff_t *tvb, packet_info *pinfo _U_,
-- proto_tree *tree)
-+static int dissect_generic_rateinfo(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
- {
- int offset = 0;
- guint16 i;
- proto_item *ti;
-- guint16 numclasses = tvb_get_ntohs(tvb, 0);
-+ guint16 numclasses = tvb_get_ntohs(tvb, 0);
- proto_tree *classes_tree = NULL, *groups_tree, *group_tree;
- proto_tree_add_uint(tree, hf_generic_rateinfo_numclasses, tvb, 0, 2, numclasses );
- offset+=2;
-
- if(tree) {
-- ti = proto_tree_add_text(tree, tvb, offset, 33*numclasses, "Available Rate Classes");
-+ /* sizeof(rate_class_struct) = 35 ! */
-+ ti = proto_tree_add_text(tree, tvb, offset, 35 * numclasses, "Available Rate Classes");
- classes_tree = proto_item_add_subtree(ti, ett_generic_rateinfo_classes);
- }
-
- for(i = 0; i < numclasses; i++) {
-- guint16 myid = tvb_get_ntohs(tvb, offset);
-- proto_item *ti = proto_tree_add_text(classes_tree, tvb, offset, 33,"Rate Class 0x%02x", myid);
-+ guint16 myid = tvb_get_ntohs(tvb, offset);
-+ proto_item *ti = proto_tree_add_text(classes_tree, tvb, offset, 35, "Rate Class 0x%02x", myid);
- proto_tree *class_tree = proto_item_add_subtree(ti, ett_generic_rateinfo_class);
- offset = dissect_rate_class(tvb, pinfo, offset, class_tree);
- }
-@@ -193,17 +192,19 @@
- groups_tree = proto_item_add_subtree(ti, ett_generic_rateinfo_groups);
-
- for(i = 0; i < numclasses; i++) {
-- guint16 myid = tvb_get_ntohs(tvb, offset);
- guint16 j;
-- guint16 numpairs;
--
-- proto_item *ti = proto_tree_add_text(groups_tree, tvb, offset, 33,"Rate Group 0x%02x", myid);
-+ guint16 myid = tvb_get_ntohs(tvb, offset);
-+ guint16 numpairs = tvb_get_ntohs(tvb, offset + 2);
-+ /*
-+ * sizeof(rate_group) = sizeof(class_id) + sizeof(numpairs) + numpairs * 2 * sizeof(uint16_t)
-+ * = 2 + 2 + numpairs * 4
-+ */
-+ proto_item *ti = proto_tree_add_text(groups_tree, tvb, offset, 4 + 4 * numpairs, "Rate Group 0x%02x", myid);
- group_tree = proto_item_add_subtree(ti, ett_generic_rateinfo_group);
- proto_tree_add_uint(group_tree, hf_generic_rateinfo_classid, tvb, offset, 2, myid);offset+=2;
-- numpairs = tvb_get_ntohs(tvb, offset);
- proto_tree_add_uint(group_tree, hf_generic_rateinfo_numpairs, tvb, offset, 2, numpairs); offset+=2;
- for(j = 0; j < numpairs; j++) {
-- guint16 family_id;
-+ guint16 family_id;
- guint16 subtype_id;
- const aim_family *family;
- const aim_subtype *subtype;
Deleted: gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-ssi-server-ack-decode.patch
===================================================================
--- gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-ssi-server-ack-decode.patch 2008-07-23 12:43:49 UTC (rev 415)
+++ gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-ssi-server-ack-decode.patch 2008-07-23 12:57:22 UTC (rev 416)
@@ -1,114 +0,0 @@
-diff --recursive -bu wireshark-1.0.0-original/epan/dissectors/packet-aim.c wireshark-1.0.0/epan/dissectors/packet-aim.c
---- wireshark-1.0.0-original/epan/dissectors/packet-aim.c 2008-03-29 20:26:32.000000000 +0300
-+++ wireshark-1.0.0/epan/dissectors/packet-aim.c 2008-05-23 12:02:08.000000000 +0400
-@@ -328,6 +328,40 @@
- { 0, NULL, NULL }
- };
-
-+#define SSI_OP_RESULT_SUCCESS 0
-+#define SSI_OP_RESULT_DB_ERROR 1
-+#define SSI_OP_RESULT_NOT_FOUND 2
-+#define SSI_OP_RESULT_ALREADY_EXISTS 3
-+#define SSI_OP_RESULT_UNAVAILABLE 5
-+#define SSI_OP_RESULT_BAD_REQUEST 10
-+#define SSI_OP_RESULT_DB_TIME_OUT 11
-+#define SSI_OP_RESULT_OVER_ROW_LIMIT 12
-+#define SSI_OP_RESULT_NOT_EXECUTED 13
-+#define SSI_OP_RESULT_AUTH_REQUIRED 14
-+#define SSI_OP_RESULT_BAD_LOGINID 16
-+#define SSI_OP_RESULT_OVER_BUDDY_LIMIT 17
-+#define SSI_OP_RESULT_INSERT_SMART_GROUP 20
-+#define SSI_OP_RESULT_TIMEOUT 26
-+
-+static const value_string aim_ssi_result_codes[] = {
-+ { SSI_OP_RESULT_SUCCESS, "Success" },
-+ { SSI_OP_RESULT_DB_ERROR, "Some kind of database error" },
-+ { SSI_OP_RESULT_NOT_FOUND, "Item was not found for an update or delete" },
-+ { SSI_OP_RESULT_ALREADY_EXISTS, "Item already exists for an insert" },
-+ { SSI_OP_RESULT_UNAVAILABLE, "Server or database is not available" },
-+ { SSI_OP_RESULT_BAD_REQUEST, "Request was not formed well" },
-+ { SSI_OP_RESULT_DB_TIME_OUT, "Database timed out" },
-+ { SSI_OP_RESULT_OVER_ROW_LIMIT, "Too many items of this class for an insert" },
-+ { SSI_OP_RESULT_NOT_EXECUTED, "Not executed due to other error in same request" },
-+ { SSI_OP_RESULT_AUTH_REQUIRED, "Buddy List authorization required" },
-+ { SSI_OP_RESULT_BAD_LOGINID, "Bad loginId" },
-+ { SSI_OP_RESULT_OVER_BUDDY_LIMIT, "Too many buddies" },
-+ { SSI_OP_RESULT_INSERT_SMART_GROUP, "Attempt to added a Buddy to a smart group" },
-+ { SSI_OP_RESULT_TIMEOUT, "General timeout" },
-+ { 0, NULL }
-+};
-+
-+
- static int dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
- static guint get_aim_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset);
- static void dissect_aim_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-@@ -366,6 +400,7 @@
- static int hf_aim_buddyname = -1;
- static int hf_aim_userinfo_warninglevel = -1;
- static int hf_aim_snac_error = -1;
-+static int hf_aim_ssi_result_code = -1;
- static int hf_aim_tlvcount = -1;
- static int hf_aim_version = -1;
- static int hf_aim_userclass_unconfirmed = -1;
-@@ -678,6 +713,22 @@
- return dissect_aim_tlv_sequence(tvb, pinfo, 2, aim_tree, client_tlvs);
- }
-
-+int dissect_aim_ssi_result(tvbuff_t *tvb, packet_info *pinfo,
-+ proto_tree *aim_tree)
-+{
-+ const char *name;
-+
-+ if ((name = match_strval(tvb_get_ntohs(tvb, 0), aim_ssi_result_codes)) != NULL) {
-+ if (check_col(pinfo->cinfo, COL_INFO))
-+ col_add_str(pinfo->cinfo, COL_INFO, name);
-+ }
-+
-+ proto_tree_add_item (aim_tree, hf_aim_ssi_result_code,
-+ tvb, 0, 2, FALSE);
-+
-+ return 2;
-+}
-+
- int dissect_aim_userinfo(tvbuff_t *tvb, packet_info *pinfo,
- int offset, proto_tree *tree)
- {
-@@ -1470,7 +1521,10 @@
- { &hf_aim_dcinfo_unknown,
- { "Unknown", "aim.dcinfo.unknown", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
- },
--
-+ { &hf_aim_ssi_result_code,
-+ { "Last SSI operation result code", "aim.ssi.code", FT_UINT16,
-+ BASE_HEX, VALS(aim_ssi_result_codes), 0x0, "", HFILL },
-+ },
- };
-
- /* Setup protocol subtree array */
-diff --recursive -bu wireshark-1.0.0-original/epan/dissectors/packet-aim.h wireshark-1.0.0/epan/dissectors/packet-aim.h
---- wireshark-1.0.0-original/epan/dissectors/packet-aim.h 2008-03-29 20:26:32.000000000 +0300
-+++ wireshark-1.0.0/epan/dissectors/packet-aim.h 2008-05-23 12:02:38.000000000 +0400
-@@ -64,8 +64,9 @@
- int aim_get_buddyname( guchar *name, tvbuff_t *tvb, int len_offset, int name_offset);
- int dissect_aim_userinfo(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree);
-
--int dissect_aim_snac_error(tvbuff_t *tvb, packet_info *pinfo,
-- proto_tree *aim_tree);
-+int dissect_aim_snac_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aim_tree);
-+
-+int dissect_aim_ssi_result(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aim_tree);
-
- int dissect_aim_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *tree, const aim_tlv *);
- int dissect_aim_tlv_list(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *tree, const aim_tlv *);
-diff --recursive -bu wireshark-1.0.0-original/epan/dissectors/packet-aim-ssi.c wireshark-1.0.0/epan/dissectors/packet-aim-ssi.c
---- wireshark-1.0.0-original/epan/dissectors/packet-aim-ssi.c 2008-03-29 20:26:31.000000000 +0300
-+++ wireshark-1.0.0/epan/dissectors/packet-aim-ssi.c 2008-05-23 00:29:36.000000000 +0400
-@@ -194,7 +194,7 @@
- { 0x0008, "Add Buddy", dissect_ssi_ssi_item },
- { 0x0009, "Modify Buddy", dissect_ssi_ssi_item },
- { 0x000a, "Delete Buddy", dissect_ssi_ssi_item },
-- { 0x000e, "Server Ack", NULL },
-+ { 0x000e, "Server Ack", dissect_aim_ssi_result },
- { 0x000f, "No List", NULL },
- { 0x0011, "Edit Start", NULL },
- { 0x0012, "Edit Stop", NULL },
Deleted: gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-ssi-snacs-05-0f-14-15-enh-dissectors.patch
===================================================================
--- gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-ssi-snacs-05-0f-14-15-enh-dissectors.patch 2008-07-23 12:43:49 UTC (rev 415)
+++ gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/aim-ssi-snacs-05-0f-14-15-enh-dissectors.patch 2008-07-23 12:57:22 UTC (rev 416)
@@ -1,128 +0,0 @@
-Index: epan/dissectors/packet-aim-ssi.c
-===================================================================
---- epan/dissectors/packet-aim-ssi.c (revision 25375)
-+++ epan/dissectors/packet-aim-ssi.c (working copy)
-@@ -75,12 +75,16 @@
- static int hf_aim_fnac_subtype_ssi_numitems = -1;
- static int hf_aim_fnac_subtype_ssi_last_change_time = -1;
- static int hf_aim_fnac_subtype_ssi_buddyname_len = -1;
-+static int hf_aim_fnac_subtype_ssi_buddyname_len8 = -1;
- static int hf_aim_fnac_subtype_ssi_buddyname = -1;
- static int hf_aim_fnac_subtype_ssi_gid = -1;
- static int hf_aim_fnac_subtype_ssi_bid = -1;
- static int hf_aim_fnac_subtype_ssi_type = -1;
- static int hf_aim_fnac_subtype_ssi_tlvlen = -1;
- static int hf_aim_fnac_subtype_ssi_data = -1;
-+static int hf_aim_fnac_subtype_ssi_reason_str_len = -1;
-+static int hf_aim_fnac_subtype_ssi_reason_str = -1;
-+static int hf_aim_fnac_subtype_ssi_grant_ft_auth_unkn = -1;
-
- /* Initialize the subtree pointers */
- static gint ett_aim_ssi = -1;
-@@ -154,9 +158,24 @@
- return dissect_aim_buddyname(tvb, pinfo, 0, ssi_tree);
- }
-
--static int dissect_aim_snac_ssi_list(tvbuff_t *tvb, packet_info *pinfo _U_,
-- proto_tree *tree)
-
-+static int dissect_aim_snac_ssi_time_and_items_num(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
-+{
-+ int offset = 0;
-+
-+ /* get timestamp */
-+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_last_change_time, tvb, offset, 4, FALSE);
-+ offset += 4;
-+
-+ /* get number of SSI items */
-+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_numitems, tvb, offset, 2, FALSE);
-+ offset += 2;
-+
-+ return offset;
-+}
-+
-+
-+static int dissect_aim_snac_ssi_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
- {
- int offset = 0;
- proto_item *ti;
-@@ -183,23 +202,56 @@
- return offset;
- }
-
-+static int dissect_aim_snac_ssi_future_auth(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
-+{
-+ int offset = 0;
-+ guint16 reason_length;
-+ guint16 unknown;
-+
-+ /* get buddy length (1 byte) */
-+ guint8 buddyname_length = tvb_get_guint8(tvb, offset);
-+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_buddyname_len8, tvb, offset, 1, FALSE);
-+ offset += 1;
-+ /* show buddy name */
-+ if (buddyname_length > 0) {
-+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, FALSE);
-+ offset += buddyname_length;
-+ }
-+
-+ /* get reason message length (2 bytes) */
-+ reason_length = tvb_get_ntohs(tvb, offset);
-+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_reason_str_len, tvb, offset, 2, FALSE);
-+ offset += 2;
-+ /* show reason message if present */
-+ if (reason_length > 0) {
-+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_reason_str, tvb, offset, reason_length, FALSE);
-+ offset += reason_length;
-+ }
-+ /* unknown (always 0x0000 ???) */
-+ unknown = tvb_get_ntohs(tvb, offset);
-+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_grant_ft_auth_unkn, tvb, offset, 2, FALSE);
-+ offset += 2;
-+
-+ return offset;
-+}
-+
- static const aim_subtype aim_fnac_family_ssi[] = {
- { 0x0001, "Error", dissect_aim_snac_error },
- { 0x0002, "Request Rights", NULL },
- { 0x0003, "Rights Info", dissect_aim_ssi_rightsinfo },
- { 0x0004, "Request List (first time)", NULL },
-- { 0x0005, "Request List", NULL },
-+ { 0x0005, "Request List", dissect_aim_snac_ssi_time_and_items_num },
- { 0x0006, "List", dissect_aim_snac_ssi_list },
- { 0x0007, "Activate", NULL },
- { 0x0008, "Add Buddy", dissect_ssi_ssi_item },
- { 0x0009, "Modify Buddy", dissect_ssi_ssi_item },
- { 0x000a, "Delete Buddy", dissect_ssi_ssi_item },
- { 0x000e, "Server Ack", dissect_aim_ssi_result },
-- { 0x000f, "No List", NULL },
-+ { 0x000f, "No List", dissect_aim_snac_ssi_time_and_items_num },
- { 0x0011, "Edit Start", NULL },
- { 0x0012, "Edit Stop", NULL },
-- { 0x0014, "Grant Future Authorization to Buddy", NULL },
-- { 0x0015, "Future Authorization Granted", NULL },
-+ { 0x0014, "Grant Future Authorization to Buddy", dissect_aim_snac_ssi_future_auth },
-+ { 0x0015, "Future Authorization Granted", dissect_aim_snac_ssi_future_auth },
- { 0x0018, "Send Authentication Request", NULL },
- { 0x0019, "Authentication Request", NULL },
- { 0x001a, "Send Authentication Reply", NULL },
-@@ -246,6 +298,18 @@
- { &hf_aim_fnac_subtype_ssi_data,
- { "SSI Buddy Data", "aim_ssi.fnac.data", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
- },
-+ { &hf_aim_fnac_subtype_ssi_buddyname_len8,
-+ { "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len8", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
-+ },
-+ { &hf_aim_fnac_subtype_ssi_reason_str_len,
-+ { "Reason Message length", "aim_ssi.fnac.reason_len", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
-+ },
-+ { &hf_aim_fnac_subtype_ssi_reason_str,
-+ { "Reason Message", "aim_ssi.fnac.reason", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
-+ },
-+ { &hf_aim_fnac_subtype_ssi_grant_ft_auth_unkn,
-+ { "Unknown", "aim_ssi.fnac.grant_ft_auth_unkn", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
-+ },
- };
-
- /* Setup protocol subtree array */
Deleted: gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch
===================================================================
--- gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch 2008-07-23 12:43:49 UTC (rev 415)
+++ gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch 2008-07-23 12:57:22 UTC (rev 416)
@@ -1,10 +0,0 @@
---- ./epan/dissectors/Makefile.am.orig 2007-12-11 16:38:03.000000000 +0300
-+++ ./epan/dissectors/Makefile.am 2007-12-11 16:38:37.000000000 +0300
-@@ -32,6 +32,7 @@
-
- libasndissectors_la_SOURCES = \
- $(ASN_DISSECTOR_SRC)
-+libasndissectors_la_LIBADD = ../../wiretap/libwiretap.la
-
- libpidldissectors_la_SOURCES = \
- $(PIDL_DISSECTOR_SRC)
Deleted: gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch
===================================================================
--- gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch 2008-07-23 12:43:49 UTC (rev 415)
+++ gentoo-portage-overlay/trunk/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch 2008-07-23 12:57:22 UTC (rev 416)
@@ -1,11 +0,0 @@
---- wiretap/Makefile.am.orig 2008-02-21 23:11:41.000000000 +0300
-+++ wiretap/Makefile.am 2008-02-21 23:12:08.000000000 +0300
-@@ -67,7 +67,7 @@
- $(GENERATOR_FILES) \
- $(GENERATED_FILES)
-
--libwiretap_la_LIBADD = libwiretap_generated.la
-+libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS)
- libwiretap_la_DEPENDENCIES = libwiretap_generated.la
-
- RUNLEX = $(top_srcdir)/tools/runlex.sh
Deleted: gentoo-portage-overlay/trunk/net-analyzer/wireshark/wireshark-1.0.0.ebuild
===================================================================
--- gentoo-portage-overlay/trunk/net-analyzer/wireshark/wireshark-1.0.0.ebuild 2008-07-23 12:43:49 UTC (rev 415)
+++ gentoo-portage-overlay/trunk/net-analyzer/wireshark/wireshark-1.0.0.ebuild 2008-07-23 12:57:22 UTC (rev 416)
@@ -1,170 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.0.ebuild,v 1.9 2008/04/10 05:54:31 pva Exp $
-
-EAPI=1
-WANT_AUTOMAKE="1.9"
-inherit autotools libtool flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-
-# _rc versions has different download location.
-[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && {
-SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz";
-S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \
-SRC_URI="http://www.wireshark.org/download/src/all-versions/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="adns gtk ipv6 lua portaudio gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
-
-RDEPEND="zlib? ( sys-libs/zlib )
- smi? ( net-libs/libsmi )
- gtk? ( >=dev-libs/glib-2.0.4
- =x11-libs/gtk+-2*
- x11-libs/pango
- dev-libs/atk )
- !gtk? ( =dev-libs/glib-1.2* )
- gnutls? ( net-libs/gnutls )
- gcrypt? ( dev-libs/libgcrypt )
- pcap? ( net-libs/libpcap )
- pcre? ( dev-libs/libpcre )
- caps? ( sys-libs/libcap )
- adns? ( net-libs/adns )
- kerberos? ( virtual/krb5 )
- portaudio? ( media-libs/portaudio )
- lua? ( >=dev-lang/lua-5.1 )
- selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.15.0
- dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- sys-apps/sed"
-
-pkg_setup() {
- if ! use gtk; then
- ewarn "USE=-gtk will mean no gui called wireshark will be created and"
- ewarn "only command line utils are available"
- fi
-
- # Add group for users allowed to sniff.
- enewgroup wireshark || die "Failed to create wireshark group"
-}
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch
- epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch
- epatch "${FILESDIR}"/aim-ssi-server-ack-decode.patch
- epatch "${FILESDIR}"/aim-ssi-snacs-05-0f-14-15-enh-dissectors.patch
-
- cd "${S}"/epan
- epatch "${FILESDIR}"/wireshark-except-double-free.diff
- cd "${S}"/epan/dissectors
- epatch "${FILESDIR}"/aim-rate-response-packet-fix.patch
-
- cd "${S}"
- AT_M4DIR="${S}/aclocal-fallback"
- eautoreconf
-}
-
-src_compile() {
- # optimization bug, see bug #165340, bug #40660
- if [[ $(gcc-version) == 3.4 ]] ; then
- elog "Found gcc 3.4, forcing -O3 into CFLAGS"
- replace-flags -O? -O3
- elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then
- elog "Found <=gcc-3.3, forcing -O into CFLAGS"
- replace-flags -O? -O
- fi
-
- # see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
- # our hardened toolchain bug
- filter-flags -fstack-protector
-
- # profile and -fomit-frame-pointer are incompatible, bug #215806
- use profile && filter-flags -fomit-frame-pointer
-
- local myconf
- if use gtk; then
- einfo "Building with gtk support"
- else
- einfo "Building without gtk support"
- myconf="${myconf} --disable-wireshark"
- fi
-
- # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
- # --with-ssl to ./configure. (Mimics code from acinclude.m4).
- if use kerberos; then
- case `krb5-config --libs` in
- *-lcrypto*) myconf="${myconf} --with-ssl" ;;
- esac
- fi
-
- # dumpcap requires libcap, setuid-install requires dumpcap
- econf $(use_enable gtk gtk2) \
- $(use_enable profile profile-build) \
- $(use_with gnutls) \
- $(use_with gcrypt) \
- $(use_enable gtk wireshark) \
- $(use_enable ipv6) \
- $(use_enable threads) \
- $(use_with lua) \
- $(use_with adns) \
- $(use_with kerberos krb5) \
- $(use_with smi libsmi) \
- $(use_with pcap) \
- $(use_with zlib) \
- $(use_with pcre) \
- $(use_with portaudio) \
- $(use_with caps libcap) \
- $(use_enable pcap setuid-install) \
- --sysconfdir=/etc/wireshark \
- ${myconf} || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- fowners 0:wireshark /usr/bin/tshark
- fperms 6550 /usr/bin/tshark
- use pcap && fowners 0:wireshark /usr/bin/dumpcap
- use pcap && fperms 6550 /usr/bin/dumpcap
-
- insinto /usr/include/wiretap
- doins wiretap/wtap.h
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README{,bsd,linux,macos,vmware} doc/randpkt.txt
-
- if use gtk ; then
- insinto /usr/share/icons/hicolor/16x16/apps
- newins image/hi16-app-wireshark.png wireshark.png
- insinto /usr/share/icons/hicolor/32x32/apps
- newins image/hi32-app-wireshark.png wireshark.png
- insinto /usr/share/icons/hicolor/48x48/apps
- newins image/hi48-app-wireshark.png wireshark.png
- insinto /usr/share/applications
- doins wireshark.desktop
- fi
-}
-
-pkg_postinst() {
- echo
- ewarn "With version 0.99.7, all function calls that require elevated privileges"
- ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE"
- ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT."
- ewarn
- ewarn "NOTE: To run wireshark as normal user you have to add yourself into"
- ewarn "wireshark group. This security measure ensures that only trusted"
- ewarn "users allowed to sniff your traffic."
- echo
-}
Modified: gentoo-portage-overlay/trunk/net-analyzer/wireshark/wireshark-9999.ebuild
===================================================================
--- gentoo-portage-overlay/trunk/net-analyzer/wireshark/wireshark-9999.ebuild 2008-07-23 12:43:49 UTC (rev 415)
+++ gentoo-portage-overlay/trunk/net-analyzer/wireshark/wireshark-9999.ebuild 2008-07-23 12:57:22 UTC (rev 416)
@@ -56,6 +56,9 @@
src_unpack() {
subversion_src_unpack
+
+ cd ${S}/epan
+ epatch "${FILESDIR}"/wireshark-except-double-free.diff
}
src_compile() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
