diff --git a/90-wireshark-usbmon.rules b/90-wireshark-usbmon.rules deleted file mode 100644 index 10a127c3a840695d46c13a891924ec132fc4c28e..0000000000000000000000000000000000000000 --- a/90-wireshark-usbmon.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="usbmon", GROUP="usbmon", MODE="640" diff --git a/SIGNATURES-3.6.3.txt b/SIGNATURES-3.6.3.txt deleted file mode 100644 index 232c0f8eb9aece80c839edb0a387b63030bf1bb3..0000000000000000000000000000000000000000 Binary files a/SIGNATURES-3.6.3.txt and /dev/null differ diff --git a/SIGNATURES-3.6.8.txt b/SIGNATURES-3.6.8.txt new file mode 100644 index 0000000000000000000000000000000000000000..05866e71662bf5a199f5d4bf5178727de91787a5 --- /dev/null +++ b/SIGNATURES-3.6.8.txt @@ -0,0 +1,61 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +wireshark-3.6.8.tar.xz: 39942580 bytes +SHA256(wireshark-3.6.8.tar.xz)=67ab23ee09a646ab8cc0ddcc985209f24f253337461e3d9644c6cfe1c097260c +SHA1(wireshark-3.6.8.tar.xz)=e4b2cb5703f9d6cf0934469a2e8a2426cb308dad + +Wireshark-win64-3.6.8.exe: 77301408 bytes +SHA256(Wireshark-win64-3.6.8.exe)=17ce19def77592d4c0fb0b680e77e4712dd6c8c4af79c6d58a281eb509a4f34b +SHA1(Wireshark-win64-3.6.8.exe)=2160b0a85bf8131c7e9a912a4364f5019f98000d + +Wireshark-win32-3.6.8.exe: 61106552 bytes +SHA256(Wireshark-win32-3.6.8.exe)=332aff4889f73ee1daf656e3411554685796a51f8059e2cd531bb60fb754799c +SHA1(Wireshark-win32-3.6.8.exe)=a74431156d5f85c0cd51094200ebb32a603be79e + +Wireshark-win64-3.6.8.msi: 51019776 bytes +SHA256(Wireshark-win64-3.6.8.msi)=f0558d461a902cccdf35f44462e4bc9a0726ca8b0a90ceaa5854b10f0d49c325 +SHA1(Wireshark-win64-3.6.8.msi)=358696df8ebe3eaba626d0e59c5364577f225f36 + +Wireshark-win32-3.6.8.msi: 45662208 bytes +SHA256(Wireshark-win32-3.6.8.msi)=1028e5f498acf941fad4aa387f7bdbcc419389d1241e02333fa824ec48a87b7b +SHA1(Wireshark-win32-3.6.8.msi)=163404a19abbc20bd435c037c0d84b3fd4d886e9 + +WiresharkPortable32_3.6.8.paf.exe: 39683296 bytes +SHA256(WiresharkPortable32_3.6.8.paf.exe)=2a28cf101f35e8f6a53c3d973779d5ea940488b09a9b9ca09f4567c9da27dfa1 +SHA1(WiresharkPortable32_3.6.8.paf.exe)=ee1746e9a2bae5f148278f8834084ae716661474 + +WiresharkPortable64_3.6.8.paf.exe: 44428832 bytes +SHA256(WiresharkPortable64_3.6.8.paf.exe)=dd3c3a488c4aafc8ed87d7ed3a2abd64c2f8ee47eaf0676895d4b3ce986b0903 +SHA1(WiresharkPortable64_3.6.8.paf.exe)=5a616cf739a7675eaef8f9c18117153f4f5e186f + +Wireshark 3.6.8 Arm 64.dmg: 137659040 bytes +SHA256(Wireshark 3.6.8 Arm 64.dmg)=ae1735b05050da20d1a8d2d5c209bcd20743745ac23473bf034631f5b963970a +SHA1(Wireshark 3.6.8 Arm 64.dmg)=b5b6108ae0166b6d8b53473598e4fded1f57abb2 + +Wireshark 3.6.8 Intel 64.dmg: 139390338 bytes +SHA256(Wireshark 3.6.8 Intel 64.dmg)=c1e54f1af933486ac60da94bb1a366df5125959ef416e1a93c2a2fb9de78efa0 +SHA1(Wireshark 3.6.8 Intel 64.dmg)=8bf551f8e6c98ccdba95af3cc5912772af857f79 + +You can validate these hashes using the following commands (among others): + + Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256 + Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz + macOS: shasum -a 256 "Wireshark x.y.z Arm 64.dmg" + Other: openssl sha256 wireshark-x.y.z.tar.xz +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmMY3zAACgkQgiRKeOb+ +ruo0aBAAqAehgDXw+EgguywnW+hyUJ1epIps3/efQLpb/jw7nBlx+kMHdtRMlnhi +VcMnxBcjTxLwvbXNA1ijyEpnTNrr0IBgtDZfysT+jOJB6HAmnJBOHnW5krEQJfs/ +BurU39+mAFVAGnG96Ezm0AXfd5/0rYlwuwRQY7sBJZTcPLgRbBNAx9V2FXcB8gPJ +jtrQZd9iGVyn/dppjNVWCMJoZ9hDaiBdvRu9QFx2gPaAAH1IpHAuy5gpUKWNwHi3 +CFRoCk7WEhrLZRyAc2gxJxg72dWpu/Qm0NgoiwNEGDPZbPsOGsQR7vrxEhj20kh1 +mQ+nNdM07wfneW3YIBywOH8saqe9Vd0BBTKKi0A00gVokOTFzCaWuW49mlsa9nlF +P6vKjx1lqKQT1EKkyGLwp8X/oKRjTYeLAcVhfCzTtYSXRZEYT+Ld8b90m724qq1b +WY5E2YWHwCeKEEPCV26WUuynzhgpaiSjCFfPi+QKJfBpqqBYsHga/F7XRr+cjZ6u +y5dr+C+BkyIkIklNMOKUlQkdAdKaReYtWG7ZxU1QNO4Z0vcEJMTyCY1+lhbpqXp6 +WUpb/JrpxLcIbruN05CoyCwRxL3YT6myoMFUFywRZqOcBgEcJShRJUMvPsR2lszv +OwRcNNiVgLPzx+8eXiF8Dr6EGmkyWiOPJ4M2uE5CmvWmWAwIHWc= +=GXjp +-----END PGP SIGNATURE----- diff --git a/wireshark-0002-Customize-permission-denied-error.patch b/wireshark-0002-Customize-permission-denied-error.patch deleted file mode 100644 index cad466301e6c266625009faa3f0f5d9a0b5787f2..0000000000000000000000000000000000000000 --- a/wireshark-0002-Customize-permission-denied-error.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Jan Safranek -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 - -diff --git a/capture/capture_sync.c b/capture/capture_sync.c -index 2f9d2cc..b18e47f 100644 ---- 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 - 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); -+ - 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 diff --git a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch b/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch deleted file mode 100644 index 8277a8c40ce7d777f7ec33cb734247a8fde79218..0000000000000000000000000000000000000000 --- a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Peter Hatina -Date: Wed, 4 Sep 2013 10:03:57 +0200 -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 0f1658a..f7fd322 100644 ---- a/plugins/epan/profinet/packet-dcom-cba.c -+++ b/plugins/epan/profinet/packet-dcom-cba.c -@@ -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) - { - guint32 u32Pointer; -- gchar szStr[1000]; -+ gchar szStr[1000] = ""; - guint32 u32MaxStr = sizeof(szStr); - gchar *call; - diff --git a/wireshark-0004-Restore-Fedora-specific-groups.patch b/wireshark-0004-Restore-Fedora-specific-groups.patch deleted file mode 100644 index 4ec1140c0b7ce1e1f1b204730d5737130c56f4a3..0000000000000000000000000000000000000000 --- a/wireshark-0004-Restore-Fedora-specific-groups.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Peter Lemenkov -Date: Fri, 13 Sep 2013 14:36:55 +0400 -Subject: [PATCH] Restore Fedora-specific groups - -Signed-off-by: Peter Lemenkov -diff --git a/org.wireshark.Wireshark.desktop b/org.wireshark.Wireshark.desktop -index 334db48..669c6f1 100644 ---- 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: - # https://specifications.freedesktop.org/menu-spec/1.0/ --Categories=Network;Monitor;Qt; -+Categories=Application;Network;Monitor;Qt; diff --git a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch b/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch deleted file mode 100644 index e2c5b99db9c896372b78fe0dc6f7df7d9cc14d08..0000000000000000000000000000000000000000 --- a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Kenneth Soerensen -Date: Wed, 29 Jan 2014 16:04:12 +0400 -Subject: [PATCH] Fix paths in a org.wireshark.Wireshark.desktop file - - -diff --git a/org.wireshark.Wireshark.desktop b/org.wireshark.Wireshark.desktop -index 669c6f1..f7df1f3 100644 ---- 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=org.wireshark.Wireshark --TryExec=wireshark --Exec=wireshark %f -+TryExec=/usr/bin/wireshark -+Exec=/usr/bin/wireshark %f - 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: diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch deleted file mode 100644 index 268cbaffd81cb8f1b9dbefc5ee824bc653b01da1..0000000000000000000000000000000000000000 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ /dev/null @@ -1,269 +0,0 @@ -From cb54210f7f02b07768cfbf49ae266d487f580e1b Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Thu, 29 Jun 2017 15:32:58 +0200 -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/qt/about_dialog.cpp | 3 +- - ui/qt/iax2_analysis_dialog.cpp | 5 +-- - ui/qt/rtp_analysis_dialog.cpp | 5 +-- - ui/qt/rtp_audio_stream.cpp | 3 +- - wsutil/tempfile.c | 9 +++--- - wsutil/tempfile.h | 4 +-- - wsutil/wstmpdir.c | 70 ++++++++++++++++++++++++++++++++++++++++++ - wsutil/wstmpdir.h | 39 +++++++++++++++++++++++ - 8 files changed, 132 insertions(+), 11 deletions(-) - create mode 100644 wsutil/wstmpdir.c - create mode 100644 wsutil/wstmpdir.h - -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 -+#include /* for get_tmp_dir() */ - - #include - #include -@@ -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 ee4e5fd..fe17a95 100644 ---- a/ui/qt/iax2_analysis_dialog.cpp -+++ b/ui/qt/iax2_analysis_dialog.cpp -@@ -37,6 +37,7 @@ - #include "ui/rtp_stream.h" - #endif - #include -+#include /* for get_tmp_dir() */ - - #include - #include -@@ -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 = 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); - 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(); - -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 "rtp_audio_file.h" - #include -+#include /* 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): - - 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 -+++ b/wsutil/tempfile.c -@@ -12,10 +12,12 @@ - - #include - #include "tempfile.h" -+#include -+#include /* for get_tmp_dir() */ - - /** - * 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 namebuf [in,out] If not NULL, receives the full path of the temp file. - * Must be freed. -@@ -30,6 +31,9 @@ create_tempfile(gchar **namebuf, const char *pfx, const char *sfx, GError **err) - { - int fd; - gchar *safe_pfx = NULL; -+ gchar *tmp_file; -+ const char *tmp_dir; -+ int old_mask; - - if (pfx) { - /* The characters in "delimiters" come from: -@@ -49,7 +53,15 @@ create_tempfile(gchar **namebuf, const char *pfx, const char *sfx, GError **err) - gchar* filetmpl = g_strdup_printf("%sXXXXXX%s", safe_pfx ? safe_pfx : "", sfx ? sfx : ""); - g_free(safe_pfx); - -- 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); - return fd; -diff --git a/wsutil/tempfile.h b/wsutil/tempfile.h -index 1dca2df..bb3160c 100644 ---- a/wsutil/tempfile.h -+++ b/wsutil/tempfile.h -@@ -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 get_tmp_dir and mkstemp. - * - * @param namebuf [in,out] If not NULL, receives the full path of the temp file. - * Must be freed. -diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c -new file mode 100644 -index 0000000..d8b733b ---- /dev/null -+++ b/wsutil/wstmpdir.c -@@ -0,0 +1,71 @@ -+/* wstmpdir.c -+ * -+ * Copyright (C) 2013 Red Hat, Inc. All right reserved. -+ * -+ * Temporary directory routine -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Author: Peter Hatina -+ */ -+ -+#include "config.h" -+ -+#include -+#include "wstmpdir.h" -+ -+/** -+ * Gets the directory to use for temporary files. -+ * -+ * Inspired by glib-2.0. If no TMP, TEMP or TMPDIR is set, -+ * /var/tmp is returned (Fedora specific). -+ * -+ * Returns: the directory to use for temporary files. -+ */ -+const char *get_tmp_dir(void) -+{ -+ static gchar *tmp_dir; -+ -+ if (g_once_init_enter(&tmp_dir)) { -+ gchar *tmp; -+ -+ tmp = g_strdup(g_getenv("TEMP")); -+ if (tmp == NULL || *tmp == '\0') { -+ g_free(tmp); -+ tmp = g_strdup(g_getenv("TMPDIR")); -+ } -+ -+#ifdef P_tmpdir -+ if (tmp == NULL || *tmp == '\0') { -+ gsize k; -+ g_free(tmp); -+ tmp = g_strdup(P_tmpdir); -+ 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 */ -+ -+ if (tmp == NULL || *tmp == '\0') { -+ g_free(tmp); -+ tmp = g_strdup("/var/tmp"); -+ } -+ -+ g_once_init_leave(&tmp_dir, tmp); -+ } -+ -+ return tmp_dir; -+} -diff --git a/wsutil/wstmpdir.h b/wsutil/wstmpdir.h -new file mode 100644 -index 0000000..07ac583 ---- /dev/null -+++ b/wsutil/wstmpdir.h -@@ -0,0 +1,39 @@ -+/* wstmpdir.c -+ * -+ * Copyright (C) 2013 Red Hat, Inc. All right reserved. -+ * -+ * Temporary directory routine -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Author: Peter Hatina -+ */ -+ -+#ifndef __WS_TMP_DIR_H__ -+#define __WS_TMP_DIR_H__ -+ -+#include "ws_symbol_export.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif // __cplusplus -+ -+WS_DLL_PUBLIC const char *get_tmp_dir(void); -+ -+#ifdef __cplusplus -+} -+#endif // __cplusplus -+ -+#endif --- -2.13.0 diff --git a/wireshark-0007-cmakelists.patch b/wireshark-0007-cmakelists.patch deleted file mode 100644 index 0d75fc35c0ed76cd2226b77d8f5171fdc8809057..0000000000000000000000000000000000000000 --- a/wireshark-0007-cmakelists.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt -index 0367cd1..6382a2c 100644 ---- a/wsutil/CMakeLists.txt -+++ b/wsutil/CMakeLists.txt -@@ -69,6 +69,7 @@ set(WSUTIL_PUBLIC_HEADERS - ws_mempbrk_int.h - ws_pipe.h - ws_roundup.h -+ wstmpdir.h - wsjson.h - wslog.h - xtea.h -@@ -118,6 +118,7 @@ set(WSUTIL_COMMON_FILES - ws_getopt.c - ws_mempbrk.c - ws_pipe.c -+ wstmpdir.c - wsgcrypt.c - wsjson.c - wslog.c diff --git a/wireshark-3.6.3.tar.xz b/wireshark-3.6.8.tar.xz similarity index 77% rename from wireshark-3.6.3.tar.xz rename to wireshark-3.6.8.tar.xz index a6889bd35f25b94d9843a65cde6ca7500725d306..10c73fa73daa2b8fb1ee4e4b9554a6689001c4b6 100644 Binary files a/wireshark-3.6.3.tar.xz and b/wireshark-3.6.8.tar.xz differ diff --git a/wireshark.spec b/wireshark.spec index 8d3937d2d32e31068d8ff08edc07c4dc518053d5..ea31b2eae9f2e8d85b8719df0e5b319e45cdced0 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,91 +1,45 @@ -%undefine __cmake_in_source_build -%global plugins_version 3.6 -%define _lto_cflags %{nil} - -Summary: Network traffic analyzer -Name: wireshark -Version: 3.6.3 -Release: 1 -Epoch: 1 -License: GPL+ -Url: http://www.wireshark.org/ - -Source0: https://wireshark.org/download/src/%{name}-%{version}.tar.xz +Name: wireshark +Version: 3.6.8 +Release: 0 +Epoch: 1 +Summary: Network traffic analyzer +License: GPL+ and GPL-2.0+ and GPL-3.0 and GPL-3.0+ and BSD and ISC +URL: http://www.wireshark.org/ +Source0: https://wireshark.org/download/src/all-versions/%{name}-%{version}.tar.xz Source1: https://www.wireshark.org/download/src/all-versions/SIGNATURES-%{version}.txt -Source2: 90-wireshark-usbmon.rules -Source3: wireshark.sysusers - -Patch2: wireshark-0002-Customize-permission-denied-error.patch -Patch3: wireshark-0003-fix-string-overrun-in-plugins-profinet.patch -Patch4: wireshark-0004-Restore-Fedora-specific-groups.patch -Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch -Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch -Patch7: wireshark-0007-cmakelists.patch - -Requires: xdg-utils -Requires: hicolor-icon-theme -Requires(pre): shadow-utils + + +Requires: %{name}-help = %{epoch}:%{version}-%{release} +Requires(pre): shadow-utils Requires(post): systemd-udev +Requires: %{name}-cli = %{epoch}:%{version}-%{release} xdg-utils hicolor-icon-theme +BuildRequires: bzip2-devel c-ares-devel elfutils-devel gcc-c++ glib2-devel gnutls-devel gtk3-devel krb5-devel libcap-devel +BuildRequires: libgcrypt-devel libnl3-devel libpcap-devel >= 0.9 libselinux-devel libsmi-devel openssl-devel desktop-file-utils +BuildRequires: xdg-utils bison flex pcre-devel perl(Pod::Html) perl(Pod::Man) libssh-devel qt5-linguist qt5-qtbase-devel +BuildRequires: qt5-qtmultimedia-devel qt5-qtsvg-devel zlib-devel git cmake Provides: %{name}-cli = %{epoch}:%{version}-%{release} Obsoletes: %{name}-cli < %{epoch}:%{version}-%{release} wireshark-qt wireshark-gtk - -BuildRequires: bzip2-devel -BuildRequires: c-ares-devel -BuildRequires: elfutils-devel -BuildRequires: gcc-c++ -BuildRequires: glib2-devel -BuildRequires: gnutls-devel -BuildRequires: krb5-devel -BuildRequires: libcap-devel -BuildRequires: libgcrypt-devel -BuildRequires: libnl3-devel -BuildRequires: libpcap-devel >= 0.9 -BuildRequires: libselinux-devel -BuildRequires: libsmi-devel -BuildRequires: openssl-devel -BuildRequires: desktop-file-utils -BuildRequires: xdg-utils -BuildRequires: bison -BuildRequires: flex -BuildRequires: pcre-devel -BuildRequires: perl -BuildRequires: perl(Pod::Html) -BuildRequires: perl(Pod::Man) -BuildRequires: perl(open) -Buildrequires: libssh-devel -BuildRequires: qt5-linguist -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtmultimedia-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: zlib-devel -BuildRequires: asciidoctor -Buildrequires: git-core -Buildrequires: cmake -BuildRequires: systemd-devel -BuildRequires: systemd -BuildRequires: libnghttp2-devel -BuildRequires: pulseaudio - %description -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 -and understands more than a thousand protocols. - -It has many powerful features including a rich display filter language -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 devel -Summary: Development headers and libraries for wireshark -Requires: %{name} = %{epoch}:%{version}-%{release} glibc-devel glib2-devel - -%description devel -The wireshark-devel package contains the header files, developer -documentation, and libraries required for development of wireshark scripts -and plugins. +Wireshark is an open source tool for profiling network traffic and analyzing +packets. Such a tool is often referred to as a network analyzer, network +protocol analyzer or sniffer. + +Wireshark, formerly known as Ethereal, can be used to examine the details of +traffic at a variety of levels ranging from connection-level information to +the bits that make up a single packet. Packet capture can provide a network +administrator with information about individual packets such as transmit time, +source, destination, protocol type and header data. This information can be +useful for evaluating security events and troubleshooting network security +device issues. + +%package devel +Summary: Development headers and libraries for wireshark +Requires: %{name} = %{epoch}:%{version}-%{release} glibc-devel glib2-devel + +%description devel +The wireshark-devel package includes header files and libraries necessary +for the wireshark library. %package help Summary: This package contains help documents @@ -95,94 +49,59 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Files for help with wireshark. %prep -%autosetup -S git +%autosetup -n %{name}-%{version} -S git -p1 %build -%cmake -G "Unix Makefiles" \ - -DDISABLE_WERROR=ON \ - -DBUILD_wireshark=ON \ - -DENABLE_LUA=OFF \ - -DBUILD_mmdbresolve=OFF \ - -DBUILD_randpktdump=OFF \ - -DBUILD_androiddump=ON \ - -DENABLE_SMI=ON \ - -DENABLE_PLUGINS=ON \ - -DENABLE_NETLINK=ON \ - -DBUILD_dcerpcidl2wrs=OFF \ - -DBUILD_sdjournal=ON \ - %{nil} - +%cmake -G "Unix Makefiles" -DDISABLE_WERROR=ON -DBUILD_wireshark=ON -DENABLE_QT5=ON -DENABLE_LUA=OFF \ +-DBUILD_mmdbresolve=OFF -DBUILD_randpktdump=OFF -DBUILD_androiddump=OFF -DENABLE_SMI=ON -DENABLE_PORTAUDIO=OFF \ +-DENABLE_PLUGINS=ON -DENABLE_NETLINK=ON -DBUILD_dcerpcidl2wrs=OFF %make_build %install %make_install - desktop-file-validate %{buildroot}%{_datadir}/applications/org.wireshark.Wireshark.desktop install -d -m 0755 %{buildroot}%{_includedir}/wireshark 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 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 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 +install -d "${IDIR}/epan/crypt" "${IDIR}/epan/ftypes" "${IDIR}/epan/dfilter" "${IDIR}/epan/dissectors" +install -d "${IDIR}/epan/wmem" "${IDIR}/wiretap" "${IDIR}/wsutil" +install -d %{buildroot}%{_udevrulesdir} +install -m 644 config.h epan/register.h cfile.h file.h ws_symbol_export.h ws_diag_control.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 wiretap/*.h "${IDIR}/wiretap" +install -m 644 wsutil/*.h "${IDIR}/wsutil" touch %{buildroot}%{_bindir}/%{name} -find %{buildroot} -type f -name "*.la" -delete +%delete_la %pre getent group wireshark >/dev/null || groupadd -r wireshark -exit 0 -#%post -#%{?ldconfig} -#if [ -S /run/udev/control ]; then -# /usr/bin/udevadm trigger --subsystem-match=usbmon -#fi -# -#%ldconfig_postun +getent group usbmon >/dev/null || groupadd -r usbmon + +%post +/sbin/ldconfig +/usr/bin/udevadm trigger --subsystem-match=usbmon + +%postun +/sbin/ldconfig %files %{_datadir}/applications/org.wireshark.Wireshark.desktop -%{_datadir}/metainfo/*.xml -%{_datadir}/mime/packages/*.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/mimetypes/* -%{_bindir}/* -%{_mandir}/man1/wireshark.* -%{_sysusersdir}/%{name}.conf -%license COPYING +%{_datadir}/mime/packages/org.wireshark.Wireshark.xml +%{_datadir}/metainfo/org.wireshark.Wireshark.metainfo.xml +%doc COPYING %attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap -%{_udevrulesdir}/90-wireshark-usbmon.rules +%{_bindir}/* %{_libdir}/lib*.so.* -%dir %{_libdir}/wireshark -%dir %{_libdir}/wireshark/extcap -%dir %{_libdir}/wireshark/plugins %{_libdir}/wireshark/extcap/* -%dir %{_libdir}/wireshark/cmake %{_libdir}/wireshark/cmake/*.cmake -%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 -%dir %{_datadir}/wireshark +%{_libdir}/wireshark/plugins/3.6/epan/*.so +%{_libdir}/wireshark/plugins/3.6/wiretap/*.so +%{_libdir}/wireshark/plugins/3.6/codecs/*.so %{_datadir}/wireshark/* %files devel @@ -192,37 +111,36 @@ exit 0 %files help %doc AUTHORS INSTALL NEWS README* doc/README.* ChangeLog -%{_mandir}/man?/* %changelog -* Tue Apr 19 2022 wangkai - 3.6.3-1 -- Update to 3.6.3 +* Tue Sep 27 2022 liyuxiang - 0.4.2-1 +- update to 3.6.8 to fix CVE-2022-3190 * Fri Apr 1 2022 yaoxin - 2.6.2-21 - Fix CVE-2021-22191 CVE-2021-22207 CVE-2021-4181 CVE-2021-4185 -* Tue Jul 27 2021 wangyue - 2.6.2-20 +* Tue Jul 28 2021 zhuyuncheng - 2.6.2-20 - fix CVE-2019-12295 -* Tue Jul 27 2021 lingsheng - 2.6.2-19 -- Move headers outside extern C to fix build fail - -* Thu Feb 25 2021 wangxiao - 2.6.2-18 +* Thu Feb 25 2021 wangxiao - 2.6.2-19 - Fix CVE-2019-13619 CVE-2019-19553 CVE-2020-9428 CVE-2020-9431 -* Mon Feb 08 2021 wangyue - 2.6.2-17 +* Mon Feb 08 2021 wangyue - 2.6.2-18 - fix CVE-2020-26575 -* Thu Jan 14 2021 zhanghua - 2.6.2-16 +* Thu Jan 14 2021 zhanghua - 2.6.2-17 - fix CVE-2019-16319 -* Wed Dec 16 2020 zhanghua - 2.6.2-15 +* Wed Dec 16 2020 zhanghua - 2.6.2-16 - fix CVE-2020-9430 -* Mon Nov 07 2020 wangxiao - 2.6.2-14 +* Mon Nov 07 2020 wangxiao - 2.6.2-15 - fix CVE-2020-28030 malformed packet on wire could make GQUIC protocol dissector loop +* Mon Nov 9 2020 baizhonggui - 2.6.2-14 +- Add install requires help package into main package + * Mon Nov 02 2020 lingsheng - 2.6.2-13 - Fix use-of-uninitialized-value in end_string @@ -255,7 +173,7 @@ exit 0 * Fri May 15 2020 huanghaitao - 2.6.2-7 - Type:cves -- ID: CVE-2020-11647 +- ID: CVE-2020-11647 - SUG:restart - DESC: fix CVE-2020-11647 diff --git a/wireshark.sysusers b/wireshark.sysusers deleted file mode 100644 index b035d11a82ec3b9412a7aa6bf231806ded3a3ca3..0000000000000000000000000000000000000000 --- a/wireshark.sysusers +++ /dev/null @@ -1,2 +0,0 @@ -g wireshark - - -g usbmon - - diff --git a/wireshark.yaml b/wireshark.yaml deleted file mode 100644 index d2e6584b20b529c1cce9933c3fd2c7d0eb8449d3..0000000000000000000000000000000000000000 --- a/wireshark.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: git -src_repo: https://code.wireshark.org/review/gitweb?p=wireshark.git -tag_prefix: "^v" -seperator: "."