Build 2.2.15.wireshark-2.2.15v2.2.15

Change-Id: Iecf56ebf4a305ee35cc959ae6610f8035b02c011
Reviewed-on: https://code.wireshark.org/review/27720
Reviewed-by: Gerald Combs <gerald@wireshark.org>

3 files changed, 838 insertions, 124 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29bb2..1e866a8f3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,769 @@
+commit ff3a6da0c5
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue May 22 08:43:07 2018 -0700
+
+    Qt: Remove the capture information dialog checkbox.
+    
+    Remove the "Show extra capture information dialog" checkbox from the
+    capture options dialog. That dialog will be in 3.0, but the checkbox
+    doesn't do anything other than toggle the capture.show_info preference
+    in 2.0 to 2.6.
+    
+    Change-Id: I9cc64622a3145da62ee52125a258f4dbe2b91e17
+    Ping-bug: 12004
+    Reviewed-on: https://code.wireshark.org/review/27715
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 2c69a5a215
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon May 21 11:16:53 2018 -0700
+
+    Prep for 2.2.15.
+    
+    Change-Id: I8a10851ba8e049e0aaf5c5585e89bdcc2a9725aa
+    Reviewed-on: https://code.wireshark.org/review/27690
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit ee971ce1da
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun May 20 14:40:12 2018 -0700
+
+    Make the two file type descriptions for WTAP_FILE_TYPE_SUBTYPE_MPLOG the same.
+    
+    Change-Id: Id800bf9ea0617398d1eaede1fbacfa61ed8ebe8c
+    Reviewed-on: https://code.wireshark.org/review/27674
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 544aba3263bcfaeb4aeb629974acf390b04b5184)
+    Reviewed-on: https://code.wireshark.org/review/27677
+    (cherry picked from commit 476d80071a9787026379d1da847a5647ce5a17a3)
+    Reviewed-on: https://code.wireshark.org/review/27679
+
+commit 6647728d79
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun May 20 08:46:56 2018 +0000
+
+    [Automatic update for 2018-05-20]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I58c4eb87022bfcac17b3d5367c18f83afb7c7ce3
+    Reviewed-on: https://code.wireshark.org/review/27669
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit af6e6237f4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat May 19 19:59:21 2018 -0700
+
+    Get rid of add_async_dns_ipv4().
+    
+    We don't have add_async_dns_ipv6(), we just do the same stuff inline in
+    host_lookup6(); this removes an irrelevant difference between
+    host_lookup() and host_lookup6().
+    
+    Change-Id: Ib4aa1783ddec1bc390e2a7f64c87f1c8441fa849
+    Reviewed-on: https://code.wireshark.org/review/27661
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 8ee56d29828c23e45fa771d6b8f50b74e9185a14)
+    Reviewed-on: https://code.wireshark.org/review/27664
+
+commit 2f56988f01
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat May 19 18:35:18 2018 -0700
+
+    Make private variables static.
+    
+    Change-Id: I0844795597cec83dfb6752fb986d2a9957789530
+    Reviewed-on: https://code.wireshark.org/review/27657
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 724877497a7eab2cb28d5531233e083fcf9ed253)
+    Reviewed-on: https://code.wireshark.org/review/27660
+
+commit beaebe91b1
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri May 18 09:03:29 2018 +0200
+
+    proto.c: do not dereference a NULL pointer in proto_item_get_len() on first pass
+    
+    Like the proto_item_set_XXX functions, check proto_item pointer validity
+    before using it. It can be NULL on first pass for example.
+    
+    Bug: 14703
+    Change-Id: I94957e0738d66f99793682dc0ea1c7c0a65ceecd
+    Reviewed-on: https://code.wireshark.org/review/27629
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 40dbc0ccf26152a058484368526b7bd70c8928c1)
+    Reviewed-on: https://code.wireshark.org/review/27636
+
+commit a55b36c51f
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Mon May 14 17:29:52 2018 +0200
+
+    gsm_a_dtap: fix off-by-one buffer overflow (write)
+    
+    The output buffer needs one more byte for the string terminator.
+    
+    Bug: 14688
+    Change-Id: I7d606aa8fb769fd65ba894f0472ada3543a1e3cd
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6420
+    Reviewed-on: https://code.wireshark.org/review/27539
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 48fac2a18debb2969413e03f3d88bbb9c31500ae)
+    Reviewed-on: https://code.wireshark.org/review/27560
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit ab8a33ef08
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Mon May 14 12:27:15 2018 +0200
+
+    tvbuff: make tvb_bytes_exist fail with negative values
+    
+    tvb_generic_clone_offset_len uses tvb_bytes_exist to check that the
+    requested tvb data is actually available. It did not expect negative
+    values, that would result in an overly large memory allocation.
+    
+    Bug: 14678
+    Change-Id: Ie80095a381e55ca5dbbd5c9d835243549d0b212e
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7179
+    Reviewed-on: https://code.wireshark.org/review/27526
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit d80acae40d14efeb857258ca923637b590dd6be9)
+    Reviewed-on: https://code.wireshark.org/review/27535
+
+commit 4425716ddb
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun May 13 16:27:27 2018 +0200
+
+    dns: fix null pointer deref for empty name in SRV record
+    
+    Per RFC 2782, the name should follow the "_Service._Proto.Name" format.
+    If a malformed packet does not adhere to this and provides a zero-length
+    name, then wmem_strsplit returns NULL.
+    
+    Bug: 14681
+    Change-Id: I7b9935238a9800a1526c8b694fd2c63d3b488d0b
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7416
+    Reviewed-on: https://code.wireshark.org/review/27499
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 843735e0efe03f601ed69f69e5295974aad927b2)
+    Reviewed-on: https://code.wireshark.org/review/27532
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit 5f8bd0c94f
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Sep 10 17:47:36 2017 +0200
+
+    DNS: replace g_strsplit by wmem_strsplit
+    
+    It avoids leaking memory in case an exception is thrown during
+    dissection
+    
+    Change-Id: Iab72bcb4cc1ac56e7ce5ff2693e3111aead03e7d
+    Reviewed-on: https://code.wireshark.org/review/23464
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 85d742ef26970e35d16f16a9bea04a12ff618e17)
+    Reviewed-on: https://code.wireshark.org/review/27531
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit ccb1ac3c8c
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sun May 13 15:01:54 2018 +0200
+
+    Q.931: fix use-after-free (write) of "q931_pi"
+    
+    The dissect_q931_number_ie (and indirectly dissect_q931_cause_ie_unsafe)
+    write to the "q931_pi" structure which seems private to the q931
+    dissector, but can in fact be called through other dissectors (isup) as
+    well. Normally this structure is initialized in "dissect_q931_pdu" and
+    invalidated at the end of the function, but a malformed packet can
+    prevent the cleanup. In the next packet, a different dissector can thus
+    trigger a use-after-free via "dissect_q931_number_ie".
+    
+    Rename "dissect_q931_cause_ie_unsafe" since "unsafe" meant that external
+    dissectors could not call it directly (see commit a83a87e9ca).
+    
+    Based on commit 197ceddab109, it seems that the intended purpose of the
+    structure is to provide information to the VoIP Calls dialog, but it
+    would only be used when called through dissect_q931_pdu. Dissectors like
+    isup have their own routines to provide call information, but as a
+    side-effect of code sharing the problematic code path was reached.
+    
+    Bug: 14689
+    Change-Id: I871525db560f24690ade9a0b944c6d0e655ed34b
+    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6711
+    Reviewed-on: https://code.wireshark.org/review/27495
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit d08a53a7b9ebf723816f224897c68aa652589050)
+    Reviewed-on: https://code.wireshark.org/review/27523
+
+commit 14f1a1d749
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun May 13 08:41:50 2018 +0000
+
+    [Automatic update for 2018-05-13]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: Ica9f0c38b965b50860e5cecb4b8ffc69622b0958
+    Reviewed-on: https://code.wireshark.org/review/27489
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 961b518738
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat May 12 13:42:38 2018 -0700
+
+    Report the appropriate secondary message for ENOSPC and EDQUOT.
+    
+    Don't tell the user that, if they run out of space or go over their disk
+    quote, they should report that as a Wireshark bug; instead, tell them
+    that they're going to need to free up some space or do the capture to a
+    different file system.
+    
+    Clean up some argument types, and get rid of tabs in indentation, while
+    we're at it.
+    
+    Change-Id: I7839f38c14253a114e7e02e762243df5e09682ef
+    Ping-Bug: 14677
+    Reviewed-on: https://code.wireshark.org/review/27472
+    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 315599fff666cf1ad41902d05f1c36421962b79a)
+    Reviewed-on: https://code.wireshark.org/review/27481
+
+commit 4c4daface2
+Author: Sven Eckelmann <sven@narfation.org>
+Date:   Thu May 10 10:22:10 2018 +0200
+
+    batadv: Fix label for batadv.unicast_tvlv.src
+    
+    Change-Id: I73c06bb84efc874412b534348b9d1261b8ed5164
+    Fixes: v1.99.1rc0-546-g4cc4315793 ("batadv: Add dissector support for batadv v15")
+    Signed-off-by: Sven Eckelmann <sven@narfation.org>
+    Reviewed-on: https://code.wireshark.org/review/27440
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
+    (cherry picked from commit 04fffbbe9faccbd320edf5556b5cea57127d5225)
+    Reviewed-on: https://code.wireshark.org/review/27473
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+
+commit afc9786f03
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed May 9 09:31:44 2018 -0700
+
+    Always explicitly set tm_isdst before calling mktime().
+    
+    Except in rare cases, we want to set it to -1 so that we let mktime()
+    determine whether DST/Summer Time was in effect at the given date and
+    time rather than pretending that we know whether it's in effect or not.
+    
+    Change-Id: I0ea75317dd308a515cedf4d1260b583e1592cc9b
+    Reviewed-on: https://code.wireshark.org/review/27431
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit e7d24c606cdb460e835f7d7553d7b82e1ee11eac)
+    Reviewed-on: https://code.wireshark.org/review/27434
+
+commit 4730856fd9
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed May 9 12:39:21 2018 +0200
+
+    proto: don't overrun buffer.
+    
+    This is shown by a bunch of coverity reports all pointing at this line.
+    Every buffer has a ITEM_LABEL_LENGTH, but label_mark_truncated access it
+    at ITEM_LABEL_LENGTH (off-by-one).
+    
+    CIDs:
+    1435461
+    1435462
+    1435465
+    1435466
+    1435471
+    1435472
+    1435477
+    1435481
+    1435483
+    1435484
+    1435485
+    1435489
+    1435492
+    1435500
+    
+    Fixes: v1.11.3-rc1-1837-gf94674d2fb ("truncate UTF-8 strings only at the boundary between two characters")
+    Change-Id: I3781c36594f7db880bc9f76b64d261dbc498c0ce
+    Reviewed-on: https://code.wireshark.org/review/27425
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Dario Lombardo <lomato@gmail.com>
+    (cherry picked from commit 4b6224a67326dc72e428e8f6606b8ae10059c0bd)
+    Reviewed-on: https://code.wireshark.org/review/27426
+    Petri-Dish: Dario Lombardo <lomato@gmail.com>
+
+commit 314e8112aa
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue May 8 20:47:58 2018 -0700
+
+    You have to set tm_isdst before calling mktime().
+    
+    You either need to tell mktime() that 1) DST/Summer Time is in effect,
+    2) DST/Summer Time isn't in effect, or 3) we don't know whether
+    DST/Summer Time is in effect, you figure it out.
+    
+    We set tm_isdst to -1, to choose option 3), which is what we want.
+    
+    Fixes Coverity CID 1435496.
+    
+    Change-Id: I0f22ef1201ee8abefb3fa75aa3432b021fb13cfd
+    Reviewed-on: https://code.wireshark.org/review/27408
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 4513c66b1a2c7f7feb729e7e4e576b390395a123)
+    Reviewed-on: https://code.wireshark.org/review/27418
+
+commit 950e02b082
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue May 8 20:43:22 2018 -0700
+
+    You have to set tm_isdst before calling mktime().
+    
+    You either need to tell mktime() that 1) DST/Summer Time is in effect,
+    2) DST/Summer Time isn't in effect, or 3) we don't know whether
+    DST/Summer Time is in effect, you figure it out.
+    
+    We set tm_isdst to -1, to choose option 3), which is what we want.
+    
+    Fixes Coverity CID 1435496.
+    
+    Change-Id: Iff24e51807ab42c0e6d9629f72848ad9f8d325fb
+    Reviewed-on: https://code.wireshark.org/review/27404
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 270f0554d86ad5a7d6455f8eccbf057acdc69a91)
+    Reviewed-on: https://code.wireshark.org/review/27407
+
+commit 4dac043fc3
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun May 6 08:40:42 2018 +0000
+
+    [Automatic update for 2018-05-06]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: If19ccaf7e09e7f6eaab406b11e170fece226a58b
+    Reviewed-on: https://code.wireshark.org/review/27375
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 630c237ac9
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sat May 5 00:46:20 2018 +0200
+
+    nettrace_3gpp_32_423: fix memleak and copy of uninitialized memory
+    
+    When protocol="map", but the name attribute value is invalid, a memleak
+    occurs. Observe also that dissector_table_str is 22 bytes (21 characters
+    plus nul) and rounding up to a multiple of 4 means that 2 bytes of
+    uninitialized memory could be copied. Avoid that by copying the actual
+    length. Memory leak was found by Clang Static Analyzer.
+    
+    Change-Id: I41f5b104449e108191e505611411a8fb18f1f5db
+    Fixes: v2.1.0rc0-2545-g4b4c7a76c3 ("[Nettrace] Add parsing of some HSS records.")
+    Reviewed-on: https://code.wireshark.org/review/27350
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 7c9f333ad0f79d695f530e05cdcceceb7d54d545)
+    Reviewed-on: https://code.wireshark.org/review/27366
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+
+commit d1abbf6e0e
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri May 4 23:07:28 2018 -0700
+
+    Fix the check for getexecname().
+    
+    We want HAVE_GETEXECNAME set if it's available, so use AC_CHECK_FUNCS()
+    rather than AC_CHECK_FUNC() - the latter doesn't do anything other than
+    check, and expects to have "if it's found" or "if it isn't found" code,
+    the former will define a HAVE_ macro even with no "if it's found" or "if
+    it isn't found" code.
+    
+    Change-Id: I0e7ab2b8077734b5b9d820b689136f1ef8859e61
+    Reviewed-on: https://code.wireshark.org/review/27355
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 2613d1d0ee1568d3c1abec2cef85293933b4d176)
+    Reviewed-on: https://code.wireshark.org/review/27357
+
+commit 57005c1dac
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri May 4 23:00:29 2018 -0700
+
+    On Solaris, check for getexecname in CMake.
+    
+    We expect it to be checked for in wsutil/filesystem.c, so we should
+    check for it.  It's a Solarisism, so check for it only on Solaris.
+    
+    Change-Id: I09104c17d2ec91c74862b63e735c32a9d188f2a6
+    Reviewed-on: https://code.wireshark.org/review/27351
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit f447aa7dd7f0e36916847b8bb7193fecc42ddc89)
+    Reviewed-on: https://code.wireshark.org/review/27354
+
+commit b4e7dda3f9
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu May 3 19:25:18 2018 -0700
+
+    Fix function declaration of ws_buffer_length().
+    
+    This makes it match 1) the way the function is defined, if it is defined
+    and 2) the type returned if it's a macro, not a function.
+    
+    Change-Id: I708a44d2d20f44e58d6ae0228a11e622e7648022
+    Reviewed-on: https://code.wireshark.org/review/27320
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 0d9a7455a6c35b3573086bb53e790b3936c05063)
+    Reviewed-on: https://code.wireshark.org/review/27323
+
+commit 75cbe8204e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed May 2 16:18:43 2018 -0700
+
+    Windows: Fix our WinSparkle version.
+    
+    Change-Id: I2cecbd68e6d67b3072d96f99f9e827b545a3329f
+    Reviewed-on: https://code.wireshark.org/review/27294
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 0420873803
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed May 2 11:33:03 2018 -0700
+
+    Windows: Upgrade WinSparkle to 0.5.7.
+    
+    Bug: 14642
+    Change-Id: If29813ce84d3ee6fe8e63deefb8cecc021e2b63c
+    Reviewed-on: https://code.wireshark.org/review/27280
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 4c3f8c8a75
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed May 2 18:29:56 2018 +0200
+
+    GTP: fix compilation with gcc 8
+    
+    error: cast between incompatible function types from ‘void (*)(const void *, void *, void *)’ to ‘gboolean (*)(const void *, void *, void *)’ {aka ‘int (*)(const void *, void *, void *)’} [-Werror=cast-function-type]
+    
+    Change-Id: If93eb9a4f38b622ae5dfaf9ed1e2c3d257141105
+    Reviewed-on: https://code.wireshark.org/review/27260
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 966c5957822a974ddd4f0558db0eccbbb7afe290)
+    Reviewed-on: https://code.wireshark.org/review/27275
+
+commit f177008b04
+Author: Darius Davis <darius@vmware.com>
+Date:   Sun Apr 29 15:48:53 2018 +1000
+
+    LDSS: Fix a read overrun in dissect_ldss_transfer.
+    
+    dissect_ldss_transfer had a trivial read overrun: "line" was not
+    NUL-terminated, and strtol/g_ascii_strtoull will keep reading and discarding
+    any leading whitespace, so a malformed LDSS packet (with only whitespace
+    characters following the tag on a "Size:"/"Start:"/"Compression:" line) could
+    trigger a read overrun.
+    
+    Let's replace the tvb_memdup with tvb_get_string_enc, which does some checking
+    of the input characters (which, it seems, must always be ASCII), and produces a
+    neat NUL-terminated string.
+    
+    Testing Done: On Linux x64, ran "valgrind tshark -r fuzz-2018-04-23-14422.pcap"
+       without the fix (to reproduce the failure), and then with the fix, and
+       observed that no errors were reported anymore after the fix. 60,000 iters of
+       fuzz-test with ldss_filtered.pcap as input, plus 1,000 iters under valgrind.
+       Launched wireshark and opened ldss_filtered.pcap, and examined the dissection
+       of the "ldss and tcp" packets; All looks good.
+    
+    Bug: 14615
+    Change-Id: I3fccc4ffbe315a3cff6ea03cc7db37f884b0582c
+    Reviewed-on: https://code.wireshark.org/review/27204
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (cherry picked from commit 295abe2e83ba8428e84e7ff9b2f6f94ae948fa76)
+    Reviewed-on: https://code.wireshark.org/review/27223
+
+commit 0f87e8ec6f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Apr 29 08:40:16 2018 +0000
+
+    [Automatic update for 2018-04-29]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I48b3a4092ca28489d2fffb67695070da8f4d73a0
+    Reviewed-on: https://code.wireshark.org/review/27202
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 32309cbaa4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Apr 28 12:10:00 2018 -0700
+
+    Pick the *first* usable file type as the default, not the *last* one.
+    
+    In wtap_get_savable_file_types_subtypes(), in the search for a default
+    file type to use, stop as soon as we've found a usable file type, don't
+    keep searching.
+    
+    Bug: 14601
+    Change-Id: Iff4ffe14f5ad07271c49a761e0856059353c1634
+    Reviewed-on: https://code.wireshark.org/review/27193
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 1eb04d7ecb76c79cf681798b51aaa51aad938325)
+    Reviewed-on: https://code.wireshark.org/review/27196
+
+commit 04204c9847
+Author: Joakim Karlsson <oakimk@gmail.com>
+Date:   Tue Apr 24 20:20:33 2018 +0200
+
+    cmake: remove warnings -Werror=old-style-definition
+    
+    see https://cmake.org/Bug/bug_relationship_graph.php?bug_id=15058
+    
+    Change-Id: I325f476b145a542e987a13bedd1f95a7d8faba94
+    Reviewed-on: https://code.wireshark.org/review/27121
+    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 5994c902b452f038df82a7497d1561503c3e1fe0)
+    Reviewed-on: https://code.wireshark.org/review/27127
+
+commit 1c3395a2be
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Apr 22 20:31:26 2018 -0700
+
+    Add more bounds checks.
+    
+    If the calculated packet length in the header is bigger than the actual
+    packet length value from the header, reject the packet.
+    
+    Change-Id: I86cb24c66ee0d6fd2ed6f9240d44c1adc5f0bf91
+    Reviewed-on: https://code.wireshark.org/review/27087
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 83ecd467765408847afe6e5acdd7ab974c621f6e)
+    Reviewed-on: https://code.wireshark.org/review/27090
+
+commit 811cfb5fea
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Apr 22 08:48:47 2018 +0000
+
+    [Automatic update for 2018-04-22]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I45c818a3d95e0d38589723a817348d55e88f2020
+    Reviewed-on: https://code.wireshark.org/review/27075
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 102570f45e
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Apr 20 09:46:58 2018 -0700
+
+    Fix cpu_diag_eventid_fix_names table.
+    
+    For a value_string_ext, the values must be in numerical order.
+    
+    Change-Id: I43063b59a8c15d7d1fcdca07d4ae9fd89917427d
+    Reviewed-on: https://code.wireshark.org/review/27058
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit ccf495a8382bf62f8f90d1239dddb7c536aeface)
+    Reviewed-on: https://code.wireshark.org/review/27061
+
+commit fddba12426
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Apr 18 15:46:00 2018 -0700
+
+    Fix tapo.
+    
+    Change-Id: I1e5a39437e274aa8923e996241d2264dbd63e806
+    Reviewed-on: https://code.wireshark.org/review/27014
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit d5c4c6972ed019e1cf52d268baecd41726760b90)
+    Reviewed-on: https://code.wireshark.org/review/27017
+
+commit abd55373a0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Apr 15 16:45:59 2018 +0000
+
+    [Automatic update for 2018-04-15]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I9e4937cfddc7a6fae9008b77ac1257311475cfa3
+    Reviewed-on: https://code.wireshark.org/review/26956
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit a077aeb178
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Apr 12 17:56:51 2018 -0700
+
+    Fix the length of the payload of a private_1 or audio PES packet.
+    
+    The length field's value doesn't include the length of the length field
+    itself.
+    
+    Change-Id: Icd0cc2721a32212296929d248b9305b0f4a051e6
+    Reviewed-on: https://code.wireshark.org/review/26920
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 05615015057f13197d5694c426bccccfa7de5f5f)
+    Reviewed-on: https://code.wireshark.org/review/26923
+
+commit c685ca1ba3
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Apr 11 22:01:11 2018 -0700
+
+    Update a comment.
+    
+    We don't just reassemble DOCSIS MAC frames, we reassemble other forms of
+    higher-level packet atop an MPEG Transport Stream as well.
+    
+    Change-Id: If6e709a8d2d3e574fbaedb1fcac74797c5664aa5
+    Reviewed-on: https://code.wireshark.org/review/26905
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit d0d0cf05cc6872c7d49f1ed7b2432ba97a66331f)
+    Reviewed-on: https://code.wireshark.org/review/26908
+
+commit 4ac70ca529
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Apr 11 19:27:57 2018 -0700
+
+    Need to flag a variable as volatile, due to the use of exceptions.
+    
+    The exception mechanism is setjmp/longjmp-based, so we need to mark
+    offset as volatile, otherwise the longjmp might not restore its value.
+    
+    Change-Id: Ib63070bbbbe1f16a93cb58aa7ee5ef2a5488df8a
+    Reviewed-on: https://code.wireshark.org/review/26901
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 148f39d900b516cac575d7de689a44545a663c70)
+    Reviewed-on: https://code.wireshark.org/review/26904
+
+commit 0416a3b581
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Apr 11 17:45:46 2018 -0700
+
+    If a subdissector throws an exception, catch it and continue.
+    
+    That way, some exception thrown higher in the protocol stack doesn't
+    stop us from dissecting the next TSP.
+    
+    Change-Id: Ib756e5d62806caf0edd4e4ded18bb94000653d39
+    Reviewed-on: https://code.wireshark.org/review/26897
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 81f184bc00b938807cfdee72dc6f8d49412e26c6)
+    Reviewed-on: https://code.wireshark.org/review/26900
+
+commit c04d5907aa
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Apr 10 17:11:24 2018 +0200
+
+    NBSS: take into account snaplen when creating the TVB subset
+    
+    Otherwise you can trigger an exception interrupting the packet dissection
+    when the snaplen defined is shorter than the payload length
+    
+    Bug: 14598
+    Change-Id: Ibeb6482495ed67c7669574bdcd7c429523318428
+    Reviewed-on: https://code.wireshark.org/review/26858
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    (cherry picked from commit 526a328d839cebf8d52dfcfdd479f12e83a28d3a)
+    Conflicts:
+            epan/dissectors/packet-nbt.c
+    Reviewed-on: https://code.wireshark.org/review/26883
+
+commit a797085256
+Author: Adrian Granados <adrian@adriangranados.com>
+Date:   Mon Apr 9 16:21:27 2018 -0400
+
+    ieee80211: fixes min and max power values in item text (they are signed).
+    
+    This change further extends the fix for bug 14593 by making sure the
+    values min, max values shown in the item's info text match the
+    item's children values.
+    
+    Change-Id: Ibac39e1f21a892a02753c3cf1604ed3b14eadc52
+    Reviewed-on: https://code.wireshark.org/review/26832
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit e085119b66722eeeaa409b65e5cbb7053e171841)
+    Reviewed-on: https://code.wireshark.org/review/26837
+
+commit 9403b4d3e8
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Apr 8 08:35:32 2018 +0000
+
+    [Automatic update for 2018-04-08]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I0fdba9dcbaf9e9e552b77f087b6cc60c3c796c47
+    Reviewed-on: https://code.wireshark.org/review/26802
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 9b013536c1
+Author: Harald Welte <laforge@gnumonks.org>
+Date:   Wed Mar 21 19:42:46 2018 +0100
+
+    BSSMAP: Fix definition of Speech Version Indication for EFR (FR2)
+    
+    3GPP TS 48.008 Section 3.2.2.11 is quite clear on the definitions
+    of the "permitted speech version indication".
+    
+    The Wireshark BSSMAP dissector so far got it wrong:
+    * 0x11 is "Full Rate Version 2" (aka GSM-EFR)
+    * the short version is not FR12 but FR2
+    
+    Change-Id: I6835083389e465c791cea5a240ebc434f677b82c
+    Reviewed-on: https://code.wireshark.org/review/26790
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    (cherry picked from commit 5b0c6f9e058bb07df970956f01f0e15d1ed15af6)
+    Reviewed-on: https://code.wireshark.org/review/26793
+
+commit 4b5c5871a8
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Apr 5 11:48:01 2018 -0700
+
+    Don't install PortAudio if we're not installing GTK+.
+    
+    Change-Id: I99bad59b34ff0688cf527ae69b5e48e4c14e7380
+    Reviewed-on: https://code.wireshark.org/review/26758
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit c4da7ed843527ac75bc46d74e43de1b61fa5c5f5)
+    Reviewed-on: https://code.wireshark.org/review/26761
+
+commit 2fdc87876b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Apr 3 14:54:22 2018 -0700
+
+    2.2.14 → 2.2.15.
+    
+    Change-Id: I2c28f083133ff7c2ee5a6bf66458c66fc37fa79a
+    Reviewed-on: https://code.wireshark.org/review/26732
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
diff --git a/NEWS b/NEWS
index e403a03698..739612a900 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-                         Wireshark 2.2.14 Release Notes
+                         Wireshark 2.2.15 Release Notes
      __________________________________________________________________
 
 What is Wireshark?
