rpms/ethereal/devel .cvsignore, 1.23, 1.24 ethereal-0.10.11-cleanup.patch, 1.1, 1.2 ethereal.spec, 1.39, 1.40 sources, 1.25, 1.26
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 27 15:25:21 UTC 2005
Author: jnovy
Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15393
Modified Files:
.cvsignore ethereal-0.10.11-cleanup.patch ethereal.spec
sources
Log Message:
- update to 0.10.12
- sync with cleanup patch (most of it applied upstream)
- the new release fixes CAN-2005-2361 up to CAN-2005-2367
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 27 Apr 2005 09:23:01 -0000 1.23
+++ .cvsignore 27 Jul 2005 15:25:19 -0000 1.24
@@ -1 +1,2 @@
ethereal-0.10.11.tar.bz2
+ethereal-0.10.12.tar.bz2
ethereal-0.10.11-cleanup.patch:
packet-bacapp.c | 2 +-
packet-lpd.c | 2 +-
packet-ncp2222.inc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: ethereal-0.10.11-cleanup.patch
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal-0.10.11-cleanup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ethereal-0.10.11-cleanup.patch 31 May 2005 09:07:44 -0000 1.1
+++ ethereal-0.10.11-cleanup.patch 27 Jul 2005 15:25:19 -0000 1.2
@@ -1,52 +1,6 @@
---- ethereal-0.10.11/tools/lemon/lemon.c.cleanup 2005-05-02 23:27:34.000000000 +0200
-+++ ethereal-0.10.11/tools/lemon/lemon.c 2005-05-30 15:41:26.000000000 +0200
-@@ -2628,8 +2628,8 @@
- (*lineno)++;
- iStart = 0;
- if( name ){
-- for(i=0; line[i]; i++){
-- if( line[i]=='P' && strncmp(&line[i],"Parse",5)==0
-+ for(i=0; line[i] && i<LINESIZE; i++){
-+ if( line[i]=='P' && i<(LINESIZE-5) && strncmp(&line[i],"Parse",5)==0
- && (i==0 || !safe_isalpha(line[i-1]))
- ){
- if( i>iStart ) fprintf(out,"%.*s",i-iStart,&line[iStart]);
---- ethereal-0.10.11/epan/column.c.cleanup 2005-05-02 23:28:50.000000000 +0200
-+++ ethereal-0.10.11/epan/column.c 2005-05-30 15:41:26.000000000 +0200
-@@ -55,7 +55,7 @@
- "%i", "%L", "%B", "%XO", "%XR", "%I", "%c", "%Xs",
- "%Xd", "%V", "%x", "%e", "%H", "%P" };
-
-- if (fmt < 0 || fmt > NUM_COL_FMTS)
-+ if (fmt < 0 || fmt >= NUM_COL_FMTS)
- return NULL;
-
- return(slist[fmt]);
---- ethereal-0.10.11/epan/prefs.c.cleanup 2005-05-30 15:41:26.000000000 +0200
-+++ ethereal-0.10.11/epan/prefs.c 2005-05-30 15:41:26.000000000 +0200
-@@ -1270,7 +1270,7 @@
- if (var_len > 0) {
- if (got_val) {
- cur_var[var_len] = '\0';
-- cur_val[val_len] = '\0';
-+ cur_val[val_len<MAX_VAL_LEN ? val_len : MAX_VAL_LEN-1] = '\0';
- switch (pref_set_pair_fct(cur_var, cur_val)) {
-
- case PREFS_SET_SYNTAX_ERR:
---- ethereal-0.10.11/epan/stats_tree.c.cleanup 2005-05-02 23:28:50.000000000 +0200
-+++ ethereal-0.10.11/epan/stats_tree.c 2005-05-30 15:41:26.000000000 +0200
-@@ -281,7 +281,7 @@
-
- st->names = g_hash_table_new(g_str_hash,g_str_equal);
- st->parents = g_ptr_array_new();
-- st->filter = filter;
-+ st->filter = g_strdup(filter);
-
- st->start = -1.0;
- st->elapsed = 0.0;
---- ethereal-0.10.11/epan/dissectors/packet-ncp2222.inc.cleanup 2005-05-02 23:28:48.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-ncp2222.inc 2005-05-30 15:41:26.000000000 +0200
-@@ -4254,7 +4254,7 @@
+--- ethereal-0.10.12/epan/dissectors/packet-ncp2222.inc.cleanup 2005-07-26 21:26:42.000000000 +0200
++++ ethereal-0.10.12/epan/dissectors/packet-ncp2222.inc 2005-07-27 15:56:00.313016416 +0200
+@@ -4257,7 +4257,7 @@ nds_defrag(tvbuff_t *tvb, packet_info *p
if (request_value->nds_frag || (request_value->nds_end_frag == pinfo->fd->num))
{
/* Check to see of this is a fragment. If so then mark as a fragment. */
@@ -55,243 +9,20 @@
request_value->nds_frag = FALSE;
/* nds_length of 0 means start of fragment */
frags[frag_count].nds_length = 0;
-@@ -4322,7 +4322,7 @@
- {
- break;
- }
-- }
-+ }// FIXME: what if i==100?
- if (frags[i].nds_frag == 0xffffffff)
- {
- /* Error can't find fragment */
---- ethereal-0.10.11/epan/dissectors/packet-dcom-cba-acco.c.cleanup 2005-05-02 23:28:45.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-dcom-cba-acco.c 2005-05-30 15:41:26.000000000 +0200
-@@ -748,7 +748,7 @@
- {
- guint8 u8FirstConnect;
- guint8 u8ProvMac[6];
-- guint32 u32ProvCRID;
-+ guint32 u32ProvCRID=0;
- guint32 u32HResult;
- guint32 u32ArraySize;
- guint32 u32Idx;
-@@ -1579,10 +1579,10 @@
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
- {
- guint32 u32Pointer;
-- guint32 u32ArraySize;
-+ guint32 u32ArraySize = 0;
- guint32 u32ConsID;
- guint16 u16ConnVersion;
-- guint32 u32HResult;
-+ guint32 u32HResult = 0;
- guint32 u32Count = 0;
- guint32 u32Idx;
- proto_item *sub_item;
---- ethereal-0.10.11/epan/dissectors/packet-per.c.cleanup 2005-05-02 23:28:46.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-per.c 2005-05-30 15:41:26.000000000 +0200
-@@ -412,7 +412,7 @@
- }
- str[char_pos]=0;
- proto_tree_add_string(tree, hf_index, tvb, (old_offset>>3), (offset>>3)-(old_offset>>3), str);
-- if (info_str != NULL) {
-+ if (info_str != NULL && info_str_len) {
- if (info_str_len<length) str[info_str_len-1] = '\0';
- strcpy(info_str, str);
- }
---- ethereal-0.10.11/epan/dissectors/packet-camel.c.cleanup 2005-05-02 23:28:49.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-camel.c 2005-05-30 15:41:26.000000000 +0200
-@@ -6387,6 +6387,7 @@
- version_ptr = strrchr(pinfo->private_data,'.');
- version_str = g_strdup(version_ptr+1);
- application_context_version = atoi(version_str);
-+ g_free(version_str);
- }
-
- camel_pdu_type = tvb_get_guint8(tvb, offset)&0x0f;
---- ethereal-0.10.11/epan/dissectors/packet-ber.c.cleanup 2005-05-02 23:28:48.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-ber.c 2005-05-30 15:41:26.000000000 +0200
-@@ -695,7 +695,7 @@
- */
- int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) {
- gint8 class;
-- gboolean pc, ind, ind_field;
-+ gboolean pc, ind=0, ind_field;
- gint32 tag;
- guint32 len;
- proto_tree *tree = parent_tree;
---- ethereal-0.10.11/epan/dissectors/packet-isl.c.cleanup 2005-05-02 23:28:47.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-isl.c 2005-05-30 15:41:26.000000000 +0200
-@@ -152,9 +152,9 @@
- guint8 type;
- volatile guint16 length;
- gint captured_length;
-- tvbuff_t *volatile payload_tvb;
-+ tvbuff_t *volatile payload_tvb = NULL;
- tvbuff_t *volatile next_tvb;
-- tvbuff_t *volatile trailer_tvb;
-+ tvbuff_t *volatile trailer_tvb = NULL;
- const char *saved_proto;
-
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
---- ethereal-0.10.11/epan/dissectors/packet-bacapp.c.cleanup 2005-05-02 23:28:46.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-bacapp.c 2005-05-30 15:41:26.000000000 +0200
-@@ -3471,7 +3471,7 @@
+--- ethereal-0.10.12/epan/dissectors/packet-bacapp.c.cleanup 2005-07-26 21:26:40.000000000 +0200
++++ ethereal-0.10.12/epan/dissectors/packet-bacapp.c 2005-07-27 15:56:03.907469976 +0200
+@@ -3846,7 +3846,7 @@ fReadPropertyAck (tvbuff_t *tvb, proto_t
guint8 tag_no, class_tag;
guint32 lvt;
proto_tree *subtree = tree;
- proto_item *tt;
+ proto_item *tt = NULL;
- while ((offset < tvb_reported_length(tvb))&&(offset>lastoffset)) { /* exit loop if nothing happens inside */
- lastoffset = offset;
---- ethereal-0.10.11/epan/dissectors/packet-isis-lsp.c.cleanup 2005-05-02 23:28:45.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-isis-lsp.c 2005-05-30 15:41:26.000000000 +0200
-@@ -560,7 +560,7 @@
-
- prefix_len=0;
-
-- while(prefix_len<=33) {
-+ while(prefix_len<33) {
- if (bitmasks[prefix_len++]==mask) {
- prefix_len--;
- break;
---- ethereal-0.10.11/epan/dissectors/packet-dcm.c.cleanup 2005-05-02 23:57:18.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-dcm.c 2005-05-30 15:41:26.000000000 +0200
-@@ -632,7 +632,10 @@
- guint8 id, *name, result;
- int reply = 0;
-
-- if (ti) dcm_tree = proto_item_add_subtree(ti, ett_assoc);
-+ if (!ti)
-+ return;
-+
-+ dcm_tree = proto_item_add_subtree(ti, ett_assoc);
- while (-1 < offset && offset < (int) dcm_data->clen) {
- guint16 len;
- guint32 mlen;
---- ethereal-0.10.11/epan/dissectors/packet-dcerpc-samr.c.cleanup 2005-05-02 23:28:47.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-dcerpc-samr.c 2005-05-30 15:41:26.000000000 +0200
-@@ -1158,17 +1158,17 @@
- if (server) {
- if (dcv->opnum == SAMR_CONNECT2)
- pol_name = g_strdup_printf("Connect2(%s)", server);
-- if (dcv->opnum == SAMR_CONNECT3)
-+ else if (dcv->opnum == SAMR_CONNECT3)
- pol_name = g_strdup_printf("Connect3(%s)", server);
-- if (dcv->opnum == SAMR_CONNECT4)
-+ else if (dcv->opnum == SAMR_CONNECT4)
- pol_name = g_strdup_printf("Connect4(%s)", server);
- }
- else {
- if (dcv->opnum == SAMR_CONNECT2)
- pol_name = g_strdup("Connect2 handle");
-- if (dcv->opnum == SAMR_CONNECT3)
-+ else if (dcv->opnum == SAMR_CONNECT3)
- pol_name = g_strdup("Connect3 handle");
-- if (dcv->opnum == SAMR_CONNECT4)
-+ else if (dcv->opnum == SAMR_CONNECT4)
- pol_name = g_strdup("Connect4 handle");
- }
-
---- ethereal-0.10.11/epan/dissectors/packet-dcerpc.c.cleanup 2005-05-02 23:28:48.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-dcerpc.c 2005-05-30 15:41:26.000000000 +0200
-@@ -1866,6 +1866,8 @@
- dcerpc_callback_fnct_t *callback, void *callback_args)
- {
- dcerpc_info *di;
-+ proto_tree *tr = NULL;
-+ gint start_offset = offset;
-
- di=pinfo->private_data;
- if(di->conformant_run){
-@@ -1880,7 +1882,6 @@
- if( pointers_are_top_level
- &&(type==NDR_POINTER_REF) ){
- proto_item *item;
-- proto_tree *tr;
-
- /* we must find out a nice way to do the length here */
- item=proto_tree_add_text(tree, tvb, offset, 0,
-@@ -1898,7 +1899,6 @@
- int idx;
- guint32 id;
- proto_item *item;
-- proto_tree *tr;
-
- /* get the referent id */
- offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id);
-@@ -1935,7 +1935,6 @@
- && (type==NDR_POINTER_UNIQUE) ){
- guint32 id;
- proto_item *item;
-- proto_tree *tr;
-
- /* get the referent id */
- offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id);
-@@ -1963,7 +1962,6 @@
- && (type==NDR_POINTER_REF) ){
- guint32 id;
- proto_item *item;
-- proto_tree *tr;
-
- /* get the referent id */
- offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id);
-@@ -1984,7 +1982,6 @@
- && (type==NDR_POINTER_UNIQUE) ){
- guint32 id;
- proto_item *item;
-- proto_tree *tr;
-
- /* get the referent id */
- offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id);
-@@ -2013,7 +2010,6 @@
- int idx;
- guint32 id;
- proto_item *item;
-- proto_tree *tr;
-
- /* get the referent id */
- offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id);
-@@ -2057,6 +2053,10 @@
- pointers_are_top_level=TRUE;
- }
-
-+ /* Set the length for the new subtree */
-+ if (tr){
-+ proto_item_set_len(tr, offset-start_offset);
-+ }
- return offset;
- }
-
---- ethereal-0.10.11/epan/dissectors/packet-gtp.c.cleanup 2005-05-02 23:28:47.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-gtp.c 2005-05-30 15:41:26.000000000 +0200
-@@ -1365,9 +1365,9 @@
- for (i = 0; i < 8; i++) {
- bits8to5 = (ad[i] >> 4) & 0x0F;
- bits4to1 = ad[i] & 0x0F;
-- if (bits8to5 < 0xA)
-- str[j++] = hex_digits[bits4to1];
- if (bits4to1 < 0xA)
-+ str[j++] = hex_digits[bits4to1];
-+ if (bits8to5 < 0xA)
- str[j++] = hex_digits[bits8to5];
- }
- str[j] = '\0';
---- ethereal-0.10.11/epan/dissectors/packet-radius.c.cleanup 2005-05-02 23:28:48.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-radius.c 2005-05-30 15:41:26.000000000 +0200
-@@ -4241,7 +4241,7 @@
- rd_value_to_str(textbuffer, &vsabuffer, &avph, tvb, offset,
- attr_info, vsa_tree);
- proto_item_append_text(ti, ", %s", textbuffer);
-- for (i = 0; vsabuffer[i].str && i < VSABUFFER; i++) {
-+ for (i = 0; i < VSABUFFER && vsabuffer[i].str; i++) {
- proto_tree_add_text(vsa_tree, tvb, vsabuffer[i].offset,
- vsabuffer[i].length, "%s", vsabuffer[i].str);
- }
---- ethereal-0.10.11/epan/dissectors/packet-lpd.c.cleanup 2005-05-02 23:28:45.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-lpd.c 2005-05-30 15:41:26.000000000 +0200
-@@ -95,7 +95,7 @@
+ while ((tvb_length_remaining(tvb, offset) > 0)&&(offset>lastoffset)) { /* exit loop if nothing happens inside */
+ lastoffset = offset;
+--- ethereal-0.10.12/epan/dissectors/packet-lpd.c.cleanup 2005-07-26 21:26:39.000000000 +0200
++++ ethereal-0.10.12/epan/dissectors/packet-lpd.c 2005-07-27 15:56:06.735040120 +0200
+@@ -95,7 +95,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *
if (check_col(pinfo->cinfo, COL_INFO)) {
if (lpr_packet_type == request) {
@@ -300,159 +31,3 @@
}
else if (lpr_packet_type == response) {
col_set_str(pinfo->cinfo, COL_INFO, "LPD response");
---- ethereal-0.10.11/epan/dissectors/packet-ndmp.c.cleanup 2005-05-02 23:28:44.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-ndmp.c 2005-05-30 15:41:26.000000000 +0200
-@@ -1654,6 +1654,7 @@
- {
- /* ndmp addr */
- offset=dissect_ndmp_addr(tvb, offset, pinfo, tree);
-+ return offset;
- }
-
-
---- ethereal-0.10.11/epan/dissectors/packet-bootp.c.cleanup 2005-05-02 23:28:48.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-bootp.c 2005-05-30 15:41:26.000000000 +0200
-@@ -1423,7 +1423,7 @@
- "Suboption %d: %s (%d byte%s)" ,
- subopt, "PXE boot item",
- subopt_len, plurality(subopt_len, "", "s"));
-- } else if ((subopt < 1) || (subopt > array_length(o43pxeclient_opt))) {
-+ } else if ((subopt < 1) || (subopt >= array_length(o43pxeclient_opt))) {
- proto_tree_add_text(v_tree, tvb, optoff, subopt_len+2,
- "Unknown suboption %d (%d byte%s)", subopt, subopt_len,
- plurality(subopt_len, "", "s"));
-@@ -1589,7 +1589,7 @@
- subopt);
- return (optend);
- }
-- if ( (subopt < 1 ) || (subopt > array_length(o43cablelabs_opt)) ) {
-+ if ( (subopt < 1 ) || (subopt >= array_length(o43cablelabs_opt)) ) {
- proto_tree_add_text(v_tree, tvb, optoff, subopt_len+2,
- "Suboption %d: Unassigned (%d byte%s)", subopt, subopt_len,
- plurality(subopt_len, "", "s"));
-@@ -1712,7 +1712,7 @@
- subopt_len = tvb_get_guint8(tvb, suboptoff);
- suboptoff++;
-
-- if (subopt > array_length(o63_opt)) {
-+ if (subopt >= array_length(o63_opt)) {
- proto_tree_add_text(v_tree, tvb, optoff, subopt_len + 2, "Unknown suboption %d", subopt);
- } else {
- switch (o63_opt[subopt].ftype) {
---- ethereal-0.10.11/epan/dissectors/packet-cpfi.c.cleanup 2005-05-02 23:28:48.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-cpfi.c 2005-05-30 15:41:26.000000000 +0200
-@@ -157,13 +157,13 @@
- {
- guint32 tda;
- guint32 src;
-- guint8 src_instance;
-- guint8 src_board;
-- guint8 src_port;
-+ guint8 src_instance=0;
-+ guint8 src_board=0;
-+ guint8 src_port=0;
- guint32 dst;
-- guint8 dst_instance;
-- guint8 dst_board;
-- guint8 dst_port;
-+ guint8 dst_instance=0;
-+ guint8 dst_board=0;
-+ guint8 dst_port=0;
- proto_item *extra_item = NULL;
- proto_tree *extra_tree = NULL;
-
---- ethereal-0.10.11/epan/dissectors/packet-lmp.c.cleanup 2005-05-02 23:28:47.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-lmp.c 2005-05-30 15:41:26.000000000 +0200
-@@ -870,7 +870,7 @@
-
- static int lmp_09_class_to_subtree(int class)
- {
-- if (VALID_09_CLASS(class))
-+ if (VALID_09_CLASS(class) && (class != LMP_09_CLASS_ERROR))
- return lmp_09_subtree[LMP_TREE_CLASS_START + class];
-
- return -1;
---- ethereal-0.10.11/epan/dissectors/packet-frame.c.cleanup 2005-05-02 23:28:49.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-frame.c 2005-05-30 15:41:26.000000000 +0200
-@@ -79,7 +79,7 @@
- proto_tree *fh_tree=NULL;
- proto_item *volatile ti = NULL;
- nstime_t ts;
-- int cap_len, pkt_len;
-+ int cap_len=0, pkt_len=0;
- proto_tree *tree;
-
- tree=parent_tree;
---- ethereal-0.10.11/epan/dissectors/packet-ldap.c.cleanup 2005-05-02 23:28:47.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-ldap.c 2005-05-30 15:41:26.000000000 +0200
-@@ -519,7 +519,7 @@
- string[length] = '\0';
- }
- else
-- string = "(null)";
-+ string = g_strdup("(null)");
-
- if (tree)
- temp_item = proto_tree_add_string(tree, hf_id, a->tvb, start, a->offset - start, string);
-@@ -1612,7 +1612,7 @@
-
- mscldap_rpc=0;
- if(is_mscldap){
-- if(!strncmp(str, "netlogon", 8)){
-+ if(str && !strncmp(str, "netlogon", 8)){
- mscldap_rpc=MSCLDAP_RPC_NETLOGON;
- }
- }
-@@ -1799,6 +1799,7 @@
- proto_tree_add_text(tree, a->tvb, start, 0,
- "ERROR: Couldn't parse compare value: %s", asn1_err_to_str(ret));
- }
-+ g_free(string1);
- return;
- }
-
---- ethereal-0.10.11/epan/dissectors/packet-ethertype.c.cleanup 2005-05-02 23:28:45.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-ethertype.c 2005-05-30 15:41:26.000000000 +0200
-@@ -158,7 +158,7 @@
- char *description;
- tvbuff_t *next_tvb;
- guint length_before;
-- volatile gboolean dissector_found;
-+ volatile gboolean dissector_found = FALSE;
- const char *saved_proto;
-
- /* Add the Ethernet type to the protocol tree */
---- ethereal-0.10.11/epan/dissectors/packet-ieee8023.c.cleanup 2005-05-02 23:28:46.000000000 +0200
-+++ ethereal-0.10.11/epan/dissectors/packet-ieee8023.c 2005-05-30 15:41:26.000000000 +0200
-@@ -41,8 +41,8 @@
- proto_tree *fh_tree, int length_id, int trailer_id,
- int fcs_len)
- {
-- tvbuff_t *volatile next_tvb;
-- tvbuff_t *volatile trailer_tvb;
-+ tvbuff_t *volatile next_tvb = NULL;
-+ tvbuff_t *volatile trailer_tvb = NULL;
- const char *saved_proto;
-
- if (fh_tree)
---- ethereal-0.10.11/wiretap/netmon.c.cleanup 2005-05-02 23:28:52.000000000 +0200
-+++ ethereal-0.10.11/wiretap/netmon.c 2005-05-30 15:41:26.000000000 +0200
-@@ -280,6 +280,7 @@
- *err = file_error(wth->fh);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
-+ g_free(frame_table);
- return -1;
- }
- wth->capture.netmon->frame_table_size = frame_table_size;
---- ethereal-0.10.11/gtk/smb_stat.c.cleanup 2005-05-02 23:27:59.000000000 +0200
-+++ ethereal-0.10.11/gtk/smb_stat.c 2005-05-30 15:41:26.000000000 +0200
-@@ -107,7 +107,7 @@
- if(sti){
- add_srt_table_data(&ss->nt_trans_srt_table, sti->subcmd, &si->sip->req_time, pinfo);
- }
-- } else if(si->cmd==0x32 && si->sip->extra_info == SMB_EI_T2I){
-+ } else if(si->cmd==0x32 && si->sip->extra_info_type == SMB_EI_T2I){
- smb_transact2_info_t *st2i=(smb_transact2_info_t *)si->sip->extra_info;
-
- if(st2i){
Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ethereal.spec 15 Jul 2005 11:56:06 -0000 1.39
+++ ethereal.spec 27 Jul 2005 15:25:19 -0000 1.40
@@ -2,8 +2,8 @@
Summary: Network traffic analyzer
Name: ethereal
-Version: 0.10.11
-Release: 4
+Version: 0.10.12
+Release: 1
License: GPL
Group: Applications/Internet
Source0: http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -154,6 +154,11 @@
%changelog
+* Wed Jul 27 2005 Jindrich Novy <jnovy at redhat.com> 0.10.12-1
+- update to 0.10.12
+- sync with cleanup patch (most of it applied upstream)
+- the new release fixes CAN-2005-2361 up to CAN-2005-2367
+
* Fri Jul 15 2005 Radek Vokal <rvokal at redhat.com> 0.10.11-4
- fixed buildrequres (#163244)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 5 May 2005 06:22:22 -0000 1.25
+++ sources 27 Jul 2005 15:25:19 -0000 1.26
@@ -1 +1 @@
-03aa7fe2cbef9aa0654637cdc60e0458 ethereal-0.10.11.tar.bz2
+372b60e6eca14b7e1cf3e789207027f7 ethereal-0.10.12.tar.bz2
More information about the fedora-cvs-commits
mailing list