Build 2.6.12.wireshark-2.6.12v2.6.12

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

4 files changed, 452 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29bb2..08131826fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,377 @@
+commit 9edc6a1f58
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Oct 23 08:52:00 2019 -0700
+
+    test+wslua: Fix our protofield test count.
+    
+    Removing the RANGE_STRING test means we have 37 tests, not 38.
+    
+    Change-Id: I93cb9e130565684538720e136b26ab3e9718f37f
+    Reviewed-on: https://code.wireshark.org/review/34840
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit dac2544c1a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Oct 20 08:44:55 2019 +0000
+
+    [Automatic update for 2019-10-20]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: Ida39f22dfbd11592d5c5a091ad32d6c3a78c81fb
+    Reviewed-on: https://code.wireshark.org/review/34813
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 617e1fd369
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Oct 18 09:49:48 2019 -0700
+
+    test+wslua: Remove the RANGE_STRING test
+    
+    RANGE_STRING support isn't present in Wireshark 2.6
+    
+    Change-Id: Ib7c4568fb00378b318668f70ba0bda8ab5c7ca67
+    Reviewed-on: https://code.wireshark.org/review/34808
+    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 5105e76e9d
+Author: Sake Blok <sake@euronet.nl>
+Date:   Thu May 30 13:11:21 2019 +0200
+
+    IP: Make dissection of ip.frag_offset RFC 791 compliant
+    
+    The v2.5.0rc0-478-g558fe23226, the dissection of ip.frag_offset changed
+    to be listed under "Flags", this is not correct. The Fragmentation
+    Offset is a separate field according to the RFC. This change corrects
+    that behavior. Also, the raw value from the header was shown instead of
+    the real byte offset, this is also corrected.
+    
+    Change-Id: I1d6dfc4314091eb6f3eef418c5a17ed37f7a1200
+    Fixes: v2.5.0rc0-478-g558fe23226 ("[IP] Simplify paring of flags field by using proto_tree_add_bitmask_with_flags().")
+    Reviewed-on: https://code.wireshark.org/review/33422
+    Petri-Dish: Sake Blok <sake.blok@SYN-bit.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
+    Reviewed-by: Sake Blok <sake.blok@SYN-bit.nl>
+    (backported from commit 237ec1349f869b4a03282168b5c99d1bcce286ac)
+    Reviewed-on: https://code.wireshark.org/review/34803
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 26d9d34353
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Oct 15 12:33:13 2019 +0200
+
+    wslua: Improve parameter check in ProtoField.new()
+    
+    Improve paremeter check in ProtoField.new() when using ftypes.CHAR:
+    - Check valid base types and give an error when not supported instead of
+      terminate in a g_error() (base.DEC is not supported).
+    - Give an error if used with base.UNIT_STRING instead of silently remove
+      the flags.
+    
+    Support using base.NONE with a valuestring.
+    Add ftypes.CHAR to the list of supported types.
+    
+    Change-Id: I0e3f9698074c807f5da0de23ccd1be7446271135
+    Reviewed-on: https://code.wireshark.org/review/34783
+    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 03719942232965069a1fc67d262ab32ab9b7ca2a)
+    Reviewed-on: https://code.wireshark.org/review/34791
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+
+commit 92d31e34b5
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Tue Oct 15 09:57:10 2019 +0200
+
+    Lua: Use space for indent
+    
+    Remove use of TAB.
+    
+    Change-Id: Ic2a08f6b325e1fc52a5b043aa09e8f98dacd8c5e
+    Reviewed-on: https://code.wireshark.org/review/34780
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit efe1b0b1b2eab9312399128654b956d2f4472be5)
+    Reviewed-on: https://code.wireshark.org/review/34781
+    (cherry picked from commit a37668eca1ff4c6a9dea5ccd8cea312d9b2c58d5)
+    Reviewed-on: https://code.wireshark.org/review/34782
+
+commit 806d3f56a0
+Author: Stig Bjørlykke <stig@bjorlykke.org>
+Date:   Mon Oct 14 19:35:40 2019 +0200
+
+    Lua: Support FT_CHAR in Field
+    
+    Add support for fetching FT_CHAR field values.
+    
+    Bug: 16129
+    Change-Id: I0e3b0c784277e259fb7cd1725254fc7a723f6d1e
+    Reviewed-on: https://code.wireshark.org/review/34775
+    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    (cherry picked from commit 8e3ed86de7884ecb29fea9aee19616ae878b5e60)
+    Reviewed-on: https://code.wireshark.org/review/34776
+    (cherry picked from commit 38204e9c29e9a26a10cd20d9666b3ec1315d6b00)
+    Reviewed-on: https://code.wireshark.org/review/34777
+
+commit 54604b591a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Oct 13 08:45:21 2019 +0000
+
+    [Automatic update for 2019-10-13]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: If1d6fcd9ada6d4bf7620fa8939610ae21304d3b7
+    Reviewed-on: https://code.wireshark.org/review/34768
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit b9e855b80b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Oct 12 19:38:49 2019 -0700
+
+    We don't compile Qt, we just install a binary.
+    
+    Change-Id: Ieeaa2b393775ae58782c0f2447b51fd068ffc185
+    Reviewed-on: https://code.wireshark.org/review/34763
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 9f374047ad025530c9435eb30f084cec4687e316)
+    Reviewed-on: https://code.wireshark.org/review/34765
+
+commit 2e066515ef
+Author: Pascal Quantin <pascal@wireshark.org>
+Date:   Sun Oct 6 19:44:59 2019 +0200
+
+    dumpcap: fix capture library version display on Windows
+    
+    Ensure to call load_wpcap() berfore building the version info string.
+    
+    Bug: 16108
+    Change-Id: Ida7ecf6ad5186f816e1bf33902a0ae70f7f36b40
+    Reviewed-on: https://code.wireshark.org/review/34719
+    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
+    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    (cherry picked from commit 2cac9d47af2f9851088f8b1d6ca8b7eea1d49774)
+    Conflicts:
+            dumpcap.c
+    Reviewed-on: https://code.wireshark.org/review/34720
+    (cherry picked from commit 2fa9fad6e2c330558326d91bb06988d9a4115ae9)
+    Conflicts:
+            dumpcap.c
+    Reviewed-on: https://code.wireshark.org/review/34721
+
+commit 9ff620b9e7
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Oct 6 08:45:36 2019 +0000
+
+    [Automatic update for 2019-10-06]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I2f896927e8c81a9dc738888ebd44e55594d220a4
+    Reviewed-on: https://code.wireshark.org/review/34717
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 0db7ec792a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Sep 30 16:35:35 2019 -0700
+
+    Fix checks for "do we have an ERSPAN header?"
+    
+    For a GRE protocol type of 0x008E, check the "sequence number present"
+    bit in the GRE header, if it's available, to see if the packet has an
+    ERSPAN header or not, rather than checking the entire header to see if
+    it's zero.  (If the GRE header isn't available, assume no ERSPAN
+    header.)
+    
+    For a GRE protocol type of 0x22EB, always treat the packet as having an
+    ERSPAN header.
+    
+    That matches more closely what the most recent I-D for ERSPAN said.
+    
+    Bug: 16089
+    Change-Id: I21119411e8485854fca85fa701b994bfa4e73941
+    Reviewed-on: https://code.wireshark.org/review/34664
+    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 ef76d65fc61d01c2ce5184140f4b1bba0019078b)
+    Reviewed-on: https://code.wireshark.org/review/34666
+
+commit 5b159702c4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Sep 29 16:24:04 2019 -0700
+
+    Fix interpretation of BSO field in Type III headers.
+    
+    Use a correct right value_string table.
+    
+    Change-Id: I75ca54dc040b123a460d67fc1b6d49d9e062a49e
+    Reviewed-on: https://code.wireshark.org/review/34651
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (cherry picked from commit 486c6fd07cd640f73710350639dcc6573b05997b)
+    Reviewed-on: https://code.wireshark.org/review/34663
+
+commit adb2cada2a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Sep 29 15:54:00 2019 -0700
+
+    Improve the handling of the FT (Frame Type) field in Type III headers.
+    
+    Show the value symbolically, and don't dissect the payload as an
+    Ethernet packet if the value isn't 0, meaning "Ethernet".
+    
+    This gets rid of the mis-dissection of the payload in the capture
+    atttached to bug 16089, although it doesn't dissect it any further, as
+    we don't know how to dissect it.
+    
+    Change-Id: I97fce0f7a4f4336339bc90271aa7b19c97831abe
+    Ping-Bug: 16089
+    Reviewed-on: https://code.wireshark.org/review/34649
+    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 3367cbab17769658872decc78762c8edf681fe43)
+    Reviewed-on: https://code.wireshark.org/review/34662
+
+commit c4ae9afd2b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Sep 29 08:45:38 2019 +0000
+
+    [Automatic update for 2019-09-29]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I3c47826fa735df4c8d0513656b6ae0acb3c3bcec
+    Reviewed-on: https://code.wireshark.org/review/34645
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 438fde1165
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Sep 22 08:45:21 2019 +0000
+
+    [Automatic update for 2019-09-22]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I9698418dee2c377517ccee2f0108952aba4cb17c
+    Reviewed-on: https://code.wireshark.org/review/34589
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit d0569a457f
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Sep 20 16:59:07 2019 +0100
+
+    Debian: Fix WiresharkConfig.cmake
+    
+    CMAKE_INSTALL_LIBDIR should be a relative path. Remove the scripted
+    multiarch detection because GNUInstallDirs handles that automatically.
+    
+    Bug: 16060
+    Change-Id: Ibc80a4f5531d5d82e167814f8f1a38029f411bcd
+    Reviewed-on: https://code.wireshark.org/review/34574
+    Petri-Dish: João Valverde <j@v6e.pt>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: João Valverde <j@v6e.pt>
+
+commit ab07e44c67
+Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
+Date:   Fri Sep 20 17:01:38 2019 +0100
+
+    CMake: Fix a path in WiresharkConfig.cmake
+    
+    Change-Id: I2f24b83e1ef5a3df74adbaf970466ce87c5ca384
+    Reviewed-on: https://code.wireshark.org/review/34575
+    Reviewed-by: João Valverde <j@v6e.pt>
+
+commit a703f7a9d9
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Sep 15 09:41:46 2019 +0000
+
+    [Automatic update for 2019-09-15]
+    
+    Update manuf, services enterprise numbers, translations, and other items.
+    
+    Change-Id: I31867d57271940446d9c36bb52be0cd6a04abf48
+    Reviewed-on: https://code.wireshark.org/review/34532
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 801b9b8982
+Author: Evan Welsh <noreply@evanwelsh.com>
+Date:   Sat Sep 14 16:02:26 2019 -0400
+
+    Qt: Prevent crash in main window layout.
+    
+    Add length check for extra_sizes array in geometry calculations when using
+    recent  sizes, prevents crash in case where user creates a new user profile
+    with a layout of 1) filled pane 2) empty pane 3) empty pane.
+    
+    Bug: 16048
+    Change-Id: I5f30d6e4148703504029efab75a77f2cdb6619ff
+    Reviewed-on: https://code.wireshark.org/review/34524
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
+    (backported from commit c0224eeeb833c3ee0b2625c71b9915f13afadb23)
+    Reviewed-on: https://code.wireshark.org/review/34528
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit fa4f4bff8b
+Author: Tomasz Moń <desowin@gmail.com>
+Date:   Tue Sep 10 19:53:18 2019 +0200
+
+    randpktdump: Initialize print error handler
+    
+    When there is a problem with output pipe, randpktdump will call
+    cfile_write_failure_message() which in turn calls cmdarg_err() which
+    calls print_err. Call cmdarg_err_init() so print_err is not NULL.
+    
+    Change-Id: Ie459596a473c83204e9aa1d48bb2d2d3717b340a
+    Reviewed-on: https://code.wireshark.org/review/34495
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (backported from commit 4853fb93b2e64a882f233cd91743976075faf6da)
+    Reviewed-on: https://code.wireshark.org/review/34526
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit a731b9b56d
+Author: Jaap Keuter <jaap.keuter@xs4all.nl>
+Date:   Sat Sep 14 09:42:57 2019 +0200
+
+    SNMP: handle Net-SNMP Engine Id of 12 octets
+    
+    The Net-SNMP code creates an Engine Id size based on the compilation
+    size, either 8 or 12 octets long. Current implementation handles 32 bit
+    compilation of Net-SNMP (resulting in 8 octets), this change adds
+    handling of 64 bit compilation of Net-SNMP (resulting in 12 octets).
+    
+    Bug: 16051
+    Change-Id: I256f9a7ad2fd219492e4ebc413ef24cd2c210e0b
+    Reviewed-on: https://code.wireshark.org/review/34520
+    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
+    Tested-by: Petri Dish Buildbot
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    (cherry picked from commit 608dbda8eeefeb1c79fd93c1848515d8bc6b4ca1)
+    Reviewed-on: https://code.wireshark.org/review/34523
+
+commit 886c340d43
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Sep 11 15:46:24 2019 -0700
+
+    2.6.11 → 2.6.12.
+    
+    Change-Id: I2d963ed304ec8933adf1c4d3938860ba8a5cbffb
+    Reviewed-on: https://code.wireshark.org/review/34510
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
diff --git a/NEWS b/NEWS
index 6edd4e357c..601c4ec539 100644
--- a/NEWS
+++ b/NEWS
@@ -9,11 +9,24 @@ Wireshark 2.6.12 Release Notes
 
   Bug Fixes
 