@@ -12,59 +12,25 @@ What's New
   Bug Fixes
 
    The following vulnerabilities have been fixed:
-     * [1]wnpa-sec-2018-15
-       The MP4 dissector could crash. ([2]Bug 13777)
-     * [3]wnpa-sec-2018-16
-       The ADB dissector could crash. ([4]Bug 14460)
-     * [5]wnpa-sec-2018-17
-       The IEEE 802.15.4 dissector could crash. ([6]Bug 14468)
-     * [7]wnpa-sec-2018-18
-       The NBAP dissector could crash. ([8]Bug 14471)
-     * [9]wnpa-sec-2018-19
-       The VLAN dissector could crash. ([10]Bug 14469)
-     * [11]wnpa-sec-2018-20
-       The LWAPP dissector could crash. ([12]Bug 14467)
-     * [13]wnpa-sec-2018-23
-       The Kerberos dissector could crash. ([14]Bug 14576)
-     * tshark memory leaks with asan / valgrind [tn3270] (1/10). ([15]Bug
-       14480)
-     * tshark memory leaks with asan / valgrind [isup] (2/10). ([16]Bug
-       14481)
-     * tshark memory leaks with asan / valgrind [lapd] (3/10). ([17]Bug
-       14482)
-     * tshark memory leaks with asan / valgrind [smb2] (4/10). ([18]Bug
-       14483)
-     * tshark memory leaks with asan / valgrind [Inter-ORB] (5/10).
-       ([19]Bug 14484)
-     * tshark memory leaks with asan / valgrind [oids] (6/10). ([20]Bug
-       14485)
-     * tshark memory leaks with asan / valgrind [multipart] (7/10).
-       ([21]Bug 14486)
-     * tshark memory leaks with asan / valgrind [h223] (8/10). ([22]Bug
-       14487)
-     * tshark memory leaks with asan / valgrind [Co-Pilot] (9/10).
-       ([23]Bug 14488)
+     * [1]wnpa-sec-2018-25
+       The LDSS dissector could crash. ([2]Bug 14615)
+     * [3]wnpa-sec-2018-28
+       Multiple dissectors could consume excessive memory. ([4]Bug 14678)
+     * [5]wnpa-sec-2018-29
+       The DNS dissector could crash. ([6]Bug 14681)
+     * [7]wnpa-sec-2018-30
+       The GSM A DTAP dissector could crash. ([8]Bug 14688)
+     * [9]wnpa-sec-2018-31
+       The Q.931 dissector could crash. ([10]Bug 14689)
+     * [11]wnpa-sec-2018-33
+       Multiple dissectors could crash. ([12]Bug 14703)
 
    The following bugs have been fixed:
