diff --git a/wireshark-0.99.6-fwrite_unused_result.patch b/wireshark-0.99.6-fwrite_unused_result.patch deleted file mode 100644 index 224fbd8..0000000 --- a/wireshark-0.99.6-fwrite_unused_result.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- 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; - } diff --git a/wireshark-0.99.6.tar.bz2 b/wireshark-0.99.6.tar.bz2 deleted file mode 100644 index 40160c2..0000000 --- a/wireshark-0.99.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:118c4a5bfef00651fbe248e1d5c4e4f907b5e2982f47ccfecca2f7f48ab9d3b8 -size 11826043 diff --git a/wireshark-0.99.6-help.patch b/wireshark-0.99.7-help.patch similarity index 100% rename from wireshark-0.99.6-help.patch rename to wireshark-0.99.7-help.patch diff --git a/wireshark-0.99.7.tar.bz2 b/wireshark-0.99.7.tar.bz2 new file mode 100644 index 0000000..5793389 --- /dev/null +++ b/wireshark-0.99.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cbb3360507d8da13fa108e2fe9a4407a89b61fc0ddb6505d60f906b6c15eb82 +size 13179467 diff --git a/wireshark.changes b/wireshark.changes index 3bffcae..09cc92f 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,88 @@ +------------------------------------------------------------------- +Wed Dec 19 13:34:17 CET 2007 - prusnak@suse.cz + +- updated to 0.99.7 + * security fixes + o Wireshark could crash when reading an MP3 file. + o Beyond Security discovered that Wireshark could loop + excessively while reading a malformed DNP packet. + o Stefan Esser discovered a buffer overflow in the SSL + dissector. + o The ANSI MAP dissector could be susceptible to a buffer + overflow on some platforms. + o The Firebird/Interbase dissector could go into an infinite + loop or crash. + o The NCP dissector could cause a crash. + o The HTTP dissector could crash on some systems while decoding + chunked messages. + o The MEGACO dissector could enter a large loop and consume + system resources. + o The DCP ETSI dissector could enter a large loop and consume + system resources. + o Fabiodds discovered a buffer overflow in the iSeries (OS/400) + Communication trace file parser. + o The PPP dissector could overflow a buffer. + o The Bluetooth SDP dissector could go into an infinite loop. + o A malformed RPC Portmap packet could cause a crash. + o The IPv6 dissector could loop excessively. + o The USB dissector could loop excessively or crash. + o The SMB dissector could crash. + o The RPL dissector could go into an infinite loop. + o The WiMAX dissector could crash due to unaligned access on + some platforms. + o The CIP dissector could attempt to allocate a huge amount of + memory and crash. + * bug fixes + o Handling of non-ASCII file names and paths has been improved. + o Wireshark could crash while editing a coloring rule or a UAT + table. + o The display filter code could crash while bitwise ANDing an + IPv4 address. + * news and updates + o Most of the capture code has been moved out of the GUI, which + means that Wireshark no longer needs to be run as root. + o Many display filter names have been cleaned up. If your + favorite display filter just went missing, please consult the + display filter reference to find out where it ended up. + o You can now filter directly on SNMP OIDs. + o IO graphs have more display options, and you can now export + graphs. + o You can now follow UDP streams in addition to TCP and SSL + streams. + o You can now disable coloring rules without deleting them. + o Main window toolbar buttons are now available even when the + window is small. + o Optimizations have been applied in some places to make + Wireshark start up and run faster. + * new protocol support + ANSI TCAP, application/xcap-error (MIME type), CFM, DPNSS, + EtherCAT, ETSI e2/e4, H.282, H.460, H.501, IEEE 802.1ad and + 802.1ah, IMF (RFC 2822), RSL, SABP, T.125, TNEF, TPNCP, UNISTIM, + Wake on LAN, WiMAX ASN Control Plane, X.224, + * updated protocol support + 3Com XNS, 3G A11, ACN, ACP123, ACSE, AIM, ANSI IS-637-A, ANSI MAP, + Armagetronad, BACapp, BACnet, BER, BFD, BGP, Bluetooth, CAMEL, + CDT, CFM, CIP, Cisco ERSPAN, CLNP, CMIP, CMS, COPS, CTDB, DCCP, + DCERPC ATSVC, DCERPC PNIO, DCERPC SAMR, DCERPC, DCOM CBA-ACCO, DCP + ETSI, DEC DNA, DFS, DHCP/BOOTP, DHCPv6, DIAMETER, DISP, DMP, DNP, + DNS, DOP, DTLS, DUA, eDonkey, ELSM, ESL, Ethernet, FC ELS, FC, + FCOE, FTAM, FTP, GDSDB, GIOP, GPRS-LLC, GSM A, GSM MAP, GTP, HSRP, + HTTP, IAX2, ICMPv6, IEEE 802.11, INAP, IP, IPMI, IPv6, ISAKMP, + ISIS, iSNS, ISUP, IUUP, JXTA, K12, Kerberos, L2TP, LAPD, LDAP, + LINX, LPD, LWAPP, MEGACO, MIKEY, MIME Multipart, MMS, MP2T, MPEG + PES, MPEG, MTP2, MySQL, NBAP, NetFlow, nettl, NFS, NSIP, OSPF, + P_MUL, PANA, PER, PKCS#12, PMIPv6, PN-PTCP, PN-RT, PPI, PPPoE, + PRES, PROFINET, PTP, Q.932 ROS, Q.932, QSIG, Radiotap, RADIUS, + RANAP, RNSAP, ROS, RTCP, RTP, RTSE, RTSP, SCCP, SCTP, SDP, + SIGCOMP, SIP, Slow Protocols, SMB, SMPP, SMTP, SNDCP, SNMP, SRP, + SSL, STANAG 4406, STUN2, TCAP, TCP, text/media, TIPC, ULP, UMA, + UMTS FP, V5UA, VNC, WiMAX M2M, WiMAX, WLCCP, X.411, X.420, X.509 + SAT, XML + * new and updated capture file support + Catapult DCT 2000, Endace ERF, Juniper NetScreen snoop, Visual + Networks, Windows Sniffer (NetXRay) +- removed fwrite_unused_result.patch + ------------------------------------------------------------------- Tue Sep 4 00:24:50 CEST 2007 - ro@suse.de diff --git a/wireshark.spec b/wireshark.spec index 71e66c8..2952eea 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,5 +1,5 @@ # -# spec file for package wireshark (Version 0.99.6) +# spec file for package wireshark (Version 0.99.7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,17 +14,16 @@ Name: wireshark BuildRequires: cairo-devel gtk2-devel krb5-devel libadns-devel libpcap-devel net-snmp-devel openssl-devel pcre-devel python tcpd-devel update-desktop-files zlib-devel License: GPL v2 or later Group: Productivity/Networking/Diagnostic -Autoreqprov: on +AutoReqProv: on Summary: A Network Traffic Analyser -Version: 0.99.6 -Release: 23 -URL: http://www.wireshark.org/ +Version: 0.99.7 +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}-fwrite_unused_result.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ethereal Obsoletes: ethereal @@ -68,7 +67,7 @@ Authors: %package devel Summary: A Network Traffic Analyser Group: Productivity/Networking/Diagnostic -Autoreqprov: on +AutoReqProv: on Requires: %{name} = %{version} Provides: ethereal-devel Obsoletes: ethereal-devel @@ -112,7 +111,6 @@ Authors: %prep %setup -q %patch0 -%patch1 %build %{suse_update_config -f wiretap .} @@ -151,11 +149,9 @@ done %clean rm -rf $RPM_BUILD_ROOT -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) @@ -178,6 +174,88 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/idl2wrs* %changelog +* Wed Dec 19 2007 - prusnak@suse.cz +- updated to 0.99.7 + * security fixes + o Wireshark could crash when reading an MP3 file. + o Beyond Security discovered that Wireshark could loop + excessively while reading a malformed DNP packet. + o Stefan Esser discovered a buffer overflow in the SSL + dissector. + o The ANSI MAP dissector could be susceptible to a buffer + overflow on some platforms. + o The Firebird/Interbase dissector could go into an infinite + loop or crash. + o The NCP dissector could cause a crash. + o The HTTP dissector could crash on some systems while decoding + chunked messages. + o The MEGACO dissector could enter a large loop and consume + system resources. + o The DCP ETSI dissector could enter a large loop and consume + system resources. + o Fabiodds discovered a buffer overflow in the iSeries (OS/400) + Communication trace file parser. + o The PPP dissector could overflow a buffer. + o The Bluetooth SDP dissector could go into an infinite loop. + o A malformed RPC Portmap packet could cause a crash. + o The IPv6 dissector could loop excessively. + o The USB dissector could loop excessively or crash. + o The SMB dissector could crash. + o The RPL dissector could go into an infinite loop. + o The WiMAX dissector could crash due to unaligned access on + some platforms. + o The CIP dissector could attempt to allocate a huge amount of + memory and crash. + * bug fixes + o Handling of non-ASCII file names and paths has been improved. + o Wireshark could crash while editing a coloring rule or a UAT + table. + o The display filter code could crash while bitwise ANDing an + IPv4 address. + * news and updates + o Most of the capture code has been moved out of the GUI, which + means that Wireshark no longer needs to be run as root. + o Many display filter names have been cleaned up. If your + favorite display filter just went missing, please consult the + display filter reference to find out where it ended up. + o You can now filter directly on SNMP OIDs. + o IO graphs have more display options, and you can now export + graphs. + o You can now follow UDP streams in addition to TCP and SSL + streams. + o You can now disable coloring rules without deleting them. + o Main window toolbar buttons are now available even when the + window is small. + o Optimizations have been applied in some places to make + Wireshark start up and run faster. + * new protocol support + ANSI TCAP, application/xcap-error (MIME type), CFM, DPNSS, + EtherCAT, ETSI e2/e4, H.282, H.460, H.501, IEEE 802.1ad and + 802.1ah, IMF (RFC 2822), RSL, SABP, T.125, TNEF, TPNCP, UNISTIM, + Wake on LAN, WiMAX ASN Control Plane, X.224, + * updated protocol support + 3Com XNS, 3G A11, ACN, ACP123, ACSE, AIM, ANSI IS-637-A, ANSI MAP, + Armagetronad, BACapp, BACnet, BER, BFD, BGP, Bluetooth, CAMEL, + CDT, CFM, CIP, Cisco ERSPAN, CLNP, CMIP, CMS, COPS, CTDB, DCCP, + DCERPC ATSVC, DCERPC PNIO, DCERPC SAMR, DCERPC, DCOM CBA-ACCO, DCP + ETSI, DEC DNA, DFS, DHCP/BOOTP, DHCPv6, DIAMETER, DISP, DMP, DNP, + DNS, DOP, DTLS, DUA, eDonkey, ELSM, ESL, Ethernet, FC ELS, FC, + FCOE, FTAM, FTP, GDSDB, GIOP, GPRS-LLC, GSM A, GSM MAP, GTP, HSRP, + HTTP, IAX2, ICMPv6, IEEE 802.11, INAP, IP, IPMI, IPv6, ISAKMP, + ISIS, iSNS, ISUP, IUUP, JXTA, K12, Kerberos, L2TP, LAPD, LDAP, + LINX, LPD, LWAPP, MEGACO, MIKEY, MIME Multipart, MMS, MP2T, MPEG + PES, MPEG, MTP2, MySQL, NBAP, NetFlow, nettl, NFS, NSIP, OSPF, + P_MUL, PANA, PER, PKCS#12, PMIPv6, PN-PTCP, PN-RT, PPI, PPPoE, + PRES, PROFINET, PTP, Q.932 ROS, Q.932, QSIG, Radiotap, RADIUS, + RANAP, RNSAP, ROS, RTCP, RTP, RTSE, RTSP, SCCP, SCTP, SDP, + SIGCOMP, SIP, Slow Protocols, SMB, SMPP, SMTP, SNDCP, SNMP, SRP, + SSL, STANAG 4406, STUN2, TCAP, TCP, text/media, TIPC, ULP, UMA, + UMTS FP, V5UA, VNC, WiMAX M2M, WiMAX, WLCCP, X.411, X.420, X.509 + SAT, XML + * new and updated capture file support + Catapult DCT 2000, Endace ERF, Juniper NetScreen snoop, Visual + Networks, Windows Sniffer (NetXRay) +- removed fwrite_unused_result.patch * Tue Sep 04 2007 - ro@suse.de - disable -Werror for now * Thu Jul 26 2007 - prusnak@suse.cz