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
New version 2.6.1
2018-07-24 13:03:55 +02:00 · 2018-05-24 14:36:12 +02:00 · 2018-05-15 14:33:48 +02:00 · 2018-04-27 16:59:21 +02:00 · 2018-04-27 16:55:15 +02:00 · 2018-03-15 10:37:39 +01:00
17 changed files with 528 additions and 815 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/ci.fmf
+++ b/ci.fmf
@ -1 +0,0 @@
-resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -1,25 +0,0 @@
--- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
-#Rawhide
--- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
-#gating rhel
--- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
--- a/plans.fmf
+++ b/plans.fmf
@ -1,35 +0,0 @@
-/tier1-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/wireshark.git
-      name: /plans/tier1/internal
-
-/tier1-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/wireshark.git
-      name: /plans/tier1/public
-
-/tier2-tier3-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/wireshark.git
-      name: /plans/tier2-tier3/internal
-
-/tier2-tier3-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/wireshark.git
-      name: /plans/tier2-tier3/public
-
-/others-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/wireshark.git
-      name: /plans/others/internal
-
-/others-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/wireshark.git
-      name: /plans/others/public
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -1,13 +0,0 @@
---
-ownership:
-  #dumpcap is the only binary that has group wireshark
-  ignore:
-    - /usr/bin/dumpcap
-
-capabilities:
-  #dumpcap is the only binary that has group wireshark
-  ignore:
-    - /usr/bin/dumpcap
-
-inspections:
-  xml: off
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (wireshark-4.6.7.tar.xz) = a776d17815dcf74a7bf9b6e0e516ea20e37a2092515afa68fbae30e22b24793ffa4cd8f9bffa781d0b64683e8c2be84b7d0ec1bcb3ff25d62daf1afe652cbb3f
-SHA512 (SIGNATURES-4.6.7.txt) = 21f8f9e54855a90057e73835fb5d8dfd2e5f5beff1490d5d70435c6f6e3986bcf6a6aa53d126ff0cd6d4f0b7f2afcce564d5f70ef5e6f92d2e16af101f3b2a15
+SHA512 (wireshark-2.6.2.tar.xz) = e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2
+SHA512 (SIGNATURES-2.6.2.txt) = fbce4e0fefa12f285335264e0870f3576923aeb00b0a60ed77024ea6831cd07086988bcbdeee10556437b0d63e4b285596a27c155d06d83ea18fe0534431e0d7
--- a/wireshark-0001-enable-Lua-support.patch
+++ b/wireshark-0001-enable-Lua-support.patch
@ -0,0 +1,18 @@
+From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
+Date: Tue, 15 Dec 2009 08:36:27 +0000
+Subject: [PATCH] enable Lua support
+
+
+diff --git a/epan/wslua/template-init.lua b/epan/wslua/template-init.lua
+index 3fe2aca..2b48f9b 100644
+--- a/epan/wslua/template-init.lua
+++ b/epan/wslua/template-init.lua
+@@ -41,7 +41,7 @@ if running_superuser then
+     local disabled_lib = {}
+     setmetatable(disabled_lib,{ __index = function() error("this package ".. hint) end } );
+ 
+-    dofile = function() error("dofile " .. hint) end
+--    dofile = function() error("dofile " .. hint) end
+     loadfile = function() error("loadfile " .. hint) end
+     loadlib = function() error("loadlib " .. hint) end
+     require = function() error("require " .. hint) end
--- a/wireshark-0002-Customize-permission-denied-error.patch
+++ b/wireshark-0002-Customize-permission-denied-error.patch
@ -1,22 +1,57 @@
-diff --git a/capture/capture_sync.c b/capture/capture_sync.c
-index af08b32..2e0fcb7 100644
--- a/capture/capture_sync.c
-+++ b/capture/capture_sync.c
-@@ -1825,8 +1832,16 @@ sync_pipe_input_cb(GIOChannel *pipe_io, capture_session *cap_session)
-         if (!ws_strtoi32(buffer, NULL, &exec_errno)) {
-             ws_warning("Invalid errno: %s", buffer);
-         }
-        primary_msg = ws_strdup_printf("Couldn't run dumpcap in child process: %s",
-+        if (exec_errno == EPERM || exec_errno == EACCES) {
-+            const char *securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
-+            primary_msg = ws_strdup_printf("Couldn't run dumpcap in child process: %s%s",
-+                                       g_strerror(exec_errno), securitymsg);
-+        }
-+        else {
-+            primary_msg = ws_strdup_printf("Couldn't run dumpcap in child process: %s",
-                                        g_strerror(exec_errno));
-+        }
+From: Jan Safranek <jsafrane@redhat.com>
+Date: Fri, 26 Nov 2010 14:30:45 +0300
+Subject: [PATCH] Customize 'permission denied' error.
+
+Add Fedora-specific message to error output when dumpcap cannot be started
+because of permissions.
+
+Signed-off-by: Jan Safranek <jsafrane@redhat.com>
+
+diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
+index 2f9d2cc..b18e47f 100644
+--- a/capchild/capture_sync.c
+++ b/capchild/capture_sync.c
+@@ -375,6 +375,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi
+     gchar *signal_pipe_name;
+ #else
+     char errmsg[1024+1];
+    const char *securitymsg = "";
+     int sync_pipe[2];                       /* pipe used to send messages from child to parent */
+     enum PIPES { PIPE_READ, PIPE_WRITE };   /* Constants 0 and 1 for PIPE_READ and PIPE_WRITE */
+ #endif
+@@ -728,8 +729,11 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi
+         dup2(sync_pipe[PIPE_WRITE], 2);
+         ws_close(sync_pipe[PIPE_READ]);
+         execv(argv[0], argv);
+-        g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
+-                   argv[0], g_strerror(errno));
+        if (errno == EPERM || errno == EACCES)
+ 	      securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
+        g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s",
+                argv[0], g_strerror(errno), securitymsg);
 +
-         cap_session->error(cap_session, primary_msg, NULL);
-         /* the capture child will close the sync_pipe, nothing to do for now */
-         /* (an error message doesn't mean we have to stop capturing) */
+         sync_pipe_errmsg_to_parent(2, errmsg, "");
+ 
+         /* Exit with "_exit()", so that we don't close the connection
+@@ -826,6 +830,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd,
+     int i;
+ #else
+     char errmsg[1024+1];
+    const char *securitymsg = "";
+     int sync_pipe[2];                       /* pipe used to send messages from child to parent */
+     int data_pipe[2];                       /* pipe used to send data from child to parent */
+ #endif
+@@ -1003,8 +1008,11 @@ sync_pipe_open_command(char** argv, int *data_read_fd,
+         ws_close(sync_pipe[PIPE_READ]);
+         ws_close(sync_pipe[PIPE_WRITE]);
+         execv(argv[0], argv);
+-        g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
+-                   argv[0], g_strerror(errno));
+        execv(argv[0], (gpointer)argv);
+	if (errno == EPERM || errno == EACCES)
+		securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
+        g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s",
+                   argv[0], g_strerror(errno), securitymsg);
+         sync_pipe_errmsg_to_parent(2, errmsg, "");
+ 
+         /* Exit with "_exit()", so that we don't close the connection
--- a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch
+++ b/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch
@ -4,15 +4,15 @@ Subject: [PATCH] fix string overrun in plugins/profinet


 diff --git a/plugins/epan/profinet/packet-dcom-cba.c b/plugins/epan/profinet/packet-dcom-cba.c
-index 52c5017e1f..fb980269db 100644
+index 0f1658a..f7fd322 100644
 --- a/plugins/epan/profinet/packet-dcom-cba.c
 +++ b/plugins/epan/profinet/packet-dcom-cba.c
-@@ -543,7 +543,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst(tvbuff_t *tvb, int offset,
-     packet_info *pinfo, proto_tree *tree, dcerpc_info *di, uint8_t *drep)
+@@ -555,7 +555,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst(tvbuff_t *tvb, int offset,
+     packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep)
 {
-     uint32_t     u32Pointer;
-    char         szStr[1000];
-+    char         szStr[1000] = "";
-     uint32_t     u32MaxStr = sizeof(szStr);
-     char        *call;
+     guint32      u32Pointer;
+-    gchar        szStr[1000];
+    gchar        szStr[1000] = "";
+     guint32      u32MaxStr = sizeof(szStr);
+     gchar       *call;
 
--- a/wireshark-0004-Restore-Fedora-specific-groups.patch
+++ b/wireshark-0004-Restore-Fedora-specific-groups.patch
@ -3,13 +3,13 @@ Date: Fri, 13 Sep 2013 14:36:55 +0400
 Subject: [PATCH] Restore Fedora-specific groups

 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-diff --git a/resources/freedesktop/org.wireshark.Wireshark.desktop b/resources/freedesktop/org.wireshark.Wireshark.desktop
-index a880a50a33..a25d67d99b 100644
--- a/resources/freedesktop/org.wireshark.Wireshark.desktop
-+++ b/resources/freedesktop/org.wireshark.Wireshark.desktop
+diff --git a/wireshark.desktop b/wireshark.desktop
+index 334db48..669c6f1 100644
+--- a/wireshark.desktop
+++ b/wireshark.desktop
@@ -108,4 +108,4 @@ Terminal=false
 MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;application/x-micropross-mplog;application/x-apple-packetlogger;application/x-endace-erf;application/ipfix;application/x-ixia-vwr;
 # Category entry according to:
- # https://specifications.freedesktop.org/menu-spec/1.0/
+ # http://standards.freedesktop.org/menu-spec/1.0/
 -Categories=Network;Monitor;Qt;
 +Categories=Application;Network;Monitor;Qt;
--- a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
+++ b/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
@ -1,16 +1,16 @@
 From: Kenneth Soerensen <knnthsrnsn@gmail.com>
 Date: Wed, 29 Jan 2014 16:04:12 +0400
-Subject: [PATCH] Fix paths in a org.wireshark.Wireshark.desktop file
+Subject: [PATCH] Fix paths in a wireshark.desktop file


-diff --git a/resources/freedesktop/org.wireshark.Wireshark.desktop b/resources/freedesktop/org.wireshark.Wireshark.desktop
-index a880a50a33..54b3595d55 100644
--- a/resources/freedesktop/org.wireshark.Wireshark.desktop
-+++ b/resources/freedesktop/org.wireshark.Wireshark.desktop
+diff --git a/wireshark.desktop b/wireshark.desktop
+index 669c6f1..f7df1f3 100644
+--- a/wireshark.desktop
+++ b/wireshark.desktop
@@ -102,8 +102,8 @@ Comment[tr]=Ağ trafiği çözümleyicisi
 Comment[vi]=Trình phân tích giao thông mạng
 Comment[uk]=Аналізатор мережевого трафіку
- Icon=org.wireshark.Wireshark
+ Icon=wireshark
 -TryExec=wireshark
 -Exec=wireshark %f
 +TryExec=/usr/bin/wireshark
--- a/wireshark-0006-Move-tmp-to-var-tmp.patch
+++ b/wireshark-0006-Move-tmp-to-var-tmp.patch
@ -5,24 +5,68 @@ Subject: [PATCH] Move /tmp to /var/tmp

 Fedora is using tmpfs which is limited by the size of RAM, thus we need
 to use different directory on different filesystem.
-
 ---
+ ui/gtk/about_dlg.c             |  3 +-
 ui/qt/about_dialog.cpp         |  3 +-
- ui/qt/iax2_analysis_dialog.cpp |  5 ++-
- ui/qt/utils/rtp_audio_file.cpp |  3 +-
- wsutil/tempfile.c              | 18 +++++++-
- wsutil/tempfile.h              |  2 +-
- wsutil/wstmpdir.c              | 71 ++++++++++++++++++++++++++++++++++
- wsutil/wstmpdir.h              | 39 +++++++++++++++++++
- 7 files changed, 134 insertions(+), 7 deletions(-)
+ ui/qt/iax2_analysis_dialog.cpp |  5 +--
+ ui/qt/rtp_analysis_dialog.cpp  |  5 +--
+ ui/qt/rtp_audio_stream.cpp     |  3 +-
+ wsutil/Makefile.am             |  6 ++--
+ wsutil/tempfile.c              |  9 +++---
+ wsutil/tempfile.h              |  4 +--
+ wsutil/wstmpdir.c              | 70 ++++++++++++++++++++++++++++++++++++++++++
+ wsutil/wstmpdir.h              | 39 +++++++++++++++++++++++
+ 10 files changed, 132 insertions(+), 15 deletions(-)
 create mode 100644 wsutil/wstmpdir.c
 create mode 100644 wsutil/wstmpdir.h

+diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
+index 22ca841..6bcb527 100644
+--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
+@@ -28,6 +28,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <wsutil/filesystem.h>
+#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
+ #include <wsutil/copyright_info.h>
+ #include <version_info.h>
+ #ifdef HAVE_LIBSMI
+@@ -427,7 +428,7 @@ about_folders_page_new(void)
+       "capture files");
+ 
+   /* temp */
+-  about_folders_row(table, "Temp", g_get_tmp_dir(),
+  about_folders_row(table, "Temp", get_tmp_dir(),
+       "untitled capture files");
+ 
+   /* pers conf */
+diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
+index 31dc581..2f74285 100644
+--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
+@@ -26,6 +26,7 @@
+ 
+ #include "wireshark_application.h"
+ #include <wsutil/filesystem.h>
+#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
+ 
+ #include <QDesktopServices>
+ #include <QUrl>
+@@ -206,7 +206,7 @@ FolderListModel::FolderListModel(QObject * parent):
+     appendRow( QStringList() << tr("\"File\" dialogs") << get_last_open_dir() << tr("capture files"));
+ 
+     /* temp */
+-    appendRow( QStringList() << tr("Temp") << g_get_tmp_dir() << tr("untitled capture files"));
+    appendRow( QStringList() << tr("Temp") << get_tmp_dir() << tr("untitled capture files"));
+ 
+     /* pers conf */
+     appendRow( QStringList() << tr("Personal configuration")
 diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
-index cdbd865..a2d24c5 100644
+index ee4e5fd..fe17a95 100644
 --- a/ui/qt/iax2_analysis_dialog.cpp
 +++ b/ui/qt/iax2_analysis_dialog.cpp
-@@ -24,6 +24,7 @@
+@@ -37,6 +37,7 @@
 #include "ui/rtp_stream.h"
 #endif
 #include <wsutil/utf8_entities.h>
@ -30,107 +74,142 @@ index cdbd865..a2d24c5 100644
 
 #include <wsutil/g711.h>
 #include <wsutil/pint.h>
-@@ -252,9 +253,9 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) :
+@@ -271,10 +272,10 @@ 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 = QStringLiteral("%1/wireshark_iax2_f").arg(QDir::tempPath());
-+    QString tempname = QStringLiteral("%1/wireshark_iax2_f").arg(get_tmp_dir());
+-    QString tempname = QString("%1/wireshark_iax2_f").arg(QDir::tempPath());
+    QString tempname = QString("%1/wireshark_iax2_f").arg(get_tmp_dir());
     fwd_tempfile_ = new QTemporaryFile(tempname, this);
-    tempname = QStringLiteral("%1/wireshark_iax2_r").arg(QDir::tempPath());
-+    tempname = QStringLiteral("%1/wireshark_iax2_r").arg(get_tmp_dir());
+     fwd_tempfile_->open();
+-    tempname = QString("%1/wireshark_iax2_r").arg(QDir::tempPath());
+    tempname = QString("%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
-+++ b/ui/qt/utils/rtp_audio_file.cpp
-@@ -31,6 +31,7 @@
+diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp
+index 5d82e46..8008984 100644
+--- a/ui/qt/rtp_analysis_dialog.cpp
+++ b/ui/qt/rtp_analysis_dialog.cpp
+@@ -37,6 +37,7 @@
 
- #include "rtp_audio_file.h"
- #include <ws_attributes.h>
+ #include <wsutil/g711.h>
+ #include <wsutil/pint.h>
 +#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
 
- RtpAudioFile::RtpAudioFile(bool use_disk_for_temp, bool use_disk_for_frames):
-       real_pos_(0)
-@@ -45,7 +46,7 @@ RtpAudioFile::RtpAudioFile(bool use_disk_for_temp, bool use_disk_for_frames):
+ #include <QMessageBox>
+ #include <QPushButton>
+@@ -331,10 +332,10 @@ RtpAnalysisDialog::RtpAnalysisDialog(QWidget &parent, CaptureFile &cf, struct _r
 
-     tempname = "memory";
-     if (use_disk_for_temp) {
-        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);
+     // 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_rtp_f").arg(QDir::tempPath());
+    QString tempname = QString("%1/wireshark_rtp_f").arg(get_tmp_dir());
+     fwd_tempfile_ = new QTemporaryFile(tempname, this);
+     fwd_tempfile_->open();
+-    tempname = QString("%1/wireshark_rtp_r").arg(QDir::tempPath());
+    tempname = QString("%1/wireshark_rtp_r").arg(get_tmp_dir());
+     rev_tempfile_ = new QTemporaryFile(tempname, this);
+     rev_tempfile_->open();
+ 
+diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp
+index fde66c8..b9531d2 100644
+--- a/ui/qt/rtp_audio_stream.cpp
+++ b/ui/qt/rtp_audio_stream.cpp
+@@ -37,6 +37,7 @@
+ #include <ui/rtp_stream.h>
+ 
+ #include <wsutil/nstime.h>
+#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
+ 
+ #include <QAudioFormat>
+ #include <QAudioOutput>
+@@ -76,7 +77,7 @@ RtpAudioStream::RtpAudioStream(QObject *parent, _rtp_stream_info *rtp_stream) :
+                                                 visual_sample_rate_, SPEEX_RESAMPLER_QUALITY_MIN, NULL);
+     speex_resampler_skip_zeros(visual_resampler_);
+ 
+-    QString tempname = QString("%1/wireshark_rtp_stream").arg(QDir::tempPath());
+    QString tempname = QString("%1/wireshark_rtp_stream").arg(get_tmp_dir());
+     tempfile_ = new QTemporaryFile(tempname, this);
+     tempfile_->open();
+ 
+diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
+index 2af1b6c..aa149a2 100644
+--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
+@@ -90,6 +90,7 @@ WSUTIL_PUBLIC_INCLUDES = \
+ 	ws_pipe.h		\
+ 	ws_printf.h		\
+ 	wsjsmn.h		\
+	wstmpdir.h		\
+ 	wsgcrypt.h		\
+ 	wsgetopt.h		\
+ 	wspcap.h		\
+@@ -168,6 +169,7 @@ libwsutil_la_SOURCES = \
+ 	ws_pipe.c		\
+ 	wsgcrypt.c		\
+ 	wsjsmn.c		\
+	wstmpdir.c		\
+ 	xtea.c
+ 
+ if HAVE_PLUGINS
 diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c
-index 531ed91..bd6fd60 100644
+index 8e1f8dc..dcf2f78 100644
 --- a/wsutil/tempfile.c
 +++ b/wsutil/tempfile.c
-@@ -10,6 +10,8 @@
+@@ -36,6 +36,7 @@
 
- #include "config.h"
 #include "tempfile.h"
-+#include <wsutil/file_util.h>
+ #include <wsutil/file_util.h>
 +#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
 
- #include <errno.h>
- 
-@@ -39,7 +41,7 @@ sanitize_prefix(const char *prefix)
- 
-  /**
-  * Create a tempfile with the given prefix (e.g. "wireshark"). The path
- * is created using g_file_open_tmp.
-+ * is created using get_tmp_dir.
-  *
-  * @param tempdir [in] If not NULL, the directory in which to create the file.
-  * @param namebuf [in,out] If not NULL, receives the full path of the temp file.
-@@ -55,13 +57,25 @@ create_tempfile(const char *tempdir, char **namebuf, const char *pfx, const char
+ #ifndef __set_errno
+ #define __set_errno(x) errno=(x)
+@@ -83,13 +83,14 @@ mkstemps(char *path_template, int suffixlen)
+  */
+ char *get_tempfile_path(const char *filename)
 {
-   int fd;
-   char *safe_pfx = sanitize_prefix(pfx);
-+  gchar *tmp_file;
-+  const char *tmp_dir;
-+  int old_mask;
+-  return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", g_get_tmp_dir(), filename);
+  return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_tmp_dir(), filename);
+ }
 
-   if (tempdir == NULL || tempdir[0] == '\0') {
-     /* Use OS default tempdir behaviour */
-     char* filetmpl = ws_strdup_printf("%sXXXXXX%s", safe_pfx ? safe_pfx : "", sfx ? sfx : "");
-     g_free(safe_pfx);
+ #define MAX_TEMPFILES   3
 
-    fd = g_file_open_tmp(filetmpl, namebuf, err);
-+    tmp_dir = get_tmp_dir();
-+    tmp_file = g_strconcat(tmp_dir, "/", filetmpl, NULL);
-+
-+    if (namebuf)
-+      *namebuf = tmp_file;
-+
-+    old_mask = ws_umask(0077);
-+    fd = mkstemps(tmp_file, sfx ? (int) strlen(sfx) : 0);
-+    ws_umask(old_mask);
-+
-     g_free(filetmpl);
+ /**
+- * Create a tempfile with the given prefix (e.g. "wireshark").
+ * Create a tempfile with the given prefix (e.g. "wireshark"). The path
+ * is created using get_tmp_dir and mkdtemp
+  *
+  * @param namebuf If not NULL, receives the full path of the temp file.
+  *                Should NOT be freed.
+@@ -199,7 +200,7 @@ create_tempfile(char **namebuf, const char *pfx, const char *sfx)
+     tf[idx].path = (char *)g_malloc(tf[idx].len);
   }
-   else {
+ 
+-  tmp_dir = g_get_tmp_dir();
+  tmp_dir = get_tmp_dir();
+ 
+ #ifdef _WIN32
+   _tzset();
 diff --git a/wsutil/tempfile.h b/wsutil/tempfile.h
-index 70031b5419..72011e265a 100644
+index 1dca2df..bb3160c 100644
 --- a/wsutil/tempfile.h
 +++ b/wsutil/tempfile.h
-@@ -23,7 +23,7 @@ extern "C" {
+@@ -45,7 +45,7 @@ WS_DLL_PUBLIC char *get_tempfile_path(const char *filename);
 
 /**
  * Create a tempfile with the given prefix (e.g. "wireshark"). The path
- * is created using g_file_open_tmp.
+- * is created using g_get_tmp_dir and mkstemp.
 + * is created using get_tmp_dir and mkstemp.
  *
-  * @param tempdir [in] If not NULL, the directory in which to create the file.
  * @param namebuf [in,out] If not NULL, receives the full path of the temp file.
+  *                Must NOT be freed.
 diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c
 new file mode 100644
-index 0000000000..9128d354ce
+index 0000000..d8b733b
 --- /dev/null
 +++ b/wsutil/wstmpdir.c
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,70 @@
 +/* wstmpdir.c
 + *
 + * Copyright (C) 2013 Red Hat, Inc. All right reserved.
@ -188,7 +267,6 @@ index 0000000000..9128d354ce
 +            k = strlen(tmp);
 +            if (k > 1 && G_IS_DIR_SEPARATOR(tmp[k - 1]))
 +                tmp[k - 1] = '\0';
-+            fprintf(stderr, "Using P_tmpdir: %s\n", P_tmpdir);
 +        }
 +#endif /* P_tmpdir */
 +
@ -204,7 +282,7 @@ index 0000000000..9128d354ce
 +}
 diff --git a/wsutil/wstmpdir.h b/wsutil/wstmpdir.h
 new file mode 100644
-index 0000000000..07ac5837ac
+index 0000000..07ac583
 --- /dev/null
 +++ b/wsutil/wstmpdir.h
@@ -0,0 +1,39 @@
@ -248,26 +326,5 @@ index 0000000000..07ac5837ac
 +
 +#endif
 -- 
-2.37.3
+2.13.0

-diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
-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/wstmpdir.h> /* for get_tmp_dir() */
- 
- #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"));
- 
-     /* temp */
-    appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : g_get_tmp_dir())
-+    appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : get_tmp_dir())
-                             << tr("Untitled capture files"));
- 
-     /* pers conf */
--- a/wireshark-0007-cmakelists.patch
+++ b/wireshark-0007-cmakelists.patch
@ -1,20 +0,0 @@
-diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
-index a55086c..0149801 100644
--- a/wsutil/CMakeLists.txt
-+++ b/wsutil/CMakeLists.txt
-@@ -80,6 +80,7 @@ set(WSUTIL_PUBLIC_HEADERS
- 	ws_roundup.h
- 	ws_strptime.h
- 	wsgcrypt.h
-+	wstmpdir.h
- 	wsjson.h
- 	wslog.h
- 	xtea.h
-@@ -135,6 +136,7 @@ set(WSUTIL_COMMON_FILES
- 	ws_pipe.c
- 	ws_strptime.c
- 	wsgcrypt.c
-+	wstmpdir.c
- 	wsjson.c
- 	wslog.c
- 	xtea.c
--- a/wireshark-0008-pkgconfig.patch
+++ b/wireshark-0008-pkgconfig.patch
@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e6095ac..71a04e8 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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 ${TMP_DST_PATH}
-	COMPONENT "Development"
-	EXCLUDE_FROM_ALL
- )
- 
- cmake_path(SET TMP_DST_PATH NORMALIZE "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")
--- a/wireshark-0009-remove-strato-manpages.patch
+++ b/wireshark-0009-remove-strato-manpages.patch
@ -1,44 +0,0 @@
-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)
-@@ -48,13 +46,11 @@ ADD_MAN_PAGE(ciscodump   1)
- ADD_MAN_PAGE(dumpcap     1)
- ADD_MAN_PAGE(editcap     1)
- ADD_MAN_PAGE(etwdump     1)
-ADD_MAN_PAGE(falcodump   1)
- ADD_MAN_PAGE(mergecap    1)
- ADD_MAN_PAGE(randpkt     1)
- ADD_MAN_PAGE(randpktdump 1)
- ADD_MAN_PAGE(rawshark    1)
- ADD_MAN_PAGE(reordercap  1)
- ADD_MAN_PAGE(sharkd      1)
-ADD_MAN_PAGE(sshdig      1)
- ADD_MAN_PAGE(sshdump     1)
- ADD_MAN_PAGE(text2pcap   1)
- 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71a04e8..a797ad1 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2283,11 +2283,8 @@ 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/sharkd.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
--- a/wireshark.spec
+++ b/wireshark.spec
@ -1,45 +1,37 @@
-%undefine __cmake_in_source_build
 %global with_lua 1
