aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog205
-rw-r--r--config.nmake2
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog2
-rw-r--r--docbook/asciidoc.conf2
-rw-r--r--docbook/release-notes.asciidoc22
-rw-r--r--epan/CMakeLists.txt2
-rw-r--r--epan/Makefile.am2
-rwxr-xr-xmake-version.pl2
-rw-r--r--version.conf12
-rw-r--r--wiretap/CMakeLists.txt2
-rw-r--r--wiretap/Makefile.am2
13 files changed, 23 insertions, 236 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29379d515c..7ec2182521 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 0)
-set(PROJECT_PATCH_VERSION 16)
+set(PROJECT_PATCH_VERSION 17)
set(PROJECT_BUILD_VERSION ${GIT_REVISION})
set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
diff --git a/ChangeLog b/ChangeLog
index 0bf6f3c0fe..e69de29bb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,205 +0,0 @@
-commit a357dfa0af
-Author: Gerald Combs <gerald@wireshark.org>
-Date: Sun Oct 8 08:32:33 2017 +0000
-
- [Automatic update for 2017-10-08]
-
- Update manuf, services enterprise numbers, translations, and other items.
-
- Change-Id: I829a06c2da67e8d5f0082c3b35913151dde8b0a4
- Reviewed-on: https://code.wireshark.org/review/23862
- Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 45263ff544
-Author: Gerald Combs <gerald@wireshark.org>
-Date: Fri Oct 6 15:52:20 2017 -0700
-
- Update the release notes for 2.0.16.
-
- Change-Id: I089c0db031796a94dbe47e7eb22bf30cf38a9028
- Reviewed-on: https://code.wireshark.org/review/23856
- Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a7678d2196
-Author: Gerald Combs <gerald@wireshark.org>
-Date: Sun Oct 1 08:43:04 2017 +0000
-
- [Automatic update for 2017-10-01]
-
- Update manuf, services enterprise numbers, translations, and other items.
-
- Change-Id: I0b75ede897327175ad0f84d4291d45ecbb793829
- Reviewed-on: https://code.wireshark.org/review/23797
- Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit e209b4c527
-Author: Guy Harris <guy@alum.mit.edu>
-Date: Thu Sep 28 12:23:12 2017 -0700
-
- Have dissect_7bit_string() return a const gchar *.
-
- Nobody needs to modify the string, and nobody needs to free it - which
- is good, because it could be a string constant which can neither be
- modified nor freed.
-
- Change-Id: I13d4239557698e4631e8f8b062d436a2e94d5eca
- Reviewed-on: https://code.wireshark.org/review/23773
- Petri-Dish: Guy Harris <guy@alum.mit.edu>
- Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
- Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit c1ea97241d
-Author: Gerald Combs <gerald@wireshark.org>
-Date: Thu Sep 28 16:49:46 2017 +0000
-
- DMP: Work around a gcc "write-strings"-induced warning
-
- Add a cast in order to squelch
-
- packet-dmp.c: In function ‘dissect_7bit_string’:
- packet-dmp.c:1657:13: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
- decoded = "";
- ^
-
- Change-Id: Ib333e1a57b94a5bfadfddc463e881ffe880da759
- Reviewed-on: https://code.wireshark.org/review/23772
- Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 458856f052
-Author: Guy Harris <guy@alum.mit.edu>
-Date: Sun Sep 24 13:01:49 2017 -0700
-
- Replace DISSECTOR_ASSERT(hfinfo->type == FT_STRING) with DISSECTOR_ASSERT_FIELD_TYPE.
-
- That produces better error messages, giving the name of the offending
- field.
-
- Change-Id: I155ac29c68ecd7811cc9752980db9cdc37fea72e
- Reviewed-on: https://code.wireshark.org/review/23685
- Reviewed-by: Guy Harris <guy@alum.mit.edu>
- (cherry picked from commit 7517b73e74bd3a425406e08fa0ce667a655ee049)
- Reviewed-on: https://code.wireshark.org/review/23688
-
-commit 7f238c95fe
-Author: Guy Harris <guy@alum.mit.edu>
-Date: Sun Sep 24 12:36:53 2017 -0700
-
- Move DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME after __DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME().
-
- That's consistent with the other DISSECTOR_ASSERT_FIELD_TYPE... macros.
-
- Change-Id: I1f5711b29ae8a440b0529373eb7903ff122ea18e
- Reviewed-on: https://code.wireshark.org/review/23681
- Reviewed-by: Guy Harris <guy@alum.mit.edu>
- (cherry picked from commit a9963c45e79440094df221dfcb34b11ba94f0882)
- Reviewed-on: https://code.wireshark.org/review/23684
-
-commit 4fa59f9e19
-Author: Gerald Combs <gerald@wireshark.org>
-Date: Sun Sep 24 08:28:15 2017 +0000
-
- [Automatic update for 2017-09-24]
-
- Update manuf, services enterprise numbers, translations, and other items.
-
- Change-Id: I93c0758846d9ccfb3e54bf5b8158eae1bbeade66
- Reviewed-on: https://code.wireshark.org/review/23672
- Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit bf1f1fd864
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date: Sun Sep 17 21:46:09 2017 +0200
-
- DMP: check 7bit string length before decoding it
-
- Bug: 14068
- Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3372
- Change-Id: Ib9ff63e2ef8d3c2546f357534c374a662e70e43c
- Reviewed-on: https://code.wireshark.org/review/23591
- Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
- Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
- Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
- Reviewed-by: Peter Wu <peter@lekensteyn.nl>
- (cherry picked from commit 8dbb21dfde14221dab09b6b9c7719b9067c1f06e)
- Reviewed-on: https://code.wireshark.org/review/23595
- Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit cf385c9068
-Author: Gerald Combs <gerald@wireshark.org>
-Date: Sun Sep 17 08:29:20 2017 +0000
-
- [Automatic update for 2017-09-17]
-
- Update manuf, services enterprise numbers, translations, and other items.
-
- Change-Id: Id2f80f71c2a446ecb1edbc1094be96aca2387693
- Reviewed-on: https://code.wireshark.org/review/23583
- Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 3f7d5859ac
-Author: Michael Mann <mmann78@netscape.net>
-Date: Thu Aug 17 20:30:01 2017 -0400
-
- Fix: Segfault when "Update list of packets in real time" is unchecked
-
- capture_file structure is not populated with "fixed" captures. Qt menu
- presumes it has a populated capture_file structure. Just have menu
- items be disabled until capture file is reloaded for display.
-
- Bug: 13024
- Change-Id: I9dfb5355c5d421f5344f97e1e9d5b4dd08b11c6e
- Reviewed-on: https://code.wireshark.org/review/23095
- Petri-Dish: Michael Mann <mmann78@netscape.net>
- Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
- Reviewed-by: Michael Mann <mmann78@netscape.net>
- (cherry picked from commit b4d8b68d7c9c0e3280a204dcfca9b57e66bffddd)
- Reviewed-on: https://code.wireshark.org/review/23514
-
-commit 0ac9415d51
-Author: Gerald Combs <gerald@wireshark.org>
-Date: Sun Sep 10 08:32:51 2017 +0000
-
- [Automatic update for 2017-09-10]
-
- Update manuf, services enterprise numbers, translations, and other items.
-
- Change-Id: I71edd1936c084f6779038e8a4e589a9816594c25
- Reviewed-on: https://code.wireshark.org/review/23451
- Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 15ae203496
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date: Wed Sep 6 15:14:44 2017 +0200
-
- Qt: fix RTP/IAX2 reverse stream export to CSV
-
- Bug: 14040
- Change-Id: Idadfbd3b60124b5f7ac4ace275db94b10daf010a
- Reviewed-on: https://code.wireshark.org/review/23409
- Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
- Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
- Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
- (cherry picked from commit d022091acfd4c9513a4f13973d7cdc7d7785c09e)
- Reviewed-on: https://code.wireshark.org/review/23414
-
-commit 5a6cab4481
-Author: Gerald Combs <gerald@wireshark.org>
-Date: Sun Sep 3 08:24:58 2017 +0000
-
- [Automatic update for 2017-09-03]
-
- Update manuf, services enterprise numbers, translations, and other items.
-
- Change-Id: I26fd0a454dee64300a1fad20b2870bc5a5a8f888
- Reviewed-on: https://code.wireshark.org/review/23372
- Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit a7669ed6c4
-Author: Gerald Combs <gerald@wireshark.org>
-Date: Tue Aug 29 12:38:06 2017 -0700
-
- 2.0.15 → 2.0.16.
-
- Change-Id: I6c96fc3782775d45db3c6bd24cd66cdb37fe7e6c
- Reviewed-on: https://code.wireshark.org/review/23297
- Reviewed-by: Gerald Combs <gerald@wireshark.org>
diff --git a/config.nmake b/config.nmake
index 6c47ca7dd0..b5714dc231 100644
--- a/config.nmake
+++ b/config.nmake
@@ -35,7 +35,7 @@ VCS_REVISION=0
# Updated by make-version.pl
VERSION_MAJOR=2
VERSION_MINOR=0
-VERSION_MICRO=16
+VERSION_MICRO=17
VERSION_BUILD=$(VCS_REVISION)
# Local build information. Recommended: Unique string for your
diff --git a/configure.ac b/configure.ac
index 32aed0a211..7e4746c74d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
#
m4_define([version_major], [2])
m4_define([version_minor], [0])
-m4_define([version_micro], [16])
+m4_define([version_micro], [17])
m4_define([version_micro_extra], version_micro)
m4_append([version_micro_extra], [])
diff --git a/debian/changelog b/debian/changelog
index ee6533f46c..4e6423adbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (2.0.16) unstable; urgency=low
+wireshark (2.0.17) unstable; urgency=low
* Self-made package
diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index 433970df40..b907f84a6c 100644
--- a/docbook/asciidoc.conf
+++ b/docbook/asciidoc.conf
@@ -4,7 +4,7 @@
# Yes, these are fake macros.
# We should probably replace some or all of them with attributes.
-wireshark-version:\[\]=2.0.16
+wireshark-version:\[\]=2.0.17
wireshark-major-minor-version:\[\]=2.0
wireshark-authors-url:\[\]=https://www.wireshark.org/about.html#authors
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 3b09b2d7ca..cb4ab9ab88 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -12,15 +12,14 @@ used for troubleshooting, analysis, development and education.
The following vulnerabilities have been fixed:
-* ws-salink:2017-44[]
+* ws-salink:2017-47[]
+
-DMP dissector crash
-(ws-buglink:14068[])
-cve-idlink:2017-15191[]
-// Fixed in master: 8dbb21dfdef
-// Fixed in master-2.4: 3d8f82c24f
-// Fixed in master-2.2: cd2a1e9a8d
-// Fixed in master-2.0: bf1f1fd864
+A dissector went awry.
+(ws-buglink:xxxx[])
+// cve-idlink:2017-xxxx[]
+// Fixed in master: xxxx
+// Fixed in master-2.4: xxxx
+// Fixed in master-2.2: xxxx
The following bugs have been fixed:
@@ -30,12 +29,6 @@ The following bugs have been fixed:
//* Wireshark insists on calling you on your land line which is keeping you from abandoning it for cellular. (ws-buglink:0000[])
// cp /dev/null /tmp/buglist.txt ; for bugnumber in `git log --stat v2.0.17rc0..| grep ' Bug:' | cut -f2 -d: | sort -n -u ` ; do gen-bugnote $bugnumber; pbpaste >> /tmp/buglist.txt; done
-// Left off at a7678d2196
-
-* Wireshark crash when end capturing with "Update list of packets in real-time" option off. (ws-buglink:13024[])
-
-* RTP Analysis "save as CSV" saves twice the forward stream, if two streams are selected. (ws-buglink:14040[])
-
=== New and Updated Features
There are no new features in this release.
@@ -53,7 +46,6 @@ There are no new protocols in this release.
=== Updated Protocol Support
--sort-and-group--
-DMP
--sort-and-group--
=== New and Updated Capture File Support
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 27195ed916..568b2e0f67 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1780,7 +1780,7 @@ add_library(epan ${LINK_MODE_LIB}
${CMAKE_BINARY_DIR}/image/libwireshark.rc
)
-set(FULL_SO_VERSION "7.1.16")
+set(FULL_SO_VERSION "7.1.17")
set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
diff --git a/epan/Makefile.am b/epan/Makefile.am
index f43e58e169..a83049f60d 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -42,7 +42,7 @@ ACLOCAL_AMFLAGS = `../aclocal-flags`
noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
lib_LTLIBRARIES = libwireshark.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwireshark_la_LDFLAGS = -version-info 8:16:1 @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 8:17:1 @LDFLAGS_SHAREDLIB@
include Makefile.common
diff --git a/make-version.pl b/make-version.pl
index a307a1a05c..244f365942 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" => 0,
- "version_micro" => 16,
+ "version_micro" => 17,
"version_build" => 0,
"enable" => 1,
diff --git a/version.conf b/version.conf
index 9480b2f829..6dedd7c96a 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
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index f8f309660c..fa4a0b300f 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -110,7 +110,7 @@ add_library(wiretap ${LINK_MODE_LIB}
${CMAKE_BINARY_DIR}/image/wiretap.rc
)
-set(FULL_SO_VERSION "5.0.16")
+set(FULL_SO_VERSION "5.0.17")
set_target_properties(wiretap PROPERTIES
COMPILE_DEFINITIONS "WS_BUILD_DLL"
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 9f2e472d9e..fcf665c40c 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -28,7 +28,7 @@ include Makefile.common
noinst_LTLIBRARIES = libwiretap_generated.la
lib_LTLIBRARIES = libwiretap.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwiretap_la_LDFLAGS = -version-info 5:16:0 @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 5:17:0 @LDFLAGS_SHAREDLIB@
AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 03:51:53 +0000