New version 3.6.2

Fix for CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585, CVE-2022-0586

ci.fmf

@@ -8,6 +8,6 @@
       - name: tier1
         how: fmf
         filter: 'tier: 1'
-        repository: "https://src.fedoraproject.org/tests/wireshark.git"
+        url: "https://src.fedoraproject.org/tests/wireshark.git"
     execute:
         how: beakerlib

sources

@@ -1,2 +1,2 @@
-SHA512 (wireshark-3.4.2.tar.xz) = 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a
-SHA512 (SIGNATURES-3.4.2.txt) = b9d6bba7ef06dcd3ab954fc413e17230fa7570913daa30b89fba71015a09250241a35712a5a72a7fdb859fd231bc4d1d4455953b1cc8d77fa673648e2f0f196f
+SHA512 (wireshark-3.6.2.tar.xz) = cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
+SHA512 (SIGNATURES-3.6.2.txt) = 0370ee5827003f98983d0a7d1a1024aa891a5f74bafb42d993be2509cdf63181acbd0547d722af072491b4406cf02b899c2b8af7bac52e2e4ddb801f28695caf

wireshark-0002-Customize-permission-denied-error.patch

@@ -7,10 +7,10 @@ because of permissions.
 
 Signed-off-by: Jan Safranek <jsafrane@redhat.com>
 
-diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
+diff --git a/capture/capture_sync.c b/capture/capture_sync.c
 index 2f9d2cc..b18e47f 100644
---- a/capchild/capture_sync.c
-+++ b/capchild/capture_sync.c
+--- a/capture/capture_sync.c
++++ b/capture/capture_sync.c
 @@ -375,6 +375,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi
      gchar *signal_pipe_name;
  #else

wireshark-0004-Restore-Fedora-specific-groups.patch

@@ -3,10 +3,10 @@ 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/wireshark.desktop b/wireshark.desktop
+diff --git a/org.wireshark.Wireshark.desktop b/org.wireshark.Wireshark.desktop
 index 334db48..669c6f1 100644
---- a/wireshark.desktop
-+++ b/wireshark.desktop
+--- a/org.wireshark.Wireshark.desktop
++++ b/org.wireshark.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:

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 wireshark.desktop file
+Subject: [PATCH] Fix paths in a org.wireshark.Wireshark.desktop file
 
 
-diff --git a/wireshark.desktop b/wireshark.desktop
+diff --git a/org.wireshark.Wireshark.desktop b/org.wireshark.Wireshark.desktop
 index 669c6f1..f7df1f3 100644
---- a/wireshark.desktop
-+++ b/wireshark.desktop
+--- a/org.wireshark.Wireshark.desktop
++++ b/org.wireshark.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=wireshark
+ Icon=org.wireshark.Wireshark
 -TryExec=wireshark
 -Exec=wireshark %f
 +TryExec=/usr/bin/wireshark

wireshark-0006-Move-tmp-to-var-tmp.patch

@@ -64,52 +64,27 @@ index ee4e5fd..fe17a95 100644
      rev_tempfile_ = new QTemporaryFile(tempname, this);
      rev_tempfile_->open();
  
-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 @@
+diff --git a/ui/qt/utils/rtp_audio_file.cpp b/ui/qt/utils/rtp_audio_file.cpp
+index 591a63b..203f5c5 100644
+--- a/ui/qt/utils/rtp_audio_file.cpp
++++ b/ui/qt/utils/rtp_audio_file.cpp
+@@ -31,6 +31,7 @@
  
- #include <wsutil/g711.h>
- #include <wsutil/pint.h>
+ #include "rtp_audio_file.h"
+ #include <ws_attributes.h>
 +#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
  
- #include <QMessageBox>
- #include <QPushButton>
-@@ -331,10 +332,10 @@ RtpAnalysisDialog::RtpAnalysisDialog(QWidget &parent, CaptureFile &cf, struct _r
- 
-     // 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();
+ 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):
  
+     tempname = "memory";
+     if (use_disk_for_temp) {
+-        tempname = QString("%1/wireshark_rtp_stream").arg(QDir::tempPath());
++        tempname = QString("%1/wireshark_rtp_stream").arg(get_tmp_dir());
+         sample_file_ = new QTemporaryFile(tempname, this);
+     } else {
+         sample_file_ = new QBuffer(this);
 diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c
 index 5082452..f751a7c 100644
 --- a/wsutil/tempfile.c
@@ -292,4 +267,3 @@ index 0000000..07ac583
 +#endif
 -- 
 2.13.0
-

wireshark-0007-cmakelists.patch

@@ -5,16 +5,16 @@ index 0367cd1..6382a2c 100644
 @@ -69,6 +69,7 @@ set(WSUTIL_PUBLIC_HEADERS
  	ws_mempbrk_int.h
  	ws_pipe.h
- 	ws_printf.h
+ 	ws_roundup.h
 +	wstmpdir.h
  	wsjson.h
+ 	wslog.h
  	xtea.h
- )
 @@ -118,6 +118,7 @@ set(WSUTIL_COMMON_FILES
- 	unicode-utils.c
+ 	ws_getopt.c
  	ws_mempbrk.c
  	ws_pipe.c
 +	wstmpdir.c
  	wsgcrypt.c
  	wsjson.c
- 	xtea.c
+ 	wslog.c

wireshark.spec

@@ -1,13 +1,13 @@
 %undefine __cmake_in_source_build
 %global with_lua 1
 %global with_maxminddb 1
-%global plugins_version 3.4
+%global plugins_version 3.6
 # added temporarily due to errors in libqt5core
 %define _lto_cflags %{nil}
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	3.4.2
+Version:	3.6.2
 Release:	1%{?dist}
 Epoch:		1
 License:	GPL+
@@ -16,6 +16,7 @@ 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
@@ -67,13 +68,14 @@ 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
 %endif
 %if %{with_lua} && 0%{?fedora}
 BuildRequires:	compat-lua-devel
 %endif
-Buildrequires: git
+Buildrequires: git-core
 %if 0%{?fedora}
 Buildrequires: python3-devel
 %endif
@@ -81,6 +83,7 @@ Buildrequires: cmake
 #needed for sdjournal external capture interface
 BuildRequires: systemd-devel
 BuildRequires: libnghttp2-devel
+BuildRequires: systemd-rpm-macros
 
 Obsoletes: wireshark-qt, wireshark-gtk
 
@@ -145,7 +148,7 @@ and plugins.
 %install
 %cmake_install
 
-desktop-file-validate %{buildroot}%{_datadir}/applications/wireshark.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.wireshark.Wireshark.desktop
 
 #install devel files (inspired by debian/wireshark-dev.header-files)
 install -d -m 0755  %{buildroot}%{_includedir}/wireshark
@@ -167,11 +170,11 @@ 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}
+install -Dpm 644 %{SOURCE3}		%{buildroot}%{_sysusersdir}/%{name}.conf
 
 touch %{buildroot}%{_bindir}/%{name}
 
@@ -179,8 +182,7 @@ touch %{buildroot}%{_bindir}/%{name}
 find %{buildroot} -type f -name "*.la" -delete
 
 %pre cli
-getent group wireshark >/dev/null || groupadd -r wireshark
-getent group usbmon >/dev/null || groupadd -r usbmon
+%sysusers_create_compat %{SOURCE3}
 
 %post cli
 %{?ldconfig}
@@ -193,13 +195,14 @@ fi
 %ldconfig_postun cli
 
 %files
-%{_datadir}/appdata/%{name}.appdata.xml
-%{_datadir}/applications/wireshark.desktop
+%{_datadir}/applications/org.wireshark.Wireshark.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/mimetypes/*
-%{_datadir}/mime/packages/wireshark.xml
+%{_datadir}/mime/packages/*.xml
+%{_datadir}/metainfo/*.xml
 %{_bindir}/wireshark
 %{_mandir}/man1/wireshark.*
+%{_sysusersdir}/%{name}.conf
 
 %files cli
 %license COPYING
@@ -258,13 +261,13 @@ fi
 %{_mandir}/man1/randpktdump.*
 %{_mandir}/man1/dpauxmon.*
 %{_mandir}/man1/sdjournal.*
+%{_mandir}/man1/etwdump.*
 %{_mandir}/man4/extcap.*
 %if %{with_maxminddb} && 0%{?fedora}
 %{_mandir}/man1/mmdbresolve.*
 %endif
 %dir %{_datadir}/wireshark
 %{_datadir}/wireshark/*
-%{_docdir}/wireshark/*.html
 
 %files devel
 %doc doc/README.* ChangeLog
@@ -273,6 +276,52 @@ fi
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* 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
+
+* 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-1
+- New version 3.4.9
+
+* Wed Sep 22 2021 Michal Ruprich <mruprich@redhat.com> - 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
+
+* 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

wireshark.sysusers

@@ -0,0 +1,2 @@
+g wireshark - -
+g usbmon    - -