diff options
author | Gerald Combs <gerald@wireshark.org> | 2020-02-26 14:27:37 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2020-02-26 22:30:33 +0000 |
commit | 6aaa4aed873493de6a95bb64e2fb6c55007b3b27 (patch) | |
tree | d5b21499ef346aa4ec07e5aaba7acb4649eaeac6 | |
parent | 1c3b8f526904a5e02a74390ae314714219ef240f (diff) | |
download | wireshark-6aaa4aed873493de6a95bb64e2fb6c55007b3b27.tar.gz wireshark-6aaa4aed873493de6a95bb64e2fb6c55007b3b27.tar.bz2 wireshark-6aaa4aed873493de6a95bb64e2fb6c55007b3b27.zip |
2.6.15 → 2.6.16.v2.6.16rc0
Change-Id: I69123ff5d020fa2738961cbf57556632f5a97fc9
Reviewed-on: https://code.wireshark.org/review/36202
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | ChangeLog | 325 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | docbook/attributes.asciidoc | 2 | ||||
-rw-r--r-- | docbook/release-notes.asciidoc | 46 | ||||
-rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
-rw-r--r-- | epan/Makefile.am | 2 | ||||
-rwxr-xr-x | make-version.pl | 2 | ||||
-rw-r--r-- | version.conf | 12 | ||||
-rw-r--r-- | wiretap/CMakeLists.txt | 2 | ||||
-rw-r--r-- | wiretap/Makefile.am | 2 |
12 files changed, 22 insertions, 379 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 81f2ea8320..2bbd808b2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ project(Wireshark C CXX) set(GIT_REVISION 0) set(PROJECT_MAJOR_VERSION 2) set(PROJECT_MINOR_VERSION 6) -set(PROJECT_PATCH_VERSION 15) +set(PROJECT_PATCH_VERSION 16) set(PROJECT_BUILD_VERSION ${GIT_REVISION}) set(PROJECT_VERSION_EXTENSION "") set(PROJECT_RELEASE_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}") @@ -1,325 +0,0 @@ -commit 9fe2de783d -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Feb 21 10:19:35 2020 -0800 - - EAP: Remove a couple of string length assumptions. - - Don't assume our MNC and MCC string lengths are > 3. - - Bug: 16397 - Change-Id: I0759dcb9d0c5f078cf3a98e9323d9cb741e15dd4 - Reviewed-on: https://code.wireshark.org/review/36146 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 8bda8642dfc8c9a870c6a48771566012353cc898) - Reviewed-on: https://code.wireshark.org/review/36173 - -commit e3dea81173 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 23 08:58:20 2020 +0000 - - [Automatic update for 2020-02-23] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I11c1e21e2e716e190ae592e6ad135c5bc5f0a551 - Reviewed-on: https://code.wireshark.org/review/36164 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 4f00a466cd -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Feb 22 20:35:43 2020 -0800 - - Use "must" instead of "should" to avoid ambiguity. - - As I said in - - https://ask.wireshark.org/question/10361/how-to-properly-use-heuristic-dissector-for-tcp/?answer=10363#post-id-10363 - - "Should" has multiple meanings; there's "Used to indicate obligation, - duty, or correctness, typically when criticizing someone's actions.", as - in "I think we should trust our people more", and there's "Used to - indicate what is probable.", as in "the bus should arrive in a few - minutes". You're reading it in the latter sense; it was intended in the - former sense. - - That sentence should probably be changed to "Wireshark must be then set - up..." to avoid the ambiguity. - - Make it so (over half a year later, sigh), and change another case where - "should" is meant in the first sense while we're at it. - - Change-Id: I90198d1616619c75802deeeb703ceee0c8bac1bf - Reviewed-on: https://code.wireshark.org/review/36155 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit c268e9b0d563cfd248fae611c06e39430e1bad6c) - Reviewed-on: https://code.wireshark.org/review/36158 - -commit 3e8163790d -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 16 08:58:54 2020 +0000 - - [Automatic update for 2020-02-16] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I2feb9bb26444e5047db077addad9b05c35582ebb - Reviewed-on: https://code.wireshark.org/review/36119 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 6b98dc6370 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 12 12:07:52 2020 -0800 - - WiMax DLMAP: Fix a large loop. - - Make sure we advance our offset. - - Bug: 16383 - Ping-Bug: 16368 - Change-Id: I4949cb0988601dbe545d0bc22de4d654b4e61204 - Reviewed-on: https://code.wireshark.org/review/36085 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 6dad599a8a1bda8b8e999cc4a7e460140e4ecc0a) - Reviewed-on: https://code.wireshark.org/review/36094 - -commit 97cb5e9cb9 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 9 08:58:21 2020 +0000 - - [Automatic update for 2020-02-09] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: Ib29ea40d51b569f366ad46ba979f7e9b974df29f - Reviewed-on: https://code.wireshark.org/review/36063 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 93d6b03a67 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Feb 7 11:17:35 2020 -0800 - - WiMax DLMAP: Add a length check. - - Make sure we have enough data for a CRC. - - Bug: 16368 - Change-Id: I03a2532061a5cf5e28cb65c83dd4ab90654d1679 - Reviewed-on: https://code.wireshark.org/review/36051 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 9eb2802176 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 2 08:58:28 2020 +0000 - - [Automatic update for 2020-02-02] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I5c054a84cb1d2b34901306e7079fdebbb5f55c24 - Reviewed-on: https://code.wireshark.org/review/36008 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 093a10ca3c -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 31 16:39:37 2020 -0800 - - Check for liblua-{version} as well as liblua{version}. - - FreeBSD packages install liblua-{version}. - - Change-Id: Ib28d2032a13baff9da42d61e3054a8b8e64b5cc9 - Reviewed-on: https://code.wireshark.org/review/35994 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit 20e9652179221ec4e7399eae2bda2a1fff44cb36) - Reviewed-on: https://code.wireshark.org/review/35997 - -commit a7ad54e1df -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 27 15:46:24 2020 -0800 - - Fix indentation. - - Change-Id: Ib80213ecb5c02d64f107706971c646decc601e8d - Reviewed-on: https://code.wireshark.org/review/35967 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit 0c112e2e242005437698961d41b6758c22cdbc7b) - Reviewed-on: https://code.wireshark.org/review/35970 - -commit c9eed5d79d -Author: Dario Lombardo <lomato@gmail.com> -Date: Fri Jan 10 15:42:58 2020 +0100 - - Fix compilation with gcc-9. - - gcc-9 spotted some NULL pointer usages. - - Bug: 16319 - Change-Id: I3e4ac57705f1852c43299f5e924fc642a2c56a3a - Reviewed-on: https://code.wireshark.org/review/35733 - Reviewed-by: Peter Wu <peter@lekensteyn.nl> - Petri-Dish: Peter Wu <peter@lekensteyn.nl> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 084a887a30b78a3f4f42aa35a15049c251adfcfa) - Reviewed-on: https://code.wireshark.org/review/35966 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit bac736d162 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 26 08:57:54 2020 +0000 - - [Automatic update for 2020-01-26] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I649e5ad3dc0bcde94b0e30d0d7718d9b83f6db96 - Reviewed-on: https://code.wireshark.org/review/35952 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 28dc014dc2 -Author: Erwin Rol <erwin@erwinrol.com> -Date: Sat Jan 11 17:14:44 2020 +0100 - - rdm: Remove incorrect dissection of ack overflow data - - Ack overflow data was incorrectly dissected causing checksum errors. For now - just display raw data. - - Change-Id: Icdd858bdbeeb4dd40e48c45fc46e5e188d53be69 - Signed-off-by: Erwin Rol <erwin@erwinrol.com> - Reviewed-on: https://code.wireshark.org/review/35915 - Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> - Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - (cherry picked from commit 4f462bb6e3470ccb09b8da1efd4f133169aef03d) - Reviewed-on: https://code.wireshark.org/review/35945 - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - -commit 80504ef3ca -Author: Erwin Rol <erwin@erwinrol.com> -Date: Tue Dec 24 10:52:37 2019 +0100 - - artnet: Fix ArtPollReply universe calculation - - The SubSwitch field holds bit 7-4 of the 15bit port address, but - it holds it in bit 3-0 so we have to shift it 4 bits instead of - taking bit 7-4 of the SubSwitch field. - - Change-Id: I7841d64749e8a561e4ee928a23a3c46cb5be34cb - Signed-off-by: Erwin Rol <erwin@erwinrol.com> - Reviewed-on: https://code.wireshark.org/review/35910 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - (cherry picked from commit 824fef51aa3efc7a146ea57de90b1a6135614496) - Reviewed-on: https://code.wireshark.org/review/35948 - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - -commit b3935dbb52 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Thu Jan 23 02:13:40 2020 +0000 - - IPv4: Fix display of Fragment Offset field - - Bug: 16344 - Change-Id: I0fe0bec606a103e0cb96c6b6da0f98f9b12097b7 - Fixes: v3.1.0rc0-916-g237ec1349f ("IP: Make dissection of ip.frag_offset RFC 791 compliant") - Reviewed-on: https://code.wireshark.org/review/35918 - Petri-Dish: João Valverde <j@v6e.pt> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Reviewed-on: https://code.wireshark.org/review/35929 - Reviewed-by: João Valverde <j@v6e.pt> - -commit 086003c9d6 -Author: Pascal Quantin <pascal@wireshark.org> -Date: Wed Jan 22 11:38:02 2020 +0100 - - LTE RRC: fix a memory leak in composite TVB handling - - Bug: 16341 - Change-Id: Ib6c020ea3df8b39a02f742f0684fca7db96f1fc3 - Reviewed-on: https://code.wireshark.org/review/35899 - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - (cherry picked from commit adeeb7f2da801303768ce96e2cacf6a703a69c6f) - Conflicts: - epan/dissectors/packet-lte-rrc.c - Reviewed-on: https://code.wireshark.org/review/35903 - -commit 3a86df5bbe -Author: Pascal Quantin <pascal@wireshark.org> -Date: Mon Jan 20 21:38:44 2020 +0100 - - ICMP/ICMPv6: fix request/response tracking for checksum 0x0000 - - Apply the change proposed by Chris Maynard in - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16334 - - Bug: 16334 - Change-Id: I91d79d992c107ca4ddaa17c25c3629424cc240f6 - Reviewed-on: https://code.wireshark.org/review/35878 - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Reviewed-on: https://code.wireshark.org/review/35884 - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - -commit 69c5a2feb9 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 19 08:58:04 2020 +0000 - - [Automatic update for 2020-01-19] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I3c4340d26da0af882a4ed29db47360b5e2538cfa - Reviewed-on: https://code.wireshark.org/review/35866 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 6a901125d0 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Sat Jan 18 20:03:02 2020 +0100 - - Qt: Support ampersand in profile name - - An ampersand in the menu item text is used as shortcut, so use "&&" to - get a real ampersand. - - Change-Id: Iea1e10f23db582cded83182778be815cfeece7bd - Reviewed-on: https://code.wireshark.org/review/35861 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit f8e92a21fb2e981d7bb5e019cbf781ec43031665) - Reviewed-on: https://code.wireshark.org/review/35862 - -commit c589a695b3 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Jan 15 22:14:16 2020 +0100 - - lapdm(.h): fix duplicate include guard (found by lgtm.com) - - Change-Id: I3cf4d30f5e91b6182c64b7f016e03d63aa1066d0 - Reviewed-on: https://code.wireshark.org/review/35829 - Petri-Dish: Guy Harris <guy@alum.mit.edu> - Tested-by: Petri Dish Buildbot - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit 3e072f1bc9d89c070b1e8a81e8fffcd11fa19cbd) - Reviewed-on: https://code.wireshark.org/review/35834 - -commit 8dcd5dff7f -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 15 12:38:37 2020 -0800 - - 2.6.14 → 2.6.15. - - Change-Id: I05dec99b3454f2100b562fe65ecfbd235e0cdd0f - Reviewed-on: https://code.wireshark.org/review/35827 - Reviewed-by: Gerald Combs <gerald@wireshark.org> diff --git a/configure.ac b/configure.ac index 14290fa19e..cc6e3dca9f 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # m4_define([version_major], [2]) m4_define([version_minor], [6]) -m4_define([version_micro], [15]) +m4_define([version_micro], [16]) dnl Updated by make-version.pl m4_define([version_extra], []) m4_define([version_micro_extra], m4_join([], version_micro, version_extra)) diff --git a/debian/changelog b/debian/changelog index 0b55ea3d91..cde5dc9558 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (2.6.15) unstable; urgency=low +wireshark (2.6.16) unstable; urgency=low * Self-made package diff --git a/docbook/attributes.asciidoc b/docbook/attributes.asciidoc index b3ec5e04d4..5dd95f4932 100644 --- a/docbook/attributes.asciidoc +++ b/docbook/attributes.asciidoc @@ -1,6 +1,6 @@ // Common attributes -:wireshark-version: 2.6.15 +:wireshark-version: 2.6.16 // We're migrating from AsciiDoc. :compat-mode: diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 8caa369ce4..5be7aa3f89 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -17,32 +17,14 @@ It is used for troubleshooting, analysis, development and education. // The following vulnerabilities have been fixed: -* wssalink:2020-03[] -LTE RRC dissector memory leak. -wsbuglink:16341[]. +* wssalink:2020-07[] +A dissector went awry. +// wsbuglink:xxxx[]. // cveidlink:2019-xxxxx[]. -// Fixed in master: adeeb7f2da -// Fixed in master-3.2: 0ce952b724 -// Fixed in master-3.0: 873dca931a -// Fixed in master-2.6: 086003c9d6 - -* wssalink:2020-04[] -WiMax DLMAP dissector crash. -wsbuglink:16368[]. -// cveidlink:2019-xxxxx[]. -// Fixed in master: 7ce2ca316c, 6dad599a8a -// Fixed in master-3.2: 49c6720028, 5a13c2316f -// Fixed in master-3.0: 135cf649b1, 3daba57466 -// Fixed in master-2.6: 93d6b03a67, 6b98dc6370 - -* wssalink:2020-05[] -EAP dissector crash. -wsbuglink:16397[]. -// cveidlink:2019-xxxxx[]. -// Fixed in master: 8bda8642df -// Fixed in master-3.2: 79769da3b5 -// Fixed in master-3.0: 924ae4d091 -// Fixed in master-2.6: 9fe2de783d +// Fixed in master: xxxx +// Fixed in master-3.2: xxxx +// Fixed in master-3.0: xxxx +// Fixed in master-2.6: xxxx The following bugs have been fixed: @@ -52,12 +34,6 @@ The following bugs have been fixed: //* Wireshark convinced you to switch seats on the plane while neglecting to tell you that its seat was noticeably moist. // cp /dev/null /tmp/buglist.txt ; for bugnumber in `git log --stat v2.6.16rc0..| grep ' Bug:' | awk '{print $2}' | sort -n -u ` ; do "$(git rev-parse --show-toplevel)/tools/gen-bugnote" $bugnumber; pbpaste >> /tmp/buglist.txt; done -* Wireshark fails to build with GCC-9. wsbuglink:16319[]. - -* ICMP: No response if ICMP reply packet has an ICMP checksum of 0x0000. wsbuglink:16334[]. - -* IPv4 fragment offset value is incorrect in IPv4 header decode. wsbuglink:16344[]. - === New and Updated Features There are no new features in this release. @@ -75,14 +51,6 @@ There are no new protocols in this release. // Add one protocol per line between the -- delimiters. [commaize] -- -ARTNET -EAP -ICMP -ICMPv6 -IPv4 -LTE RRC -RDM -WiMax DLMAP -- === New and Updated Capture File Support diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index d8adc98b35..91a1002d24 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -312,7 +312,7 @@ add_library(epan add_dependencies(epan version) -set(FULL_SO_VERSION "11.1.15") +set(FULL_SO_VERSION "11.1.16") set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" diff --git a/epan/Makefile.am b/epan/Makefile.am index d8b0d5e2b3..035ecaa804 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -300,7 +300,7 @@ nodist_libwireshark_la_SOURCES = \ libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 11:15:1 @LDFLAGS_BIGSHAREDLIB@ @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 11:16:1 @LDFLAGS_BIGSHAREDLIB@ @LDFLAGS_SHAREDLIB@ if HAVE_LIBLUA wslua_lib = wslua/libwslua.la diff --git a/make-version.pl b/make-version.pl index a50f3ec07f..bd505c2b83 100755 --- a/make-version.pl +++ b/make-version.pl @@ -73,7 +73,7 @@ my $set_release = 0; my %version_pref = ( "version_major" => 2, "version_minor" => 6, - "version_micro" => 15, + "version_micro" => 16, "version_build" => 0, "enable" => 1, diff --git a/version.conf b/version.conf index cc8d9d1108..b999997703 100644 --- a/version.conf +++ b/version.conf @@ -1,9 +1,9 @@ # Interim releases: Enable packaging, add an "rc" to the version. -#enable: 1 -#pkg_format: rc0-%# -#pkg_enable: 1 +enable: 1 +pkg_format: rc0-%# +pkg_enable: 1 # Final release: Disable package version stamps. -enable: 1 -pkg_format: -pkg_enable: 0 +#enable: 1 +#pkg_format: +#pkg_enable: 0 diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index a51a2c20c9..2a9c0368f0 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -115,7 +115,7 @@ add_library(wiretap add_dependencies(wiretap version) -set(FULL_SO_VERSION "8.0.15") +set(FULL_SO_VERSION "8.0.16") set_target_properties(wiretap PROPERTIES PREFIX "lib" diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 3eadd7deba..76e26c5764 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -188,7 +188,7 @@ libwiretap_la_SOURCES = \ version_info.c # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 8:15:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 8:16:0 @LDFLAGS_SHAREDLIB@ libwiretap_la_LIBADD = ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) |