-   The following vulnerabilities have been fixed:
+   The following bugs have been fixed:
 
-     • wnpa-sec-2019-22[1] Foo dissector {crash,infinite loop}.
+     • Qt interface crashes on a profile with packet list only. Bug
+       16048[1].
 
-   The following bugs have been fixed:
+     • NET-SNMP EngineID Length handling Warning. Bug 16051[2].
+
+     • Wireshark CMake configuration points to wrong plugin install dir.
+       Bug 16060[3].
+
+     • ERSPAN Type III over GRE without sequence number not decoded
+       correctly. Bug 16089[4].
+
+     • Windows dumpcap -v does not display capture library info. Bug
+       16108[5].
+
+     • [Regression] FT_CHAR fields not supported in Lua API. Bug
+       16129[6].
 
   New and Updated Features
 
@@ -25,6 +38,8 @@ Wireshark 2.6.12 Release Notes
 
   Updated Protocol Support
 
+   ERSPAN, IPv4, and SNMP
+
   New and Updated Capture File Support
 
    There is no new or updated capture file support in this release.
@@ -36,14 +51,14 @@ Wireshark 2.6.12 Release Notes
  Getting Wireshark
 
   Wireshark source code and installation packages are available from
-  https://www.wireshark.org/download.html[2].
+  https://www.wireshark.org/download.html[7].
 
   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 download page[3] on the Wireshark web site.
+   be found on the download page[8] on the Wireshark web site.
 
  File Locations
 
@@ -54,49 +69,50 @@ Wireshark 2.6.12 Release Notes
 
  Known Problems
 
-  The BER dissector might infinitely loop. Bug 1516[4].
+  The BER dissector might infinitely loop. Bug 1516[9].
 
   Capture filters aren’t applied when capturing from named pipes. Bug
-  1814[5].
+  1814[10].
 
   Filtering tshark captures with read filters (-R) no longer works. Bug
-  2234[6].
+  2234[11].
 
-  Application crash when changing real-time option. Bug 4035[7].
+  Application crash when changing real-time option. Bug 4035[12].
 
   Wireshark and TShark will display incorrect delta times in some cases.
-  Bug 4985[8].
+  Bug 4985[13].
 
   Wireshark should let you work with multiple capture files. Bug
-  10488[9].
+  10488[14].
 
  Getting Help
 
-  Community support is available on Wireshark’s Q&A site[10] and on the
+  Community support is available on Wireshark’s Q&A site[15] and on the
   wireshark-users mailing list. Subscription information and archives
-  for all of Wireshark’s mailing lists can be found on the web site[11].
-
-  Official Wireshark training and certification are available from
-  Wireshark University[12].
+  for all of Wireshark’s mailing lists can be found on the web site[16].
 
  Frequently Asked Questions
 
