diff --git a/sources b/sources index 50e2f9f..3fa460c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (SIGNATURES-4.0.14.txt) = f084d454d1756be35e1e1ed4636cb994bd9c49bd4666d355ce3719d526bf71f9e3cc929b4dca311231d43b046711b223a379c6d915aa260966f0b7bab8a8e352 -SHA512 (wireshark-4.0.14.tar.xz) = e88a4b2f41489f3ffe82c4c79c9c89ec521d931a716a5dacaede28c03b0625a0603935e723d5d869f801cfcab440a7d2f310c910707e15f9b0bca0c131398d73 +SHA512 (wireshark-4.0.15.tar.xz) = 6f1915c48860f79c25df8ac753aac4391393db9cf6d4b3d4ba11499fafb5cae8c1e56b7f735ea14b9f18560cb4156a3cbb65c567102db52b40e5d1f53e00be7a +SHA512 (SIGNATURES-4.0.15.txt) = e47ad252b260016d7cce60f53c6d308a36c1ae8c194359212fa38ec934d961bba6e1ace53d1ff3c909c5c5cad09ff8c1ded39d9ce7cac10b1b987eeee594c565 diff --git a/wireshark-0008-glib2-g_strdup-build.patch b/wireshark-0008-glib2-g_strdup-build.patch deleted file mode 100644 index 6c4f931..0000000 --- a/wireshark-0008-glib2-g_strdup-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ui/qt/wireshark_main_window_slots.cpp b/ui/qt/wireshark_main_window_slots.cpp -index 0594ff6..3068797 100644 ---- a/ui/qt/wireshark_main_window_slots.cpp -+++ b/ui/qt/wireshark_main_window_slots.cpp -@@ -2513,7 +2513,7 @@ void WiresharkMainWindow::showHideMainWidgets(QAction *action) - if (widget == toolbar) { - GList *entry = g_list_find_custom(recent.interface_toolbars, action->text().toUtf8(), (GCompareFunc)strcmp); - if (show && !entry) { -- recent.interface_toolbars = g_list_append(recent.interface_toolbars, g_strdup(action->text().toUtf8())); -+ recent.interface_toolbars = g_list_append(recent.interface_toolbars, g_strdup(action->text().toUtf8().constData())); - } else if (!show && entry) { - recent.interface_toolbars = g_list_remove(recent.interface_toolbars, entry->data); - } diff --git a/wireshark-0010-manage-interfaces-crash.patch b/wireshark-0010-manage-interfaces-crash.patch deleted file mode 100644 index f2eb347..0000000 --- a/wireshark-0010-manage-interfaces-crash.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 2d55e5672b07a8a102024e0af66e821bba51213b Mon Sep 17 00:00:00 2001 -From: Gerald Combs -Date: Sun, 27 Aug 2023 14:47:52 -0700 -Subject: [PATCH] Qt: Fix ManageInterfacesDialog cleanup - -Handle our ManageInterfacesDialog cleanup tasks inside our destructor. -If we try to handle them in on_buttonBox_accepted we run into a race -condition with WA_DeleteOnClose. - -Fixes #19287 ---- - ui/qt/manage_interfaces_dialog.cpp | 25 ++++++++++++------------- - ui/qt/manage_interfaces_dialog.h | 2 -- - 2 files changed, 12 insertions(+), 15 deletions(-) - -diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp -index cb9da8697b5..a8529e265a9 100644 ---- a/ui/qt/manage_interfaces_dialog.cpp -+++ b/ui/qt/manage_interfaces_dialog.cpp -@@ -209,6 +209,18 @@ ManageInterfacesDialog::ManageInterfacesDialog(QWidget *parent) : - - ManageInterfacesDialog::~ManageInterfacesDialog() - { -+ if (result() == QDialog::Accepted) { -+#ifdef HAVE_LIBPCAP -+ sourceModel->save(); -+#endif -+#ifdef HAVE_PCAP_REMOTE -+ remoteAccepted(); -+#endif -+ prefs_main_write(); -+ mainApp->refreshLocalInterfaces(); -+ emit ifsChanged(); -+ } -+ - delete ui; - } - -@@ -252,19 +264,6 @@ void ManageInterfacesDialog::updateWidgets() - ui->hintLabel->setText(hint); - } - --void ManageInterfacesDialog::on_buttonBox_accepted() --{ --#ifdef HAVE_LIBPCAP -- sourceModel->save(); --#endif --#ifdef HAVE_PCAP_REMOTE -- remoteAccepted(); --#endif -- prefs_main_write(); -- mainApp->refreshLocalInterfaces(); -- emit ifsChanged(); --} -- - #ifdef HAVE_LIBPCAP - void ManageInterfacesDialog::on_addPipe_clicked() - { -diff --git a/ui/qt/manage_interfaces_dialog.h b/ui/qt/manage_interfaces_dialog.h -index 80b78afbe7a..79e9d0d9bfa 100644 ---- a/ui/qt/manage_interfaces_dialog.h -+++ b/ui/qt/manage_interfaces_dialog.h -@@ -59,8 +59,6 @@ signals: - private slots: - void updateWidgets(); - -- void on_buttonBox_accepted(); -- - #ifdef HAVE_LIBPCAP - void on_addPipe_clicked(); - void on_delPipe_clicked(); --- -GitLab - diff --git a/wireshark.spec b/wireshark.spec index c0f1987..9f75e14 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.0.14 +Version: 4.0.15 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) @@ -27,9 +27,7 @@ Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch # Fedora-specific Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch Patch7: wireshark-0007-cmakelists.patch -Patch8: wireshark-0008-glib2-g_strdup-build.patch Patch9: wireshark-0009-ripemd-fips-core-dump.patch -Patch10: wireshark-0010-manage-interfaces-crash.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -280,6 +278,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed May 22 2024 Michal Ruprich - 1:4.0.15-1 +- New version 4.0.15 + * Mon Apr 08 2024 Michal Ruprich - 1:4.0.14-1 - New version 4.0.14