From a77c3bb73e7a95bda39ed467669334f797762e0c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 8 Oct 2026 15:15:38 +0200 Subject: [PATCH 1/3] wireshark: Update version from 4.0.2 to 4.6.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 4.6.9 is the latest stable release; 4.7.x is the development series. The tarball’s SHA256 matches upstream’s SIGNATURES-4.6.9.txt: d062d416a1ab3a49975aafe3a671c882dde0562ccd71b078808ceb59d465fc0f The AUTH_MARIUX patch no longer applies: $ patch -p1 --dry-run < /src/mariux/patches/wireshark-add-auth-mariux checking file epan/dissectors/packet-rpc.c Hunk #1 succeeded at 106 with fuzz 2 (offset 7 lines). Hunk #2 FAILED at 1285. Hunk #3 succeeded at 1412 with fuzz 1 (offset 2 lines). 1 out of 3 hunks FAILED checking file epan/dissectors/packet-rpc.h Hunk #1 FAILED at 30. 1 out of 1 hunk FAILED Upstream added AUTH_TLS (7) next to it, and dissect_rpc_authunix_cred() now takes pinfo. Flavor 8 is still unassigned, so use the same patch, rebased onto 4.6.9, as wireshark-4.6.9-add-auth-mariux.patch, which is mirrored on beehive. Wireshark renamed the CMake option USE_QT6 to USE_qt6, and CMake only lists the old, now unused name under “Manually-specified variables were not used” at the end of its output, so a plain version bump would quietly switch to Qt6. Spell it the new way to keep building with Qt5. Assisted-by: claude-opus-5.5 (Claude Code) --- wireshark.be0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wireshark.be0 b/wireshark.be0 index 6d4c18cc5..355a59e22 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -1,11 +1,11 @@ #!/usr/bin/env beesh -# BEE_VERSION wireshark-4.0.2-0 +# BEE_VERSION wireshark-4.6.9-0 #SRCURL[0]="https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PKGVERSION}.tar.xz" -SRCURL[0]="https://beehive.molgen.mpg.de/60eb89ab41cd2dbfcefed7efeccec9e3/wireshark-4.0.2.tar.xz" +SRCURL[0]="https://beehive.molgen.mpg.de/974dbfff96dc5fe32d42b1b7c151a340/wireshark-4.6.9.tar.xz" -PATCHURL+=(/src/mariux/patches/wireshark-add-auth-mariux) +PATCHURL+=("https://beehive.molgen.mpg.de/7b32c6dd3be41ebf0b99fc2aa924b580/wireshark-4.6.9-add-auth-mariux.patch") # build_in_sourcedir @@ -24,7 +24,7 @@ BEE_BUILDTYPE='autotools' mee_configure() { CFLAGS=-Wno-maybe-uninitialized \ bee_configure \ - -DUSE_QT6=NO \ + -DUSE_qt6=OFF \ -DCMAKE_PREFIX_PATH=/usr/local/qt5 } From 87ea7d7bca46c1b637f2237af5b586d1d77c5c31 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 8 Oct 2026 15:15:57 +0200 Subject: [PATCH 2/3] wireshark: Build with Qt6 instead of Qt5 Wireshark 4.6 prefers Qt6 (USE_qt6 defaults to ON) and deprecates Qt5: CMake Deprecation Warning at CMakeLists.txt:1424 (message): Support for building with Qt5 will be removed in the future. /usr/local/qt6 (qt6-6.9.1) has all modules Wireshark needs, Core5Compat, LinguistTools, Multimedia and DBus included, and CopyQ already builds against it. Drop the Qt5 pin from Wireshark 4.0.2 and point CMake at Qt6. Assisted-by: claude-opus-5.5 (Claude Code) --- wireshark.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wireshark.be0 b/wireshark.be0 index 355a59e22..5ea8d9cba 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -24,8 +24,7 @@ BEE_BUILDTYPE='autotools' mee_configure() { CFLAGS=-Wno-maybe-uninitialized \ bee_configure \ - -DUSE_qt6=OFF \ - -DCMAKE_PREFIX_PATH=/usr/local/qt5 + -DCMAKE_PREFIX_PATH=/usr/local/qt6 } #mee_build() { From 0deecfa2028498486a07339d9721332bcd3b36db Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 8 Oct 2026 16:30:51 +0200 Subject: [PATCH 3/3] wireshark: Install headers, pkg-config and CMake package files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wireshark 4.0.2 installed its headers and wireshark.pc with `make install`. Wireshark 4.6.9 puts them, and the CMake package files, into the install component Development, marked EXCLUDE_FROM_ALL, so the package lost them: $ tar -xjf wireshark-4.6.9-0.x86_64.bee.tar.bz2 -C pkg $ PKG_CONFIG_LIBDIR=pkg/usr/lib/pkgconfig pkg-config --modversion wireshark Package wireshark was not found in the pkg-config search path. Perhaps you should add the directory containing `wireshark.pc' to the PKG_CONFIG_PATH environment variable No package 'wireshark' found Install that component in addition, so that dissector plugins and other programs can still be built against libwireshark. The package now ships 675 headers below /usr/include/wireshark, /usr/lib/pkgconfig/wireshark.pc and /usr/lib/cmake/wireshark/. A test program calling epan_get_version() builds with pkg-config as well as with CMake’s find_package(Wireshark 4.6), and prints 4.6.9. The new wireshark.pc also no longer has the doubled libdir of 4.0.2’s (libdir=${exec_prefix}//usr/lib). Assisted-by: claude-opus-5.5 (Claude Code) --- wireshark.be0 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wireshark.be0 b/wireshark.be0 index 5ea8d9cba..1259de045 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -31,6 +31,9 @@ mee_configure() { # bee_build #} -#mee_install() { -# bee_install -#} +mee_install() { + bee_install + # The headers, wireshark.pc and the CMake package files are in the + # component Development, which `make install` leaves out. + DESTDIR=${D} cmake --install ${B} --component Development +}