+%global with_portaudio 1
+#libmaxmind is a substitute for GeoIP
 %global with_maxminddb 1
-%global with_pytools 1
-%global plugins_version 4.6
-
-%bcond http3 %[0%{?fedora} >= 43]
+%global plugins_version 2.6

 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	4.6.7
-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)
+Version:	2.6.2
+Release:	1%{?dist}
+Epoch:          1
+License:	GPL+
 Url:		http://www.wireshark.org/

 Source0:	https://wireshark.org/download/src/%{name}-%{version}.tar.xz
 Source1:        https://www.wireshark.org/download/src/all-versions/SIGNATURES-%{version}.txt
 Source2:	90-wireshark-usbmon.rules
-Source3:	wireshark.sysusers

-# Fedora-specific
-Patch2:   wireshark-0002-Customize-permission-denied-error.patch
-# Fedora-specific
-Patch4:   wireshark-0004-Restore-Fedora-specific-groups.patch
-# Fedora-specific
-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-pkgconfig.patch
-Patch9:   wireshark-0009-remove-strato-manpages.patch
-
-#install tshark together with wireshark GUI
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
-
-Requires:	xdg-utils
-Requires:	hicolor-icon-theme
-
-%if %{with_maxminddb} && 0%{?fedora}
-Requires:	libmaxminddb
+Requires:	%{name}-qt = %{epoch}:%{version}-%{release}
+# Fedora-specific
+%if %{with_lua}
+Patch1:		wireshark-0001-enable-Lua-support.patch
 %endif
+# 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
+Patch5:		wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
+# Fedora-specific
+Patch6:		wireshark-0006-Move-tmp-to-var-tmp.patch

 BuildRequires:	bzip2-devel
 BuildRequires:	c-ares-devel
@ -47,6 +39,7 @@ BuildRequires:	elfutils-devel
 BuildRequires:	gcc-c++
 BuildRequires:	glib2-devel
 BuildRequires:	gnutls-devel
+BuildRequires:	gtk3-devel
 BuildRequires:	krb5-devel
 BuildRequires:	libcap-devel
 BuildRequires:	libgcrypt-devel
@ -59,54 +52,35 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	xdg-utils
 BuildRequires:	bison
 BuildRequires:	flex
+BuildRequires:	pcre-devel
 BuildRequires:	perl(Pod::Html)
 BuildRequires:	perl(Pod::Man)
-BuildRequires:	perl(open)
-BuildRequires:	pcre2-devel
-Buildrequires:	libssh-devel
-BuildRequires:	qt6-qttools-devel
-BuildRequires:	qt6-linguist
-BuildRequires:	qt6-qtbase-devel
-BuildRequires:	qt6-qt5compat-devel
-BuildRequires:	qt6-qtmultimedia-devel
-BuildRequires:	qt6-qtsvg-devel
-BuildRequires:  qt6-qtimageformats
+Buildrequires:  libssh-devel
+Buildrequires:  libssh2-devel
+BuildRequires:	qt5-linguist
+BuildRequires:	qt5-qtbase-devel
+BuildRequires:	qt5-qtmultimedia-devel
+BuildRequires:	qt5-qtsvg-devel
 BuildRequires:	zlib-devel
-BuildRequires:	asciidoctor
-%if %{with_maxminddb} && 0%{?fedora}
-BuildRequires:	libmaxminddb-devel
+%if %{with_maxminddb}
+BuildRequires:  libmaxminddb-devel
 %endif
-%if %{with_lua} && 0%{?fedora}
-BuildRequires:	lua-devel
+%if %{with_lua}
+BuildRequires:	compat-lua-devel
 %endif
-Buildrequires:	git-core
-Buildrequires:	python3-devel
-Buildrequires:	cmake
-Buildrequires:	speexdsp-devel
-#needed for sdjournal external capture interface
-BuildRequires:	systemd-devel
-BuildRequires:	libnghttp2-devel
-%if %{with http3}
-BuildRequires:	libnghttp3-devel
-%endif
-BuildRequires:	systemd-rpm-macros
-BuildRequires:	lz4-devel
-BuildRequires:	snappy-devel
-BuildRequires:	brotli-devel
-BuildRequires:	opus-devel
-BuildRequires:	sbc-devel
-%if 0%{?fedora}
-BuildRequires:	ilbc-devel
-BuildRequires:	opencore-amr-devel
-# bcg729 for G.729
-BuildRequires:	bcg729-devel
-# spandsp for G.722 and G.726
-BuildRequires:	spandsp-devel
-# wireshark needs the -compat package
-%endif
-
+BuildRequires: libtool, automake, autoconf
+Buildrequires: git
+Buildrequires: python2-devel

 %description
+Metapackage with installs %{name}-cli and %{name}-qt.
+
+%package	cli
+Summary:	Network traffic analyzer
+Requires(pre):	shadow-utils
+Requires(post): systemd-udev
+
+%description cli
 Wireshark allows you to examine protocol data stored in files or as it is
 captured from wired or wireless (WiFi or Bluetooth) networks, USB devices,
 and many other sources.  It supports dozens of protocol capture file formats
@ -117,23 +91,55 @@ and the ability to reassemble multiple protocol packets in order to, for
 example, view a complete TCP stream, save the contents of a file which was
 transferred over HTTP or CIFS, or play back an RTP audio stream.

-%package	cli
-Summary:	Network traffic analyzer
-
-%description cli
 This package contains command-line utilities, plugins, and documentation for
 Wireshark.

+%package	qt
+Summary:	Wireshark's Qt-based GUI
+Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
+Requires:	xdg-utils
+Requires:	hicolor-icon-theme
+%if %{with_portaudio}
+Requires:	portaudio
+BuildRequires:	portaudio-devel
+%endif
+%if %{with_maxminddb}
+Requires:	libmaxminddb
+%endif
+Requires(post):	/usr/sbin/update-alternatives
+Requires(postun):	/usr/sbin/update-alternatives
+
+%description qt
+This package contains the Qt Wireshark GUI and desktop integration files.
+
+%package	gtk
+Summary:	Wireshark's GTK+-based GUI
+
+Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+# This package used to be called wireshark-gnome.
+Provides:	wireshark-gnome = %{version}-%{release}
+Obsoletes:	wireshark-gnome < 2.0.0
+%if %{with_portaudio}
+Requires:	portaudio
+BuildRequires:	portaudio-devel
+%endif
+%if %{with_maxminddb}
+Requires:	libmaxminddb
+%endif
+Requires:	xdg-utils
+Requires:	hicolor-icon-theme
+BuildRequires:	desktop-file-utils
+Requires(post):	desktop-file-utils
+Requires(post):	/usr/sbin/update-alternatives
+Requires(postun):	/usr/sbin/update-alternatives
+
+%description gtk
+This package contains the GTK+ Wireshark GUI and desktop integration files.
+
 %package devel
 Summary:	Development headers and libraries for wireshark
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
-Requires:	glibc-devel
-Requires:	glib2-devel
-%if %{with_pytools} && 0%{?fedora}
-Requires:	python3-ply
-Requires:	omniORB-devel
-%endif
+Requires:	%{name} = %{epoch}:%{version}-%{release} glibc-devel glib2-devel

 %description devel
 The wireshark-devel package contains the header files, developer
@ -145,529 +151,280 @@ and plugins.
 %autosetup -S git

 %build
-%cmake -G "Unix Makefiles" \
-  -DDISABLE_WERROR=ON \
-  -DBUILD_wireshark=ON \
-%if %{with_lua} && 0%{?fedora}
-  -DENABLE_LUA=ON \
-%else
-  -DENABLE_LUA=OFF \
-%endif
-%if %{with_maxminddb} && 0%{?fedora} 
-  -DBUILD_mmdbresolve=ON \
-%else
-  -DBUILD_mmdbresolve=OFF \
-%endif
-  -DBUILD_randpktdump=OFF \
-  -DBUILD_androiddump=ON \
-  -DENABLE_SMI=ON \
-  -DUSE_qt6=ON \
-  -DENABLE_PLUGINS=ON \
-  -DENABLE_NETLINK=ON \
-  -DBUILD_dcerpcidl2wrs=OFF \
-  -DBUILD_sdjournal=ON \
-  -DBUILD_stratoshark=OFF
+autoreconf -ivf

-%cmake_build
+%configure \
+   --bindir=%{_bindir} \
+   --with-libsmi \
+   --with-gnu-ld \
+   --with-pic \
+   --with-gtk=3 \
+   --with-qt=5 \
+%if %{with_lua}
+   --with-lua \
+%else
+   --with-lua=no \
+%endif
+%if %{with_portaudio}
+   --with-portaudio \
+%else
+  --with-portaudio=no \
+%endif
+%if %{with_maxminddb}
+  --with-maxminddb \
+%else
+  --with-maxminddb=no \
+%endif
+   --disable-warnings-as-errors \
+   --enable-plugins \
+   --with-libnl \
+   --disable-androiddump \
+   --disable-randpktdump
+
+#remove rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags}

 %install
-%cmake_install
-%cmake_install --component Development
+make DESTDIR=%{buildroot} install

-desktop-file-validate %{buildroot}%{_datadir}/applications/org.wireshark.Wireshark.desktop
+# Install python stuff.
+mkdir -p %{buildroot}%{python2_sitearch}
+install -m 644 tools/wireshark_be.py tools/wireshark_gen.py  %{buildroot}%{python2_sitearch}
+
+desktop-file-validate %{buildroot}%{_datadir}/applications/wireshark.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop

 #install devel files (inspired by debian/wireshark-dev.header-files)
 install -d -m 0755  %{buildroot}%{_includedir}/wireshark
-install -m 0644 %{__cmake_builddir}/config.h %{buildroot}%{_includedir}/wireshark/config.h
 IDIR="%{buildroot}%{_includedir}/wireshark"
+mkdir -p "${IDIR}/epan"
+mkdir -p "${IDIR}/epan/crypt"
+mkdir -p "${IDIR}/epan/ftypes"
+mkdir -p "${IDIR}/epan/dfilter"
+mkdir -p "${IDIR}/epan/dissectors"
+mkdir -p "${IDIR}/epan/wmem"
+mkdir -p "${IDIR}/wiretap"
+mkdir -p "${IDIR}/wsutil"
 mkdir -p %{buildroot}%{_udevrulesdir}
