New version 2.6.2

Contains fixes for CVE-2018-14339, CVE-2018-14340, CVE-2018-14341, CVE-2018-14342, CVE-2018-14343, CVE-2018-14344, CVE-2018-14367, CVE-2018-14368, CVE-2018-14369, CVE-2018-14370

sources

@@ -1,2 +1,2 @@
-SHA512 (wireshark-2.6.1.tar.xz) = e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
-SHA512 (SIGNATURES-2.6.1.txt) = 14b0ac0a601c2330b6d044333c955eaddef56b8da34f6f65e5ff3a26befe6c71a7624141887e249e155d00165f4d4b5e891d9be411970316ee3712ec20495e26
+SHA512 (wireshark-2.6.2.tar.xz) = e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2
+SHA512 (SIGNATURES-2.6.2.txt) = fbce4e0fefa12f285335264e0870f3576923aeb00b0a60ed77024ea6831cd07086988bcbdeee10556437b0d63e4b285596a27c155d06d83ea18fe0534431e0d7

wireshark-0008-qt5-includes.patch

@@ -1,63 +0,0 @@
-From ea197d88a3e85ff238ffebda28baadc36dc34b7d Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
-Date: Fri, 1 Jun 2018 16:15:47 +0100
-Subject: [PATCH] Fix compilation with Qt 5.11
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-On my system (Arch Linux) with Qt 5.11 these includes are required
-to avoid undefined declarations.
-
-Change-Id: Iffb0aa4d867ea55cf4a5e8fe7df9a6264c5b3be3
-Reviewed-on: https://code.wireshark.org/review/27947
-Petri-Dish: João Valverde <j@v6e.pt>
-Reviewed-by: Roland Knall <rknall@gmail.com>
-Tested-by: Petri Dish Buildbot
-Reviewed-by: João Valverde <j@v6e.pt>
----
- ui/qt/packet_format_group_box.cpp | 1 +
- ui/qt/time_shift_dialog.cpp       | 3 +++
- ui/qt/wireless_frame.cpp          | 1 +
- 3 files changed, 5 insertions(+)
-
-diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
-index a80a71a..3c0fff2 100644
---- a/ui/qt/packet_format_group_box.cpp
-+++ b/ui/qt/packet_format_group_box.cpp
-@@ -10,6 +10,7 @@
- #include <ui_packet_format_group_box.h>
- 
- #include <QStyle>
-+#include <QStyleOption>
- 
- PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
-     QGroupBox(parent),
-diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
-index 93882c0..7906bd2 100644
---- a/ui/qt/time_shift_dialog.cpp
-+++ b/ui/qt/time_shift_dialog.cpp
-@@ -14,6 +14,9 @@
- #include <ui/time_shift.h>
- #include <ui/qt/utils/tango_colors.h>
- 
-+#include <QStyle>
-+#include <QStyleOption>
-+
- 
- TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
-     QDialog(parent),
-diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
-index bd9076a..46fb2dd 100644
---- a/ui/qt/wireless_frame.cpp
-+++ b/ui/qt/wireless_frame.cpp
-@@ -23,6 +23,7 @@
- #include <wsutil/frequency-utils.h>
- 
- #include <QProcess>
-+#include <QAbstractItemView>
- 
- // To do:
- // - Disable or hide invalid channel types.
--- 
-2.7.4

wireshark.spec

@@ -5,8 +5,8 @@
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	2.6.1
-Release:	3%{?dist}
+Version:	2.6.2
+Release:	1%{?dist}
 Epoch:          1
 License:	GPL+
 Url:		http://www.wireshark.org/
@@ -16,7 +16,7 @@ Source1:        https://www.wireshark.org/download/src/all-versions/SIGNATURES-%
 Source2:	90-wireshark-usbmon.rules
 
 # Fedora-specific
-%if %{with_lua}
+%if %{with_lua} && 0%{?fedora}
 Patch1:		wireshark-0001-enable-Lua-support.patch
 %endif
 # Fedora-specific
@@ -30,7 +30,6 @@ 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-qt5-includes.patch
 
 #install tshark together with wireshark GUI
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
@@ -77,7 +76,7 @@ BuildRequires:	zlib-devel
 %if %{with_maxminddb} && 0%{?fedora}
 BuildRequires:	libmaxminddb-devel
 %endif
-%if %{with_lua}
+%if %{with_lua} && 0%{?fedora}
 BuildRequires:	compat-lua-devel
 %endif
 Buildrequires: git
@@ -125,7 +124,7 @@ and plugins.
   -DDISABLE_WERROR=ON \
   -DBUILD_wireshark=ON \
   -DENABLE_QT5=ON \
-%if %{with_lua}
+%if %{with_lua} && 0%{?fedora}
   -DENABLE_LUA=ON \
 %else
   -DENABLE_LUA=OFF \
@@ -265,6 +264,10 @@ getent group usbmon >/dev/null || groupadd -r usbmon
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Jul 23 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.2-1
+- New version 2.6.2
+- Contains fixes for CVE-2018-14339, CVE-2018-14340, CVE-2018-14341, CVE-2018-14342, CVE-2018-14343, CVE-2018-14344, CVE-2018-14367, CVE-2018-14368, CVE-2018-14369, CVE-2018-14370
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild