Merging upstream version 4.2.6.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 22 insertions, 15 deletions

diff --git a/tools/alpine-setup.sh b/tools/alpine-setup.sh
index 46220352..b5cd5a17 100755
--- a/tools/alpine-setup.sh
+++ b/tools/alpine-setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 # Setup development environment on alpine systems
 #
 # Wireshark - Network traffic analyzer
@@ -50,6 +50,7 @@ then
 fi
 
 BASIC_LIST="
+	bash
 	cmake
 	ninja
 	gcc
@@ -60,10 +61,11 @@ BASIC_LIST="
 	tiff-dev
 	c-ares-dev
 	pcre2-dev
-	qt5-qtbase-dev
-	qt5-qttools-dev
-	qt5-qtmultimedia-dev
-	qt5-qtsvg-dev
+	qt6-qtbase-dev
+	qt6-qttools-dev
+	qt6-qtmultimedia-dev
+	qt6-qtsvg-dev
+	qt6-qt5compat-dev
 	speexdsp-dev
 	python3
 	"
@@ -74,6 +76,7 @@ ADDITIONAL_LIST="
 	libssh-dev
 	spandsp-dev
 	libcap-dev
+	libcap-setcap
 	libpcap-dev
 	libxml2-dev
 	libmaxminddb-dev
@@ -88,6 +91,7 @@ ADDITIONAL_LIST="
 	sbc-dev
 	minizip-dev
 	brotli-dev
+	opencore-amr-dev
 	perl
 	py3-pytest
 	py3-pytest-xdist
diff --git a/tools/fuzz-test.sh b/tools/fuzz-test.sh
index b63f647b..7e8d1abc 100755
--- a/tools/fuzz-test.sh
+++ b/tools/fuzz-test.sh
@@ -304,7 +304,7 @@ while { [ $PASS -lt "$MAX_PASSES" ] || [ "$MAX_PASSES" -lt 1 ]; } && ! $DONE ; d
                 fi
             fi
 
-            if ! $DONE && { [ $RUNNER_RETVAL -ne 0 ] || [ $DISSECTOR_BUG -ne 0 ] || [ $VG_ERR_CNT -ne 0 ]; } ; then
+            if ! $DONE && { [ $RUNNER_RETVAL -ne 0 ] || [ $DISSECTOR_BUG -ne 0 ] || [ "$VG_ERR_CNT" -ne 0 ]; } ; then
                 # shellcheck disable=SC2086
                 rm -f $RUNNER_ERR_FILES
                 ws_exit_error
diff --git a/tools/make-version.py b/tools/make-version.py
index ee660c19..05458b65 100755
--- a/tools/make-version.py
+++ b/tools/make-version.py
@@ -44,8 +44,8 @@ GIT_ABBREV_LENGTH = 12
 # If the text "$Format" is still present, it means that
 # git archive did not replace the $Format string, which
 # means that this not a git archive.
-GIT_EXPORT_SUBST_H = '4aa814ac25a18ea48d4002351ed45d4b245b0c08'
-GIT_EXPORT_SUBST_D = 'tag: wireshark-4.2.5, tag: v4.2.5, refs/merge-requests/15651/head, refs/keep-around/4aa814ac25a18ea48d4002351ed45d4b245b0c08'
+GIT_EXPORT_SUBST_H = '2acd1a854babc4caae980ef9ed79ad36b6bc0362'
+GIT_EXPORT_SUBST_D = 'tag: wireshark-4.2.6, tag: v4.2.6, refs/merge-requests/16375/head, refs/keep-around/2acd1a854babc4caae980ef9ed79ad36b6bc0362'
 IS_GIT_ARCHIVE = not GIT_EXPORT_SUBST_H.startswith('$Format')
 
 