-     * Lua script calling Ethernet dissector runs OK in 1.12.4 but crashes
-       in later releases. ([24]Bug 14293)
-     * PEEKREMOTE dissector lacks 80mhz support, short preamble support
-       and spatial streams encoding. ([25]Bug 14452)
-     * Typo error in enumeration value of speech version identifier.
-       ([26]Bug 14528)
-     * WCCP logical error in CHECK_LENGTH_ADVANCE_OFFSET macros. ([27]Bug
-       14538)
-     * Buildbot crash output: fuzz-2018-03-19-19114.pcap. ([28]Bug 14544)
-     * alloca() used in wsutil/getopt_long.c without <alloca.h> inclusion.
-       ([29]Bug 14552)
-     * HP-UX HP ANSI C requires -Wp,-H200000 flag to compile. ([30]Bug
-       14554)
-     * Makefile.in uses non-portable "install" command. ([31]Bug 14555)
-     * HP-UX HP ANSI C doesn't support assigning {} to a variable in
-       epan/app_mem_usage.c. ([32]Bug 14556)
-     * PPP in SSTP, HDLC framing not parsed properly. ([33]Bug 14559)
-     * Using the DIAMETER dictionary causes the standard input to be
-       closed when the dictionary is read. ([34]Bug 14577)
+     * SMB2 Write requests not displayed. ([13]Bug 14598)
+     * Wrong default file format chosen in when saving a capture with
+       comments added if the original format doesn't support comments.
+       ([14]Bug 14601)
+     * WinSparkle 0.5.6 is out of date and is buggy. ([15]Bug 14642)
 
   New and Updated Features
 