-  A complete FAQ is available on the Wireshark web site[13].
+  A complete FAQ is available on the Wireshark web site[17].
 
-  Last updated 2019-10-20 08:34:14 UTC
+  Last updated 2019-10-23 17:15:51 UTC
 
  References
 
-   1. https://www.wireshark.org/security/wnpa-sec-2019-22
-   2. https://www.wireshark.org/download.html
-   3. https://www.wireshark.org/download.html#thirdparty
-   4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516
-   5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814
-   6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234
-   7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035
-   8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985
-   9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10488
-  10. https://ask.wireshark.org/
-  11. https://www.wireshark.org/lists/
-  12. http://www.wiresharktraining.com/
-  13. https://www.wireshark.org/faq.html
+   1. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16048
+   2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16051
+   3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16060
+   4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16089
+   5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16108
+   6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16129
+   7. https://www.wireshark.org/download.html
+   8. https://www.wireshark.org/download.html#thirdparty
+   9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516
+  10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814
+  11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234
+  12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035
+  13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985
+  14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10488
+  15. https://ask.wireshark.org/
+  16. https://www.wireshark.org/lists/
+  17. https://www.wireshark.org/faq.html
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 1a624e472d..0ce2a776b4 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -8,17 +8,17 @@ include::attributes.asciidoc[]
 
 == What is Wireshark?
 
