From 9d313cc96344d6f73ad8e7f1e4db7d02d099919e8ad533cd371537e8dc851835 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 28 Feb 2008 17:25:39 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=11 --- wireshark-0.99.7-strptime.patch | 38 ----------- wireshark-0.99.7.tar.bz2 | 3 - ...-help.patch => wireshark-0.99.8-help.patch | 0 wireshark-0.99.8-strncat.patch | 17 +++++ wireshark-0.99.8.tar.bz2 | 3 + wireshark.changes | 52 +++++++++++++++ wireshark.spec | 65 ++++++++++++++++--- 7 files changed, 128 insertions(+), 50 deletions(-) delete mode 100644 wireshark-0.99.7-strptime.patch delete mode 100644 wireshark-0.99.7.tar.bz2 rename wireshark-0.99.7-help.patch => wireshark-0.99.8-help.patch (100%) create mode 100644 wireshark-0.99.8-strncat.patch create mode 100644 wireshark-0.99.8.tar.bz2 diff --git a/wireshark-0.99.7-strptime.patch b/wireshark-0.99.7-strptime.patch deleted file mode 100644 index 1cd2fa5..0000000 --- a/wireshark-0.99.7-strptime.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- text2pcap.c -+++ text2pcap.c -@@ -77,6 +77,19 @@ - * snaplength is automatically set to 64K. - */ - -+/* -+ * Just make sure we include the prototype for strptime as well -+ * (needed for glibc 2.2) but make sure we do this only if not -+ * yet defined. -+ */ -+ -+#ifndef __USE_XOPEN -+# define __USE_XOPEN -+#endif -+#ifndef _XOPEN_SOURCE -+# define _XOPEN_SOURCE -+#endif -+ - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif -@@ -87,15 +100,6 @@ - #include - #include - --/* -- * Just make sure we include the prototype for strptime as well -- * (needed for glibc 2.2) but make sure we do this only if not -- * yet defined. -- */ --#ifndef __USE_XOPEN --# define __USE_XOPEN --#endif -- - #include - #include - diff --git a/wireshark-0.99.7.tar.bz2 b/wireshark-0.99.7.tar.bz2 deleted file mode 100644 index 5793389..0000000 --- a/wireshark-0.99.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cbb3360507d8da13fa108e2fe9a4407a89b61fc0ddb6505d60f906b6c15eb82 -size 13179467 diff --git a/wireshark-0.99.7-help.patch b/wireshark-0.99.8-help.patch similarity index 100% rename from wireshark-0.99.7-help.patch rename to wireshark-0.99.8-help.patch diff --git a/wireshark-0.99.8-strncat.patch b/wireshark-0.99.8-strncat.patch new file mode 100644 index 0000000..d985944 --- /dev/null +++ b/wireshark-0.99.8-strncat.patch @@ -0,0 +1,17 @@ +--- epan/dissectors/packet-gtp.c ++++ epan/dissectors/packet-gtp.c +@@ -1594,10 +1594,10 @@ + } + + _tmp[0] = '\0'; +- strncat(_tmp, proto_name, COL_MAX_LEN); +- strncat(_tmp, " <", COL_MAX_LEN - strlen(_tmp)); +- strncat(_tmp, cinfo->col_buf[i], COL_MAX_LEN - strlen(_tmp)); +- strncat(_tmp, ">", COL_MAX_LEN - strlen(_tmp)); ++ strncat(_tmp, proto_name, COL_MAX_LEN-1); ++ strncat(_tmp, " <", COL_MAX_LEN - strlen(_tmp)-1); ++ strncat(_tmp, cinfo->col_buf[i], COL_MAX_LEN - strlen(_tmp)-1); ++ strncat(_tmp, ">", COL_MAX_LEN - strlen(_tmp)-1); + cinfo->col_buf[i][0] = '\0'; + strncat(cinfo->col_buf[i], _tmp, COL_MAX_LEN); + cinfo->col_data[i] = cinfo->col_buf[i]; diff --git a/wireshark-0.99.8.tar.bz2 b/wireshark-0.99.8.tar.bz2 new file mode 100644 index 0000000..9b07f9a --- /dev/null +++ b/wireshark-0.99.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee9d2e7a75bc1ed80ef5faf9debca51ac238996a544f60314b7028f2f3140c22 +size 13243168 diff --git a/wireshark.changes b/wireshark.changes index fe80efa..e304055 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Thu Feb 28 11:38:06 CET 2008 - prusnak@suse.cz + +- updated to 0.99.8 + * security fixes + o fixed crash in SCTP, SNMP and TFTP dissectors + The following bugs have been fixed: + o Wireshark could crash when: + - saving I/O graphs + - editing table-based preferences + - trying to play RTP streams. + - trying to apply a display filter macro + - using Turkish and other locales. + * new features: + o multiple configuration profiles + o temporary coloring rules (let you color or filter on a conversation) + o I/O graphs have been improved + o Wireshark now has WLAN traffic statistics + o the Wireshark GUI now supports RPCAP + o conversations and endopoints can now be limited to the current display filter + o experimental support for the NTAR/PcapNG file format + * new protocol support: + AiroPeek Remote Capture, China Mobile Point to Point, Distributed + Lock Manager 3, EUTRAN X2 Application Protocol, Fieldbus + Foundation, International Passenger Airline Reservation + System/Airline Link Control, Microsoft DirectPlay, Path + Computation Element communication Protocol, Real Time Messaging + Protocol, S1 Application Protocol, Scripting Service Protocol, + Societe Internationale de Telecommunications Aeronautiques, Unisys + Transmittal System, Wi-fi Protected Setup, + * updated protocol support: + 3G A11, 3GPP, ACN, ACP133, ALCAP, AMR, ANSI A, ANSI IS-637-A, ANSI + MAP, ARP, ASAP, AVS WLAN, BACapp, BER, BOOTP, Bluetooth (HCI ACL, + HCI CMD, HCI EVT, HCI SCO, L2CAP, SDP), CDP, CFM, CMS, COPS, + Camel, Cisco ERSPAN, DAP, DCERPC SPOOLSS, DCERPC, DHCP, DHCPv6, + DIAMETER, DMP, DTLS, E.164, EAP, ENIP, ENRP, EtherCAT, Ethernet, + FMP, FTAM, GMRP, GRE, GSM MAP, GSM SMS, GSS-API, GTP, Gryphon, + H.223, H.225, H.245, H.263, H.264, H.460, HCI H1, HTTP, ICMP, IEEE + 802.11, IGMP, IPP, ISAKMP, ISUP, JFIF, JPEG, JXTA, Kerberos, LDAP, + MP2T, MS MMS, MTP3MG, NBAP, NFS, NHRP, NetFlow, P7, PER, PIM, + PKCS12, PPPoE, PTP, P_Mul, Q.932, Quakeworld, RANAP, RMT ALC, RMT + LCT, ROS, RPC, RPL, RRC, RTCP, RTP, SCCP, SCTP, SDP, SLL, SMB, + SMB2, SMPP, SMTP, SNMP, SRVLOC, SSL, STUN2, T.38, TCAP, TCP, TFTP, + TiVoConnect, UCP, UDP-Lite, USB, VLAN, WBXML, X.411, X.420, + X.509if, X.509sat + * new and updated capture file support: + Catapult DCT2000, DBS Etherwatch, NTAR/PcapNG, TamoSoft CommView, + Visual Networks +- removed obsolete patch: + * strptime.patch (included in update) +- added bison and flex to BuildRequires + ------------------------------------------------------------------- Thu Feb 21 04:51:57 CET 2008 - crrodriguez@suse.de diff --git a/wireshark.spec b/wireshark.spec index 9bdd0c8..092de05 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,5 +1,5 @@ # -# spec file for package wireshark (Version 0.99.7) +# spec file for package wireshark (Version 0.99.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,20 +12,21 @@ 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 +BuildRequires: cairo-devel gtk2-devel krb5-devel libadns-devel libpcap-devel net-snmp-devel openssl-devel pcre-devel tcpd-devel zlib-devel +BuildRequires: bison flex python update-desktop-files License: GPL v2 or later Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: A Network Traffic Analyser -Version: 0.99.7 -Release: 17 +Version: 0.99.8 +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}-strptime.patch +Patch1: %{name}-%{version}-strncat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ethereal Obsoletes: ethereal @@ -116,10 +117,7 @@ Authors: %patch1 %build -%{suse_update_config -f wiretap .} -cd wiretap -autoreconf -fi -cd .. +# %{suse_update_config -f wiretap .} autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" %configure \ @@ -177,6 +175,55 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/idl2wrs* %changelog +* Thu Feb 28 2008 prusnak@suse.cz +- updated to 0.99.8 + * security fixes + o fixed crash in SCTP, SNMP and TFTP dissectors + The following bugs have been fixed: + o Wireshark could crash when: + - saving I/O graphs + - editing table-based preferences + - trying to play RTP streams. + - trying to apply a display filter macro + - using Turkish and other locales. + * new features: + o multiple configuration profiles + o temporary coloring rules (let you color or filter on a conversation) + o I/O graphs have been improved + o Wireshark now has WLAN traffic statistics + o the Wireshark GUI now supports RPCAP + o conversations and endopoints can now be limited to the current display filter + o experimental support for the NTAR/PcapNG file format + * new protocol support: + AiroPeek Remote Capture, China Mobile Point to Point, Distributed + Lock Manager 3, EUTRAN X2 Application Protocol, Fieldbus + Foundation, International Passenger Airline Reservation + System/Airline Link Control, Microsoft DirectPlay, Path + Computation Element communication Protocol, Real Time Messaging + Protocol, S1 Application Protocol, Scripting Service Protocol, + Societe Internationale de Telecommunications Aeronautiques, Unisys + Transmittal System, Wi-fi Protected Setup, + * updated protocol support: + 3G A11, 3GPP, ACN, ACP133, ALCAP, AMR, ANSI A, ANSI IS-637-A, ANSI + MAP, ARP, ASAP, AVS WLAN, BACapp, BER, BOOTP, Bluetooth (HCI ACL, + HCI CMD, HCI EVT, HCI SCO, L2CAP, SDP), CDP, CFM, CMS, COPS, + Camel, Cisco ERSPAN, DAP, DCERPC SPOOLSS, DCERPC, DHCP, DHCPv6, + DIAMETER, DMP, DTLS, E.164, EAP, ENIP, ENRP, EtherCAT, Ethernet, + FMP, FTAM, GMRP, GRE, GSM MAP, GSM SMS, GSS-API, GTP, Gryphon, + H.223, H.225, H.245, H.263, H.264, H.460, HCI H1, HTTP, ICMP, IEEE + 802.11, IGMP, IPP, ISAKMP, ISUP, JFIF, JPEG, JXTA, Kerberos, LDAP, + MP2T, MS MMS, MTP3MG, NBAP, NFS, NHRP, NetFlow, P7, PER, PIM, + PKCS12, PPPoE, PTP, P_Mul, Q.932, Quakeworld, RANAP, RMT ALC, RMT + LCT, ROS, RPC, RPL, RRC, RTCP, RTP, SCCP, SCTP, SDP, SLL, SMB, + SMB2, SMPP, SMTP, SNMP, SRVLOC, SSL, STUN2, T.38, TCAP, TCP, TFTP, + TiVoConnect, UCP, UDP-Lite, USB, VLAN, WBXML, X.411, X.420, + X.509if, X.509sat + * new and updated capture file support: + Catapult DCT2000, DBS Etherwatch, NTAR/PcapNG, TamoSoft CommView, + Visual Networks +- removed obsolete patch: + * strptime.patch (included in update) +- added bison and flex to BuildRequires * Thu Feb 21 2008 crrodriguez@suse.de - fix -devel package dependencies * Wed Jan 09 2008 prusnak@suse.cz