Hello community, here is the log from the commit of package wireshark checked in at Tue Jul 10 19:15:15 CEST 2007. -------- --- wireshark/wireshark.changes 2007-03-07 13:49:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/wireshark/wireshark.changes 2007-07-10 11:54:04.000000000 +0200 @@ -1,0 +2,25 @@ +Tue Jul 10 11:22:31 CEST 2007 - prusnak@suse.cz + +- updated to 0.99.6 + * security fixes: + * crash when dissecting an HTTP chunked response + * crash while reading iSeries capture files + * exhaust system memory while reading a malformed DCP ETSI packet + * loop excessively while reading a malformed SSL packet + * DHCP/BOOTP dissector susceptible to an off-by-one error + * loop excessively while reading a malformed MMS packet + * bug fixes: + * WEP decryption would only work for the first key specified + * WEP and WPA decryption didn't work for QoS frames + * WPA decryption failed if EAPOL handshake packets contained extra data + * Wireshark failed to parse colon-separated WEP keys + * merging files in Wireshark now appends files properly + * hang while saving an RTP stream with bad timestamp data + * frame.time_delta display filter now works as expected + * for full information see: + * http://www.wireshark.org/docs/relnotes/wireshark-0.99.6.html +- added fwrite_unused_result.patch (fixes warn_unused_result warnings in fwrite calls) +- dropped obsolete patches: + * dissectors.patch (included in update) + +------------------------------------------------------------------- Old: ---- wireshark-0.99.5-dissectors.patch wireshark-0.99.5-help.patch wireshark-0.99.5.tar.bz2 New: ---- wireshark-0.99.6-fwrite_unused_result.patch wireshark-0.99.6-help.patch wireshark-0.99.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ --- /var/tmp/diff_new_pack.Q32402/_old 2007-07-10 19:15:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Q32402/_new 2007-07-10 19:15:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wireshark (Version 0.99.5) +# spec file for package wireshark (Version 0.99.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,19 +12,19 @@ Name: wireshark BuildRequires: cairo-devel gtk2-devel krb5-devel libadns-devel libpcap net-snmp-devel openssl-devel pcre-devel python tcpd-devel update-desktop-files zlib-devel -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Productivity/Networking/Diagnostic Autoreqprov: on Summary: A Network Traffic Analyser -Version: 0.99.5 -Release: 7 +Version: 0.99.6 +Release: 1 URL: http://www.wireshark.org/ Source: %{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png Source3: include.filelist Patch0: %{name}-%{version}-help.patch -Patch1: %{name}-%{version}-dissectors.patch +Patch1: %{name}-%{version}-fwrite_unused_result.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ethereal Obsoletes: ethereal @@ -177,6 +177,28 @@ %{_mandir}/man1/idl2wrs* %changelog +* Tue Jul 10 2007 - prusnak@suse.cz +- updated to 0.99.6 + * security fixes: + * crash when dissecting an HTTP chunked response + * crash while reading iSeries capture files + * exhaust system memory while reading a malformed DCP ETSI packet + * loop excessively while reading a malformed SSL packet + * DHCP/BOOTP dissector susceptible to an off-by-one error + * loop excessively while reading a malformed MMS packet + * bug fixes: + * WEP decryption would only work for the first key specified + * WEP and WPA decryption didn't work for QoS frames + * WPA decryption failed if EAPOL handshake packets contained extra data + * Wireshark failed to parse colon-separated WEP keys + * merging files in Wireshark now appends files properly + * hang while saving an RTP stream with bad timestamp data + * frame.time_delta display filter now works as expected + * for full information see: + * http://www.wireshark.org/docs/relnotes/wireshark-0.99.6.html +- added fwrite_unused_result.patch (fixes warn_unused_result warnings in fwrite calls) +- dropped obsolete patches: + * dissectors.patch (included in update) * Wed Mar 07 2007 - prusnak@suse.cz - added [t]ethereal symlinks [#252117] - cleaned spec file ++++++ wireshark-0.99.6-fwrite_unused_result.patch ++++++ --- wiretap/catapult_dct2000.c +++ wiretap/catapult_dct2000.c @@ -578,6 +578,7 @@ guint32 n; line_prefix_info_t *prefix = NULL; gchar time_string[16]; + size_t wr; /******************************************************/ /* Look up the file_externals structure for this file */ @@ -592,14 +593,14 @@ wdh->dump.dct2000 = g_malloc(sizeof(catapult_dct2000_t)); /* Write out saved first line */ - fwrite(file_externals->firstline, 1, file_externals->firstline_length, wdh->fh); - fwrite("\n", 1, 1, wdh->fh); + wr = fwrite(file_externals->firstline, 1, file_externals->firstline_length, wdh->fh); + wr = fwrite("\n", 1, 1, wdh->fh); /* Also write out saved second line with timestamp corresponding to the opening time of the log. */ - fwrite(file_externals->secondline, 1, file_externals->secondline_length, wdh->fh); - fwrite("\n", 1, 1, wdh->fh); + wr = fwrite(file_externals->secondline, 1, file_externals->secondline_length, wdh->fh); + wr = fwrite("\n", 1, 1, wdh->fh); /* Allocate the dct2000-specific dump structure */ wdh->dump.dct2000 = g_malloc(sizeof(catapult_dct2000_t)); @@ -623,7 +624,7 @@ (const void*)&(pseudo_header->dct2000.seek_off)); /* Write out text before timestamp */ - fwrite(prefix->before_time, 1, strlen(prefix->before_time), wdh->fh); + wr = fwrite(prefix->before_time, 1, strlen(prefix->before_time), wdh->fh); /* Calculate time of this packet to write, relative to start of dump */ if (phdr->ts.nsecs >= wdh->dump.dct2000->start_time.nsecs) @@ -640,16 +641,16 @@ } /* Write out the calculated timestamp */ - fwrite(time_string, 1, strlen(time_string), wdh->fh); + wr = fwrite(time_string, 1, strlen(time_string), wdh->fh); /* Write out text between timestamp and start of hex data */ if (prefix->after_time == NULL) { - fwrite(" l ", 1, strlen(" l "), wdh->fh); + wr = fwrite(" l ", 1, strlen(" l "), wdh->fh); } else { - fwrite(prefix->after_time, 1, strlen(prefix->after_time), wdh->fh); + wr = fwrite(prefix->after_time, 1, strlen(prefix->after_time), wdh->fh); } @@ -685,7 +686,7 @@ /**************************************/ /* Remainder is encapsulated protocol */ - fwrite("$", 1, 1, wdh->fh); + wr = fwrite("$", 1, 1, wdh->fh); /* Each binary byte is written out as 2 hex string chars */ for (; n < phdr->len; n++) @@ -695,11 +696,11 @@ c[1] = char_from_hex((guchar)(pd[n] & 0x0f)); /* Write both hex chars of byte together */ - fwrite(c, 1, 2, wdh->fh); + wr = fwrite(c, 1, 2, wdh->fh); } /* End the line */ - fwrite("\n", 1, 1, wdh->fh); + wr = fwrite("\n", 1, 1, wdh->fh); return TRUE; } --- wiretap/k12.c +++ wiretap/k12.c @@ -724,20 +724,21 @@ static const gchar dumpy_junk[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static void k12_dump_record(wtap_dumper *wdh, long len, guint8* buffer) { + size_t wr; long junky_offset = (0x2000 - ( (wdh->dump.k12->file_offset - 0x200) % 0x2000 )) % 0x2000; if (len > junky_offset) { if (junky_offset) - fwrite(buffer, 1, junky_offset, wdh->fh); + wr = fwrite(buffer, 1, junky_offset, wdh->fh); - fwrite(dumpy_junk, 1, 0x10, wdh->fh); + wr = fwrite(dumpy_junk, 1, 0x10, wdh->fh); - fwrite(buffer+junky_offset, 1, len - junky_offset, wdh->fh); + wr = fwrite(buffer+junky_offset, 1, len - junky_offset, wdh->fh); wdh->dump.k12->file_offset += len + 0x10; } else { - fwrite(buffer, 1, len, wdh->fh); + wr = fwrite(buffer, 1, len, wdh->fh); wdh->dump.k12->file_offset += len; } @@ -900,12 +901,13 @@ static const guint8 k12_eof[] = {0xff,0xff}; static gboolean k12_dump_close(wtap_dumper *wdh, int *err) { + size_t wr; union { guint8 b[sizeof(guint32)]; guint32 u; } d; - fwrite(k12_eof, 1, 2, wdh->fh); + wr = fwrite(k12_eof, 1, 2, wdh->fh); if (fseek(wdh->fh, 8, SEEK_SET) == -1) { *err = errno; @@ -914,11 +918,11 @@ d.u = g_htonl(wdh->dump.k12->file_len); - fwrite(d.b, 1, 4, wdh->fh); + wr = fwrite(d.b, 1, 4, wdh->fh); d.u = g_htonl(wdh->dump.k12->num_of_records); - fwrite(d.b, 1, 4, wdh->fh); + wr = fwrite(d.b, 1, 4, wdh->fh); return TRUE; } ++++++ wireshark-0.99.5-help.patch -> wireshark-0.99.6-help.patch ++++++ --- wireshark/wireshark-0.99.5-help.patch 2007-02-06 09:42:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/wireshark/wireshark-0.99.6-help.patch 2007-07-10 11:17:14.000000000 +0200 @@ -1,6 +1,6 @@ --- gtk/help_dlg.c +++ gtk/help_dlg.c -@@ -54,7 +54,7 @@ +@@ -51,7 +51,7 @@ #endif @@ -9,7 +9,7 @@ #define NOTEBOOK_KEY "notebook_key" -@@ -88,10 +88,8 @@ +@@ -164,10 +164,8 @@ char *relative_path, *absolute_path; help_page_t *page; @@ -21,7 +21,7 @@ gtk_widget_show(text_page); page = g_malloc(sizeof (help_page_t)); -@@ -123,12 +121,11 @@ +@@ -223,12 +221,11 @@ return; } ++++++ wireshark-0.99.5.tar.bz2 -> wireshark-0.99.6.tar.bz2 ++++++ wireshark/wireshark-0.99.5.tar.bz2 /mounts/work_src_done/STABLE/wireshark/wireshark-0.99.6.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org