Compare commits
13 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
53ec90186c | ||
|
|
061953fb01 | ||
|
|
12313acb80 | ||
|
|
440fe918b1 | ||
|
|
9433816a1f | ||
|
|
4a42349804 | ||
|
7104735911 | ||
|
|
1c4e2ba178 | ||
|
|
9710c259e1 | ||
|
|
1c260d37cb | ||
|
|
f84e44524d | ||
|
|
7d03e8e2f5 |
||
|
|
2565470d05 |
10 changed files with 162 additions and 48 deletions
1
ci.fmf
Normal file
1
ci.fmf
Normal file
|
|
@ -0,0 +1 @@
|
|||
resultsdb-testcase: separate
|
||||
21
gating.yaml
21
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}
|
||||
|
||||
#gating rawhide
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
||||
|
||||
#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 (wireshark-4.4.3.tar.xz) = d100b562fbd452f52945502ecd918b26a15084b9c942754af43ffb221d49229f5a93eafd18b9bacc0cfcd60a38935d51a6ac809a2060d65faf1157ec9dae16e7
|
||||
SHA512 (SIGNATURES-4.4.3.txt) = 5dfbc85bb41b009022cd67148c44051971e2c3f0bf865c4755a41596b25f9018bae125cda3477c5e7d19f9a0c1c60de424ddbad60abd4b19da697349849c8b9b
|
||||
SHA512 (wireshark-4.6.4.tar.xz) = 5ff1b0fd012bbac0ad79ee58e065e7eabb60fce888959fb6701b79b1d03305724f2adb2623549406f1fc3036f54d4bf14d49c3e4237e68e649a20e430a868acd
|
||||
SHA512 (SIGNATURES-4.6.4.txt) = 915527a527c5d9666ade6e53b174ec943cb8cb22f0abacd590533936206e8156d7fdf79516832507513a627d1cdd5a1ffc6f8e1c015438c70a0b3e727a3cb854
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@ to use different directory on different filesystem.
|
|||
create mode 100644 wsutil/wstmpdir.h
|
||||
|
||||
diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
|
||||
index 07b9b42e01..fb09de989b 100644
|
||||
index cdbd865..a2d24c5 100644
|
||||
--- a/ui/qt/iax2_analysis_dialog.cpp
|
||||
+++ b/ui/qt/iax2_analysis_dialog.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "ui/rtp_stream.h"
|
||||
#endif
|
||||
#include <wsutil/utf8_entities.h>
|
||||
|
|
@ -30,19 +30,18 @@ index 07b9b42e01..fb09de989b 100644
|
|||
|
||||
#include <wsutil/g711.h>
|
||||
#include <wsutil/pint.h>
|
||||
@@ -255,10 +256,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 591a63bbf3..203f5c5286 100644
|
||||
--- a/ui/qt/utils/rtp_audio_file.cpp
|
||||
|
|
@ -59,8 +58,8 @@ index 591a63bbf3..203f5c5286 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);
|
||||
|
|
@ -256,13 +255,13 @@ 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/filesystem.h>
|
||||
+#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
|
||||
|
||||
#include <QDesktopServices>
|
||||
#include <QUrl>
|
||||
#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"));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 17fa031..6876018 100644
|
||||
index e6095ac..71a04e8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -4175,8 +4175,6 @@ endif()
|
||||
|
||||
@@ -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 ${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
||||
DESTINATION ${TMP_DST_PATH}
|
||||
- COMPONENT "Development"
|
||||
- EXCLUDE_FROM_ALL
|
||||
)
|
||||
|
||||
install(
|
||||
cmake_path(SET TMP_DST_PATH NORMALIZE "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")
|
||||
|
|
|
|||
39
wireshark-0009-remove-strato-manpages.patch
Normal file
39
wireshark-0009-remove-strato-manpages.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
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)
|
||||
@@ -55,10 +53,8 @@ ADD_MAN_PAGE(randpktdump 1)
|
||||
ADD_MAN_PAGE(etwdump 1)
|
||||
ADD_MAN_PAGE(rawshark 1)
|
||||
ADD_MAN_PAGE(reordercap 1)
|
||||
-ADD_MAN_PAGE(sshdig 1)
|
||||
ADD_MAN_PAGE(sshdump 1)
|
||||
ADD_MAN_PAGE(text2pcap 1)
|
||||
-ADD_MAN_PAGE(falcodump 1)
|
||||
ADD_MAN_PAGE(udpdump 1)
|
||||
ADD_MAN_PAGE(wifidump 1)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 71a04e8..a797ad1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -2272,10 +2272,7 @@ 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/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
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
%undefine __cmake_in_source_build
|
||||
%global with_lua 1
|
||||
%global with_maxminddb 1
|
||||
%global plugins_version 4.4
|
||||
%global plugins_version 4.6
|
||||
|
||||
Summary: Network traffic analyzer
|
||||
Name: wireshark
|
||||
Version: 4.4.3
|
||||
Version: 4.6.4
|
||||
Release: 1%{?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)
|
||||
|
|
@ -18,8 +18,6 @@ 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
|
||||
# Fedora-specific
|
||||
Patch4: wireshark-0004-Restore-Fedora-specific-groups.patch
|
||||
# Fedora-specific
|
||||
|
|
@ -28,6 +26,7 @@ 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
|
||||
Patch8: wireshark-0008-pkgconfig.patch
|
||||
Patch9: wireshark-0009-remove-strato-manpages.patch
|
||||
|
||||
#install tshark together with wireshark GUI
|
||||
Requires: %{name}-cli = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -187,7 +186,7 @@ find %{buildroot} -type f -name "*.la" -delete
|
|||
# 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
|
||||
|
|
@ -206,6 +205,7 @@ fi
|
|||
%doc AUTHORS INSTALL README*
|
||||
%{_bindir}/capinfos
|
||||
%{_bindir}/captype
|
||||
%{_bindir}/dftest
|
||||
%{_bindir}/editcap
|
||||
%{_bindir}/mergecap
|
||||
%{_bindir}/randpkt
|
||||
|
|
@ -220,16 +220,16 @@ 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/wifidump
|
||||
%{_libdir}/wireshark/extcap/sshdump
|
||||
%{_libdir}/wireshark/extcap/sdjournal
|
||||
%{_libdir}/wireshark/extcap/dpauxmon
|
||||
%{_libdir}/wireshark/extcap/androiddump
|
||||
%{_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
|
||||
|
|
@ -258,7 +258,6 @@ fi
|
|||
%{_mandir}/man1/dpauxmon.*
|
||||
%{_mandir}/man1/sdjournal.*
|
||||
%{_mandir}/man1/etwdump.*
|
||||
%{_mandir}/man1/falcodump.*
|
||||
%{_mandir}/man4/extcap.*
|
||||
%{_datadir}/doc/wireshark/*
|
||||
|
||||
|
|
@ -278,6 +277,39 @@ fi
|
|||
%{_libdir}/cmake/%{name}/*.cmake
|
||||
|
||||
%changelog
|
||||
* Wed Mar 04 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.4-1
|
||||
- New version 4.6.4
|
||||
|
||||
* Thu Jan 15 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.3-1
|
||||
- New version 4.6.3
|
||||
|
||||
* Fri Nov 28 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.6.1-1
|
||||
- New version 4.6.1
|
||||
|
||||
* Mon Oct 13 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 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
|
||||
|
||||
* Wed Jan 22 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.3-1
|
||||
- New version 4.4.3
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue