New version 4.4.10

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate 

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}

plans.fmf

@@ -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 

plans/all.fmf

@@ -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

sources

@@ -1,2 +1,2 @@
-SHA512 (wireshark-4.2.6.tar.xz) = 265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516
-SHA512 (SIGNATURES-4.2.6.txt) = 287342d1ccb36326a9bab5e50c48442a41b599e258611e9046eedb078a84f2840d16f29f91b1259b3b4d37486e48d85596192ea5c6b9d1fa7ad3e78543193e0b
+SHA512 (wireshark-4.4.10.tar.xz) = fdeda2bf9aa5a95f320fd6b1762e64bc2f6e6e04f565effa5a5d96d53f55369f5584025430afc201da48a4c1c3b788d39c2eb7b2bfece75230dae83aec27ad50
+SHA512 (SIGNATURES-4.4.10.txt) = 43da15505433d717e9926a4c3e42675b19b6911c1c7c3d83a1611d274ad0a924f10db1474c6be16bf557df3528b00380a6db8d57221d50fb14353cd3dda04a75

wireshark-0003-fix-string-overrun-in-plugins-profinet.patch

@@ -8,11 +8,11 @@ index 52c5017e1f..fb980269db 100644
 --- a/plugins/epan/profinet/packet-dcom-cba.c
 +++ b/plugins/epan/profinet/packet-dcom-cba.c
 @@ -543,7 +543,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst(tvbuff_t *tvb, int offset,
-     packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep)
+     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;
  

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

@@ -18,27 +18,6 @@ to use different directory on different filesystem.
  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 752b669ac4..42c2be0fca 100644
---- a/ui/qt/about_dialog.cpp
-+++ b/ui/qt/about_dialog.cpp
-@@ -14,6 +14,7 @@
- 
- #include "main_application.h"
- #include <wsutil/filesystem.h>
-+#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
- 
- #include <QDesktopServices>
- #include <QUrl>
-@@ -185,7 +186,7 @@ FolderListModel::FolderListModel(QObject * parent):
-     appendRow(QStringList() << tr("\"File\" dialogs") << 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()) << tr("untitled capture files"));
-+    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 */
-     appendRow(QStringList() << tr("Personal configuration")
 diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
 index 07b9b42e01..fb09de989b 100644
 --- a/ui/qt/iax2_analysis_dialog.cpp
@@ -272,3 +251,24 @@ index 0000000000..07ac5837ac
 -- 
 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 "main_application.h"
+ #include <wsutil/filesystem.h>
++#include <wsutil/wstmpdir.h> /* for get_tmp_dir() */
+ 
+ #include <QDesktopServices>
+ #include <QUrl>
+@@ -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 */

wireshark-0008-pkgconfig.patch

@@ -1,13 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 27fa752..7bdc036 100644
+index 17fa031..6876018 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -4037,9 +4037,6 @@ install(
- 		"${CMAKE_BINARY_DIR}/wireshark.pc"
- 	DESTINATION
- 		${CMAKE_INSTALL_LIBDIR}/pkgconfig
--	COMPONENT
--		"Development"
+@@ -4175,8 +4175,6 @@ endif()
+ 
+ install(FILES "${CMAKE_BINARY_DIR}/resources/wireshark.pc"
+ 	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+-	COMPONENT "Development"
 -	EXCLUDE_FROM_ALL
  )
  

wireshark.spec

@@ -1,12 +1,12 @@
 %undefine __cmake_in_source_build
 %global with_lua 1
 %global with_maxminddb 1
-%global plugins_version 4.2
+%global plugins_version 4.4
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	4.2.6
-Release:	2%{?dist}
+Version:	4.4.10
+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)
 Url:		http://www.wireshark.org/
@@ -75,7 +75,7 @@ BuildRequires:	asciidoctor
 BuildRequires:	libmaxminddb-devel
 %endif
 %if %{with_lua} && 0%{?fedora}
-BuildRequires:	compat-lua-devel
+BuildRequires:	lua-devel
 %endif
 Buildrequires:	git-core
 Buildrequires:	python3-devel
@@ -164,33 +164,14 @@ and plugins.
 
 %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
 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}/wiretap"
-mkdir -p "${IDIR}/wsutil"
-mkdir -p "${IDIR}/wsutil/wmem"
 mkdir -p %{buildroot}%{_udevrulesdir}
-install -m 644 %{_vpath_builddir}/config.h epan/register.h	"${IDIR}/"
-install -m 644 %{_vpath_builddir}/ws_version.h    "${IDIR}/"
-install -m 644 cfile.h file.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 wsutil/wmem/*.h		"${IDIR}/wsutil/wmem"
-install -m 644 include/*.h              "${IDIR}/"
 install -m 644 %{SOURCE2}		%{buildroot}%{_udevrulesdir}
 install -Dpm 644 %{SOURCE3}		%{buildroot}%{_sysusersdir}/%{name}.conf
 
@@ -207,7 +188,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
@@ -223,7 +204,7 @@ fi
 
 %files cli
 %license COPYING
-%doc AUTHORS INSTALL NEWS README*
+%doc AUTHORS INSTALL README*
 %{_bindir}/capinfos
 %{_bindir}/captype
 %{_bindir}/editcap
@@ -291,11 +272,52 @@ fi
 
 %files devel
 %doc doc/README.* ChangeLog
-%{_includedir}/wireshark
+%dir %{_includedir}/wireshark
+%{_includedir}/wireshark/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/cmake/%{name}/*.cmake
 
 %changelog
+* Mon Oct 13 2025 Michal Ruprich <mruprich@redhat.com> - 1:4.4.10-1
+- New version 4.4.10
+
+* 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.2-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
+
+* 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