diff --git a/tools/randpkt-test.sh b/tools/randpkt-test.sh
index b47646dd..a49e3002 100755
--- a/tools/randpkt-test.sh
+++ b/tools/randpkt-test.sh
@@ -162,7 +162,7 @@ while [ $PASS -lt "$MAX_PASSES" ] || [ "$MAX_PASSES" -lt 1 ] ; do
         grep -i "dissector bug" "$TMP_DIR/$ERR_FILE" \
             > /dev/null 2>&1 && DISSECTOR_BUG=1
 
-        if [ $RETVAL -ne 0 ] || [ $DISSECTOR_BUG -ne 0 ] || [ $VG_ERR_CNT -ne 0 ] ; then
+        if [ "$RETVAL" -ne 0 ] || [ $DISSECTOR_BUG -ne 0 ] || [ "$VG_ERR_CNT" -ne 0 ] ; then
             ws_exit_error
         fi
         echo " OK"
diff --git a/tools/rpm-setup.sh b/tools/rpm-setup.sh
index 23f06747..86a3ab29 100755
--- a/tools/rpm-setup.sh
+++ b/tools/rpm-setup.sh
@@ -16,7 +16,7 @@ set -e -u -o pipefail
 function print_usage() {
 	printf "\nUtility to setup a rpm-based system for Wireshark Development.\n"
 	printf "The basic usage installs the needed software\n\n"
-	printf "Usage: $0 [--install-optional] [...other options...]\n"
+	printf "Usage: %s [--install-optional] [...other options...]\n" "$0"
 	printf "\t--install-optional: install optional software as well\n"
 	printf "\t--install-rpm-deps: install packages required to build the .rpm file\n"
 	printf "\\t--install-qt5-deps: force installation of packages required to use Qt5\\n"
@@ -65,7 +65,7 @@ for arg; do
 done
 
 # Check if the user is root
-if [ $(id -u) -ne 0 ]
+if [ "$(id -u)" -ne 0 ]
 then
 	echo "You must be root."
 	exit 1
@@ -115,7 +115,7 @@ for PM in zypper dnf yum ''; do
 	fi
 done
 
-if [ -z $PM ]
+if [ -z "$PM" ]
 then
 	echo "No package managers found, exiting"
 	exit 1
@@ -142,6 +142,7 @@ add_package() {
 	local list="$1" pkgname="$2"
 
 	# fail if the package is not known
+	# shellcheck disable=SC2086
 	$PM $PM_SEARCH "$pkgname" &> /dev/null || return 1
 
 	# package is found, append it to list
@@ -150,10 +151,11 @@ add_package() {
 
 # Adds packages $2-$n to list variable $1 if all the packages are found
 add_packages() {
-	local list="$1" pkgnames="${@:2}"
+	local list="$1" pkgnames="${*:2}"
 
 	# fail if any package is not known
 	for pkgname in $pkgnames; do
+		# shellcheck disable=SC2086
 		$PM $PM_SEARCH "$pkgname" &> /dev/null || return 1
 	done
 
@@ -239,7 +241,7 @@ then
 			qt6-qtmultimedia-devel
 			libxkbcommon-devel)
 
-	for pkg in ${QT6_LIST[@]}
+	for pkg in "${QT6_LIST[@]}"
 	do
 		add_package BASIC_LIST "$pkg" ||
 		echo "Qt6 dependency $pkg is unavailable" >&2
@@ -345,6 +347,7 @@ then
 	ACTUAL_LIST="$ACTUAL_LIST $RPMDEPS_LIST"
 fi
 
+# shellcheck disable=SC2086
 $PM $PM_OPT install $ACTUAL_LIST $OPTIONS
 
 if [ $ADDITIONAL -eq 0 ]
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py
index cf16f1f1..e53fbf9e 100755
--- a/tools/wireshark_gen.py
+++ b/tools/wireshark_gen.py
@@ -2363,7 +2363,7 @@ proto_tree *union_tree = proto_tree_add_subtree(tree, tvb, *offset, -1, ett_giop
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/proto.h>
-#include <epan/dissectors/packet-giop.h>
+#include "packet-giop.h"
 #include <epan/expert.h>
 
 #include "ws_diag_control.h"