-install -m 0644 %{SOURCE2}		%{buildroot}%{_udevrulesdir}
-install -Dpm 0644 %{SOURCE3}		%{buildroot}%{_sysusersdir}/%{name}.conf
+install -m 644 config.h epan/register.h	"${IDIR}/"
+install -m 644 cfile.h file.h		"${IDIR}/"
+install -m 644 ws_symbol_export.h	"${IDIR}/"
+install -m 644 epan/*.h			"${IDIR}/epan/"
+install -m 644 epan/crypt/*.h		"${IDIR}/epan/crypt"
+install -m 644 epan/ftypes/*.h		"${IDIR}/epan/ftypes"
+install -m 644 epan/dfilter/*.h		"${IDIR}/epan/dfilter"
+install -m 644 epan/dissectors/*.h	"${IDIR}/epan/dissectors"
+install -m 644 epan/wmem/*.h		"${IDIR}/epan/wmem"
+install -m 644 wiretap/*.h		"${IDIR}/wiretap"
+install -m 644 wsutil/*.h		"${IDIR}/wsutil"
+install -m 644 ws_diag_control.h	"${IDIR}/"
+install -m 644 %{SOURCE2}		%{buildroot}%{_udevrulesdir}

-%if %{with_pytools} && 0%{?fedora}
-#install asn2wrs.py, idl2wrs and make-plugin-reg.py tools
-mkdir -p %{buildroot}%{_libexecdir}/wireshark/pytools
-install -m 0755 tools/asn2wrs.py %{buildroot}%{_libexecdir}/wireshark/pytools/
-install -m 0755 tools/make-plugin-reg.py %{buildroot}%{_libexecdir}/wireshark/pytools/
-install -m 0755 tools/idl2wrs %{buildroot}%{_libexecdir}/wireshark/pytools/
-
-#install idl2wrs dependent scripts
-install -m 0644 tools/wireshark_be.py %{buildroot}%{_libexecdir}/wireshark/pytools/
-install -m 0644 tools/wireshark_gen.py %{buildroot}%{_libexecdir}/wireshark/pytools/
-%endif
+# Change the program name for 'alternatives'
+mv %{buildroot}%{_bindir}/wireshark %{buildroot}%{_bindir}/wireshark-qt

 touch %{buildroot}%{_bindir}/%{name}

 # Remove libtool archives and static libs
 find %{buildroot} -type f -name "*.la" -delete

+# Remove idl2wrs
+rm -f %{buildroot}%{_bindir}/idl2wrs

-%post cli
-%{?ldconfig}
-# skip triggering if udevd isn't even accessible, e.g. containers or
-# rpm-ostree-based systems
-if [ -S /run/udev/control ]; then
-    /usr/bin/udevadm trigger --subsystem-match=usbmon || :
+%pre cli
+getent group wireshark >/dev/null || groupadd -r wireshark
+getent group usbmon >/dev/null || groupadd -r usbmon
+
+# If we have a pre-alternatives wireshark binary out there, get rid of it.
+# (With 'alternatives' %{_bindir}/wireshark should be a symlink.)
+%pre gtk
+if [ -f %{_bindir}/wireshark ]; then
+	rm -f %{_bindir}/wireshark
 fi

-%ldconfig_postun cli
+# If we have a pre-alternatives wireshark binary out there, get rid of it.
+# (With 'alternatives' %{_bindir}/wireshark should be a symlink.)
+%pre qt
+if [ -f %{_bindir}/wireshark ]; then
+	rm -f %{_bindir}/wireshark
+fi
+
+%post cli
+/sbin/ldconfig
+/usr/bin/udevadm trigger --subsystem-match=usbmon
+
+%post gtk
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/gnome &>/dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+gtk-update-icon-cache -t %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/sbin/update-alternatives --install %{_bindir}/wireshark \
+	%{name} %{_bindir}/wireshark-gtk 10
+
+%post qt
+update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+/usr/sbin/update-alternatives --install %{_bindir}/wireshark \
+	%{name} %{_bindir}/wireshark-qt 50
+
+%triggerin -- wireshark < 2.2.6-4
+/usr/sbin/update-alternatives --remove-all %{name} &> /dev/null || :
+# This one was used as a workaround during f26 devel phase
+/usr/sbin/update-alternatives --remove-all %{name}-gui &> /dev/null || :
+
+%postun cli -p /sbin/ldconfig
+
+%postun gtk
+update-desktop-database &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+	touch --no-create %{_datadir}/icons/gnome &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
+
+	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+        touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+        update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+
+	/usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-gtk
+fi
+
+%postun qt
+update-desktop-database &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+        /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-qt
+fi
+
+%posttrans cli
+gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :

 %files
-%{_datadir}/applications/org.wireshark.Wireshark.desktop
-%{_datadir}/metainfo/*.xml
-%{_datadir}/mime/packages/*.xml
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/icons/hicolor/*/mimetypes/*
-%{_bindir}/wireshark
-%{_mandir}/man1/wireshark.*

 %files cli
 %license COPYING
-%doc AUTHORS INSTALL README*
+%doc AUTHORS INSTALL NEWS README*
 %{_bindir}/capinfos
+%{_bindir}/mmdbresolve
 %{_bindir}/captype
 %{_bindir}/editcap
-%{_bindir}/dftest
 %{_bindir}/mergecap
 %{_bindir}/randpkt
 %{_bindir}/reordercap
 %{_bindir}/sharkd
 %{_bindir}/text2pcap
 %{_bindir}/tshark
-%if %{with_maxminddb} && 0%{?fedora}
-%{_bindir}/mmdbresolve
-%endif
 %attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap
 %{_bindir}/rawshark
 %{_udevrulesdir}/90-wireshark-usbmon.rules
+%{python2_sitearch}/*.py*
 %{_libdir}/lib*.so.*
-%dir %{_libexecdir}/wireshark
-%dir %{_libexecdir}/wireshark/extcap
-%dir %{_libdir}/wireshark/plugins
 %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
+%dir %{_libdir}/wireshark/extcap
+%dir %{_libdir}/wireshark/plugins
+%{_libdir}/wireshark/extcap/ciscodump
+%{_libdir}/wireshark/extcap/udpdump
+%{_libdir}/wireshark/extcap/sshdump
 #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
-%dir %{_libdir}/wireshark/plugins/%{plugins_version}/wiretap
-%dir %{_libdir}/wireshark/plugins/%{plugins_version}/codecs
 %{_libdir}/wireshark/plugins/%{plugins_version}/epan/*.so
-%{_libdir}/wireshark/plugins/%{plugins_version}/wiretap/*.so
 %{_libdir}/wireshark/plugins/%{plugins_version}/codecs/*.so
+%{_libdir}/wireshark/plugins/%{plugins_version}/wiretap/*.so
 %{_mandir}/man1/editcap.*
 %{_mandir}/man1/tshark.*
 %{_mandir}/man1/mergecap.*
 %{_mandir}/man1/text2pcap.*
 %{_mandir}/man1/capinfos.*
+%{_mandir}/man1/captype.*
+%{_mandir}/man1/ciscodump.*
 %{_mandir}/man1/dumpcap.*
 %{_mandir}/man4/wireshark-filter.*
 %{_mandir}/man1/rawshark.*
+%{_mandir}/man1/dftest.*
 %{_mandir}/man1/randpkt.*
 %{_mandir}/man1/reordercap.*
 %{_mandir}/man1/sshdump.*
 %{_mandir}/man1/udpdump.*
-%{_mandir}/man1/wifidump.*
-%{_mandir}/man1/androiddump.*
-%{_mandir}/man1/captype.*
-%{_mandir}/man1/ciscodump.*
-%{_mandir}/man1/randpktdump.*
-%{_mandir}/man1/dpauxmon.*
-%{_mandir}/man1/sdjournal.*
-%{_mandir}/man1/sharkd.*
-%{_mandir}/man1/etwdump.*
 %{_mandir}/man4/extcap.*
-%{_datadir}/doc/wireshark/*
-
-%if %{with_maxminddb} && 0%{?fedora}
 %{_mandir}/man1/mmdbresolve.*
-%endif
 %dir %{_datadir}/wireshark
 %{_datadir}/wireshark/*
-%{_sysusersdir}/%{name}.conf
+%if %{with_lua}
+%config(noreplace) %{_datadir}/wireshark/init.lua
+%endif
+
+%files gtk
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/wireshark-gtk.desktop
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/mimetypes/*
+%{_datadir}/mime/packages/wireshark.xml
+%{_bindir}/wireshark-gtk
+%{_mandir}/man1/wireshark.*
+%ghost %{_bindir}/wireshark
+
+%files qt
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/wireshark.desktop
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/mimetypes/*
+%{_datadir}/mime/packages/wireshark.xml
+%{_bindir}/wireshark-qt
+%{_mandir}/man1/wireshark.*
+%ghost %{_bindir}/wireshark

 %files devel
 %doc doc/README.* ChangeLog
-%dir %{_includedir}/wireshark
-%{_includedir}/wireshark/*
+%{_includedir}/wireshark
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/cmake/%{name}/*.cmake
-%if %{with_pytools} && 0%{?fedora}
-%dir %{_libexecdir}/wireshark/pytools
-%{_libexecdir}/wireshark/pytools/*.py
-%{_libexecdir}/wireshark/pytools/idl2wrs
-%endif

 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.6.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Tue Jul 14 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.7-1
- New version 4.6.7
-
-* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1:4.6.6-2
- Rebuilt for openssl 4.0
-
-* Mon Jun 01 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.6-1
- New version 4.6.6
-
-* Wed Mar 11 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.4-2
- Python tools should only be shipped in Fedora
-
-* Wed Mar 04 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.4-1
- New version 4.6.4
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Thu Jan 15 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.3-1
- New version 4.6.3
-
-* Thu Dec 11 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 1:4.6.1-3
- Enable HTTP/3 support on F43+ only
-
-* Tue Dec 09 2025 Alexey Kurov <nucleo@fedoraproject.org> - 1:4.6.1-2
- BuildRequires: libnghttp3-devel - needed for HTTP3 support
-
-* Thu Nov 27 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.6.1-1
- New version 4.6.1
-
-* 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
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.4.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jul 18 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.8-1
- New version 4.4.8
-
-* Thu Jun 05 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.7-1
- New version 4.4.7
-
-* Tue Jun 03 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.6-2
- udevadm should be ignored if an error occures
-
-* Mon May 26 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.6-1
- New version 4.4.6
-
-* Tue Mar 18 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.5-1
- New version 4.4.5
-
-* Thu Feb 20 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.4-1
- New version 4.4.4
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:4.4.3-2
- Drop call to %sysusers_create_compat
-
-* Wed Jan 22 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.3-1
- New version 4.4.3
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Nov 21 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.4.2-1
- New version 4.4.2
-
-* Thu Oct 10 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.4.1-1
- New version 4.4.1
-
-* Fri Sep 20 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.4.0-2
- Using cmake install for development headers and .cmake files
-
-* Thu Aug 29 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.4.0-1
- New version 4.4.0
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jul 11 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.2.6-1
- New version 4.2.6
-
-* Fri May 24 2024 Neal Gompa <ngompa@fedoraproject.org> - 1:4.2.5-2
- Rebuild (Qt6)
-
-* Wed May 22 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.2.5-1
- New version 4.2.5
-
-* Tue May 21 2024 Jan Grulich <jgrulich@redhat.com> - 1:4.2.4-3
- Rebuild (qt6)
-
-* Sat May 04 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.2.4-2
- Enabling additional features (rhbz#2278136)
-
-* Mon Apr 08 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.2.4-1
- New version 4.2.4
-
-* Thu Apr 04 2024 Jan Grulich <jgrulich@redhat.com> - 1:4.2.3-2
- Rebuild (qt6)
-
-* Tue Mar 12 2024 Marie Loise Nolden <loise@kde.org> - 1:4.2.3-1
- New version 4.2.3-1
-
-* Sun Feb 18 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1:4.2.2-3
- Install more devel headers
-
-* Sun Feb 11 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.2.2-2
- Making sure that wireshark.pc is created and installed
-
-* Thu Feb 01 2024 Michal Ruprich <mruprich@redhat.com> - 1:4.2.2-1
- New version 4.2.2
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.0.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* 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
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jul 14 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.7-1
- New version 4.0.7
-
-* Thu May 25 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.6-1
- New version 4.0.6
-
-* Thu Apr 13 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.5-1
- New version 4.0.5
- Fix for bug #2159392
-
-* Wed Mar 22 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.4-2
- SPDX migration
-
-* Tue Mar 07 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.4-1
- New version 4.0.4
-
-* Thu Feb 02 2023 Michal Ruprich <mruprich@redhat.com> - 1:4.0.3-1
- New version 4.0.3
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Dec 08 2022 Michal Ruprich <mruprich@redhat.com> - 1:4.0.2-1
- New version 4.0.2
-
-* Thu Oct 27 2022 Michal Ruprich <mruprich@redhat.com> - 1:4.0.1-1
- New version 4.0.1
- Only compat-lua is supported, on Fedora only
-
-* Fri Oct 14 2022 Michal Ruprich <mruprich@redhat.com> - 1:4.0.0-2
- Adding a couple of tweaks for the latest rebased version
-
-* Thu Oct 06 2022 Kenneth Topp <toppk@bllue.org> - 1:4.0.0-1
- New version 4.0.0
-
-* Thu Sep 29 2022 Michal Ruprich <mruprich@redhat.com> - 1:3.6.8-2
- New version 3.6.8
- Fix for CVE-2022-3190
-
-* Mon Aug 01 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 1:3.6.7-2
- Drop gating for python3-devel dependency
-
-* Thu Jul 28 2022 Michal Ruprich <mruprich@redhat.com> - 1:3.6.7-1
- New version 3.6.7
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Feb 16 2022 Michal Ruprich <mruprich@redhat.com> - 1:3.6.2-1
- New version 3.6.2
- Fix for CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585, CVE-2022-0586
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jan 12 2022 Michal Ruprich <mruprich@redhat.com> - 1:3.6.1-1
- New version 3.6.1
- Fix for CVE-2021-4181, CVE-2021-4182, CVE-2021-4183, CVE-2021-4184, CVE-2021-4185, CVE-2021-4190
-
-* Thu Nov 25 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.6.0-1
- New version 3.6.0
- Fix for CVE-2021-39920, CVE-2021-39921, CVE-2021-39922, CVE-2021-39923, CVE-2021-39924, CVE-2021-39925, CVE-2021-39926, CVE-2021-39928, CVE-2021-39929
-
-* Wed Oct 13 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.9-2
- New version 3.4.9
-
-* Mon Sep 06 2021 Timothée Ravier <tim@siosm.fr> - 1:3.4.8-2
- Use system sysusers config to create groups
-
-* Tue Aug 31 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.8-1
- New version 3.4.8
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.4.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jul 15 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.7-1
- New version 3.4.7
-
-* Thu Jun 10 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.6-1
- New version 3.4.6
- Fix for CVE-2021-22207
-
-* Thu May 27 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.5-1
- New version 3.4.5
- Fix for CVE-2021-22207
-
-* Tue Mar 16 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.4-1
- New version 3.4.4
- Fix for CVE-2021-22191
-
-* Tue Feb 23 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.3-3
- Adding more commits to make SMC complete
-
-* Mon Feb 22 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.3-2
- Adding SMC-R, SMC-D and SMC-D v2
-
-* Tue Feb 16 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.3-1
- New version 3.4.3
- Fix for CVE-2021-22173, CVE-2021-22174
-
-* Fri Jan 29 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.2-1
- New version 3.4.2
- Fix for CVE-2020-26418, CVE-2020-26419, CVE-2020-26420, CVE-2020-26421
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Dec 02 2020 Michal Ruprich <mruprich@redhat.com> - 1:3.4.0-1
- New version 3.4.0
- Fix for CVE-2020-26575, CVE-2020-28030
-
-* Fri Oct 09 2020 Michal Ruprich <mruprich@redhat.com> - 1:3.2.7-1
- New version 3.2.7
- Fix for CVE-2020-25862, CVE-2020-25863, CVE-2020-25866
-
-* Thu Sep 10 2020 Michal Ruprich <mruprich@redhat.com> - 1:3.2.6-2
- Temprorarily disabling LTO build due to errors in libqt5core
-
-* Wed Aug 19 2020 Michal Ruprich <mruprich@redhat.com> - 1:3.2.6-1
- New version 3.2.6
- Fix for CVE-2020-17498
-
-* Thu Jul 30 2020 Michal Ruprich <mruprich@redhat.com> - 1:3.2.5-3
- Adding ownership for dirs created by wireshark (rhbz#1860650)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 02 2020 Michal Ruprich <mruprich@redhat.com> - 1:3.2.5-1
- New version 3.2.5
-
-* Fri May 22 2020 Michal Ruprich <mruprich@redhat.com> - 1:3.2.4-1
- New version 3.2.4
- Enabling build with androiddump (rhbz#1834367)
-
-* Mon Apr 13 2020 Gwyn Ciesla <gwync@protonmail.com> - 1:3.2.3-1
- 3.2.3
-
-* Fri Apr 03 2020 Michal Ruprich <mruprich@redhat.com> - 1:3.2.2-1
- New version 3.2.2
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Dec 19 2019 Michal Ruprich <mruprich@redhat.com> - 1:3.2.0-1
- New version 3.2.0
-
-* Wed Oct 30 2019 Michal Ruprich <mruprich@redhat.com> - 1:3.0.5-1
- New version 3.0.5
-
-* Tue Aug 20 2019 Michal Ruprich <mruprich@redhat.com> - 1:3.0.3-1
- New version 3.0.3
- Fixes CVE-2019-13619
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Apr 09 2019 Michal Ruprich <mruprich@redhat.com> - 1:3.0.1-1
- New version 3.0.1
- Fixes CVE-2019-10894, CVE-2019-10895, CVE-2019-10896, CVE-2019-10897, CVE-2019-10898, CVE-2019-10899, CVE-2019-10900, CVE-2019-10901, CVE-2019-10902, CVE-2019-10903
-
-* Mon Mar 11 2019 Michal Ruprich <mruprich@redhat.com> - 1:3.0.0-1
- New version 3.0.0
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 21 2019 Michal Ruprich <mruprich@redhat.com> - 1:2.6.6-1
- New version 2.6.6 
- Contains fixes for CVE-2019-5716, CVE-2019-5717, CVE-2019-5718, CVE-2019-5719
- Add explicit curdir on CMake invokation
-
-* Wed Jan 02 2019 Michal Ruprich <mruprich@redhat.com> - 1:2.6.5-2
- Adding libnghttp2-devel as BuildRequires - needed for HTTP2 support(rhbz#1512722)
-
-* Mon Dec 10 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.5-1
- New version 2.6.5
- Contains fixes for CVE-2018-19622, CVE-2018-19623,  CVE-2018-19624, CVE-2018-19625, CVE-2018-19626, CVE-2018-19627, CVE-2018-19628
-
-* Mon Nov 12 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.4-1
- New version 2.6.4
- Contains fixes for CVE-2018-16056, CVE-2018-16057, CVE-2018-16058
-
-* Mon Jul 23 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.2-1
+* Tue Jul 24 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
-
-* Wed Jul 11 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.1-2
- Fixing build error with newer qt5 version
-
 * Thu May 24 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.1-1
 - New version 2.6.1

-* Tue May 15 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.0-2
- Added Obsoletes for wireshark-qt and wireshark-gtk
+* Tue May 15 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.0-3
+- Fixed undefined reference error in tshark (rhbz#1573906)
+- Correcting usage of build flags (rhbz#1548665)

-* Wed May 02 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.0-1
+* Fri Apr 27 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.0-2
+- Uploading sources for version 2.6.0
+
+* Fri Apr 27 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.6.0-1
 - New version 2.6.0
- Fix for CVE-2018-9256, CVE-2018-9257, CVE-2018-9258, CVE-2018-9259, CVE-2018-9260, CVE-2018-9261, CVE-2018-9262, CVE-2018-9263, CVE-2018-9264, CVE-2018-9265, CVE-2018-9266, CVE-2018-9267, CVE-2018-9268, CVE-2018-9269, CVE-2018-9270, CVE-2018-9271, CVE-2018-9272, CVE-2018-9273, CVE-2018-9274
- Switch from autotools to cmake
- Removed python2-devel(#1560284) and libssh2-devel from dependencies
- Removed python scripts
+- Removed GeoIP support, libmaxminddb is used instead
+- Removed dftest binary

-* Thu Mar 15 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.4.5-2
+* Thu Mar 15 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.4.5-3
 - Removing dependency on wireshark from wireshark-cli (rhbz#1554818)
 - Removing deprecated Group tags

-* Fri Mar 09 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.4.5-1
- New upstream version 2.4.5
- Contains fixes for CVE-2018-7419, CVE-2018-7418, CVE-2018-7417, CVE-2018-7420, CVE-2018-7320, CVE-2018-7336, CVE-2018-7337, CVE-2018-7334, CVE-2018-7335, CVE-2018-6836, CVE-2018-5335,  CVE-2018-5334,  CVE-2017-6014, CVE-2017-9616, CVE-2017-9617, CVE-2017-9766
- Removed GTK+ based GUI (rhbz#1486203)
- Corrected LDFLAGS in spec (rhbz#1548665)
- Alternatives are no longer needed (rhbz#1533701)
+* Tue Mar 13 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.4.5-2
+- Added wireshark-qt package to wireshark metapackage (rhbz#1506859)

-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:2.4.4-2
- Escape macros in %%changelog
+* Tue Mar 13 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.4.5-1
+- New version 2.4.5
+- Contains fixes for CVE-2018-7419, CVE-2018-7418, CVE-2018-7417, CVE-2018-7420, CVE-2018-7320, CVE-2018-7336, CVE-2018-7337, CVE-2018-7334, CVE-2018-7335, CVE-2018-6836, CVE-2018-5335, CVE-2018-5334, CVE-2017-6014, CVE-2017-9616, CVE-2017-9617, CVE-2017-9766
+- Corrected LDFLAGS in spec (rhbz#1548665)

 * Fri Jan 19 2018 Michal Ruprich <mruprich@redhat.com> - 1:2.4.4-1
 - New upstream version 2.4.4
- Contains fix for CVE-2017-17935 
-
-* Fri Jan 05 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:2.4.3-2
- Remove obsolete scriptlets
+- Contains fix for CVE-2017-17935

 * Wed Dec 20 2017 Michal Ruprich <mruprich@redhat.com> - 1:2.4.3-1
 - New upstream version 2.4.3
- Contains fixe for CVE-2017-17085, CVE-2017-17084, CVE-2017-17083
+- Contains fixes for CVE-2017-17085, CVE-2017-17084, CVE-2017-17083

 * Thu Oct 12 2017 Michal Ruprich <mruprich@redhat.com> - 1:2.4.2-1
 - New upstream version 2.4.2
@ -810,7 +567,7 @@ fi
 - Dropped patch no. 11 (applied upstream)

 * Tue Jun 30 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-4
- Move plugins to %%{_libdir}/wireshark/plugins to avoid
+- Move plugins to %{_libdir}/wireshark/plugins to avoid
  transaction conflicts

 * Fri Jun 26 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-3
@ -818,7 +575,7 @@ fi
 - Resolves: rhbz#1235830

 * Fri Jun 26 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-2
- Add symlink plugins/current -> plugins/%%{version}
+- Add symlink plugins/current -> plugins/%{version}

 * Thu Jun 18 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-1
 - Ver. 1.12.6
--- a/wireshark.sysusers
+++ b/wireshark.sysusers
@ -1,2 +0,0 @@
-g wireshark - -
-g usbmon    - -
Author	SHA1	Message	Date
Michal Ruprich	0df76e8300	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	2018-07-24 13:03:55 +02:00
Michal Ruprich	e9db166558	New version 2.6.1	2018-05-24 14:36:12 +02:00
Michal Ruprich	e25d3218be	Fixed undefined reference error in tshark (rhbz#1573906) Correcting usage of build flags (rhbz#1548665)	2018-05-15 14:33:48 +02:00
Michal Ruprich	2d4419cb03	Uploading sources for version 2.6.0	2018-04-27 16:59:21 +02:00
Michal Ruprich	ac3bc51c5f	New version 2.6.0 Removed GeoIP support, libmaxminddb is used instead Removed dftest binary	2018-04-27 16:55:15 +02:00
Michal Ruprich	192ac244eb	Removing dependency on wireshark from wireshark-cli (rhbz#1554818) Removing deprecated Group tags	2018-03-15 10:37:39 +01:00
Michal Ruprich	a5fca7faf2	Added wireshark-qt package to wireshark metapackage (rhbz#1506859)	2018-03-13 12:41:16 +01:00
Michal Ruprich	ce12ad88ab	New version 2.4.5 Contains fixes for CVE-2018-7419, CVE-2018-7418, CVE-2018-7417, CVE-2018-7420, CVE-2018-7320, CVE-2018-7336, CVE-2018-7337, CVE-2018-7334, CVE-2018-7335, CVE-2018-6836, CVE-2018-5335, CVE-2018-5334, CVE-2017-6014, CVE-2017-9616, CVE-2017-9617, CVE-2017-9766 Corrected LDFLAGS in spec (rhbz#1548665)	2018-03-13 11:34:59 +01:00
Michal Ruprich	99980117dc	New upstream version 2.4.4 Contains fix for CVE-2017-17935	2018-01-19 15:02:10 +01:00
Michal Ruprich	6e57399227	New upstream version 2.4.3 Contains fixes for CVE-2017-17085, CVE-2017-17084, CVE-2017-17083	2017-12-20 16:02:17 +01:00
Michal Ruprich	3f83cc9a16	New upstream version 2.4.2 Contains fixes for CVE-2017-15189, CVE-2017-15190, CVE-2017-15191, CVE-2017-15192, CVE-2017-15193, CVE-2017-13764, CVE-2017-13765, CVE-2017-13766, CVE-2017-13767	2017-10-12 12:25:30 +02:00