Initialize release-3.4.

Initialize the release-3.4 branch.

.gitlab-ci.yml

@@ -15,7 +15,7 @@
   # https://gould.cx/ted/blog/2017/06/10/ccache-for-Gitlab-CI/
   cache:
     # XXX Use ${CI_JOB_NAME}-${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} instead?
-    key: ${CI_JOB_NAME}-master
+    key: ${CI_JOB_NAME}-release-3.4
     paths:
       - ccache/
   before_script:

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[wireshark.master]
+[wireshark.qt-34]
 file_filter = ui/qt/wireshark_<lang>.ts
 source_file = ui/qt/wireshark_en.ts
 source_lang = en
@@ -17,7 +17,7 @@ trans.uk = ui/qt/wireshark_uk.ts
 trans.zh_CN = ui/qt/wireshark_zh_CN.ts
 type = QT
 
-[wireshark.debian]
+[wireshark.po-34]
 file_filter = debian/po/<lang>.po
 source_file = debian/po/templates.pot
 source_lang = en

CMakeLists.txt

@@ -117,7 +117,7 @@ if(WIN32)
 		file( TO_CMAKE_PATH "$ENV{WIRESHARK_LIB_DIR}" _PROJECT_LIB_DIR )
 	elseif( DEFINED ENV{WIRESHARK_BASE_DIR} )
 		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-3.4" )
 	else()
 		# Don't know what to do
 		message(FATAL_ERROR "Neither WIRESHARK_BASE_DIR or WIRESHARK_LIB_DIR are defined")
@@ -264,8 +264,8 @@ endif(WIN32)
 # 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

CMakeOptions.txt

@@ -37,7 +37,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)

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-3.4" )
       endif()
     endif()
 

debian/control

@@ -26,8 +26,8 @@ Homepage: https://www.wireshark.org/
 
 Package: wireshark-common
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark0 (>= ${binary:Version}),
- libwiretap0 (>= ${binary:Version}), debconf, libcap2-bin [linux-any]
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark14 (>= ${binary:Version}),
+ libwiretap11 (>= ${binary:Version}), debconf, libcap2-bin [linux-any]
 Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version})
 Breaks: ethereal (<< 1.0.0-3),
         wireshark (<< 2.0.0~),
@@ -124,21 +124,21 @@ Description: network traffic analyzer - documentation
  This package contains Wireshark User's guide, Wireshark Developer's Guide
  and the Lua Reference.
 
-Package: libwireshark0
+Package: libwireshark14
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark-data (>= ${source:Version}),
- libwsutil0 (>= ${source:Version})
+ libwsutil12 (>= ${source:Version})
 Suggests: wireshark-doc (>= ${source:Version})
 Conflicts: wireshark-common (<< 1.4.0~rc2-1)
 Replaces: wireshark-common (<< 1.4.0~rc2-1)
 Description: network packet dissection library -- shared library
  The libwireshark library provides the network packet dissection services
  developed by the Wireshark project.
 
-Package: libwsutil0
+Package: libwsutil12
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -147,12 +147,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: wireshark-common (<< 1.4.0~rc2-1), libwireshark1 (<< 1.4.2-2)
 Replaces: wireshark-common (<< 1.4.0~rc2-1), libwireshark1 (<< 1.4.2-2)
 Description: network packet dissection utilities library -- shared library
- The libwsutil library provides utility functions for libwireshark0.
+ The libwsutil library provides utility functions for libwireshark14.
 
 Package: libwsutil-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends} , libwsutil0 (= ${binary:Version})
+Depends: ${misc:Depends} , libwsutil12 (= ${binary:Version})
 Conflicts: wireshark-common (<< 1.4.0~rc2-1), libwireshark-dev (<< 1.4.2-2),
  wireshark-dev (<< 1.4.0~rc2-1)
 Replaces: wireshark-common (<< 1.4.0~rc2-1), libwireshark-dev (<< 1.4.2-2),
@@ -181,7 +181,7 @@ Description: network packet dissection library -- data files
 Package: libwireshark-dev
 Section: libdevel
 Depends: ${misc:Depends}, libwsutil-dev, libwiretap-dev,
