New version 4.6.8

rpminspect.yaml

@@ -4,5 +4,10 @@ ownership:
   ignore:
     - /usr/bin/dumpcap
 
+capabilities:
+  #dumpcap is the only binary that has group wireshark
+  ignore:
+    - /usr/bin/dumpcap
+
 inspections:
   xml: off

sources

@@ -1,2 +1,2 @@
-SHA512 (wireshark-4.4.8.tar.xz) = 06939f8b48ff4533ab4a8d1d40c646737606beb0e09470dd672374f287749a0d33f5ffb6475fa5e31acd6228c971a14f9921efd7c25e410497e76a19456d49a3
-SHA512 (SIGNATURES-4.4.8.txt) = e9c515950efebd3d1721d2852328c2a223c2abf9dc86da2539c34906a36ef8a7c8caddf94f01658caf9d2f8ab5e17520d914f24f938e0b12d10bdff166f9a184
+SHA512 (wireshark-4.6.8.tar.xz) = 4692bd15bebd67475502b6afe106e3be85b90add16f932d7e58c4426fd62b5886e96daa522aafd9ee4a8300bf3e091a738b5b1fa20e3e0721d0d0f3be216f3c8
+SHA512 (SIGNATURES-4.6.8.txt) = 598caa682ac71899465fb82a37445f7141287bbabee964dfd33aedbb4c4c6e0ed9b206d458b9eb2d9a083f9c6db9f8b50d8dcaf11e26dc33bb8baee83ae3f6fa

wireshark-0006-Move-tmp-to-var-tmp.patch

@@ -19,10 +19,10 @@ to use different directory on different filesystem.
  create mode 100644 wsutil/wstmpdir.h
 
 diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
-index 07b9b42e01..fb09de989b 100644
+index cdbd865..a2d24c5 100644
 --- a/ui/qt/iax2_analysis_dialog.cpp
 +++ b/ui/qt/iax2_analysis_dialog.cpp
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
  #include "ui/rtp_stream.h"
  #endif
  #include <wsutil/utf8_entities.h>
@@ -30,19 +30,18 @@ index 07b9b42e01..fb09de989b 100644
  
  #include <wsutil/g711.h>
  #include <wsutil/pint.h>
-@@ -255,10 +256,10 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) :
+@@ -252,9 +253,9 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) :
  
      // We keep our temp files open for the lifetime of the dialog. The GTK+
      // UI opens and closes at various points.
--    QString tempname = QString("%1/wireshark_iax2_f").arg(QDir::tempPath());
-+    QString tempname = QString("%1/wireshark_iax2_f").arg(get_tmp_dir());
+-    QString tempname = QStringLiteral("%1/wireshark_iax2_f").arg(QDir::tempPath());
++    QString tempname = QStringLiteral("%1/wireshark_iax2_f").arg(get_tmp_dir());
      fwd_tempfile_ = new QTemporaryFile(tempname, this);
-     fwd_tempfile_->open();
--    tempname = QString("%1/wireshark_iax2_r").arg(QDir::tempPath());
-+    tempname = QString("%1/wireshark_iax2_r").arg(get_tmp_dir());
+-    tempname = QStringLiteral("%1/wireshark_iax2_r").arg(QDir::tempPath());
++    tempname = QStringLiteral("%1/wireshark_iax2_r").arg(get_tmp_dir());
      rev_tempfile_ = new QTemporaryFile(tempname, this);
-     rev_tempfile_->open();
  