@@ -80,14 +46,12 @@ What's New
 
   Updated Protocol Support
 
-   6LoWPAN, ADB, DNS, Ethernet, GIOP, GSM BSSMAP, H.223, IEEE 802.11, IEEE
-   802.11 Radiotap, IEEE 802.15.4, ISUP, Kerberos, LAPD, LWAPP, MIME
-   multipart, MP4, NBAP, PCP, PEEKREMOTE, S1AP, SMB2, SSTP, T.30, TN3270,
-   VLAN, WCCP, and WSP
+   BATADV, BSSMAP, BVLC, DNS, GSM A DTAP, GTP, IEEE 802.11, LDSS, Logcat
+   Text, MP2T, MPEG PES, NBSS, Q.931, and S7COMM
 
   New and Updated Capture File Support
 
-   There is no new or updated capture file support in this release.
+   3GPP TS 32.423 Trace, and Android Logcat
 
   New and Updated Capture Interfaces support
 
@@ -102,14 +66,14 @@ What's New
 Getting Wireshark
 
    Wireshark source code and installation packages are available from
-   [35]https://www.wireshark.org/download.html.
+   [16]https://www.wireshark.org/download.html.
 
   Vendor-supplied Packages
 
    Most Linux and Unix vendors supply their own Wireshark packages. You
    can usually install or upgrade Wireshark using the package management
    system specific to that platform. A list of third-party packages can be
-   found on the [36]download page on the Wireshark web site.
+   found on the [17]download page on the Wireshark web site.
      __________________________________________________________________
 
 File Locations
@@ -122,88 +86,69 @@ File Locations
 
 Known Problems
 
-   Dumpcap might not quit if Wireshark or TShark crashes. ([37]Bug 1419)
+   Dumpcap might not quit if Wireshark or TShark crashes. ([18]Bug 1419)
 
-   The BER dissector might infinitely loop. ([38]Bug 1516)
+   The BER dissector might infinitely loop. ([19]Bug 1516)
 
    Capture filters aren't applied when capturing from named pipes.
-   ([39]Bug 1814)
+   ([20]Bug 1814)
 
    Filtering tshark captures with read filters (-R) no longer works.
-   ([40]Bug 2234)
+   ([21]Bug 2234)
 
-   Application crash when changing real-time option. ([41]Bug 4035)
+   Application crash when changing real-time option. ([22]Bug 4035)
 
    Wireshark and TShark will display incorrect delta times in some cases.
-   ([42]Bug 4985)
+   ([23]Bug 4985)
 
-   Wireshark should let you work with multiple capture files. ([43]Bug
+   Wireshark should let you work with multiple capture files. ([24]Bug
    10488)
      __________________________________________________________________
 
 Getting Help
 
-   Community support is available on [44]Wireshark's Q&A site and on the
+   Community support is available on [25]Wireshark's Q&A site and on the
    wireshark-users mailing list. Subscription information and archives for
-   all of Wireshark's mailing lists can be found on [45]the web site.
+   all of Wireshark's mailing lists can be found on [26]the web site.
 
    Official Wireshark training and certification are available from
-   [46]Wireshark University.
+   [27]Wireshark University.
      __________________________________________________________________
 
 Frequently Asked Questions
 
-   A complete FAQ is available on the [47]Wireshark web site.
+   A complete FAQ is available on the [28]Wireshark web site.
      __________________________________________________________________
 
-   Last updated 2018-04-03 18:38:19 UTC
+   Last updated 2018-05-21 20:14:12 UTC
 
 References
 
-   1. https://www.wireshark.org/security/wnpa-sec-2018-15.html
-   2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13777
-   3. https://www.wireshark.org/security/wnpa-sec-2018-16.html
-   4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14460
-   5. https://www.wireshark.org/security/wnpa-sec-2018-17.html
-   6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14468
-   7. https://www.wireshark.org/security/wnpa-sec-2018-18.html
-   8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14471
-   9. https://www.wireshark.org/security/wnpa-sec-2018-19.html
-  10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14469
-  11. https://www.wireshark.org/security/wnpa-sec-2018-20.html
-  12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14467
-  13. https://www.wireshark.org/security/wnpa-sec-2018-23.html
-  14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14576
-  15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14480
-  16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14481
-  17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14482
-  18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14483
-  19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14484
-  20. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14485
-  21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14486
-  22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14487
-  23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14488
-  24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14293
-  25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14452
-  26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14528
-  27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14538
-  28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14544
-  29. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14552
-  30. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14554
-  31. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14555
-  32. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14556
-  33. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14559
-  34. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14577
-  35. https://www.wireshark.org/download.html
-  36. https://www.wireshark.org/download.html#thirdparty
-  37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419
-  38. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516
-  39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814
-  40. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234
-  41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035
-  42. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985
-  43. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10488
-  44. https://ask.wireshark.org/
-  45. https://www.wireshark.org/lists/
-  46. http://www.wiresharktraining.com/
-  47. https://www.wireshark.org/faq.html
+   1. https://www.wireshark.org/security/wnpa-sec-2018-25.html
+   2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14615
+   3. https://www.wireshark.org/security/wnpa-sec-2018-28.html
+   4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14678
+   5. https://www.wireshark.org/security/wnpa-sec-2018-29.html
+   6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14681
+   7. https://www.wireshark.org/security/wnpa-sec-2018-30.html
+   8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14688
+   9. https://www.wireshark.org/security/wnpa-sec-2018-31.html
+  10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14689
+  11. https://www.wireshark.org/security/wnpa-sec-2018-33.html
+  12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14703
+  13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14598
+  14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14601
+  15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14642
+  16. https://www.wireshark.org/download.html
+  17. https://www.wireshark.org/download.html#thirdparty
+  18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419
+  19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516
+  20. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814
+  21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234
+  22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035
+  23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985
+  24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10488
+  25. https://ask.wireshark.org/
+  26. https://www.wireshark.org/lists/
+  27. http://www.wiresharktraining.com/
+  28. https://www.wireshark.org/faq.html
diff --git a/version.conf b/version.conf
index 6dedd7c96a..9480b2f829 100644
--- a/version.conf
+++ b/version.conf
@@ -1,9 +1,9 @@
 # Interim releases: Enable packaging, add a "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