- libwireshark0 (= ${binary:Version})
+ libwireshark14 (= ${binary:Version})
 Conflicts: wireshark-dev (<< 1.4.0~rc2-1)
 Replaces: wireshark-dev (<< 1.4.0~rc2-1)
 Architecture: any
@@ -192,7 +192,7 @@ Description: network packet dissection library -- development files
  This package contains the static library and the C header files that are
  needed for applications to use libwireshark services.
 
-Package: libwiretap0
+Package: libwiretap11
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -227,7 +227,7 @@ Description: network packet capture library -- shared library
 
 Package: libwiretap-dev
 Section: libdevel
-Depends: ${misc:Depends}, libwiretap0 (= ${binary:Version})
+Depends: ${misc:Depends}, libwiretap11 (= ${binary:Version})
 Conflicts: wireshark-dev (<< 1.4.0~rc2-1)
 Replaces: wireshark-dev (<< 1.4.0~rc2-1)
 Architecture: any

debian/libwireshark14.lintian-overrides

@@ -0,0 +1,8 @@
+# from file-elf.c
+libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Synopsys Synopsis
+
+# Typo directly on IANA enterprise-numbers (epan/enterprise-numbers)
+
+libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Nam Name
+libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Informations Information
+libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Dont Don't

debian/libwireshark0.symbols → debian/libwireshark14.symbols

@@ -1,4 +1,4 @@
-libwireshark.so.0 libwireshark0 #MINVER#
+libwireshark.so.14 libwireshark14 #MINVER#
  AdmissionRejectReason_vals@Base 1.9.1
  BandRejectReason_vals@Base 1.9.1
  CommandCode_vals_ext@Base 1.9.1

debian/libwiretap0.symbols → debian/libwiretap11.symbols

@@ -1,4 +1,4 @@
-libwiretap.so.0 libwiretap0 #MINVER#
+libwiretap.so.11 libwiretap11 #MINVER#
  file_eof@Base 1.9.1
  file_error@Base 1.9.1
  file_getc@Base 1.9.1

debian/libwsutil0.symbols → debian/libwsutil12.symbols

@@ -1,4 +1,4 @@
-libwsutil.so.0 libwsutil0 #MINVER#
+libwsutil.so.12 libwsutil12 #MINVER#
  Dot11DecryptWepDecrypt@Base 2.5.0
  Eax_Decrypt@Base 1.12.0~rc1
  adler32_bytes@Base 1.12.0~rc1

epan/CMakeLists.txt

@@ -330,7 +330,7 @@ endif()
 set_target_properties(epan PROPERTIES
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
-	VERSION "0.0.0" SOVERSION 0
+	VERSION "14.0.0" SOVERSION 14
 	INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}"
 	# By default the name for a library with target name epan will be libepan,
 	# but Ethereal is now named Wireshark

tools/win-setup.ps1

@@ -33,7 +33,7 @@ Wireshark.
 
 .PARAMETER Destination
 Specifies the destination directory for the text files. The path must
-contain the pattern "wireshark-*-libs".
+contain the pattern "wireshark-*-libs-3.4".
 
 .PARAMETER Platform
 Target platform. One of "win64" or "win32".
@@ -48,12 +48,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-3.4 -Platform win64
 #>
 
 Param(
     [Parameter(Mandatory=$true, Position=0)]
-    [ValidateScript({$_ -like "*\wireshark-*-libs"})]
+    [ValidateScript({$_ -like "*\wireshark-*-libs-3.4"})]
     [String]
     $Destination,
 

wiretap/CMakeLists.txt

@@ -123,7 +123,7 @@ set_target_properties(wiretap PROPERTIES
 	PREFIX "lib"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
-	VERSION "0.0.0" SOVERSION 0
+	VERSION "11.0.0" SOVERSION 11
 	FOLDER "DLLs"
 	INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}"
 )

wsutil/CMakeLists.txt

@@ -250,7 +250,7 @@ set_target_properties(wsutil PROPERTIES
 	PREFIX "lib"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
-	VERSION "0.0.0" SOVERSION 0
+	VERSION "12.0.0" SOVERSION 12
 	FOLDER "DLLs"
 	INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}"
 )