-Wireshark is the world’s most popular network protocol analyzer. It is
-used for troubleshooting, analysis, development and education.
+Wireshark is the world’s most popular network protocol analyzer.
+It is used for troubleshooting, analysis, development and education.
 
 == What’s New
 
 === Bug Fixes
 
-The following vulnerabilities have been fixed:
+// The following vulnerabilities have been fixed:
 
-* wssalink:2019-22[]
-Foo dissector {crash,infinite loop}.
+// * wssalink:2019-22[]
+// Foo dissector {crash,infinite loop}.
 // wsbuglink:xxxxx[].
 // cveidlink:2019-XXXXX[].
 // Fixed in master: xxxxx
@@ -33,6 +33,18 @@ 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.12rc0..| grep ' Bug:' | awk '{print $2}' | sort -n -u ` ; do "$(git rev-parse --show-toplevel)/tools/gen-bugnote" $bugnumber; pbpaste >> /tmp/buglist.txt; done
 
+* Qt interface crashes on a profile with packet list only. wsbuglink:16048[].
+
+* NET-SNMP EngineID Length handling Warning. wsbuglink:16051[].
+
+* Wireshark CMake configuration points to wrong plugin install dir. wsbuglink:16060[].
+
+* ERSPAN Type III over GRE without sequence number not decoded correctly. wsbuglink:16089[].
+
+* Windows dumpcap -v does not display capture library info. wsbuglink:16108[].
+
+* [Regression] FT_CHAR fields not supported in Lua API. wsbuglink:16129[].
+
 === New and Updated Features
 
 There are no new features in this release.
@@ -50,6 +62,9 @@ There are no new protocols in this release.
 // Add one protocol per line between the -- delimiters.
 [commaize]
 --
+ERSPAN
+IPv4
+SNMP
 --
 
 === New and Updated Capture File Support
@@ -113,8 +128,8 @@ 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 https://www.wireshark.org/lists/[the web site].
 
-Official Wireshark training and certification are available from
-http://www.wiresharktraining.com/[Wireshark University].
+// Official Wireshark training and certification are available from
+// http://www.wiresharktraining.com/[Wireshark University].
 
 == Frequently Asked Questions
 
diff --git a/version.conf b/version.conf
index b999997703..cc8d9d1108 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