2.5 → 2.9.

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

CMakeLists.txt

@@ -12,8 +12,8 @@ project(Wireshark C CXX)
 # Updated by make-version.pl
 set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 2)
-set(PROJECT_MINOR_VERSION 5)
-set(PROJECT_PATCH_VERSION 2)
+set(PROJECT_MINOR_VERSION 9)
+set(PROJECT_PATCH_VERSION 0)
 set(PROJECT_BUILD_VERSION ${GIT_REVISION})
 set(PROJECT_VERSION_EXTENSION "")
 set(PROJECT_RELEASE_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}")

configure.ac

@@ -6,8 +6,8 @@
 # Define variables for the components of the Wireshark version number.
 #
 m4_define([version_major], [2])
-m4_define([version_minor], [5])
-m4_define([version_micro], [2])
+m4_define([version_minor], [9])
+m4_define([version_micro], [0])
 dnl Updated by make-version.pl
 m4_define([version_extra], [])
 m4_define([version_micro_extra], m4_join([], version_micro, version_extra))

debian/changelog

@@ -1,4 +1,4 @@
-wireshark (2.5.2) unstable; urgency=low
+wireshark (2.9.0) unstable; urgency=low
 
   * Self-made package
 

docbook/attributes.asciidoc

@@ -1,6 +1,6 @@
 // Common attributes
 
-:wireshark-version: 2.5.1
+:wireshark-version: 2.9.0
 
 // We're migrating from AsciiDoc.
 :compat-mode:

docbook/developer-guide-docinfo.xml

@@ -1,7 +1,7 @@
 <!-- Document information for the Developer's Guide. -->
 
 <!-- Updated by make-version.pl -->
-<subtitle>For Wireshark 2.5</subtitle>
+<subtitle>For Wireshark 2.9</subtitle>
 
   <!-- <title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title> -->
 

docbook/release-notes.asciidoc

@@ -7,8 +7,8 @@ include::attributes.asciidoc[]
 // Asciidoctor Syntax Quick Reference:
 // http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/
 
-This is a semi-experimental release intended to test new features for
-Wireshark 2.6.
+This is an sexperimental release intended to test new features for
+Wireshark 3.0.
 
 == What is Wireshark?
 
@@ -17,9 +17,6 @@ used for troubleshooting, analysis, development and education.
 
 == What’s New
 
-Wireshark 2.6 is the last release that will support the legacy (GTK+)
-user interface. It will not be supported or available in Wireshark 3.0.
-
 Many user interface improvements have been made. See the “New and Updated
 Features” section below for more details.
 
@@ -30,7 +27,7 @@ The following bugs have been fixed:
 //* ws_buglink:5000[]
 //* ws_buglink:6000[Wireshark bug]
 //* cve_idlink:2014-2486[]
-//* Wireshark convinced you to switch seats on the plane while neglecting to tell you that its seat was noticeably moist.
+//* Wireshark slowly leaked water under the kitchen sink over the course of several months, causing a big mess.
 
 //_Non-empty section placeholder._
 
@@ -40,56 +37,9 @@ Dumpcap might not quit if Wireshark or TShark crashes.
 === New and Updated Features
 
 The following features are new (or have been significantly updated)
-since version 2.5.0:
+since version 2.6.0:
 
-* HTTP Request sequences are now supported.
-* Wireshark now supports MaxMind DB files. Support for GeoIP and GeoLite
-  Legacy databases has been removed.
-* The Windows packages are now built using Microsoft Visual Studio 2017.
-* The IP map feature (the “Map” button in the “Endpoints” dialog) has been removed.
-
-The following features are new (or have been significantly updated)
-since version 2.4.0:
-
-* Display filter buttons can now be edited, disabled, and removed via a context
-  menu directly from the toolbar
-* Drag & Drop filter fields to the display filter toolbar or edit to create
-  a button on the fly or apply the filter as a display filter.
-* Application startup time has been reduced.
-* Some keyboard shortcut mix-ups have been resolved by assigning new shortcuts
-  to Edit -> Copy methods.
-* TShark now supports color using the --color option.
-* The "matches" display filter operator is now case-insensitive.
-* Display expression (button) preferences have been converted to a UAT.
-  This puts the display expressions in their own file.  Wireshark still
-  supports preference files that contain the old preferences, but new
-  preference files will be written without the old fields.
-* SMI private enterprise numbers are now read from the "enterprises.tsv" configuration file.
-* The QUIC dissector has been renamed to **G**oogle QUIC (quic -> **g**quic).
-* The selected packet number can now be shown in the Status Bar by enabling
-  Preferences -> Appearance -> Layout -> Show selected packet number.
-* File load time in the Status Bar is now disabled by default and can be enabled in
-  Preferences -> Appearance -> Layout -> Show file load time.
-* Support for the G.729A codec in the RTP Player is now added via the bcg729 library.
-* Support for hardware-timestamping of packets has been added.
-* Improved NetMon .cap support with comments, event tracing, network filter,
-  network info types and some Message Analyzer exported types.
-* The personal plugins folder on Linux/Unix is now {tilde}/.local/lib/wireshark/plugins.
-* TShark can print flow graphs using `-z flow…`
-* Capinfos now prints SHA256 hashes in addition to RIPEMD160 and SHA1. MD5 output
-  has been removed.
-* The packet editor has been removed. (This was a GTK+ only experimental feature.)
-* Support BBC micro:bit Bluetooth profile
-* The Linux and UNIX installation step for Wireshark will now install
-  headers required to build plugins. A pkg-config file is provided to
-  help with this (see doc/plugins.example for details). Note you must
-  still rebuild all plugins between minor releases (X.Y).
-* The Windows installers and packages now ship with Qt 5.9.4.
-* The generic data dissector can now uncompress zlib compressed data.
-* Dns Stats now support service-level stats.
-* Dns filters for retransmissions and unsolicited responses have been added.
-* The “tcptrace” TCP Stream graph now shows duplicate ACKS and zero
-  window advertisements.
+* Watch this space.
 
 //=== Removed Dissectors
 
@@ -100,45 +50,6 @@ since version 2.4.0:
 // Add one protocol per line between the -- delimiters.
 [commaize]
 --
-ActiveMQ Artemis Core Protocol
-AMT (Automatic Multicast Tunneling)
-AVSP (Arista Vendor Specific Protocol)
-Bluetooth Mesh
-Broadcom tags (Broadcom Ethernet switch management frames)
-CVS password server
-CAN-ETH
-Excentis DOCSIS31 XRA header
-F1 Application Protocol
-F5ethtrailer
-FP Mux
-GRPC (gRPC)
-IEEE 802.3br Frame Preemption Protocol
-IEEE 802.11ax (High Efficiency WLAN (HEW))
-IEEE 802.15.9 IEEE Recommended Practice for Transport of Key Management Protocol (KMP) Datagrams
-IEEE 1905.1a
-ISOBUS
-LoRaTap
-LoRaWAN
-Lustre Network
-Lustre Filesystem
-Nano / RaiBlocks Cryptocurrency Protocol (UDP)
-Network Functional Application Platform Interface (NFAPI) Protocol
-New Radio Radio Resource Control protocol
-New Radio Radio Link Control protocol
-NR (5G) MAC protocol
-NXP 802.15.4 Sniffer Protocol
-Object Security for Constrained RESTful Environments (OSCORE)
-PFCP (Packet Forwarding Control Protocol)
-Protobuf (Protocol Buffers)
-QUIC (IETF)
-RFC 4108 Using CMS to Protect Firmware Packages
-SolarEdge monitoring protocol
-Session Multiplex Protocol
-Steam In-Home Streaming Discovery Protocol
-Tibia
-TWAMP and OWAMP
-Wi-Fi Device Provisioning Protocol
-Wi-SUN FAN Protocol
 --
 
 === Updated Protocol Support
@@ -150,14 +61,12 @@ Too many protocols have been updated to list here.
 //_Non-empty section placeholder._
 // Add one file type per line between the --sort-and-group-- delimiters.
 [commaize]
-Microsoft Network Monitor
 
 === New and Updated Capture Interfaces support
 
 //_Non-empty section placeholder._
 [commaize]
 --
-LoRaTap
 --
 
 //=== Major API Changes

docbook/user-guide-docinfo.xml

@@ -1,7 +1,7 @@
 <!-- Document information for the User's Guide. -->
 
 <!-- Updated by make-version.pl -->
-<subtitle>For Wireshark 2.5</subtitle>
+<subtitle>For Wireshark 2.9</subtitle>
 
 <!--
   <title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title>

make-version.pl

@@ -72,8 +72,8 @@ my $set_version = 0;
 my $set_release = 0;
 my %version_pref = (
 	"version_major" => 2,
-	"version_minor" => 5,
-	"version_micro" => 2,
+	"version_minor" => 9,
+	"version_micro" => 0,
 	"version_build" => 0,
 
 	"enable"        => 1,
@@ -498,7 +498,7 @@ sub update_docinfo_asciidoc
 		my $contents = "";
 		open(DOCINFO_XML, "< $filepath") || die "Can't read $filepath!";
 		while ($line = <DOCINFO_XML>) {
-			if ($line =~ /^<subtitle>For Wireshark \d.\d<\/subtitle>([\r\n]+)$/) {
+			if ($line =~ /^<subtitle>For Wireshark \d.\d+<\/subtitle>([\r\n]+)$/) {
 				$line = sprintf("<subtitle>For Wireshark %d.%d</subtitle>$1",
 						$version_pref{"version_major"},
 						$version_pref{"version_minor"},