From bb46d550471760a5ba80407615a83af54b7bbbcd Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 7 Mar 2023 10:26:22 +0100 Subject: [PATCH] New version 4.0.4 --- sources | 4 ++-- wireshark-0008-glib2-g_strdup-build.patch | 13 +++++++++++++ wireshark.spec | 6 +++++- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 wireshark-0008-glib2-g_strdup-build.patch diff --git a/sources b/sources index c667207..9603f87 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.0.3.tar.xz) = ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c -SHA512 (SIGNATURES-4.0.3.txt) = ab8abcadb076635897aa5db75ccebf916796a90cd46fb0fe1713e2e44ed525d25b1152831e70996d728e690fc21e9eb6b0bdf7080111401377ed62774f650d41 +SHA512 (wireshark-4.0.4.tar.xz) = e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff +SHA512 (SIGNATURES-4.0.4.txt) = 9c24a1b4c8ceb16fbb46fed03db21860efbb9a4adf5152679599190f42f64c84023375dd59ff4951d1c1a07694be941cddf6acccb7136731b1aaa00f9246459b diff --git a/wireshark-0008-glib2-g_strdup-build.patch b/wireshark-0008-glib2-g_strdup-build.patch new file mode 100644 index 0000000..6c4f931 --- /dev/null +++ b/wireshark-0008-glib2-g_strdup-build.patch @@ -0,0 +1,13 @@ +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.spec b/wireshark.spec index d02c087..68b2b17 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -27,6 +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 #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -278,6 +279,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Mar 07 2023 Michal Ruprich - 1:4.0.4-1 +- New version 4.0.4 + * Thu Feb 02 2023 Michal Ruprich - 1:4.0.3-1 - New version 4.0.3