diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ChangeLog | 1007 | ||||
| -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 | 94 | ||||
| -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, 28 insertions, 1103 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0aebe2adbd..4648d859d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ project(Wireshark C CXX) set(GIT_REVISION 0) set(PROJECT_MAJOR_VERSION 2) set(PROJECT_MINOR_VERSION 4) -set(PROJECT_PATCH_VERSION 4) +set(PROJECT_PATCH_VERSION 5) set(PROJECT_BUILD_VERSION ${GIT_REVISION}) set(PROJECT_VERSION_EXTENSION "") @@ -1,1007 +0,0 @@ -commit c3d81906d4 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 10 12:05:17 2018 -0800 - - Build 2.4.4. - - Change-Id: I9604b35acca293fde78bf6b4c3b90ffe2232c6ac - -commit d6b2f2a6ce -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 9 09:45:13 2018 -0800 - - IxVeriWave: Adjust signature timestamp checking. - - Move the signature timestamp bounds checks inside get_signature_ts. Fix - what appears to be an off-by-one error. - - Bug: 14297 - Change-Id: I9ca1762a8418e47153f270a1a62b2d0d3a800130 - Reviewed-on: https://code.wireshark.org/review/25229 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 5dbc1d8d1c14aea4fda820567d6ac0e226027ed3) - Reviewed-on: https://code.wireshark.org/review/25245 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit d4ee5fafea -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 9 16:22:07 2018 -0800 - - More 2.4.4 updates. - - Change-Id: Id790d2c807c8021c431e5a340210190415903671 - Reviewed-on: https://code.wireshark.org/review/25236 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 568ccd2250 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 9 11:31:40 2018 -0800 - - WCP: Add a length check. - - Add a bounds check for the current window. Blind attempt at fixing bug - 14251. - - Bug: 14251 - Change-Id: Ia3775bcabb2dc633b6994547125e53a4fe23451e - Reviewed-on: https://code.wireshark.org/review/25230 - 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 a7e29d8b66dd7c1cb691966938404dafc6b89689) - Reviewed-on: https://code.wireshark.org/review/25233 - -commit 87d86189cc -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Jan 9 15:27:46 2018 +0100 - - Fix tvbparse recursion limit check. - - When doing recursion check we must also count down when done. - - Bug: 14253 - Change-Id: Icacc86e8b25e106e151117dbcc2f132b1bbe898e - Reviewed-on: https://code.wireshark.org/review/25226 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit c51560985a43592a79c29baba4f79f399a8e15dd) - Reviewed-on: https://code.wireshark.org/review/25227 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - -commit f2fd4df276 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Dec 28 12:34:20 2017 -0500 - - Populate Remote Interfaces with data from recent file - - Remote Interfaces have been saved in the recent_common file however - they were never populated by the GUI. - - # Conflicts: - # ui/recent.c - - Bug: 8557 - Change-Id: Ib68a75ce02f5b5e2c115b72d58c3e781a5122f9f - Reviewed-on: https://code.wireshark.org/review/25039 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Reviewed-on: https://code.wireshark.org/review/25067 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 4e4597484a -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Jan 8 15:14:58 2018 -0800 - - Prep for 2.4.4. - - Change-Id: Ie950f6812da119e9022337e94a534e767e1b55cb - Reviewed-on: https://code.wireshark.org/review/25213 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 374e3d4bcf -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Jan 8 13:54:00 2018 -0800 - - Limit tvbparse recursion. - - Add a recursion check to tvbparse so that we don't overflow our stack. - - Bug: 14253 - Change-Id: I0f667c3720311318267a1184b33e33253f8ff729 - Reviewed-on: https://code.wireshark.org/review/25202 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit 94479aded162aecce6289bdf26f95073bed0dc55) - Reviewed-on: https://code.wireshark.org/review/25211 - Petri-Dish: Michael Mann <mmann78@netscape.net> - -commit db66351946 -Author: Jon DeVree <nuxi@vault24.org> -Date: Mon Jan 8 01:22:53 2018 -0500 - - Do not automatically enable the linux kernel's BPF JIT compiler - - The default value of kernel.unprivileged_bpf_disabled is 0 which means - this is enabling the BPF JIT compiler for unprivileged users. Given that - this is a known attack vector for Spectre variant 1 (CVE-2017-5753) this - is not a setting that a utility should be tampering with. - - Tshark's and dumpcap's help message is changed by Balint Reczey to suggest - enabling BPF manually after considering security-related implications. - - Change-Id: I1cc34cbd6e84485eba9dee79a8700aa388354885 - Signed-off-by: Balint Reczey <balint.reczey@canonical.com> - Bug: 14313 - Reviewed-on: https://code.wireshark.org/review/25192 - Reviewed-by: Balint Reczey <balint@balintreczey.hu> - Petri-Dish: Balint Reczey <balint@balintreczey.hu> - Reviewed-by: João Valverde <j@v6e.pt> - Tested-by: Petri Dish Buildbot - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry-picked from commit 51e0d22ec6db124abca69a1cc35905c9342c884a) - Reviewed-on: https://code.wireshark.org/review/25206 - -commit 391cdf7531 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 8 15:40:50 2018 -0800 - - Copy preferences to capture options after the preferences are initially loaded. - - We copy them after, for example, switching profiles; we should do so - when they're initially loaded as well. - - Change-Id: Iadd67d20b1be8cc14be1b19543f914f71e4c9c00 - Reviewed-on: https://code.wireshark.org/review/25208 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit 7ec5dead2ffc03f009398a0a30217052e6749ad0) - Reviewed-on: https://code.wireshark.org/review/25209 - -commit 36819b7ec9 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 8 14:02:15 2018 -0800 - - Fix comment, get rid of extra blank line. - - Change-Id: I073975f6468b5fb6c4d404f3778427786e0a3137 - Reviewed-on: https://code.wireshark.org/review/25203 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit 7a911f29271d1e075ff1861eafa9393589c9896a) - Reviewed-on: https://code.wireshark.org/review/25204 - -commit b08c621e75 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 7 08:23:14 2018 +0000 - - [Automatic update for 2018-01-07] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I12e354aa276e05b5f324620f9b75775e87c161b5 - Reviewed-on: https://code.wireshark.org/review/25179 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit b2d6d1ed23 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Jan 5 09:58:39 2018 +0100 - - btsmp: Put <none> in COL_INFO when having no keys - - Change-Id: If2db9fa1894f586523df882dca224b3b7b0eecb0 - Reviewed-on: https://code.wireshark.org/review/25153 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit fdfa22979374b9790667232f33347a08c297aba4) - Reviewed-on: https://code.wireshark.org/review/25155 - -commit 9f75f7bcbc -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Jan 5 09:45:20 2018 +0100 - - btatt: Avoid duplicate "Handle:" in COL_INFO - - Do not add two "Handle:" in COL_INFO for opcode "Error Response". - - Change-Id: I13dd5fc3bbef1762c2e868dfe885fa5d6437412e - Reviewed-on: https://code.wireshark.org/review/25152 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit fb9abcf2d4c50c2ff528ee2ed5750fbab48743bf) - Reviewed-on: https://code.wireshark.org/review/25154 - -commit 79e565304c -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Wed Jan 3 12:14:41 2018 +0100 - - bthci: Update bthci_cmd_appearance_vals - - Change-Id: I385808b95f823a2242844173927cc6abd05c1905 - Reviewed-on: https://code.wireshark.org/review/25125 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit e7b50f47519637d4e21eb25d7ef30f14cf5d10fc) - Reviewed-on: https://code.wireshark.org/review/25126 - -commit 5a5e4f022b -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Jan 1 12:24:06 2018 +0100 - - Happy New Year 2018! - - Change-Id: I61ece8256384786c718fe2c1bc8813560fa372eb - Reviewed-on: https://code.wireshark.org/review/25094 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit 564a3fae124afaaf6b2d7f2b9cda716fbd7f6f14) - Reviewed-on: https://code.wireshark.org/review/25095 - -commit 8c50c80349 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 31 08:23:04 2017 +0000 - - [Automatic update for 2017-12-31] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I52df12729f8cb82733a57db289553247717f14a2 - Reviewed-on: https://code.wireshark.org/review/25081 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 3ab5d93626 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Thu Dec 28 23:10:38 2017 +0100 - - btatt: Skip Units and Members UUIDs in decode-as - - Change-Id: I926c2abdfb6620236fabd6ae5aa1aa35d1fa79d2 - Reviewed-on: https://code.wireshark.org/review/25050 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit b60a60717f8d3ac23253f5cc1767c8a8c58f06a3) - Reviewed-on: https://code.wireshark.org/review/25074 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit ac15c966d7 -Author: Thomas Chen <funorpain@gmail.com> -Date: Fri Dec 29 21:26:42 2017 +0800 - - proto_data.c: Fix bug in p_remove_proto_data. - - Change-Id: I44654b1aa6f513a0bccb88cba3181f5c52073832 - Reviewed-on: https://code.wireshark.org/review/25065 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - (cherry picked from commit 998507d327b9c57d5b3a9627bc5a1dcd40e4756d) - Reviewed-on: https://code.wireshark.org/review/25078 - -commit 786ec96d70 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Thu Dec 28 23:09:46 2017 +0100 - - bluetooth: Update Assigned Numbers - - Change-Id: I1565d8fa8983c36a6efe6ffbdb97b1e874632891 - Reviewed-on: https://code.wireshark.org/review/25049 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - (cherry picked from commit c693522e3312d4b7c4e4f68409e39f1000644631) - Reviewed-on: https://code.wireshark.org/review/25073 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 1a2b8913cb -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Dec 28 22:10:59 2017 -0800 - - No need to remove the old name after a save-with-move; it was, well, *moved*. - - Change-Id: Ic76eee870aff69b9daaf80d99fa619bf762258a1 - Reviewed-on: https://code.wireshark.org/review/25058 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit c791549a778aa34d83154b27fc9cd272e0d14881) - Reviewed-on: https://code.wireshark.org/review/25061 - -commit e68fa50eac -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Dec 28 20:58:38 2017 -0800 - - Do the right check for "no name resolution information to save". - - The check that the pcapng code does is "do we have a non-null - addrinfo_lists_t * and, if so, does it have a non-null ipv4_addr_list or - ipv6_addr_list"? - - The check that the file-save code was using was just "do we have a - non-null addrinfo_lists_t *", so sometimes it'd think we couldn't do a - "quick save" even though we had no name resolution information to write - out to the capture file. - - Make a routine that does that check, and use it in *both* places. - - Change-Id: Id4720f4fe4940354320b2b7621ca5e37e45ec1f3 - Reviewed-on: https://code.wireshark.org/review/25055 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit 9bf40d4a6e507e10c8429a758ac190146caf48d6) - Reviewed-on: https://code.wireshark.org/review/25056 - -commit 1ade911a6a -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Dec 28 19:58:04 2017 -0800 - - If we save a temporary file by copying or writing, remove it when we're done. - - Temporary files aren't supposed to stay around once we've done a save; - the packets are now in the file to which we saved the contents. - - Bug: 14298 - Change-Id: Ic64b1324fe92bda66ccbb82475ff75ad67637304 - Reviewed-on: https://code.wireshark.org/review/25052 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit c5dbcca2e4f3613f04e74715269c611dbb5259d1) - Reviewed-on: https://code.wireshark.org/review/25053 - -commit 3c9cbc7d38 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Tue Dec 26 11:48:04 2017 +0000 - - potential buffer underflow in File_read_line function in epan/wslua/wslua_file.c - - Putting up for review, though I am not completely convinced that - file_gets() can return an empty line. - - Bug: 14295 - Change-Id: If36761ea511b66c01a9f167809a218a7eadbfcc5 - Reviewed-on: https://code.wireshark.org/review/24997 - Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 137ab7d5681486c6d6cc8faac4300b7cd4ec0cf1) - Reviewed-on: https://code.wireshark.org/review/25034 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit beb30f96e6 -Author: Roland Knall <rknall@gmail.com> -Date: Wed Dec 27 19:19:49 2017 +0100 - - extcap: Increase spawn size - - Increase the spawn size to prevent windows from stopping if the - output of the extcap utility is too long - - # Conflicts: - # extcap_spawn.c - - Bug: 12845 - Change-Id: I162b1322fd970777d2156d869e95b005b0f045ac - Reviewed-on: https://code.wireshark.org/review/25014 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Roland Knall <rknall@gmail.com> - Reviewed-on: https://code.wireshark.org/review/25026 - -commit eb115f2a05 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Dec 26 10:33:22 2017 -0800 - - Fix some comments. - - Change-Id: I8f22a38a944573e43f6232e0fab6188967deefd6 - Reviewed-on: https://code.wireshark.org/review/24999 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit 6e844dc46ad56d5ea9439c7e49c67251fdfb9900) - Reviewed-on: https://code.wireshark.org/review/25001 - -commit 3fd621326e -Author: Dario Lombardo <lomato@gmail.com> -Date: Mon Dec 25 23:12:55 2017 +0100 - - wiretap: remove unneeded check (CID: 1396988). - - Existence of in_file has been checked in line 908. - - Change-Id: Ida6c06362a1f88caec40701be7f3e42133ce404a - Reviewed-on: https://code.wireshark.org/review/24994 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit c18bc1291d42423e907d2ce0b3d4f39ecd59e675) - Reviewed-on: https://code.wireshark.org/review/25000 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit a653fdfa0e -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Dec 22 20:05:44 2017 -0500 - - Add Service Response Time dialog for SCSI. - - SCSI requires parameter data to be passed into the tap. Provide - a new dialog that can handle SCSI commands. - - Bug: 14144 - Change-Id: I4561f251ec38753a28befee33b8b994b04b92230 - Reviewed-on: https://code.wireshark.org/review/24955 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 386f354f878c1a72ef3c3eba708f936261fb7e09) - Reviewed-on: https://code.wireshark.org/review/24982 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 07477b57e5 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 24 08:17:44 2017 +0000 - - [Automatic update for 2017-12-24] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: Ia60c31e4dce80db63b724900ce3c5629537ecc5a - Reviewed-on: https://code.wireshark.org/review/24975 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit c6b15a6119 -Author: Peter Wu <peter@lekensteyn.nl> -Date: Sun Dec 24 02:04:44 2017 +0100 - - mip: properly advance offset if !tree - - The offset must be advanced or else dissection of the following - extensions will result in a malformed packet exception. - - Bug: 14292 - Change-Id: I8b5cb2f377c8d3e01677b76f5bb6c3126dea64f9 - Reviewed-on: https://code.wireshark.org/review/24970 - Petri-Dish: Peter Wu <peter@lekensteyn.nl> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit b1a2bef8bda4e8472757549b567fe5b775d481aa) - Reviewed-on: https://code.wireshark.org/review/24972 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - -commit 7f80106110 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Dec 22 15:50:16 2017 -0500 - - RPC Service Response Time dialog: Fix crash - - There were a few use-after-free situations. Fix one by using epan API - to get program name for tap structure. - tap structure shouldn't be deleted because it's needed. Will be freed - by the tap reset/free function. - - Change-Id: Ia18d84340362839926036c777106ca1c6d1b18f5 - Ping-Bug: 14141 - Reviewed-on: https://code.wireshark.org/review/24950 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit 54f6df525e57513398e348b76cd7395e6a4b1298) - Reviewed-on: https://code.wireshark.org/review/24956 - -commit 6e582716e8 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Thu Dec 21 11:00:09 2017 +0100 - - [BSSAP] Fix mandatory IEs in Uplink Tunnle request(add IMSI) - - Bug: 14289 - Change-Id: I720b31a6275b4b9a9eeff34b5fd0554cd6fcb7d3 - Reviewed-on: https://code.wireshark.org/review/24924 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit a5c22592579e3841fd69be5ff9b4a3620e06fa8a) - Reviewed-on: https://code.wireshark.org/review/24927 - -commit 63549ae4c4 -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Dec 20 19:23:21 2017 -0500 - - NULL check some g_log statements for extcap. - - "Yes, on *most* UN*Xes, that causes "(null)" to be printed, but it causes a crash on at - least some versions of Solaris, so Don't Do It." - Guy Harris - - Bug: 14194 - Change-Id: Iff0d59803d78b1e87a564e8bcdc5c84af485eea6 - Reviewed-on: https://code.wireshark.org/review/24922 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit bb5ade02d5f9250c75c74d3920edaeea51561ad0) - Reviewed-on: https://code.wireshark.org/review/24923 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 971806c095 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Wed Dec 20 10:49:56 2017 +0100 - - Qt: Improve ColumnEditorFrame stretching - - Use more free space in the ColumnEditorFrame for the Fields entry. - - Change-Id: I6bdf2c6ce187dbd2aae08da00d99bda683dc5970 - Reviewed-on: https://code.wireshark.org/review/24907 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit 153d588972ee4893b664b64f9e8b9f6285972744) - Reviewed-on: https://code.wireshark.org/review/24916 - -commit e447d26315 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Dec 18 21:02:52 2017 +0100 - - Qt: Resolve duplicate keyboard shortcuts - - Two Edit->Copy methods are using the same keyboard shortcut as other - functionality: - - 1. Ctrl+Shift+D is used for "Copy this item's description" and - "Ignore All Displayed packets" - - 2. Ctrl+Shift+F is used for "Copy this item's field name" and - "Reload as File Format/Capture" - - Resolve this by changing the Copy methods to use Ctrl+Alt+Shift as modifier. - Add a keyboard shortcut for "Copy all visible items" while here. - - Change-Id: I0d963501055e63963d93e211f592aa9e82801d3c - Reviewed-on: https://code.wireshark.org/review/24884 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 7cb6255f17b90863d863ad995d7bca5921b7c517) - Reviewed-on: https://code.wireshark.org/review/24891 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 7e12ae6171 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Dec 19 09:58:03 2017 +0000 - - Revert "Qt: Add Collapse Subtrees" - - This reverts commit 0ee034a4ff2fad19412cf91656806af7e961e760. - - Change-Id: I6630dafe1984c5179ec7dbb3d33e81018a3ff663 - Reviewed-on: https://code.wireshark.org/review/24896 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 0ee034a4ff -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Dec 18 10:25:03 2017 +0100 - - Qt: Add Collapse Subtrees - - This item is missing from the Qt port. - - Change-Id: Iacc18a7c2eb2368d6566622788a4e900868d446e - Reviewed-on: https://code.wireshark.org/review/24879 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 9f7b8713fa8286611e84a68f82adc2d494b21173) - Reviewed-on: https://code.wireshark.org/review/24889 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 54427b6552 -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Jun 28 20:00:38 2017 -0400 - - Add a model to use for Expert Info dialog. - - With the model (and proxy), the following features were added/fixed. - 1. Expert severities can be filtered by type - 2. Search filter expanded to include summary, protocol and column info - 3. Expert info starts with all items collapsed. - 4. Context menus for collapse/expand all - - # Conflicts: - # ui/qt/CMakeLists.txt - # ui/qt/Makefile.am - # ui/qt/expert_info_dialog.cpp - - Bug: 11753 - Bug: 13831 - Bug: 13842 - Change-Id: I8e89c7be441e1f08e18915ef8805609e5c5d0bd1 - Reviewed-on: https://code.wireshark.org/review/22458 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Roland Knall <rknall@gmail.com> - Reviewed-on: https://code.wireshark.org/review/24859 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 510efe8ae6 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Sat Dec 16 10:33:28 2017 +0000 - - Simple statistics export: fill in callback to get item data - - Bug: 13942 - - Change-Id: Ie7d13b1c17083d0a5b98282f04e6ac30319352a7 - Reviewed-on: https://code.wireshark.org/review/24853 - Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit f4b2263a0b753984c3ce97f2709ed4e435afe9ff) - Reviewed-on: https://code.wireshark.org/review/24871 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit ce99af0de3 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 17 08:24:54 2017 +0000 - - [Automatic update for 2017-12-17] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I47bcab7b08736e0aebf58ce968da4617e04d8617 - Reviewed-on: https://code.wireshark.org/review/24868 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 61d9b08d38 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Dec 15 19:26:00 2017 +0100 - - wslua: Fix crash in Dir.open() - - Do not give an uninitialised error pointer to g_dir_open(), this - will give a crash if g_dir_open() fails. - - Remove wslua_dir.dummy because it is not used by anyone. - - Change-Id: I044eee021393f2ea2aa022138bbf6fd099eb0908 - Reviewed-on: https://code.wireshark.org/review/24840 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit 3d086e638dc0a1713328c23161671555dfa4faaf) - Reviewed-on: https://code.wireshark.org/review/24854 - -commit e9efc0fe14 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Dec 15 21:38:30 2017 +0100 - - wslua: Fix memory leakages - - Free some variables in error handling. - - Change-Id: I0d0653962b11f760c31872aa7e5b5f1d20c54dcb - Reviewed-on: https://code.wireshark.org/review/24842 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit 28ba56667599c7a90c8492052b438f58aa963902) - Reviewed-on: https://code.wireshark.org/review/24855 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit a6b54342e0 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Dec 15 13:41:21 2017 +0100 - - epan: Add default type handling for custom column - - Add default type handling in proto_custom_set() to prevent crashes when - trying to use FT_IPXNET, FT_AX25 or FT_VINES items as custom columns. - - This will also work as a safeguard when adding new types. - - Change-Id: Iaf3b48aec72f0e5c10332b0e6d5f7221b0196e15 - Reviewed-on: https://code.wireshark.org/review/24836 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 774a986ec07be46263e7acbbec4fbb69563a95a1) - Reviewed-on: https://code.wireshark.org/review/24852 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 41173641a2 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Dec 15 14:35:44 2017 +0100 - - Qt: Fix translating some texts - - Change-Id: I8267bfd96efe9d9d086913ff418a74a68e63b8da - Reviewed-on: https://code.wireshark.org/review/24837 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit a51ac8d398aeedf9a678188147a89bf1ee035443) - Reviewed-on: https://code.wireshark.org/review/24851 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 7b4fdc956a -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 13 19:16:28 2017 -0800 - - Register the UDS dissector by name. - - See - - https://ask.wireshark.org/question/891/use-uds-dissector-inside-doip-dissector/ - - Change-Id: I608b4ffb90e65fd31e9f3e421f4c473f4e66bebd - Reviewed-on: https://code.wireshark.org/review/24818 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - (cherry picked from commit 6af7b9a63ad8c7ce7b57e0d8adcb5e61d70a2123) - Reviewed-on: https://code.wireshark.org/review/24819 - -commit 1881c53d12 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Dec 12 23:34:03 2017 +0100 - - epan: Use expert info summary text as field name - - Change the expert info registry to use summary text as field name instead - of blurb to show the correct column header tooltip in custom columns. - - Preserve backward compability by not use empty summary text. - - Change-Id: Ibbaf142165be0d9f42d1e2476f39f8d251ea0593 - Reviewed-on: https://code.wireshark.org/review/24788 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit f945b85391976bc59da4b542fe84cb58033bd22e) - Reviewed-on: https://code.wireshark.org/review/24791 - -commit 7669fa889a -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Dec 12 23:29:24 2017 +0100 - - epan: Show a check mark in custom columns for FT_NONE types - - This is valuable when adding a expert info field as custom column, - but will also make sense for other FT_NONE types. - - Change-Id: Ib1a14c59a5450f2e713f190aecf3484586d116c4 - Reviewed-on: https://code.wireshark.org/review/24787 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit e4750105b23c2e19cfa4fbb79679b4a045ec0ebe) - Reviewed-on: https://code.wireshark.org/review/24790 - -commit af441951fa -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Dec 12 15:36:26 2017 +0100 - - epan: Use check mark in protocol custom column - - Change from the text "Yes" to a utf8 check mark to indicate the - precense of a protocol in custom columns. - - Change-Id: I9510333fc12148bf1f61aa2ddea2c6d390a9491a - Reviewed-on: https://code.wireshark.org/review/24783 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit 158d9298840434f2770c96bd3b8d2f44792932d1) - Reviewed-on: https://code.wireshark.org/review/24789 - -commit 957e752d2d -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sat Dec 9 18:34:31 2017 +0100 - - qt: follow stream: fix crash during close - - The Follow Stream dialogue's button "Filter out this stream" filters out - the stream's packets and then closes the Follow Stream dialogue. This may - take a moment. If the user presses the Close button while the filtering - is still running, the dialogue will be closed twice. This causes a crash - which can be seen in ASAN builds. - - ==9485==ERROR: AddressSanitizer: SEGV on unknown address 0x60205e80001b (pc 0x7f923e672b8c sp 0x7fff73104600 bp 0x7fff73104600 T0) - #0 0x7f923e672b8b in QCoreApplicationPrivate::sendThroughObjectEventFilters(QObject*, QEvent*) (/usr/lib/x86_64-linux-gnu/libQt5Core.so.5+0x2d9b8b) - #1 0x7f924f46010b in QApplicationPrivate::notify_helper(QObject*, QEvent*) (/usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5+0x13f10b) - #2 0x7f924f4655ff in QApplication::notify(QObject*, QEvent*) (/usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5+0x1445ff) - #3 0x7f923e672dca in QCoreApplication::notifyInternal(QObject*, QEvent*) (/usr/lib/x86_64-linux-gnu/libQt5Core.so.5+0x2d9dca) - #4 0x7f924f49ae54 in QWidgetPrivate::close_helper(QWidgetPrivate::CloseMode) (/usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5+0x179e54) - #5 0x55f3e249582f in FollowStreamDialog::close() /media/sf_wireshark.git/ui/qt/follow_stream_dialog.cpp:327 - #6 0x55f3e236e534 in FollowStreamDialog::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ui/qt/moc_follow_stream_dialog.cpp:155 - ... - SUMMARY: AddressSanitizer: SEGV ??:0 QCoreApplicationPrivate::sendThroughObjectEventFilters(QObject*, QEvent*) - ==9485==ABORTING - - Ignore the Close button if we know that we'll be closing the dialogue shortly. - - Change-Id: Ibf1684fd75937e6b24fcb9ea62ae6acb038260e6 - Reviewed-on: https://code.wireshark.org/review/24777 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit 621498f88e882dbe8cc3a2c8373bb342bb0dbe77) - Reviewed-on: https://code.wireshark.org/review/24780 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 8f2af03865 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Dec 10 22:17:04 2017 +0100 - - NTP: fix parsing of multiple comma separated identifiers - - Bug: 14268 - Change-Id: Id1d6040052d34d3f8bdfe49d20f4f3f8efbe001b - Reviewed-on: https://code.wireshark.org/review/24755 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit 7d383637865e2f1f0de7a8921261f406f42af4bf) - Reviewed-on: https://code.wireshark.org/review/24760 - Petri-Dish: Michael Mann <mmann78@netscape.net> - -commit 95a747bc0e -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Dec 10 23:09:54 2017 +0100 - - NTP: fix authenticator dissection when padding is used - - Bug: 14269 - Change-Id: Ifdc9af7524a0566e33acbedff3757cff416ce8fb - Reviewed-on: https://code.wireshark.org/review/24758 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit 224e24884a8b37732105bd40a0ee85d5feaaeab1) - Reviewed-on: https://code.wireshark.org/review/24762 - Petri-Dish: Michael Mann <mmann78@netscape.net> - -commit 6add95aff1 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 10 08:23:57 2017 +0000 - - [Automatic update for 2017-12-10] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: Icb6ef64d7878a650fc49dd6f621a396e0a726b9c - Reviewed-on: https://code.wireshark.org/review/24753 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit e1ab84ca41 -Author: Uli Heilmeier <uh@heilmeier.eu> -Date: Fri Dec 8 18:21:04 2017 +0100 - - SOCKS: Display right version in pseudo header - - Use the previous recorded version as version and set field as generated. - - Bug: 14262 - Change-Id: I0872ed826ccd8a5a1b75b071d810404d08ddc7b3 - Reviewed-on: https://code.wireshark.org/review/24741 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit 22a7d8fa8d8b8c7171ede55e7f413d004cb7b099) - Reviewed-on: https://code.wireshark.org/review/24749 - Tested-by: Petri Dish Buildbot - -commit ba22412d16 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Fri Dec 8 16:01:33 2017 +0100 - - [SCTP] Export of reassembled PDU uses wrong tvb. - - Change-Id: I87ff6ef54dff5900a4a92406c87693fec6d9f692 - Reviewed-on: https://code.wireshark.org/review/24737 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - (cherry picked from commit 5d6315fefe6f2ffb1cafb3ad12522a57b43876ba) - Reviewed-on: https://code.wireshark.org/review/24739 - -commit 992373649f -Author: Dario Lombardo <lomato@gmail.com> -Date: Wed Nov 22 10:18:25 2017 +0100 - - sshdump: add option to prevent promiscuous mode. - - Bug: 14237 - Change-Id: I5cecca8ed638c3935c7c77e3a304e4b0527d7fa3 - Reviewed-on: https://code.wireshark.org/review/24530 - Petri-Dish: Dario Lombardo <lomato@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann <mmann78@netscape.net> - (cherry picked from commit c58aed9b73d8989ef82145626e1701769b21e705) - Reviewed-on: https://code.wireshark.org/review/24725 - -commit 66e486d1b0 -Author: Dario Lombardo <lomato@gmail.com> -Date: Wed Nov 22 10:20:44 2017 +0100 - - sshdump: remove extra option check. - - This looked a bit odd since the capture filter is variable length. - Removing it makes sshdump work. - - Change-Id: I454c6263c04019d5e8ecbecd2490dd10185f5c67 - Reviewed-on: https://code.wireshark.org/review/24531 - Petri-Dish: Dario Lombardo <lomato@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit b993c6f05c3a9c3bd8748ffe57928a8d790371f7) - Reviewed-on: https://code.wireshark.org/review/24726 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit ad0ded8858 -Author: Balint Reczey <balint.reczey@canonical.com> -Date: Sat Aug 5 16:36:10 2017 +0200 - - debian: Update symbols files - - Change-Id: Ic2b049ffb1510de7437a291d65f601d337acbd8d - Signed-off-by: Balint Reczey <balint.reczey@canonical.com> - Reviewed-on: https://code.wireshark.org/review/24704 - Petri-Dish: Balint Reczey <balint@balintreczey.hu> - Tested-by: Petri Dish Buildbot - Reviewed-by: Balint Reczey <balint@balintreczey.hu> - -commit 57a465d355 -Author: Balint Reczey <balint.reczey@canonical.com> -Date: Sat Aug 5 16:22:40 2017 +0200 - - debian: Update packaging to match new SO versions - - Change-Id: I86439670797f32b5f5cf4ae37edda2e27c8a6f97 - Signed-off-by: Balint Reczey <balint.reczey@canonical.com> - Reviewed-on: https://code.wireshark.org/review/24703 - Reviewed-by: Balint Reczey <balint@balintreczey.hu> - -commit cad022dcf2 -Author: Pavel Strnad <pavel_strnad@hotmail.com> -Date: Sun Dec 3 10:28:35 2017 +0100 - - tshark: fix pdml export for LUA cases - - bug fix for wrong level introduced in SHA-1:b8ead953 - - fix indent for Close off fake wrapper protocol - - Change-Id: Iccb10af8f3ac1604fc5582d730f2fd39ffaeb1c0 - Reviewed-on: https://code.wireshark.org/review/24681 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit d3a3b0ba27fc46a48273f8f311e1b7fd751fcbc5) - Reviewed-on: https://code.wireshark.org/review/24698 - -commit 19321efa86 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 3 17:04:26 2017 +0000 - - [Automatic update for 2017-12-03] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: Ic4eddc2d7494e96b8265e16641a4b5a0fdc1b322 - Reviewed-on: https://code.wireshark.org/review/24684 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 09b9c324bc -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Nov 30 13:59:51 2017 -0800 - - 2.4.3 → 2.4.4. - - Change-Id: Iba5ce943ec87635ba3f1d01123153fa48bbe08af - Reviewed-on: https://code.wireshark.org/review/24668 - Reviewed-by: Gerald Combs <gerald@wireshark.org> diff --git a/configure.ac b/configure.ac index 9fe0be70f6..4b8654aeaf 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # m4_define([version_major], [2]) m4_define([version_minor], [4]) -m4_define([version_micro], [4]) +m4_define([version_micro], [5]) 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 3a2e824530..b247e54257 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (2.4.4) unstable; urgency=low +wireshark (2.4.5) unstable; urgency=low * Self-made package diff --git a/docbook/attributes.asciidoc b/docbook/attributes.asciidoc index e29ea95a1d..fe13adf3b2 100644 --- a/docbook/attributes.asciidoc +++ b/docbook/attributes.asciidoc @@ -1,6 +1,6 @@ // Common attributes -:wireshark-version: 2.4.4 +:wireshark-version: 2.4.5 // // URLs diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index ba3619dc21..8e3cc88d99 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -12,39 +12,18 @@ used for troubleshooting, analysis, development and education. === Bug Fixes -The following bugs have been fixed: +The following vulnerabilities have been fixed: -* ws-salink:2018-01[] -+ -Multiple dissectors could crash. -(ws-buglink:14253[]) -cve-idlink:2018-5336[] -// Fixed in master: 94479aded1, c51560985a -// Fixed in master-2.4: 374e3d4bcf, 87d86189cc -// Fixed in master-2.2: 4f4c95cf46, f6702e49a9 - -* ws-salink:2018-03[] +* ws-salink:2018-05[] + -The IxVeriWave file parser could crash. -(ws-buglink:14297[]) -cve-idlink:2018-5334[] -// Fixed in master: 5dbc1d8d1c -// Fixed in master-2.4: d6b2f2a6ce -// Fixed in master-2.2: dc308c05ba - -* ws-salink:2018-04[] -+ -The WCP dissector could crash. -(ws-buglink:14251[]) -cve-idlink:2018-5335[] -// Fixed in master: a7e29d8b66 -// Fixed in master-2.4: 568ccd2250 -// Fixed in master-2.2: 086b87376b - -Prior to this release dumpcap enabled the Linux kernel's BPF JIT -compiler via the `net.core.bpf_jit_enable` sysctl. This could make -systems more vulnerable to Spectre variant 1 (cve-idlink:2017-5753[]) -and this feature has been removed (ws-buglink:14313[]). +A dissector went awry. +(ws-buglink:xxxx[]) +cve-idlink:2018-xxxx[] +// Fixed in master: xxxx +// Fixed in master-2.4: xxxx +// Fixed in master-2.2: xxxx + +The following bugs have been fixed: //* ws-buglink:5000[] //* ws-buglink:6000[Wireshark bug] @@ -52,41 +31,6 @@ and this feature has been removed (ws-buglink:14313[]). //* Wireshark keeps leaving voicemails advertising timeshare condominiums in Fresno. (ws-buglink:0000[]) // cp /dev/null /tmp/buglist.txt ; for bugnumber in `git log --stat v2.4.5rc0..| grep ' Bug:' | cut -f2 -d: | sort -n -u ` ; do gen-bugnote $bugnumber; pbpaste >> /tmp/buglist.txt; done -* Some keyboard shortcut mix-up has been resolved by assigning new shortcuts - to Edit -> Copy methods. - -* Remote interfaces are not saved. (ws-buglink:8557[]) - -* Additional grouping in Expert Information dialog. (ws-buglink:11753[]) - -* First start with non-empty extcap folder after install or reboot hangs at "initializing tap listeners". (ws-buglink:12845[]) - -* Can't hide expert categories in Expert Information. (ws-buglink:13831[]) - -* Expert info dialog should have "Collapse All"/"Expand All" options. (ws-buglink:13842[]) - -* SIP Statistics extract does not work. (ws-buglink:13942[]) - -* Service Response Time - SCSI dialog crashes. (ws-buglink:14144[]) - -* Wireshark & Tshark 2.4.2 core dumps with segmentation fault. (ws-buglink:14194[]) - -* SSH remote capture promiscuous mode. (ws-buglink:14237[]) - -* SOCKS pseudo header displays incorrect Version value. (ws-buglink:14262[]) - -* Only first variable of list is dissected in NTP Control request message. (ws-buglink:14268[]) - -* NTP Authenticator field dissection fails if padding is used. (ws-buglink:14269[]) - -* BSSAP packet dissector issue - BSSAP_UPLINK_TUNNEL_REQUEST message. (ws-buglink:14289[]) - -* "[Malformed Packet]" for Mobile IP (MIP) protocol. (ws-buglink:14292[]) - -* There is a potential buffer underflow in File_read_line function in epan/wslua/wslua_file.c file. (ws-buglink:14295[]) - -* Saving a temporary capture file may not result in the temporary file being removed. (ws-buglink:14298[]) - === New and Updated Features There are no new features in this release. @@ -102,25 +46,13 @@ There are no new protocols in this release. === Updated Protocol Support --sort-and-group-- -Bluetooth -BSSAP -BT ATT -BT HCI -BT SMP -MIP -NTP -SCTP -SOCKS -UDS -WCP --sort-and-group-- === New and Updated Capture File Support -//There is no new or updated capture file support in this release. ---sort-and-group-- -Ixia IxVeriWave ---sort-and-group-- +There is no new or updated capture file support in this release. +//--sort-and-group-- +//--sort-and-group-- //=== New and Updated Capture Interfaces support diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index f5171a9ad3..8f0fcee186 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -243,7 +243,7 @@ add_library(epan ${LINK_MODE_LIB} add_dependencies(epan version) -set(FULL_SO_VERSION "10.1.4") +set(FULL_SO_VERSION "10.1.5") set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") set_target_properties(epan PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}") diff --git a/epan/Makefile.am b/epan/Makefile.am index 7ddccf0318..17973a17e3 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -306,7 +306,7 @@ 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 10:4:1 @LDFLAGS_BIGSHAREDLIB@ @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 10:5:1 @LDFLAGS_BIGSHAREDLIB@ @LDFLAGS_SHAREDLIB@ # # Add the object files for missing routines, if any. diff --git a/make-version.pl b/make-version.pl index 2460c30780..e8dd6a001e 100755 --- a/make-version.pl +++ b/make-version.pl @@ -85,7 +85,7 @@ my $set_release = 0; my %version_pref = ( "version_major" => 2, "version_minor" => 4, - "version_micro" => 4, + "version_micro" => 5, "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 5927c1e5cc..43dc096c6c 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -114,7 +114,7 @@ add_library(wiretap ${LINK_MODE_LIB} add_dependencies(wiretap version) -set(FULL_SO_VERSION "7.0.4") +set(FULL_SO_VERSION "7.0.5") set_target_properties(wiretap PROPERTIES PREFIX "lib" diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 61d71b75ce..a6eed0b8a2 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -189,7 +189,7 @@ libwiretap_la_SOURCES = \ ws_version_info.c # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 7:4:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 7:5:0 @LDFLAGS_SHAREDLIB@ libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) |