Compare commits
71 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
60736f4e6c | ||
|
|
41f57995c5 | ||
|
|
5320fdb534 | ||
|
|
b322ec58ee | ||
|
|
f04cc3f978 | ||
|
|
aa822250ea | ||
|
|
426e574331 | ||
|
|
2d96acd7fe | ||
|
|
b7d10b60f6 | ||
|
|
fc0b356a80 | ||
|
|
d00b96d9eb | ||
|
|
6621283664 | ||
|
|
e2e91a0b8f | ||
|
|
92f80f6263 | ||
|
|
433b55e0df | ||
|
|
b75536364f | ||
|
|
e851189359 | ||
|
|
f7e5e9a71b | ||
|
|
7ef093270b | ||
|
|
d4f2911cf3 | ||
|
|
fc18e07d6d | ||
|
|
6c84c54e0a | ||
|
|
bf470dc099 | ||
| fa96ad923a | |||
|
|
df5d338c91 | ||
|
|
3b5e1ca1f0 | ||
|
|
3e218c38e7 | ||
|
|
f694014695 | ||
|
|
208badf420 | ||
|
|
9f9fd3d2ed | ||
|
|
12321ec858 | ||
|
|
3b551e750f | ||
| ae2d2f6a44 | |||
|
|
b544a872c7 | ||
|
|
f725712d47 | ||
|
|
8cd86f692d | ||
|
|
e3df12a5f1 | ||
|
|
6420a261ec | ||
|
|
458399d009 | ||
|
|
1597f98830 | ||
|
|
5943ebdae6 | ||
|
|
85d9580754 | ||
|
|
4cdb9e8c1c | ||
|
|
c48825402c | ||
|
|
7ced997b9e | ||
|
|
09b6821e74 | ||
|
|
936697e45c | ||
|
|
bd2c02866c | ||
|
|
cb4bfa04b6 | ||
|
|
cd554497c9 | ||
|
|
99027dbe74 | ||
|
|
2a86f75a7e | ||
|
|
9c0159e57b | ||
|
|
3c541c0ee1 | ||
|
|
d8a7e7ffb2 | ||
|
|
bb46d55047 | ||
|
|
079bb7a40c | ||
|
|
76e69798e9 | ||
|
|
753eeb74ca | ||
|
|
71af06e491 | ||
|
|
1ff990e051 | ||
|
|
389e6ca1e3 | ||
|
|
0d054c10eb | ||
|
|
81fb795b64 | ||
|
|
2cfc0a31f8 | ||
|
|
6e2ecf1b89 | ||
|
|
e48d9ba9f8 | ||
| bccd1878ed | |||
|
|
73e7a27f97 | ||
|
|
46e60d8220 | ||
|
|
16f9e9e5ac |
15 changed files with 503 additions and 242 deletions
1
ci.fmf
Normal file
1
ci.fmf
Normal file
|
|
@ -0,0 +1 @@
|
|||
resultsdb-testcase: separate
|
||||
19
gating.yaml
19
gating.yaml
|
|
@ -1,16 +1,25 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts: [bodhi_update_push_testing]
|
||||
decision_context: bodhi_update_push_testing
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
||||
|
||||
#gating rawhide
|
||||
#Rawhide
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts: [bodhi_update_push_stable]
|
||||
decision_context: bodhi_update_push_stable
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
- !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}
|
||||
35
plans.fmf
Normal file
35
plans.fmf
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
/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
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
summary: Test plan with all Fedora tests
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://src.fedoraproject.org/tests/wireshark.git
|
||||
execute:
|
||||
how: tmt
|
||||
|
|
@ -4,5 +4,10 @@ ownership:
|
|||
ignore:
|
||||
- /usr/bin/dumpcap
|
||||
|
||||
capabilities:
|
||||
#dumpcap is the only binary that has group wireshark
|
||||
ignore:
|
||||
- /usr/bin/dumpcap
|
||||
|
||||
inspections:
|
||||
xml: off
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (SIGNATURES-3.6.13.txt) = b4ba19853a52fa60dc46a9053236d4ceee21e16b2a765c80adc4c0fcfcb0f4a5be942ed7dacf317ba0b1593780ef74d6b5ffb03c8040cc12e5875683a1fc9a42
|
||||
SHA512 (wireshark-3.6.13.tar.xz) = ab6ab6deff410539fe6b5fc9c35a570951719fd040381993e710c3e0447dddda8ec6d8e94a5f46ce9350ac3aa9e300409c2fb3f83c735a2e0cfa1dd8ffa44edb
|
||||
SHA512 (wireshark-4.6.7.tar.xz) = a776d17815dcf74a7bf9b6e0e516ea20e37a2092515afa68fbae30e22b24793ffa4cd8f9bffa781d0b64683e8c2be84b7d0ec1bcb3ff25d62daf1afe652cbb3f
|
||||
SHA512 (SIGNATURES-4.6.7.txt) = 21f8f9e54855a90057e73835fb5d8dfd2e5f5beff1490d5d70435c6f6e3986bcf6a6aa53d126ff0cd6d4f0b7f2afcce564d5f70ef5e6f92d2e16af101f3b2a15
|
||||
|
|
|
|||
|
|
@ -1,57 +1,22 @@
|
|||
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/capture/capture_sync.c b/capture/capture_sync.c
|
||||
index 2f9d2cc..b18e47f 100644
|
||||
index af08b32..2e0fcb7 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);
|
||||
@@ -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));
|
||||
+ }
|
||||
+
|
||||
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
|
||||
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) */
|
||||
|
|
|
|||
|
|
@ -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 0f1658a..f7fd322 100644
|
||||
index 52c5017e1f..fb980269db 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)
|
||||
@@ -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)
|
||||
{
|
||||
guint32 u32Pointer;
|
||||
- gchar szStr[1000];
|
||||
+ gchar szStr[1000] = "";
|
||||
guint32 u32MaxStr = sizeof(szStr);
|
||||
gchar *call;
|
||||
uint32_t u32Pointer;
|
||||
- char szStr[1000];
|
||||
+ char szStr[1000] = "";
|
||||
uint32_t u32MaxStr = sizeof(szStr);
|
||||
char *call;
|
||||
|
||||
|
|
|
|||
|
|
@ -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/org.wireshark.Wireshark.desktop b/org.wireshark.Wireshark.desktop
|
||||
index 334db48..669c6f1 100644
|
||||
--- a/org.wireshark.Wireshark.desktop
|
||||
+++ b/org.wireshark.Wireshark.desktop
|
||||
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
|
||||
@@ -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:
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ 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
|
||||
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
|
||||
@@ -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]=Аналізатор мережевого трафіку
|
||||
|
|
|
|||
|
|
@ -5,45 +5,24 @@ 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(-)
|
||||
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(-)
|
||||
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 <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 ee4e5fd..fe17a95 100644
|
||||
index cdbd865..a2d24c5 100644
|
||||
--- a/ui/qt/iax2_analysis_dialog.cpp
|
||||
+++ b/ui/qt/iax2_analysis_dialog.cpp
|
||||
@@ -37,6 +37,7 @@
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "ui/rtp_stream.h"
|
||||
#endif
|
||||
#include <wsutil/utf8_entities.h>
|
||||
|
|
@ -51,21 +30,20 @@ index ee4e5fd..fe17a95 100644
|
|||
|
||||
#include <wsutil/g711.h>
|
||||
#include <wsutil/pint.h>
|
||||
@@ -271,10 +272,10 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) :
|
||||
@@ -252,9 +253,9 @@ 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());
|
||||
- QString tempname = QStringLiteral("%1/wireshark_iax2_f").arg(QDir::tempPath());
|
||||
+ QString tempname = QStringLiteral("%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());
|
||||
- tempname = QStringLiteral("%1/wireshark_iax2_r").arg(QDir::tempPath());
|
||||
+ tempname = QStringLiteral("%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 591a63b..203f5c5 100644
|
||||
index 591a63bbf3..203f5c5286 100644
|
||||
--- a/ui/qt/utils/rtp_audio_file.cpp
|
||||
+++ b/ui/qt/utils/rtp_audio_file.cpp
|
||||
@@ -31,6 +31,7 @@
|
||||
|
|
@ -80,72 +58,76 @@ index 591a63b..203f5c5 100644
|
|||
|
||||
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());
|
||||
- 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);
|
||||
diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c
|
||||
index 5082452..f751a7c 100644
|
||||
index 531ed91..bd6fd60 100644
|
||||
--- a/wsutil/tempfile.c
|
||||
+++ b/wsutil/tempfile.c
|
||||
@@ -12,10 +12,12 @@
|
||||
|
||||
#include <glib.h>
|
||||
@@ -10,6 +10,8 @@
|
||||
|
||||
#include "config.h"
|
||||
#include "tempfile.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.
|
||||
* Must be freed.
|
||||
@@ -30,6 +31,9 @@ create_tempfile(gchar **namebuf, const char *pfx, const char *sfx, GError **err)
|
||||
@@ -55,13 +57,25 @@ create_tempfile(const char *tempdir, char **namebuf, const char *pfx, const char
|
||||
{
|
||||
int fd;
|
||||
gchar *safe_pfx = NULL;
|
||||
char *safe_pfx = sanitize_prefix(pfx);
|
||||
+ 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 (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);
|
||||
|
||||
- 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;
|
||||
+ 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;
|
||||
+ old_mask = ws_umask(0077);
|
||||
+ fd = mkstemps(tmp_file, sfx ? (int) strlen(sfx) : 0);
|
||||
+ ws_umask(old_mask);
|
||||
+
|
||||
g_free(filetmpl);
|
||||
}
|
||||
else {
|
||||
diff --git a/wsutil/tempfile.h b/wsutil/tempfile.h
|
||||
index 1dca2df..bb3160c 100644
|
||||
index 70031b5419..72011e265a 100644
|
||||
--- a/wsutil/tempfile.h
|
||||
+++ b/wsutil/tempfile.h
|
||||
@@ -45,7 +45,7 @@ WS_DLL_PUBLIC char *get_tempfile_path(const char *filename);
|
||||
@@ -23,7 +23,7 @@ extern "C" {
|
||||
|
||||
/**
|
||||
* 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 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 be freed.
|
||||
diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c
|
||||
new file mode 100644
|
||||
index 0000000..d8b733b
|
||||
index 0000000000..9128d354ce
|
||||
--- /dev/null
|
||||
+++ b/wsutil/wstmpdir.c
|
||||
@@ -0,0 +1,71 @@
|
||||
|
|
@ -222,7 +204,7 @@ index 0000000..d8b733b
|
|||
+}
|
||||
diff --git a/wsutil/wstmpdir.h b/wsutil/wstmpdir.h
|
||||
new file mode 100644
|
||||
index 0000000..07ac583
|
||||
index 0000000000..07ac5837ac
|
||||
--- /dev/null
|
||||
+++ b/wsutil/wstmpdir.h
|
||||
@@ -0,0 +1,39 @@
|
||||
|
|
@ -266,4 +248,26 @@ index 0000000..07ac583
|
|||
+
|
||||
+#endif
|
||||
--
|
||||
2.13.0
|
||||
2.37.3
|
||||
|
||||
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 */
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
|
||||
index 0367cd1..6382a2c 100644
|
||||
index a55086c..0149801 100644
|
||||
--- a/wsutil/CMakeLists.txt
|
||||
+++ b/wsutil/CMakeLists.txt
|
||||
@@ -69,6 +69,7 @@ set(WSUTIL_PUBLIC_HEADERS
|
||||
ws_mempbrk_int.h
|
||||
ws_pipe.h
|
||||
@@ -80,6 +80,7 @@ set(WSUTIL_PUBLIC_HEADERS
|
||||
ws_roundup.h
|
||||
ws_strptime.h
|
||||
wsgcrypt.h
|
||||
+ wstmpdir.h
|
||||
wsjson.h
|
||||
wslog.h
|
||||
xtea.h
|
||||
@@ -118,6 +118,7 @@ set(WSUTIL_COMMON_FILES
|
||||
ws_getopt.c
|
||||
ws_mempbrk.c
|
||||
@@ -135,6 +136,7 @@ set(WSUTIL_COMMON_FILES
|
||||
ws_pipe.c
|
||||
+ wstmpdir.c
|
||||
ws_strptime.c
|
||||
wsgcrypt.c
|
||||
+ wstmpdir.c
|
||||
wsjson.c
|
||||
wslog.c
|
||||
xtea.c
|
||||
|
|
|
|||
13
wireshark-0008-pkgconfig.patch
Normal file
13
wireshark-0008-pkgconfig.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
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}")
|
||||
44
wireshark-0009-remove-strato-manpages.patch
Normal file
44
wireshark-0009-remove-strato-manpages.patch
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
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
|
||||
351
wireshark.spec
351
wireshark.spec
|
|
@ -1,16 +1,17 @@
|
|||
%undefine __cmake_in_source_build
|
||||
%global with_lua 1
|
||||
%global with_maxminddb 1
|
||||
%global plugins_version 3.6
|
||||
# added temporarily due to errors in libqt5core
|
||||
%define _lto_cflags %{nil}
|
||||
%global with_pytools 1
|
||||
%global plugins_version 4.6
|
||||
|
||||
%bcond http3 %[0%{?fedora} >= 43]
|
||||
|
||||
Summary: Network traffic analyzer
|
||||
Name: wireshark
|
||||
Version: 3.6.13
|
||||
Release: 1%{?dist}
|
||||
Version: 4.6.7
|
||||
Release: 2%{?dist}
|
||||
Epoch: 1
|
||||
License: GPL+
|
||||
License: BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND MIT AND GPL-2.0-or-later AND LGPL-2.0-or-later AND Zlib AND ISC AND (BSD-3-Clause OR GPL-2.0-only) AND (GPL-2.0-or-later AND Zlib)
|
||||
Url: http://www.wireshark.org/
|
||||
|
||||
Source0: https://wireshark.org/download/src/%{name}-%{version}.tar.xz
|
||||
|
|
@ -19,16 +20,16 @@ Source2: 90-wireshark-usbmon.rules
|
|||
Source3: wireshark.sysusers
|
||||
|
||||
# Fedora-specific
|
||||
Patch2: wireshark-0002-Customize-permission-denied-error.patch
|
||||
# Will be proposed upstream
|
||||
Patch3: wireshark-0003-fix-string-overrun-in-plugins-profinet.patch
|
||||
Patch2: wireshark-0002-Customize-permission-denied-error.patch
|
||||
# Fedora-specific
|
||||
Patch4: wireshark-0004-Restore-Fedora-specific-groups.patch
|
||||
Patch4: wireshark-0004-Restore-Fedora-specific-groups.patch
|
||||
# Fedora-specific
|
||||
Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
|
||||
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
|
||||
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}
|
||||
|
|
@ -58,34 +59,52 @@ 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: qt5-linguist
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: qt5-qtmultimedia-devel
|
||||
BuildRequires: qt5-qtsvg-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: zlib-devel
|
||||
BuildRequires: asciidoctor
|
||||
%if %{with_maxminddb} && 0%{?fedora}
|
||||
BuildRequires: libmaxminddb-devel
|
||||
%endif
|
||||
%if %{with_lua} && 0%{?fedora}
|
||||
BuildRequires: compat-lua-devel
|
||||
BuildRequires: lua-devel
|
||||
%endif
|
||||
Buildrequires: git-core
|
||||
%if 0%{?fedora}
|
||||
Buildrequires: python3-devel
|
||||
%endif
|
||||
Buildrequires: cmake
|
||||
Buildrequires: git-core
|
||||
Buildrequires: python3-devel
|
||||
Buildrequires: cmake
|
||||
Buildrequires: speexdsp-devel
|
||||
#needed for sdjournal external capture interface
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: libnghttp2-devel
|
||||
BuildRequires: systemd-rpm-macros
|
||||
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
|
||||
|
||||
Obsoletes: wireshark-qt, wireshark-gtk
|
||||
|
||||
%description
|
||||
Wireshark allows you to examine protocol data stored in files or as it is
|
||||
|
|
@ -100,8 +119,6 @@ transferred over HTTP or CIFS, or play back an RTP audio stream.
|
|||
|
||||
%package cli
|
||||
Summary: Network traffic analyzer
|
||||
Requires(pre): shadow-utils
|
||||
Requires(post): systemd-udev
|
||||
|
||||
%description cli
|
||||
This package contains command-line utilities, plugins, and documentation for
|
||||
|
|
@ -109,7 +126,14 @@ Wireshark.
|
|||
|
||||
%package devel
|
||||
Summary: Development headers and libraries for wireshark
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release} glibc-devel glib2-devel
|
||||
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
|
||||
|
||||
%description devel
|
||||
The wireshark-devel package contains the header files, developer
|
||||
|
|
@ -137,59 +161,53 @@ and plugins.
|
|||
-DBUILD_randpktdump=OFF \
|
||||
-DBUILD_androiddump=ON \
|
||||
-DENABLE_SMI=ON \
|
||||
-DUSE_qt6=ON \
|
||||
-DENABLE_PLUGINS=ON \
|
||||
-DENABLE_NETLINK=ON \
|
||||
-DBUILD_dcerpcidl2wrs=OFF \
|
||||
-DBUILD_sdjournal=ON \
|
||||
%{nil}
|
||||
-DBUILD_stratoshark=OFF
|
||||
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
%cmake_install --component Development
|
||||
|
||||
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
|
||||
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 644 %{_vpath_builddir}/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 -m 0644 %{SOURCE2} %{buildroot}%{_udevrulesdir}
|
||||
install -Dpm 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf
|
||||
|
||||
%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
|
||||
|
||||
touch %{buildroot}%{_bindir}/%{name}
|
||||
|
||||
# Remove libtool archives and static libs
|
||||
find %{buildroot} -type f -name "*.la" -delete
|
||||
|
||||
%pre cli
|
||||
%sysusers_create_compat %{SOURCE3}
|
||||
|
||||
%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
|
||||
/usr/bin/udevadm trigger --subsystem-match=usbmon || :
|
||||
fi
|
||||
|
||||
%ldconfig_postun cli
|
||||
|
|
@ -202,14 +220,14 @@ fi
|
|||
%{_datadir}/icons/hicolor/*/mimetypes/*
|
||||
%{_bindir}/wireshark
|
||||
%{_mandir}/man1/wireshark.*
|
||||
%{_sysusersdir}/%{name}.conf
|
||||
|
||||
%files cli
|
||||
%license COPYING
|
||||
%doc AUTHORS INSTALL NEWS README*
|
||||
%doc AUTHORS INSTALL README*
|
||||
%{_bindir}/capinfos
|
||||
%{_bindir}/captype
|
||||
%{_bindir}/editcap
|
||||
%{_bindir}/dftest
|
||||
%{_bindir}/mergecap
|
||||
%{_bindir}/randpkt
|
||||
%{_bindir}/reordercap
|
||||
|
|
@ -223,17 +241,17 @@ fi
|
|||
%{_bindir}/rawshark
|
||||
%{_udevrulesdir}/90-wireshark-usbmon.rules
|
||||
%{_libdir}/lib*.so.*
|
||||
%dir %{_libdir}/wireshark
|
||||
%dir %{_libdir}/wireshark/extcap
|
||||
%dir %{_libexecdir}/wireshark
|
||||
%dir %{_libexecdir}/wireshark/extcap
|
||||
%dir %{_libdir}/wireshark/plugins
|
||||
%{_libdir}/wireshark/extcap/ciscodump
|
||||
%{_libdir}/wireshark/extcap/udpdump
|
||||
%{_libdir}/wireshark/extcap/sshdump
|
||||
%{_libdir}/wireshark/extcap/sdjournal
|
||||
%{_libdir}/wireshark/extcap/dpauxmon
|
||||
%{_libdir}/wireshark/extcap/androiddump
|
||||
%dir %{_libdir}/wireshark/cmake
|
||||
%{_libdir}/wireshark/cmake/*.cmake
|
||||
%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
|
||||
#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
|
||||
|
|
@ -250,51 +268,224 @@ fi
|
|||
%{_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/etwdump.1.gz
|
||||
%{_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
|
||||
|
||||
%files devel
|
||||
%doc doc/README.* ChangeLog
|
||||
%{_includedir}/wireshark
|
||||
%dir %{_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
|
||||
* Thu Apr 13 2023 Michal Ruprich <mruprich@redhat.com> - 1:3.6.13-1
|
||||
- New version 3.6.13
|
||||
* 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 Mar 07 2023 Michal Ruprich <mruprich@redhat.com> - 1:3.6.12-1
|
||||
- New version 3.6.12
|
||||
* Tue Jul 14 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.7-1
|
||||
- New version 4.6.7
|
||||
|
||||
* Thu Feb 02 2023 Michal Ruprich <mruprich@redhat.com> - 1:3.6.11-1
|
||||
- New version 3.6.11
|
||||
* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1:4.6.6-2
|
||||
- Rebuilt for openssl 4.0
|
||||
|
||||
* Thu Dec 08 2022 Michal Ruprich <mruprich@redhat.com> - 1:3.6.10-1
|
||||
- New version 3.6.10
|
||||
* Mon Jun 01 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.6-1
|
||||
- New version 4.6.6
|
||||
|
||||
* Thu Sep 29 2022 Michal Ruprich <mruprich@redhat.com> - 1:3.6.8-1
|
||||
* 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue