PR#39: New version 4.0.8 - rpms/wireshark

rpms / wireshark

#39 New version 4.0.8

Merged 10 months ago by mruprich. Opened 10 months ago by mruprich.

rpms/ mruprich/wireshark rebase-f39 into f39

wireshark crash in managed interfaces

Michal Ruprich • 10 months ago

d59a945

New version 4.0.8

Michal Ruprich • 10 months ago

39c1b5e

sources

file modified

+2 -2

		`@@ -1,2 +1,2 @@`
		`- SHA512 (wireshark-4.0.7.tar.xz) = 98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab`
		`- SHA512 (SIGNATURES-4.0.7.txt) = 4c89bffd394df2ffbd9050ff22ef1672a72d4b2c496b4790569acf7a14e29638533b51b272e73b59c31ebf6e63d34954c3482c76b30ba1cb2c82fee3780e19f2`
		`+ SHA512 (wireshark-4.0.8.tar.xz) = f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65`
		`+ SHA512 (SIGNATURES-4.0.8.txt) = 7da9141c6b0768121245df9e19eebb4976e2f5f16811730cd03f4088efae5fe21ec43563ff9cc68c5089722c1e4d2d90817dbd5b0c55e36a4851c0b3184d5249`

wireshark-0011-manage-interfaces-crash.patch

file added

+74

		`@@ -0,0 +1,74 @@`
		`+ From 2d55e5672b07a8a102024e0af66e821bba51213b Mon Sep 17 00:00:00 2001`
		`+ From: Gerald Combs <gerald@wireshark.org>`
		`+ 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`
		`+`

wireshark.spec

file modified

+10 -2

		`@@ -5,8 +5,8 @@`

		`Summary: Network traffic analyzer`
		`Name: wireshark`
		`- Version: 4.0.7`
		`- Release: 3%{?dist}`
		`+ Version: 4.0.8`
		`+ Release: 2%{?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/`
		`@@ -30,6 +30,7 @@`
		`Patch8: wireshark-0008-glib2-g_strdup-build.patch`
		`Patch9: wireshark-0009-fix-asn2wrs-cmake.patch`
		`Patch10: wireshark-0010-ripemd-fips-core-dump.patch`
		`+ Patch11: wireshark-0011-manage-interfaces-crash.patch`

		`#install tshark together with wireshark GUI`
		`Requires: %{name}-cli = %{epoch}:%{version}-%{release}`
		`@@ -280,6 +281,13 @@`
		`%{_libdir}/pkgconfig/%{name}.pc`

		`%changelog`
		`+ * Thu Aug 31 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.8-2`
		`+ - Resolves: #2236246 - wireshark crash in managed interfaces`
		`+`
		`+ * Tue Aug 29 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.8-1`
		`+ - New version 4.0.8`
		`+ - Resolves: #2235577 - possible Denial of Service via crafted package`
		`+`
		`* Fri Jul 28 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.7-3`
		`- Resolves: #2227004 - capinfos aborts in FIPS`