aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitreview2
-rw-r--r--.tx/config4
-rw-r--r--CMakeLists.txt8
-rw-r--r--CMakeOptions.txt2
-rw-r--r--cmake/modules/FindWSWinLibs.cmake2
-rw-r--r--configure.ac12
-rw-r--r--debian/changelog2
-rw-r--r--docbook/attributes.asciidoc2
-rw-r--r--docbook/developer-guide-docinfo.xml2
-rw-r--r--docbook/release-notes.asciidoc4
-rw-r--r--docbook/user-guide-docinfo.xml2
-rw-r--r--epan/CMakeLists.txt2
-rw-r--r--epan/Makefile.am2
-rwxr-xr-xmake-version.pl4
-rwxr-xr-xtools/make-pixbuf-csource.pl2
-rw-r--r--tools/win-setup.ps14
-rw-r--r--ui/gtk/Makefile.am2
-rw-r--r--version.conf9
-rw-r--r--wiretap/CMakeLists.txt2
-rw-r--r--wiretap/Makefile.am2
-rw-r--r--wsutil/CMakeLists.txt2
-rw-r--r--wsutil/Makefile.am2
22 files changed, 41 insertions, 34 deletions
diff --git a/.gitreview b/.gitreview
index 6e80490ddb..dcf89b41f2 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@ host=code.wireshark.org
port=29418
project=wireshark.git
defaultremote=origin
-defaultbranch=master
+defaultbranch=master-2.6
diff --git a/.tx/config b/.tx/config
index 452f2d5e27..91f4c0b4e6 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com
-[wireshark.master]
+[wireshark.master-2.6]
file_filter = ui/qt/wireshark_<lang>.ts
source_file = ui/qt/wireshark_en.ts
source_lang = en
@@ -13,7 +13,7 @@ trans.ja_JP = ui/qt/wireshark_ja_JP.ts
trans.pl = ui/qt/wireshark_pl.ts
trans.zh_CN = ui/qt/wireshark_zh_CN.ts
-[wireshark.debian]
+[wireshark.debian-26]
file_filter = debian/po/<lang>.po
source_file = debian/po/templates.pot
source_lang = en
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da3f3f140a..6cf8727d8c 100644
--- a/CMakeLists.txt
+++ b/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 6)
+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}")
@@ -186,8 +186,8 @@ endif()
# Banner shown at top right of Qt welcome screen.
if(DEFINED ENV{WIRESHARK_VERSION_FLAVOR})
set(VERSION_FLAVOR "$ENV{WIRESHARK_VERSION_FLAVOR}")
-else()
- set(VERSION_FLAVOR "Development Build")
+#else()
+# set(VERSION_FLAVOR "Development Build")
endif()
# These are required in .rc files and manifests
diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index fc7064ac9e..fb405c5abc 100644
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -30,7 +30,7 @@ else()
endif()
option(BUILD_mmdbresolve "Build MaxMind DB resolver" ON)
-option(DISABLE_WERROR "Do not treat warnings as errors" OFF)
+option(DISABLE_WERROR "Do not treat warnings as errors" ON)
option(DISABLE_FRAME_LARGER_THAN_WARNING "Disable warning if the size of a function frame is large" OFF)
option(EXTCAP_ANDROIDDUMP_LIBPCAP "Build androiddump using libpcap" OFF)
option(ENABLE_EXTRA_COMPILER_WARNINGS "Do additional compiler warnings (disables -Werror)" OFF)
diff --git a/cmake/modules/FindWSWinLibs.cmake b/cmake/modules/FindWSWinLibs.cmake
index 05e53b0117..37697e4ba3 100644
--- a/cmake/modules/FindWSWinLibs.cmake
+++ b/cmake/modules/FindWSWinLibs.cmake
@@ -16,7 +16,7 @@ function( FindWSWinLibs _WS_LIB_SEARCH_PATH _LIB_HINT_VAR )
file( TO_CMAKE_PATH "$ENV{WIRESHARK_LIB_DIR}" _PROJECT_LIB_DIR )
else()
file( TO_CMAKE_PATH "$ENV{WIRESHARK_BASE_DIR}" _WS_BASE_DIR )
- set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs" )
+ set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs-2.6" )
endif()
endif()
file( GLOB _SUBDIR "${_PROJECT_LIB_DIR}/*" )
diff --git a/configure.ac b/configure.ac
index e4febe2b35..f208c66777 100644
--- a/configure.ac
+++ b/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], [6])
+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))
@@ -61,8 +61,8 @@ AC_DEFINE(VERSION_MAJOR, version_major, [Wireshark's major version])
AC_DEFINE(VERSION_MINOR, version_minor, [Wireshark's minor version])
AC_DEFINE(VERSION_MICRO, version_micro, [Wireshark's micro version])
-AC_DEFINE_UNQUOTED(VERSION_FLAVOR,
- ["${WIRESHARK_VERSION_FLAVOR:-"Development Build"}"], [Wireshark's package flavor])
+dnl AC_DEFINE_UNQUOTED(VERSION_FLAVOR,
+dnl ["${WIRESHARK_VERSION_FLAVOR:-"Development Build"}"], [Wireshark's package flavor])
LT_PREREQ([2.2.2])
LT_INIT([disable-static])
@@ -915,11 +915,11 @@ AC_WIRESHARK_GCC_FORTIFY_SOURCE_CHECK
# This barrier is set for a very large part of the code. However, it is
# typically not set for "generated" code (flex, ans2wrs, idl2wrs, ...)
#
-warnings_as_errors_default="yes"
+warnings_as_errors_default="no"
AC_MSG_CHECKING(whether we should treat compiler warnings as errors)
AC_ARG_ENABLE(warnings-as-errors,
AC_HELP_STRING( [--enable-warnings-as-errors],
- [treat warnings as errors (only for GCC or clang) @<:@default=yes, unless extra compiler warnings are enabled@:>@]),
+ [treat warnings as errors (only for GCC or clang) @<:@default=no@:>@]),
[
if test "x$ac_supports_gcc_flags" = "xyes" -a "x$enableval" = "xyes"; then
with_warnings_as_errors="yes"
diff --git a/debian/changelog b/debian/changelog
index 0aa76f4c9f..df7d7a99a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (2.5.2) unstable; urgency=low
+wireshark (2.6.0) unstable; urgency=low
* Self-made package
diff --git a/docbook/attributes.asciidoc b/docbook/attributes.asciidoc
index da1bd8b642..9dd5542335 100644
--- a/docbook/attributes.asciidoc
+++ b/docbook/attributes.asciidoc
@@ -1,6 +1,6 @@
// Common attributes
-:wireshark-version: 2.5.1
+:wireshark-version: 2.6.0
// We're migrating from AsciiDoc.
:compat-mode:
diff --git a/docbook/developer-guide-docinfo.xml b/docbook/developer-guide-docinfo.xml
index e9dcb01f0f..883d76f79c 100644
--- a/docbook/developer-guide-docinfo.xml
+++ b/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.6</subtitle>
<!-- <title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title> -->
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 1b9e4fb57c..8f0a3fce1b 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -3,12 +3,10 @@ include::attributes.asciidoc[]
:linkcss:
= Wireshark {wireshark-version} Release Notes
-// AsciiDoc quick reference: http://powerman.name/doc/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 the first release candidate for Wireshark 2.6.0.
== What is Wireshark?
diff --git a/docbook/user-guide-docinfo.xml b/docbook/user-guide-docinfo.xml
index cfd6ce3f14..97adbeaf5a 100644
--- a/docbook/user-guide-docinfo.xml
+++ b/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.6</subtitle>
<!--
<title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title>
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 6812574994..9902c089e3 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -312,7 +312,7 @@ add_library(epan
add_dependencies(epan version)
-set(FULL_SO_VERSION "0.0.0")
+set(FULL_SO_VERSION "11.0.0")
set_target_properties(epan PROPERTIES
COMPILE_DEFINITIONS "WS_BUILD_DLL"
diff --git a/epan/Makefile.am b/epan/Makefile.am
index c85fcd2d52..4cfe655a45 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -300,7 +300,7 @@ nodist_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 0:0:0 @LDFLAGS_BIGSHAREDLIB@ @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 11:0:0 @LDFLAGS_BIGSHAREDLIB@ @LDFLAGS_SHAREDLIB@
if HAVE_LIBLUA
wslua_lib = wslua/libwslua.la
diff --git a/make-version.pl b/make-version.pl
index 2c53467f1e..02d37cd655 100755
--- a/make-version.pl
+++ b/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" => 6,
+ "version_micro" => 0,
"version_build" => 0,
"enable" => 1,
diff --git a/tools/make-pixbuf-csource.pl b/tools/make-pixbuf-csource.pl
index 7e300479ec..7c0cb57b81 100755
--- a/tools/make-pixbuf-csource.pl
+++ b/tools/make-pixbuf-csource.pl
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
# Simple script to create extern pixbuf csource. Receives list of
-# tuples (varname, path) separated with spaces.
+# tuples (varname, path) separated with spaces. GTK+ only.
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1
index 0d6366e81d..5389314d68 100644
--- a/tools/win-setup.ps1
+++ b/tools/win-setup.ps1
@@ -57,12 +57,12 @@ their compressed archives.
A date stamp (current-tag.txt)
.EXAMPLE
-C:\PS> .\tools\win-setup.ps1 -Destination C:\wireshark-master-64-libs -Platform win64
+C:\PS> .\tools\win-setup.ps1 -Destination C:\wireshark-win64-libs-2.6 -Platform win64
#>
Param(
[Parameter(Mandatory=$true, Position=0)]
- [ValidateScript({$_ -like "*\wireshark-*-libs"})]
+ [ValidateScript({$_ -like "*\wireshark-*-libs-2.6"})]
[String]
$Destination,
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index 23d70fb8b2..0425f3080f 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -414,7 +414,7 @@ pixbuf_csource_data = \
wsiconcap_64_pb_data \
$(imagedir)/wsiconcap64.png \
wssplash_pb_data \
- $(imagedir)/wssplash_dev.png
+ $(imagedir)/wssplash.png
pixbuf-csource:
$(PERL) $(top_srcdir)/tools/make-pixbuf-csource.pl $@ $(pixbuf_csource_data)
diff --git a/version.conf b/version.conf
new file mode 100644
index 0000000000..b999997703
--- /dev/null
+++ b/version.conf
@@ -0,0 +1,9 @@
+# Interim releases: Enable packaging, add an "rc" to the version.
+enable: 1
+pkg_format: rc0-%#
+pkg_enable: 1
+
+# Final release: Disable package version stamps.
+#enable: 1
+#pkg_format:
+#pkg_enable: 0
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 172827ab29..3047f86ca1 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -115,7 +115,7 @@ add_library(wiretap
add_dependencies(wiretap version)
-set(FULL_SO_VERSION "0.0.0")
+set(FULL_SO_VERSION "8.0.0")
set_target_properties(wiretap PROPERTIES
PREFIX "lib"
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 1bf03c887b..c7861457ee 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -188,7 +188,7 @@ libwiretap_la_SOURCES = \
version_info.c
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 8:0:0 @LDFLAGS_SHAREDLIB@
libwiretap_la_LIBADD = ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS)
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index cd5c826000..0367cd10ad 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -253,7 +253,7 @@ add_library(wsutil
${CMAKE_BINARY_DIR}/image/libwsutil.rc
)
-set(FULL_SO_VERSION "0.0.0")
+set(FULL_SO_VERSION "9.0.0")
set_target_properties(wsutil PROPERTIES
PREFIX "lib"
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index 2e29e2b143..649de3f96d 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -175,7 +175,7 @@ libwsutil_la_SOURCES += plugins.c
endif
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwsutil_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
+libwsutil_la_LDFLAGS = -version-info 9:0:0 @LDFLAGS_SHAREDLIB@
libwsutil_la_LIBADD = \
$(LTLIBOBJS) \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 15:30:23 +0000