+     if (!fwd_tempfile_->open() || fwd_tempfile_->error() != QFile::NoError || !rev_tempfile_->open() || rev_tempfile_->error() != QFile::NoError) {
 diff --git a/ui/qt/utils/rtp_audio_file.cpp b/ui/qt/utils/rtp_audio_file.cpp
 index 591a63bbf3..203f5c5286 100644
 --- a/ui/qt/utils/rtp_audio_file.cpp
@@ -59,8 +58,8 @@ index 591a63bbf3..203f5c5286 100644
  
      tempname = "memory";
      if (use_disk_for_temp) {
--        tempname = QString("%1/wireshark_rtp_stream").arg(QDir::tempPath());
-+        tempname = QString("%1/wireshark_rtp_stream").arg(get_tmp_dir());
+-        tempname = QStringLiteral("%1/wireshark_rtp_stream").arg(QDir::tempPath());
++        tempname = QStringLiteral("%1/wireshark_rtp_stream").arg(get_tmp_dir());
          sample_file_ = new QTemporaryFile(tempname, this);
      } else {
          sample_file_ = new QBuffer(this);
@@ -256,13 +255,13 @@ index ea11122..982ba1a 100644
 --- a/ui/qt/about_dialog.cpp
 +++ b/ui/qt/about_dialog.cpp
 @@ -14,6 +14,7 @@
+ #include <ui_about_dialog.h>
  
  #include "main_application.h"
- #include <wsutil/filesystem.h>
 +#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
  
- #include <QDesktopServices>
- #include <QUrl>
+ #include <wsutil/application_flavor.h>
+ 
 @@ -204,7 +205,7 @@ FolderListModel::FolderListModel(QObject * parent):
      appendRow(QStringList() << tr("\"File\" dialog location") << get_open_dialog_initial_dir() << tr("Capture files"));
  

wireshark-0008-pkgconfig.patch

@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17fa031..6876018 100644
+index e6095ac..71a04e8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -4175,8 +4175,6 @@ endif()
- 
+@@ -4309,8 +4309,6 @@ endif()
+ cmake_path(SET TMP_DST_PATH NORMALIZE "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
  install(FILES "${CMAKE_BINARY_DIR}/resources/wireshark.pc"
- 	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ 	DESTINATION ${TMP_DST_PATH}
 -	COMPONENT "Development"
 -	EXCLUDE_FROM_ALL
  )
  
- install(
+ cmake_path(SET TMP_DST_PATH NORMALIZE "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")

wireshark-0009-remove-strato-manpages.patch

@@ -0,0 +1,44 @@
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index adcfa0c..fd92872 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -40,8 +40,6 @@ endmacro()
+ 
+ ADD_MAN_PAGE(wireshark   1)
+ ADD_MAN_PAGE(tshark      1)
+-ADD_MAN_PAGE(stratoshark 1)
+-ADD_MAN_PAGE(strato      1)
+ 
+ ADD_MAN_PAGE(androiddump 1)
+ ADD_MAN_PAGE(capinfos    1)
+@@ -48,13 +46,11 @@ ADD_MAN_PAGE(ciscodump   1)
+ ADD_MAN_PAGE(dumpcap     1)
+ ADD_MAN_PAGE(editcap     1)
+ ADD_MAN_PAGE(etwdump     1)
+-ADD_MAN_PAGE(falcodump   1)
+ ADD_MAN_PAGE(mergecap    1)
+ ADD_MAN_PAGE(randpkt     1)
+ ADD_MAN_PAGE(randpktdump 1)
+ ADD_MAN_PAGE(rawshark    1)
+ ADD_MAN_PAGE(reordercap  1)
+ ADD_MAN_PAGE(sharkd      1)
+-ADD_MAN_PAGE(sshdig      1)
+ ADD_MAN_PAGE(sshdump     1)
+ ADD_MAN_PAGE(text2pcap   1)
+ 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 71a04e8..a797ad1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2283,11 +2283,8 @@ if (ASCIIDOCTOR_FOUND)
+ 		${CMAKE_BINARY_DIR}/doc/man_pages/etwdump.html
+ 		${CMAKE_BINARY_DIR}/doc/man_pages/rawshark.html
+ 		${CMAKE_BINARY_DIR}/doc/man_pages/reordercap.html
+ 		${CMAKE_BINARY_DIR}/doc/man_pages/sharkd.html
+-		${CMAKE_BINARY_DIR}/doc/man_pages/sshdig.html
+ 		${CMAKE_BINARY_DIR}/doc/man_pages/sshdump.html
+-		${CMAKE_BINARY_DIR}/doc/man_pages/strato.html
+-		${CMAKE_BINARY_DIR}/doc/man_pages/stratoshark.html
+ 		${CMAKE_BINARY_DIR}/doc/man_pages/wifidump.html
+ 		${CMAKE_BINARY_DIR}/doc/man_pages/text2pcap.html
+ 		${CMAKE_BINARY_DIR}/doc/man_pages/tshark.html

wireshark.spec

@@ -1,12 +1,12 @@
 %undefine __cmake_in_source_build
 %global with_lua 1
 %global with_maxminddb 1
-%global plugins_version 4.4
+%global plugins_version 4.6
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	4.4.8
-Release:	2%{?dist}
+Version:	4.6.8
+Release:	1%{?dist}
 Epoch:		1
 License:	BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND MIT AND GPL-2.0-or-later AND LGPL-2.0-or-later AND Zlib AND ISC AND (BSD-3-Clause OR GPL-2.0-only) AND (GPL-2.0-or-later AND Zlib)
 Url:		http://www.wireshark.org/
@@ -18,8 +18,6 @@ Source3:	wireshark.sysusers
 
 # Fedora-specific
 Patch2:   wireshark-0002-Customize-permission-denied-error.patch
-# Will be proposed upstream
-Patch3:   wireshark-0003-fix-string-overrun-in-plugins-profinet.patch
 # Fedora-specific
 Patch4:   wireshark-0004-Restore-Fedora-specific-groups.patch
 # Fedora-specific
@@ -28,6 +26,7 @@ Patch5:   wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
 Patch6:   wireshark-0006-Move-tmp-to-var-tmp.patch
 Patch7:   wireshark-0007-cmakelists.patch
 Patch8:   wireshark-0008-pkgconfig.patch
+Patch9:   wireshark-0009-remove-strato-manpages.patch
 
 #install tshark together with wireshark GUI
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
@@ -203,6 +202,7 @@ fi
 %doc AUTHORS INSTALL README*
 %{_bindir}/capinfos
 %{_bindir}/captype
+%{_bindir}/dftest
 %{_bindir}/editcap
 %{_bindir}/mergecap
 %{_bindir}/randpkt
@@ -217,16 +217,16 @@ fi
 %{_bindir}/rawshark
 %{_udevrulesdir}/90-wireshark-usbmon.rules
 %{_libdir}/lib*.so.*
-%dir %{_libdir}/wireshark
-%dir %{_libdir}/wireshark/extcap
+%dir %{_libexecdir}/wireshark
+%dir %{_libexecdir}/wireshark/extcap
 %dir %{_libdir}/wireshark/plugins
-%{_libdir}/wireshark/extcap/ciscodump
-%{_libdir}/wireshark/extcap/udpdump
-%{_libdir}/wireshark/extcap/wifidump
-%{_libdir}/wireshark/extcap/sshdump
-%{_libdir}/wireshark/extcap/sdjournal
-%{_libdir}/wireshark/extcap/dpauxmon
-%{_libdir}/wireshark/extcap/androiddump
+%{_libexecdir}/wireshark/extcap/ciscodump
+%{_libexecdir}/wireshark/extcap/udpdump
+%{_libexecdir}/wireshark/extcap/wifidump
+%{_libexecdir}/wireshark/extcap/sshdump
+%{_libexecdir}/wireshark/extcap/sdjournal
+%{_libexecdir}/wireshark/extcap/dpauxmon
+%{_libexecdir}/wireshark/extcap/androiddump
 #the version wireshark uses to store plugins is only x.y, not .z
 %dir %{_libdir}/wireshark/plugins/%{plugins_version}
 %dir %{_libdir}/wireshark/plugins/%{plugins_version}/epan
@@ -254,8 +254,8 @@ fi
 %{_mandir}/man1/randpktdump.*
 %{_mandir}/man1/dpauxmon.*
 %{_mandir}/man1/sdjournal.*
+%{_mandir}/man1/sharkd.*
 %{_mandir}/man1/etwdump.*
-%{_mandir}/man1/falcodump.*
 %{_mandir}/man4/extcap.*
 %{_datadir}/doc/wireshark/*
 
@@ -275,6 +275,30 @@ fi
 %{_libdir}/cmake/%{name}/*.cmake
 
 %changelog
+* Mon Aug 17 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.8-1
+- New version 4.6.8
+
+* Tue Jul 14 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.7-1
+- New version 4.6.7
+
+* Mon Jun 01 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.6-1
+- New version 4.6.6
+
+* Wed Mar 04 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.4-1
+- New version 4.6.4
+
+* Thu Jan 15 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.3-1
+- New version 4.6.3
+
+* Fri Nov 28 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.6.1-1
+- New version 4.6.1
+
+* Mon Oct 13 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.6.0-1
+- New version 4.6.0
+
+* Thu Sep 25 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.9-1
+- New version 4.4.9
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.4.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild