diff --git a/wireshark-1.6.7.tar.bz2 b/wireshark-1.6.7.tar.bz2 deleted file mode 100644 index dba911b..0000000 --- a/wireshark-1.6.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e9d806d02ebfc3a70b948b4e82d19ba5bcde671eb229b18569149f95681f17b -size 21524856 diff --git a/wireshark-1.6.8.tar.bz2 b/wireshark-1.6.8.tar.bz2 new file mode 100644 index 0000000..b6c2248 --- /dev/null +++ b/wireshark-1.6.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4fbaffa4fd32543ed1d03b3097bf89a7d492e6d02e9bf8f8aa8a71281f3057f +size 21967111 diff --git a/wireshark-corosync-packet-dissector.patch b/wireshark-corosync-packet-dissector.patch index 34f27a5..f93c0de 100644 --- a/wireshark-corosync-packet-dissector.patch +++ b/wireshark-corosync-packet-dissector.patch @@ -1,7 +1,7 @@ -Index: wireshark-1.6.5/epan/dissectors/Makefile.common +Index: epan/dissectors/Makefile.common =================================================================== ---- wireshark-1.6.5.orig/epan/dissectors/Makefile.common 2012-01-10 20:08:58.000000000 +0100 -+++ wireshark-1.6.5/epan/dissectors/Makefile.common 2012-03-02 14:27:44.059540118 +0100 +--- epan/dissectors/Makefile.common.orig 2012-04-29 04:46:48.000000000 +0100 ++++ epan/dissectors/Makefile.common 2012-05-22 20:01:41.000000000 +0100 @@ -320,6 +320,8 @@ DISSECTOR_SRC = \ packet-collectd.c \ packet-componentstatus.c \ @@ -11,10 +11,10 @@ Index: wireshark-1.6.5/epan/dissectors/Makefile.common packet-cosine.c \ packet-cpfi.c \ packet-cpha.c \ -Index: wireshark-1.6.5/epan/dissectors/packet-corosync-totemnet.c +Index: epan/dissectors/packet-corosync-totemnet.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ wireshark-1.6.5/epan/dissectors/packet-corosync-totemnet.c 2012-03-02 14:27:44.060540120 +0100 ++++ epan/dissectors/packet-corosync-totemnet.c 2012-05-22 20:01:41.000000000 +0100 @@ -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.6.5/epan/dissectors/packet-corosync-totemnet.c +} + +/* packet-corosync-totemnet.c ends here */ -Index: wireshark-1.6.5/epan/dissectors/packet-corosync-totemsrp.c +Index: epan/dissectors/packet-corosync-totemsrp.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ wireshark-1.6.5/epan/dissectors/packet-corosync-totemsrp.c 2012-03-02 14:27:44.061540123 +0100 ++++ epan/dissectors/packet-corosync-totemsrp.c 2012-05-22 20:01:41.000000000 +0100 @@ -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.6.5/epan/dissectors/packet-corosync-totemsrp.c + corosync_totemsrp_is_little_endian(pinfo)); +} + -Index: wireshark-1.6.5/epan/dissectors/packet-corosync-totemsrp.h +Index: epan/dissectors/packet-corosync-totemsrp.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ wireshark-1.6.5/epan/dissectors/packet-corosync-totemsrp.h 2012-03-02 14:27:44.061540123 +0100 ++++ epan/dissectors/packet-corosync-totemsrp.h 2012-05-22 20:01:41.000000000 +0100 @@ -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.6.5/epan/dissectors/packet-corosync-totemsrp.h + + +#endif /* packet-totemsrp.h */ -Index: wireshark-1.6.5/epan/dissectors/Makefile.in +Index: epan/dissectors/Makefile.in =================================================================== ---- wireshark-1.6.5.orig/epan/dissectors/Makefile.in 2012-01-10 20:09:44.000000000 +0100 -+++ wireshark-1.6.5/epan/dissectors/Makefile.in 2012-03-02 14:27:44.065540133 +0100 +--- epan/dissectors/Makefile.in.orig 2012-05-22 15:21:15.000000000 +0100 ++++ epan/dissectors/Makefile.in 2012-05-22 20:01:41.000000000 +0100 @@ -231,6 +231,8 @@ am__objects_3 = libdissectors_la-packet- libdissectors_la-packet-collectd.lo \ libdissectors_la-packet-componentstatus.lo \ @@ -2745,7 +2745,7 @@ Index: wireshark-1.6.5/epan/dissectors/Makefile.in libdissectors_la-packet-cosine.lo \ libdissectors_la-packet-cpfi.lo \ libdissectors_la-packet-cpha.lo \ -@@ -1555,6 +1557,8 @@ DISSECTOR_SRC = \ +@@ -1559,6 +1561,8 @@ DISSECTOR_SRC = \ packet-collectd.c \ packet-componentstatus.c \ packet-cops.c \ @@ -2754,7 +2754,7 @@ Index: wireshark-1.6.5/epan/dissectors/Makefile.in packet-cosine.c \ packet-cpfi.c \ packet-cpha.c \ -@@ -2890,6 +2894,8 @@ distclean-compile: +@@ -2894,6 +2898,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-collectd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-componentstatus.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cops.Plo@am__quote@ @@ -2763,7 +2763,7 @@ Index: wireshark-1.6.5/epan/dissectors/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cosine.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cpfi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cpha.Plo@am__quote@ -@@ -4611,6 +4617,20 @@ libdissectors_la-packet-cops.lo: packet- +@@ -4615,6 +4621,20 @@ libdissectors_la-packet-cops.lo: packet- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdissectors_la_CFLAGS) $(CFLAGS) -c -o libdissectors_la-packet-cops.lo `test -f 'packet-cops.c' || echo '$(srcdir)/'`packet-cops.c diff --git a/wireshark.changes b/wireshark.changes index 140647e..d7221b1 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Tue May 22 19:02:42 UTC 2012 - andreas.stieger@gmx.de + +- adjust wireshark-corosync-packet-dissector.patch for source changes +- update to upstream 1.6.8 + + security fixes + * wnpa-sec-2012-08 / CVE-2012-2392 + Infinite and large loops in the ANSI MAP, ASF, BACapp, + Bluetooth HCI, IEEE 802.11, IEEE 802.3, LTP, and R3 dissectors + have been fixed. Discovered by Laurent Butti. (Bugs 6805, + 7118, 7119, 7120, 7121, 7122, 7124, 7125) + * wnpa-sec-2012-09 / CVE-2012-2393 + The DIAMETER dissector could try to allocate memory improperly + and crash. (Bug 7138) + * wnpa-sec-2012-10 / CVE-2012-2394 + Wireshark could crash on SPARC processors due to misaligned + memory. Discovered by Klaus Heckelmann. (Bug 7221) + + bug fixes + * User-Password - PAP decoding passwords longer than 16 bytes. + (Bug 6779) + * The MSISDN is not seen correctly in GTP packet. (Bug 7042) + * Wireshark doesn't calculate the right IPv4 destination using + source routing options when bad options precede them. (Bug + 7043) + * BOOTP dissector issue with DHCP option 82 - suboption 9. (Bug + 7047) + + * MPLS dissector in 1.6.7 and 1.7.1 misdecodes some MPLS CW + packets. (Bug 7089) + + * ANSI MAP infinite loop. (Bug 7119) + * HCIEVT infinite loop. (Bug 7122) + * Wireshark doesn't decode NFSv4.1 operations. (Bug 7127) + * LTP infinite loop. (Bug 7124) + * Wrong values in DNS CERT RR. (Bug 7130) + * Megaco parser problem with LF in header. (Bug 7198) + * OPC UA bytestring node id decoding is wrong. (Bug 7226) + + Updated Protocol Support + ANSI MAP, ASF, BACapp, Bluetooth HCI, DHCP, DIAMETER, DNS, GTP, + IEEE 802.11, IEEE 802.3, IPv4, LTP, Megaco, MPLS, NFS, OPC UA, + RADIUS + + New and Updated Capture File Support + 5View, CSIDS, pcap, pcap-ng + ------------------------------------------------------------------- Sat Apr 14 12:37:37 UTC 2012 - reddwarf@opensuse.org diff --git a/wireshark.spec b/wireshark.spec index 10fd479..09327d8 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -20,7 +20,7 @@ %define use_caps 0 Name: wireshark -Version: 1.6.7 +Version: 1.6.8 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0+ @@ -95,7 +95,7 @@ view the reconstructed stream of a TCP session. %prep %setup -q %patch2 -%patch3 -p1 +%patch3 %patch4 %patch5 -p1