From 21920e70caba482cc744a0940c03840cbfe5c2e4b8bbd46b6a0627f8715905f8 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 10 Nov 2010 15:42:35 +0000 Subject: [PATCH] - updated to 1.4.1 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=24 --- wireshark-1.2.0-disable-warning-dialog.patch | 6 ++-- wireshark-1.4.0.tar.bz2 | 3 -- wireshark-1.4.1.tar.bz2 | 3 ++ wireshark-corosync-packet-dissector.patch | 24 ++++++------- wireshark.changes | 38 ++++++++++++++++++++ wireshark.spec | 6 ++-- 6 files changed, 60 insertions(+), 20 deletions(-) delete mode 100644 wireshark-1.4.0.tar.bz2 create mode 100644 wireshark-1.4.1.tar.bz2 diff --git a/wireshark-1.2.0-disable-warning-dialog.patch b/wireshark-1.2.0-disable-warning-dialog.patch index f52c015..ebd52e7 100644 --- a/wireshark-1.2.0-disable-warning-dialog.patch +++ b/wireshark-1.2.0-disable-warning-dialog.patch @@ -2,7 +2,7 @@ Index: gtk/main.c =================================================================== --- gtk/main.c.orig +++ gtk/main.c -@@ -1246,13 +1246,13 @@ set_display_filename(capture_file *cf) +@@ -1417,13 +1417,13 @@ set_display_filename(capture_file *cf) } GtkWidget *close_dlg = NULL; @@ -18,7 +18,7 @@ Index: gtk/main.c #ifdef _WIN32 static void npf_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_) -@@ -1792,9 +1792,10 @@ check_and_warn_user_startup(gchar *cf_na +@@ -1979,9 +1979,10 @@ check_and_warn_user_startup(gchar *cf_na #endif { gchar *cur_user, *cur_group; @@ -30,7 +30,7 @@ Index: gtk/main.c if (running_with_special_privs() && recent.privs_warn_if_elevated) { cur_user = get_cur_username(); cur_group = get_cur_groupname(); -@@ -1806,7 +1807,7 @@ check_and_warn_user_startup(gchar *cf_na +@@ -1993,7 +1994,7 @@ check_and_warn_user_startup(gchar *cf_na simple_dialog_check_set(priv_warning_dialog, "Don't show this message again."); simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL); } diff --git a/wireshark-1.4.0.tar.bz2 b/wireshark-1.4.0.tar.bz2 deleted file mode 100644 index 2dff9c9..0000000 --- a/wireshark-1.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c0df77d11c643b1142b6ed3fd21e0c79b3f05f1749fe10e9ba5fd3beee8b743 -size 20481773 diff --git a/wireshark-1.4.1.tar.bz2 b/wireshark-1.4.1.tar.bz2 new file mode 100644 index 0000000..40aca01 --- /dev/null +++ b/wireshark-1.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bd1e7e0f6408afb48e5e1e3ded651e0dee41a77a65868b72e26f36f3aff0983 +size 20208926 diff --git a/wireshark-corosync-packet-dissector.patch b/wireshark-corosync-packet-dissector.patch index cefc339..f260ecb 100644 --- a/wireshark-corosync-packet-dissector.patch +++ b/wireshark-corosync-packet-dissector.patch @@ -1,7 +1,7 @@ -Index: wireshark-1.4.0/epan/dissectors/Makefile.common +Index: wireshark-1.4.1/epan/dissectors/Makefile.common =================================================================== ---- wireshark-1.4.0.orig/epan/dissectors/Makefile.common -+++ wireshark-1.4.0/epan/dissectors/Makefile.common +--- wireshark-1.4.1.orig/epan/dissectors/Makefile.common ++++ wireshark-1.4.1/epan/dissectors/Makefile.common @@ -307,6 +307,8 @@ DISSECTOR_SRC = \ packet-collectd.c \ packet-componentstatus.c \ @@ -11,10 +11,10 @@ Index: wireshark-1.4.0/epan/dissectors/Makefile.common packet-cosine.c \ packet-cpfi.c \ packet-cpha.c \ -Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c +Index: wireshark-1.4.1/epan/dissectors/packet-corosync-totemnet.c =================================================================== --- /dev/null -+++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c ++++ wireshark-1.4.1/epan/dissectors/packet-corosync-totemnet.c @@ -0,0 +1,1274 @@ +/* packet-corosync-totemnet.c + * Routines for the lowest level(encryption/decryption) protocol used in Corosync cluster engine @@ -1290,10 +1290,10 @@ Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemnet.c +} + +/* packet-corosync-totemnet.c ends here */ -Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.c +Index: wireshark-1.4.1/epan/dissectors/packet-corosync-totemsrp.c =================================================================== --- /dev/null -+++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.c ++++ wireshark-1.4.1/epan/dissectors/packet-corosync-totemsrp.c @@ -0,0 +1,1379 @@ +/* packet-corosync-totemsrp.c + * Dissectors for totem single ring protocol implementated in corosync cluster engine @@ -2674,10 +2674,10 @@ Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.c + corosync_totemsrp_is_little_endian(pinfo)); +} + -Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.h +Index: wireshark-1.4.1/epan/dissectors/packet-corosync-totemsrp.h =================================================================== --- /dev/null -+++ wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.h ++++ wireshark-1.4.1/epan/dissectors/packet-corosync-totemsrp.h @@ -0,0 +1,53 @@ +/* packet-corosync-totemsrp.h + * Dissectors for totem single ring protocol implemented in corosync cluster engine @@ -2732,10 +2732,10 @@ Index: wireshark-1.4.0/epan/dissectors/packet-corosync-totemsrp.h + + +#endif /* packet-totemsrp.h */ -Index: wireshark-1.4.0/epan/dissectors/Makefile.in +Index: wireshark-1.4.1/epan/dissectors/Makefile.in =================================================================== ---- wireshark-1.4.0.orig/epan/dissectors/Makefile.in -+++ wireshark-1.4.0/epan/dissectors/Makefile.in +--- wireshark-1.4.1.orig/epan/dissectors/Makefile.in ++++ wireshark-1.4.1/epan/dissectors/Makefile.in @@ -224,6 +224,8 @@ am__objects_3 = libdissectors_la-packet- libdissectors_la-packet-collectd.lo \ libdissectors_la-packet-componentstatus.lo \ diff --git a/wireshark.changes b/wireshark.changes index 8593cde..223437a 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Wed Nov 10 15:36:51 UTC 2010 - prusnak@opensuse.org + +- updated to 1.4.1 + * security fixes: + o stack overflow in ASN.1 BER dissector + * bug fixes: + o Incorrect behavior using sorting in the packet list + o Cooked-capture dissector should omit the source address field if empty + o MySQL dissector doesn't dissect MySQL stream + o Wireshark crashes if active display filter macro is renamed + o Incorrect dissection of MAP V2 PRN_ACK + o TCP bytes_in_flight becomes inflated with lost packets + o GTP header is exported in PDML with an incorrect size + o Packet list hidden columns will not be parsed correctly from preferences file + o Wireshark does not display the t.38 graph + o Wireshark don't show mgcp calls in "Telephony → VoIP calls" + o Wireshark 1.4.0 & VoIP calls "Prepare Filter" problem + o GTPv2: IMSI is decoded improperly + o EPS Quality of Service IE decoding is wrong + o Wireshark mistakenly writes "not all data available" for IPv4 checksum + o GSM: Cell Channel Description, range 1024 format + o Wrong SDP interpretation on VoIP call flow chart + o The CLDAP attribute value on a CLDAP reply is no longer being decoded + o [NAS EPS] Traffic Flow Template IE dissection bugs + o [NAS EPS] Use Request Type IE defined in 3GPP 24.008 + o NTLMSSP_AUTH domain and username truncated to first letter with IE8/Windows7 + o IPv6 RH0: dest addr is to be used i.s.o. last RH address when 0 segments remain + o EIGRP dissection error in Flags field in external route TLVs. + o MRP packet is not correctly parsed in PROFINET multiple write record request + o MySQL Enhancement: support of Show Fields and bug fix + o [NAS EPS] Fix TFT decoding when having several Packet Filters defined + o Crash if using ssl.debug.file with no password for ssl.keys_list + * updated protocol support + ASN.1 BER, ASN.1 PER, EIGRP, GSM A RR, GSM Management, GSM MAP, + GTP, GTPv2, ICMPv6, Interlink, IPv4, IPv6, IPX, LDAP, LLC, MySQL, + NAS EPS, NTLMSSP, PN-IO, PPP, RPC, SDP, SLL, SSL, TCP + ------------------------------------------------------------------- Thu Sep 9 18:34:09 CEST 2010 - dimstar@opensuse.org diff --git a/wireshark.spec b/wireshark.spec index f2fb5a9..492aa4b 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -22,7 +22,7 @@ Name: wireshark License: GPLv2+ Group: Productivity/Networking/Diagnostic Summary: A Network Traffic Analyser -Version: 1.4.0 +Version: 1.4.1 Release: 1 Url: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -77,7 +77,9 @@ view the reconstructed stream of a TCP session. License: GPLv2+ Summary: A Network Traffic Analyser Group: Productivity/Networking/Diagnostic -Requires: %{name} = %{version} glibc-devel glib2-devel +Requires: %{name} = %{version} +Requires: glibc-devel +Requires: glib2-devel Provides: ethereal-devel = %{version} Obsoletes: ethereal-devel < %{version}