public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/wireshark] f43: New version 4.6.0
@ 2026-09-22 19:30 Michal Ruprich
0 siblings, 0 replies; only message in thread
From: Michal Ruprich @ 2026-09-22 19:30 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/wireshark
Branch : f43
Commit : 92f80f6263e9eb1e77dc5d81b36d7c5854edfa22
Author : Michal Ruprich <mruprich@redhat.com>
Date : 2025-10-13T12:59:16+02:00
Stats : +78/-36 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/wireshark/c/92f80f6263e9eb1e77dc5d81b36d7c5854edfa22?branch=f43
Log:
New version 4.6.0
---
diff --git a/sources b/sources
index d3e1b3b..923760a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (wireshark-4.4.9.tar.xz) = a4f13bc0c8b1c08dfed8fe8e88997e5378c0ad1f9eeb972ea07cd85e7c7140b17f63ec9efce286b636abea7b99b9f54a640852a2ec4a36bfab96c6cf08e4772d
-SHA512 (SIGNATURES-4.4.9.txt) = 8f2c637b3027a477ec7eb421a8f77c96c23800df068a892ba608fd4603761a0b512e30c7be15b9643fc36a4433c9875921bdf6395b5edb04272c54b6ba9a1e97
+SHA512 (wireshark-4.6.0.tar.xz) = f531dc8a4aa9b6539235fe1c87a680a01a6cba3af048297ba4b884edbcf1577b8af9061d9d4f43cbe1fbf213c18bb72fddd44b324a93edcc612e3f5b3cdde75e
+SHA512 (SIGNATURES-4.6.0.txt) = 5a461c6280eeadb26e95238b233c08d6f99cf0170aec80165c4f4328ca1e36c3adea28840274863cb694d16b2acd455d4cd669708b5b498fc695f65a7d4fa6c2
diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch
index a856286..01f0a4a 100644
--- a/wireshark-0006-Move-tmp-to-var-tmp.patch
+++ b/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"));
diff --git a/wireshark-0008-pkgconfig.patch b/wireshark-0008-pkgconfig.patch
index e32958a..b5df5b2 100644
--- a/wireshark-0008-pkgconfig.patch
+++ b/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}")
diff --git a/wireshark-0009-remove-strato-manpages.patch b/wireshark-0009-remove-strato-manpages.patch
new file mode 100644
index 0000000..a96d329
--- /dev/null
+++ b/wireshark-0009-remove-strato-manpages.patch
@@ -0,0 +1,39 @@
+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)
+@@ -55,10 +53,8 @@ ADD_MAN_PAGE(randpktdump 1)
+ ADD_MAN_PAGE(etwdump 1)
+ ADD_MAN_PAGE(rawshark 1)
+ ADD_MAN_PAGE(reordercap 1)
+-ADD_MAN_PAGE(sshdig 1)
+ ADD_MAN_PAGE(sshdump 1)
+ ADD_MAN_PAGE(text2pcap 1)
+-ADD_MAN_PAGE(falcodump 1)
+ ADD_MAN_PAGE(udpdump 1)
+ ADD_MAN_PAGE(wifidump 1)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 71a04e8..a797ad1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2272,10 +2272,7 @@ 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/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
diff --git a/wireshark.spec b/wireshark.spec
index 35b64aa..4894330 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -1,11 +1,11 @@
%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.9
+Version: 4.6.0
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)
@@ -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}
@@ -156,7 +155,8 @@ and plugins.
-DENABLE_PLUGINS=ON \
-DENABLE_NETLINK=ON \
-DBUILD_dcerpcidl2wrs=OFF \
- -DBUILD_sdjournal=ON
+ -DBUILD_sdjournal=ON \
+ -DBUILD_stratoshark=OFF
%cmake_build
@@ -204,6 +204,7 @@ fi
%{_bindir}/capinfos
%{_bindir}/captype
%{_bindir}/editcap
+%{_bindir}/dftest
%{_bindir}/mergecap
%{_bindir}/randpkt
%{_bindir}/reordercap
@@ -217,16 +218,17 @@ 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
+%dir %{_libdir}/wireshark
+%{_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
@@ -255,7 +257,6 @@ fi
%{_mandir}/man1/dpauxmon.*
%{_mandir}/man1/sdjournal.*
%{_mandir}/man1/etwdump.*
-%{_mandir}/man1/falcodump.*
%{_mandir}/man4/extcap.*
%{_datadir}/doc/wireshark/*
@@ -275,6 +276,9 @@ fi
%{_libdir}/cmake/%{name}/*.cmake
%changelog
+* Thu Oct 09 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.6.0-1
+- New version 4.6.0
+
* Mon Sep 01 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.9-1
- New version 4.4.9
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-22 19:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-22 19:30 [rpms/wireshark] f43: New version 4.6.0 Michal Ruprich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox