From fa96ad923ac3340769918d30399b33b916bcb266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 18:03:12 +0100 Subject: [PATCH 01/31] Drop call to %sysusers_create_compat After https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers, rpm will handle account creation automatically. --- wireshark.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index dc7f8e6..8c7f91b 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.4.3 -Release: 1%{?dist} +Release: 2%{?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/ @@ -114,7 +114,6 @@ transferred over HTTP or CIFS, or play back an RTP audio stream. %package cli Summary: Network traffic analyzer -Requires(pre): shadow-utils %description cli This package contains command-line utilities, plugins, and documentation for @@ -179,8 +178,6 @@ 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} @@ -278,6 +275,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1:4.4.3-2 +- Drop call to %sysusers_create_compat + * Wed Jan 22 2025 Michal Ruprich - 1:4.4.3-1 - New version 4.4.3 From bf470dc0992512ac3756d5496e8c972e920fa119 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 20 Feb 2025 08:44:22 +0100 Subject: [PATCH 02/31] New version 4.4.4 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index a6b1cec..4c2a28f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.4.3.tar.xz) = d100b562fbd452f52945502ecd918b26a15084b9c942754af43ffb221d49229f5a93eafd18b9bacc0cfcd60a38935d51a6ac809a2060d65faf1157ec9dae16e7 -SHA512 (SIGNATURES-4.4.3.txt) = 5dfbc85bb41b009022cd67148c44051971e2c3f0bf865c4755a41596b25f9018bae125cda3477c5e7d19f9a0c1c60de424ddbad60abd4b19da697349849c8b9b +SHA512 (wireshark-4.4.4.tar.xz) = f2787d49de55cea4b6f09217e5520c7517f2a906ee7b91447ca0e6e1ab50c58d71963577a5eb899fd1e9b87103f34c9f7ea081ac6d6586e3a4974d74946a0199 +SHA512 (SIGNATURES-4.4.4.txt) = f543b5fc95bbead2bad9981e75083c364014e1cceb81c9b96057fdd30d9d4547fccb9db23879180b9e15e769d99e89d26e78937662a7e66acdba27d4f42eefaa diff --git a/wireshark.spec b/wireshark.spec index 8c7f91b..7c704ea 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.4.3 -Release: 2%{?dist} +Version: 4.4.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) Url: http://www.wireshark.org/ @@ -275,6 +275,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Thu Feb 20 2025 Michal Ruprich - 1:4.4.4-1 +- New version 4.4.4 + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1:4.4.3-2 - Drop call to %sysusers_create_compat From 6c84c54e0a6f69199b0dfce8f4c4bba5dc9b0c2d Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 18 Mar 2025 17:47:48 +0100 Subject: [PATCH 03/31] New version 4.4.5 --- sources | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 4c2a28f..78af866 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.4.4.tar.xz) = f2787d49de55cea4b6f09217e5520c7517f2a906ee7b91447ca0e6e1ab50c58d71963577a5eb899fd1e9b87103f34c9f7ea081ac6d6586e3a4974d74946a0199 -SHA512 (SIGNATURES-4.4.4.txt) = f543b5fc95bbead2bad9981e75083c364014e1cceb81c9b96057fdd30d9d4547fccb9db23879180b9e15e769d99e89d26e78937662a7e66acdba27d4f42eefaa +SHA512 (wireshark-4.4.5.tar.xz) = 09956fadb2ab80df136c6b35a1be2aa72eec20e1f11c94aaaabecff72d450239d09173ef3cc2bcd8c85c194816afb750e1d476538038ff612366a255ae4fece5 +SHA512 (SIGNATURES-4.4.5.txt) = 70e148023eb728bcbba3abe1848d56c699ce500ddfc6bf3d7406e3f155341bc12406d08c3d31654cee9d5df48632bf3998771d81d2dc4a268ee857f5f7efe8ce diff --git a/wireshark.spec b/wireshark.spec index 7c704ea..2920b5f 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.4.4 +Version: 4.4.5 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) @@ -275,6 +275,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Tue Mar 18 2025 Michal Ruprich - 1:4.4.5-1 +- New version 4.4.5 + * Thu Feb 20 2025 Michal Ruprich - 1:4.4.4-1 - New version 4.4.4 From fc18e07d6d37be45ab5e2bf238d8883c1fa253f2 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Mon, 26 May 2025 09:36:39 +0200 Subject: [PATCH 04/31] New version 4.4.6 --- sources | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 78af866..80b488b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.4.5.tar.xz) = 09956fadb2ab80df136c6b35a1be2aa72eec20e1f11c94aaaabecff72d450239d09173ef3cc2bcd8c85c194816afb750e1d476538038ff612366a255ae4fece5 -SHA512 (SIGNATURES-4.4.5.txt) = 70e148023eb728bcbba3abe1848d56c699ce500ddfc6bf3d7406e3f155341bc12406d08c3d31654cee9d5df48632bf3998771d81d2dc4a268ee857f5f7efe8ce +SHA512 (wireshark-4.4.6.tar.xz) = 5bc1f99ed18df2a5ebcd72828f7ed5e5ae4bdc17b245ef9de02f58a5997b04bd1dca764c3f163d1385616efcf9895c46c002ea2800f190b5e44bcc75e5485692 +SHA512 (SIGNATURES-4.4.6.txt) = d09ed7d48d0e3f5aa6388d8d249e0d48e58008dd5d30f1bf4200ffe94ce479a53c78cc8a54fb9542c6b87039614edfddb08e51f901289311db6bdb9f17ff9a31 diff --git a/wireshark.spec b/wireshark.spec index 2920b5f..7bf6e2f 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.4.5 +Version: 4.4.6 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) @@ -275,6 +275,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Mon May 26 2025 Michal Ruprich - 1:4.4.6-1 +- New version 4.4.6 + * Tue Mar 18 2025 Michal Ruprich - 1:4.4.5-1 - New version 4.4.5 From d4f2911cf3b9807054f89d075b7eac8924669138 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 3 Jun 2025 17:01:59 +0200 Subject: [PATCH 05/31] udevadm should be ignored if an error occures --- wireshark.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 7bf6e2f..7ad26ee 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.4.6 -Release: 1%{?dist} +Release: 2%{?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/ @@ -184,7 +184,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 @@ -275,6 +275,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Tue Jun 03 2025 Michal Ruprich - 1:4.4.6-2 +- udevadm should be ignored if an error occures + * Mon May 26 2025 Michal Ruprich - 1:4.4.6-1 - New version 4.4.6 From 7ef093270bda3e9b1fe2ba1c7fd1799235335aac Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 5 Jun 2025 15:48:35 +0200 Subject: [PATCH 06/31] New version 4.4.7 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 80b488b..ec0d0cf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.4.6.tar.xz) = 5bc1f99ed18df2a5ebcd72828f7ed5e5ae4bdc17b245ef9de02f58a5997b04bd1dca764c3f163d1385616efcf9895c46c002ea2800f190b5e44bcc75e5485692 -SHA512 (SIGNATURES-4.4.6.txt) = d09ed7d48d0e3f5aa6388d8d249e0d48e58008dd5d30f1bf4200ffe94ce479a53c78cc8a54fb9542c6b87039614edfddb08e51f901289311db6bdb9f17ff9a31 +SHA512 (wireshark-4.4.7.tar.xz) = 5fdebdc25a59383b0c27632aac61c57fef9ba12ea0929a1af76c23e713b8b7e4162ba382301fbf2bb63940226ad235a2b5f7c1fe5a0a21ee722dd4c2348da0eb +SHA512 (SIGNATURES-4.4.7.txt) = 10735d0e8f5bfd9cbfccf55b26006d754c636f3e61aa04b7c6643de3383acdc828922675c27bf591174a9002431f41dd18eeea988930334ab7c916c69dfadd0b diff --git a/wireshark.spec b/wireshark.spec index 7ad26ee..e07dd7d 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.4.6 -Release: 2%{?dist} +Version: 4.4.7 +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/ @@ -275,6 +275,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Thu Jun 05 2025 Michal Ruprich - 1:4.4.7-1 +- New version 4.4.7 + * Tue Jun 03 2025 Michal Ruprich - 1:4.4.6-2 - udevadm should be ignored if an error occures From f7e5e9a71b3e5123bb526f96fdaddab3c0d9950c Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 18 Jul 2025 11:41:08 +0200 Subject: [PATCH 07/31] New version 4.4.8 --- sources | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index ec0d0cf..c6f9895 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.4.7.tar.xz) = 5fdebdc25a59383b0c27632aac61c57fef9ba12ea0929a1af76c23e713b8b7e4162ba382301fbf2bb63940226ad235a2b5f7c1fe5a0a21ee722dd4c2348da0eb -SHA512 (SIGNATURES-4.4.7.txt) = 10735d0e8f5bfd9cbfccf55b26006d754c636f3e61aa04b7c6643de3383acdc828922675c27bf591174a9002431f41dd18eeea988930334ab7c916c69dfadd0b +SHA512 (wireshark-4.4.8.tar.xz) = 06939f8b48ff4533ab4a8d1d40c646737606beb0e09470dd672374f287749a0d33f5ffb6475fa5e31acd6228c971a14f9921efd7c25e410497e76a19456d49a3 +SHA512 (SIGNATURES-4.4.8.txt) = e9c515950efebd3d1721d2852328c2a223c2abf9dc86da2539c34906a36ef8a7c8caddf94f01658caf9d2f8ab5e17520d914f24f938e0b12d10bdff166f9a184 diff --git a/wireshark.spec b/wireshark.spec index e07dd7d..e0a7e44 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.4.7 +Version: 4.4.8 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) @@ -275,6 +275,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Fri Jul 18 2025 Michal Ruprich - 1:4.4.8-1 +- New version 4.4.8 + * Thu Jun 05 2025 Michal Ruprich - 1:4.4.7-1 - New version 4.4.7 From e851189359dca66147a3e7bbac8761a403e82a0e Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 18 Jul 2025 14:37:45 +0200 Subject: [PATCH 08/31] Adding new testing plans --- ci.fmf | 1 + gating.yaml | 19 ++++++++++++++----- plans.fmf | 35 +++++++++++++++++++++++++++++++++++ plans/all.fmf | 6 ------ 4 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 ci.fmf create mode 100644 plans.fmf delete mode 100644 plans/all.fmf diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml index 195c6fe..1b16508 100644 --- a/gating.yaml +++ b/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} \ No newline at end of file + - !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} \ No newline at end of file diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..f8749f8 --- /dev/null +++ b/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 diff --git a/plans/all.fmf b/plans/all.fmf deleted file mode 100644 index 18bccad..0000000 --- a/plans/all.fmf +++ /dev/null @@ -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 From b75536364f3a2ecd007e0a2cb1c8bff176f6a598 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:27:35 +0000 Subject: [PATCH 09/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index e0a7e44..9913365 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.4.8 -Release: 1%{?dist} +Release: 2%{?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/ @@ -275,6 +275,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:4.4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 18 2025 Michal Ruprich - 1:4.4.8-1 - New version 4.4.8 From 433b55e0dfc192895f5d801c29af49ac4acaf877 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Mon, 1 Sep 2025 21:24:23 +0200 Subject: [PATCH 10/31] New version 4.4.9 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c6f9895..d3e1b3b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.4.8.tar.xz) = 06939f8b48ff4533ab4a8d1d40c646737606beb0e09470dd672374f287749a0d33f5ffb6475fa5e31acd6228c971a14f9921efd7c25e410497e76a19456d49a3 -SHA512 (SIGNATURES-4.4.8.txt) = e9c515950efebd3d1721d2852328c2a223c2abf9dc86da2539c34906a36ef8a7c8caddf94f01658caf9d2f8ab5e17520d914f24f938e0b12d10bdff166f9a184 +SHA512 (wireshark-4.4.9.tar.xz) = a4f13bc0c8b1c08dfed8fe8e88997e5378c0ad1f9eeb972ea07cd85e7c7140b17f63ec9efce286b636abea7b99b9f54a640852a2ec4a36bfab96c6cf08e4772d +SHA512 (SIGNATURES-4.4.9.txt) = 8f2c637b3027a477ec7eb421a8f77c96c23800df068a892ba608fd4603761a0b512e30c7be15b9643fc36a4433c9875921bdf6395b5edb04272c54b6ba9a1e97 diff --git a/wireshark.spec b/wireshark.spec index 9913365..35b64aa 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.4.8 -Release: 2%{?dist} +Version: 4.4.9 +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/ @@ -275,6 +275,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Mon Sep 01 2025 Michal Ruprich - 1:4.4.9-1 +- New version 4.4.9 + * Fri Jul 25 2025 Fedora Release Engineering - 1:4.4.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 92f80f6263e9eb1e77dc5d81b36d7c5854edfa22 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Mon, 13 Oct 2025 12:59:16 +0200 Subject: [PATCH 11/31] New version 4.6.0 --- sources | 4 +-- wireshark-0006-Move-tmp-to-var-tmp.patch | 27 +++++++------- wireshark-0008-pkgconfig.patch | 10 +++--- wireshark-0009-remove-strato-manpages.patch | 39 +++++++++++++++++++++ wireshark.spec | 34 ++++++++++-------- 5 files changed, 78 insertions(+), 36 deletions(-) create mode 100644 wireshark-0009-remove-strato-manpages.patch diff --git a/sources b/sources index d3e1b3b..923760a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.4.9.tar.xz) = a4f13bc0c8b1c08dfed8fe8e88997e5378c0ad1f9eeb972ea07cd85e7c7140b17f63ec9efce286b636abea7b99b9f54a640852a2ec4a36bfab96c6cf08e4772d -SHA512 (SIGNATURES-4.4.9.txt) = 8f2c637b3027a477ec7eb421a8f77c96c23800df068a892ba608fd4603761a0b512e30c7be15b9643fc36a4433c9875921bdf6395b5edb04272c54b6ba9a1e97 +SHA512 (wireshark-4.6.0.tar.xz) = f531dc8a4aa9b6539235fe1c87a680a01a6cba3af048297ba4b884edbcf1577b8af9061d9d4f43cbe1fbf213c18bb72fddd44b324a93edcc612e3f5b3cdde75e +SHA512 (SIGNATURES-4.6.0.txt) = 5a461c6280eeadb26e95238b233c08d6f99cf0170aec80165c4f4328ca1e36c3adea28840274863cb694d16b2acd455d4cd669708b5b498fc695f65a7d4fa6c2 diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index a856286..01f0a4a 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -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 @@ -30,19 +30,18 @@ index 07b9b42e01..fb09de989b 100644 #include #include -@@ -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 #include "main_application.h" - #include +#include /* for get_tmp_dir() */ - #include - #include + #include + @@ -204,7 +205,7 @@ FolderListModel::FolderListModel(QObject * parent): appendRow(QStringList() << tr("\"File\" dialog location") << get_open_dialog_initial_dir() << tr("Capture files")); diff --git a/wireshark-0008-pkgconfig.patch b/wireshark-0008-pkgconfig.patch index e32958a..b5df5b2 100644 --- a/wireshark-0008-pkgconfig.patch +++ b/wireshark-0008-pkgconfig.patch @@ -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}") diff --git a/wireshark-0009-remove-strato-manpages.patch b/wireshark-0009-remove-strato-manpages.patch new file mode 100644 index 0000000..a96d329 --- /dev/null +++ b/wireshark-0009-remove-strato-manpages.patch @@ -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 diff --git a/wireshark.spec b/wireshark.spec index 35b64aa..4894330 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -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.9 +Version: 4.6.0 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} @@ -156,7 +155,8 @@ and plugins. -DENABLE_PLUGINS=ON \ -DENABLE_NETLINK=ON \ -DBUILD_dcerpcidl2wrs=OFF \ - -DBUILD_sdjournal=ON + -DBUILD_sdjournal=ON \ + -DBUILD_stratoshark=OFF %cmake_build @@ -204,6 +204,7 @@ fi %{_bindir}/capinfos %{_bindir}/captype %{_bindir}/editcap +%{_bindir}/dftest %{_bindir}/mergecap %{_bindir}/randpkt %{_bindir}/reordercap @@ -217,16 +218,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/wifidump -%{_libdir}/wireshark/extcap/sshdump -%{_libdir}/wireshark/extcap/sdjournal -%{_libdir}/wireshark/extcap/dpauxmon -%{_libdir}/wireshark/extcap/androiddump +%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 @@ -255,7 +257,6 @@ fi %{_mandir}/man1/dpauxmon.* %{_mandir}/man1/sdjournal.* %{_mandir}/man1/etwdump.* -%{_mandir}/man1/falcodump.* %{_mandir}/man4/extcap.* %{_datadir}/doc/wireshark/* @@ -275,6 +276,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Thu Oct 09 2025 Michal Ruprich - 1:4.6.0-1 +- New version 4.6.0 + * Mon Sep 01 2025 Michal Ruprich - 1:4.4.9-1 - New version 4.4.9 From e2e91a0b8f513c690d056728cc41c26e946363da Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 28 Nov 2025 14:33:54 +0100 Subject: [PATCH 12/31] New version 4.6.1 --- sources | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 923760a..54031ba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.6.0.tar.xz) = f531dc8a4aa9b6539235fe1c87a680a01a6cba3af048297ba4b884edbcf1577b8af9061d9d4f43cbe1fbf213c18bb72fddd44b324a93edcc612e3f5b3cdde75e -SHA512 (SIGNATURES-4.6.0.txt) = 5a461c6280eeadb26e95238b233c08d6f99cf0170aec80165c4f4328ca1e36c3adea28840274863cb694d16b2acd455d4cd669708b5b498fc695f65a7d4fa6c2 +SHA512 (SIGNATURES-4.6.1.txt) = 8cd14afb8aca1a78801a07d40292e1bc38fa1b09fc3d712d58e237ba570730914887cd32d53702d222d71c51098d2db3d0e25ad53c7d31a50a19cc77f4c4dcf1 +SHA512 (wireshark-4.6.1.tar.xz) = 49d5d1df11c5a44065b56e5002cdf3790592e513e83d399e2627f3ebd3475d57847c09b15eb1f7003fe0726ee1927fa24a3a6af8732f2c5da444cb5de614303e diff --git a/wireshark.spec b/wireshark.spec index 4894330..e6461e8 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.6.0 +Version: 4.6.1 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) @@ -276,6 +276,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Thu Nov 27 2025 Michal Ruprich - 1:4.6.1-1 +- New version 4.6.1 + * Thu Oct 09 2025 Michal Ruprich - 1:4.6.0-1 - New version 4.6.0 From 66212836641e0b58309cb7ed9f9e12ad985c1765 Mon Sep 17 00:00:00 2001 From: nucleo Date: Tue, 9 Dec 2025 16:51:30 +0200 Subject: [PATCH 13/31] BuildRequires: libnghttp3-devel - needed for HTTP3 support --- wireshark.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index e6461e8..0104afb 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.6.1 -Release: 1%{?dist} +Release: 2%{?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/ @@ -83,6 +83,7 @@ Buildrequires: speexdsp-devel #needed for sdjournal external capture interface BuildRequires: systemd-devel BuildRequires: libnghttp2-devel +BuildRequires: libnghttp3-devel BuildRequires: systemd-rpm-macros BuildRequires: lz4-devel BuildRequires: snappy-devel @@ -276,6 +277,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Tue Dec 09 2025 Alexey Kurov - 1:4.6.1-2 +- BuildRequires: libnghttp3-devel - needed for HTTP3 support + * Thu Nov 27 2025 Michal Ruprich - 1:4.6.1-1 - New version 4.6.1 From d00b96d9eba7390838313968dae58057272cb35c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 10 Dec 2025 21:26:19 -0500 Subject: [PATCH 14/31] Enable HTTP/3 support on F43+ only So far, packages which are adding nghttp3/ngtcp2 dependencies are doing so only for F43+; possible support in ELN (RHEL 11) is still TBD. --- wireshark.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 0104afb..b324e62 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -3,10 +3,12 @@ %global with_maxminddb 1 %global plugins_version 4.6 +%bcond http3 %[0%{?fedora} >= 43] + Summary: Network traffic analyzer Name: wireshark Version: 4.6.1 -Release: 2%{?dist} +Release: 3%{?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/ @@ -83,7 +85,9 @@ Buildrequires: speexdsp-devel #needed for sdjournal external capture interface BuildRequires: systemd-devel BuildRequires: libnghttp2-devel +%if %{with http3} BuildRequires: libnghttp3-devel +%endif BuildRequires: systemd-rpm-macros BuildRequires: lz4-devel BuildRequires: snappy-devel @@ -277,6 +281,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Thu Dec 11 2025 Yaakov Selkowitz - 1:4.6.1-3 +- Enable HTTP/3 support on F43+ only + * Tue Dec 09 2025 Alexey Kurov - 1:4.6.1-2 - BuildRequires: libnghttp3-devel - needed for HTTP3 support From fc0b356a80552b728a71a29fabff8207726b3715 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 15 Jan 2026 09:39:24 +0100 Subject: [PATCH 15/31] New version 4.6.3 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 54031ba..5639acf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (SIGNATURES-4.6.1.txt) = 8cd14afb8aca1a78801a07d40292e1bc38fa1b09fc3d712d58e237ba570730914887cd32d53702d222d71c51098d2db3d0e25ad53c7d31a50a19cc77f4c4dcf1 -SHA512 (wireshark-4.6.1.tar.xz) = 49d5d1df11c5a44065b56e5002cdf3790592e513e83d399e2627f3ebd3475d57847c09b15eb1f7003fe0726ee1927fa24a3a6af8732f2c5da444cb5de614303e +SHA512 (wireshark-4.6.3.tar.xz) = 99ee0c5a12138b421646a5d5f4ac7175558997033a0cfc4335421b8c9fae433c4cd2c9a8842e79f6faee276f8d23ccfe7749791e4f8bbb971e7e694d44eca581 +SHA512 (SIGNATURES-4.6.3.txt) = 5a6b25abbd35eb7b55e1fa99005d00c704baef9e5101a7fdb9e3e5f012e3c8e1ce1f5404f7309c288839900debe627c9cd4559271d01661e80e5ba41ad835e5e diff --git a/wireshark.spec b/wireshark.spec index b324e62..50111c2 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,8 +7,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.6.1 -Release: 3%{?dist} +Version: 4.6.3 +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/ @@ -281,6 +281,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Thu Jan 15 2026 Michal Ruprich - 1:4.6.3-1 +- New version 4.6.3 + * Thu Dec 11 2025 Yaakov Selkowitz - 1:4.6.1-3 - Enable HTTP/3 support on F43+ only From b7d10b60f66b7421ba34c75a0d3e98948eba0852 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:16:45 +0000 Subject: [PATCH 16/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 50111c2..8a2bfaa 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,7 +8,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.6.3 -Release: 1%{?dist} +Release: 2%{?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/ @@ -281,6 +281,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1:4.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Jan 15 2026 Michal Ruprich - 1:4.6.3-1 - New version 4.6.3 From 2d96acd7fe062b68a138d3f161df9c215a37840e Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 4 Mar 2026 10:56:27 +0100 Subject: [PATCH 17/31] New version 4.6.4 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 5639acf..37b9fc4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.6.3.tar.xz) = 99ee0c5a12138b421646a5d5f4ac7175558997033a0cfc4335421b8c9fae433c4cd2c9a8842e79f6faee276f8d23ccfe7749791e4f8bbb971e7e694d44eca581 -SHA512 (SIGNATURES-4.6.3.txt) = 5a6b25abbd35eb7b55e1fa99005d00c704baef9e5101a7fdb9e3e5f012e3c8e1ce1f5404f7309c288839900debe627c9cd4559271d01661e80e5ba41ad835e5e +SHA512 (wireshark-4.6.4.tar.xz) = 5ff1b0fd012bbac0ad79ee58e065e7eabb60fce888959fb6701b79b1d03305724f2adb2623549406f1fc3036f54d4bf14d49c3e4237e68e649a20e430a868acd +SHA512 (SIGNATURES-4.6.4.txt) = 915527a527c5d9666ade6e53b174ec943cb8cb22f0abacd590533936206e8156d7fdf79516832507513a627d1cdd5a1ffc6f8e1c015438c70a0b3e727a3cb854 diff --git a/wireshark.spec b/wireshark.spec index 8a2bfaa..91f2ea2 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,8 +7,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.6.3 -Release: 2%{?dist} +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) Url: http://www.wireshark.org/ @@ -281,6 +281,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Wed Mar 04 2026 Michal Ruprich - 1:4.6.4-1 +- New version 4.6.4 + * Sat Jan 17 2026 Fedora Release Engineering - 1:4.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 426e574331cf331c32405a214a2b220316e5a051 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 6 Mar 2026 16:54:15 +0100 Subject: [PATCH 18/31] Fixing Lua, adding a couple of tools --- rpminspect.yaml | 5 +++++ wireshark.spec | 21 +++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/rpminspect.yaml b/rpminspect.yaml index c1c92dc..e8454ee 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -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 diff --git a/wireshark.spec b/wireshark.spec index 91f2ea2..6e6180c 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -29,6 +29,7 @@ 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 +Patch10: wireshark-0010-find-lua-5.5.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -129,6 +130,8 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-cli = %{epoch}:%{version}-%{release} Requires: glibc-devel Requires: glib2-devel +Requires: python3-ply +Requires: omniORB-devel %description devel The wireshark-devel package contains the header files, developer @@ -173,10 +176,21 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.wireshark.Wiresha #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 %{buildroot}%{_udevrulesdir} -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 + +#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/ touch %{buildroot}%{_bindir}/%{name} @@ -279,6 +293,9 @@ fi %{_libdir}/lib*.so %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/cmake/%{name}/*.cmake +%dir %{_libexecdir}/wireshark/pytools +%{_libexecdir}/wireshark/pytools/*.py +%{_libexecdir}/wireshark/pytools/idl2wrs %changelog * Wed Mar 04 2026 Michal Ruprich - 1:4.6.4-1 From aa822250ea9ebe0b4199522aba92b3c931488a0b Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Sun, 8 Mar 2026 20:26:33 +0100 Subject: [PATCH 19/31] Adding patch --- wireshark-0010-find-lua-5.5.patch | 463 ++++++++++++++++++++++++++++++ 1 file changed, 463 insertions(+) create mode 100644 wireshark-0010-find-lua-5.5.patch diff --git a/wireshark-0010-find-lua-5.5.patch b/wireshark-0010-find-lua-5.5.patch new file mode 100644 index 0000000..c1238a1 --- /dev/null +++ b/wireshark-0010-find-lua-5.5.patch @@ -0,0 +1,463 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4542efa..56c5c25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1545,8 +1545,7 @@ if(FETCH_lua) + # Download and build lua + include(${CMAKE_SOURCE_DIR}/cmake/external/lua54/Lua54.cmake) + else() +- set(LUA_FIND_VERSIONS "5.4;5.3" CACHE STRING "Lua versions valid for the build (as a list)") +- ws_find_package(Lua ENABLE_LUA HAVE_LUA) ++ ws_find_package(Lua ENABLE_LUA HAVE_LUA "5.3") + endif() + + ws_find_package(NL ENABLE_NETLINK HAVE_LIBNL) +diff --git a/cmake/modules/FindLua.cmake b/cmake/modules/FindLua.cmake +index 7bacfdd..87171f5 100644 +--- a/cmake/modules/FindLua.cmake ++++ b/cmake/modules/FindLua.cmake +@@ -1,50 +1,149 @@ + # Distributed under the OSI-approved BSD 3-Clause License. See accompanying +-# file Copyright.txt or https://cmake.org/licensing for details. ++# file LICENSE.rst or https://cmake.org/licensing for details. + + #[=======================================================================[.rst: + FindLua + ------- + +-Locate Lua library. ++Finds the Lua library: ++ ++.. code-block:: cmake ++ ++ find_package(Lua [] [...]) ++ ++Lua is a embeddable scripting language. + + .. versionadded:: 3.18 + Support for Lua 5.4. + +-This module defines: ++.. versionadded:: 4.3 ++ Support for Lua 5.5. ++ ++When working with Lua, its library headers are intended to be included in ++project source code as: ++ ++.. code-block:: c ++ ++ #include ++ ++and not: ++ ++.. code-block:: c ++ ++ #include ++ ++This is because, the location of Lua headers may differ across platforms and may ++exist in locations other than ``lua/``. ++ ++Result Variables ++^^^^^^^^^^^^^^^^ ++ ++This module defines the following variables: ++ ++``Lua_FOUND`` ++ .. versionadded:: 3.3 ++ ++ Boolean indicating whether (the requested version of) Lua was found. ++ ++``Lua_VERSION`` ++ .. versionadded:: 4.2 ++ ++ The version of Lua found. ++ ++``Lua_VERSION_MAJOR`` ++ .. versionadded:: 4.2 ++ ++ The major version of Lua found. ++ ++``Lua_VERSION_MINOR`` ++ .. versionadded:: 4.2 ++ ++ The minor version of Lua found. ++ ++``Lua_VERSION_PATCH`` ++ .. versionadded:: 4.2 ++ ++ The patch version of Lua found. + +-``LUA_FOUND`` +- if false, do not try to link to Lua + ``LUA_LIBRARIES`` +- both lua and lualib ++ Libraries needed to link against to use Lua. This list includes both ``lua`` ++ and ``lualib`` libraries. ++ ++Cache Variables ++^^^^^^^^^^^^^^^ ++ ++The following cache variables may also be set: ++ + ``LUA_INCLUDE_DIR`` +- where to find lua.h ++ The directory containing the Lua header files, such as ``lua.h``, ++ ``lualib.h``, and ``lauxlib.h``, needed to use Lua. ++ ++Deprecated Variables ++^^^^^^^^^^^^^^^^^^^^ ++ ++The following variables are provided for backward compatibility: ++ ++``LUA_FOUND`` ++ .. deprecated:: 4.2 ++ Use ``Lua_FOUND``, which has the same value. ++ ++ Boolean indicating whether (the requested version of) Lua was found. ++ + ``LUA_VERSION_STRING`` +- the version of Lua found ++ .. deprecated:: 4.2 ++ Superseded by the ``Lua_VERSION``. ++ ++ The version of Lua found. ++ + ``LUA_VERSION_MAJOR`` +- the major version of Lua ++ .. deprecated:: 4.2 ++ Superseded by the ``Lua_VERSION_MAJOR``. ++ ++ The major version of Lua found. ++ + ``LUA_VERSION_MINOR`` +- the minor version of Lua ++ .. deprecated:: 4.2 ++ Superseded by the ``Lua_VERSION_MINOR``. ++ ++ The minor version of Lua found. ++ + ``LUA_VERSION_PATCH`` +- the patch version of Lua ++ .. deprecated:: 4.2 ++ Superseded by the ``Lua_VERSION_PATCH``. + +-Note that the expected include convention is ++ The patch version of Lua found. + +-:: ++Examples ++^^^^^^^^ + +- #include "lua.h" ++Finding the Lua library and creating an interface :ref:`imported target ++` that encapsulates its usage requirements for linking to a ++project target: + +-and not ++.. code-block:: cmake + +-:: ++ find_package(Lua) + +- #include ++ if(Lua_FOUND AND NOT TARGET Lua::Lua) ++ add_library(Lua::Lua INTERFACE IMPORTED) ++ set_target_properties( ++ Lua::Lua ++ PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}" ++ INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}" ++ ) ++ endif() + +-This is because, the lua location is not standardized and may exist in +-locations other than lua/ ++ target_link_libraries(project_target PRIVATE Lua::Lua) + #]=======================================================================] + + cmake_policy(PUSH) # Policies apply to functions at definition-time +-cmake_policy(SET CMP0012 NEW) # For while(TRUE) ++if(POLICY CMP0140) ++ cmake_policy(SET CMP0140 NEW) ++endif() ++if(POLICY CMP0159) ++ cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ ++endif() + + INCLUDE(FindWSWinLibs) + FindWSWinLibs("lua-5*" "LUA_HINTS") +@@ -55,12 +154,39 @@ unset(_lua_append_versions) + + # this is a function only to have all the variables inside go away automatically + function(_lua_get_versions) +- set(LUA_VERSIONS5 ${LUA_FIND_VERSIONS}) +- list(FILTER LUA_VERSIONS5 INCLUDE REGEX "5\.[43]") +- set(_lua_append_versions ${LUA_VERSIONS5}) +- message(STATUS "Considering the following Lua versions: ${_lua_append_versions}") ++ set(LUA_VERSIONS5 5.5 5.4 5.3 5.2 5.1 5.0) ++ ++ if (Lua_FIND_VERSION_EXACT) ++ if (Lua_FIND_VERSION_COUNT GREATER 1) ++ set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}) ++ endif () ++ elseif (Lua_FIND_VERSION) ++ # once there is a different major version supported this should become a loop ++ if (NOT Lua_FIND_VERSION_MAJOR GREATER 5) ++ if (Lua_FIND_VERSION_COUNT EQUAL 1) ++ set(_lua_append_versions ${LUA_VERSIONS5}) ++ else () ++ foreach (subver IN LISTS LUA_VERSIONS5) ++ if (NOT subver VERSION_LESS ${Lua_FIND_VERSION}) ++ list(APPEND _lua_append_versions ${subver}) ++ endif () ++ endforeach () ++ # New version -> Search for it (heuristic only! Defines in include might have changed) ++ if (NOT _lua_append_versions) ++ set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}) ++ endif() ++ endif () ++ endif () ++ else () ++ # once there is a different major version supported this should become a loop ++ set(_lua_append_versions ${LUA_VERSIONS5}) ++ endif () ++ ++ if (LUA_Debug) ++ message(STATUS "Considering following Lua versions: ${_lua_append_versions}") ++ endif() + +- set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE) ++ set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE) + endfunction() + + function(_lua_set_version_vars) +@@ -82,10 +208,10 @@ function(_lua_set_version_vars) + endforeach () + + set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE) +-endfunction(_lua_set_version_vars) ++endfunction() + + function(_lua_get_header_version) +- unset(LUA_VERSION_STRING PARENT_SCOPE) ++ unset(Lua_VERSION PARENT_SCOPE) + set(_hdr_file "${LUA_INCLUDE_DIR}/lua.h") + + if (NOT EXISTS "${_hdr_file}") +@@ -98,30 +224,42 @@ function(_lua_get_header_version) + file(STRINGS "${_hdr_file}" lua_version_strings + REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*") + +- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};") +- if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$") +- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};") +- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};") +- set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}") ++ string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR(_N)?[ \t]+\"?([0-9])\"?[ \t]*;.*" "\\2" Lua_VERSION_MAJOR ";${lua_version_strings};") ++ ++ if (Lua_VERSION_MAJOR MATCHES "^[0-9]+$") ++ string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR(_N)?[ \t]+\"?([0-9])\"?[ \t]*;.*" "\\2" Lua_VERSION_MINOR ";${lua_version_strings};") ++ string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE(_N)?[ \t]+\"?([0-9])\"?[ \t]*;.*" "\\2" Lua_VERSION_PATCH ";${lua_version_strings};") ++ set(Lua_VERSION "${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR}.${Lua_VERSION_PATCH}") + else () +- string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};") +- if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$") +- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};") ++ string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" Lua_VERSION ";${lua_version_strings};") ++ if (NOT Lua_VERSION MATCHES "^[0-9.]+$") ++ string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" Lua_VERSION ";${lua_version_strings};") + endif () +- string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}") +- string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}") +- string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}") ++ string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" Lua_VERSION_MAJOR "${Lua_VERSION}") ++ string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" Lua_VERSION_MINOR "${Lua_VERSION}") ++ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" Lua_VERSION_PATCH "${Lua_VERSION}") + endif () + foreach (ver IN LISTS _lua_append_versions) +- if (ver STREQUAL "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}") +- set(LUA_VERSION_MAJOR ${LUA_VERSION_MAJOR} PARENT_SCOPE) +- set(LUA_VERSION_MINOR ${LUA_VERSION_MINOR} PARENT_SCOPE) +- set(LUA_VERSION_PATCH ${LUA_VERSION_PATCH} PARENT_SCOPE) +- set(LUA_VERSION_STRING ${LUA_VERSION_STRING} PARENT_SCOPE) +- return() ++ if (ver STREQUAL "${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR}") ++ set(LUA_VERSION_STRING "${Lua_VERSION}") ++ set(LUA_VERSION_MAJOR "${Lua_VERSION_MAJOR}") ++ set(LUA_VERSION_MINOR "${Lua_VERSION_MINOR}") ++ set(LUA_VERSION_PATCH "${Lua_VERSION_PATCH}") ++ ++ return( ++ PROPAGATE ++ Lua_VERSION ++ Lua_VERSION_MAJOR ++ Lua_VERSION_MINOR ++ Lua_VERSION_PATCH ++ LUA_VERSION_STRING ++ LUA_VERSION_MAJOR ++ LUA_VERSION_MINOR ++ LUA_VERSION_PATCH ++ ) + endif () + endforeach () +-endfunction(_lua_get_header_version) ++endfunction() + + function(_lua_find_header) + _lua_set_version_vars() +@@ -147,9 +285,9 @@ function(_lua_find_header) + endif() + _lua_get_header_version() + # Found accepted version -> Ok +- if (LUA_VERSION_STRING) ++ if (Lua_VERSION) + if (LUA_Debug) +- message(STATUS "Found suitable version ${LUA_VERSION_STRING} in ${LUA_INCLUDE_DIR}/lua.h") ++ message(STATUS "Found suitable version ${Lua_VERSION} in ${LUA_INCLUDE_DIR}/lua.h") + endif() + return() + endif() +@@ -169,12 +307,12 @@ _lua_find_header() + _lua_get_header_version() + unset(_lua_append_versions) + +-if (LUA_VERSION_STRING) ++if (Lua_VERSION) + set(_lua_library_names +- lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR} +- lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} +- lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} +- lua.${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} ++ lua${Lua_VERSION_MAJOR}${Lua_VERSION_MINOR} ++ lua${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR} ++ lua-${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR} ++ lua.${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR} + ) + endif () + +@@ -189,7 +327,7 @@ find_library(LUA_LIBRARY + unset(_lua_library_names) + + if (LUA_LIBRARY) +- # include the math library for Unix ++ # include the math library for Unixes other than macOS + if (UNIX AND NOT APPLE AND NOT BEOS) + find_library(LUA_MATH_LIBRARY m) + mark_as_advanced(LUA_MATH_LIBRARY) +@@ -208,11 +346,9 @@ if (LUA_LIBRARY) + endif () + + include(FindPackageHandleStandardArgs) +-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if +-# all listed variables are TRUE +-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua ++find_package_handle_standard_args(Lua + REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR +- VERSION_VAR LUA_VERSION_STRING) ++ VERSION_VAR Lua_VERSION) + + mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY) + +@@ -220,8 +356,6 @@ cmake_policy(POP) + + IF(Lua_FOUND) + SET( LUA_INCLUDE_DIRS ${LUA_INCLUDE_DIR} ) +- +- unset(HAVE_LUA_INTEGER_SIZE CACHE) + cmake_push_check_state() + include(CheckTypeSize) + set(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR}) +@@ -244,6 +378,55 @@ IF(Lua_FOUND) + # it here. + set(HAVE_LUA_UNICODE True) + endif() ++ ++ # ++ # Lua 5.4.5 broke the Lua API by adding a second argument to ++ # lua_resetthread(). ++ # ++ # Fedora, and possibly other Linux distributions, compounded ++ # that error by backporting a fix from 5.4.5 that iincluded ++ # that API-breaking change, but didn't change LUA_VERSION_RELEASE_NUM, ++ # so that checking for LUA_VERSION_RELEASE_NUM == 50404 isn't ++ # sufficient to detect the broken version of the API. ++ # ++ # See the thread starting at ++ # ++ # https://lists.wireshark.org/archives/wireshark-dev/202511/msg00031.html ++ # ++ # So we do it the hard way, by checking whether a program that ++ # calls the one-argument version compiles. ++ # ++ # CMake doesn't appear to support "check whether this C source ++ # compiles, but don't bother testing whether it links", which ++ # is what we want here - all we care about is whether the ++ # two-argument call to lua_resetthread() compiles or fails to ++ # compile, not whether the routine is available in the library. ++ # This test will fail if the link fails; we are testing with ++ # a two-argument call, so that means that, if the link fails ++ # for any reason (wrong required libraries, wrong required flags, ++ # etc.), we'll treat Lua as having a one-argument lua_resetthread(). ++ # ++ include(CheckCSourceCompiles) ++ cmake_push_check_state() ++ set(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR}) ++ set(CMAKE_EXTRA_INCLUDE_FILES "luaconf.h") ++ set(CMAKE_REQUIRED_LIBRARIES ${LUA_LIBRARIES}) ++ check_c_source_compiles( ++ " ++// ++// Undo any definition of _FORTIFY_SOURCE, so that we don't get a ++// complaint that we're compiling without optimization. ++// ++#undef _FORTIFY_SOURCE ++#include ++ ++int ++main(void) ++{ ++ return lua_resetthread(NULL, NULL); ++} ++" HAVE_TWO_ARGUMENT_LUA_RESETTHREAD) ++ cmake_pop_check_state() + ELSE(Lua_FOUND) + SET( LUA_LIBRARIES ) + SET( LUA_INCLUDE_DIRS ) +From ec16791d8d68f9045400a0610a5a10b1ea544dfd Mon Sep 17 00:00:00 2001 +From: Jaap Keuter +Date: Thu, 5 Mar 2026 22:52:23 +0100 +Subject: [PATCH] Lua: Adjust for Lua 5.5 lua_newstate parameter extension + +In Lua 5.5 the lua_newstate function gained a new parameter. +Create a conditional compilation to handle the difference. + +Fixes #21060 + +AI-Assisted: no +--- + epan/wslua/init_wslua.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c +index cd47e6737fe..b1fe8a3f980 100644 +--- a/epan/wslua/init_wslua.c ++++ b/epan/wslua/init_wslua.c +@@ -1714,7 +1714,15 @@ void wslua_init(register_cb cb, void *client_data, const char* app_env_var_prefi + } + + if (!L) { ++#if LUA_VERSION_NUM > 504 ++ // This function now requires a hash seed for the JS hash function ++ // (by Justin Sobel) as used for Lua's string hashing function. ++ // However the seed is mangled with the string length before use, ++ // so it doesn't really matter what it is. ++ L = lua_newstate(wslua_allocf, NULL, 1315423911); ++#else + L = lua_newstate(wslua_allocf, NULL); ++#endif + } + + WSLUA_INIT(L); +-- +GitLab + From f04cc3f9784960596f863c85e85d21b0511da2eb Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 11 Mar 2026 09:22:00 +0100 Subject: [PATCH 20/31] Python tools should only be shipped in Fedora --- wireshark.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 6e6180c..a717d8e 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,6 +1,7 @@ %undefine __cmake_in_source_build %global with_lua 1 %global with_maxminddb 1 +%global with_pytools 1 %global plugins_version 4.6 %bcond http3 %[0%{?fedora} >= 43] @@ -8,7 +9,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.6.4 -Release: 1%{?dist} +Release: 2%{?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/ @@ -130,8 +131,10 @@ 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 @@ -182,6 +185,7 @@ mkdir -p %{buildroot}%{_udevrulesdir} 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/ @@ -191,6 +195,7 @@ 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} @@ -293,11 +298,16 @@ fi %{_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 +* Wed Mar 11 2026 Michal Ruprich - 1:4.6.4-2 +- Python tools should only be shipped in Fedora + * Wed Mar 04 2026 Michal Ruprich - 1:4.6.4-1 - New version 4.6.4 From b322ec58ee6b4fbc64026d085ca31c42eb1c06e6 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Mon, 1 Jun 2026 15:37:51 +0200 Subject: [PATCH 21/31] New version 4.6.6 --- sources | 4 +- wireshark-0009-remove-strato-manpages.patch | 15 +- wireshark-0010-find-lua-5.5.patch | 463 -------------------- wireshark.spec | 9 +- 4 files changed, 18 insertions(+), 473 deletions(-) delete mode 100644 wireshark-0010-find-lua-5.5.patch diff --git a/sources b/sources index 37b9fc4..6df4fbc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.6.4.tar.xz) = 5ff1b0fd012bbac0ad79ee58e065e7eabb60fce888959fb6701b79b1d03305724f2adb2623549406f1fc3036f54d4bf14d49c3e4237e68e649a20e430a868acd -SHA512 (SIGNATURES-4.6.4.txt) = 915527a527c5d9666ade6e53b174ec943cb8cb22f0abacd590533936206e8156d7fdf79516832507513a627d1cdd5a1ffc6f8e1c015438c70a0b3e727a3cb854 +SHA512 (wireshark-4.6.6.tar.xz) = fdeca4647ed3bb7dca5a2f5f747afaa877220ec1153c1d0c5f2688d164fa2feb4d2f45175061415fe6602d3328bf8ec028a4ade73eca6ebd8f6b67d2fcb54d5a +SHA512 (SIGNATURES-4.6.6.txt) = 51cfa6344f78ff485ab4613ba25d81363b456117bf5b7328e9c43ae868368e223cf2f10835b4774c255938e4d9edb293bcf210206decd8e87a8377fd51f49d87 diff --git a/wireshark-0009-remove-strato-manpages.patch b/wireshark-0009-remove-strato-manpages.patch index a96d329..f61c64e 100644 --- a/wireshark-0009-remove-strato-manpages.patch +++ b/wireshark-0009-remove-strato-manpages.patch @@ -11,25 +11,30 @@ index adcfa0c..fd92872 100644 ADD_MAN_PAGE(androiddump 1) ADD_MAN_PAGE(capinfos 1) -@@ -55,10 +53,8 @@ ADD_MAN_PAGE(randpktdump 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) --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) +@@ -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 diff --git a/wireshark-0010-find-lua-5.5.patch b/wireshark-0010-find-lua-5.5.patch deleted file mode 100644 index c1238a1..0000000 --- a/wireshark-0010-find-lua-5.5.patch +++ /dev/null @@ -1,463 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4542efa..56c5c25 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1545,8 +1545,7 @@ if(FETCH_lua) - # Download and build lua - include(${CMAKE_SOURCE_DIR}/cmake/external/lua54/Lua54.cmake) - else() -- set(LUA_FIND_VERSIONS "5.4;5.3" CACHE STRING "Lua versions valid for the build (as a list)") -- ws_find_package(Lua ENABLE_LUA HAVE_LUA) -+ ws_find_package(Lua ENABLE_LUA HAVE_LUA "5.3") - endif() - - ws_find_package(NL ENABLE_NETLINK HAVE_LIBNL) -diff --git a/cmake/modules/FindLua.cmake b/cmake/modules/FindLua.cmake -index 7bacfdd..87171f5 100644 ---- a/cmake/modules/FindLua.cmake -+++ b/cmake/modules/FindLua.cmake -@@ -1,50 +1,149 @@ - # Distributed under the OSI-approved BSD 3-Clause License. See accompanying --# file Copyright.txt or https://cmake.org/licensing for details. -+# file LICENSE.rst or https://cmake.org/licensing for details. - - #[=======================================================================[.rst: - FindLua - ------- - --Locate Lua library. -+Finds the Lua library: -+ -+.. code-block:: cmake -+ -+ find_package(Lua [] [...]) -+ -+Lua is a embeddable scripting language. - - .. versionadded:: 3.18 - Support for Lua 5.4. - --This module defines: -+.. versionadded:: 4.3 -+ Support for Lua 5.5. -+ -+When working with Lua, its library headers are intended to be included in -+project source code as: -+ -+.. code-block:: c -+ -+ #include -+ -+and not: -+ -+.. code-block:: c -+ -+ #include -+ -+This is because, the location of Lua headers may differ across platforms and may -+exist in locations other than ``lua/``. -+ -+Result Variables -+^^^^^^^^^^^^^^^^ -+ -+This module defines the following variables: -+ -+``Lua_FOUND`` -+ .. versionadded:: 3.3 -+ -+ Boolean indicating whether (the requested version of) Lua was found. -+ -+``Lua_VERSION`` -+ .. versionadded:: 4.2 -+ -+ The version of Lua found. -+ -+``Lua_VERSION_MAJOR`` -+ .. versionadded:: 4.2 -+ -+ The major version of Lua found. -+ -+``Lua_VERSION_MINOR`` -+ .. versionadded:: 4.2 -+ -+ The minor version of Lua found. -+ -+``Lua_VERSION_PATCH`` -+ .. versionadded:: 4.2 -+ -+ The patch version of Lua found. - --``LUA_FOUND`` -- if false, do not try to link to Lua - ``LUA_LIBRARIES`` -- both lua and lualib -+ Libraries needed to link against to use Lua. This list includes both ``lua`` -+ and ``lualib`` libraries. -+ -+Cache Variables -+^^^^^^^^^^^^^^^ -+ -+The following cache variables may also be set: -+ - ``LUA_INCLUDE_DIR`` -- where to find lua.h -+ The directory containing the Lua header files, such as ``lua.h``, -+ ``lualib.h``, and ``lauxlib.h``, needed to use Lua. -+ -+Deprecated Variables -+^^^^^^^^^^^^^^^^^^^^ -+ -+The following variables are provided for backward compatibility: -+ -+``LUA_FOUND`` -+ .. deprecated:: 4.2 -+ Use ``Lua_FOUND``, which has the same value. -+ -+ Boolean indicating whether (the requested version of) Lua was found. -+ - ``LUA_VERSION_STRING`` -- the version of Lua found -+ .. deprecated:: 4.2 -+ Superseded by the ``Lua_VERSION``. -+ -+ The version of Lua found. -+ - ``LUA_VERSION_MAJOR`` -- the major version of Lua -+ .. deprecated:: 4.2 -+ Superseded by the ``Lua_VERSION_MAJOR``. -+ -+ The major version of Lua found. -+ - ``LUA_VERSION_MINOR`` -- the minor version of Lua -+ .. deprecated:: 4.2 -+ Superseded by the ``Lua_VERSION_MINOR``. -+ -+ The minor version of Lua found. -+ - ``LUA_VERSION_PATCH`` -- the patch version of Lua -+ .. deprecated:: 4.2 -+ Superseded by the ``Lua_VERSION_PATCH``. - --Note that the expected include convention is -+ The patch version of Lua found. - --:: -+Examples -+^^^^^^^^ - -- #include "lua.h" -+Finding the Lua library and creating an interface :ref:`imported target -+` that encapsulates its usage requirements for linking to a -+project target: - --and not -+.. code-block:: cmake - --:: -+ find_package(Lua) - -- #include -+ if(Lua_FOUND AND NOT TARGET Lua::Lua) -+ add_library(Lua::Lua INTERFACE IMPORTED) -+ set_target_properties( -+ Lua::Lua -+ PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}" -+ INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}" -+ ) -+ endif() - --This is because, the lua location is not standardized and may exist in --locations other than lua/ -+ target_link_libraries(project_target PRIVATE Lua::Lua) - #]=======================================================================] - - cmake_policy(PUSH) # Policies apply to functions at definition-time --cmake_policy(SET CMP0012 NEW) # For while(TRUE) -+if(POLICY CMP0140) -+ cmake_policy(SET CMP0140 NEW) -+endif() -+if(POLICY CMP0159) -+ cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ -+endif() - - INCLUDE(FindWSWinLibs) - FindWSWinLibs("lua-5*" "LUA_HINTS") -@@ -55,12 +154,39 @@ unset(_lua_append_versions) - - # this is a function only to have all the variables inside go away automatically - function(_lua_get_versions) -- set(LUA_VERSIONS5 ${LUA_FIND_VERSIONS}) -- list(FILTER LUA_VERSIONS5 INCLUDE REGEX "5\.[43]") -- set(_lua_append_versions ${LUA_VERSIONS5}) -- message(STATUS "Considering the following Lua versions: ${_lua_append_versions}") -+ set(LUA_VERSIONS5 5.5 5.4 5.3 5.2 5.1 5.0) -+ -+ if (Lua_FIND_VERSION_EXACT) -+ if (Lua_FIND_VERSION_COUNT GREATER 1) -+ set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}) -+ endif () -+ elseif (Lua_FIND_VERSION) -+ # once there is a different major version supported this should become a loop -+ if (NOT Lua_FIND_VERSION_MAJOR GREATER 5) -+ if (Lua_FIND_VERSION_COUNT EQUAL 1) -+ set(_lua_append_versions ${LUA_VERSIONS5}) -+ else () -+ foreach (subver IN LISTS LUA_VERSIONS5) -+ if (NOT subver VERSION_LESS ${Lua_FIND_VERSION}) -+ list(APPEND _lua_append_versions ${subver}) -+ endif () -+ endforeach () -+ # New version -> Search for it (heuristic only! Defines in include might have changed) -+ if (NOT _lua_append_versions) -+ set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}) -+ endif() -+ endif () -+ endif () -+ else () -+ # once there is a different major version supported this should become a loop -+ set(_lua_append_versions ${LUA_VERSIONS5}) -+ endif () -+ -+ if (LUA_Debug) -+ message(STATUS "Considering following Lua versions: ${_lua_append_versions}") -+ endif() - -- set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE) -+ set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE) - endfunction() - - function(_lua_set_version_vars) -@@ -82,10 +208,10 @@ function(_lua_set_version_vars) - endforeach () - - set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE) --endfunction(_lua_set_version_vars) -+endfunction() - - function(_lua_get_header_version) -- unset(LUA_VERSION_STRING PARENT_SCOPE) -+ unset(Lua_VERSION PARENT_SCOPE) - set(_hdr_file "${LUA_INCLUDE_DIR}/lua.h") - - if (NOT EXISTS "${_hdr_file}") -@@ -98,30 +224,42 @@ function(_lua_get_header_version) - file(STRINGS "${_hdr_file}" lua_version_strings - REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*") - -- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};") -- if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$") -- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};") -- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};") -- set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}") -+ string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR(_N)?[ \t]+\"?([0-9])\"?[ \t]*;.*" "\\2" Lua_VERSION_MAJOR ";${lua_version_strings};") -+ -+ if (Lua_VERSION_MAJOR MATCHES "^[0-9]+$") -+ string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR(_N)?[ \t]+\"?([0-9])\"?[ \t]*;.*" "\\2" Lua_VERSION_MINOR ";${lua_version_strings};") -+ string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE(_N)?[ \t]+\"?([0-9])\"?[ \t]*;.*" "\\2" Lua_VERSION_PATCH ";${lua_version_strings};") -+ set(Lua_VERSION "${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR}.${Lua_VERSION_PATCH}") - else () -- string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};") -- if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$") -- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};") -+ string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" Lua_VERSION ";${lua_version_strings};") -+ if (NOT Lua_VERSION MATCHES "^[0-9.]+$") -+ string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" Lua_VERSION ";${lua_version_strings};") - endif () -- string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}") -- string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}") -- string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}") -+ string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" Lua_VERSION_MAJOR "${Lua_VERSION}") -+ string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" Lua_VERSION_MINOR "${Lua_VERSION}") -+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" Lua_VERSION_PATCH "${Lua_VERSION}") - endif () - foreach (ver IN LISTS _lua_append_versions) -- if (ver STREQUAL "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}") -- set(LUA_VERSION_MAJOR ${LUA_VERSION_MAJOR} PARENT_SCOPE) -- set(LUA_VERSION_MINOR ${LUA_VERSION_MINOR} PARENT_SCOPE) -- set(LUA_VERSION_PATCH ${LUA_VERSION_PATCH} PARENT_SCOPE) -- set(LUA_VERSION_STRING ${LUA_VERSION_STRING} PARENT_SCOPE) -- return() -+ if (ver STREQUAL "${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR}") -+ set(LUA_VERSION_STRING "${Lua_VERSION}") -+ set(LUA_VERSION_MAJOR "${Lua_VERSION_MAJOR}") -+ set(LUA_VERSION_MINOR "${Lua_VERSION_MINOR}") -+ set(LUA_VERSION_PATCH "${Lua_VERSION_PATCH}") -+ -+ return( -+ PROPAGATE -+ Lua_VERSION -+ Lua_VERSION_MAJOR -+ Lua_VERSION_MINOR -+ Lua_VERSION_PATCH -+ LUA_VERSION_STRING -+ LUA_VERSION_MAJOR -+ LUA_VERSION_MINOR -+ LUA_VERSION_PATCH -+ ) - endif () - endforeach () --endfunction(_lua_get_header_version) -+endfunction() - - function(_lua_find_header) - _lua_set_version_vars() -@@ -147,9 +285,9 @@ function(_lua_find_header) - endif() - _lua_get_header_version() - # Found accepted version -> Ok -- if (LUA_VERSION_STRING) -+ if (Lua_VERSION) - if (LUA_Debug) -- message(STATUS "Found suitable version ${LUA_VERSION_STRING} in ${LUA_INCLUDE_DIR}/lua.h") -+ message(STATUS "Found suitable version ${Lua_VERSION} in ${LUA_INCLUDE_DIR}/lua.h") - endif() - return() - endif() -@@ -169,12 +307,12 @@ _lua_find_header() - _lua_get_header_version() - unset(_lua_append_versions) - --if (LUA_VERSION_STRING) -+if (Lua_VERSION) - set(_lua_library_names -- lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR} -- lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} -- lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} -- lua.${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} -+ lua${Lua_VERSION_MAJOR}${Lua_VERSION_MINOR} -+ lua${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR} -+ lua-${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR} -+ lua.${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR} - ) - endif () - -@@ -189,7 +327,7 @@ find_library(LUA_LIBRARY - unset(_lua_library_names) - - if (LUA_LIBRARY) -- # include the math library for Unix -+ # include the math library for Unixes other than macOS - if (UNIX AND NOT APPLE AND NOT BEOS) - find_library(LUA_MATH_LIBRARY m) - mark_as_advanced(LUA_MATH_LIBRARY) -@@ -208,11 +346,9 @@ if (LUA_LIBRARY) - endif () - - include(FindPackageHandleStandardArgs) --# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if --# all listed variables are TRUE --FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua -+find_package_handle_standard_args(Lua - REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR -- VERSION_VAR LUA_VERSION_STRING) -+ VERSION_VAR Lua_VERSION) - - mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY) - -@@ -220,8 +356,6 @@ cmake_policy(POP) - - IF(Lua_FOUND) - SET( LUA_INCLUDE_DIRS ${LUA_INCLUDE_DIR} ) -- -- unset(HAVE_LUA_INTEGER_SIZE CACHE) - cmake_push_check_state() - include(CheckTypeSize) - set(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR}) -@@ -244,6 +378,55 @@ IF(Lua_FOUND) - # it here. - set(HAVE_LUA_UNICODE True) - endif() -+ -+ # -+ # Lua 5.4.5 broke the Lua API by adding a second argument to -+ # lua_resetthread(). -+ # -+ # Fedora, and possibly other Linux distributions, compounded -+ # that error by backporting a fix from 5.4.5 that iincluded -+ # that API-breaking change, but didn't change LUA_VERSION_RELEASE_NUM, -+ # so that checking for LUA_VERSION_RELEASE_NUM == 50404 isn't -+ # sufficient to detect the broken version of the API. -+ # -+ # See the thread starting at -+ # -+ # https://lists.wireshark.org/archives/wireshark-dev/202511/msg00031.html -+ # -+ # So we do it the hard way, by checking whether a program that -+ # calls the one-argument version compiles. -+ # -+ # CMake doesn't appear to support "check whether this C source -+ # compiles, but don't bother testing whether it links", which -+ # is what we want here - all we care about is whether the -+ # two-argument call to lua_resetthread() compiles or fails to -+ # compile, not whether the routine is available in the library. -+ # This test will fail if the link fails; we are testing with -+ # a two-argument call, so that means that, if the link fails -+ # for any reason (wrong required libraries, wrong required flags, -+ # etc.), we'll treat Lua as having a one-argument lua_resetthread(). -+ # -+ include(CheckCSourceCompiles) -+ cmake_push_check_state() -+ set(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR}) -+ set(CMAKE_EXTRA_INCLUDE_FILES "luaconf.h") -+ set(CMAKE_REQUIRED_LIBRARIES ${LUA_LIBRARIES}) -+ check_c_source_compiles( -+ " -+// -+// Undo any definition of _FORTIFY_SOURCE, so that we don't get a -+// complaint that we're compiling without optimization. -+// -+#undef _FORTIFY_SOURCE -+#include -+ -+int -+main(void) -+{ -+ return lua_resetthread(NULL, NULL); -+} -+" HAVE_TWO_ARGUMENT_LUA_RESETTHREAD) -+ cmake_pop_check_state() - ELSE(Lua_FOUND) - SET( LUA_LIBRARIES ) - SET( LUA_INCLUDE_DIRS ) -From ec16791d8d68f9045400a0610a5a10b1ea544dfd Mon Sep 17 00:00:00 2001 -From: Jaap Keuter -Date: Thu, 5 Mar 2026 22:52:23 +0100 -Subject: [PATCH] Lua: Adjust for Lua 5.5 lua_newstate parameter extension - -In Lua 5.5 the lua_newstate function gained a new parameter. -Create a conditional compilation to handle the difference. - -Fixes #21060 - -AI-Assisted: no ---- - epan/wslua/init_wslua.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c -index cd47e6737fe..b1fe8a3f980 100644 ---- a/epan/wslua/init_wslua.c -+++ b/epan/wslua/init_wslua.c -@@ -1714,7 +1714,15 @@ void wslua_init(register_cb cb, void *client_data, const char* app_env_var_prefi - } - - if (!L) { -+#if LUA_VERSION_NUM > 504 -+ // This function now requires a hash seed for the JS hash function -+ // (by Justin Sobel) as used for Lua's string hashing function. -+ // However the seed is mangled with the string length before use, -+ // so it doesn't really matter what it is. -+ L = lua_newstate(wslua_allocf, NULL, 1315423911); -+#else - L = lua_newstate(wslua_allocf, NULL); -+#endif - } - - WSLUA_INIT(L); --- -GitLab - diff --git a/wireshark.spec b/wireshark.spec index a717d8e..8aa22e5 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,8 +8,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.6.4 -Release: 2%{?dist} +Version: 4.6.6 +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/ @@ -30,7 +30,6 @@ 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 -Patch10: wireshark-0010-find-lua-5.5.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -280,6 +279,7 @@ fi %{_mandir}/man1/randpktdump.* %{_mandir}/man1/dpauxmon.* %{_mandir}/man1/sdjournal.* +%{_mandir}/man1/sharkd.* %{_mandir}/man1/etwdump.* %{_mandir}/man4/extcap.* %{_datadir}/doc/wireshark/* @@ -305,6 +305,9 @@ fi %endif %changelog +* Mon Jun 01 2026 Michal Ruprich - 1:4.6.6-1 +- New version 4.6.6 + * Wed Mar 11 2026 Michal Ruprich - 1:4.6.4-2 - Python tools should only be shipped in Fedora From 5320fdb53445b256e4f2dd6dabbe499624eb168c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:05:20 -0400 Subject: [PATCH 22/31] Rebuilt for openssl 4.0 --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 8aa22e5..1bd22ed 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -9,7 +9,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.6.6 -Release: 1%{?dist} +Release: 2%{?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/ @@ -305,6 +305,9 @@ fi %endif %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 1:4.6.6-2 +- Rebuilt for openssl 4.0 + * Mon Jun 01 2026 Michal Ruprich - 1:4.6.6-1 - New version 4.6.6 From 41f57995c5976034ad501589f8b11f3cbde404f8 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 14 Jul 2026 17:38:59 +0200 Subject: [PATCH 23/31] New version 4.6.7 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 6df4fbc..970c3a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.6.6.tar.xz) = fdeca4647ed3bb7dca5a2f5f747afaa877220ec1153c1d0c5f2688d164fa2feb4d2f45175061415fe6602d3328bf8ec028a4ade73eca6ebd8f6b67d2fcb54d5a -SHA512 (SIGNATURES-4.6.6.txt) = 51cfa6344f78ff485ab4613ba25d81363b456117bf5b7328e9c43ae868368e223cf2f10835b4774c255938e4d9edb293bcf210206decd8e87a8377fd51f49d87 +SHA512 (wireshark-4.6.7.tar.xz) = a776d17815dcf74a7bf9b6e0e516ea20e37a2092515afa68fbae30e22b24793ffa4cd8f9bffa781d0b64683e8c2be84b7d0ec1bcb3ff25d62daf1afe652cbb3f +SHA512 (SIGNATURES-4.6.7.txt) = 21f8f9e54855a90057e73835fb5d8dfd2e5f5beff1490d5d70435c6f6e3986bcf6a6aa53d126ff0cd6d4f0b7f2afcce564d5f70ef5e6f92d2e16af101f3b2a15 diff --git a/wireshark.spec b/wireshark.spec index 1bd22ed..0024154 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,8 +8,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.6.6 -Release: 2%{?dist} +Version: 4.6.7 +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/ @@ -305,6 +305,9 @@ fi %endif %changelog +* Tue Jul 14 2026 Michal Ruprich - 1:4.6.7-1 +- New version 4.6.7 + * Sat Jun 13 2026 Yaakov Selkowitz - 1:4.6.6-2 - Rebuilt for openssl 4.0 From 60736f4e6c44e6ba32dd55918a42140aef04e9db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:50:35 +0000 Subject: [PATCH 24/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 0024154..0f8aaab 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -9,7 +9,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.6.7 -Release: 1%{?dist} +Release: 2%{?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/ @@ -305,6 +305,9 @@ fi %endif %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1:4.6.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Tue Jul 14 2026 Michal Ruprich - 1:4.6.7-1 - New version 4.6.7 From c985dfbd418635c49ac9bc0dfd03758a2b9c1b6b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 8 Sep 2026 15:37:55 +0200 Subject: [PATCH 25/31] Remove stray patch which was applied upstream Signed-off-by: Peter Lemenkov --- ...ix-string-overrun-in-plugins-profinet.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 wireshark-0003-fix-string-overrun-in-plugins-profinet.patch 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 7e9cb39..0000000 --- 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 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, uint8_t *drep) - { - uint32_t u32Pointer; -- char szStr[1000]; -+ char szStr[1000] = ""; - uint32_t u32MaxStr = sizeof(szStr); - char *call; - From 928e8ef43e99cdb100e16b684b90f6a579854013 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 8 Sep 2026 16:56:24 +0200 Subject: [PATCH 26/31] Improved tmpdir handling Signed-off-by: Peter Lemenkov --- wireshark-0006-Move-tmp-to-var-tmp.patch | 338 +++++------------------ wireshark-0007-cmakelists.patch | 20 -- wireshark.spec | 14 +- 3 files changed, 86 insertions(+), 286 deletions(-) delete mode 100644 wireshark-0007-cmakelists.patch diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index 01f0a4a..93dc4b2 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -1,273 +1,83 @@ -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 +From e819ed35245a0b9ebda9947f9091401fb70c5533 Mon Sep 17 00:00:00 2001 +From: Peter Hatina +Date: Tue, 24 Sep 2013 10:55:09 +0200 +Subject: [PATCH 1/1] 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. +Fedora mounts /tmp on tmpfs, which is backed by RAM, and capture files +are routinely larger than RAM, so the default temporary directory needs +to be somewhere on disk. +Set TMPDIR in configuration_init(), which every program calls early in +main(). TMPDIR is the one knob that GLib (g_get_tmp_dir()), Qt +(QDir::tempPath()) and child processes such as dumpcap all read, so one +default covers every temporary file rather than the handful of call +sites a per-site patch can reach. A TMPDIR already in the environment is +left alone. + +Only TMPDIR is consulted, and an empty one counts as unset - that is +exactly how GLib and Qt behave on Unix, where TMP and TEMP are ignored +entirely. + +The change is Peter Hatina's, from 2013; the implementation above was +rewritten in 2026 and the original is worth recording. It added +wsutil/wstmpdir.{c,h} - a copy of g_get_tmp_dir() with a /var/tmp +fallback, exported from libwsutil as get_tmp_dir() - and rewrote +create_tempfile() around it. + +That reached three of the roughly seventeen places that ask for a +temporary directory, missing the second temporary file in +rtp_audio_file.cpp, the export-object and traffic-tab dialogs, tshark's +own default, wsutil/socket.c and create_tempdir(). It also worked only +by accident: P_tmpdir is "/tmp" on glibc and was tested ahead of the +/var/tmp default, so the fallback was reached purely because +wstmpdir.c never included . Adding that one header would have +silently restored /tmp. + +Setting TMPDIR keeps Peter's intent and drops all of that. + +Rewritten-by: Peter Lemenkov +Assisted-by: Claude --- - ui/qt/about_dialog.cpp | 3 +- - 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 + wsutil/filesystem.c | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) -diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp -index cdbd865..a2d24c5 100644 ---- a/ui/qt/iax2_analysis_dialog.cpp -+++ b/ui/qt/iax2_analysis_dialog.cpp -@@ -24,6 +24,7 @@ - #include "ui/rtp_stream.h" - #endif - #include -+#include /* for get_tmp_dir() */ - - #include - #include -@@ -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 = 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); -- 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); - - 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 -+++ 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 = 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 531ed91..bd6fd60 100644 ---- a/wsutil/tempfile.c -+++ b/wsutil/tempfile.c -@@ -10,6 +10,8 @@ - - #include "config.h" - #include "tempfile.h" -+#include -+#include /* for get_tmp_dir() */ - - #include - -@@ -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. -@@ -55,13 +57,25 @@ create_tempfile(const char *tempdir, char **namebuf, const char *pfx, const char - { - int fd; - char *safe_pfx = sanitize_prefix(pfx); -+ gchar *tmp_file; -+ const char *tmp_dir; -+ int old_mask; - - 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); +diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c +index f1c7358a97..6ee028cb71 100644 +--- a/wsutil/filesystem.c ++++ b/wsutil/filesystem.c +@@ -932,6 +932,32 @@ configuration_init(const char* arg0) + #ifdef _WIN32 + return configuration_init_w32(arg0); + #else ++ /* ++ * Fedora mounts /tmp on tmpfs, which is backed by RAM, and capture ++ * files are routinely larger than RAM. Default the temporary ++ * directory to /var/tmp unless the user has asked for something else. ++ * ++ * TMPDIR is the one knob that GLib (g_get_tmp_dir()), Qt ++ * (QDir::tempPath()) and child processes such as dumpcap all read on ++ * this platform, so setting it here covers every temporary file the ++ * programs create without having to touch each call site. It has to ++ * happen before any of them run, and configuration_init() is among ++ * the first things every program calls. ++ * ++ * Only TMPDIR is consulted. TMP and TEMP are Windows spellings that ++ * neither GLib nor Qt looks at on Unix, so honouring them here would ++ * promise something the rest of the code cannot keep. ++ * ++ * An empty TMPDIR counts as unset, which is how both GLib and Qt ++ * treat it - otherwise it would suppress this default and leave them ++ * falling back to /tmp, the one outcome nobody asked for. ++ */ ++ const char *tmpdir = g_getenv("TMPDIR"); + -+ 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); - } - else { -diff --git a/wsutil/tempfile.h b/wsutil/tempfile.h -index 70031b5419..72011e265a 100644 ---- a/wsutil/tempfile.h -+++ b/wsutil/tempfile.h -@@ -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. -diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c -new file mode 100644 -index 0000000000..9128d354ce ---- /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); ++ if (tmpdir == NULL || tmpdir[0] == '\0') { ++ g_setenv("TMPDIR", "/var/tmp", true); + } + -+ return tmp_dir; -+} -diff --git a/wsutil/wstmpdir.h b/wsutil/wstmpdir.h -new file mode 100644 -index 0000000000..07ac5837ac ---- /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 + return configuration_init_posix(arg0); + #endif + } -- -2.37.3 +2.55.0 -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 - - #include "main_application.h" -+#include /* for get_tmp_dir() */ - - #include - -@@ -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 */ diff --git a/wireshark-0007-cmakelists.patch b/wireshark-0007-cmakelists.patch deleted file mode 100644 index 18064e2..0000000 --- a/wireshark-0007-cmakelists.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt -index a55086c..0149801 100644 ---- a/wsutil/CMakeLists.txt -+++ b/wsutil/CMakeLists.txt -@@ -80,6 +80,7 @@ set(WSUTIL_PUBLIC_HEADERS - ws_roundup.h - ws_strptime.h - wsgcrypt.h -+ wstmpdir.h - wsjson.h - wslog.h - xtea.h -@@ -135,6 +136,7 @@ set(WSUTIL_COMMON_FILES - ws_pipe.c - ws_strptime.c - wsgcrypt.c -+ wstmpdir.c - wsjson.c - wslog.c - xtea.c diff --git a/wireshark.spec b/wireshark.spec index 0f8aaab..9f02b5e 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -9,7 +9,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.6.7 -Release: 2%{?dist} +Release: 3%{?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/ @@ -27,7 +27,6 @@ Patch4: wireshark-0004-Restore-Fedora-specific-groups.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 Patch8: wireshark-0008-pkgconfig.patch Patch9: wireshark-0009-remove-strato-manpages.patch @@ -305,6 +304,17 @@ fi %endif %changelog +* Tue Sep 08 2026 Peter Lemenkov - 1:4.6.7-3 +- Rewrite the /var/tmp patch to set TMPDIR in configuration_init() rather + than add wsutil/wstmpdir.{c,h} and rewrite create_tempfile(). TMPDIR is + read by GLib, by Qt and by child processes such as dumpcap, so one + default now covers every temporary file instead of three of the roughly + seventeen places that ask for a temporary directory +- Drop wireshark-0007-cmakelists.patch, which existed only to build the + files the rewrite removes +- Drop the stray wireshark-0003 patch, applied upstream in 0bc06ec1086 and + unreferenced by the spec since 4.6.0 + * Fri Jul 17 2026 Fedora Release Engineering - 1:4.6.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 66b902e4f8b5a4d0f12279886e6bd00b6d90ce4f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 8 Sep 2026 20:11:17 +0200 Subject: [PATCH 27/31] Remove unnecessary patch `cmake --install build --component Development` does the trick. Signed-off-by: Peter Lemenkov --- wireshark-0008-pkgconfig.patch | 13 ------------- wireshark.spec | 1 - 2 files changed, 14 deletions(-) delete mode 100644 wireshark-0008-pkgconfig.patch diff --git a/wireshark-0008-pkgconfig.patch b/wireshark-0008-pkgconfig.patch deleted file mode 100644 index b5df5b2..0000000 --- a/wireshark-0008-pkgconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -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}") diff --git a/wireshark.spec b/wireshark.spec index 9f02b5e..0e5d38f 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -27,7 +27,6 @@ Patch4: wireshark-0004-Restore-Fedora-specific-groups.patch Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch # Fedora-specific Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch -Patch8: wireshark-0008-pkgconfig.patch Patch9: wireshark-0009-remove-strato-manpages.patch #install tshark together with wireshark GUI From 0a1e55a478a455c19f5677256ee6cc6be16a482d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 8 Sep 2026 21:26:46 +0200 Subject: [PATCH 28/31] Drop the Categories patch, which adds a deprecated value The patch added Application to the Categories list in the desktop file. That value is not in the freedesktop category registry, and desktop-file-validate reports it: warning: value "Application;Network;Monitor;Qt;" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application" The %install section runs desktop-file-validate on the installed file, so that warning has been in every build. It is a warning rather than an error, which is why it went unnoticed. Application was a required category back in Desktop Entry Specification 0.9.x, when this patch was written, and it is also what Fedora's old desktop-file-install --add-category=Application produced. Neither is current, and modern desktops ignore the value. The entry already says Type=Application on the line above, so it was redundant even when it was valid. Upstream's Categories=Network;Monitor;Qt; is correct as it stands: one main category and two additional ones, all of them registered, and it validates clean. Nothing to send upstream here. Signed-off-by: Peter Lemenkov --- ...hark-0004-Restore-Fedora-specific-groups.patch | 15 --------------- wireshark.spec | 2 -- 2 files changed, 17 deletions(-) delete mode 100644 wireshark-0004-Restore-Fedora-specific-groups.patch diff --git a/wireshark-0004-Restore-Fedora-specific-groups.patch b/wireshark-0004-Restore-Fedora-specific-groups.patch deleted file mode 100644 index 53e62dc..0000000 --- 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/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: - # https://specifications.freedesktop.org/menu-spec/1.0/ --Categories=Network;Monitor;Qt; -+Categories=Application;Network;Monitor;Qt; diff --git a/wireshark.spec b/wireshark.spec index 0e5d38f..9804047 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -22,8 +22,6 @@ Source3: wireshark.sysusers # Fedora-specific Patch2: wireshark-0002-Customize-permission-denied-error.patch # Fedora-specific -Patch4: wireshark-0004-Restore-Fedora-specific-groups.patch -# Fedora-specific Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch # Fedora-specific Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch From ed6da4fd7955a1bd61f91b3773ef28c79dd21061 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 8 Sep 2026 21:30:05 +0200 Subject: [PATCH 29/31] Added note about upstream proposal Signed-off-by: Peter Lemenkov --- wireshark.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wireshark.spec b/wireshark.spec index 9804047..0f29581 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -25,6 +25,7 @@ Patch2: wireshark-0002-Customize-permission-denied-error.patch Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch # Fedora-specific Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch +# Proposed upstream - https://gitlab.com/wireshark/wireshark/-/merge_requests/26425 Patch9: wireshark-0009-remove-strato-manpages.patch #install tshark together with wireshark GUI From 9b43c179e8fac8c4e138c96106a4b7a70f454faa Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 8 Sep 2026 21:45:00 +0200 Subject: [PATCH 30/31] Drop the desktop-file path patch, whose reason no longer holds The patch rewrote TryExec and Exec in the desktop file to absolute paths. It was added for rhbz #1059188: Nautilus refused to open pcap files, reporting "There is no application installed for 'Packet Capture (PCAPNG)' files", because Wireshark was installed in /usr/sbin, which is not on an ordinary user's PATH. A TryExec that cannot be resolved lets the entry be ignored, so the association disappeared. Naming the binary in full was the right fix for a binary that is not on PATH. Wireshark is in /usr/bin now, and /usr/sbin is a symlink to bin, so "wireshark" resolves for any user and the entry works as upstream ships it. Keeping the absolute path is not free. It makes the menu entry disagree with the shell: a build in ~/.local/bin is what "wireshark" runs in a terminal, but the desktop entry would still start /usr/bin/wireshark. It is also the minority form here - of the desktop files installed on a Fedora system, roughly four in five name the program without a path, and those that do use one are mostly /usr/libexec programs, which is the same "not on PATH" reason that has now gone away. A build installed under ~/.local is unaffected either way, since it installs its own desktop file into ~/.local/share/applications, which is searched ahead of /usr/share/applications. Signed-off-by: Peter Lemenkov --- ...ix-paths-in-a-wireshark.desktop-file.patch | 20 ------------------- wireshark.spec | 2 -- 2 files changed, 22 deletions(-) delete mode 100644 wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch 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 325afe2..0000000 --- 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/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]=Аналізатор мережевого трафіку - 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.spec b/wireshark.spec index 0f29581..7569741 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -22,8 +22,6 @@ Source3: wireshark.sysusers # Fedora-specific Patch2: wireshark-0002-Customize-permission-denied-error.patch # Fedora-specific -Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch -# Fedora-specific Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch # Proposed upstream - https://gitlab.com/wireshark/wireshark/-/merge_requests/26425 Patch9: wireshark-0009-remove-strato-manpages.patch From 4d423a48ee8e9733e04eed17b9b87578b605fc60 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 9 Sep 2026 10:17:55 +0200 Subject: [PATCH 31/31] New version 4.6.8 Signed-off-by: Peter Lemenkov --- sources | 4 +- ...02-Customize-permission-denied-error.patch | 10 +- wireshark-0006-Move-tmp-to-var-tmp.patch | 10 +- wireshark-0009-remove-strato-manpages.patch | 259 ++++++++++++++++-- wireshark.spec | 9 +- 5 files changed, 253 insertions(+), 39 deletions(-) diff --git a/sources b/sources index 970c3a7..844e3d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.6.7.tar.xz) = a776d17815dcf74a7bf9b6e0e516ea20e37a2092515afa68fbae30e22b24793ffa4cd8f9bffa781d0b64683e8c2be84b7d0ec1bcb3ff25d62daf1afe652cbb3f -SHA512 (SIGNATURES-4.6.7.txt) = 21f8f9e54855a90057e73835fb5d8dfd2e5f5beff1490d5d70435c6f6e3986bcf6a6aa53d126ff0cd6d4f0b7f2afcce564d5f70ef5e6f92d2e16af101f3b2a15 +SHA512 (wireshark-4.6.8.tar.xz) = 4692bd15bebd67475502b6afe106e3be85b90add16f932d7e58c4426fd62b5886e96daa522aafd9ee4a8300bf3e091a738b5b1fa20e3e0721d0d0f3be216f3c8 +SHA512 (SIGNATURES-4.6.8.txt) = 598caa682ac71899465fb82a37445f7141287bbabee964dfd33aedbb4c4c6e0ed9b206d458b9eb2d9a083f9c6db9f8b50d8dcaf11e26dc33bb8baee83ae3f6fa diff --git a/wireshark-0002-Customize-permission-denied-error.patch b/wireshark-0002-Customize-permission-denied-error.patch index 5c9d237..4b9580c 100644 --- a/wireshark-0002-Customize-permission-denied-error.patch +++ b/wireshark-0002-Customize-permission-denied-error.patch @@ -1,8 +1,14 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "From: Jan Safranek" +Date: Wed, 9 Sep 2026 08:53:35 +0200 +Subject: [PATCH] Customize 'permission denied' error. + + diff --git a/capture/capture_sync.c b/capture/capture_sync.c -index af08b32..2e0fcb7 100644 +index 36a8f3edbe..db8b49b816 100644 --- a/capture/capture_sync.c +++ b/capture/capture_sync.c -@@ -1825,8 +1832,16 @@ sync_pipe_input_cb(GIOChannel *pipe_io, capture_session *cap_session) +@@ -2102,8 +2102,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); } diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index 93dc4b2..fa13f0e 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -1,7 +1,7 @@ -From e819ed35245a0b9ebda9947f9091401fb70c5533 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Hatina Date: Tue, 24 Sep 2013 10:55:09 +0200 -Subject: [PATCH 1/1] Move /tmp to /var/tmp +Subject: [PATCH] Move /tmp to /var/tmp Fedora mounts /tmp on tmpfs, which is backed by RAM, and capture files are routinely larger than RAM, so the default temporary directory needs @@ -37,9 +37,6 @@ Setting TMPDIR keeps Peter's intent and drops all of that. Rewritten-by: Peter Lemenkov Assisted-by: Claude ---- - wsutil/filesystem.c | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index f1c7358a97..6ee028cb71 100644 @@ -78,6 +75,3 @@ index f1c7358a97..6ee028cb71 100644 return configuration_init_posix(arg0); #endif } --- -2.55.0 - diff --git a/wireshark-0009-remove-strato-manpages.patch b/wireshark-0009-remove-strato-manpages.patch index f61c64e..d8f65e8 100644 --- a/wireshark-0009-remove-strato-manpages.patch +++ b/wireshark-0009-remove-strato-manpages.patch @@ -1,44 +1,257 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Tue, 8 Sep 2026 19:49:08 +0200 +Subject: [PATCH] Docs: Build a manual page only when its program is built + +The manual pages are added to the build unconditionally, so a build +configured without a program still generates, installs and packages +that program's page. + +The default configuration shows it. BUILD_stratoshark is OFF by +default, yet stratoshark(1), strato(1), falcodump(1), sshdig(1) and +dumpcalls(1) are built and installed anyway, along with the Stratoshark +release notes, documenting programs that were never compiled. The same +goes for anything else switched off: randpktdump(1) survives +-DBUILD_randpktdump=OFF, and etwdump(1) is installed on every platform, +though the program it describes is built only on Windows. + +Guard each page on the condition its program is built under, which is +what dpauxmon, sdjournal and mmdbresolve already do a few lines further +down. That means the dependency as well as the option, so sshdump, +ciscodump, wifidump and sshdig follow LIBSSH_FOUND and falcodump and +dumpcalls follow SINSP_FOUND, exactly as extcap/CMakeLists.txt builds +them. Extend the same to the HTML pages in DOC_FILES, where falcodump +and dumpcalls were already guarded and the rest were not, and to the +Stratoshark release notes. + +sshdig moves to the stratoshark package in the Debian packaging. It is +a Stratoshark extcap, installed into STRATOSHARK_EXTCAP_INSTALL_LIBDIR +and shipped with stratoshark, but its manual page was listed in +wireshark-common. That was already wrong - a default build has no +sshdig binary in that package - and it becomes a build failure once the +page is only generated when the program is: + + dh_installman: error: Cannot find (any matches for) + "obj-*/doc/man_pages/sshdig.1" (tried in ., debian/tmp) + +Pages for things that are always built - wireshark, tshark, capinfos, +captype, dumpcap, editcap, mergecap, randpkt, rawshark, reordercap, +sharkd, text2pcap and the section 4 pages - stay unconditional. + +Assisted-by: Claude +Signed-off-by: Peter Lemenkov + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2129bd0b22..e467cfdb1f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2281,33 +2281,60 @@ endif() + + if (ASCIIDOCTOR_FOUND) + list(APPEND DOC_FILES +- ${CMAKE_BINARY_DIR}/doc/man_pages/androiddump.html +- ${CMAKE_BINARY_DIR}/doc/man_pages/udpdump.html + ${CMAKE_BINARY_DIR}/doc/man_pages/capinfos.html + ${CMAKE_BINARY_DIR}/doc/man_pages/captype.html +- ${CMAKE_BINARY_DIR}/doc/man_pages/ciscodump.html + ${CMAKE_BINARY_DIR}/doc/man_pages/dumpcap.html + ${CMAKE_BINARY_DIR}/doc/man_pages/editcap.html + ${CMAKE_BINARY_DIR}/doc/man_pages/extcap.html + ${CMAKE_BINARY_DIR}/doc/man_pages/mergecap.html + ${CMAKE_BINARY_DIR}/doc/man_pages/randpkt.html +- ${CMAKE_BINARY_DIR}/doc/man_pages/randpktdump.html +- ${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 + ${CMAKE_BINARY_DIR}/doc/man_pages/wireshark.html + ${CMAKE_BINARY_DIR}/doc/man_pages/wireshark-filter.html + "${CMAKE_BINARY_DIR}/doc/Wireshark Release Notes.html" +- "${CMAKE_BINARY_DIR}/doc/Stratoshark Release Notes.html" + ) ++ ++ # ++ # As with the manual pages themselves, only install the HTML for a ++ # program that is actually built. ++ # ++ if(BUILD_stratoshark) ++ list(APPEND DOC_FILES ++ ${CMAKE_BINARY_DIR}/doc/man_pages/stratoshark.html ++ "${CMAKE_BINARY_DIR}/doc/Stratoshark Release Notes.html" ++ ) ++ endif() ++ if(BUILD_strato) ++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/strato.html) ++ endif() ++ if(BUILD_androiddump) ++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/androiddump.html) ++ endif() ++ if(BUILD_ciscodump AND LIBSSH_FOUND) ++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/ciscodump.html) ++ endif() ++ if(BUILD_etwdump AND WIN32) ++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/etwdump.html) ++ endif() ++ if(BUILD_randpktdump) ++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/randpktdump.html) ++ endif() ++ if(BUILD_sshdig AND LIBSSH_FOUND) ++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/sshdig.html) ++ endif() ++ if(BUILD_sshdump AND LIBSSH_FOUND) ++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/sshdump.html) ++ endif() ++ if(BUILD_udpdump) ++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/udpdump.html) ++ endif() ++ if(BUILD_wifidump AND LIBSSH_FOUND) ++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/wifidump.html) ++ endif() + if(MAXMINDDB_FOUND) + list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/mmdbresolve.html) + endif() diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index adcfa0c..fd92872 100644 +index a92ed452fe..7a05821b4c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt -@@ -40,8 +40,6 @@ endmacro() +@@ -40,28 +40,70 @@ 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(androiddump 1) ADD_MAN_PAGE(capinfos 1) -@@ -48,13 +46,11 @@ ADD_MAN_PAGE(ciscodump 1) + ADD_MAN_PAGE(captype 1) +-ADD_MAN_PAGE(ciscodump 1) ADD_MAN_PAGE(dumpcap 1) ADD_MAN_PAGE(editcap 1) - ADD_MAN_PAGE(etwdump 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(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(sshdump 1) ADD_MAN_PAGE(text2pcap 1) +-ADD_MAN_PAGE(udpdump 1) +-ADD_MAN_PAGE(wifidump 1) ++ ++# ++# A program that is not built should not leave a manual page behind for ++# it. Each of these follows the option that decides whether the program ++# is built, the same way dpauxmon, sdjournal and mmdbresolve do below. ++# ++if(BUILD_stratoshark) ++ ADD_MAN_PAGE(stratoshark 1) ++endif() ++ ++if(BUILD_strato) ++ ADD_MAN_PAGE(strato 1) ++endif() ++ ++if(BUILD_androiddump) ++ ADD_MAN_PAGE(androiddump 1) ++endif() ++ ++if(BUILD_ciscodump AND LIBSSH_FOUND) ++ ADD_MAN_PAGE(ciscodump 1) ++endif() ++ ++if(BUILD_dumpcalls AND SINSP_FOUND) ++ ADD_MAN_PAGE(dumpcalls 1) ++endif() ++ ++if(BUILD_etwdump AND WIN32) ++ ADD_MAN_PAGE(etwdump 1) ++endif() ++ ++if(BUILD_falcodump AND SINSP_FOUND) ++ ADD_MAN_PAGE(falcodump 1) ++endif() ++ ++if(BUILD_randpktdump) ++ ADD_MAN_PAGE(randpktdump 1) ++endif() ++ ++if(BUILD_sshdig AND LIBSSH_FOUND) ++ ADD_MAN_PAGE(sshdig 1) ++endif() ++ ++if(BUILD_sshdump AND LIBSSH_FOUND) ++ ADD_MAN_PAGE(sshdump 1) ++endif() ++ ++if(BUILD_udpdump) ++ ADD_MAN_PAGE(udpdump 1) ++endif() ++ ++if(BUILD_wifidump AND LIBSSH_FOUND) ++ ADD_MAN_PAGE(wifidump 1) ++endif() -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 + ADD_MAN_PAGE(extcap 4) + ADD_MAN_PAGE(wireshark-filter 4) +@@ -112,13 +154,17 @@ endif() + if(ASCIIDOCTOR_FOUND) + ASCIIDOCTOR2HTML("Wireshark_Release_Notes.adoc" CONVERT_UNDERSCORES) + ASCIIDOCTOR2TXT("Wireshark_Release_Notes.adoc" CONVERT_UNDERSCORES) +- ASCIIDOCTOR2HTML("Stratoshark_Release_Notes.adoc" CONVERT_UNDERSCORES) +- ASCIIDOCTOR2TXT("Stratoshark_Release_Notes.adoc" CONVERT_UNDERSCORES) ++ set(RELEASE_NOTES_HTML "${CMAKE_CURRENT_BINARY_DIR}/Wireshark Release Notes.html") ++ ++ # Only the release notes for something that was built. ++ if(BUILD_stratoshark) ++ ASCIIDOCTOR2HTML("Stratoshark_Release_Notes.adoc" CONVERT_UNDERSCORES) ++ list(APPEND RELEASE_NOTES_HTML "${CMAKE_CURRENT_BINARY_DIR}/Stratoshark Release Notes.html") ++ endif() + + add_custom_target(release_notes_html + DEPENDS +- "${CMAKE_CURRENT_BINARY_DIR}/Wireshark Release Notes.html" +- "${CMAKE_CURRENT_BINARY_DIR}/Stratoshark Release Notes.html" ++ ${RELEASE_NOTES_HTML} + ) + set_target_properties(release_notes_html PROPERTIES FOLDER "Documentation") + +@@ -166,8 +212,7 @@ if(ASCIIDOCTOR_FOUND) + install( + FILES + ${HTML_INSTALL_FILES} +- "${CMAKE_CURRENT_BINARY_DIR}/Wireshark Release Notes.html" +- "${CMAKE_CURRENT_BINARY_DIR}/Stratoshark Release Notes.html" ++ ${RELEASE_NOTES_HTML} + DESTINATION + ${CMAKE_INSTALL_DOCDIR} + COMPONENT "ReleaseNotes" +diff --git a/packaging/debian/stratoshark.manpages b/packaging/debian/stratoshark.manpages +index 4f27313b47..f13fa2d55d 100644 +--- a/packaging/debian/stratoshark.manpages ++++ b/packaging/debian/stratoshark.manpages +@@ -1,2 +1,3 @@ + usr/share/man/man1/strato.1 + usr/share/man/man1/stratoshark.1 ++usr/share/man/man1/sshdig.1 +diff --git a/packaging/debian/wireshark-common.manpages b/packaging/debian/wireshark-common.manpages +index 9c7ce5956c..974e970e28 100644 +--- a/packaging/debian/wireshark-common.manpages ++++ b/packaging/debian/wireshark-common.manpages +@@ -13,7 +13,6 @@ obj-*/doc/man_pages/androiddump.1 + obj-*/doc/man_pages/ciscodump.1 + obj-*/doc/man_pages/randpktdump.1 + obj-*/doc/man_pages/udpdump.1 +-obj-*/doc/man_pages/sshdig.1 + obj-*/doc/man_pages/sshdump.1 + obj-*/doc/man_pages/wifidump.1 + obj-*/doc/man_pages/extcap.4 diff --git a/wireshark.spec b/wireshark.spec index 7569741..55cddff 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,8 +8,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.6.7 -Release: 3%{?dist} +Version: 4.6.8 +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/ @@ -271,11 +271,9 @@ fi %{_mandir}/man1/androiddump.* %{_mandir}/man1/captype.* %{_mandir}/man1/ciscodump.* -%{_mandir}/man1/randpktdump.* %{_mandir}/man1/dpauxmon.* %{_mandir}/man1/sdjournal.* %{_mandir}/man1/sharkd.* -%{_mandir}/man1/etwdump.* %{_mandir}/man4/extcap.* %{_datadir}/doc/wireshark/* @@ -300,6 +298,9 @@ fi %endif %changelog +* Wed Sep 9 2026 Peter Lemenkov - 1:4.6.8-1 +- New version 4.6.8 + * Tue Sep 08 2026 Peter Lemenkov - 1:4.6.7-3 - Rewrite the /var/tmp patch to set TMPDIR in configuration_init() rather than add wsutil/wstmpdir.{c,h} and rewrite create_tempfile(). TMPDIR is