From 14c3a4d97869d2fd67df80d58c7773ee6407460e Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Mon, 6 Apr 2020 14:55:04 +0200 Subject: [PATCH 001/120] New version 3.2.2 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 65c2e2f..985f6bd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.0.tar.xz) = 30d2d6da4f32167518ec045c9e07f952fa6589a4cde18a765dcc375264005ac9146a36faee77bf701e786ff32b9a673f3f03ccf9ba6c9cb51b2cc120bcabbfcf -SHA512 (SIGNATURES-3.2.0.txt) = 3cd4d4da9306c053d51ed13404a7f1bdbe87c105977c01ac4101887fef040035ce3b19d8e2cca8c16f807370345a37685003d945a09eb29bdf8b95fd84c4c72c +SHA512 (wireshark-3.2.2.tar.xz) = ab0a312369655f10926dc4245c2e11b988e0a1e49ffefe22d8fdad31e4f310b0b141bac080034511f4ffb1c6cace7e6e595c59a8f65d67909fdcb1c16e87b651 +SHA512 (SIGNATURES-3.2.2.txt) = 084e43b65be3acee40486c3aeb9a0788488af87886cd56cf181ac9d38c4070498833c517d31dd24ef0c2cf796468fd356b0a3cbf83c02ef9bea54567c6e7ef9b diff --git a/wireshark.spec b/wireshark.spec index fc01b0c..8f2dced 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,8 +4,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.2.0 -Release: 2%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -259,6 +259,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Apr 06 2020 Michal Ruprich - 1:3.2.2-1 +- New version 3.2.2 + * Fri Jan 31 2020 Fedora Release Engineering - 1:3.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f7db049edebe120ed0e5b6607c01170115d8960b Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 22 May 2020 10:22:16 +0200 Subject: [PATCH 002/120] New version 3.2.4 Enabling build with androiddump (rhbz#1834367) --- sources | 4 ++-- wireshark.spec | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 4dfc574..7e38e8a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.3.tar.xz) = 6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a -SHA512 (SIGNATURES-3.2.3.txt) = adab805747e433387c4b99bdeb839b36669d00637b523bcb5ae02bfa71571239ac085934793f358a017e476c383f2810a9afa7282d46295a9426c4a340fe485a +SHA512 (wireshark-3.2.4.tar.xz) = 67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097 +SHA512 (SIGNATURES-3.2.4.txt) = 180081d1f5bbb5fe406902ec8bd365e69b14ef486f759fe71fa8a65907e9b07902ed758f66ad60feef94c7e0c68f248d360f4076e0a76f5cfe1dec5a6c7dc553 diff --git a/wireshark.spec b/wireshark.spec index f2258e1..41fd1c3 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,7 +4,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.2.3 +Version: 3.2.4 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -128,7 +128,7 @@ and plugins. -DBUILD_mmdbresolve=OFF \ %endif -DBUILD_randpktdump=OFF \ - -DBUILD_androiddump=OFF \ + -DBUILD_androiddump=ON \ -DENABLE_SMI=ON \ -DENABLE_PLUGINS=ON \ -DENABLE_NETLINK=ON \ @@ -220,6 +220,7 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/wireshark/extcap/sshdump %{_libdir}/wireshark/extcap/sdjournal %{_libdir}/wireshark/extcap/dpauxmon +%{_libdir}/wireshark/extcap/androiddump %{_libdir}/wireshark/cmake/*.cmake #the version wireshark uses to store plugins is only x.y, not .z %{_libdir}/wireshark/plugins/%{plugins_version}/epan/*.so @@ -259,6 +260,10 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri May 22 2020 Michal Ruprich - 1:3.2.4-1 +- New version 3.2.4 +- Enabling build with androiddump (rhbz#1834367) + * Mon Apr 13 2020 Gwyn Ciesla - 1:3.2.3-1 - 3.2.3 From 7d7f314c6e3f30096b990b8c909d1fddf68dab92 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 22 May 2020 10:29:18 +0200 Subject: [PATCH 003/120] New version 3.2.4 Enabling build with androiddump (rhbz#1834367) --- sources | 4 ++-- wireshark.spec | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 4dfc574..7e38e8a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.3.tar.xz) = 6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a -SHA512 (SIGNATURES-3.2.3.txt) = adab805747e433387c4b99bdeb839b36669d00637b523bcb5ae02bfa71571239ac085934793f358a017e476c383f2810a9afa7282d46295a9426c4a340fe485a +SHA512 (wireshark-3.2.4.tar.xz) = 67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097 +SHA512 (SIGNATURES-3.2.4.txt) = 180081d1f5bbb5fe406902ec8bd365e69b14ef486f759fe71fa8a65907e9b07902ed758f66ad60feef94c7e0c68f248d360f4076e0a76f5cfe1dec5a6c7dc553 diff --git a/wireshark.spec b/wireshark.spec index f2258e1..5b2d551 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,7 +4,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.2.3 +Version: 3.2.4 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -128,7 +128,7 @@ and plugins. -DBUILD_mmdbresolve=OFF \ %endif -DBUILD_randpktdump=OFF \ - -DBUILD_androiddump=OFF \ + -DBUILD_androiddump=ON \ -DENABLE_SMI=ON \ -DENABLE_PLUGINS=ON \ -DENABLE_NETLINK=ON \ @@ -220,6 +220,7 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/wireshark/extcap/sshdump %{_libdir}/wireshark/extcap/sdjournal %{_libdir}/wireshark/extcap/dpauxmon +%{_libdir}/wireshark/extcap/androiddump %{_libdir}/wireshark/cmake/*.cmake #the version wireshark uses to store plugins is only x.y, not .z %{_libdir}/wireshark/plugins/%{plugins_version}/epan/*.so @@ -259,6 +260,10 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri May 22 2020 Michal Ruprich - 1:3.2.4-1 +- New version 3.2.4 +- Enabling build with androiddump (rhbz#1834367) + * Mon Apr 13 2020 Gwyn Ciesla - 1:3.2.3-1 - 3.2.3 From a25bdc4faf1cc79e0716d4a494d0df42e2d0dbcf Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 2 Jul 2020 14:47:47 +0200 Subject: [PATCH 004/120] New version 3.2.5 --- sources | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 7e38e8a..087895d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.4.tar.xz) = 67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097 -SHA512 (SIGNATURES-3.2.4.txt) = 180081d1f5bbb5fe406902ec8bd365e69b14ef486f759fe71fa8a65907e9b07902ed758f66ad60feef94c7e0c68f248d360f4076e0a76f5cfe1dec5a6c7dc553 +SHA512 (wireshark-3.2.5.tar.xz) = 3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277 +SHA512 (SIGNATURES-3.2.5.txt) = 2289e522601c4ea3359368ebe3e4b5fa2b8cafad08798f2cd8378db1d69f816c2175fcfa1bce675c197caac6d3218e30ebb8c9f2f7f459326ac102985a1a9364 diff --git a/wireshark.spec b/wireshark.spec index 41fd1c3..1476825 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,7 +4,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.2.4 +Version: 3.2.5 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -260,6 +260,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 02 2020 Michal Ruprich - 1:3.2.5-1 +- New version 3.2.5 + * Fri May 22 2020 Michal Ruprich - 1:3.2.4-1 - New version 3.2.4 - Enabling build with androiddump (rhbz#1834367) From a45ede1dc9d055bb1f7c6e7801acc5bdfc7ff1c6 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 2 Jul 2020 14:50:14 +0200 Subject: [PATCH 005/120] New version 3.2.5 --- sources | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 7e38e8a..087895d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.4.tar.xz) = 67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097 -SHA512 (SIGNATURES-3.2.4.txt) = 180081d1f5bbb5fe406902ec8bd365e69b14ef486f759fe71fa8a65907e9b07902ed758f66ad60feef94c7e0c68f248d360f4076e0a76f5cfe1dec5a6c7dc553 +SHA512 (wireshark-3.2.5.tar.xz) = 3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277 +SHA512 (SIGNATURES-3.2.5.txt) = 2289e522601c4ea3359368ebe3e4b5fa2b8cafad08798f2cd8378db1d69f816c2175fcfa1bce675c197caac6d3218e30ebb8c9f2f7f459326ac102985a1a9364 diff --git a/wireshark.spec b/wireshark.spec index 5b2d551..2eee181 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,7 +4,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.2.4 +Version: 3.2.5 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -260,6 +260,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 02 2020 Michal Ruprich - 1:3.2.5-1 +- New version 3.2.5 + * Fri May 22 2020 Michal Ruprich - 1:3.2.4-1 - New version 3.2.4 - Enabling build with androiddump (rhbz#1834367) From 4a6646c2dd2dca70613d1060722c6bd9ee3f603a Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 5 Jul 2020 20:38:50 +0200 Subject: [PATCH 006/120] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- wireshark.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 1476825..38d3245 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,3 +1,4 @@ +%undefine __cmake_in_source_build %global with_lua 1 %global with_maxminddb 1 %global plugins_version 3.2 @@ -134,12 +135,12 @@ and plugins. -DENABLE_NETLINK=ON \ -DBUILD_dcerpcidl2wrs=OFF \ -DBUILD_sdjournal=ON \ - . + %{nil} -make %{?_smp_mflags} +%cmake_build %install -make DESTDIR=%{buildroot} install +%cmake_install desktop-file-validate %{buildroot}%{_datadir}/applications/wireshark.desktop @@ -155,7 +156,7 @@ mkdir -p "${IDIR}/epan/wmem" mkdir -p "${IDIR}/wiretap" mkdir -p "${IDIR}/wsutil" mkdir -p %{buildroot}%{_udevrulesdir} -install -m 644 config.h epan/register.h "${IDIR}/" +install -m 644 %{_vpath_builddir}/config.h epan/register.h "${IDIR}/" install -m 644 cfile.h file.h "${IDIR}/" install -m 644 ws_symbol_export.h "${IDIR}/" install -m 644 epan/*.h "${IDIR}/epan/" From 43d1840f074e7a2c6e66806ed881e016466a5da6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:12:45 +0000 Subject: [PATCH 007/120] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 38d3245..689c9e7 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -261,6 +261,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1:3.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 02 2020 Michal Ruprich - 1:3.2.5-1 - New version 3.2.5 From 3b307fab7e494afc8c7ff9ac6dbd55b3555de89a Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 30 Jul 2020 15:35:42 +0200 Subject: [PATCH 008/120] Adding ownership for dirs created by wireshark (rhbz#1860650) --- wireshark.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 689c9e7..4cee6b5 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -222,8 +222,13 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/wireshark/extcap/sdjournal %{_libdir}/wireshark/extcap/dpauxmon %{_libdir}/wireshark/extcap/androiddump +%dir %{_libdir}/wireshark/cmake %{_libdir}/wireshark/cmake/*.cmake #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 +%dir %{_libdir}/wireshark/plugins/%{plugins_version}/wiretap +%dir %{_libdir}/wireshark/plugins/%{plugins_version}/codecs %{_libdir}/wireshark/plugins/%{plugins_version}/epan/*.so %{_libdir}/wireshark/plugins/%{plugins_version}/wiretap/*.so %{_libdir}/wireshark/plugins/%{plugins_version}/codecs/*.so @@ -261,6 +266,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 30 2020 Michal Ruprich - 1:3.2.5-3 +- Adding ownership for dirs created by wireshark (rhbz#1860650) + * Wed Jul 29 2020 Fedora Release Engineering - 1:3.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 878a05fc884c8dfa5b7520be1f71d021c1b6a271 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 30 Jul 2020 15:38:28 +0200 Subject: [PATCH 009/120] Adding ownership for dirs created by wireshark (rhbz#1860650) --- wireshark.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 2eee181..a7bfbce 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -221,8 +221,13 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/wireshark/extcap/sdjournal %{_libdir}/wireshark/extcap/dpauxmon %{_libdir}/wireshark/extcap/androiddump +%dir %{_libdir}/wireshark/cmake %{_libdir}/wireshark/cmake/*.cmake #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 +%dir %{_libdir}/wireshark/plugins/%{plugins_version}/wiretap +%dir %{_libdir}/wireshark/plugins/%{plugins_version}/codecs %{_libdir}/wireshark/plugins/%{plugins_version}/epan/*.so %{_libdir}/wireshark/plugins/%{plugins_version}/wiretap/*.so %{_libdir}/wireshark/plugins/%{plugins_version}/codecs/*.so @@ -260,6 +265,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 30 2020 Michal Ruprich - 1:3.2.5-2 +- Adding ownership for dirs created by wireshark (rhbz#1860650) + * Thu Jul 02 2020 Michal Ruprich - 1:3.2.5-1 - New version 3.2.5 From 7033d906766522f0842e0c994a06dba2b95331a7 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 19 Aug 2020 10:10:56 +0200 Subject: [PATCH 010/120] New version 3.2.6 Fix for CVE-2020-17498 --- sources | 4 ++-- wireshark.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 087895d..8186cca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.5.tar.xz) = 3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277 -SHA512 (SIGNATURES-3.2.5.txt) = 2289e522601c4ea3359368ebe3e4b5fa2b8cafad08798f2cd8378db1d69f816c2175fcfa1bce675c197caac6d3218e30ebb8c9f2f7f459326ac102985a1a9364 +SHA512 (wireshark-3.2.6.tar.xz) = 71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78 +SHA512 (SIGNATURES-3.2.6.txt) = 58a7f16fc04d3ec6281ac2d736261191500c23bfad6f61b6f842546c640c973302fec7ebe38e64e1f4b093bf64256beca04ed01cffa6e090361a17b370f3a850 diff --git a/wireshark.spec b/wireshark.spec index 4cee6b5..434ac1a 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.2.5 -Release: 3%{?dist} +Version: 3.2.6 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -266,6 +266,10 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Aug 19 2020 Michal Ruprich - 1:3.2.6-1 +- New version 3.2.6 +- Fix for CVE-2020-17498 + * Thu Jul 30 2020 Michal Ruprich - 1:3.2.5-3 - Adding ownership for dirs created by wireshark (rhbz#1860650) From 8fca215a55ddd3ecd44220eeb0f88e16cedbb2ee Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 19 Aug 2020 10:20:20 +0200 Subject: [PATCH 011/120] New version 3.2.6 Fix for CVE-2020-17498 --- sources | 4 ++-- wireshark.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 087895d..8186cca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.5.tar.xz) = 3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277 -SHA512 (SIGNATURES-3.2.5.txt) = 2289e522601c4ea3359368ebe3e4b5fa2b8cafad08798f2cd8378db1d69f816c2175fcfa1bce675c197caac6d3218e30ebb8c9f2f7f459326ac102985a1a9364 +SHA512 (wireshark-3.2.6.tar.xz) = 71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78 +SHA512 (SIGNATURES-3.2.6.txt) = 58a7f16fc04d3ec6281ac2d736261191500c23bfad6f61b6f842546c640c973302fec7ebe38e64e1f4b093bf64256beca04ed01cffa6e090361a17b370f3a850 diff --git a/wireshark.spec b/wireshark.spec index a7bfbce..328098f 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,8 +4,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.2.5 -Release: 2%{?dist} +Version: 3.2.6 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -265,6 +265,10 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Aug 19 2020 Michal Ruprich - 1:3.2.6-1 +- New version 3.2.6 +- Fix for CVE-2020-17498 + * Thu Jul 30 2020 Michal Ruprich - 1:3.2.5-2 - Adding ownership for dirs created by wireshark (rhbz#1860650) From e14ec14401ade3c619c14b963b774480d1270b4e Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 10 Sep 2020 15:50:37 +0200 Subject: [PATCH 012/120] Temporarily disabling LTO --- wireshark.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 434ac1a..ea3a681 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -2,11 +2,13 @@ %global with_lua 1 %global with_maxminddb 1 %global plugins_version 3.2 +# added temporarily due to errors in libqt5core +%define _lto_cflags %{nil} Summary: Network traffic analyzer Name: wireshark Version: 3.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -266,17 +268,20 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog -* Wed Aug 19 2020 Michal Ruprich - 1:3.2.6-1 +* Thu Sep 10 2020 Michal Ruprich - 1:3.2.6-2 +- Temprorarily disabling LTO build due to errors in libqt5core + +* Wed Aug 19 2020 Michal Ruprich - 1:3.2.6-1 - New version 3.2.6 - Fix for CVE-2020-17498 -* Thu Jul 30 2020 Michal Ruprich - 1:3.2.5-3 +* Thu Jul 30 2020 Michal Ruprich - 1:3.2.5-3 - Adding ownership for dirs created by wireshark (rhbz#1860650) * Wed Jul 29 2020 Fedora Release Engineering - 1:3.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Thu Jul 02 2020 Michal Ruprich - 1:3.2.5-1 +* Thu Jul 02 2020 Michal Ruprich - 1:3.2.5-1 - New version 3.2.5 * Fri May 22 2020 Michal Ruprich - 1:3.2.4-1 @@ -286,7 +291,7 @@ getent group usbmon >/dev/null || groupadd -r usbmon * Mon Apr 13 2020 Gwyn Ciesla - 1:3.2.3-1 - 3.2.3 -* Fri Apr 03 2020 Michal Ruprich - 1:3.2.2-1 +* Fri Apr 03 2020 Michal Ruprich - 1:3.2.2-1 - New version 3.2.2 * Fri Jan 31 2020 Fedora Release Engineering - 1:3.2.0-2 From db8f5cd1f9f9f1ee5b85adb8721b89038de8480f Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 9 Oct 2020 09:44:09 +0200 Subject: [PATCH 013/120] New version 3.2.7 Fix for CVE-2020-25862, CVE-2020-25863, CVE-2020-25866 --- sources | 4 ++-- wireshark.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 8186cca..2f57427 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.6.tar.xz) = 71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78 -SHA512 (SIGNATURES-3.2.6.txt) = 58a7f16fc04d3ec6281ac2d736261191500c23bfad6f61b6f842546c640c973302fec7ebe38e64e1f4b093bf64256beca04ed01cffa6e090361a17b370f3a850 +SHA512 (wireshark-3.2.7.tar.xz) = c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b +SHA512 (SIGNATURES-3.2.7.txt) = c29a1f5772aff17efb7e4d3a7d88d717e788cc31915614b9d8b3b4588e40c33aeeb8183ae94eb7be51401f73557a0267a83f05b73097a793ebb8283f57c21644 diff --git a/wireshark.spec b/wireshark.spec index ea3a681..5fd887c 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,7 +7,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.2.6 +Version: 3.2.7 Release: 2%{?dist} Epoch: 1 License: GPL+ @@ -268,6 +268,10 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Oct 09 2020 Michal Ruprich - 1:3.2.7-1 +- New version 3.2.7 +- Fix for CVE-2020-25862, CVE-2020-25863, CVE-2020-25866 + * Thu Sep 10 2020 Michal Ruprich - 1:3.2.6-2 - Temprorarily disabling LTO build due to errors in libqt5core From 7ba536c11dcb9f53dcb78583cdaa01fe6c532100 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 9 Oct 2020 09:49:59 +0200 Subject: [PATCH 014/120] New version 3.2.7 Fix for CVE-2020-25862, CVE-2020-25863, CVE-2020-25866 --- sources | 4 ++-- wireshark.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 8186cca..2f57427 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.6.tar.xz) = 71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78 -SHA512 (SIGNATURES-3.2.6.txt) = 58a7f16fc04d3ec6281ac2d736261191500c23bfad6f61b6f842546c640c973302fec7ebe38e64e1f4b093bf64256beca04ed01cffa6e090361a17b370f3a850 +SHA512 (wireshark-3.2.7.tar.xz) = c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b +SHA512 (SIGNATURES-3.2.7.txt) = c29a1f5772aff17efb7e4d3a7d88d717e788cc31915614b9d8b3b4588e40c33aeeb8183ae94eb7be51401f73557a0267a83f05b73097a793ebb8283f57c21644 diff --git a/wireshark.spec b/wireshark.spec index 328098f..5a2f198 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,7 +4,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.2.6 +Version: 3.2.7 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -265,6 +265,10 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Oct 09 2020 Michal Ruprich - 1:3.2.7-1 +- New version 3.2.7 +- Fix for CVE-2020-25862, CVE-2020-25863, CVE-2020-25866 + * Wed Aug 19 2020 Michal Ruprich - 1:3.2.6-1 - New version 3.2.6 - Fix for CVE-2020-17498 From dcd6e4a42d26ec6b6d1cfb1d9905905e35fc450f Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 4 Nov 2020 17:51:35 +0100 Subject: [PATCH 015/120] Enabling testing in CI --- .fmf/version | 1 + ci.fmf | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..0df4c06 --- /dev/null +++ b/ci.fmf @@ -0,0 +1,13 @@ +/test: + summary: + CI plan, picks Tier1 tests, runs in beakerlib. + description: + This special plan has to be named ci.fmf to run in CI. + It selects test which have 'tier 1' in their main.fmf file + discover: + - name: tier1 + how: fmf + filter: 'tier: 1' + repository: "https://src.fedoraproject.org/tests/wireshark.git" + execute: + how: beakerlib From 0315112421438859ed3f36d3e4035ffd410484bc Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 3 Dec 2020 14:36:37 +0100 Subject: [PATCH 016/120] New version 3.4.0 Fix for CVE-2020-26575, CVE-2020-28030 --- wireshark-0006-Move-tmp-to-var-tmp.patch | 76 +++++++++++++----------- wireshark.spec | 13 ++-- 2 files changed, 51 insertions(+), 38 deletions(-) diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index 6a4ece9..dbc1d70 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -111,43 +111,50 @@ index fde66c8..b9531d2 100644 tempfile_->open(); diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c -index 8e1f8dc..dcf2f78 100644 +index 5082452..f751a7c 100644 --- a/wsutil/tempfile.c +++ b/wsutil/tempfile.c -@@ -36,6 +36,7 @@ - +@@ -12,10 +12,12 @@ + + #include #include "tempfile.h" - #include ++#include +#include /* for get_tmp_dir() */ - - #ifndef __set_errno - #define __set_errno(x) errno=(x) -@@ -83,13 +83,14 @@ mkstemps(char *path_template, int suffixlen) - */ - char *get_tempfile_path(const char *filename) - { -- return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", g_get_tmp_dir(), filename); -+ return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_tmp_dir(), filename); - } - - #define MAX_TEMPFILES 3 - - /** -- * Create a tempfile with the given prefix (e.g. "wireshark"). -+ * Create a tempfile with the given prefix (e.g. "wireshark"). The path -+ * is created using get_tmp_dir and mkdtemp + + /** + * Create a tempfile with the given prefix (e.g. "wireshark"). The path +- * is created using g_file_open_tmp. ++ * is created using get_tmp_dir. * - * @param namebuf If not NULL, receives the full path of the temp file. - * Should NOT be freed. -@@ -199,7 +200,7 @@ create_tempfile(char **namebuf, const char *pfx, const char *sfx) - tf[idx].path = (char *)g_malloc(tf[idx].len); - } - -- tmp_dir = g_get_tmp_dir(); + * @param namebuf [in,out] If not NULL, receives the full path of the temp file. + * Must be freed. +@@ -30,6 +31,9 @@ create_tempfile(gchar **namebuf, const char *pfx, const char *sfx, GError **err) + { + int fd; + gchar *safe_pfx = NULL; ++ gchar *tmp_file; ++ const char *tmp_dir; ++ int old_mask; + + if (pfx) { + /* The characters in "delimiters" come from: +@@ -49,7 +53,15 @@ create_tempfile(gchar **namebuf, const char *pfx, const char *sfx, GError **err) + gchar* filetmpl = g_strdup_printf("%sXXXXXX%s", safe_pfx ? safe_pfx : "", sfx ? sfx : ""); + g_free(safe_pfx); + +- fd = g_file_open_tmp(filetmpl, namebuf, err); + tmp_dir = get_tmp_dir(); - - #ifdef _WIN32 - _tzset(); ++ tmp_file = g_strconcat(tmp_dir, "/", filetmpl, NULL); ++ ++ if (namebuf) ++ *namebuf = tmp_file; ++ ++ old_mask = ws_umask(0077); ++ fd = mkstemps(tmp_file, sfx ? (int) strlen(sfx) : 0); ++ ws_umask(old_mask); + + g_free(filetmpl); + return fd; diff --git a/wsutil/tempfile.h b/wsutil/tempfile.h index 1dca2df..bb3160c 100644 --- a/wsutil/tempfile.h @@ -156,17 +163,17 @@ index 1dca2df..bb3160c 100644 /** * Create a tempfile with the given prefix (e.g. "wireshark"). The path -- * is created using g_get_tmp_dir and mkstemp. +- * is created using g_file_open_tmp. + * is created using get_tmp_dir and mkstemp. * * @param namebuf [in,out] If not NULL, receives the full path of the temp file. - * Must NOT be freed. + * Must be freed. diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c new file mode 100644 index 0000000..d8b733b --- /dev/null +++ b/wsutil/wstmpdir.c -@@ -0,0 +1,70 @@ +@@ -0,0 +1,71 @@ +/* wstmpdir.c + * + * Copyright (C) 2013 Red Hat, Inc. All right reserved. @@ -224,6 +231,7 @@ index 0000000..d8b733b + 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 */ + diff --git a/wireshark.spec b/wireshark.spec index 5fd887c..982604f 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,14 +1,14 @@ %undefine __cmake_in_source_build %global with_lua 1 %global with_maxminddb 1 -%global plugins_version 3.2 +%global plugins_version 3.4 # added temporarily due to errors in libqt5core %define _lto_cflags %{nil} Summary: Network traffic analyzer Name: wireshark -Version: 3.2.7 -Release: 2%{?dist} +Version: 3.4.0 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -60,7 +60,8 @@ BuildRequires: flex BuildRequires: pcre-devel BuildRequires: perl(Pod::Html) BuildRequires: perl(Pod::Man) -Buildrequires: libssh-devel +BuildRequires: perl(open) +Buildrequires: libssh-devel BuildRequires: qt5-linguist BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtmultimedia-devel @@ -268,6 +269,10 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Dec 02 2020 Michal Ruprich - 1:3.4.0-1 +- New version 3.4.0 +- Fix for CVE-2020-26575, CVE-2020-28030 + * Fri Oct 09 2020 Michal Ruprich - 1:3.2.7-1 - New version 3.2.7 - Fix for CVE-2020-25862, CVE-2020-25863, CVE-2020-25866 From a2ed06751fd12097c70900a3ebf72752e999f0e4 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 3 Dec 2020 14:39:54 +0100 Subject: [PATCH 017/120] Adding new sources for 3.4.0 --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2f57427..5544c0d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.7.tar.xz) = c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b -SHA512 (SIGNATURES-3.2.7.txt) = c29a1f5772aff17efb7e4d3a7d88d717e788cc31915614b9d8b3b4588e40c33aeeb8183ae94eb7be51401f73557a0267a83f05b73097a793ebb8283f57c21644 +SHA512 (wireshark-3.4.0.tar.xz) = 02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649 +SHA512 (SIGNATURES-3.4.0.txt) = 0a91d82381d5874b85346e2b34f17e791b2c9b5e705b53f34b46215b366f4db4a84831d589ab58288578f501c4ec8a7600e271b44ef43355c948fbbd79535b2d From acc398e6bbb4c517adf3aba482ef63bf006d2516 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 3 Dec 2020 15:05:10 +0100 Subject: [PATCH 018/120] New version 3.4.0 Fix for CVE-2020-26575, CVE-2020-28030 --- sources | 4 +- wireshark-0006-Move-tmp-to-var-tmp.patch | 76 +++++++++++++----------- wireshark.spec | 21 ++++--- 3 files changed, 57 insertions(+), 44 deletions(-) diff --git a/sources b/sources index 2f57427..5544c0d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.2.7.tar.xz) = c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b -SHA512 (SIGNATURES-3.2.7.txt) = c29a1f5772aff17efb7e4d3a7d88d717e788cc31915614b9d8b3b4588e40c33aeeb8183ae94eb7be51401f73557a0267a83f05b73097a793ebb8283f57c21644 +SHA512 (wireshark-3.4.0.tar.xz) = 02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649 +SHA512 (SIGNATURES-3.4.0.txt) = 0a91d82381d5874b85346e2b34f17e791b2c9b5e705b53f34b46215b366f4db4a84831d589ab58288578f501c4ec8a7600e271b44ef43355c948fbbd79535b2d diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index 6a4ece9..dbc1d70 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -111,43 +111,50 @@ index fde66c8..b9531d2 100644 tempfile_->open(); diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c -index 8e1f8dc..dcf2f78 100644 +index 5082452..f751a7c 100644 --- a/wsutil/tempfile.c +++ b/wsutil/tempfile.c -@@ -36,6 +36,7 @@ - +@@ -12,10 +12,12 @@ + + #include #include "tempfile.h" - #include ++#include +#include /* for get_tmp_dir() */ - - #ifndef __set_errno - #define __set_errno(x) errno=(x) -@@ -83,13 +83,14 @@ mkstemps(char *path_template, int suffixlen) - */ - char *get_tempfile_path(const char *filename) - { -- return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", g_get_tmp_dir(), filename); -+ return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_tmp_dir(), filename); - } - - #define MAX_TEMPFILES 3 - - /** -- * Create a tempfile with the given prefix (e.g. "wireshark"). -+ * Create a tempfile with the given prefix (e.g. "wireshark"). The path -+ * is created using get_tmp_dir and mkdtemp + + /** + * Create a tempfile with the given prefix (e.g. "wireshark"). The path +- * is created using g_file_open_tmp. ++ * is created using get_tmp_dir. * - * @param namebuf If not NULL, receives the full path of the temp file. - * Should NOT be freed. -@@ -199,7 +200,7 @@ create_tempfile(char **namebuf, const char *pfx, const char *sfx) - tf[idx].path = (char *)g_malloc(tf[idx].len); - } - -- tmp_dir = g_get_tmp_dir(); + * @param namebuf [in,out] If not NULL, receives the full path of the temp file. + * Must be freed. +@@ -30,6 +31,9 @@ create_tempfile(gchar **namebuf, const char *pfx, const char *sfx, GError **err) + { + int fd; + gchar *safe_pfx = NULL; ++ gchar *tmp_file; ++ const char *tmp_dir; ++ int old_mask; + + if (pfx) { + /* The characters in "delimiters" come from: +@@ -49,7 +53,15 @@ create_tempfile(gchar **namebuf, const char *pfx, const char *sfx, GError **err) + gchar* filetmpl = g_strdup_printf("%sXXXXXX%s", safe_pfx ? safe_pfx : "", sfx ? sfx : ""); + g_free(safe_pfx); + +- fd = g_file_open_tmp(filetmpl, namebuf, err); + tmp_dir = get_tmp_dir(); - - #ifdef _WIN32 - _tzset(); ++ tmp_file = g_strconcat(tmp_dir, "/", filetmpl, NULL); ++ ++ if (namebuf) ++ *namebuf = tmp_file; ++ ++ old_mask = ws_umask(0077); ++ fd = mkstemps(tmp_file, sfx ? (int) strlen(sfx) : 0); ++ ws_umask(old_mask); + + g_free(filetmpl); + return fd; diff --git a/wsutil/tempfile.h b/wsutil/tempfile.h index 1dca2df..bb3160c 100644 --- a/wsutil/tempfile.h @@ -156,17 +163,17 @@ index 1dca2df..bb3160c 100644 /** * Create a tempfile with the given prefix (e.g. "wireshark"). The path -- * is created using g_get_tmp_dir and mkstemp. +- * is created using g_file_open_tmp. + * is created using get_tmp_dir and mkstemp. * * @param namebuf [in,out] If not NULL, receives the full path of the temp file. - * Must NOT be freed. + * Must be freed. diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c new file mode 100644 index 0000000..d8b733b --- /dev/null +++ b/wsutil/wstmpdir.c -@@ -0,0 +1,70 @@ +@@ -0,0 +1,71 @@ +/* wstmpdir.c + * + * Copyright (C) 2013 Red Hat, Inc. All right reserved. @@ -224,6 +231,7 @@ index 0000000..d8b733b + 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 */ + diff --git a/wireshark.spec b/wireshark.spec index 5a2f198..ae03733 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,10 +1,10 @@ %global with_lua 1 %global with_maxminddb 1 -%global plugins_version 3.2 +%global plugins_version 3.4 Summary: Network traffic analyzer Name: wireshark -Version: 3.2.7 +Version: 3.4.0 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -57,7 +57,8 @@ BuildRequires: flex BuildRequires: pcre-devel BuildRequires: perl(Pod::Html) BuildRequires: perl(Pod::Man) -Buildrequires: libssh-devel +BuildRequires: perl(open) +Buildrequires: libssh-devel BuildRequires: qt5-linguist BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtmultimedia-devel @@ -265,28 +266,32 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Dec 03 2020 Michal Ruprich - 1:3.4.0-1 +- New version 3.4.0 +- Fix for CVE-2020-26575, CVE-2020-28030 + * Fri Oct 09 2020 Michal Ruprich - 1:3.2.7-1 - New version 3.2.7 - Fix for CVE-2020-25862, CVE-2020-25863, CVE-2020-25866 -* Wed Aug 19 2020 Michal Ruprich - 1:3.2.6-1 +* Wed Aug 19 2020 Michal Ruprich - 1:3.2.6-1 - New version 3.2.6 - Fix for CVE-2020-17498 -* Thu Jul 30 2020 Michal Ruprich - 1:3.2.5-2 +* Thu Jul 30 2020 Michal Ruprich - 1:3.2.5-2 - Adding ownership for dirs created by wireshark (rhbz#1860650) -* Thu Jul 02 2020 Michal Ruprich - 1:3.2.5-1 +* Thu Jul 02 2020 Michal Ruprich - 1:3.2.5-1 - New version 3.2.5 -* Fri May 22 2020 Michal Ruprich - 1:3.2.4-1 +* Fri May 22 2020 Michal Ruprich - 1:3.2.4-1 - New version 3.2.4 - Enabling build with androiddump (rhbz#1834367) * Mon Apr 13 2020 Gwyn Ciesla - 1:3.2.3-1 - 3.2.3 -* Fri Apr 03 2020 Michal Ruprich - 1:3.2.2-1 +* Fri Apr 03 2020 Michal Ruprich - 1:3.2.2-1 - New version 3.2.2 * Fri Jan 31 2020 Fedora Release Engineering - 1:3.2.0-2 From 75916227cf071f8ee127a0849e3addcdc8e823fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:33:45 +0000 Subject: [PATCH 019/120] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 982604f..daa8e7b 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,7 +8,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -269,6 +269,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1:3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Dec 02 2020 Michal Ruprich - 1:3.4.0-1 - New version 3.4.0 - Fix for CVE-2020-26575, CVE-2020-28030 From 60b7a7360895cfa999bc3e15d790557ae8cb0e95 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 21 Dec 2020 10:32:45 -0500 Subject: [PATCH 020/120] Don't trigger udev if socket doesn't exist On rpm-ostree systems, we don't want scriptlets to affect the running system because a major part of the value is "background updates". Scriptlets are run in a containerized environment where e.g. udev is not available. Add a check for the udev socket before triggering it to handle this. This also helps the container use case. See also: https://bugzilla.redhat.com/show_bug.cgi?id=1352154 See also: https://src.fedoraproject.org/rpms/udisks2/pull-request/3 See also: https://github.com/coreos/fedora-coreos-tracker/issues/703 --- wireshark.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index daa8e7b..c2a1f9c 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -184,7 +184,11 @@ getent group usbmon >/dev/null || groupadd -r usbmon %post cli %{?ldconfig} -/usr/bin/udevadm trigger --subsystem-match=usbmon +# 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 +fi %ldconfig_postun cli From eaa032ee04cab00575e74a3da02bdf48f83f697d Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 29 Jan 2021 13:39:47 +0100 Subject: [PATCH 021/120] New version 3.4.2 Fix for CVE-2020-26418, CVE-2020-26419, CVE-2020-26420, CVE-2020-26421 --- sources | 4 ++-- wireshark.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 5544c0d..6f1169d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.0.tar.xz) = 02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649 -SHA512 (SIGNATURES-3.4.0.txt) = 0a91d82381d5874b85346e2b34f17e791b2c9b5e705b53f34b46215b366f4db4a84831d589ab58288578f501c4ec8a7600e271b44ef43355c948fbbd79535b2d +SHA512 (wireshark-3.4.2.tar.xz) = 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a +SHA512 (SIGNATURES-3.4.2.txt) = b9d6bba7ef06dcd3ab954fc413e17230fa7570913daa30b89fba71015a09250241a35712a5a72a7fdb859fd231bc4d1d4455953b1cc8d77fa673648e2f0f196f diff --git a/wireshark.spec b/wireshark.spec index c2a1f9c..aff6273 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,8 +7,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.0 -Release: 2%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -273,6 +273,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jan 29 2021 Michal Ruprich - 1:3.4.2-1 +- New version 3.4.2 +- Fix for CVE-2020-26418, CVE-2020-26419, CVE-2020-26420, CVE-2020-26421 + * Wed Jan 27 2021 Fedora Release Engineering - 1:3.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 5b0d900df66f3593ac301295f81d28ce81c014aa Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 29 Jan 2021 14:01:38 +0100 Subject: [PATCH 022/120] New version 3.4.2 Fix for CVE-2020-26418, CVE-2020-26419, CVE-2020-26420, CVE-2020-26421 --- sources | 4 ++-- wireshark.spec | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 5544c0d..6f1169d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.0.tar.xz) = 02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649 -SHA512 (SIGNATURES-3.4.0.txt) = 0a91d82381d5874b85346e2b34f17e791b2c9b5e705b53f34b46215b366f4db4a84831d589ab58288578f501c4ec8a7600e271b44ef43355c948fbbd79535b2d +SHA512 (wireshark-3.4.2.tar.xz) = 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a +SHA512 (SIGNATURES-3.4.2.txt) = b9d6bba7ef06dcd3ab954fc413e17230fa7570913daa30b89fba71015a09250241a35712a5a72a7fdb859fd231bc4d1d4455953b1cc8d77fa673648e2f0f196f diff --git a/wireshark.spec b/wireshark.spec index ae03733..f6c268b 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,7 +4,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.0 +Version: 3.4.2 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -181,7 +181,11 @@ getent group usbmon >/dev/null || groupadd -r usbmon %post cli %{?ldconfig} -/usr/bin/udevadm trigger --subsystem-match=usbmon +# 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 +fi %ldconfig_postun cli @@ -266,6 +270,10 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jan 29 2021 Michal Ruprich - 1:3.4.2-1 +- New version 3.4.2 +- Fix for CVE-2020-26418, CVE-2020-26419, CVE-2020-26420, CVE-2020-26421 + * Thu Dec 03 2020 Michal Ruprich - 1:3.4.0-1 - New version 3.4.0 - Fix for CVE-2020-26575, CVE-2020-28030 From f8e39e79bf25d6c3fb3f333e58f27165cc959781 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 16 Feb 2021 14:12:39 +0100 Subject: [PATCH 023/120] New version 3.4.3 Fix for CVE-2021-22173, CVE-2021-22174 --- sources | 4 +- wireshark-0008-move-glib.patch | 312 +++++++++++++++++++++++++++++++++ wireshark.spec | 7 +- 3 files changed, 320 insertions(+), 3 deletions(-) create mode 100644 wireshark-0008-move-glib.patch diff --git a/sources b/sources index 6f1169d..33837ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.2.tar.xz) = 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a -SHA512 (SIGNATURES-3.4.2.txt) = b9d6bba7ef06dcd3ab954fc413e17230fa7570913daa30b89fba71015a09250241a35712a5a72a7fdb859fd231bc4d1d4455953b1cc8d77fa673648e2f0f196f +SHA512 (wireshark-3.4.3.tar.xz) = 6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859 +SHA512 (SIGNATURES-3.4.3.txt) = 30b2e61e6168503794f437a4e3ca6c3a85cd50759e5edb1968f03d4f5692783474126741bda12646b13647ece53a883c00a69903e83253a06dea6e64525321f3 diff --git a/wireshark-0008-move-glib.patch b/wireshark-0008-move-glib.patch new file mode 100644 index 0000000..5c9567a --- /dev/null +++ b/wireshark-0008-move-glib.patch @@ -0,0 +1,312 @@ +diff --git a/caputils/capture_ifinfo.h b/caputils/capture_ifinfo.h +index e063134b74..9965703538 100644 +--- a/caputils/capture_ifinfo.h ++++ b/caputils/capture_ifinfo.h +@@ -11,12 +11,12 @@ + #ifndef __CAPTURE_IFINFO_H__ + #define __CAPTURE_IFINFO_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include +- + /* + * Explicitly set the interface_type enum values as these values are exposed + * in the preferences gui.interfaces_hidden_types string. +diff --git a/epan/dissectors/dissectors.h b/epan/dissectors/dissectors.h +index b9f4c6b0ff..6f83b01b7c 100644 +--- a/epan/dissectors/dissectors.h ++++ b/epan/dissectors/dissectors.h +@@ -11,12 +11,12 @@ + #ifndef __DISSECTOR_REGISTER_H__ + #define __DISSECTOR_REGISTER_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include +- + typedef struct _dissector_reg { + const char *cb_name; + void (*cb_func)(void); +diff --git a/epan/epan.h b/epan/epan.h +index 1f6a52fa27..f646c1fc95 100644 +--- a/epan/epan.h ++++ b/epan/epan.h +@@ -10,11 +10,12 @@ + #ifndef __EPAN_H__ + #define __EPAN_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include + #include + #include + #include +diff --git a/epan/prefs.h b/epan/prefs.h +index 1fc560ccdc..1814f53a80 100644 +--- a/epan/prefs.h ++++ b/epan/prefs.h +@@ -11,12 +11,12 @@ + #ifndef __PREFS_H__ + #define __PREFS_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include +- + #include + #include + +diff --git a/epan/value_string.h b/epan/value_string.h +index 03551e31f4..548ec6a7ae 100644 +--- a/epan/value_string.h ++++ b/epan/value_string.h +@@ -11,11 +11,12 @@ + #ifndef __VALUE_STRING_H__ + #define __VALUE_STRING_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include + #include "ws_symbol_export.h" + #include "wmem/wmem.h" + +diff --git a/epan/wmem/wmem_user_cb_int.h b/epan/wmem/wmem_user_cb_int.h +index 3045d943ab..7232241c81 100644 +--- a/epan/wmem/wmem_user_cb_int.h ++++ b/epan/wmem/wmem_user_cb_int.h +@@ -12,11 +12,12 @@ + #ifndef __WMEM_USER_CB_INT_H__ + #define __WMEM_USER_CB_INT_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include + #include "wmem_user_cb.h" + + WS_DLL_LOCAL +diff --git a/ui/packet_range.h b/ui/packet_range.h +index 6e7d34d118..2e5dad62af 100644 +--- a/ui/packet_range.h ++++ b/ui/packet_range.h +@@ -14,12 +14,12 @@ + #ifndef __PACKET_RANGE_H__ + #define __PACKET_RANGE_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include +- + #include + #include + +diff --git a/ui/recent.h b/ui/recent.h +index 3d6d1c9cdb..5ae5852bb4 100644 +--- a/ui/recent.h ++++ b/ui/recent.h +@@ -12,11 +12,12 @@ + #ifndef __RECENT_H__ + #define __RECENT_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include + #include + #include "epan/timestamp.h" + #include "ui/ws_ui_util.h" +diff --git a/ui/rtp_media.h b/ui/rtp_media.h +index 04290f6aee..e144ac571e 100644 +--- a/ui/rtp_media.h ++++ b/ui/rtp_media.h +@@ -15,6 +15,8 @@ + #ifndef __RTP_MEDIA_H__ + #define __RTP_MEDIA_H__ + ++#include ++ + /** @file + * "RTP Player" dialog box common routines. + * @ingroup main_ui_group +@@ -24,8 +26,6 @@ + extern "C" { + #endif /* __cplusplus */ + +-#include +- + /****************************************************************************/ + /* INTERFACE */ + /****************************************************************************/ +diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h +index e368a792bf..b683f16ba7 100644 +--- a/ui/rtp_stream.h ++++ b/ui/rtp_stream.h +@@ -14,6 +14,8 @@ + #ifndef __RTP_STREAM_H__ + #define __RTP_STREAM_H__ + ++#include ++ + /** @file + * "RTP Streams" dialog box common routines. + * @ingroup main_ui_group +@@ -24,7 +26,6 @@ extern "C" { + #endif /* __cplusplus */ + + #include "tap-rtp-analysis.h" +-#include + #include + + #include "cfile.h" +diff --git a/ui/voip_calls.h b/ui/voip_calls.h +index 0fc71f180f..cfd791d6f8 100644 +--- a/ui/voip_calls.h ++++ b/ui/voip_calls.h +@@ -22,6 +22,8 @@ + #ifndef __VOIP_CALLS_H__ + #define __VOIP_CALLS_H__ + ++#include ++ + /** @file + * "VoIP Calls" dialog box common routines. + * @ingroup main_ui_group +@@ -31,7 +33,6 @@ + extern "C" { + #endif /* __cplusplus */ + +-#include + #include + + #include "epan/address.h" +diff --git a/wsutil/file_util.h b/wsutil/file_util.h +index 565b9d46e3..e9942f3c5b 100644 +--- a/wsutil/file_util.h ++++ b/wsutil/file_util.h +@@ -11,6 +11,8 @@ + #ifndef __FILE_UTIL_H__ + #define __FILE_UTIL_H__ + ++#include ++ + #include "config.h" + + #include "ws_symbol_export.h" +@@ -19,8 +21,6 @@ + extern "C" { + #endif /* __cplusplus */ + +-#include +- + #ifdef _WIN32 + #include /* for _read(), _write(), etc. */ + #include +diff --git a/wsutil/plugins.h b/wsutil/plugins.h +index 49c221ef5e..9eaa0e41ea 100644 +--- a/wsutil/plugins.h ++++ b/wsutil/plugins.h +@@ -11,13 +11,13 @@ + #ifndef __PLUGINS_H__ + #define __PLUGINS_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include + #include +- + #include "ws_symbol_export.h" + + typedef void (*plugin_register_func)(void); +diff --git a/ui/taps.h b/ui/taps.h +index 4078e6d..d083519 100644 +--- a/ui/taps.h ++++ b/ui/taps.h +@@ -11,12 +11,12 @@ + #ifndef __TAP_REGISTER_H__ + #define __TAP_REGISTER_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include +- + typedef struct _tap_reg { + const char *cb_name; + void (*cb_func)(void); +diff --git a/epan/epan_dissect.h b/epan/epan_dissect.h +index f288682..6bce465 100644 +--- a/epan/epan_dissect.h ++++ b/epan/epan_dissect.h +@@ -10,11 +10,12 @@ + #ifndef EPAN_DISSECT_H + #define EPAN_DISSECT_H + ++#include "epan.h" ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include "epan.h" + #include "tvbuff.h" + #include "proto.h" + #include "packet_info.h" +diff --git a/epan/conversation.h b/epan/conversation.h +index 2da42db..9457336 100644 +--- a/epan/conversation.h ++++ b/epan/conversation.h +@@ -12,6 +12,7 @@ + #define __CONVERSATION_H__ + + #include "ws_symbol_export.h" ++#include "packet.h" /* for conversation dissector type */ + + #ifdef __cplusplus + extern "C" { +@@ -46,8 +47,6 @@ extern "C" { + /* Flags to handle endpoints */ + #define USE_LAST_ENDPOINT 0x08 /* Use last endpoint created, regardless of type */ + +-#include "packet.h" /* for conversation dissector type */ +- + /* Types of port numbers Wireshark knows about. */ + typedef enum { + ENDPOINT_NONE, /* no endpoint */ diff --git a/wireshark.spec b/wireshark.spec index aff6273..d519d6e 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,7 +7,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.2 +Version: 3.4.3 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -28,6 +28,7 @@ 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-move-glib.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -273,6 +274,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Feb 16 2021 Michal Ruprich - 1:3.4.3-1 +- New version 3.4.3 +- Fix for CVE-2021-22173, CVE-2021-22174 + * Fri Jan 29 2021 Michal Ruprich - 1:3.4.2-1 - New version 3.4.2 - Fix for CVE-2020-26418, CVE-2020-26419, CVE-2020-26420, CVE-2020-26421 From 47808811b55bdb67a70af90fb8f47f1e7fc7019f Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 16 Feb 2021 14:22:44 +0100 Subject: [PATCH 024/120] New version 3.4.3 Fix for CVE-2021-22173, CVE-2021-22174 --- sources | 4 ++-- wireshark.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 6f1169d..33837ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.2.tar.xz) = 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a -SHA512 (SIGNATURES-3.4.2.txt) = b9d6bba7ef06dcd3ab954fc413e17230fa7570913daa30b89fba71015a09250241a35712a5a72a7fdb859fd231bc4d1d4455953b1cc8d77fa673648e2f0f196f +SHA512 (wireshark-3.4.3.tar.xz) = 6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859 +SHA512 (SIGNATURES-3.4.3.txt) = 30b2e61e6168503794f437a4e3ca6c3a85cd50759e5edb1968f03d4f5692783474126741bda12646b13647ece53a883c00a69903e83253a06dea6e64525321f3 diff --git a/wireshark.spec b/wireshark.spec index f6c268b..6541886 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,7 +4,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.2 +Version: 3.4.3 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -270,6 +270,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Feb 16 2021 Michal Ruprich - 1:3.4.3-1 +- New version 3.4.3 +- Fix for CVE-2021-22173, CVE-2021-22174 + * Fri Jan 29 2021 Michal Ruprich - 1:3.4.2-1 - New version 3.4.2 - Fix for CVE-2020-26418, CVE-2020-26419, CVE-2020-26420, CVE-2020-26421 From 422124221f41d96b0ab5c728311f81ffbbcd2ce7 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Mon, 22 Feb 2021 14:45:18 +0100 Subject: [PATCH 025/120] Adding SMC-R, SMC-D and SMC-D v2 --- wireshark-0009-smc-support.patch | 1656 ++++++++++++++++++++++++++++++ wireshark.spec | 6 +- 2 files changed, 1661 insertions(+), 1 deletion(-) create mode 100644 wireshark-0009-smc-support.patch diff --git a/wireshark-0009-smc-support.patch b/wireshark-0009-smc-support.patch new file mode 100644 index 0000000..84bdca3 --- /dev/null +++ b/wireshark-0009-smc-support.patch @@ -0,0 +1,1656 @@ +diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt +index 11d2c89cd0..3c313d2c5e 100644 +--- a/epan/dissectors/CMakeLists.txt ++++ b/epan/dissectors/CMakeLists.txt +@@ -1745,7 +1745,7 @@ set(DISSECTOR_SRC + ${CMAKE_CURRENT_SOURCE_DIR}/packet-smb-direct.c + ${CMAKE_CURRENT_SOURCE_DIR}/packet-smb.c + ${CMAKE_CURRENT_SOURCE_DIR}/packet-smb2.c +- ${CMAKE_CURRENT_SOURCE_DIR}/packet-smcr.c ++ ${CMAKE_CURRENT_SOURCE_DIR}/packet-smc.c + ${CMAKE_CURRENT_SOURCE_DIR}/packet-sml.c + ${CMAKE_CURRENT_SOURCE_DIR}/packet-smp.c + ${CMAKE_CURRENT_SOURCE_DIR}/packet-smpp.c +diff --git a/epan/dissectors/packet-smcr.c b/epan/dissectors/packet-smc.c +similarity index 56% +rename from epan/dissectors/packet-smcr.c +rename to epan/dissectors/packet-smc.c +index 7096d1b0b0..bbfa9c07ef 100644 +--- a/epan/dissectors/packet-smcr.c ++++ b/epan/dissectors/packet-smc.c +@@ -1,7 +1,8 @@ +-/* packet-smcr.c +- * SMC-R dissector for wireshark ++/* packet-smc.c ++ * SMC dissector for wireshark + * By Joe Fowler +- * (c) Copyright IBM Corporation 2014 ++ * By Guvenc Gulce ++ * (c) Copyright IBM Corporation 2014,2020 + * LICENSE: GNU General Public License, version 2, or (at your option) any + * version. http://opensource.org/licenses/gpl-2.0.php + * +@@ -13,6 +14,7 @@ + * + * Please refer to the following specs for protocol: + * - ietf - draft-fox-tcpm-shared-memory-rdma-05 ++ * - https://www.ibm.com/support/pages/node/6326337 + */ + + #include "config.h" +@@ -20,25 +22,33 @@ + #include + + #include "packet-tcp.h" ++#include + +-#define SMCR_TCP_MIN_HEADER_LENGTH 7 +-#define CLC_MSG_START_OFFSET 7 ++#define SMC_TCP_MIN_HEADER_LENGTH 7 ++#define CLC_MSG_START_OFFSET 5 + #define LLC_MSG_START_OFFSET 3 + #define RMBE_CTRL_START_OFFSET 2 + #define MAC_ADDR_LEN 6 ++#define SMC_V2 2 + #define GID_LEN 16 + #define PEERID_LEN 8 ++#define DIAG_INFO_LEN 4 ++#define EID_LEN 32 ++#define ISM_GID_LEN 8 ++#define ISM_CHID_LEN 2 + #define IPV4_SUBNET_MASK_LEN 4 +-#define IPV6_PREFIX_LEN 4 ++#define IPV6_PREFIX_LEN 16 + #define ONE_BYTE_RESERVED 1 + #define TWO_BYTE_RESERVED 2 + #define QP_LEN 3 + #define RKEY_LEN 4 + #define VIRTUAL_ADDR_LEN 8 + #define FLAG_BYTE_LEN 1 ++#define LENGTH_BYTE_LEN 2 + #define SEQNO_LEN 2 + #define CURSOR_LEN 4 + #define ALERT_TOKEN_LEN 4 ++#define DMB_TOKEN_LEN 8 + #define PSN_LEN 3 + #define CONN_INDEX_LEN 1 + #define SMCR_MSG_BYTE_0 0 +@@ -52,6 +62,7 @@ + #define LLC_CMD_RSP_OFFSET 3 + #define ACCEPT_CONFIRM_QP_OFFSET 38 + #define SMCR_CLC_ID 0xe2d4c3d9 /*EBCDIC 'SMCR' */ ++#define SMCD_CLC_ID 0xe2d4c3c4 /*EBCDIC 'SMCD' */ + #define SMC_CLC_V1 0x10 + #define SMC_CLC_SMC_R 0x01 + +@@ -66,6 +77,52 @@ typedef enum { + SMC_CLC_DECLINE = 4 + } clc_message; + ++typedef enum { ++ SMC_CLC_SMCR = 0, ++ SMC_CLC_SMCD = 1, ++ SMC_CLC_NONE = 2, ++ SMC_CLC_BOTH = 3, ++} clc_type_message; ++ ++typedef enum { ++ SMC_CLC_OS_ZOS = 1, ++ SMC_CLC_OS_LINUX = 2, ++ SMC_CLC_OS_AIX = 3, ++ SMC_CLC_OS_UNKOWN = 15, ++} clc_os_message; ++ ++static const value_string smc_clc_os_message_txt[] = { ++ { SMC_CLC_OS_ZOS, "z/OS" }, ++ { SMC_CLC_OS_LINUX, "Linux" }, ++ { SMC_CLC_OS_AIX, "AIX" }, ++ { SMC_CLC_OS_UNKOWN, "Unknown" }, ++ { 0, NULL } ++}; ++ ++static const value_string smc_clc_type_message_txt[] = { ++ { SMC_CLC_SMCR, "SMC-R" }, ++ { SMC_CLC_SMCD, "SMC-D" }, ++ { SMC_CLC_NONE, "NONE" }, ++ { SMC_CLC_BOTH, "SMC-R/SMC-D" }, ++ { 0, NULL } ++}; ++ ++ ++static const value_string smcv2_clc_col_info_message_txt[] = { ++ { SMC_CLC_SMCR, "[SMC-R-Proposal]" }, ++ { SMC_CLC_SMCD, "[SMC-Dv2-Proposal]" }, ++ { SMC_CLC_NONE, "[NONE]" }, ++ { SMC_CLC_BOTH, "[SMC-Dv2/SMC-R-Proposal]" }, ++ { 0, NULL } ++}; ++ ++static const value_string smc_clc_col_info_message_txt[] = { ++ { SMC_CLC_SMCR, "[SMC-R-Proposal]" }, ++ { SMC_CLC_SMCD, "[SMC-D-Proposal]" }, ++ { SMC_CLC_NONE, "[NONE]" }, ++ { SMC_CLC_BOTH, "[SMC-D/SMC-R-Proposal]" }, ++ { 0, NULL } ++}; + + static const value_string smcr_clc_message_txt[] = { + { SMC_CLC_PROPOSAL, "Proposal" }, +@@ -104,22 +161,35 @@ static const value_string smcr_llc_message_txt[] = { + { 0, NULL } + }; + +-static int proto_smcr = -1; ++static int proto_smc = -1; + static int ett_smcr = -1; + static int hf_smcr_clc_msg = -1; + static int hf_smcr_llc_msg = -1; + +-/* SMC-R Proposal */ ++/* SMC Proposal for both SMC-D and SMC-R */ + static int ett_proposal_flag = -1; ++static int ett_proposal_ext_flag2 = -1; ++static int hf_proposal_smc_version_release_number = -1; ++static int hf_proposal_smc_version_seid = -1; + static int hf_proposal_smc_version = -1; +-static int hf_smcr_proposal_flags = -1; +-static int hf_smcr_proposal_client_peer_id = -1; +-static int hf_smcr_proposal_client_preferred_gid = -1; +-static int hf_smcr_proposal_client_preferred_mac = -1; +-static int hf_smcr_proposal_outgoing_interface_subnet_mask = -1; +-static int hf_smcr_proposal_outgoing_subnet_mask_signifcant_bits = -1; +-static int hf_smcr_proposal_ipv6_prefix = -1; +-static int hf_smcr_proposal_ipv6_prefix_length = -1; ++static int hf_proposal_smc_type = -1; ++static int hf_proposal_smc_v2_type = -1; ++static int hf_smc_length = -1; ++static int hf_smc_proposal_smc_chid = -1; ++static int hf_smc_proposal_flags = -1; ++static int hf_smc_proposal_eid = -1; ++static int hf_smc_proposal_system_eid = -1; ++static int hf_smc_proposal_ext_flags = -1; ++static int hf_smc_proposal_client_peer_id = -1; ++static int hf_smc_proposal_ism_gid = -1; ++static int hf_smc_proposal_client_preferred_gid = -1; ++static int hf_smc_proposal_client_preferred_mac = -1; ++static int hf_smc_proposal_outgoing_interface_subnet_mask = -1; ++static int hf_smc_proposal_rocev2_gid_ipv4_addr = -1; ++static int hf_smc_proposal_rocev2_gid_ipv6_addr = -1; ++static int hf_smc_proposal_outgoing_subnet_mask_signifcant_bits = -1; ++static int hf_smc_proposal_ipv6_prefix = -1; ++static int hf_smc_proposal_ipv6_prefix_length = -1; + + /* SMC-R Accept */ + static int ett_accept_flag = -1; +@@ -158,10 +228,57 @@ static int hf_confirm_smc_version = -1; + static int hf_confirm_rmb_buffer_size = -1; + static int hf_confirm_qp_mtu_value = -1; + ++/* SMC-D Accept */ ++static int hf_accept_smc_type = -1; ++static int ett_smcd_accept_flag = -1; ++static int ett_smcd_accept_fce_flag = -1; ++static int ett_smcd_accept_flag2 = -1; ++static int hf_smcd_accept_smc_version = -1; ++static int hf_accept_os_type = -1; ++static int hf_accept_smc_version_release_number = -1; ++static int hf_smcd_accept_first_contact = -1; ++static int hf_accept_dmb_buffer_size = -1; ++static int hf_smcd_accept_flags = -1; ++static int hf_smcd_accept_fce_flags = -1; ++static int hf_smcd_accept_flags2 = -1; ++static int hf_smcd_accept_server_peer_id = -1; ++static int hf_smcd_accept_dmbe_conn_index = -1; ++static int hf_smcd_accept_dmb_token = -1; ++static int hf_smcd_accept_server_link_id = -1; ++static int hf_smcd_accept_smc_chid = -1; ++static int hf_smcd_accept_eid = -1; ++static int hf_smcd_accept_peer_name = -1; ++ ++/* SMC-D Confirm */ ++static int hf_confirm_smc_type = -1; ++static int ett_smcd_confirm_flag = -1; ++static int ett_smcd_confirm_fce_flag = -1; ++static int ett_smcd_confirm_flag2 = -1; ++static int hf_smcd_confirm_smc_version = -1; ++static int hf_confirm_os_type = -1; ++static int hf_smcd_confirm_flags = -1; ++static int hf_smcd_confirm_flags2 = -1; ++static int hf_smcd_confirm_first_contact = -1; ++static int hf_smcd_confirm_client_peer_id = -1; ++static int hf_smcd_confirm_dmb_token = -1; ++static int hf_smcd_confirm_dmbe_conn_index = -1; ++static int hf_smcd_confirm_client_link_id = -1; ++static int hf_confirm_smc_version_release_number = -1; ++static int hf_smcd_confirm_dmb_buffer_size = -1; ++static int hf_smcd_confirm_smc_chid = -1; ++static int hf_smcd_confirm_eid = -1; ++static int hf_smcd_confirm_peer_name = -1; ++ + /* SMC-R Decline */ +-static int hf_smcr_decline_flags = -1; +-static int hf_smcr_decline_peer_id = -1; +-static int hf_smcr_decline_diag_info = -1; ++static int ett_decline_flag = -1; ++static int ett_decline_flag2 = -1; ++static int hf_smc_decline_flags = -1; ++static int hf_smc_decline_flags2 = -1; ++static int hf_smc_decline_peer_id = -1; ++static int hf_smc_decline_diag_info = -1; ++static int hf_decline_os_type = -1; ++static int hf_decline_smc_version = -1; ++static int hf_decline_out_of_sync = -1; + + /* SMC-R Confirm Link*/ + static int ett_confirm_link_flag = -1; +@@ -256,55 +373,300 @@ static int hf_smcr_rmbe_ctrl_peer_abnormal_close = -1; + + void proto_register_smcr(void); + void proto_reg_handoff_smcr(void); +-static dissector_handle_t smcr_tcp_handle; ++static dissector_handle_t smc_tcp_handle; + + static void +-disect_smcr_proposal(tvbuff_t *tvb, proto_tree *tree) ++disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) + { +- guint offset; +- guint16 mask_offset; +- guint8 ipv6_prefix_count; ++ guint offset, suboffset; ++ guint16 mask_offset, v2_ext_offset; ++ guint16 v2_ext_pos = 0, smcd_v2_ext_offset = 0; ++ guint16 smcd_v2_ext_pos = 0; ++ guint8 ipv6_prefix_count, smc_version; ++ guint8 smc_type, num_of_gids = 0, num_of_eids = 0; ++ guint8 smc_type_v1 = 0, smc_type_v2 = 0; ++ bool is_smc_v2, is_smcdv1, is_smcdv2; + proto_item *proposal_flag_item; + proto_tree *proposal_flag_tree; + ++ + offset = CLC_MSG_START_OFFSET; +- proposal_flag_item = proto_tree_add_item(tree, hf_smcr_proposal_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ proto_tree_add_item(tree, hf_smc_length, tvb, offset, ++ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += LENGTH_BYTE_LEN; ++ proposal_flag_item = proto_tree_add_item(tree, hf_smc_proposal_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + proposal_flag_tree = proto_item_add_subtree(proposal_flag_item, ett_proposal_flag); + proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ smc_version = tvb_get_guint8(tvb, offset); ++ smc_type = tvb_get_guint8(tvb, offset); ++ smc_version = ((smc_version >> 4) & 0x0F); ++ is_smc_v2 = (smc_version >= SMC_V2); ++ smc_type_v2 = ((smc_type >> 2) & 0x03); ++ smc_type_v1 = (smc_type & 0x03); ++ is_smcdv1 = ((smc_type_v1 == SMC_CLC_SMCD) || (smc_type_v1 == SMC_CLC_BOTH)); ++ is_smcdv2 = ((smc_type_v2 == SMC_CLC_SMCD) || (smc_type_v2 == SMC_CLC_BOTH)); ++ ++ if (is_smc_v2) ++ proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_v2_type, tvb, ++ offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ ++ proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_type, tvb, ++ offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ + offset += FLAG_BYTE_LEN; +- proto_tree_add_item(tree, hf_smcr_proposal_client_peer_id, tvb, offset, ++ proto_tree_add_item(tree, hf_smc_proposal_client_peer_id, tvb, offset, + PEERID_LEN, ENC_BIG_ENDIAN); + offset += PEERID_LEN; +- proto_tree_add_item(tree, hf_smcr_proposal_client_preferred_gid, tvb, ++ proto_tree_add_item(tree, hf_smc_proposal_client_preferred_gid, tvb, + offset, GID_LEN, ENC_NA); + offset += GID_LEN; +- proto_tree_add_item(tree, hf_smcr_proposal_client_preferred_mac, tvb, ++ proto_tree_add_item(tree, hf_smc_proposal_client_preferred_mac, tvb, + offset, MAC_ADDR_LEN, ENC_NA); + offset += MAC_ADDR_LEN; + mask_offset = tvb_get_ntohs(tvb, offset); +- offset += 2 + mask_offset; +- proto_tree_add_item(tree, hf_smcr_proposal_outgoing_interface_subnet_mask, tvb, +- offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN); ++ ++ if (mask_offset != 0) { ++ suboffset = offset; ++ suboffset += TWO_BYTE_RESERVED; ++ if (is_smcdv1 || is_smcdv2) { ++ proto_tree_add_item(tree, hf_smc_proposal_ism_gid, tvb, ++ suboffset, ISM_GID_LEN, ENC_NA); ++ } ++ suboffset += ISM_GID_LEN; ++ if (is_smc_v2) { ++ if (is_smcdv2) { ++ proto_tree_add_item(tree, hf_smc_proposal_smc_chid, tvb, suboffset, ++ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); ++ } ++ suboffset += LENGTH_BYTE_LEN; ++ v2_ext_offset = tvb_get_ntohs(tvb, suboffset); ++ v2_ext_pos = suboffset + TWO_BYTE_RESERVED + v2_ext_offset; ++ } ++ } ++ offset += TWO_BYTE_RESERVED + mask_offset; ++ ++ proto_tree_add_item(tree, hf_smc_proposal_outgoing_interface_subnet_mask, tvb, ++ offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN); + offset += IPV4_SUBNET_MASK_LEN; +- proto_tree_add_item(tree, hf_smcr_proposal_outgoing_subnet_mask_signifcant_bits, tvb, +- offset, 1, ENC_BIG_ENDIAN); ++ proto_tree_add_item(tree, hf_smc_proposal_outgoing_subnet_mask_signifcant_bits, tvb, ++ offset, 1, ENC_BIG_ENDIAN); + offset += 1; + /* Bump past reserved bytes */ + offset += TWO_BYTE_RESERVED; + ipv6_prefix_count = tvb_get_guint8(tvb, offset); +- offset += 2; ++ offset += 1; + + while (ipv6_prefix_count != 0) { +- proto_tree_add_item(tree, hf_smcr_proposal_ipv6_prefix, tvb, ++ proto_tree_add_item(tree, hf_smc_proposal_ipv6_prefix, tvb, + offset, IPV6_PREFIX_LEN, ENC_NA); + offset += IPV6_PREFIX_LEN; +- proto_tree_add_item(tree, hf_smcr_proposal_ipv6_prefix_length, tvb, ++ proto_tree_add_item(tree, hf_smc_proposal_ipv6_prefix_length, tvb, + offset, 1, ENC_BIG_ENDIAN); + offset += 1; + ipv6_prefix_count--; + } ++ ++ if (v2_ext_pos >= offset) { ++ offset = v2_ext_pos; ++ num_of_eids = tvb_get_guint8(tvb, offset); ++ offset += FLAG_BYTE_LEN; ++ num_of_gids = tvb_get_guint8(tvb, offset); ++ offset += FLAG_BYTE_LEN; ++ /*Skip reserved flag 1*/ ++ offset += 1; ++ proposal_flag_item = proto_tree_add_item(tree, hf_smc_proposal_ext_flags, tvb, ++ offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ proposal_flag_tree = proto_item_add_subtree(proposal_flag_item, ett_proposal_ext_flag2); ++ proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version_release_number, ++ tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version_seid, tvb, ++ offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += FLAG_BYTE_LEN; ++ /*Skip not used 2 bytes*/ ++ offset += 2; ++ smcd_v2_ext_offset = tvb_get_ntohs(tvb, offset); ++ offset += 2; ++ smcd_v2_ext_pos = offset + smcd_v2_ext_offset; ++ ++ if (is_ipv6) { ++ proto_tree_add_item(tree, hf_smc_proposal_rocev2_gid_ipv6_addr, tvb, ++ offset, GID_LEN, ENC_NA); ++ offset += GID_LEN; ++ } ++ else { ++ offset += 12; ++ proto_tree_add_item(tree, hf_smc_proposal_rocev2_gid_ipv4_addr, tvb, ++ offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN); ++ offset += IPV4_SUBNET_MASK_LEN; ++ } ++ /*Skip reserved 16 bytes*/ ++ offset += 16; ++ while (num_of_eids != 0) { ++ proto_tree_add_item(tree, hf_smc_proposal_eid, tvb, ++ offset, EID_LEN, ENC_ASCII | ENC_NA); ++ offset += EID_LEN; ++ num_of_eids--; ++ } ++ if (smcd_v2_ext_pos >= offset) { ++ offset = smcd_v2_ext_pos; ++ proto_tree_add_item(tree, hf_smc_proposal_system_eid, tvb, ++ offset, EID_LEN, ENC_ASCII | ENC_NA); ++ offset += EID_LEN; ++ /*Skip reserved 16 bytes*/ ++ offset += 16; ++ while (num_of_gids != 0) { ++ proto_tree_add_item(tree, hf_smc_proposal_ism_gid, tvb, ++ offset, ISM_GID_LEN, ENC_NA); ++ offset += ISM_GID_LEN; ++ proto_tree_add_item(tree, hf_smc_proposal_smc_chid, tvb, offset, ++ ISM_CHID_LEN, ENC_BIG_ENDIAN); ++ offset += ISM_CHID_LEN; ++ num_of_gids--; ++ } ++ } ++ ++ } ++} ++ ++static void ++disect_smcd_accept(tvbuff_t* tvb, proto_tree* tree) ++{ ++ guint offset; ++ proto_item* accept_flag_item; ++ proto_tree* accept_flag_tree; ++ proto_item* accept_flag2_item; ++ proto_tree* accept_flag2_tree; ++ guint8 smc_version, first_contact = 0; ++ ++ offset = CLC_MSG_START_OFFSET; ++ proto_tree_add_item(tree, hf_smc_length, tvb, offset, ++ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += LENGTH_BYTE_LEN; ++ accept_flag_item = proto_tree_add_item(tree, hf_smcd_accept_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_smcd_accept_flag); ++ proto_tree_add_item(accept_flag_tree, hf_smcd_accept_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ proto_tree_add_item(accept_flag_tree, hf_smcd_accept_first_contact, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ proto_tree_add_item(accept_flag_tree, hf_accept_smc_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ smc_version = tvb_get_guint8(tvb, offset); ++ first_contact = tvb_get_guint8(tvb, offset); ++ smc_version = ((smc_version >> 4) & 0x0F); ++ first_contact = ((first_contact >> 3) & 0x01); ++ offset += FLAG_BYTE_LEN; ++ proto_tree_add_item(tree, hf_smcd_accept_server_peer_id, tvb, offset, ++ PEERID_LEN, ENC_BIG_ENDIAN); ++ offset += PEERID_LEN; ++ ++ proto_tree_add_item(tree, hf_smcd_accept_dmb_token, tvb, ++ offset, DMB_TOKEN_LEN, ENC_NA); ++ offset += DMB_TOKEN_LEN; ++ ++ proto_tree_add_item(tree, hf_smcd_accept_dmbe_conn_index, tvb, ++ offset, CONN_INDEX_LEN, ENC_BIG_ENDIAN); ++ offset += CONN_INDEX_LEN; ++ ++ accept_flag2_item = proto_tree_add_item(tree, hf_smcd_accept_flags2, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ accept_flag2_tree = proto_item_add_subtree(accept_flag2_item, ett_smcd_accept_flag2); ++ proto_tree_add_item(accept_flag2_tree, hf_accept_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += FLAG_BYTE_LEN; ++ offset += TWO_BYTE_RESERVED; ++ proto_tree_add_item(tree, hf_smcd_accept_server_link_id, tvb, ++ offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN); ++ offset += ALERT_TOKEN_LEN; ++ ++ if (smc_version >= SMC_V2) { ++ proto_tree_add_item(tree, hf_smcd_accept_smc_chid, tvb, offset, ++ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += LENGTH_BYTE_LEN; ++ ++ proto_tree_add_item(tree, hf_smcd_accept_eid, tvb, offset, 32, ENC_ASCII | ENC_NA); ++ offset += 32; ++ /* Reserved bytes */ ++ offset += 8; ++ ++ if (first_contact) { ++ offset += ONE_BYTE_RESERVED; ++ accept_flag_item = proto_tree_add_item(tree, hf_smcd_accept_fce_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_smcd_accept_fce_flag); ++ proto_tree_add_item(accept_flag_tree, hf_accept_os_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ proto_tree_add_item(accept_flag_tree, hf_accept_smc_version_release_number, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += FLAG_BYTE_LEN; ++ offset += TWO_BYTE_RESERVED; ++ proto_tree_add_item(tree, hf_smcd_accept_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); ++ offset += 32; ++ } ++ } ++} ++ ++static void ++disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree) ++{ ++ guint offset; ++ proto_item* confirm_flag_item; ++ proto_tree* confirm_flag_tree; ++ proto_item* confirm_flag2_item; ++ proto_tree* confirm_flag2_tree; ++ guint8 smc_version, first_contact = 0; ++ ++ offset = CLC_MSG_START_OFFSET; ++ proto_tree_add_item(tree, hf_smc_length, tvb, offset, ++ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += LENGTH_BYTE_LEN; ++ confirm_flag_item = proto_tree_add_item(tree, hf_smcd_confirm_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_smcd_confirm_flag); ++ proto_tree_add_item(confirm_flag_tree, hf_smcd_confirm_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ proto_tree_add_item(confirm_flag_tree, hf_smcd_confirm_first_contact, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ smc_version = tvb_get_guint8(tvb, offset); ++ first_contact = tvb_get_guint8(tvb, offset); ++ smc_version = ((smc_version >> 4) & 0x0F); ++ first_contact = ((first_contact >> 3) & 0x01); ++ offset += FLAG_BYTE_LEN; ++ proto_tree_add_item(tree, hf_smcd_confirm_client_peer_id, tvb, offset, ++ PEERID_LEN, ENC_BIG_ENDIAN); ++ offset += PEERID_LEN; ++ ++ proto_tree_add_item(tree, hf_smcd_confirm_dmb_token, tvb, ++ offset, DMB_TOKEN_LEN, ENC_NA); ++ offset += DMB_TOKEN_LEN; ++ ++ proto_tree_add_item(tree, hf_smcd_confirm_dmbe_conn_index, tvb, ++ offset, CONN_INDEX_LEN, ENC_BIG_ENDIAN); ++ offset += CONN_INDEX_LEN; ++ ++ confirm_flag2_item = proto_tree_add_item(tree, hf_smcd_confirm_flags2, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ confirm_flag2_tree = proto_item_add_subtree(confirm_flag2_item, ett_smcd_confirm_flag2); ++ proto_tree_add_item(confirm_flag2_tree, hf_smcd_confirm_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += FLAG_BYTE_LEN; ++ offset += TWO_BYTE_RESERVED; ++ proto_tree_add_item(tree, hf_smcd_confirm_client_link_id, tvb, ++ offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN); ++ offset += ALERT_TOKEN_LEN; ++ ++ if (smc_version >= SMC_V2) { ++ proto_tree_add_item(tree, hf_smcd_confirm_smc_chid, tvb, offset, ++ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += LENGTH_BYTE_LEN; ++ ++ proto_tree_add_item(tree, hf_smcd_confirm_eid, tvb, offset, 32, ENC_ASCII | ENC_NA); ++ offset += 32; ++ /* Reserved bytes */ ++ offset += 8; ++ ++ if (first_contact) { ++ offset += ONE_BYTE_RESERVED; ++ confirm_flag_item = proto_tree_add_item(tree, hf_smcd_accept_fce_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_smcd_confirm_fce_flag); ++ proto_tree_add_item(confirm_flag_tree, hf_confirm_os_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_version_release_number, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += FLAG_BYTE_LEN; ++ offset += TWO_BYTE_RESERVED; ++ proto_tree_add_item(tree, hf_smcd_confirm_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); ++ offset += 32; ++ } ++ } + } + ++ + static void + disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree) + { +@@ -315,6 +677,9 @@ disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree) + proto_tree *accept_flag2_tree; + + offset = CLC_MSG_START_OFFSET; ++ proto_tree_add_item(tree, hf_smc_length, tvb, offset, ++ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += LENGTH_BYTE_LEN; + accept_flag_item = proto_tree_add_item(tree, hf_smcr_accept_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_accept_flag); + proto_tree_add_item(accept_flag_tree, hf_accept_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); +@@ -367,6 +732,9 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree) + proto_tree *confirm_flag2_tree; + + offset = CLC_MSG_START_OFFSET; ++ proto_tree_add_item(tree, hf_smc_length, tvb, offset, ++ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += LENGTH_BYTE_LEN; + confirm_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_confirm_flag); + proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); +@@ -411,17 +779,41 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree) + static void + disect_smcr_decline(tvbuff_t *tvb, proto_tree *tree) + { +- guint offset; ++ proto_item* decline_flag_item; ++ proto_tree* decline_flag_tree; ++ proto_item* decline_flag2_item; ++ proto_tree* decline_flag2_tree; ++ guint offset, smc_version; + + offset = CLC_MSG_START_OFFSET; +- proto_tree_add_item(tree, hf_smcr_decline_flags, tvb, offset, ++ proto_tree_add_item(tree, hf_smc_length, tvb, offset, ++ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); ++ offset += LENGTH_BYTE_LEN; ++ ++ decline_flag_item = proto_tree_add_item(tree, hf_smc_decline_flags, tvb, offset, ++ FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ decline_flag_tree = proto_item_add_subtree(decline_flag_item, ett_decline_flag); ++ proto_tree_add_item(decline_flag_tree, hf_decline_smc_version, tvb, offset, ++ FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ proto_tree_add_item(decline_flag_tree, hf_decline_out_of_sync, tvb, offset, + FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ smc_version = tvb_get_guint8(tvb, offset); ++ smc_version = ((smc_version >> 4) & 0x0F); ++ + offset += FLAG_BYTE_LEN; +- proto_tree_add_item(tree, hf_smcr_decline_peer_id, tvb, offset, ++ proto_tree_add_item(tree, hf_smc_decline_peer_id, tvb, offset, + PEERID_LEN, ENC_BIG_ENDIAN); + offset += PEERID_LEN; +- proto_tree_add_item(tree, hf_smcr_decline_diag_info, tvb, offset, +- 4, ENC_BIG_ENDIAN); ++ proto_tree_add_item(tree, hf_smc_decline_diag_info, tvb, offset, ++ DIAG_INFO_LEN, ENC_BIG_ENDIAN); ++ offset += DIAG_INFO_LEN; ++ if (smc_version >= SMC_V2) { ++ decline_flag2_item = proto_tree_add_item(tree, hf_smc_decline_flags2, tvb, offset, ++ FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ decline_flag2_tree = proto_item_add_subtree(decline_flag2_item, ett_decline_flag2); ++ proto_tree_add_item(decline_flag2_tree, hf_decline_os_type, tvb, offset, ++ FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ++ } + } + + static void +@@ -730,50 +1122,126 @@ disect_smcr_rmbe_ctrl(tvbuff_t *tvb, proto_tree *tree) + tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + } + ++static guint8 get_mixed_type(guint8 v1_type, guint8 v2_type) ++{ ++ if (v1_type == SMC_CLC_BOTH) ++ return v1_type; ++ ++ if (v1_type == SMC_CLC_NONE) ++ return v2_type; ++ ++ if (((v2_type == SMC_CLC_SMCD) && (v1_type == SMC_CLC_SMCR)) || ++ ((v2_type == SMC_CLC_SMCR) && (v1_type == SMC_CLC_SMCD))) ++ return SMC_CLC_BOTH; ++ ++ return v2_type; ++} ++ + static int +-dissect_smcr_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ++dissect_smc_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, + void *data _U_) + { + gint offset; + guint16 msg_len; ++ guint8 smc_type, smc_v2_type = 0, smc_v1_type = 0, smc_version = 0; ++ guint8 mixed_type; + clc_message clc_msgid; + proto_item *ti; +- proto_tree *smcr_tree; ++ proto_tree *smc_tree; ++ bool is_ipv6, is_smc_v2, is_smcd = false; + +- col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMC-R"); + msg_len = tvb_get_ntohs(tvb, CLC_MSG_LEN_OFFSET); + offset = 4; +- clc_msgid = (clc_message) tvb_get_guint8(tvb, offset); +- col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-R-%s],", +- val_to_str_const((guint32)clc_msgid, +- smcr_clc_message_txt, "Unknown Command")); ++ clc_msgid = (clc_message)tvb_get_guint8(tvb, offset); + +- if ((clc_msgid == SMC_CLC_ACCEPT) || +- (clc_msgid == SMC_CLC_CONFIRMATION)) { ++ smc_version = tvb_get_guint8(tvb, offset + 3); ++ smc_version = ((smc_version >> 4) & 0x0F); ++ smc_type = tvb_get_guint8(tvb, offset + 3); ++ is_smc_v2 = (smc_version >= SMC_V2); ++ ++ if (is_smc_v2 && (clc_msgid == SMC_CLC_PROPOSAL)) { ++ smc_v1_type = (smc_type & 0x03); ++ smc_v2_type = ((smc_type >> 2) & 0x03); ++ } ++ else if (clc_msgid != SMC_CLC_DECLINE) { ++ smc_v2_type = (smc_type & 0x03); ++ smc_v1_type = (smc_type & 0x03); ++ } ++ ++ is_ipv6 = (pinfo->src.type == AT_IPv6); ++ ++ if (is_smc_v2) ++ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMCv2"); ++ else ++ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMC"); ++ ++ if (clc_msgid == SMC_CLC_PROPOSAL) { ++ if (is_smc_v2 && (smc_v2_type != SMC_CLC_NONE)) { ++ mixed_type = get_mixed_type(smc_v1_type, smc_v2_type); ++ col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s,", ++ val_to_str_const((guint32)mixed_type, ++ smcv2_clc_col_info_message_txt, "Unknown Command")); ++ } else { ++ col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s,", ++ val_to_str_const((guint32)smc_v1_type, ++ smc_clc_col_info_message_txt, "Unknown Command")); ++ } ++ } else if ((smc_v2_type == SMC_CLC_SMCR) && ((clc_msgid == SMC_CLC_ACCEPT) || ++ (clc_msgid == SMC_CLC_CONFIRMATION))) { ++ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-R-%s],", ++ val_to_str_const((guint32)clc_msgid, ++ smcr_clc_message_txt, "Unknown Command")); + col_append_fstr(pinfo->cinfo, COL_INFO, " QP=0x%06x", + tvb_get_ntoh24(tvb, ACCEPT_CONFIRM_QP_OFFSET)); + } ++ else if ((smc_v2_type == SMC_CLC_SMCD) && ((clc_msgid == SMC_CLC_ACCEPT) || ++ (clc_msgid == SMC_CLC_CONFIRMATION))) { ++ is_smcd = true; ++ if (is_smc_v2) ++ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-Dv2-%s],", ++ val_to_str_const((guint32)clc_msgid, ++ smcr_clc_message_txt, "Unknown Command")); ++ else ++ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-D-%s],", ++ val_to_str_const((guint32)clc_msgid, ++ smcr_clc_message_txt, "Unknown Command")); ++ } ++ else { ++ if (is_smc_v2) ++ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMCv2-%s],", ++ val_to_str_const((guint32)clc_msgid, ++ smcr_clc_message_txt, "Unknown Command")); ++ else ++ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-%s],", ++ val_to_str_const((guint32)clc_msgid, ++ smcr_clc_message_txt, "Unknown Command")); ++ } + + if (!tree) + return tvb_reported_length(tvb); + +- ti = proto_tree_add_item(tree, proto_smcr, tvb, 0, msg_len, ENC_NA); +- smcr_tree = proto_item_add_subtree(ti, ett_smcr); +- proto_tree_add_item(smcr_tree, hf_smcr_clc_msg, tvb, offset, 1, ++ ti = proto_tree_add_item(tree, proto_smc, tvb, 0, msg_len, ENC_NA); ++ smc_tree = proto_item_add_subtree(ti, ett_smcr); ++ proto_tree_add_item(smc_tree, hf_smcr_clc_msg, tvb, offset, 1, + ENC_BIG_ENDIAN); +- + switch (clc_msgid) { + case SMC_CLC_PROPOSAL: +- disect_smcr_proposal(tvb, smcr_tree); ++ disect_smc_proposal(tvb, smc_tree, is_ipv6); + break; + case SMC_CLC_ACCEPT: +- disect_smcr_accept(tvb, smcr_tree); ++ if (is_smcd) ++ disect_smcd_accept(tvb, smc_tree); ++ else ++ disect_smcr_accept(tvb, smc_tree); + break; + case SMC_CLC_CONFIRMATION: +- disect_smcr_confirm(tvb, smcr_tree); ++ if (is_smcd) ++ disect_smcd_confirm(tvb, smc_tree); ++ else ++ disect_smcr_confirm(tvb, smc_tree); + break; + case SMC_CLC_DECLINE: +- disect_smcr_decline(tvb, smcr_tree); ++ disect_smcr_decline(tvb, smc_tree); + break; + default: + /* Unknown Command */ +@@ -802,7 +1270,7 @@ dissect_smcr_infiniband(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi + (tvb_get_guint8(tvb, LLC_CMD_RSP_OFFSET) & LLC_FLAG_RESP)) + col_append_str(pinfo->cinfo, COL_INFO, "(Resp)"); + +- ti = proto_tree_add_item(tree, proto_smcr, tvb, 0, msg_len, ENC_NA); ++ ti = proto_tree_add_item(tree, proto_smc, tvb, 0, msg_len, ENC_NA); + smcr_tree = proto_item_add_subtree(ti, ett_smcr); + proto_tree_add_item(smcr_tree, hf_smcr_llc_msg, tvb, 0, 1, + ENC_BIG_ENDIAN); +@@ -861,24 +1329,27 @@ get_smcr_pdu_length(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *dat + } + + static int +-dissect_smcr_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ++dissect_smc_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, + void *data) + { +- tcp_dissect_pdus(tvb, pinfo, tree, TRUE, SMCR_TCP_MIN_HEADER_LENGTH, +- get_smcr_pdu_length, dissect_smcr_tcp_pdu, data); ++ tcp_dissect_pdus(tvb, pinfo, tree, TRUE, SMC_TCP_MIN_HEADER_LENGTH, ++ get_smcr_pdu_length, dissect_smc_tcp_pdu, data); + return tvb_reported_length(tvb); + } + + static gboolean +-dissect_smcr_tcp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ++dissect_smc_tcp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, + void *data) + { + if (tvb_captured_length(tvb) < 4) { + return FALSE; + } + +- if (tvb_get_ntohl(tvb, CLC_MSG_BYTE_0) != SMCR_CLC_ID) return FALSE; +- dissect_smcr_tcp(tvb, pinfo, tree, data); ++ if ((tvb_get_ntohl(tvb, CLC_MSG_BYTE_0) != SMCR_CLC_ID) && ++ (tvb_get_ntohl(tvb, CLC_MSG_BYTE_0) != SMCD_CLC_ID)) ++ return FALSE; ++ ++ dissect_smc_tcp(tvb, pinfo, tree, data); + return TRUE; + } + +@@ -921,479 +1392,688 @@ proto_register_smcr(void) + /* Setup list of header fields */ + static hf_register_info hf[] = { + { &hf_smcr_clc_msg, { +- "CLC Message", "smcr.clc_msg", ++ "CLC Message", "smc.clc_msg", + FT_UINT8, BASE_DEC, VALS(smcr_clc_message_txt), 0x0, + NULL, HFILL}}, + + { &hf_smcr_llc_msg, { +- "LLC Message", "smcr.llc_msg", ++ "LLC Message", "smc.llc_msg", + FT_UINT8, BASE_DEC, VALS(smcr_llc_message_txt), 0x0, + NULL, HFILL}}, + ++ { &hf_proposal_smc_version_release_number, { ++ "SMC Version Release Number", "smc.proposal.smc.version.relnum", ++ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }}, ++ ++ { &hf_proposal_smc_version_seid, { ++ "SEID Indicator", "smc.proposal.smc.seid", ++ FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, ++ + { &hf_proposal_smc_version, { +- "SMC Version", "smcr.proposal.smc.version", ++ "SMC Version", "smc.proposal.smc.version", + FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, + ++ { &hf_proposal_smc_type, { ++ "SMC(v1) Type", "smc.proposal.smc.type", ++ FT_UINT8, BASE_DEC, VALS(smc_clc_type_message_txt), ++ 0x03, NULL, HFILL}}, ++ ++ { &hf_accept_smc_type, { ++ "SMC Type", "smc.accept.smc.type", ++ FT_UINT8, BASE_DEC, VALS(smc_clc_type_message_txt), ++ 0x03, NULL, HFILL}}, ++ ++ { &hf_confirm_smc_type, { ++ "SMC Type", "smc.confirm.smc.type", ++ FT_UINT8, BASE_DEC, VALS(smc_clc_type_message_txt), ++ 0x03, NULL, HFILL}}, ++ ++ { &hf_proposal_smc_v2_type, { ++ "SMC(v2) Type", "smc.proposal.smcv2.type", ++ FT_UINT8, BASE_DEC, VALS(smc_clc_type_message_txt), ++ 0x0C, NULL, HFILL}}, ++ ++ { &hf_smc_proposal_smc_chid, { ++ "ISM CHID", "smc.proposal.smc.chid", ++ FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL}}, ++ ++ { &hf_smc_length, { ++ "SMC Length", "smc.length", ++ FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL}}, ++ + { &hf_accept_smc_version, { +- "SMC Version", "smcr.proposal.smc.version", ++ "SMC Version", "smc.proposal.smc.version", ++ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, ++ ++ { &hf_smcd_accept_smc_version, { ++ "SMC Version", "smc.proposal.smc.version", ++ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, ++ ++ { &hf_smcd_confirm_smc_version, { ++ "SMC Version", "smc.proposal.smc.version", + FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, + + { &hf_accept_first_contact, { +- "First Contact", "smcr.proposal.first.contact", ++ "First Contact", "smc.proposal.first.contact", + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL}}, + + { &hf_confirm_smc_version, { +- "SMC Version", "smcr.proposal.smc.version", ++ "SMC Version", "smc.proposal.smc.version", + FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, + + { &hf_accept_rmb_buffer_size, { + "Server RMB Buffers Size (Compressed Notation)", +- "smcr.accept.rmb.buffer.size", ++ "smc.accept.rmb.buffer.size", + FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, + + { &hf_accept_qp_mtu_value, { + "QP MTU Value (enumerated value)", +- "smcr.accept.qp.mtu.value", ++ "smc.accept.qp.mtu.value", + FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL}}, + + { &hf_confirm_rmb_buffer_size, { + "Client RMB Buffers Size (Compressed Notation)", +- "smcr.confirm.rmb.buffer.size", ++ "smc.confirm.rmb.buffer.size", + FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, + + { &hf_confirm_qp_mtu_value, { + "QP MTU Value (enumerated value)", +- "smcr.confirm.qp.mtu.value", ++ "smc.confirm.qp.mtu.value", + FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL}}, + +- { &hf_smcr_proposal_flags, { +- "Flags", "smcr.proposal.flags", ++ { &hf_smc_proposal_flags, { ++ "Flags", "smc.proposal.flags", ++ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, ++ ++ { &hf_smc_proposal_ext_flags, { ++ "Flag 2", "smc.proposal.extflags.2", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_flags, { +- "Flags", "smcr.accept.flags", ++ "Flags", "smc.accept.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_flags2, { +- "Flags 2", "smcr.accept.flags.2", ++ "Flags 2", "smc.accept.flags.2", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_flags, { +- "Flags", "smcr.confirm.flags", ++ "Flags", "smc.confirm.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + +- { &hf_smcr_decline_flags, { +- "Flags", "smcr.decline.flags", ++ { &hf_decline_smc_version, { ++ "SMC Version", "smc.decline.smc.version", ++ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL} }, ++ ++ { &hf_decline_out_of_sync, { ++ "Out of Sync", "smc.decline.osync", ++ FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL} }, ++ ++ { &hf_smc_decline_flags2, { ++ "Flags 2", "smc.decline.flags2", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + ++ { &hf_smc_decline_flags, { ++ "Flags", "smc.decline.flags", ++ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ + { &hf_smcr_confirm_flags2, { +- "Flags 2", "smcr.confirm.flags.2", ++ "Flags 2", "smc.confirm.flags.2", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + +- { &hf_smcr_proposal_client_peer_id, { +- "Sender (Client) Peer ID", "smcr.proposal.sender.client.peer.id", ++ { &hf_smc_proposal_client_peer_id, { ++ "Sender (Client) Peer ID", "smc.proposal.sender.client.peer.id", ++ FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, ++ ++ { &hf_smc_proposal_ism_gid, { ++ "ISM GID", "smc.proposal.ism.gid", + FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + +- { &hf_smcr_proposal_client_preferred_gid, { +- "Client Preferred GID", "smcr.proposal.client.preferred.gid", ++ { &hf_smc_proposal_client_preferred_gid, { ++ "Client Preferred GID", "smc.proposal.client.preferred.gid", + FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + +- { &hf_smcr_proposal_client_preferred_mac, { ++ { &hf_smc_proposal_client_preferred_mac, { + "Client Preferred MAC Address", +- "smcr.proposal.client.preferred.mac", ++ "smc.proposal.client.preferred.mac", + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_server_peer_id, { +- "Sender (Server) Peer ID", "smcr.accept.sender.server.peer.id", ++ "Sender (Server) Peer ID", "smc.accept.sender.server.peer.id", + FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_server_preferred_gid, { +- "Server Preferred GID", "smcr.accept.server.preferred.gid", ++ "Server Preferred GID", "smc.accept.server.preferred.gid", + FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_server_preferred_mac, { + "Server Preferred MAC Address", +- "smcr.accept.server.preferred.mac", ++ "smc.accept.server.preferred.mac", + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + +- { &hf_smcr_proposal_outgoing_interface_subnet_mask, { ++ { &hf_smc_proposal_rocev2_gid_ipv6_addr, { ++ "RoCEv2 GID IPv6 Address", ++ "smc.proposal.rocev2.gid.ipv6", ++ FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smc_proposal_rocev2_gid_ipv4_addr, { ++ "RoCEv2 GID IPv4 Address", ++ "smc.proposal.rocev2.gid.ipv4", ++ FT_IPv4, BASE_NETMASK, NULL, 0x0, NULL, HFILL}}, ++ ++ { &hf_smc_proposal_outgoing_interface_subnet_mask, { + "Outgoing Interface Subnet Mask", +- "smcr.outgoing.interface.subnet.mask", ++ "smc.outgoing.interface.subnet.mask", + FT_IPv4, BASE_NETMASK, NULL, 0x0, NULL, HFILL}}, + +- { &hf_smcr_proposal_outgoing_subnet_mask_signifcant_bits, { ++ { &hf_smc_proposal_outgoing_subnet_mask_signifcant_bits, { + "Outgoing Interface Subnet Mask Number of Significant Bits", +- "smcr.outgoing.interface.subnet.mask.number.of.significant.bits", ++ "smc.outgoing.interface.subnet.mask.number.of.significant.bits", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, + +- { &hf_smcr_proposal_ipv6_prefix, { +- "IPv6 Prefix Value","smcr.proposal.ipv6.prefix.value", ++ { &hf_smc_proposal_ipv6_prefix, { ++ "IPv6 Prefix Value","smc.proposal.ipv6.prefix.value", + FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + +- { &hf_smcr_proposal_ipv6_prefix_length, { +- "IPv6 Prefix Length", "smcr.proposal.ipv6.prefix.length", ++ { &hf_smc_proposal_ipv6_prefix_length, { ++ "IPv6 Prefix Length", "smc.proposal.ipv6.prefix.length", + FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_server_qp_number, { +- "Server QP Number","smcr.accept.server.qp.number", ++ "Server QP Number","smc.accept.server.qp.number", + FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_server_rmb_rkey, { +- "Server RMB Rkey","smcr.accept.server.rmb.rkey", ++ "Server RMB Rkey","smc.accept.server.rmb.rkey", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_server_tcp_conn_index, { + "Server TCP Connection Index", +- "smcr.accept.server.tcp.conn.index", ++ "smc.accept.server.tcp.conn.index", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_server_rmb_element_alert_token, { + "Server RMB Element Alert Token", +- "smcr.accept.server.rmb.element.alert.token", ++ "smc.accept.server.rmb.element.alert.token", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_server_rmb_virtual_address, { + "Server's RMB Virtual Address", +- "smcr.accept.server.rmb.virtual.address", ++ "smc.accept.server.rmb.virtual.address", + FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_accept_initial_psn, { +- "Initial PSN","smcr.accept.initial.psn", ++ "Initial PSN","smc.accept.initial.psn", + FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_client_peer_id, { + "Sender (Client) Peer ID", +- "smcr.confirm.sender.client.peer.id", ++ "smc.confirm.sender.client.peer.id", + FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_client_gid, { +- "Client GID", "smcr.client.gid", ++ "Client GID", "smc.client.gid", + FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_client_mac, { +- "Client MAC Address", "smcr.confirm.client.mac", ++ "Client MAC Address", "smc.confirm.client.mac", + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_client_qp_number, { +- "Client QP Number","smcr.confirm.client.qp.number", ++ "Client QP Number","smc.confirm.client.qp.number", + FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_client_rmb_rkey, { +- "Client RMB Rkey","smcr.confirm.client.rmb.rkey", ++ "Client RMB Rkey","smc.confirm.client.rmb.rkey", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_client_tcp_conn_index, { + "Client TCP Connection Index", +- "smcr.confirm.client.tcp.conn.index", ++ "smc.confirm.client.tcp.conn.index", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_client_rmb_element_alert_token, { + "Client RMB Element Alert Token", +- "smcr.client.rmb.element.alert.token", ++ "smc.client.rmb.element.alert.token", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_client_rmb_virtual_address, { + "Client's RMB Virtual Address", +- "smcr.client.rmb.virtual.address", ++ "smc.client.rmb.virtual.address", + FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_initial_psn, { +- "Initial PSN","smcr.initial.psn", ++ "Initial PSN","smc.initial.psn", + FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + +- { &hf_smcr_decline_peer_id, { +- "Sender Peer ID", "smcr.sender.peer.id", ++ { &hf_smc_decline_peer_id, { ++ "Sender Peer ID", "smc.sender.peer.id", + FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + +- { &hf_smcr_decline_diag_info, { +- "Peer Diagnosis Information", "smcr.peer.diag.info", ++ { &hf_smc_decline_diag_info, { ++ "Peer Diagnosis Information", "smc.peer.diag.info", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + ++ { &hf_decline_os_type, { ++ "OS Type", "smc.decline.os.type", ++ FT_UINT8, BASE_DEC, VALS(smc_clc_os_message_txt), 0xF0, NULL, HFILL} }, ++ + { &hf_smcr_confirm_link_gid, { +- "Sender GID", "smcr.sender.gid", ++ "Sender GID", "smc.sender.gid", + FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_link_mac, { +- "Sender MAC Address", "smcr.confirm.link.sender.mac", ++ "Sender MAC Address", "smc.confirm.link.sender.mac", + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_link_qp_number, { +- "Sender QP Number","smcr.confirm.link.sender.qp.number", ++ "Sender QP Number","smc.confirm.link.sender.qp.number", + FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_link_number, { +- "Link Number", "smcr.confirm.link.number", ++ "Link Number", "smc.confirm.link.number", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_link_userid, { + "Sender Link User ID", +- "smcr.confirm.link.sender.link.userid", ++ "smc.confirm.link.sender.link.userid", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_link_max_links, { +- "Max Links","smcr.confirm.link.max.links", ++ "Max Links","smc.confirm.link.max.links", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_link_flags, { +- "Flags", "smcr.confirm.link.flags", ++ "Flags", "smc.confirm.link.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_link_response, { +- "Response", "smcr.confirm.link.response", ++ "Response", "smc.confirm.link.response", + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, + + { &hf_smcr_add_link_gid, { +- "Sender GID", "smcr.add.link.sender.gid", ++ "Sender GID", "smc.add.link.sender.gid", + FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_mac, { +- "Sender MAC Address", "smcr.add.link.sender.mac", ++ "Sender MAC Address", "smc.add.link.sender.mac", + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_qp_number, { +- "Sender QP Number","smcr.add.link.sender.qp.number", ++ "Sender QP Number","smc.add.link.sender.qp.number", + FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_number, { +- "Link Number", "smcr.add.link.link.number", ++ "Link Number", "smc.add.link.link.number", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_initial_psn, { +- "Initial PSN", "smcr.add.link.initial.psn", ++ "Initial PSN", "smc.add.link.initial.psn", + FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_flags, { +- "Flags", "smcr.add.link.flags", ++ "Flags", "smc.add.link.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_response, { +- "Add Link Response", "smcr.add.link.response", ++ "Add Link Response", "smc.add.link.response", + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, + + { &hf_smcr_add_link_response_rejected, { +- "Add Link Rejected", "smcr.add.link.response.rejected", ++ "Add Link Rejected", "smc.add.link.response.rejected", + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}}, + + { &hf_smcr_add_link_flags2, { +- "Flags", "smcr.add.link.flags2", ++ "Flags", "smc.add.link.flags2", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + + { &hf_smcr_add_link_qp_mtu_value, { +- "QP MTU Value", "smcr.add.link.qp.mtu.value", ++ "QP MTU Value", "smc.add.link.qp.mtu.value", + FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL}}, + + { &hf_smcr_add_link_cont_flags, { +- "Flags", "smcr.add.link.cont.flags", ++ "Flags", "smc.add.link.cont.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_cont_response, { +- "Response", "smcr.add.link.cont.response", ++ "Response", "smc.add.link.cont.response", + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, + + { &hf_smcr_add_link_cont_link_number, { +- "Link Number", "smcr.add.link.cont.link.number", ++ "Link Number", "smc.add.link.cont.link.number", + FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, + + { &hf_smcr_add_link_cont_number_of_rkeys, { +- "Number of Rkeys", "smcr.add.link.cont.rkey.number", ++ "Number of Rkeys", "smc.add.link.cont.rkey.number", + FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, + + { &hf_smcr_add_link_cont_p1_rkey, { + "RMB RToken Pair 1 - Rkey as known on this SMC Link", +- "smcr.add.link.cont.rmb.RTok1.Rkey1", ++ "smc.add.link.cont.rmb.RTok1.Rkey1", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_cont_p1_rkey2, { + "RMB RToken Pair 1 - Equivalent Rkey for the new SMC Link", +- "smcr.add.link.cont.rmb.RTok1.Rkey2", ++ "smc.add.link.cont.rmb.RTok1.Rkey2", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_cont_p1_virt_addr, { + "RMB RToken Pair 1 Virtual Address for the new SMC Link", +- "smcr.add.link.cont.rmb.RTok1.virt", ++ "smc.add.link.cont.rmb.RTok1.virt", + FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_cont_p2_rkey, { + "RMB RToken Pair 2 - Rkey as known on this SMC Link", +- "smcr.add.link.cont.rmb.RTok2.Rkey1", ++ "smc.add.link.cont.rmb.RTok2.Rkey1", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_cont_p2_rkey2, { + "RMB RToken Pair 2 - Equivalent Rkey for the new SMC Link", +- "smcr.add.link.cont.rmb.RTok2.Rkey2", ++ "smc.add.link.cont.rmb.RTok2.Rkey2", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_add_link_cont_p2_virt_addr, { + "RMB RToken Pair 2 Virtual Address for the new SMC Link", +- "smcr.add.link.cont.rmb.RTok1.virt", ++ "smc.add.link.cont.rmb.RTok1.virt", + FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_delete_link_flags, { +- "Flags", "smcr.delete.link.flags", ++ "Flags", "smc.delete.link.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_delete_link_response, { +- "Response", "smcr.delete.link.response", ++ "Response", "smc.delete.link.response", + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, + + { &hf_smcr_delete_link_all, { + "Terminate All Links In The Link Group", +- "smcr.delete.link.all", ++ "smc.delete.link.all", + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}}, + + { &hf_smcr_delete_link_orderly, { +- "Terminate Links Orderly", "smcr.delete.link.orderly", ++ "Terminate Links Orderly", "smc.delete.link.orderly", + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, + + { &hf_smcr_delete_link_number, { +- "Link Number For The Failed Link", "smcr.delete.link.number", ++ "Link Number For The Failed Link", "smc.delete.link.number", + FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, + + { &hf_smcr_delete_link_reason_code, { +- "Reason Code", "smcr.delete.link.reason.code", ++ "Reason Code", "smc.delete.link.reason.code", + FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL}}, + + { &hf_smcr_confirm_rkey_flags, { +- "Flags", "smcr.confirm.rkey.flags", ++ "Flags", "smc.confirm.rkey.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_rkey_response, { +- "Response", "smcr.confirm.rkey.response", ++ "Response", "smc.confirm.rkey.response", + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, + + { &hf_smcr_confirm_rkey_negative_response, { +- "Negative Response", "smcr.confirm.rkey.negative.response", ++ "Negative Response", "smc.confirm.rkey.negative.response", + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, + + { &hf_smcr_confirm_rkey_retry_rkey_set, { +- "Retry Rkey Set", "smcr.confirm.rkey.retry.rkey.set", ++ "Retry Rkey Set", "smc.confirm.rkey.retry.rkey.set", + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL}}, + + { &hf_smcr_confirm_rkey_number, { +- "Number of other QP", "smcr.confirm.rkey.number.qp", ++ "Number of other QP", "smc.confirm.rkey.number.qp", + FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, + + { &hf_smcr_confirm_rkey_new_rkey, { +- "New Rkey for this link","smcr.confirm.rkey.new.rkey", ++ "New Rkey for this link","smc.confirm.rkey.new.rkey", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_rkey_virtual_address, { + "New RMB virtual address for this link", +- "smcr.confirm.rkey.new.virt", ++ "smc.confirm.rkey.new.virt", + FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_confirm_rkey_link_number, { +- "Link Number", "smcr.confirm.rkey.link.number", ++ "Link Number", "smc.confirm.rkey.link.number", + FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, + + { &hf_smcr_delete_rkey_flags, { +- "Flags", "smcr.delete.rkey.flags", ++ "Flags", "smc.delete.rkey.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_delete_rkey_response, { +- "Response", "smcr.delete.rkey.response", ++ "Response", "smc.delete.rkey.response", + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, + + { &hf_smcr_delete_rkey_negative_response, { +- "Negative Response", "smcr.delete.rkey.negative.response", ++ "Negative Response", "smc.delete.rkey.negative.response", + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, + + { &hf_smcr_delete_rkey_mask, { +- "Error Mask", "smcr.delete.rkey.error.mask", ++ "Error Mask", "smc.delete.rkey.error.mask", + FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, + + { &hf_smcr_delete_rkey_deleted, { +- "RMB Rkey to be deleted", "smcr.delete.rkey.deleted", ++ "RMB Rkey to be deleted", "smc.delete.rkey.deleted", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_test_link_flags, { +- "Flags", "smcr.test.link.flags", ++ "Flags", "smc.test.link.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_test_link_response, { +- "Response", "smcr.test.link.response", ++ "Response", "smc.test.link.response", + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_seqno, { +- "Sequence Number", "smcr.rmbe.ctrl.seqno", ++ "Sequence Number", "smc.rmbe.ctrl.seqno", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_alert_token, { +- "Alert Token", "smcr.rmbe.ctrl.alert.token", ++ "Alert Token", "smc.rmbe.ctrl.alert.token", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + ++ { &hf_smc_proposal_eid, { ++ "EID", "smc.proposal.eid", ++ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smc_proposal_system_eid, { ++ "SEID", "smc.proposal.system.eid", ++ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, ++ + { &hf_smcr_rmbe_ctrl_prod_wrap_seqno, { + "Producer window wrap sequence number", +- "smcr.rmbe.ctrl.prod.wrap.seq", ++ "smc.rmbe.ctrl.prod.wrap.seq", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_peer_prod_curs, { +- "Peer Producer Cursor", "smcr.rmbe.ctrl.peer.prod.curs", ++ "Peer Producer Cursor", "smc.rmbe.ctrl.peer.prod.curs", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + + { &hf_smcr_rmbe_ctrl_cons_wrap_seqno, { + "Consumer window wrap sequence number", +- "smcr.rmbe.ctrl.prod.wrap.seq", ++ "smc.rmbe.ctrl.prod.wrap.seq", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_peer_cons_curs, { +- "Peer Consumer Cursor", "smcr.rmbe.ctrl.peer.prod.curs", ++ "Peer Consumer Cursor", "smc.rmbe.ctrl.peer.prod.curs", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_conn_rw_status_flags, { + "Connection read/write status flags", +- "smcr.rmbe.ctrl.conn.rw.status.flags", ++ "smc.rmbe.ctrl.conn.rw.status.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_write_blocked, { +- "Write Blocked", "smcr.rmbe.ctrl.write.blocked", ++ "Write Blocked", "smc.rmbe.ctrl.write.blocked", + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_urgent_pending, { +- "Urgent Data Pending", "smcr.rmbe.ctrl.urgent.pending", ++ "Urgent Data Pending", "smc.rmbe.ctrl.urgent.pending", + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_urgent_present, { +- "Urgent Data Present", "smcr.rmbe.ctrl.urgent.present", ++ "Urgent Data Present", "smc.rmbe.ctrl.urgent.present", + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_cons_update_requested, { + "Consumer Cursor Update Requested", +- "smcr.rmbe.ctrl.cons.update.requested", ++ "smc.rmbe.ctrl.cons.update.requested", + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_failover_validation, { + "Failover Validation Indicator", +- "smcr.rmbe.ctrl.failover.validation", ++ "smc.rmbe.ctrl.failover.validation", + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_peer_conn_state_flags, { + "Peer Connection State Flags", +- "smcr.rmbe.ctrl.peer.conn.state.flags", ++ "smc.rmbe.ctrl.peer.conn.state.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_peer_sending_done, { +- "Peer Sending Done", "smcr.rmbe.ctrl.peer.sending.done", ++ "Peer Sending Done", "smc.rmbe.ctrl.peer.sending.done", + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_peer_closed_conn, { +- "Peer Closed Connection", "smcr.rmbe.ctrl.peer.closed.conn", ++ "Peer Closed Connection", "smc.rmbe.ctrl.peer.closed.conn", + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}}, + + { &hf_smcr_rmbe_ctrl_peer_abnormal_close, { +- "Peer Abnormal Close", "smcr.rmbe.ctrl.peer.abnormal.close", +- FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}} ++ "Peer Abnormal Close", "smc.rmbe.ctrl.peer.abnormal.close", ++ FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, ++ ++ { &hf_smcd_accept_eid, { ++ "EID", "smc.accept.eid", ++ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_eid, { ++ "EID", "smc.confirm.eid", ++ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_accept_peer_name, { ++ "Peer Host Name", "smc.accept.peer.host.name", ++ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_peer_name, { ++ "Peer Host Name", "smc.confirm.peer.host.name", ++ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_accept_first_contact, { ++ "First Contact", "smc.accept.first.contact", ++ FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_first_contact, { ++ "First Contact", "smc.confirm.first.contact", ++ FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL} }, ++ ++ { &hf_accept_smc_version_release_number, { ++ "SMC Version Release Number", "smc.accept.smc.version.relnum", ++ FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL } }, ++ ++ { &hf_confirm_smc_version_release_number, { ++ "SMC Version Release Number", "smc.confirm.smc.version.relnum", ++ FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL } }, ++ ++ { &hf_accept_os_type, { ++ "OS Type", "smc.accept.os.type", ++ FT_UINT8, BASE_DEC, VALS(smc_clc_os_message_txt), 0xF0, NULL, HFILL} }, ++ ++ { &hf_confirm_os_type, { ++ "OS Type", "smc.confirm.os.type", ++ FT_UINT8, BASE_DEC, VALS(smc_clc_os_message_txt), 0xF0, NULL, HFILL} }, ++ ++ { &hf_smcd_accept_dmb_token, { ++ "DMB Token", "smc.accept.dmb.token", ++ FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_dmb_token, { ++ "DMB Token", "smc.confirm.dmb.token", ++ FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_accept_dmb_buffer_size, { ++ "Server DMBE Buffers Size (Compressed Notation)", ++ "smc.accept.dmbe.buffer.size", ++ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_dmb_buffer_size, { ++ "Client DMBE Buffers Size (Compressed Notation)", ++ "smc.confirm.dmbe.buffer.size", ++ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL} }, ++ ++ { &hf_smcd_accept_smc_chid, { ++ "ISM CHID", "smc.accept.smc.chid", ++ FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_smc_chid, { ++ "ISM CHID", "smc.confirm.smc.chid", ++ FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL} }, ++ ++ { &hf_smcd_accept_server_peer_id, { ++ "Sender (Server) ISM GID", "smc.accept.sender.server.ism.gid", ++ FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_client_peer_id, { ++ "Sender (Client) ISM GID", "smc.confirm.sender.client.ism.gid", ++ FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_accept_dmbe_conn_index, { ++ "DMBE Connection Index", ++ "smc.accept.dmbe.conn.index", ++ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_accept_server_link_id, { ++ "Server Link ID", ++ "smc.accept.server.linkid", ++ FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_dmbe_conn_index, { ++ "DMBE Connection Index", ++ "smc.confirm.dmbe.conn.index", ++ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_client_link_id, { ++ "Client Link ID", ++ "smc.confirm.client.linkid", ++ FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_accept_flags, { ++ "Flags", "smc.accept.flags", ++ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_flags, { ++ "Flags", "smc.confirm.flags", ++ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_accept_flags2, { ++ "DMBE Size", "smc.accept.dmbe.size", ++ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_confirm_flags2, { ++ "DMBE Size", "smc.confirm.dmbe.size", ++ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smcd_accept_fce_flags, { ++ "Flags", "smc.accept.fce.flags", ++ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} } + }; + + /* Setup protocol subtree arrays */ +- static gint *ett[] = { ++ static gint* ett[] = { + &ett_smcr, + &ett_proposal_flag, ++ &ett_proposal_ext_flag2, + &ett_accept_flag, + &ett_accept_flag2, ++ &ett_smcd_accept_flag, ++ &ett_smcd_accept_flag2, ++ &ett_smcd_accept_fce_flag, ++ &ett_smcd_confirm_flag, ++ &ett_smcd_confirm_fce_flag, ++ &ett_smcd_confirm_flag2, + &ett_confirm_flag, + &ett_confirm_flag2, + &ett_confirm_link_flag, ++ &ett_decline_flag, ++ &ett_decline_flag2, + &ett_add_link_flag, + &ett_add_link_flag2, + &ett_add_link_cont_flag, +@@ -1405,21 +2085,21 @@ proto_register_smcr(void) + &ett_rmbe_ctrl_peer_conn_state_flag + }; + +- proto_smcr = proto_register_protocol("Shared Memory Communications - RDMA", +- "SMCR", "smcr"); ++ proto_smc = proto_register_protocol("Shared Memory Communications", ++ "SMC", "smc"); + +- proto_register_field_array(proto_smcr, hf, array_length(hf)); ++ proto_register_field_array(proto_smc, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +- smcr_tcp_handle = register_dissector("smcr", dissect_smcr_tcp, proto_smcr); ++ smc_tcp_handle = register_dissector("smc", dissect_smc_tcp, proto_smc); + } + + void + proto_reg_handoff_smcr(void) + { +- heur_dissector_add("tcp", dissect_smcr_tcp_heur, "Shared Memory Communications over TCP", "smcr_tcp", proto_smcr, HEURISTIC_ENABLE); +- heur_dissector_add("infiniband.payload", dissect_smcr_infiniband_heur, "Shared Memory Communications Infiniband", "smcr_infiniband", proto_smcr, HEURISTIC_ENABLE); +- dissector_add_for_decode_as("infiniband", create_dissector_handle( dissect_smcr_infiniband, proto_smcr ) ); ++ heur_dissector_add("tcp", dissect_smc_tcp_heur, "Shared Memory Communications over TCP", "smc_tcp", proto_smc, HEURISTIC_ENABLE); ++ heur_dissector_add("infiniband.payload", dissect_smcr_infiniband_heur, "Shared Memory Communications Infiniband", "smcr_infiniband", proto_smc, HEURISTIC_ENABLE); ++ dissector_add_for_decode_as("infiniband", create_dissector_handle( dissect_smcr_infiniband, proto_smc ) ); + } + + /* diff --git a/wireshark.spec b/wireshark.spec index d519d6e..7c31c73 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,7 +8,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -29,6 +29,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-move-glib.patch +Patch9: wireshark-0009-smc-support.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -274,6 +275,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Feb 22 2021 Michal Ruprich - 1:3.4.3-2 +- Adding SMC-R, SMC-D and SMC-D v2 + * Tue Feb 16 2021 Michal Ruprich - 1:3.4.3-1 - New version 3.4.3 - Fix for CVE-2021-22173, CVE-2021-22174 From f831e8d264889924603c7a94502b70be763624b1 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 23 Feb 2021 08:50:19 +0100 Subject: [PATCH 026/120] Adding more commits to make SMC complete --- wireshark-0009-smc-support.patch | 237 +++++++++++++++++++++++++++++++ wireshark.spec | 5 +- 2 files changed, 241 insertions(+), 1 deletion(-) diff --git a/wireshark-0009-smc-support.patch b/wireshark-0009-smc-support.patch index 84bdca3..8de1d91 100644 --- a/wireshark-0009-smc-support.patch +++ b/wireshark-0009-smc-support.patch @@ -1654,3 +1654,240 @@ index 7096d1b0b0..bbfa9c07ef 100644 } /* +diff --git a/epan/dissectors/packet-smc.c b/epan/dissectors/packet-smc.c +index bbfa9c07ef..0a4e96e055 100644 +--- a/epan/dissectors/packet-smc.c ++++ b/epan/dissectors/packet-smc.c +@@ -592,7 +592,7 @@ disect_smcd_accept(tvbuff_t* tvb, proto_tree* tree) + offset += FLAG_BYTE_LEN; + offset += TWO_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcd_accept_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); +- offset += 32; ++ /* offset += 32; */ + } + } + } +@@ -661,7 +661,7 @@ disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree) + offset += FLAG_BYTE_LEN; + offset += TWO_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcd_confirm_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); +- offset += 32; ++ /* offset += 32; */ + } + } + } +diff --git a/epan/dissectors/packet-smc.c b/epan/dissectors/packet-smc.c +index 0a4e96e055..6ede4690db 100644 +--- a/epan/dissectors/packet-smc.c ++++ b/epan/dissectors/packet-smc.c +@@ -1,3 +1,6 @@ ++ ++ ++ + /* packet-smc.c + * SMC dissector for wireshark + * By Joe Fowler +@@ -191,6 +194,8 @@ static int hf_smc_proposal_outgoing_subnet_mask_signifcant_bits = -1; + static int hf_smc_proposal_ipv6_prefix = -1; + static int hf_smc_proposal_ipv6_prefix_length = -1; + ++static int hf_smc_reserved = -1; ++ + /* SMC-R Accept */ + static int ett_accept_flag = -1; + static int ett_accept_flag2 = -1; +@@ -427,6 +432,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) + + if (mask_offset != 0) { + suboffset = offset; ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ suboffset, TWO_BYTE_RESERVED, ENC_NA); + suboffset += TWO_BYTE_RESERVED; + if (is_smcdv1 || is_smcdv2) { + proto_tree_add_item(tree, hf_smc_proposal_ism_gid, tvb, +@@ -439,6 +446,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) + LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); + } + suboffset += LENGTH_BYTE_LEN; ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ suboffset, TWO_BYTE_RESERVED, ENC_NA); + v2_ext_offset = tvb_get_ntohs(tvb, suboffset); + v2_ext_pos = suboffset + TWO_BYTE_RESERVED + v2_ext_offset; + } +@@ -451,7 +460,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) + proto_tree_add_item(tree, hf_smc_proposal_outgoing_subnet_mask_signifcant_bits, tvb, + offset, 1, ENC_BIG_ENDIAN); + offset += 1; +- /* Bump past reserved bytes */ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, TWO_BYTE_RESERVED, ENC_NA); + offset += TWO_BYTE_RESERVED; + ipv6_prefix_count = tvb_get_guint8(tvb, offset); + offset += 1; +@@ -472,7 +482,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) + offset += FLAG_BYTE_LEN; + num_of_gids = tvb_get_guint8(tvb, offset); + offset += FLAG_BYTE_LEN; +- /*Skip reserved flag 1*/ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, 1, ENC_NA); + offset += 1; + proposal_flag_item = proto_tree_add_item(tree, hf_smc_proposal_ext_flags, tvb, + offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); +@@ -482,7 +493,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) + proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version_seid, tvb, + offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + offset += FLAG_BYTE_LEN; +- /*Skip not used 2 bytes*/ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, 2, ENC_NA); + offset += 2; + smcd_v2_ext_offset = tvb_get_ntohs(tvb, offset); + offset += 2; +@@ -499,7 +511,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) + offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN); + offset += IPV4_SUBNET_MASK_LEN; + } +- /*Skip reserved 16 bytes*/ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, 16, ENC_NA); + offset += 16; + while (num_of_eids != 0) { + proto_tree_add_item(tree, hf_smc_proposal_eid, tvb, +@@ -512,7 +525,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) + proto_tree_add_item(tree, hf_smc_proposal_system_eid, tvb, + offset, EID_LEN, ENC_ASCII | ENC_NA); + offset += EID_LEN; +- /*Skip reserved 16 bytes*/ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, 16, ENC_NA); + offset += 16; + while (num_of_gids != 0) { + proto_tree_add_item(tree, hf_smc_proposal_ism_gid, tvb, +@@ -580,16 +594,21 @@ disect_smcd_accept(tvbuff_t* tvb, proto_tree* tree) + + proto_tree_add_item(tree, hf_smcd_accept_eid, tvb, offset, 32, ENC_ASCII | ENC_NA); + offset += 32; +- /* Reserved bytes */ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, 8, ENC_NA); + offset += 8; + + if (first_contact) { ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, ONE_BYTE_RESERVED, ENC_NA); + offset += ONE_BYTE_RESERVED; + accept_flag_item = proto_tree_add_item(tree, hf_smcd_accept_fce_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_smcd_accept_fce_flag); + proto_tree_add_item(accept_flag_tree, hf_accept_os_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + proto_tree_add_item(accept_flag_tree, hf_accept_smc_version_release_number, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + offset += FLAG_BYTE_LEN; ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, TWO_BYTE_RESERVED, ENC_NA); + offset += TWO_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcd_accept_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); + /* offset += 32; */ +@@ -637,6 +656,8 @@ disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree) + confirm_flag2_tree = proto_item_add_subtree(confirm_flag2_item, ett_smcd_confirm_flag2); + proto_tree_add_item(confirm_flag2_tree, hf_smcd_confirm_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + offset += FLAG_BYTE_LEN; ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, ONE_BYTE_RESERVED, ENC_NA); + offset += TWO_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcd_confirm_client_link_id, tvb, + offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN); +@@ -649,16 +670,21 @@ disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree) + + proto_tree_add_item(tree, hf_smcd_confirm_eid, tvb, offset, 32, ENC_ASCII | ENC_NA); + offset += 32; +- /* Reserved bytes */ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, 8, ENC_NA); + offset += 8; + + if (first_contact) { ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, ONE_BYTE_RESERVED, ENC_NA); + offset += ONE_BYTE_RESERVED; + confirm_flag_item = proto_tree_add_item(tree, hf_smcd_accept_fce_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_smcd_confirm_fce_flag); + proto_tree_add_item(confirm_flag_tree, hf_confirm_os_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_version_release_number, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + offset += FLAG_BYTE_LEN; ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, TWO_BYTE_RESERVED, ENC_NA); + offset += TWO_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcd_confirm_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); + /* offset += 32; */ +@@ -711,12 +737,14 @@ disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree) + proto_tree_add_item(accept_flag2_tree, hf_accept_rmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + proto_tree_add_item(accept_flag2_tree, hf_accept_qp_mtu_value, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + offset += FLAG_BYTE_LEN; +- /* Bump past reserved byte */ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, ONE_BYTE_RESERVED, ENC_NA); + offset += ONE_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcr_accept_server_rmb_virtual_address, tvb, + offset, VIRTUAL_ADDR_LEN, ENC_BIG_ENDIAN); + offset += VIRTUAL_ADDR_LEN; +- /* Bump past reserved byte */ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, ONE_BYTE_RESERVED, ENC_NA); + offset += ONE_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcr_accept_initial_psn, tvb, + offset, PSN_LEN, ENC_BIG_ENDIAN); +@@ -765,12 +793,14 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree) + proto_tree_add_item(confirm_flag2_tree, hf_confirm_rmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + proto_tree_add_item(confirm_flag2_tree, hf_confirm_qp_mtu_value, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); + offset += FLAG_BYTE_LEN; +- /* Bump past reserved byte */ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, ONE_BYTE_RESERVED, ENC_NA); + offset += ONE_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcr_confirm_client_rmb_virtual_address, tvb, + offset, VIRTUAL_ADDR_LEN, ENC_BIG_ENDIAN); + offset += VIRTUAL_ADDR_LEN; +- /* Bump past reserved byte */ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, ONE_BYTE_RESERVED, ENC_NA); + offset += ONE_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcr_confirm_initial_psn, tvb, + offset, PSN_LEN, ENC_BIG_ENDIAN); +@@ -866,7 +896,8 @@ disect_smcr_add_link(tvbuff_t *tvb, proto_tree *tree) + proto_tree_add_item(tree, hf_smcr_add_link_mac, tvb, + offset, MAC_ADDR_LEN, ENC_NA); + offset += MAC_ADDR_LEN; +- /* Bump past reserved bytes */ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, ++ offset, TWO_BYTE_RESERVED, ENC_NA); + offset += TWO_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcr_add_link_gid, tvb, + offset, GID_LEN, ENC_NA); +@@ -1084,12 +1115,13 @@ disect_smcr_rmbe_ctrl(tvbuff_t *tvb, proto_tree *tree) + offset += SEQNO_LEN; + proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_alert_token, tvb, offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN); + offset += ALERT_TOKEN_LEN; ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, TWO_BYTE_RESERVED, ENC_NA); + offset += TWO_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_prod_wrap_seqno, tvb, offset, SEQNO_LEN, ENC_BIG_ENDIAN); + offset += SEQNO_LEN; + proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_peer_prod_curs, tvb, offset, CURSOR_LEN, ENC_BIG_ENDIAN); + offset += CURSOR_LEN; +- /* Bump past reserved bytes */ ++ proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, TWO_BYTE_RESERVED, ENC_NA); + offset += TWO_BYTE_RESERVED; + proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_cons_wrap_seqno, tvb, offset, SEQNO_LEN, ENC_BIG_ENDIAN); + offset += SEQNO_LEN; +@@ -2053,7 +2085,11 @@ proto_register_smcr(void) + + { &hf_smcd_accept_fce_flags, { + "Flags", "smc.accept.fce.flags", +- FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} } ++ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, ++ ++ { &hf_smc_reserved, { ++ "Reserved", "smc.reserved", ++ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} } + }; + + /* Setup protocol subtree arrays */ diff --git a/wireshark.spec b/wireshark.spec index 7c31c73..145fd8b 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,7 +8,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -275,6 +275,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Feb 23 2021 Michal Ruprich - 1:3.4.3-3 +- Adding more commits to make SMC complete + * Mon Feb 22 2021 Michal Ruprich - 1:3.4.3-2 - Adding SMC-R, SMC-D and SMC-D v2 From 9fdbade58ab9e531900025ae8073465087919891 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 11 Mar 2021 15:46:21 +0100 Subject: [PATCH 027/120] repository will be deprecated soon --- ci.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.fmf b/ci.fmf index 0df4c06..d6542da 100644 --- a/ci.fmf +++ b/ci.fmf @@ -8,6 +8,6 @@ - name: tier1 how: fmf filter: 'tier: 1' - repository: "https://src.fedoraproject.org/tests/wireshark.git" + url: "https://src.fedoraproject.org/tests/wireshark.git" execute: how: beakerlib From d7ac10e2a001bfea416b0389b1e613d8223fd187 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 16 Mar 2021 10:52:14 +0100 Subject: [PATCH 028/120] New version 3.4.4 Fix for CVE-2021-22191 --- sources | 4 ++-- wireshark.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 33837ca..4582e8c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.3.tar.xz) = 6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859 -SHA512 (SIGNATURES-3.4.3.txt) = 30b2e61e6168503794f437a4e3ca6c3a85cd50759e5edb1968f03d4f5692783474126741bda12646b13647ece53a883c00a69903e83253a06dea6e64525321f3 +SHA512 (wireshark-3.4.4.tar.xz) = 388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172 +SHA512 (SIGNATURES-3.4.4.txt) = f8e270388fdf7c5bc3b502c7f1df5823b9cb5f17ec522bd57d6a7df6a8389714e92dca469364670f0437ae3e0ef70bcc1b0254b070e6d230cada3b2eee29eebc diff --git a/wireshark.spec b/wireshark.spec index 145fd8b..114e549 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,8 +7,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.3 -Release: 3%{?dist} +Version: 3.4.4 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -275,6 +275,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Mar 16 2021 Michal Ruprich - 1:3.4.4-1 +- New version 3.4.4 +- Fix for CVE-2021-22191 + * Tue Feb 23 2021 Michal Ruprich - 1:3.4.3-3 - Adding more commits to make SMC complete From d79d166c75e1e8a0560bbece5efe738f55f74efe Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 16 Mar 2021 10:55:39 +0100 Subject: [PATCH 029/120] New version 3.4.4 Fix for CVE-2021-22191 --- sources | 4 ++-- wireshark.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 33837ca..4582e8c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.3.tar.xz) = 6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859 -SHA512 (SIGNATURES-3.4.3.txt) = 30b2e61e6168503794f437a4e3ca6c3a85cd50759e5edb1968f03d4f5692783474126741bda12646b13647ece53a883c00a69903e83253a06dea6e64525321f3 +SHA512 (wireshark-3.4.4.tar.xz) = 388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172 +SHA512 (SIGNATURES-3.4.4.txt) = f8e270388fdf7c5bc3b502c7f1df5823b9cb5f17ec522bd57d6a7df6a8389714e92dca469364670f0437ae3e0ef70bcc1b0254b070e6d230cada3b2eee29eebc diff --git a/wireshark.spec b/wireshark.spec index 6541886..ebaf453 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,7 +4,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.3 +Version: 3.4.4 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -270,6 +270,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Mar 16 2021 Michal Ruprich - 1:3.4.4-1 +- New version 3.4.4 +- Fix for CVE-2021-22191 + * Tue Feb 16 2021 Michal Ruprich - 1:3.4.3-1 - New version 3.4.3 - Fix for CVE-2021-22173, CVE-2021-22174 From 13fdc7040e21e56b967031e31e22ae656a1baff7 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 27 May 2021 12:18:00 +0200 Subject: [PATCH 030/120] New version 3.4.5 Fix for CVE-2021-22207 --- sources | 4 +- wireshark-0008-move-glib.patch | 312 --------------------------------- wireshark.spec | 7 +- 3 files changed, 7 insertions(+), 316 deletions(-) delete mode 100644 wireshark-0008-move-glib.patch diff --git a/sources b/sources index 4582e8c..f728ddb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.4.tar.xz) = 388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172 -SHA512 (SIGNATURES-3.4.4.txt) = f8e270388fdf7c5bc3b502c7f1df5823b9cb5f17ec522bd57d6a7df6a8389714e92dca469364670f0437ae3e0ef70bcc1b0254b070e6d230cada3b2eee29eebc +SHA512 (wireshark-3.4.5.tar.xz) = f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a +SHA512 (SIGNATURES-3.4.5.txt) = a0a8e57c1dc2ee6c154d2d39079981f03f1804f5e3946077b5c1996b6ddf1854d430b685fcd65faa9dab4e59e31d8ded4fd22e4ae9db02f3a04da7165cacb84d diff --git a/wireshark-0008-move-glib.patch b/wireshark-0008-move-glib.patch deleted file mode 100644 index 5c9567a..0000000 --- a/wireshark-0008-move-glib.patch +++ /dev/null @@ -1,312 +0,0 @@ -diff --git a/caputils/capture_ifinfo.h b/caputils/capture_ifinfo.h -index e063134b74..9965703538 100644 ---- a/caputils/capture_ifinfo.h -+++ b/caputils/capture_ifinfo.h -@@ -11,12 +11,12 @@ - #ifndef __CAPTURE_IFINFO_H__ - #define __CAPTURE_IFINFO_H__ - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include -- - /* - * Explicitly set the interface_type enum values as these values are exposed - * in the preferences gui.interfaces_hidden_types string. -diff --git a/epan/dissectors/dissectors.h b/epan/dissectors/dissectors.h -index b9f4c6b0ff..6f83b01b7c 100644 ---- a/epan/dissectors/dissectors.h -+++ b/epan/dissectors/dissectors.h -@@ -11,12 +11,12 @@ - #ifndef __DISSECTOR_REGISTER_H__ - #define __DISSECTOR_REGISTER_H__ - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include -- - typedef struct _dissector_reg { - const char *cb_name; - void (*cb_func)(void); -diff --git a/epan/epan.h b/epan/epan.h -index 1f6a52fa27..f646c1fc95 100644 ---- a/epan/epan.h -+++ b/epan/epan.h -@@ -10,11 +10,12 @@ - #ifndef __EPAN_H__ - #define __EPAN_H__ - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include - #include - #include - #include -diff --git a/epan/prefs.h b/epan/prefs.h -index 1fc560ccdc..1814f53a80 100644 ---- a/epan/prefs.h -+++ b/epan/prefs.h -@@ -11,12 +11,12 @@ - #ifndef __PREFS_H__ - #define __PREFS_H__ - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include -- - #include - #include - -diff --git a/epan/value_string.h b/epan/value_string.h -index 03551e31f4..548ec6a7ae 100644 ---- a/epan/value_string.h -+++ b/epan/value_string.h -@@ -11,11 +11,12 @@ - #ifndef __VALUE_STRING_H__ - #define __VALUE_STRING_H__ - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include - #include "ws_symbol_export.h" - #include "wmem/wmem.h" - -diff --git a/epan/wmem/wmem_user_cb_int.h b/epan/wmem/wmem_user_cb_int.h -index 3045d943ab..7232241c81 100644 ---- a/epan/wmem/wmem_user_cb_int.h -+++ b/epan/wmem/wmem_user_cb_int.h -@@ -12,11 +12,12 @@ - #ifndef __WMEM_USER_CB_INT_H__ - #define __WMEM_USER_CB_INT_H__ - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include - #include "wmem_user_cb.h" - - WS_DLL_LOCAL -diff --git a/ui/packet_range.h b/ui/packet_range.h -index 6e7d34d118..2e5dad62af 100644 ---- a/ui/packet_range.h -+++ b/ui/packet_range.h -@@ -14,12 +14,12 @@ - #ifndef __PACKET_RANGE_H__ - #define __PACKET_RANGE_H__ - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include -- - #include - #include - -diff --git a/ui/recent.h b/ui/recent.h -index 3d6d1c9cdb..5ae5852bb4 100644 ---- a/ui/recent.h -+++ b/ui/recent.h -@@ -12,11 +12,12 @@ - #ifndef __RECENT_H__ - #define __RECENT_H__ - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include - #include - #include "epan/timestamp.h" - #include "ui/ws_ui_util.h" -diff --git a/ui/rtp_media.h b/ui/rtp_media.h -index 04290f6aee..e144ac571e 100644 ---- a/ui/rtp_media.h -+++ b/ui/rtp_media.h -@@ -15,6 +15,8 @@ - #ifndef __RTP_MEDIA_H__ - #define __RTP_MEDIA_H__ - -+#include -+ - /** @file - * "RTP Player" dialog box common routines. - * @ingroup main_ui_group -@@ -24,8 +26,6 @@ - extern "C" { - #endif /* __cplusplus */ - --#include -- - /****************************************************************************/ - /* INTERFACE */ - /****************************************************************************/ -diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h -index e368a792bf..b683f16ba7 100644 ---- a/ui/rtp_stream.h -+++ b/ui/rtp_stream.h -@@ -14,6 +14,8 @@ - #ifndef __RTP_STREAM_H__ - #define __RTP_STREAM_H__ - -+#include -+ - /** @file - * "RTP Streams" dialog box common routines. - * @ingroup main_ui_group -@@ -24,7 +26,6 @@ extern "C" { - #endif /* __cplusplus */ - - #include "tap-rtp-analysis.h" --#include - #include - - #include "cfile.h" -diff --git a/ui/voip_calls.h b/ui/voip_calls.h -index 0fc71f180f..cfd791d6f8 100644 ---- a/ui/voip_calls.h -+++ b/ui/voip_calls.h -@@ -22,6 +22,8 @@ - #ifndef __VOIP_CALLS_H__ - #define __VOIP_CALLS_H__ - -+#include -+ - /** @file - * "VoIP Calls" dialog box common routines. - * @ingroup main_ui_group -@@ -31,7 +33,6 @@ - extern "C" { - #endif /* __cplusplus */ - --#include - #include - - #include "epan/address.h" -diff --git a/wsutil/file_util.h b/wsutil/file_util.h -index 565b9d46e3..e9942f3c5b 100644 ---- a/wsutil/file_util.h -+++ b/wsutil/file_util.h -@@ -11,6 +11,8 @@ - #ifndef __FILE_UTIL_H__ - #define __FILE_UTIL_H__ - -+#include -+ - #include "config.h" - - #include "ws_symbol_export.h" -@@ -19,8 +21,6 @@ - extern "C" { - #endif /* __cplusplus */ - --#include -- - #ifdef _WIN32 - #include /* for _read(), _write(), etc. */ - #include -diff --git a/wsutil/plugins.h b/wsutil/plugins.h -index 49c221ef5e..9eaa0e41ea 100644 ---- a/wsutil/plugins.h -+++ b/wsutil/plugins.h -@@ -11,13 +11,13 @@ - #ifndef __PLUGINS_H__ - #define __PLUGINS_H__ - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include - #include -- - #include "ws_symbol_export.h" - - typedef void (*plugin_register_func)(void); -diff --git a/ui/taps.h b/ui/taps.h -index 4078e6d..d083519 100644 ---- a/ui/taps.h -+++ b/ui/taps.h -@@ -11,12 +11,12 @@ - #ifndef __TAP_REGISTER_H__ - #define __TAP_REGISTER_H__ - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include -- - typedef struct _tap_reg { - const char *cb_name; - void (*cb_func)(void); -diff --git a/epan/epan_dissect.h b/epan/epan_dissect.h -index f288682..6bce465 100644 ---- a/epan/epan_dissect.h -+++ b/epan/epan_dissect.h -@@ -10,11 +10,12 @@ - #ifndef EPAN_DISSECT_H - #define EPAN_DISSECT_H - -+#include "epan.h" -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include "epan.h" - #include "tvbuff.h" - #include "proto.h" - #include "packet_info.h" -diff --git a/epan/conversation.h b/epan/conversation.h -index 2da42db..9457336 100644 ---- a/epan/conversation.h -+++ b/epan/conversation.h -@@ -12,6 +12,7 @@ - #define __CONVERSATION_H__ - - #include "ws_symbol_export.h" -+#include "packet.h" /* for conversation dissector type */ - - #ifdef __cplusplus - extern "C" { -@@ -46,8 +47,6 @@ extern "C" { - /* Flags to handle endpoints */ - #define USE_LAST_ENDPOINT 0x08 /* Use last endpoint created, regardless of type */ - --#include "packet.h" /* for conversation dissector type */ -- - /* Types of port numbers Wireshark knows about. */ - typedef enum { - ENDPOINT_NONE, /* no endpoint */ diff --git a/wireshark.spec b/wireshark.spec index 114e549..9f56ae4 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,7 +7,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.4 +Version: 3.4.5 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -28,7 +28,6 @@ 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-move-glib.patch Patch9: wireshark-0009-smc-support.patch #install tshark together with wireshark GUI @@ -275,6 +274,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu May 27 2021 Michal Ruprich - 1:3.4.5-1 +- New version 3.4.5 +- Fix for CVE-2021-22207 + * Tue Mar 16 2021 Michal Ruprich - 1:3.4.4-1 - New version 3.4.4 - Fix for CVE-2021-22191 From fdd2ae7818931b5c255a2f81fc323c393ae4ae08 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 10 Jun 2021 11:49:27 +0200 Subject: [PATCH 031/120] New version 3.4.6 Fix for CVE-2021-22207 --- sources | 4 ++-- wireshark.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index f728ddb..64fa9e5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.5.tar.xz) = f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a -SHA512 (SIGNATURES-3.4.5.txt) = a0a8e57c1dc2ee6c154d2d39079981f03f1804f5e3946077b5c1996b6ddf1854d430b685fcd65faa9dab4e59e31d8ded4fd22e4ae9db02f3a04da7165cacb84d +SHA512 (wireshark-3.4.6.tar.xz) = eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d +SHA512 (SIGNATURES-3.4.6.txt) = c61b63493921a1a000e4b7b9d7b734f37bce7420705754c1f2cd56e138049bdc19930f4522a87a2775e88c9852bcf66f7bed65e178687d29653941ac8549c09a diff --git a/wireshark.spec b/wireshark.spec index 9f56ae4..d49b15d 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,7 +7,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.5 +Version: 3.4.6 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -274,6 +274,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jun 10 2021 Michal Ruprich - 1:3.4.6-1 +- New version 3.4.6 +- Fix for CVE-2021-22207 + * Thu May 27 2021 Michal Ruprich - 1:3.4.5-1 - New version 3.4.5 - Fix for CVE-2021-22207 From 9081c267e4d4e7a354763d5bb2273f43439fc4a2 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 15 Jul 2021 12:00:47 +0200 Subject: [PATCH 032/120] New version 3.4.7 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 64fa9e5..468c6a0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.6.tar.xz) = eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d -SHA512 (SIGNATURES-3.4.6.txt) = c61b63493921a1a000e4b7b9d7b734f37bce7420705754c1f2cd56e138049bdc19930f4522a87a2775e88c9852bcf66f7bed65e178687d29653941ac8549c09a +SHA512 (wireshark-3.4.7.tar.xz) = 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0 +SHA512 (SIGNATURES-3.4.7.txt) = 17d0c588b59bb6339797fcc84111673f303161d69756809f3e09a332179b0835ac377259e50ff6a6d4a09f6327c3af1b6f11b8c4d4f2e0a9dbcf040e667b4305 diff --git a/wireshark.spec b/wireshark.spec index d49b15d..070e687 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,7 +7,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.6 +Version: 3.4.7 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -74,7 +74,7 @@ BuildRequires: libmaxminddb-devel %if %{with_lua} && 0%{?fedora} BuildRequires: compat-lua-devel %endif -Buildrequires: git +Buildrequires: git-core %if 0%{?fedora} Buildrequires: python3-devel %endif @@ -274,6 +274,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 15 2021 Michal Ruprich - 1:3.4.7-1 +- New version 3.4.7 + * Thu Jun 10 2021 Michal Ruprich - 1:3.4.6-1 - New version 3.4.6 - Fix for CVE-2021-22207 From d4768bcd80dca50e4f527a65068ce285fac8ccad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:00:58 +0000 Subject: [PATCH 033/120] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 070e687..5103bb6 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,7 +8,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.4.7 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -274,6 +274,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1:3.4.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jul 15 2021 Michal Ruprich - 1:3.4.7-1 - New version 3.4.7 From d08cc9725c38d7bdf6eb0d75f0ed06545e57638b Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 31 Aug 2021 12:33:45 +0200 Subject: [PATCH 034/120] New version 3.4.8 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 468c6a0..c9fbe0d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.7.tar.xz) = 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0 -SHA512 (SIGNATURES-3.4.7.txt) = 17d0c588b59bb6339797fcc84111673f303161d69756809f3e09a332179b0835ac377259e50ff6a6d4a09f6327c3af1b6f11b8c4d4f2e0a9dbcf040e667b4305 +SHA512 (wireshark-3.4.8.tar.xz) = 962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8 +SHA512 (SIGNATURES-3.4.8.txt) = 5e273e075214cb0aeca45cf138bea8a7cbaff600ac661bb64161c10e1cafd5d848ffaf4abc8dc00fcd6a12d84d485da8033ef1dd51b312b9808ce2b5a2f900c7 diff --git a/wireshark.spec b/wireshark.spec index 5103bb6..2bf7e56 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,8 +7,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.7 -Release: 2%{?dist} +Version: 3.4.8 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -274,6 +274,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Aug 31 2021 Michal Ruprich - 1:3.4.8-1 +- New version 3.4.8 + * Fri Jul 23 2021 Fedora Release Engineering - 1:3.4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 5759920a852b499dc4b7e7969422772bc5c10da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 6 Sep 2021 16:41:11 +0200 Subject: [PATCH 035/120] Use systemd sysusers config to greate groups See: https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/#_dynamic_allocation --- wireshark.spec | 12 +++++++++--- wireshark.sysusers | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 wireshark.sysusers diff --git a/wireshark.spec b/wireshark.spec index 2bf7e56..2d605f2 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,7 +8,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.4.8 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -16,6 +16,7 @@ Url: http://www.wireshark.org/ Source0: https://wireshark.org/download/src/%{name}-%{version}.tar.xz Source1: https://www.wireshark.org/download/src/all-versions/SIGNATURES-%{version}.txt Source2: 90-wireshark-usbmon.rules +Source3: wireshark.sysusers # Fedora-specific Patch2: wireshark-0002-Customize-permission-denied-error.patch @@ -82,6 +83,7 @@ Buildrequires: cmake #needed for sdjournal external capture interface BuildRequires: systemd-devel BuildRequires: libnghttp2-devel +BuildRequires: systemd-rpm-macros Obsoletes: wireshark-qt, wireshark-gtk @@ -173,6 +175,7 @@ install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wsutil/*.h "${IDIR}/wsutil" install -m 644 ws_diag_control.h "${IDIR}/" install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir} +install -Dpm 644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf touch %{buildroot}%{_bindir}/%{name} @@ -180,8 +183,7 @@ touch %{buildroot}%{_bindir}/%{name} find %{buildroot} -type f -name "*.la" -delete %pre cli -getent group wireshark >/dev/null || groupadd -r wireshark -getent group usbmon >/dev/null || groupadd -r usbmon +%sysusers_create_compat %{SOURCE3} %post cli %{?ldconfig} @@ -201,6 +203,7 @@ fi %{_datadir}/mime/packages/wireshark.xml %{_bindir}/wireshark %{_mandir}/man1/wireshark.* +%{_sysusersdir}/%{name}.conf %files cli %license COPYING @@ -274,6 +277,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Sep 06 2021 Timothée Ravier - 1:3.4.8-2 +- Use system sysusers config to create groups + * Tue Aug 31 2021 Michal Ruprich - 1:3.4.8-1 - New version 3.4.8 diff --git a/wireshark.sysusers b/wireshark.sysusers new file mode 100644 index 0000000..b035d11 --- /dev/null +++ b/wireshark.sysusers @@ -0,0 +1,2 @@ +g wireshark - - +g usbmon - - From a2f98560cea0f5f3be73e97bf70b5fd167e4183a Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 13 Oct 2021 10:42:11 +0200 Subject: [PATCH 036/120] New version 3.4.9 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c9fbe0d..8bbce52 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.8.tar.xz) = 962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8 -SHA512 (SIGNATURES-3.4.8.txt) = 5e273e075214cb0aeca45cf138bea8a7cbaff600ac661bb64161c10e1cafd5d848ffaf4abc8dc00fcd6a12d84d485da8033ef1dd51b312b9808ce2b5a2f900c7 +SHA512 (wireshark-3.4.9.tar.xz) = 479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb +SHA512 (SIGNATURES-3.4.9.txt) = 989192fa4d2c3377ae1b349cda2b7fdff6b9decfc28a59ee73b175a9c1c7eeb1bd5261360f98c1751991f35e4bf698e75b80b47a043ca4c115b1b10e41729d66 diff --git a/wireshark.spec b/wireshark.spec index 2d605f2..ee44900 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,8 +7,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.4.8 -Release: 2%{?dist} +Version: 3.4.9 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -277,6 +277,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Oct 13 2021 Michal Ruprich - 1:3.4.9-2 +- New version 3.4.9 + * Mon Sep 06 2021 Timothée Ravier - 1:3.4.8-2 - Use system sysusers config to create groups From 63bc18bb95799a9c5d2855ebc9869a9b9652edcc Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 25 Nov 2021 12:06:21 +0100 Subject: [PATCH 037/120] New version 3.6.0 Fix for CVE-2021-39920, CVE-2021-39921, CVE-2021-39922, CVE-2021-39923, CVE-2021-39924, CVE-2021-39925, CVE-2021-39926, CVE-2021-39928, CVE-2021-39929 --- sources | 4 +- ...02-Customize-permission-denied-error.patch | 6 +- ...-0004-Restore-Fedora-specific-groups.patch | 6 +- ...ix-paths-in-a-wireshark.desktop-file.patch | 10 +- wireshark-0006-Move-tmp-to-var-tmp.patch | 60 +- wireshark-0007-cmakelists.patch | 8 +- wireshark-0009-smc-support.patch | 1893 ----------------- wireshark.spec | 21 +- 8 files changed, 46 insertions(+), 1962 deletions(-) delete mode 100644 wireshark-0009-smc-support.patch diff --git a/sources b/sources index 8bbce52..6bfbc40 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.4.9.tar.xz) = 479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb -SHA512 (SIGNATURES-3.4.9.txt) = 989192fa4d2c3377ae1b349cda2b7fdff6b9decfc28a59ee73b175a9c1c7eeb1bd5261360f98c1751991f35e4bf698e75b80b47a043ca4c115b1b10e41729d66 +SHA512 (wireshark-3.6.0.tar.xz) = 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094 +SHA512 (SIGNATURES-3.6.0.txt) = 52d306dcb5afa949e97b760a0d7aaec2f46f0501f80a637a8b1e6715752a0fe4139f0599c71a6befd86029c3b9bcf63862ac272c43201ba1028c9431b7226d8a diff --git a/wireshark-0002-Customize-permission-denied-error.patch b/wireshark-0002-Customize-permission-denied-error.patch index db8296f..cad4663 100644 --- a/wireshark-0002-Customize-permission-denied-error.patch +++ b/wireshark-0002-Customize-permission-denied-error.patch @@ -7,10 +7,10 @@ because of permissions. Signed-off-by: Jan Safranek -diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c +diff --git a/capture/capture_sync.c b/capture/capture_sync.c index 2f9d2cc..b18e47f 100644 ---- a/capchild/capture_sync.c -+++ b/capchild/capture_sync.c +--- a/capture/capture_sync.c ++++ b/capture/capture_sync.c @@ -375,6 +375,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi gchar *signal_pipe_name; #else diff --git a/wireshark-0004-Restore-Fedora-specific-groups.patch b/wireshark-0004-Restore-Fedora-specific-groups.patch index 72ebf49..4ec1140 100644 --- a/wireshark-0004-Restore-Fedora-specific-groups.patch +++ b/wireshark-0004-Restore-Fedora-specific-groups.patch @@ -3,10 +3,10 @@ Date: Fri, 13 Sep 2013 14:36:55 +0400 Subject: [PATCH] Restore Fedora-specific groups Signed-off-by: Peter Lemenkov -diff --git a/wireshark.desktop b/wireshark.desktop +diff --git a/org.wireshark.Wireshark.desktop b/org.wireshark.Wireshark.desktop index 334db48..669c6f1 100644 ---- a/wireshark.desktop -+++ b/wireshark.desktop +--- a/org.wireshark.Wireshark.desktop ++++ b/org.wireshark.Wireshark.desktop @@ -108,4 +108,4 @@ Terminal=false MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;application/x-micropross-mplog;application/x-apple-packetlogger;application/x-endace-erf;application/ipfix;application/x-ixia-vwr; # Category entry according to: diff --git a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch b/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch index a762194..e2c5b99 100644 --- a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch +++ b/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch @@ -1,16 +1,16 @@ From: Kenneth Soerensen Date: Wed, 29 Jan 2014 16:04:12 +0400 -Subject: [PATCH] Fix paths in a wireshark.desktop file +Subject: [PATCH] Fix paths in a org.wireshark.Wireshark.desktop file -diff --git a/wireshark.desktop b/wireshark.desktop +diff --git a/org.wireshark.Wireshark.desktop b/org.wireshark.Wireshark.desktop index 669c6f1..f7df1f3 100644 ---- a/wireshark.desktop -+++ b/wireshark.desktop +--- a/org.wireshark.Wireshark.desktop ++++ b/org.wireshark.Wireshark.desktop @@ -102,8 +102,8 @@ Comment[tr]=Ağ trafiği çözümleyicisi Comment[vi]=Trình phân tích giao thông mạng Comment[uk]=Аналізатор мережевого трафіку - Icon=wireshark + Icon=org.wireshark.Wireshark -TryExec=wireshark -Exec=wireshark %f +TryExec=/usr/bin/wireshark diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index dbc1d70..268cbaf 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -64,52 +64,27 @@ index ee4e5fd..fe17a95 100644 rev_tempfile_ = new QTemporaryFile(tempname, this); rev_tempfile_->open(); -diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp -index 5d82e46..8008984 100644 ---- a/ui/qt/rtp_analysis_dialog.cpp -+++ b/ui/qt/rtp_analysis_dialog.cpp -@@ -37,6 +37,7 @@ +diff --git a/ui/qt/utils/rtp_audio_file.cpp b/ui/qt/utils/rtp_audio_file.cpp +index 591a63b..203f5c5 100644 +--- a/ui/qt/utils/rtp_audio_file.cpp ++++ b/ui/qt/utils/rtp_audio_file.cpp +@@ -31,6 +31,7 @@ - #include - #include + #include "rtp_audio_file.h" + #include +#include /* for get_tmp_dir() */ - #include - #include -@@ -331,10 +332,10 @@ RtpAnalysisDialog::RtpAnalysisDialog(QWidget &parent, CaptureFile &cf, struct _r - - // 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_rtp_f").arg(QDir::tempPath()); -+ QString tempname = QString("%1/wireshark_rtp_f").arg(get_tmp_dir()); - fwd_tempfile_ = new QTemporaryFile(tempname, this); - fwd_tempfile_->open(); -- tempname = QString("%1/wireshark_rtp_r").arg(QDir::tempPath()); -+ tempname = QString("%1/wireshark_rtp_r").arg(get_tmp_dir()); - rev_tempfile_ = new QTemporaryFile(tempname, this); - rev_tempfile_->open(); - -diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp -index fde66c8..b9531d2 100644 ---- a/ui/qt/rtp_audio_stream.cpp -+++ b/ui/qt/rtp_audio_stream.cpp -@@ -37,6 +37,7 @@ - #include - - #include -+#include /* for get_tmp_dir() */ - - #include - #include -@@ -76,7 +77,7 @@ RtpAudioStream::RtpAudioStream(QObject *parent, _rtp_stream_info *rtp_stream) : - visual_sample_rate_, SPEEX_RESAMPLER_QUALITY_MIN, NULL); - speex_resampler_skip_zeros(visual_resampler_); - -- QString tempname = QString("%1/wireshark_rtp_stream").arg(QDir::tempPath()); -+ QString tempname = QString("%1/wireshark_rtp_stream").arg(get_tmp_dir()); - tempfile_ = new QTemporaryFile(tempname, this); - tempfile_->open(); + RtpAudioFile::RtpAudioFile(bool use_disk_for_temp, bool use_disk_for_frames): + real_pos_(0) +@@ -45,7 +46,7 @@ RtpAudioFile::RtpAudioFile(bool use_disk_for_temp, bool use_disk_for_frames): + tempname = "memory"; + if (use_disk_for_temp) { +- tempname = QString("%1/wireshark_rtp_stream").arg(QDir::tempPath()); ++ tempname = QString("%1/wireshark_rtp_stream").arg(get_tmp_dir()); + sample_file_ = new QTemporaryFile(tempname, this); + } else { + sample_file_ = new QBuffer(this); diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c index 5082452..f751a7c 100644 --- a/wsutil/tempfile.c @@ -292,4 +267,3 @@ index 0000000..07ac583 +#endif -- 2.13.0 - diff --git a/wireshark-0007-cmakelists.patch b/wireshark-0007-cmakelists.patch index 870c9a4..0d75fc3 100644 --- a/wireshark-0007-cmakelists.patch +++ b/wireshark-0007-cmakelists.patch @@ -5,16 +5,16 @@ index 0367cd1..6382a2c 100644 @@ -69,6 +69,7 @@ set(WSUTIL_PUBLIC_HEADERS ws_mempbrk_int.h ws_pipe.h - ws_printf.h + ws_roundup.h + wstmpdir.h wsjson.h + wslog.h xtea.h - ) @@ -118,6 +118,7 @@ set(WSUTIL_COMMON_FILES - unicode-utils.c + ws_getopt.c ws_mempbrk.c ws_pipe.c + wstmpdir.c wsgcrypt.c wsjson.c - xtea.c + wslog.c diff --git a/wireshark-0009-smc-support.patch b/wireshark-0009-smc-support.patch deleted file mode 100644 index 8de1d91..0000000 --- a/wireshark-0009-smc-support.patch +++ /dev/null @@ -1,1893 +0,0 @@ -diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt -index 11d2c89cd0..3c313d2c5e 100644 ---- a/epan/dissectors/CMakeLists.txt -+++ b/epan/dissectors/CMakeLists.txt -@@ -1745,7 +1745,7 @@ set(DISSECTOR_SRC - ${CMAKE_CURRENT_SOURCE_DIR}/packet-smb-direct.c - ${CMAKE_CURRENT_SOURCE_DIR}/packet-smb.c - ${CMAKE_CURRENT_SOURCE_DIR}/packet-smb2.c -- ${CMAKE_CURRENT_SOURCE_DIR}/packet-smcr.c -+ ${CMAKE_CURRENT_SOURCE_DIR}/packet-smc.c - ${CMAKE_CURRENT_SOURCE_DIR}/packet-sml.c - ${CMAKE_CURRENT_SOURCE_DIR}/packet-smp.c - ${CMAKE_CURRENT_SOURCE_DIR}/packet-smpp.c -diff --git a/epan/dissectors/packet-smcr.c b/epan/dissectors/packet-smc.c -similarity index 56% -rename from epan/dissectors/packet-smcr.c -rename to epan/dissectors/packet-smc.c -index 7096d1b0b0..bbfa9c07ef 100644 ---- a/epan/dissectors/packet-smcr.c -+++ b/epan/dissectors/packet-smc.c -@@ -1,7 +1,8 @@ --/* packet-smcr.c -- * SMC-R dissector for wireshark -+/* packet-smc.c -+ * SMC dissector for wireshark - * By Joe Fowler -- * (c) Copyright IBM Corporation 2014 -+ * By Guvenc Gulce -+ * (c) Copyright IBM Corporation 2014,2020 - * LICENSE: GNU General Public License, version 2, or (at your option) any - * version. http://opensource.org/licenses/gpl-2.0.php - * -@@ -13,6 +14,7 @@ - * - * Please refer to the following specs for protocol: - * - ietf - draft-fox-tcpm-shared-memory-rdma-05 -+ * - https://www.ibm.com/support/pages/node/6326337 - */ - - #include "config.h" -@@ -20,25 +22,33 @@ - #include - - #include "packet-tcp.h" -+#include - --#define SMCR_TCP_MIN_HEADER_LENGTH 7 --#define CLC_MSG_START_OFFSET 7 -+#define SMC_TCP_MIN_HEADER_LENGTH 7 -+#define CLC_MSG_START_OFFSET 5 - #define LLC_MSG_START_OFFSET 3 - #define RMBE_CTRL_START_OFFSET 2 - #define MAC_ADDR_LEN 6 -+#define SMC_V2 2 - #define GID_LEN 16 - #define PEERID_LEN 8 -+#define DIAG_INFO_LEN 4 -+#define EID_LEN 32 -+#define ISM_GID_LEN 8 -+#define ISM_CHID_LEN 2 - #define IPV4_SUBNET_MASK_LEN 4 --#define IPV6_PREFIX_LEN 4 -+#define IPV6_PREFIX_LEN 16 - #define ONE_BYTE_RESERVED 1 - #define TWO_BYTE_RESERVED 2 - #define QP_LEN 3 - #define RKEY_LEN 4 - #define VIRTUAL_ADDR_LEN 8 - #define FLAG_BYTE_LEN 1 -+#define LENGTH_BYTE_LEN 2 - #define SEQNO_LEN 2 - #define CURSOR_LEN 4 - #define ALERT_TOKEN_LEN 4 -+#define DMB_TOKEN_LEN 8 - #define PSN_LEN 3 - #define CONN_INDEX_LEN 1 - #define SMCR_MSG_BYTE_0 0 -@@ -52,6 +62,7 @@ - #define LLC_CMD_RSP_OFFSET 3 - #define ACCEPT_CONFIRM_QP_OFFSET 38 - #define SMCR_CLC_ID 0xe2d4c3d9 /*EBCDIC 'SMCR' */ -+#define SMCD_CLC_ID 0xe2d4c3c4 /*EBCDIC 'SMCD' */ - #define SMC_CLC_V1 0x10 - #define SMC_CLC_SMC_R 0x01 - -@@ -66,6 +77,52 @@ typedef enum { - SMC_CLC_DECLINE = 4 - } clc_message; - -+typedef enum { -+ SMC_CLC_SMCR = 0, -+ SMC_CLC_SMCD = 1, -+ SMC_CLC_NONE = 2, -+ SMC_CLC_BOTH = 3, -+} clc_type_message; -+ -+typedef enum { -+ SMC_CLC_OS_ZOS = 1, -+ SMC_CLC_OS_LINUX = 2, -+ SMC_CLC_OS_AIX = 3, -+ SMC_CLC_OS_UNKOWN = 15, -+} clc_os_message; -+ -+static const value_string smc_clc_os_message_txt[] = { -+ { SMC_CLC_OS_ZOS, "z/OS" }, -+ { SMC_CLC_OS_LINUX, "Linux" }, -+ { SMC_CLC_OS_AIX, "AIX" }, -+ { SMC_CLC_OS_UNKOWN, "Unknown" }, -+ { 0, NULL } -+}; -+ -+static const value_string smc_clc_type_message_txt[] = { -+ { SMC_CLC_SMCR, "SMC-R" }, -+ { SMC_CLC_SMCD, "SMC-D" }, -+ { SMC_CLC_NONE, "NONE" }, -+ { SMC_CLC_BOTH, "SMC-R/SMC-D" }, -+ { 0, NULL } -+}; -+ -+ -+static const value_string smcv2_clc_col_info_message_txt[] = { -+ { SMC_CLC_SMCR, "[SMC-R-Proposal]" }, -+ { SMC_CLC_SMCD, "[SMC-Dv2-Proposal]" }, -+ { SMC_CLC_NONE, "[NONE]" }, -+ { SMC_CLC_BOTH, "[SMC-Dv2/SMC-R-Proposal]" }, -+ { 0, NULL } -+}; -+ -+static const value_string smc_clc_col_info_message_txt[] = { -+ { SMC_CLC_SMCR, "[SMC-R-Proposal]" }, -+ { SMC_CLC_SMCD, "[SMC-D-Proposal]" }, -+ { SMC_CLC_NONE, "[NONE]" }, -+ { SMC_CLC_BOTH, "[SMC-D/SMC-R-Proposal]" }, -+ { 0, NULL } -+}; - - static const value_string smcr_clc_message_txt[] = { - { SMC_CLC_PROPOSAL, "Proposal" }, -@@ -104,22 +161,35 @@ static const value_string smcr_llc_message_txt[] = { - { 0, NULL } - }; - --static int proto_smcr = -1; -+static int proto_smc = -1; - static int ett_smcr = -1; - static int hf_smcr_clc_msg = -1; - static int hf_smcr_llc_msg = -1; - --/* SMC-R Proposal */ -+/* SMC Proposal for both SMC-D and SMC-R */ - static int ett_proposal_flag = -1; -+static int ett_proposal_ext_flag2 = -1; -+static int hf_proposal_smc_version_release_number = -1; -+static int hf_proposal_smc_version_seid = -1; - static int hf_proposal_smc_version = -1; --static int hf_smcr_proposal_flags = -1; --static int hf_smcr_proposal_client_peer_id = -1; --static int hf_smcr_proposal_client_preferred_gid = -1; --static int hf_smcr_proposal_client_preferred_mac = -1; --static int hf_smcr_proposal_outgoing_interface_subnet_mask = -1; --static int hf_smcr_proposal_outgoing_subnet_mask_signifcant_bits = -1; --static int hf_smcr_proposal_ipv6_prefix = -1; --static int hf_smcr_proposal_ipv6_prefix_length = -1; -+static int hf_proposal_smc_type = -1; -+static int hf_proposal_smc_v2_type = -1; -+static int hf_smc_length = -1; -+static int hf_smc_proposal_smc_chid = -1; -+static int hf_smc_proposal_flags = -1; -+static int hf_smc_proposal_eid = -1; -+static int hf_smc_proposal_system_eid = -1; -+static int hf_smc_proposal_ext_flags = -1; -+static int hf_smc_proposal_client_peer_id = -1; -+static int hf_smc_proposal_ism_gid = -1; -+static int hf_smc_proposal_client_preferred_gid = -1; -+static int hf_smc_proposal_client_preferred_mac = -1; -+static int hf_smc_proposal_outgoing_interface_subnet_mask = -1; -+static int hf_smc_proposal_rocev2_gid_ipv4_addr = -1; -+static int hf_smc_proposal_rocev2_gid_ipv6_addr = -1; -+static int hf_smc_proposal_outgoing_subnet_mask_signifcant_bits = -1; -+static int hf_smc_proposal_ipv6_prefix = -1; -+static int hf_smc_proposal_ipv6_prefix_length = -1; - - /* SMC-R Accept */ - static int ett_accept_flag = -1; -@@ -158,10 +228,57 @@ static int hf_confirm_smc_version = -1; - static int hf_confirm_rmb_buffer_size = -1; - static int hf_confirm_qp_mtu_value = -1; - -+/* SMC-D Accept */ -+static int hf_accept_smc_type = -1; -+static int ett_smcd_accept_flag = -1; -+static int ett_smcd_accept_fce_flag = -1; -+static int ett_smcd_accept_flag2 = -1; -+static int hf_smcd_accept_smc_version = -1; -+static int hf_accept_os_type = -1; -+static int hf_accept_smc_version_release_number = -1; -+static int hf_smcd_accept_first_contact = -1; -+static int hf_accept_dmb_buffer_size = -1; -+static int hf_smcd_accept_flags = -1; -+static int hf_smcd_accept_fce_flags = -1; -+static int hf_smcd_accept_flags2 = -1; -+static int hf_smcd_accept_server_peer_id = -1; -+static int hf_smcd_accept_dmbe_conn_index = -1; -+static int hf_smcd_accept_dmb_token = -1; -+static int hf_smcd_accept_server_link_id = -1; -+static int hf_smcd_accept_smc_chid = -1; -+static int hf_smcd_accept_eid = -1; -+static int hf_smcd_accept_peer_name = -1; -+ -+/* SMC-D Confirm */ -+static int hf_confirm_smc_type = -1; -+static int ett_smcd_confirm_flag = -1; -+static int ett_smcd_confirm_fce_flag = -1; -+static int ett_smcd_confirm_flag2 = -1; -+static int hf_smcd_confirm_smc_version = -1; -+static int hf_confirm_os_type = -1; -+static int hf_smcd_confirm_flags = -1; -+static int hf_smcd_confirm_flags2 = -1; -+static int hf_smcd_confirm_first_contact = -1; -+static int hf_smcd_confirm_client_peer_id = -1; -+static int hf_smcd_confirm_dmb_token = -1; -+static int hf_smcd_confirm_dmbe_conn_index = -1; -+static int hf_smcd_confirm_client_link_id = -1; -+static int hf_confirm_smc_version_release_number = -1; -+static int hf_smcd_confirm_dmb_buffer_size = -1; -+static int hf_smcd_confirm_smc_chid = -1; -+static int hf_smcd_confirm_eid = -1; -+static int hf_smcd_confirm_peer_name = -1; -+ - /* SMC-R Decline */ --static int hf_smcr_decline_flags = -1; --static int hf_smcr_decline_peer_id = -1; --static int hf_smcr_decline_diag_info = -1; -+static int ett_decline_flag = -1; -+static int ett_decline_flag2 = -1; -+static int hf_smc_decline_flags = -1; -+static int hf_smc_decline_flags2 = -1; -+static int hf_smc_decline_peer_id = -1; -+static int hf_smc_decline_diag_info = -1; -+static int hf_decline_os_type = -1; -+static int hf_decline_smc_version = -1; -+static int hf_decline_out_of_sync = -1; - - /* SMC-R Confirm Link*/ - static int ett_confirm_link_flag = -1; -@@ -256,55 +373,300 @@ static int hf_smcr_rmbe_ctrl_peer_abnormal_close = -1; - - void proto_register_smcr(void); - void proto_reg_handoff_smcr(void); --static dissector_handle_t smcr_tcp_handle; -+static dissector_handle_t smc_tcp_handle; - - static void --disect_smcr_proposal(tvbuff_t *tvb, proto_tree *tree) -+disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) - { -- guint offset; -- guint16 mask_offset; -- guint8 ipv6_prefix_count; -+ guint offset, suboffset; -+ guint16 mask_offset, v2_ext_offset; -+ guint16 v2_ext_pos = 0, smcd_v2_ext_offset = 0; -+ guint16 smcd_v2_ext_pos = 0; -+ guint8 ipv6_prefix_count, smc_version; -+ guint8 smc_type, num_of_gids = 0, num_of_eids = 0; -+ guint8 smc_type_v1 = 0, smc_type_v2 = 0; -+ bool is_smc_v2, is_smcdv1, is_smcdv2; - proto_item *proposal_flag_item; - proto_tree *proposal_flag_tree; - -+ - offset = CLC_MSG_START_OFFSET; -- proposal_flag_item = proto_tree_add_item(tree, hf_smcr_proposal_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ proto_tree_add_item(tree, hf_smc_length, tvb, offset, -+ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += LENGTH_BYTE_LEN; -+ proposal_flag_item = proto_tree_add_item(tree, hf_smc_proposal_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - proposal_flag_tree = proto_item_add_subtree(proposal_flag_item, ett_proposal_flag); - proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ smc_version = tvb_get_guint8(tvb, offset); -+ smc_type = tvb_get_guint8(tvb, offset); -+ smc_version = ((smc_version >> 4) & 0x0F); -+ is_smc_v2 = (smc_version >= SMC_V2); -+ smc_type_v2 = ((smc_type >> 2) & 0x03); -+ smc_type_v1 = (smc_type & 0x03); -+ is_smcdv1 = ((smc_type_v1 == SMC_CLC_SMCD) || (smc_type_v1 == SMC_CLC_BOTH)); -+ is_smcdv2 = ((smc_type_v2 == SMC_CLC_SMCD) || (smc_type_v2 == SMC_CLC_BOTH)); -+ -+ if (is_smc_v2) -+ proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_v2_type, tvb, -+ offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ -+ proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_type, tvb, -+ offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ - offset += FLAG_BYTE_LEN; -- proto_tree_add_item(tree, hf_smcr_proposal_client_peer_id, tvb, offset, -+ proto_tree_add_item(tree, hf_smc_proposal_client_peer_id, tvb, offset, - PEERID_LEN, ENC_BIG_ENDIAN); - offset += PEERID_LEN; -- proto_tree_add_item(tree, hf_smcr_proposal_client_preferred_gid, tvb, -+ proto_tree_add_item(tree, hf_smc_proposal_client_preferred_gid, tvb, - offset, GID_LEN, ENC_NA); - offset += GID_LEN; -- proto_tree_add_item(tree, hf_smcr_proposal_client_preferred_mac, tvb, -+ proto_tree_add_item(tree, hf_smc_proposal_client_preferred_mac, tvb, - offset, MAC_ADDR_LEN, ENC_NA); - offset += MAC_ADDR_LEN; - mask_offset = tvb_get_ntohs(tvb, offset); -- offset += 2 + mask_offset; -- proto_tree_add_item(tree, hf_smcr_proposal_outgoing_interface_subnet_mask, tvb, -- offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN); -+ -+ if (mask_offset != 0) { -+ suboffset = offset; -+ suboffset += TWO_BYTE_RESERVED; -+ if (is_smcdv1 || is_smcdv2) { -+ proto_tree_add_item(tree, hf_smc_proposal_ism_gid, tvb, -+ suboffset, ISM_GID_LEN, ENC_NA); -+ } -+ suboffset += ISM_GID_LEN; -+ if (is_smc_v2) { -+ if (is_smcdv2) { -+ proto_tree_add_item(tree, hf_smc_proposal_smc_chid, tvb, suboffset, -+ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); -+ } -+ suboffset += LENGTH_BYTE_LEN; -+ v2_ext_offset = tvb_get_ntohs(tvb, suboffset); -+ v2_ext_pos = suboffset + TWO_BYTE_RESERVED + v2_ext_offset; -+ } -+ } -+ offset += TWO_BYTE_RESERVED + mask_offset; -+ -+ proto_tree_add_item(tree, hf_smc_proposal_outgoing_interface_subnet_mask, tvb, -+ offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN); - offset += IPV4_SUBNET_MASK_LEN; -- proto_tree_add_item(tree, hf_smcr_proposal_outgoing_subnet_mask_signifcant_bits, tvb, -- offset, 1, ENC_BIG_ENDIAN); -+ proto_tree_add_item(tree, hf_smc_proposal_outgoing_subnet_mask_signifcant_bits, tvb, -+ offset, 1, ENC_BIG_ENDIAN); - offset += 1; - /* Bump past reserved bytes */ - offset += TWO_BYTE_RESERVED; - ipv6_prefix_count = tvb_get_guint8(tvb, offset); -- offset += 2; -+ offset += 1; - - while (ipv6_prefix_count != 0) { -- proto_tree_add_item(tree, hf_smcr_proposal_ipv6_prefix, tvb, -+ proto_tree_add_item(tree, hf_smc_proposal_ipv6_prefix, tvb, - offset, IPV6_PREFIX_LEN, ENC_NA); - offset += IPV6_PREFIX_LEN; -- proto_tree_add_item(tree, hf_smcr_proposal_ipv6_prefix_length, tvb, -+ proto_tree_add_item(tree, hf_smc_proposal_ipv6_prefix_length, tvb, - offset, 1, ENC_BIG_ENDIAN); - offset += 1; - ipv6_prefix_count--; - } -+ -+ if (v2_ext_pos >= offset) { -+ offset = v2_ext_pos; -+ num_of_eids = tvb_get_guint8(tvb, offset); -+ offset += FLAG_BYTE_LEN; -+ num_of_gids = tvb_get_guint8(tvb, offset); -+ offset += FLAG_BYTE_LEN; -+ /*Skip reserved flag 1*/ -+ offset += 1; -+ proposal_flag_item = proto_tree_add_item(tree, hf_smc_proposal_ext_flags, tvb, -+ offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ proposal_flag_tree = proto_item_add_subtree(proposal_flag_item, ett_proposal_ext_flag2); -+ proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version_release_number, -+ tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version_seid, tvb, -+ offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += FLAG_BYTE_LEN; -+ /*Skip not used 2 bytes*/ -+ offset += 2; -+ smcd_v2_ext_offset = tvb_get_ntohs(tvb, offset); -+ offset += 2; -+ smcd_v2_ext_pos = offset + smcd_v2_ext_offset; -+ -+ if (is_ipv6) { -+ proto_tree_add_item(tree, hf_smc_proposal_rocev2_gid_ipv6_addr, tvb, -+ offset, GID_LEN, ENC_NA); -+ offset += GID_LEN; -+ } -+ else { -+ offset += 12; -+ proto_tree_add_item(tree, hf_smc_proposal_rocev2_gid_ipv4_addr, tvb, -+ offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN); -+ offset += IPV4_SUBNET_MASK_LEN; -+ } -+ /*Skip reserved 16 bytes*/ -+ offset += 16; -+ while (num_of_eids != 0) { -+ proto_tree_add_item(tree, hf_smc_proposal_eid, tvb, -+ offset, EID_LEN, ENC_ASCII | ENC_NA); -+ offset += EID_LEN; -+ num_of_eids--; -+ } -+ if (smcd_v2_ext_pos >= offset) { -+ offset = smcd_v2_ext_pos; -+ proto_tree_add_item(tree, hf_smc_proposal_system_eid, tvb, -+ offset, EID_LEN, ENC_ASCII | ENC_NA); -+ offset += EID_LEN; -+ /*Skip reserved 16 bytes*/ -+ offset += 16; -+ while (num_of_gids != 0) { -+ proto_tree_add_item(tree, hf_smc_proposal_ism_gid, tvb, -+ offset, ISM_GID_LEN, ENC_NA); -+ offset += ISM_GID_LEN; -+ proto_tree_add_item(tree, hf_smc_proposal_smc_chid, tvb, offset, -+ ISM_CHID_LEN, ENC_BIG_ENDIAN); -+ offset += ISM_CHID_LEN; -+ num_of_gids--; -+ } -+ } -+ -+ } -+} -+ -+static void -+disect_smcd_accept(tvbuff_t* tvb, proto_tree* tree) -+{ -+ guint offset; -+ proto_item* accept_flag_item; -+ proto_tree* accept_flag_tree; -+ proto_item* accept_flag2_item; -+ proto_tree* accept_flag2_tree; -+ guint8 smc_version, first_contact = 0; -+ -+ offset = CLC_MSG_START_OFFSET; -+ proto_tree_add_item(tree, hf_smc_length, tvb, offset, -+ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += LENGTH_BYTE_LEN; -+ accept_flag_item = proto_tree_add_item(tree, hf_smcd_accept_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_smcd_accept_flag); -+ proto_tree_add_item(accept_flag_tree, hf_smcd_accept_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ proto_tree_add_item(accept_flag_tree, hf_smcd_accept_first_contact, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ proto_tree_add_item(accept_flag_tree, hf_accept_smc_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ smc_version = tvb_get_guint8(tvb, offset); -+ first_contact = tvb_get_guint8(tvb, offset); -+ smc_version = ((smc_version >> 4) & 0x0F); -+ first_contact = ((first_contact >> 3) & 0x01); -+ offset += FLAG_BYTE_LEN; -+ proto_tree_add_item(tree, hf_smcd_accept_server_peer_id, tvb, offset, -+ PEERID_LEN, ENC_BIG_ENDIAN); -+ offset += PEERID_LEN; -+ -+ proto_tree_add_item(tree, hf_smcd_accept_dmb_token, tvb, -+ offset, DMB_TOKEN_LEN, ENC_NA); -+ offset += DMB_TOKEN_LEN; -+ -+ proto_tree_add_item(tree, hf_smcd_accept_dmbe_conn_index, tvb, -+ offset, CONN_INDEX_LEN, ENC_BIG_ENDIAN); -+ offset += CONN_INDEX_LEN; -+ -+ accept_flag2_item = proto_tree_add_item(tree, hf_smcd_accept_flags2, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ accept_flag2_tree = proto_item_add_subtree(accept_flag2_item, ett_smcd_accept_flag2); -+ proto_tree_add_item(accept_flag2_tree, hf_accept_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += FLAG_BYTE_LEN; -+ offset += TWO_BYTE_RESERVED; -+ proto_tree_add_item(tree, hf_smcd_accept_server_link_id, tvb, -+ offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN); -+ offset += ALERT_TOKEN_LEN; -+ -+ if (smc_version >= SMC_V2) { -+ proto_tree_add_item(tree, hf_smcd_accept_smc_chid, tvb, offset, -+ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += LENGTH_BYTE_LEN; -+ -+ proto_tree_add_item(tree, hf_smcd_accept_eid, tvb, offset, 32, ENC_ASCII | ENC_NA); -+ offset += 32; -+ /* Reserved bytes */ -+ offset += 8; -+ -+ if (first_contact) { -+ offset += ONE_BYTE_RESERVED; -+ accept_flag_item = proto_tree_add_item(tree, hf_smcd_accept_fce_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_smcd_accept_fce_flag); -+ proto_tree_add_item(accept_flag_tree, hf_accept_os_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ proto_tree_add_item(accept_flag_tree, hf_accept_smc_version_release_number, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += FLAG_BYTE_LEN; -+ offset += TWO_BYTE_RESERVED; -+ proto_tree_add_item(tree, hf_smcd_accept_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); -+ offset += 32; -+ } -+ } -+} -+ -+static void -+disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree) -+{ -+ guint offset; -+ proto_item* confirm_flag_item; -+ proto_tree* confirm_flag_tree; -+ proto_item* confirm_flag2_item; -+ proto_tree* confirm_flag2_tree; -+ guint8 smc_version, first_contact = 0; -+ -+ offset = CLC_MSG_START_OFFSET; -+ proto_tree_add_item(tree, hf_smc_length, tvb, offset, -+ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += LENGTH_BYTE_LEN; -+ confirm_flag_item = proto_tree_add_item(tree, hf_smcd_confirm_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_smcd_confirm_flag); -+ proto_tree_add_item(confirm_flag_tree, hf_smcd_confirm_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ proto_tree_add_item(confirm_flag_tree, hf_smcd_confirm_first_contact, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ smc_version = tvb_get_guint8(tvb, offset); -+ first_contact = tvb_get_guint8(tvb, offset); -+ smc_version = ((smc_version >> 4) & 0x0F); -+ first_contact = ((first_contact >> 3) & 0x01); -+ offset += FLAG_BYTE_LEN; -+ proto_tree_add_item(tree, hf_smcd_confirm_client_peer_id, tvb, offset, -+ PEERID_LEN, ENC_BIG_ENDIAN); -+ offset += PEERID_LEN; -+ -+ proto_tree_add_item(tree, hf_smcd_confirm_dmb_token, tvb, -+ offset, DMB_TOKEN_LEN, ENC_NA); -+ offset += DMB_TOKEN_LEN; -+ -+ proto_tree_add_item(tree, hf_smcd_confirm_dmbe_conn_index, tvb, -+ offset, CONN_INDEX_LEN, ENC_BIG_ENDIAN); -+ offset += CONN_INDEX_LEN; -+ -+ confirm_flag2_item = proto_tree_add_item(tree, hf_smcd_confirm_flags2, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ confirm_flag2_tree = proto_item_add_subtree(confirm_flag2_item, ett_smcd_confirm_flag2); -+ proto_tree_add_item(confirm_flag2_tree, hf_smcd_confirm_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += FLAG_BYTE_LEN; -+ offset += TWO_BYTE_RESERVED; -+ proto_tree_add_item(tree, hf_smcd_confirm_client_link_id, tvb, -+ offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN); -+ offset += ALERT_TOKEN_LEN; -+ -+ if (smc_version >= SMC_V2) { -+ proto_tree_add_item(tree, hf_smcd_confirm_smc_chid, tvb, offset, -+ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += LENGTH_BYTE_LEN; -+ -+ proto_tree_add_item(tree, hf_smcd_confirm_eid, tvb, offset, 32, ENC_ASCII | ENC_NA); -+ offset += 32; -+ /* Reserved bytes */ -+ offset += 8; -+ -+ if (first_contact) { -+ offset += ONE_BYTE_RESERVED; -+ confirm_flag_item = proto_tree_add_item(tree, hf_smcd_accept_fce_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_smcd_confirm_fce_flag); -+ proto_tree_add_item(confirm_flag_tree, hf_confirm_os_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_version_release_number, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += FLAG_BYTE_LEN; -+ offset += TWO_BYTE_RESERVED; -+ proto_tree_add_item(tree, hf_smcd_confirm_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); -+ offset += 32; -+ } -+ } - } - -+ - static void - disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree) - { -@@ -315,6 +677,9 @@ disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree) - proto_tree *accept_flag2_tree; - - offset = CLC_MSG_START_OFFSET; -+ proto_tree_add_item(tree, hf_smc_length, tvb, offset, -+ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += LENGTH_BYTE_LEN; - accept_flag_item = proto_tree_add_item(tree, hf_smcr_accept_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_accept_flag); - proto_tree_add_item(accept_flag_tree, hf_accept_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -@@ -367,6 +732,9 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree) - proto_tree *confirm_flag2_tree; - - offset = CLC_MSG_START_OFFSET; -+ proto_tree_add_item(tree, hf_smc_length, tvb, offset, -+ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += LENGTH_BYTE_LEN; - confirm_flag_item = proto_tree_add_item(tree, hf_smcr_confirm_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_confirm_flag); - proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_version, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -@@ -411,17 +779,41 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree) - static void - disect_smcr_decline(tvbuff_t *tvb, proto_tree *tree) - { -- guint offset; -+ proto_item* decline_flag_item; -+ proto_tree* decline_flag_tree; -+ proto_item* decline_flag2_item; -+ proto_tree* decline_flag2_tree; -+ guint offset, smc_version; - - offset = CLC_MSG_START_OFFSET; -- proto_tree_add_item(tree, hf_smcr_decline_flags, tvb, offset, -+ proto_tree_add_item(tree, hf_smc_length, tvb, offset, -+ LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); -+ offset += LENGTH_BYTE_LEN; -+ -+ decline_flag_item = proto_tree_add_item(tree, hf_smc_decline_flags, tvb, offset, -+ FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ decline_flag_tree = proto_item_add_subtree(decline_flag_item, ett_decline_flag); -+ proto_tree_add_item(decline_flag_tree, hf_decline_smc_version, tvb, offset, -+ FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ proto_tree_add_item(decline_flag_tree, hf_decline_out_of_sync, tvb, offset, - FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ smc_version = tvb_get_guint8(tvb, offset); -+ smc_version = ((smc_version >> 4) & 0x0F); -+ - offset += FLAG_BYTE_LEN; -- proto_tree_add_item(tree, hf_smcr_decline_peer_id, tvb, offset, -+ proto_tree_add_item(tree, hf_smc_decline_peer_id, tvb, offset, - PEERID_LEN, ENC_BIG_ENDIAN); - offset += PEERID_LEN; -- proto_tree_add_item(tree, hf_smcr_decline_diag_info, tvb, offset, -- 4, ENC_BIG_ENDIAN); -+ proto_tree_add_item(tree, hf_smc_decline_diag_info, tvb, offset, -+ DIAG_INFO_LEN, ENC_BIG_ENDIAN); -+ offset += DIAG_INFO_LEN; -+ if (smc_version >= SMC_V2) { -+ decline_flag2_item = proto_tree_add_item(tree, hf_smc_decline_flags2, tvb, offset, -+ FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ decline_flag2_tree = proto_item_add_subtree(decline_flag2_item, ett_decline_flag2); -+ proto_tree_add_item(decline_flag2_tree, hf_decline_os_type, tvb, offset, -+ FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -+ } - } - - static void -@@ -730,50 +1122,126 @@ disect_smcr_rmbe_ctrl(tvbuff_t *tvb, proto_tree *tree) - tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - } - -+static guint8 get_mixed_type(guint8 v1_type, guint8 v2_type) -+{ -+ if (v1_type == SMC_CLC_BOTH) -+ return v1_type; -+ -+ if (v1_type == SMC_CLC_NONE) -+ return v2_type; -+ -+ if (((v2_type == SMC_CLC_SMCD) && (v1_type == SMC_CLC_SMCR)) || -+ ((v2_type == SMC_CLC_SMCR) && (v1_type == SMC_CLC_SMCD))) -+ return SMC_CLC_BOTH; -+ -+ return v2_type; -+} -+ - static int --dissect_smcr_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, -+dissect_smc_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - void *data _U_) - { - gint offset; - guint16 msg_len; -+ guint8 smc_type, smc_v2_type = 0, smc_v1_type = 0, smc_version = 0; -+ guint8 mixed_type; - clc_message clc_msgid; - proto_item *ti; -- proto_tree *smcr_tree; -+ proto_tree *smc_tree; -+ bool is_ipv6, is_smc_v2, is_smcd = false; - -- col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMC-R"); - msg_len = tvb_get_ntohs(tvb, CLC_MSG_LEN_OFFSET); - offset = 4; -- clc_msgid = (clc_message) tvb_get_guint8(tvb, offset); -- col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-R-%s],", -- val_to_str_const((guint32)clc_msgid, -- smcr_clc_message_txt, "Unknown Command")); -+ clc_msgid = (clc_message)tvb_get_guint8(tvb, offset); - -- if ((clc_msgid == SMC_CLC_ACCEPT) || -- (clc_msgid == SMC_CLC_CONFIRMATION)) { -+ smc_version = tvb_get_guint8(tvb, offset + 3); -+ smc_version = ((smc_version >> 4) & 0x0F); -+ smc_type = tvb_get_guint8(tvb, offset + 3); -+ is_smc_v2 = (smc_version >= SMC_V2); -+ -+ if (is_smc_v2 && (clc_msgid == SMC_CLC_PROPOSAL)) { -+ smc_v1_type = (smc_type & 0x03); -+ smc_v2_type = ((smc_type >> 2) & 0x03); -+ } -+ else if (clc_msgid != SMC_CLC_DECLINE) { -+ smc_v2_type = (smc_type & 0x03); -+ smc_v1_type = (smc_type & 0x03); -+ } -+ -+ is_ipv6 = (pinfo->src.type == AT_IPv6); -+ -+ if (is_smc_v2) -+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMCv2"); -+ else -+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMC"); -+ -+ if (clc_msgid == SMC_CLC_PROPOSAL) { -+ if (is_smc_v2 && (smc_v2_type != SMC_CLC_NONE)) { -+ mixed_type = get_mixed_type(smc_v1_type, smc_v2_type); -+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s,", -+ val_to_str_const((guint32)mixed_type, -+ smcv2_clc_col_info_message_txt, "Unknown Command")); -+ } else { -+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s,", -+ val_to_str_const((guint32)smc_v1_type, -+ smc_clc_col_info_message_txt, "Unknown Command")); -+ } -+ } else if ((smc_v2_type == SMC_CLC_SMCR) && ((clc_msgid == SMC_CLC_ACCEPT) || -+ (clc_msgid == SMC_CLC_CONFIRMATION))) { -+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-R-%s],", -+ val_to_str_const((guint32)clc_msgid, -+ smcr_clc_message_txt, "Unknown Command")); - col_append_fstr(pinfo->cinfo, COL_INFO, " QP=0x%06x", - tvb_get_ntoh24(tvb, ACCEPT_CONFIRM_QP_OFFSET)); - } -+ else if ((smc_v2_type == SMC_CLC_SMCD) && ((clc_msgid == SMC_CLC_ACCEPT) || -+ (clc_msgid == SMC_CLC_CONFIRMATION))) { -+ is_smcd = true; -+ if (is_smc_v2) -+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-Dv2-%s],", -+ val_to_str_const((guint32)clc_msgid, -+ smcr_clc_message_txt, "Unknown Command")); -+ else -+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-D-%s],", -+ val_to_str_const((guint32)clc_msgid, -+ smcr_clc_message_txt, "Unknown Command")); -+ } -+ else { -+ if (is_smc_v2) -+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMCv2-%s],", -+ val_to_str_const((guint32)clc_msgid, -+ smcr_clc_message_txt, "Unknown Command")); -+ else -+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[SMC-%s],", -+ val_to_str_const((guint32)clc_msgid, -+ smcr_clc_message_txt, "Unknown Command")); -+ } - - if (!tree) - return tvb_reported_length(tvb); - -- ti = proto_tree_add_item(tree, proto_smcr, tvb, 0, msg_len, ENC_NA); -- smcr_tree = proto_item_add_subtree(ti, ett_smcr); -- proto_tree_add_item(smcr_tree, hf_smcr_clc_msg, tvb, offset, 1, -+ ti = proto_tree_add_item(tree, proto_smc, tvb, 0, msg_len, ENC_NA); -+ smc_tree = proto_item_add_subtree(ti, ett_smcr); -+ proto_tree_add_item(smc_tree, hf_smcr_clc_msg, tvb, offset, 1, - ENC_BIG_ENDIAN); -- - switch (clc_msgid) { - case SMC_CLC_PROPOSAL: -- disect_smcr_proposal(tvb, smcr_tree); -+ disect_smc_proposal(tvb, smc_tree, is_ipv6); - break; - case SMC_CLC_ACCEPT: -- disect_smcr_accept(tvb, smcr_tree); -+ if (is_smcd) -+ disect_smcd_accept(tvb, smc_tree); -+ else -+ disect_smcr_accept(tvb, smc_tree); - break; - case SMC_CLC_CONFIRMATION: -- disect_smcr_confirm(tvb, smcr_tree); -+ if (is_smcd) -+ disect_smcd_confirm(tvb, smc_tree); -+ else -+ disect_smcr_confirm(tvb, smc_tree); - break; - case SMC_CLC_DECLINE: -- disect_smcr_decline(tvb, smcr_tree); -+ disect_smcr_decline(tvb, smc_tree); - break; - default: - /* Unknown Command */ -@@ -802,7 +1270,7 @@ dissect_smcr_infiniband(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi - (tvb_get_guint8(tvb, LLC_CMD_RSP_OFFSET) & LLC_FLAG_RESP)) - col_append_str(pinfo->cinfo, COL_INFO, "(Resp)"); - -- ti = proto_tree_add_item(tree, proto_smcr, tvb, 0, msg_len, ENC_NA); -+ ti = proto_tree_add_item(tree, proto_smc, tvb, 0, msg_len, ENC_NA); - smcr_tree = proto_item_add_subtree(ti, ett_smcr); - proto_tree_add_item(smcr_tree, hf_smcr_llc_msg, tvb, 0, 1, - ENC_BIG_ENDIAN); -@@ -861,24 +1329,27 @@ get_smcr_pdu_length(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *dat - } - - static int --dissect_smcr_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, -+dissect_smc_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - void *data) - { -- tcp_dissect_pdus(tvb, pinfo, tree, TRUE, SMCR_TCP_MIN_HEADER_LENGTH, -- get_smcr_pdu_length, dissect_smcr_tcp_pdu, data); -+ tcp_dissect_pdus(tvb, pinfo, tree, TRUE, SMC_TCP_MIN_HEADER_LENGTH, -+ get_smcr_pdu_length, dissect_smc_tcp_pdu, data); - return tvb_reported_length(tvb); - } - - static gboolean --dissect_smcr_tcp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, -+dissect_smc_tcp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - void *data) - { - if (tvb_captured_length(tvb) < 4) { - return FALSE; - } - -- if (tvb_get_ntohl(tvb, CLC_MSG_BYTE_0) != SMCR_CLC_ID) return FALSE; -- dissect_smcr_tcp(tvb, pinfo, tree, data); -+ if ((tvb_get_ntohl(tvb, CLC_MSG_BYTE_0) != SMCR_CLC_ID) && -+ (tvb_get_ntohl(tvb, CLC_MSG_BYTE_0) != SMCD_CLC_ID)) -+ return FALSE; -+ -+ dissect_smc_tcp(tvb, pinfo, tree, data); - return TRUE; - } - -@@ -921,479 +1392,688 @@ proto_register_smcr(void) - /* Setup list of header fields */ - static hf_register_info hf[] = { - { &hf_smcr_clc_msg, { -- "CLC Message", "smcr.clc_msg", -+ "CLC Message", "smc.clc_msg", - FT_UINT8, BASE_DEC, VALS(smcr_clc_message_txt), 0x0, - NULL, HFILL}}, - - { &hf_smcr_llc_msg, { -- "LLC Message", "smcr.llc_msg", -+ "LLC Message", "smc.llc_msg", - FT_UINT8, BASE_DEC, VALS(smcr_llc_message_txt), 0x0, - NULL, HFILL}}, - -+ { &hf_proposal_smc_version_release_number, { -+ "SMC Version Release Number", "smc.proposal.smc.version.relnum", -+ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }}, -+ -+ { &hf_proposal_smc_version_seid, { -+ "SEID Indicator", "smc.proposal.smc.seid", -+ FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, -+ - { &hf_proposal_smc_version, { -- "SMC Version", "smcr.proposal.smc.version", -+ "SMC Version", "smc.proposal.smc.version", - FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, - -+ { &hf_proposal_smc_type, { -+ "SMC(v1) Type", "smc.proposal.smc.type", -+ FT_UINT8, BASE_DEC, VALS(smc_clc_type_message_txt), -+ 0x03, NULL, HFILL}}, -+ -+ { &hf_accept_smc_type, { -+ "SMC Type", "smc.accept.smc.type", -+ FT_UINT8, BASE_DEC, VALS(smc_clc_type_message_txt), -+ 0x03, NULL, HFILL}}, -+ -+ { &hf_confirm_smc_type, { -+ "SMC Type", "smc.confirm.smc.type", -+ FT_UINT8, BASE_DEC, VALS(smc_clc_type_message_txt), -+ 0x03, NULL, HFILL}}, -+ -+ { &hf_proposal_smc_v2_type, { -+ "SMC(v2) Type", "smc.proposal.smcv2.type", -+ FT_UINT8, BASE_DEC, VALS(smc_clc_type_message_txt), -+ 0x0C, NULL, HFILL}}, -+ -+ { &hf_smc_proposal_smc_chid, { -+ "ISM CHID", "smc.proposal.smc.chid", -+ FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL}}, -+ -+ { &hf_smc_length, { -+ "SMC Length", "smc.length", -+ FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL}}, -+ - { &hf_accept_smc_version, { -- "SMC Version", "smcr.proposal.smc.version", -+ "SMC Version", "smc.proposal.smc.version", -+ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, -+ -+ { &hf_smcd_accept_smc_version, { -+ "SMC Version", "smc.proposal.smc.version", -+ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, -+ -+ { &hf_smcd_confirm_smc_version, { -+ "SMC Version", "smc.proposal.smc.version", - FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, - - { &hf_accept_first_contact, { -- "First Contact", "smcr.proposal.first.contact", -+ "First Contact", "smc.proposal.first.contact", - FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL}}, - - { &hf_confirm_smc_version, { -- "SMC Version", "smcr.proposal.smc.version", -+ "SMC Version", "smc.proposal.smc.version", - FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, - - { &hf_accept_rmb_buffer_size, { - "Server RMB Buffers Size (Compressed Notation)", -- "smcr.accept.rmb.buffer.size", -+ "smc.accept.rmb.buffer.size", - FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, - - { &hf_accept_qp_mtu_value, { - "QP MTU Value (enumerated value)", -- "smcr.accept.qp.mtu.value", -+ "smc.accept.qp.mtu.value", - FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL}}, - - { &hf_confirm_rmb_buffer_size, { - "Client RMB Buffers Size (Compressed Notation)", -- "smcr.confirm.rmb.buffer.size", -+ "smc.confirm.rmb.buffer.size", - FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL}}, - - { &hf_confirm_qp_mtu_value, { - "QP MTU Value (enumerated value)", -- "smcr.confirm.qp.mtu.value", -+ "smc.confirm.qp.mtu.value", - FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL}}, - -- { &hf_smcr_proposal_flags, { -- "Flags", "smcr.proposal.flags", -+ { &hf_smc_proposal_flags, { -+ "Flags", "smc.proposal.flags", -+ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, -+ -+ { &hf_smc_proposal_ext_flags, { -+ "Flag 2", "smc.proposal.extflags.2", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_flags, { -- "Flags", "smcr.accept.flags", -+ "Flags", "smc.accept.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_flags2, { -- "Flags 2", "smcr.accept.flags.2", -+ "Flags 2", "smc.accept.flags.2", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_flags, { -- "Flags", "smcr.confirm.flags", -+ "Flags", "smc.confirm.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - -- { &hf_smcr_decline_flags, { -- "Flags", "smcr.decline.flags", -+ { &hf_decline_smc_version, { -+ "SMC Version", "smc.decline.smc.version", -+ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL} }, -+ -+ { &hf_decline_out_of_sync, { -+ "Out of Sync", "smc.decline.osync", -+ FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL} }, -+ -+ { &hf_smc_decline_flags2, { -+ "Flags 2", "smc.decline.flags2", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - -+ { &hf_smc_decline_flags, { -+ "Flags", "smc.decline.flags", -+ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ - { &hf_smcr_confirm_flags2, { -- "Flags 2", "smcr.confirm.flags.2", -+ "Flags 2", "smc.confirm.flags.2", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - -- { &hf_smcr_proposal_client_peer_id, { -- "Sender (Client) Peer ID", "smcr.proposal.sender.client.peer.id", -+ { &hf_smc_proposal_client_peer_id, { -+ "Sender (Client) Peer ID", "smc.proposal.sender.client.peer.id", -+ FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, -+ -+ { &hf_smc_proposal_ism_gid, { -+ "ISM GID", "smc.proposal.ism.gid", - FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - -- { &hf_smcr_proposal_client_preferred_gid, { -- "Client Preferred GID", "smcr.proposal.client.preferred.gid", -+ { &hf_smc_proposal_client_preferred_gid, { -+ "Client Preferred GID", "smc.proposal.client.preferred.gid", - FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - -- { &hf_smcr_proposal_client_preferred_mac, { -+ { &hf_smc_proposal_client_preferred_mac, { - "Client Preferred MAC Address", -- "smcr.proposal.client.preferred.mac", -+ "smc.proposal.client.preferred.mac", - FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_server_peer_id, { -- "Sender (Server) Peer ID", "smcr.accept.sender.server.peer.id", -+ "Sender (Server) Peer ID", "smc.accept.sender.server.peer.id", - FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_server_preferred_gid, { -- "Server Preferred GID", "smcr.accept.server.preferred.gid", -+ "Server Preferred GID", "smc.accept.server.preferred.gid", - FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_server_preferred_mac, { - "Server Preferred MAC Address", -- "smcr.accept.server.preferred.mac", -+ "smc.accept.server.preferred.mac", - FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - -- { &hf_smcr_proposal_outgoing_interface_subnet_mask, { -+ { &hf_smc_proposal_rocev2_gid_ipv6_addr, { -+ "RoCEv2 GID IPv6 Address", -+ "smc.proposal.rocev2.gid.ipv6", -+ FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smc_proposal_rocev2_gid_ipv4_addr, { -+ "RoCEv2 GID IPv4 Address", -+ "smc.proposal.rocev2.gid.ipv4", -+ FT_IPv4, BASE_NETMASK, NULL, 0x0, NULL, HFILL}}, -+ -+ { &hf_smc_proposal_outgoing_interface_subnet_mask, { - "Outgoing Interface Subnet Mask", -- "smcr.outgoing.interface.subnet.mask", -+ "smc.outgoing.interface.subnet.mask", - FT_IPv4, BASE_NETMASK, NULL, 0x0, NULL, HFILL}}, - -- { &hf_smcr_proposal_outgoing_subnet_mask_signifcant_bits, { -+ { &hf_smc_proposal_outgoing_subnet_mask_signifcant_bits, { - "Outgoing Interface Subnet Mask Number of Significant Bits", -- "smcr.outgoing.interface.subnet.mask.number.of.significant.bits", -+ "smc.outgoing.interface.subnet.mask.number.of.significant.bits", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - -- { &hf_smcr_proposal_ipv6_prefix, { -- "IPv6 Prefix Value","smcr.proposal.ipv6.prefix.value", -+ { &hf_smc_proposal_ipv6_prefix, { -+ "IPv6 Prefix Value","smc.proposal.ipv6.prefix.value", - FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - -- { &hf_smcr_proposal_ipv6_prefix_length, { -- "IPv6 Prefix Length", "smcr.proposal.ipv6.prefix.length", -+ { &hf_smc_proposal_ipv6_prefix_length, { -+ "IPv6 Prefix Length", "smc.proposal.ipv6.prefix.length", - FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_server_qp_number, { -- "Server QP Number","smcr.accept.server.qp.number", -+ "Server QP Number","smc.accept.server.qp.number", - FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_server_rmb_rkey, { -- "Server RMB Rkey","smcr.accept.server.rmb.rkey", -+ "Server RMB Rkey","smc.accept.server.rmb.rkey", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_server_tcp_conn_index, { - "Server TCP Connection Index", -- "smcr.accept.server.tcp.conn.index", -+ "smc.accept.server.tcp.conn.index", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_server_rmb_element_alert_token, { - "Server RMB Element Alert Token", -- "smcr.accept.server.rmb.element.alert.token", -+ "smc.accept.server.rmb.element.alert.token", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_server_rmb_virtual_address, { - "Server's RMB Virtual Address", -- "smcr.accept.server.rmb.virtual.address", -+ "smc.accept.server.rmb.virtual.address", - FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_accept_initial_psn, { -- "Initial PSN","smcr.accept.initial.psn", -+ "Initial PSN","smc.accept.initial.psn", - FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_client_peer_id, { - "Sender (Client) Peer ID", -- "smcr.confirm.sender.client.peer.id", -+ "smc.confirm.sender.client.peer.id", - FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_client_gid, { -- "Client GID", "smcr.client.gid", -+ "Client GID", "smc.client.gid", - FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_client_mac, { -- "Client MAC Address", "smcr.confirm.client.mac", -+ "Client MAC Address", "smc.confirm.client.mac", - FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_client_qp_number, { -- "Client QP Number","smcr.confirm.client.qp.number", -+ "Client QP Number","smc.confirm.client.qp.number", - FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_client_rmb_rkey, { -- "Client RMB Rkey","smcr.confirm.client.rmb.rkey", -+ "Client RMB Rkey","smc.confirm.client.rmb.rkey", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_client_tcp_conn_index, { - "Client TCP Connection Index", -- "smcr.confirm.client.tcp.conn.index", -+ "smc.confirm.client.tcp.conn.index", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_client_rmb_element_alert_token, { - "Client RMB Element Alert Token", -- "smcr.client.rmb.element.alert.token", -+ "smc.client.rmb.element.alert.token", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_client_rmb_virtual_address, { - "Client's RMB Virtual Address", -- "smcr.client.rmb.virtual.address", -+ "smc.client.rmb.virtual.address", - FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_initial_psn, { -- "Initial PSN","smcr.initial.psn", -+ "Initial PSN","smc.initial.psn", - FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - -- { &hf_smcr_decline_peer_id, { -- "Sender Peer ID", "smcr.sender.peer.id", -+ { &hf_smc_decline_peer_id, { -+ "Sender Peer ID", "smc.sender.peer.id", - FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - -- { &hf_smcr_decline_diag_info, { -- "Peer Diagnosis Information", "smcr.peer.diag.info", -+ { &hf_smc_decline_diag_info, { -+ "Peer Diagnosis Information", "smc.peer.diag.info", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - -+ { &hf_decline_os_type, { -+ "OS Type", "smc.decline.os.type", -+ FT_UINT8, BASE_DEC, VALS(smc_clc_os_message_txt), 0xF0, NULL, HFILL} }, -+ - { &hf_smcr_confirm_link_gid, { -- "Sender GID", "smcr.sender.gid", -+ "Sender GID", "smc.sender.gid", - FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_link_mac, { -- "Sender MAC Address", "smcr.confirm.link.sender.mac", -+ "Sender MAC Address", "smc.confirm.link.sender.mac", - FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_link_qp_number, { -- "Sender QP Number","smcr.confirm.link.sender.qp.number", -+ "Sender QP Number","smc.confirm.link.sender.qp.number", - FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_link_number, { -- "Link Number", "smcr.confirm.link.number", -+ "Link Number", "smc.confirm.link.number", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_link_userid, { - "Sender Link User ID", -- "smcr.confirm.link.sender.link.userid", -+ "smc.confirm.link.sender.link.userid", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_link_max_links, { -- "Max Links","smcr.confirm.link.max.links", -+ "Max Links","smc.confirm.link.max.links", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_link_flags, { -- "Flags", "smcr.confirm.link.flags", -+ "Flags", "smc.confirm.link.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_link_response, { -- "Response", "smcr.confirm.link.response", -+ "Response", "smc.confirm.link.response", - FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, - - { &hf_smcr_add_link_gid, { -- "Sender GID", "smcr.add.link.sender.gid", -+ "Sender GID", "smc.add.link.sender.gid", - FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_mac, { -- "Sender MAC Address", "smcr.add.link.sender.mac", -+ "Sender MAC Address", "smc.add.link.sender.mac", - FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_qp_number, { -- "Sender QP Number","smcr.add.link.sender.qp.number", -+ "Sender QP Number","smc.add.link.sender.qp.number", - FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_number, { -- "Link Number", "smcr.add.link.link.number", -+ "Link Number", "smc.add.link.link.number", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_initial_psn, { -- "Initial PSN", "smcr.add.link.initial.psn", -+ "Initial PSN", "smc.add.link.initial.psn", - FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_flags, { -- "Flags", "smcr.add.link.flags", -+ "Flags", "smc.add.link.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_response, { -- "Add Link Response", "smcr.add.link.response", -+ "Add Link Response", "smc.add.link.response", - FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, - - { &hf_smcr_add_link_response_rejected, { -- "Add Link Rejected", "smcr.add.link.response.rejected", -+ "Add Link Rejected", "smc.add.link.response.rejected", - FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}}, - - { &hf_smcr_add_link_flags2, { -- "Flags", "smcr.add.link.flags2", -+ "Flags", "smc.add.link.flags2", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - - { &hf_smcr_add_link_qp_mtu_value, { -- "QP MTU Value", "smcr.add.link.qp.mtu.value", -+ "QP MTU Value", "smc.add.link.qp.mtu.value", - FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL}}, - - { &hf_smcr_add_link_cont_flags, { -- "Flags", "smcr.add.link.cont.flags", -+ "Flags", "smc.add.link.cont.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_cont_response, { -- "Response", "smcr.add.link.cont.response", -+ "Response", "smc.add.link.cont.response", - FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, - - { &hf_smcr_add_link_cont_link_number, { -- "Link Number", "smcr.add.link.cont.link.number", -+ "Link Number", "smc.add.link.cont.link.number", - FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, - - { &hf_smcr_add_link_cont_number_of_rkeys, { -- "Number of Rkeys", "smcr.add.link.cont.rkey.number", -+ "Number of Rkeys", "smc.add.link.cont.rkey.number", - FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, - - { &hf_smcr_add_link_cont_p1_rkey, { - "RMB RToken Pair 1 - Rkey as known on this SMC Link", -- "smcr.add.link.cont.rmb.RTok1.Rkey1", -+ "smc.add.link.cont.rmb.RTok1.Rkey1", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_cont_p1_rkey2, { - "RMB RToken Pair 1 - Equivalent Rkey for the new SMC Link", -- "smcr.add.link.cont.rmb.RTok1.Rkey2", -+ "smc.add.link.cont.rmb.RTok1.Rkey2", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_cont_p1_virt_addr, { - "RMB RToken Pair 1 Virtual Address for the new SMC Link", -- "smcr.add.link.cont.rmb.RTok1.virt", -+ "smc.add.link.cont.rmb.RTok1.virt", - FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_cont_p2_rkey, { - "RMB RToken Pair 2 - Rkey as known on this SMC Link", -- "smcr.add.link.cont.rmb.RTok2.Rkey1", -+ "smc.add.link.cont.rmb.RTok2.Rkey1", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_cont_p2_rkey2, { - "RMB RToken Pair 2 - Equivalent Rkey for the new SMC Link", -- "smcr.add.link.cont.rmb.RTok2.Rkey2", -+ "smc.add.link.cont.rmb.RTok2.Rkey2", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_add_link_cont_p2_virt_addr, { - "RMB RToken Pair 2 Virtual Address for the new SMC Link", -- "smcr.add.link.cont.rmb.RTok1.virt", -+ "smc.add.link.cont.rmb.RTok1.virt", - FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_delete_link_flags, { -- "Flags", "smcr.delete.link.flags", -+ "Flags", "smc.delete.link.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_delete_link_response, { -- "Response", "smcr.delete.link.response", -+ "Response", "smc.delete.link.response", - FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, - - { &hf_smcr_delete_link_all, { - "Terminate All Links In The Link Group", -- "smcr.delete.link.all", -+ "smc.delete.link.all", - FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}}, - - { &hf_smcr_delete_link_orderly, { -- "Terminate Links Orderly", "smcr.delete.link.orderly", -+ "Terminate Links Orderly", "smc.delete.link.orderly", - FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, - - { &hf_smcr_delete_link_number, { -- "Link Number For The Failed Link", "smcr.delete.link.number", -+ "Link Number For The Failed Link", "smc.delete.link.number", - FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, - - { &hf_smcr_delete_link_reason_code, { -- "Reason Code", "smcr.delete.link.reason.code", -+ "Reason Code", "smc.delete.link.reason.code", - FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL}}, - - { &hf_smcr_confirm_rkey_flags, { -- "Flags", "smcr.confirm.rkey.flags", -+ "Flags", "smc.confirm.rkey.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_rkey_response, { -- "Response", "smcr.confirm.rkey.response", -+ "Response", "smc.confirm.rkey.response", - FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, - - { &hf_smcr_confirm_rkey_negative_response, { -- "Negative Response", "smcr.confirm.rkey.negative.response", -+ "Negative Response", "smc.confirm.rkey.negative.response", - FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, - - { &hf_smcr_confirm_rkey_retry_rkey_set, { -- "Retry Rkey Set", "smcr.confirm.rkey.retry.rkey.set", -+ "Retry Rkey Set", "smc.confirm.rkey.retry.rkey.set", - FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL}}, - - { &hf_smcr_confirm_rkey_number, { -- "Number of other QP", "smcr.confirm.rkey.number.qp", -+ "Number of other QP", "smc.confirm.rkey.number.qp", - FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, - - { &hf_smcr_confirm_rkey_new_rkey, { -- "New Rkey for this link","smcr.confirm.rkey.new.rkey", -+ "New Rkey for this link","smc.confirm.rkey.new.rkey", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_rkey_virtual_address, { - "New RMB virtual address for this link", -- "smcr.confirm.rkey.new.virt", -+ "smc.confirm.rkey.new.virt", - FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_confirm_rkey_link_number, { -- "Link Number", "smcr.confirm.rkey.link.number", -+ "Link Number", "smc.confirm.rkey.link.number", - FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, - - { &hf_smcr_delete_rkey_flags, { -- "Flags", "smcr.delete.rkey.flags", -+ "Flags", "smc.delete.rkey.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_delete_rkey_response, { -- "Response", "smcr.delete.rkey.response", -+ "Response", "smc.delete.rkey.response", - FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, - - { &hf_smcr_delete_rkey_negative_response, { -- "Negative Response", "smcr.delete.rkey.negative.response", -+ "Negative Response", "smc.delete.rkey.negative.response", - FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, - - { &hf_smcr_delete_rkey_mask, { -- "Error Mask", "smcr.delete.rkey.error.mask", -+ "Error Mask", "smc.delete.rkey.error.mask", - FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, - - { &hf_smcr_delete_rkey_deleted, { -- "RMB Rkey to be deleted", "smcr.delete.rkey.deleted", -+ "RMB Rkey to be deleted", "smc.delete.rkey.deleted", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_test_link_flags, { -- "Flags", "smcr.test.link.flags", -+ "Flags", "smc.test.link.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_test_link_response, { -- "Response", "smcr.test.link.response", -+ "Response", "smc.test.link.response", - FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_seqno, { -- "Sequence Number", "smcr.rmbe.ctrl.seqno", -+ "Sequence Number", "smc.rmbe.ctrl.seqno", - FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_alert_token, { -- "Alert Token", "smcr.rmbe.ctrl.alert.token", -+ "Alert Token", "smc.rmbe.ctrl.alert.token", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - -+ { &hf_smc_proposal_eid, { -+ "EID", "smc.proposal.eid", -+ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smc_proposal_system_eid, { -+ "SEID", "smc.proposal.system.eid", -+ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, -+ - { &hf_smcr_rmbe_ctrl_prod_wrap_seqno, { - "Producer window wrap sequence number", -- "smcr.rmbe.ctrl.prod.wrap.seq", -+ "smc.rmbe.ctrl.prod.wrap.seq", - FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_peer_prod_curs, { -- "Peer Producer Cursor", "smcr.rmbe.ctrl.peer.prod.curs", -+ "Peer Producer Cursor", "smc.rmbe.ctrl.peer.prod.curs", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - - { &hf_smcr_rmbe_ctrl_cons_wrap_seqno, { - "Consumer window wrap sequence number", -- "smcr.rmbe.ctrl.prod.wrap.seq", -+ "smc.rmbe.ctrl.prod.wrap.seq", - FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_peer_cons_curs, { -- "Peer Consumer Cursor", "smcr.rmbe.ctrl.peer.prod.curs", -+ "Peer Consumer Cursor", "smc.rmbe.ctrl.peer.prod.curs", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_conn_rw_status_flags, { - "Connection read/write status flags", -- "smcr.rmbe.ctrl.conn.rw.status.flags", -+ "smc.rmbe.ctrl.conn.rw.status.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_write_blocked, { -- "Write Blocked", "smcr.rmbe.ctrl.write.blocked", -+ "Write Blocked", "smc.rmbe.ctrl.write.blocked", - FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_urgent_pending, { -- "Urgent Data Pending", "smcr.rmbe.ctrl.urgent.pending", -+ "Urgent Data Pending", "smc.rmbe.ctrl.urgent.pending", - FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_urgent_present, { -- "Urgent Data Present", "smcr.rmbe.ctrl.urgent.present", -+ "Urgent Data Present", "smc.rmbe.ctrl.urgent.present", - FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_cons_update_requested, { - "Consumer Cursor Update Requested", -- "smcr.rmbe.ctrl.cons.update.requested", -+ "smc.rmbe.ctrl.cons.update.requested", - FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_failover_validation, { - "Failover Validation Indicator", -- "smcr.rmbe.ctrl.failover.validation", -+ "smc.rmbe.ctrl.failover.validation", - FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_peer_conn_state_flags, { - "Peer Connection State Flags", -- "smcr.rmbe.ctrl.peer.conn.state.flags", -+ "smc.rmbe.ctrl.peer.conn.state.flags", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_peer_sending_done, { -- "Peer Sending Done", "smcr.rmbe.ctrl.peer.sending.done", -+ "Peer Sending Done", "smc.rmbe.ctrl.peer.sending.done", - FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_peer_closed_conn, { -- "Peer Closed Connection", "smcr.rmbe.ctrl.peer.closed.conn", -+ "Peer Closed Connection", "smc.rmbe.ctrl.peer.closed.conn", - FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}}, - - { &hf_smcr_rmbe_ctrl_peer_abnormal_close, { -- "Peer Abnormal Close", "smcr.rmbe.ctrl.peer.abnormal.close", -- FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}} -+ "Peer Abnormal Close", "smc.rmbe.ctrl.peer.abnormal.close", -+ FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, -+ -+ { &hf_smcd_accept_eid, { -+ "EID", "smc.accept.eid", -+ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_eid, { -+ "EID", "smc.confirm.eid", -+ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_accept_peer_name, { -+ "Peer Host Name", "smc.accept.peer.host.name", -+ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_peer_name, { -+ "Peer Host Name", "smc.confirm.peer.host.name", -+ FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_accept_first_contact, { -+ "First Contact", "smc.accept.first.contact", -+ FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_first_contact, { -+ "First Contact", "smc.confirm.first.contact", -+ FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL} }, -+ -+ { &hf_accept_smc_version_release_number, { -+ "SMC Version Release Number", "smc.accept.smc.version.relnum", -+ FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL } }, -+ -+ { &hf_confirm_smc_version_release_number, { -+ "SMC Version Release Number", "smc.confirm.smc.version.relnum", -+ FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL } }, -+ -+ { &hf_accept_os_type, { -+ "OS Type", "smc.accept.os.type", -+ FT_UINT8, BASE_DEC, VALS(smc_clc_os_message_txt), 0xF0, NULL, HFILL} }, -+ -+ { &hf_confirm_os_type, { -+ "OS Type", "smc.confirm.os.type", -+ FT_UINT8, BASE_DEC, VALS(smc_clc_os_message_txt), 0xF0, NULL, HFILL} }, -+ -+ { &hf_smcd_accept_dmb_token, { -+ "DMB Token", "smc.accept.dmb.token", -+ FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_dmb_token, { -+ "DMB Token", "smc.confirm.dmb.token", -+ FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_accept_dmb_buffer_size, { -+ "Server DMBE Buffers Size (Compressed Notation)", -+ "smc.accept.dmbe.buffer.size", -+ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_dmb_buffer_size, { -+ "Client DMBE Buffers Size (Compressed Notation)", -+ "smc.confirm.dmbe.buffer.size", -+ FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL} }, -+ -+ { &hf_smcd_accept_smc_chid, { -+ "ISM CHID", "smc.accept.smc.chid", -+ FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_smc_chid, { -+ "ISM CHID", "smc.confirm.smc.chid", -+ FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL} }, -+ -+ { &hf_smcd_accept_server_peer_id, { -+ "Sender (Server) ISM GID", "smc.accept.sender.server.ism.gid", -+ FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_client_peer_id, { -+ "Sender (Client) ISM GID", "smc.confirm.sender.client.ism.gid", -+ FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_accept_dmbe_conn_index, { -+ "DMBE Connection Index", -+ "smc.accept.dmbe.conn.index", -+ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_accept_server_link_id, { -+ "Server Link ID", -+ "smc.accept.server.linkid", -+ FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_dmbe_conn_index, { -+ "DMBE Connection Index", -+ "smc.confirm.dmbe.conn.index", -+ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_client_link_id, { -+ "Client Link ID", -+ "smc.confirm.client.linkid", -+ FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_accept_flags, { -+ "Flags", "smc.accept.flags", -+ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_flags, { -+ "Flags", "smc.confirm.flags", -+ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_accept_flags2, { -+ "DMBE Size", "smc.accept.dmbe.size", -+ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_confirm_flags2, { -+ "DMBE Size", "smc.confirm.dmbe.size", -+ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smcd_accept_fce_flags, { -+ "Flags", "smc.accept.fce.flags", -+ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} } - }; - - /* Setup protocol subtree arrays */ -- static gint *ett[] = { -+ static gint* ett[] = { - &ett_smcr, - &ett_proposal_flag, -+ &ett_proposal_ext_flag2, - &ett_accept_flag, - &ett_accept_flag2, -+ &ett_smcd_accept_flag, -+ &ett_smcd_accept_flag2, -+ &ett_smcd_accept_fce_flag, -+ &ett_smcd_confirm_flag, -+ &ett_smcd_confirm_fce_flag, -+ &ett_smcd_confirm_flag2, - &ett_confirm_flag, - &ett_confirm_flag2, - &ett_confirm_link_flag, -+ &ett_decline_flag, -+ &ett_decline_flag2, - &ett_add_link_flag, - &ett_add_link_flag2, - &ett_add_link_cont_flag, -@@ -1405,21 +2085,21 @@ proto_register_smcr(void) - &ett_rmbe_ctrl_peer_conn_state_flag - }; - -- proto_smcr = proto_register_protocol("Shared Memory Communications - RDMA", -- "SMCR", "smcr"); -+ proto_smc = proto_register_protocol("Shared Memory Communications", -+ "SMC", "smc"); - -- proto_register_field_array(proto_smcr, hf, array_length(hf)); -+ proto_register_field_array(proto_smc, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); - -- smcr_tcp_handle = register_dissector("smcr", dissect_smcr_tcp, proto_smcr); -+ smc_tcp_handle = register_dissector("smc", dissect_smc_tcp, proto_smc); - } - - void - proto_reg_handoff_smcr(void) - { -- heur_dissector_add("tcp", dissect_smcr_tcp_heur, "Shared Memory Communications over TCP", "smcr_tcp", proto_smcr, HEURISTIC_ENABLE); -- heur_dissector_add("infiniband.payload", dissect_smcr_infiniband_heur, "Shared Memory Communications Infiniband", "smcr_infiniband", proto_smcr, HEURISTIC_ENABLE); -- dissector_add_for_decode_as("infiniband", create_dissector_handle( dissect_smcr_infiniband, proto_smcr ) ); -+ heur_dissector_add("tcp", dissect_smc_tcp_heur, "Shared Memory Communications over TCP", "smc_tcp", proto_smc, HEURISTIC_ENABLE); -+ heur_dissector_add("infiniband.payload", dissect_smcr_infiniband_heur, "Shared Memory Communications Infiniband", "smcr_infiniband", proto_smc, HEURISTIC_ENABLE); -+ dissector_add_for_decode_as("infiniband", create_dissector_handle( dissect_smcr_infiniband, proto_smc ) ); - } - - /* -diff --git a/epan/dissectors/packet-smc.c b/epan/dissectors/packet-smc.c -index bbfa9c07ef..0a4e96e055 100644 ---- a/epan/dissectors/packet-smc.c -+++ b/epan/dissectors/packet-smc.c -@@ -592,7 +592,7 @@ disect_smcd_accept(tvbuff_t* tvb, proto_tree* tree) - offset += FLAG_BYTE_LEN; - offset += TWO_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcd_accept_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); -- offset += 32; -+ /* offset += 32; */ - } - } - } -@@ -661,7 +661,7 @@ disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree) - offset += FLAG_BYTE_LEN; - offset += TWO_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcd_confirm_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); -- offset += 32; -+ /* offset += 32; */ - } - } - } -diff --git a/epan/dissectors/packet-smc.c b/epan/dissectors/packet-smc.c -index 0a4e96e055..6ede4690db 100644 ---- a/epan/dissectors/packet-smc.c -+++ b/epan/dissectors/packet-smc.c -@@ -1,3 +1,6 @@ -+ -+ -+ - /* packet-smc.c - * SMC dissector for wireshark - * By Joe Fowler -@@ -191,6 +194,8 @@ static int hf_smc_proposal_outgoing_subnet_mask_signifcant_bits = -1; - static int hf_smc_proposal_ipv6_prefix = -1; - static int hf_smc_proposal_ipv6_prefix_length = -1; - -+static int hf_smc_reserved = -1; -+ - /* SMC-R Accept */ - static int ett_accept_flag = -1; - static int ett_accept_flag2 = -1; -@@ -427,6 +432,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) - - if (mask_offset != 0) { - suboffset = offset; -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ suboffset, TWO_BYTE_RESERVED, ENC_NA); - suboffset += TWO_BYTE_RESERVED; - if (is_smcdv1 || is_smcdv2) { - proto_tree_add_item(tree, hf_smc_proposal_ism_gid, tvb, -@@ -439,6 +446,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) - LENGTH_BYTE_LEN, ENC_BIG_ENDIAN); - } - suboffset += LENGTH_BYTE_LEN; -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ suboffset, TWO_BYTE_RESERVED, ENC_NA); - v2_ext_offset = tvb_get_ntohs(tvb, suboffset); - v2_ext_pos = suboffset + TWO_BYTE_RESERVED + v2_ext_offset; - } -@@ -451,7 +460,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) - proto_tree_add_item(tree, hf_smc_proposal_outgoing_subnet_mask_signifcant_bits, tvb, - offset, 1, ENC_BIG_ENDIAN); - offset += 1; -- /* Bump past reserved bytes */ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, TWO_BYTE_RESERVED, ENC_NA); - offset += TWO_BYTE_RESERVED; - ipv6_prefix_count = tvb_get_guint8(tvb, offset); - offset += 1; -@@ -472,7 +482,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) - offset += FLAG_BYTE_LEN; - num_of_gids = tvb_get_guint8(tvb, offset); - offset += FLAG_BYTE_LEN; -- /*Skip reserved flag 1*/ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, 1, ENC_NA); - offset += 1; - proposal_flag_item = proto_tree_add_item(tree, hf_smc_proposal_ext_flags, tvb, - offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); -@@ -482,7 +493,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) - proto_tree_add_item(proposal_flag_tree, hf_proposal_smc_version_seid, tvb, - offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - offset += FLAG_BYTE_LEN; -- /*Skip not used 2 bytes*/ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, 2, ENC_NA); - offset += 2; - smcd_v2_ext_offset = tvb_get_ntohs(tvb, offset); - offset += 2; -@@ -499,7 +511,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) - offset, IPV4_SUBNET_MASK_LEN, ENC_BIG_ENDIAN); - offset += IPV4_SUBNET_MASK_LEN; - } -- /*Skip reserved 16 bytes*/ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, 16, ENC_NA); - offset += 16; - while (num_of_eids != 0) { - proto_tree_add_item(tree, hf_smc_proposal_eid, tvb, -@@ -512,7 +525,8 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) - proto_tree_add_item(tree, hf_smc_proposal_system_eid, tvb, - offset, EID_LEN, ENC_ASCII | ENC_NA); - offset += EID_LEN; -- /*Skip reserved 16 bytes*/ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, 16, ENC_NA); - offset += 16; - while (num_of_gids != 0) { - proto_tree_add_item(tree, hf_smc_proposal_ism_gid, tvb, -@@ -580,16 +594,21 @@ disect_smcd_accept(tvbuff_t* tvb, proto_tree* tree) - - proto_tree_add_item(tree, hf_smcd_accept_eid, tvb, offset, 32, ENC_ASCII | ENC_NA); - offset += 32; -- /* Reserved bytes */ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, 8, ENC_NA); - offset += 8; - - if (first_contact) { -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, ONE_BYTE_RESERVED, ENC_NA); - offset += ONE_BYTE_RESERVED; - accept_flag_item = proto_tree_add_item(tree, hf_smcd_accept_fce_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - accept_flag_tree = proto_item_add_subtree(accept_flag_item, ett_smcd_accept_fce_flag); - proto_tree_add_item(accept_flag_tree, hf_accept_os_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - proto_tree_add_item(accept_flag_tree, hf_accept_smc_version_release_number, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - offset += FLAG_BYTE_LEN; -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, TWO_BYTE_RESERVED, ENC_NA); - offset += TWO_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcd_accept_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); - /* offset += 32; */ -@@ -637,6 +656,8 @@ disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree) - confirm_flag2_tree = proto_item_add_subtree(confirm_flag2_item, ett_smcd_confirm_flag2); - proto_tree_add_item(confirm_flag2_tree, hf_smcd_confirm_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - offset += FLAG_BYTE_LEN; -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, ONE_BYTE_RESERVED, ENC_NA); - offset += TWO_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcd_confirm_client_link_id, tvb, - offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN); -@@ -649,16 +670,21 @@ disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree) - - proto_tree_add_item(tree, hf_smcd_confirm_eid, tvb, offset, 32, ENC_ASCII | ENC_NA); - offset += 32; -- /* Reserved bytes */ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, 8, ENC_NA); - offset += 8; - - if (first_contact) { -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, ONE_BYTE_RESERVED, ENC_NA); - offset += ONE_BYTE_RESERVED; - confirm_flag_item = proto_tree_add_item(tree, hf_smcd_accept_fce_flags, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - confirm_flag_tree = proto_item_add_subtree(confirm_flag_item, ett_smcd_confirm_fce_flag); - proto_tree_add_item(confirm_flag_tree, hf_confirm_os_type, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - proto_tree_add_item(confirm_flag_tree, hf_confirm_smc_version_release_number, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - offset += FLAG_BYTE_LEN; -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, TWO_BYTE_RESERVED, ENC_NA); - offset += TWO_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcd_confirm_peer_name, tvb, offset, 32, ENC_ASCII | ENC_NA); - /* offset += 32; */ -@@ -711,12 +737,14 @@ disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree) - proto_tree_add_item(accept_flag2_tree, hf_accept_rmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - proto_tree_add_item(accept_flag2_tree, hf_accept_qp_mtu_value, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - offset += FLAG_BYTE_LEN; -- /* Bump past reserved byte */ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, ONE_BYTE_RESERVED, ENC_NA); - offset += ONE_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcr_accept_server_rmb_virtual_address, tvb, - offset, VIRTUAL_ADDR_LEN, ENC_BIG_ENDIAN); - offset += VIRTUAL_ADDR_LEN; -- /* Bump past reserved byte */ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, ONE_BYTE_RESERVED, ENC_NA); - offset += ONE_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcr_accept_initial_psn, tvb, - offset, PSN_LEN, ENC_BIG_ENDIAN); -@@ -765,12 +793,14 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree) - proto_tree_add_item(confirm_flag2_tree, hf_confirm_rmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - proto_tree_add_item(confirm_flag2_tree, hf_confirm_qp_mtu_value, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); - offset += FLAG_BYTE_LEN; -- /* Bump past reserved byte */ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, ONE_BYTE_RESERVED, ENC_NA); - offset += ONE_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcr_confirm_client_rmb_virtual_address, tvb, - offset, VIRTUAL_ADDR_LEN, ENC_BIG_ENDIAN); - offset += VIRTUAL_ADDR_LEN; -- /* Bump past reserved byte */ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, ONE_BYTE_RESERVED, ENC_NA); - offset += ONE_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcr_confirm_initial_psn, tvb, - offset, PSN_LEN, ENC_BIG_ENDIAN); -@@ -866,7 +896,8 @@ disect_smcr_add_link(tvbuff_t *tvb, proto_tree *tree) - proto_tree_add_item(tree, hf_smcr_add_link_mac, tvb, - offset, MAC_ADDR_LEN, ENC_NA); - offset += MAC_ADDR_LEN; -- /* Bump past reserved bytes */ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, -+ offset, TWO_BYTE_RESERVED, ENC_NA); - offset += TWO_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcr_add_link_gid, tvb, - offset, GID_LEN, ENC_NA); -@@ -1084,12 +1115,13 @@ disect_smcr_rmbe_ctrl(tvbuff_t *tvb, proto_tree *tree) - offset += SEQNO_LEN; - proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_alert_token, tvb, offset, ALERT_TOKEN_LEN, ENC_BIG_ENDIAN); - offset += ALERT_TOKEN_LEN; -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, TWO_BYTE_RESERVED, ENC_NA); - offset += TWO_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_prod_wrap_seqno, tvb, offset, SEQNO_LEN, ENC_BIG_ENDIAN); - offset += SEQNO_LEN; - proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_peer_prod_curs, tvb, offset, CURSOR_LEN, ENC_BIG_ENDIAN); - offset += CURSOR_LEN; -- /* Bump past reserved bytes */ -+ proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, TWO_BYTE_RESERVED, ENC_NA); - offset += TWO_BYTE_RESERVED; - proto_tree_add_item(tree, hf_smcr_rmbe_ctrl_cons_wrap_seqno, tvb, offset, SEQNO_LEN, ENC_BIG_ENDIAN); - offset += SEQNO_LEN; -@@ -2053,7 +2085,11 @@ proto_register_smcr(void) - - { &hf_smcd_accept_fce_flags, { - "Flags", "smc.accept.fce.flags", -- FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} } -+ FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, -+ -+ { &hf_smc_reserved, { -+ "Reserved", "smc.reserved", -+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} } - }; - - /* Setup protocol subtree arrays */ diff --git a/wireshark.spec b/wireshark.spec index ee44900..b8825b8 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,13 +1,13 @@ %undefine __cmake_in_source_build %global with_lua 1 %global with_maxminddb 1 -%global plugins_version 3.4 +%global plugins_version 3.6 # added temporarily due to errors in libqt5core %define _lto_cflags %{nil} Summary: Network traffic analyzer Name: wireshark -Version: 3.4.9 +Version: 3.6.0 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -29,7 +29,6 @@ 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 -Patch9: wireshark-0009-smc-support.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -69,6 +68,7 @@ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtmultimedia-devel BuildRequires: qt5-qtsvg-devel BuildRequires: zlib-devel +BuildRequires: asciidoctor %if %{with_maxminddb} && 0%{?fedora} BuildRequires: libmaxminddb-devel %endif @@ -148,7 +148,7 @@ and plugins. %install %cmake_install -desktop-file-validate %{buildroot}%{_datadir}/applications/wireshark.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/org.wireshark.Wireshark.desktop #install devel files (inspired by debian/wireshark-dev.header-files) install -d -m 0755 %{buildroot}%{_includedir}/wireshark @@ -170,7 +170,6 @@ install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt" install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes" install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" -install -m 644 epan/wmem/*.h "${IDIR}/epan/wmem" install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wsutil/*.h "${IDIR}/wsutil" install -m 644 ws_diag_control.h "${IDIR}/" @@ -196,11 +195,11 @@ fi %ldconfig_postun cli %files -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/applications/wireshark.desktop +%{_datadir}/applications/org.wireshark.Wireshark.desktop +%{_datadir}/metainfo/*.xml +%{_datadir}/mime/packages/*.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/mimetypes/* -%{_datadir}/mime/packages/wireshark.xml %{_bindir}/wireshark %{_mandir}/man1/wireshark.* %{_sysusersdir}/%{name}.conf @@ -262,13 +261,13 @@ fi %{_mandir}/man1/randpktdump.* %{_mandir}/man1/dpauxmon.* %{_mandir}/man1/sdjournal.* +%{_mandir}/man1/etwdump.1.gz %{_mandir}/man4/extcap.* %if %{with_maxminddb} && 0%{?fedora} %{_mandir}/man1/mmdbresolve.* %endif %dir %{_datadir}/wireshark %{_datadir}/wireshark/* -%{_docdir}/wireshark/*.html %files devel %doc doc/README.* ChangeLog @@ -277,6 +276,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Nov 25 2021 Michal Ruprich - 1:3.6.0-1 +- New version 3.6.0 +- Fix for CVE-2021-39920, CVE-2021-39921, CVE-2021-39922, CVE-2021-39923, CVE-2021-39924, CVE-2021-39925, CVE-2021-39926, CVE-2021-39928, CVE-2021-39929 + * Wed Oct 13 2021 Michal Ruprich - 1:3.4.9-2 - New version 3.4.9 From e4bc866318ad60f0aba07c26994b459842450b53 Mon Sep 17 00:00:00 2001 From: Frantisek Hrdina Date: Tue, 7 Dec 2021 13:26:14 +0100 Subject: [PATCH 038/120] Adding fmf plan --- plans/all.fmf | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 plans/all.fmf diff --git a/plans/all.fmf b/plans/all.fmf new file mode 100644 index 0000000..18bccad --- /dev/null +++ b/plans/all.fmf @@ -0,0 +1,6 @@ +summary: Test plan with all Fedora tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/wireshark.git +execute: + how: tmt From dbb1cd3a4b5f762e081cb493a150b7381a398164 Mon Sep 17 00:00:00 2001 From: Frantisek Hrdina Date: Wed, 8 Dec 2021 15:41:42 +0100 Subject: [PATCH 039/120] Removing ci.fmf that was in old format --- ci.fmf | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 ci.fmf diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index d6542da..0000000 --- a/ci.fmf +++ /dev/null @@ -1,13 +0,0 @@ -/test: - summary: - CI plan, picks Tier1 tests, runs in beakerlib. - description: - This special plan has to be named ci.fmf to run in CI. - It selects test which have 'tier 1' in their main.fmf file - discover: - - name: tier1 - how: fmf - filter: 'tier: 1' - url: "https://src.fedoraproject.org/tests/wireshark.git" - execute: - how: beakerlib From 337d1c65633db7653381a2e1925ff361d35df693 Mon Sep 17 00:00:00 2001 From: Frantisek Hrdina Date: Thu, 9 Dec 2021 13:40:42 +0100 Subject: [PATCH 040/120] Adding gating.yaml --- gating.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..195c6fe --- /dev/null +++ b/gating.yaml @@ -0,0 +1,16 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_testing] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +#gating rawhide +--- !Policy +product_versions: + - fedora-* +decision_contexts: [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 From 9e5d4a3b227ba70907c37baa5fc87aaa34c3821f Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 12 Jan 2022 09:58:57 +0100 Subject: [PATCH 041/120] New version 3.6.1 Fix for CVE-2021-4181, CVE-2021-4182, CVE-2021-4183, CVE-2021-4184, CVE-2021-4185, CVE-2021-4190 --- sources | 4 ++-- wireshark.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 6bfbc40..8f58d95 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.6.0.tar.xz) = 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094 -SHA512 (SIGNATURES-3.6.0.txt) = 52d306dcb5afa949e97b760a0d7aaec2f46f0501f80a637a8b1e6715752a0fe4139f0599c71a6befd86029c3b9bcf63862ac272c43201ba1028c9431b7226d8a +SHA512 (wireshark-3.6.1.tar.xz) = 8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81 +SHA512 (SIGNATURES-3.6.1.txt) = 382bade7645671ad0012ad1060ab33db3f7b96e5d73799a94eed78d07a374ca3b2e78fcd69366607ba42a09b162ad88f73001f6374ef1b5cb8bd76cf5a120dc6 diff --git a/wireshark.spec b/wireshark.spec index b8825b8..f3b58a9 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,7 +7,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.6.0 +Version: 3.6.1 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -276,6 +276,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 12 2022 Michal Ruprich - 1:3.6.1-1 +- New version 3.6.1 +- Fix for CVE-2021-4181, CVE-2021-4182, CVE-2021-4183, CVE-2021-4184, CVE-2021-4185, CVE-2021-4190 + * Thu Nov 25 2021 Michal Ruprich - 1:3.6.0-1 - New version 3.6.0 - Fix for CVE-2021-39920, CVE-2021-39921, CVE-2021-39922, CVE-2021-39923, CVE-2021-39924, CVE-2021-39925, CVE-2021-39926, CVE-2021-39928, CVE-2021-39929 From bb9c2f284fc463ea48dc6eee04ec69ac70518908 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:32:39 +0000 Subject: [PATCH 042/120] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index f3b58a9..92bada9 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,7 +8,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -276,6 +276,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1:3.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 12 2022 Michal Ruprich - 1:3.6.1-1 - New version 3.6.1 - Fix for CVE-2021-4181, CVE-2021-4182, CVE-2021-4183, CVE-2021-4184, CVE-2021-4185, CVE-2021-4190 From 16f9e9e5ac271e7e24a4ed02fe68b91b4c57884e Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 16 Feb 2022 14:29:06 +0100 Subject: [PATCH 043/120] New version 3.6.2 Fix for CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585, CVE-2022-0586 --- sources | 4 ++-- wireshark.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 8f58d95..20c938e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.6.1.tar.xz) = 8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81 -SHA512 (SIGNATURES-3.6.1.txt) = 382bade7645671ad0012ad1060ab33db3f7b96e5d73799a94eed78d07a374ca3b2e78fcd69366607ba42a09b162ad88f73001f6374ef1b5cb8bd76cf5a120dc6 +SHA512 (wireshark-3.6.2.tar.xz) = cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070 +SHA512 (SIGNATURES-3.6.2.txt) = 0370ee5827003f98983d0a7d1a1024aa891a5f74bafb42d993be2509cdf63181acbd0547d722af072491b4406cf02b899c2b8af7bac52e2e4ddb801f28695caf diff --git a/wireshark.spec b/wireshark.spec index 92bada9..5b9117e 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,8 +7,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.6.1 -Release: 2%{?dist} +Version: 3.6.2 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -276,6 +276,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Feb 16 2022 Michal Ruprich - 1:3.6.2-1 +- New version 3.6.2 +- Fix for CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585, CVE-2022-0586 + * Sat Jan 22 2022 Fedora Release Engineering - 1:3.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 46e60d82201084acddf609fbfe3afc80e8a19162 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:29:55 +0000 Subject: [PATCH 044/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 5b9117e..1e93a00 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,7 +8,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -276,6 +276,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1:3.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Feb 16 2022 Michal Ruprich - 1:3.6.2-1 - New version 3.6.2 - Fix for CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585, CVE-2022-0586 From 73e7a27f978276c7116f1455e510fc6722a3e9a7 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 28 Jul 2022 13:57:11 +0200 Subject: [PATCH 045/120] New version 3.6.7 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 20c938e..631d42d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.6.2.tar.xz) = cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070 -SHA512 (SIGNATURES-3.6.2.txt) = 0370ee5827003f98983d0a7d1a1024aa891a5f74bafb42d993be2509cdf63181acbd0547d722af072491b4406cf02b899c2b8af7bac52e2e4ddb801f28695caf +SHA512 (wireshark-3.6.7.tar.xz) = caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac +SHA512 (SIGNATURES-3.6.7.txt) = f7f826d4665cbf89088dd12a1e732a9a451b2566e2b4fad0924e443c811bb158a9276cf0221c79414f9020c6e5f8f0ec25513b56cbaf82d304c2a7ac3f06ef5d diff --git a/wireshark.spec b/wireshark.spec index 1e93a00..0c88b3e 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,8 +7,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.6.2 -Release: 2%{?dist} +Version: 3.6.7 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -276,6 +276,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 28 2022 Michal Ruprich - 1:3.6.7-1 +- New version 3.6.7 + * Sat Jul 23 2022 Fedora Release Engineering - 1:3.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From bccd1878ed698bec2dc0e1640d7070e4ebc41875 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Thu, 30 Jun 2022 13:28:59 -0700 Subject: [PATCH 046/120] Drop gating for python3-devel dependency --- wireshark.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 0c88b3e..dd053e5 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -8,7 +8,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 3.6.7 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -76,9 +76,7 @@ BuildRequires: libmaxminddb-devel BuildRequires: compat-lua-devel %endif Buildrequires: git-core -%if 0%{?fedora} Buildrequires: python3-devel -%endif Buildrequires: cmake #needed for sdjournal external capture interface BuildRequires: systemd-devel @@ -276,6 +274,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Aug 01 2022 Davide Cavalca - 1:3.6.7-2 +- Drop gating for python3-devel dependency + * Thu Jul 28 2022 Michal Ruprich - 1:3.6.7-1 - New version 3.6.7 From e48d9ba9f8fb0c2eac43f1dccce9187e5f774a08 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 29 Sep 2022 11:16:03 +0200 Subject: [PATCH 047/120] New version 3.6.8 Fix for CVE-2022-3190 --- sources | 4 ++-- wireshark.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 631d42d..f35e147 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.6.7.tar.xz) = caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac -SHA512 (SIGNATURES-3.6.7.txt) = f7f826d4665cbf89088dd12a1e732a9a451b2566e2b4fad0924e443c811bb158a9276cf0221c79414f9020c6e5f8f0ec25513b56cbaf82d304c2a7ac3f06ef5d +SHA512 (wireshark-3.6.8.tar.xz) = c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a +SHA512 (SIGNATURES-3.6.8.txt) = 1f1eed9438efd47dc11ce7e2f69741bd1202f74ae43c324ce9b24eb2e38e614d0ac7d105118601507b726cc9f3ff5f9b38dbf6cd24bb2ead8b2026d43bf4671f diff --git a/wireshark.spec b/wireshark.spec index dd053e5..3d37710 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,8 +7,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 3.6.7 -Release: 2%{?dist} +Version: 3.6.8 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -274,6 +274,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Sep 29 2022 Michal Ruprich - 1:3.6.8-2 +- New version 3.6.8 +- Fix for CVE-2022-3190 + * Mon Aug 01 2022 Davide Cavalca - 1:3.6.7-2 - Drop gating for python3-devel dependency From 6e2ecf1b89e2b7f4c64e7635510b24f6765c6c2e Mon Sep 17 00:00:00 2001 From: kenneth topp Date: Thu, 6 Oct 2022 00:30:26 -0400 Subject: [PATCH 048/120] Update to 4.0.0 --- ...02-Customize-permission-denied-error.patch | 28 +++--- ...x-string-overrun-in-plugins-profinet.patch | 4 +- ...-0004-Restore-Fedora-specific-groups.patch | 8 +- ...ix-paths-in-a-wireshark.desktop-file.patch | 8 +- wireshark-0006-Move-tmp-to-var-tmp.patch | 96 ++++++++++--------- wireshark-0007-cmakelists.patch | 14 +-- wireshark.spec | 35 +++---- 7 files changed, 98 insertions(+), 95 deletions(-) diff --git a/wireshark-0002-Customize-permission-denied-error.patch b/wireshark-0002-Customize-permission-denied-error.patch index cad4663..0b07ae0 100644 --- a/wireshark-0002-Customize-permission-denied-error.patch +++ b/wireshark-0002-Customize-permission-denied-error.patch @@ -8,10 +8,10 @@ because of permissions. Signed-off-by: Jan Safranek diff --git a/capture/capture_sync.c b/capture/capture_sync.c -index 2f9d2cc..b18e47f 100644 +index 47a30a70c4..84d19568b0 100644 --- a/capture/capture_sync.c +++ b/capture/capture_sync.c -@@ -375,6 +375,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi +@@ -336,6 +336,7 @@ sync_pipe_start(capture_options *capture_opts, GPtrArray *capture_comments, gchar *signal_pipe_name; #else char errmsg[1024+1]; @@ -19,21 +19,20 @@ index 2f9d2cc..b18e47f 100644 int sync_pipe[2]; /* pipe used to send messages from child to parent */ enum PIPES { PIPE_READ, PIPE_WRITE }; /* Constants 0 and 1 for PIPE_READ and PIPE_WRITE */ #endif -@@ -728,8 +729,11 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi +@@ -741,8 +742,10 @@ sync_pipe_start(capture_options *capture_opts, GPtrArray *capture_comments, dup2(sync_pipe[PIPE_WRITE], 2); ws_close(sync_pipe[PIPE_READ]); execv(argv[0], argv); -- g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", +- snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", - argv[0], g_strerror(errno)); + if (errno == EPERM || errno == EACCES) -+ securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; -+ g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", -+ argv[0], g_strerror(errno), securitymsg); -+ ++ securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; ++ snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", ++ argv[0], g_strerror(errno), securitymsg); sync_pipe_errmsg_to_parent(2, errmsg, ""); /* Exit with "_exit()", so that we don't close the connection -@@ -826,6 +830,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd, +@@ -846,6 +849,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, int i; #else char errmsg[1024+1]; @@ -41,16 +40,15 @@ index 2f9d2cc..b18e47f 100644 int sync_pipe[2]; /* pipe used to send messages from child to parent */ int data_pipe[2]; /* pipe used to send data from child to parent */ #endif -@@ -1003,8 +1008,11 @@ sync_pipe_open_command(char** argv, int *data_read_fd, +@@ -994,8 +998,10 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, ws_close(sync_pipe[PIPE_READ]); ws_close(sync_pipe[PIPE_WRITE]); execv(argv[0], argv); -- g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", +- snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", - argv[0], g_strerror(errno)); -+ execv(argv[0], (gpointer)argv); -+ if (errno == EPERM || errno == EACCES) -+ securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; -+ g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", ++ if (errno == EPERM || errno == EACCES) ++ securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; ++ snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", + argv[0], g_strerror(errno), securitymsg); sync_pipe_errmsg_to_parent(2, errmsg, ""); diff --git a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch b/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch index 8277a8c..b71f99c 100644 --- a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch +++ b/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch @@ -4,10 +4,10 @@ Subject: [PATCH] fix string overrun in plugins/profinet diff --git a/plugins/epan/profinet/packet-dcom-cba.c b/plugins/epan/profinet/packet-dcom-cba.c -index 0f1658a..f7fd322 100644 +index 52c5017e1f..fb980269db 100644 --- a/plugins/epan/profinet/packet-dcom-cba.c +++ b/plugins/epan/profinet/packet-dcom-cba.c -@@ -555,7 +555,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst(tvbuff_t *tvb, int offset, +@@ -543,7 +543,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) { guint32 u32Pointer; diff --git a/wireshark-0004-Restore-Fedora-specific-groups.patch b/wireshark-0004-Restore-Fedora-specific-groups.patch index 4ec1140..53e62dc 100644 --- a/wireshark-0004-Restore-Fedora-specific-groups.patch +++ b/wireshark-0004-Restore-Fedora-specific-groups.patch @@ -3,10 +3,10 @@ Date: Fri, 13 Sep 2013 14:36:55 +0400 Subject: [PATCH] Restore Fedora-specific groups Signed-off-by: Peter Lemenkov -diff --git a/org.wireshark.Wireshark.desktop b/org.wireshark.Wireshark.desktop -index 334db48..669c6f1 100644 ---- a/org.wireshark.Wireshark.desktop -+++ b/org.wireshark.Wireshark.desktop +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: diff --git a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch b/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch index e2c5b99..325afe2 100644 --- a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch +++ b/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch @@ -3,10 +3,10 @@ Date: Wed, 29 Jan 2014 16:04:12 +0400 Subject: [PATCH] Fix paths in a org.wireshark.Wireshark.desktop file -diff --git a/org.wireshark.Wireshark.desktop b/org.wireshark.Wireshark.desktop -index 669c6f1..f7df1f3 100644 ---- a/org.wireshark.Wireshark.desktop -+++ b/org.wireshark.Wireshark.desktop +diff --git a/resources/freedesktop/org.wireshark.Wireshark.desktop b/resources/freedesktop/org.wireshark.Wireshark.desktop +index a880a50a33..54b3595d55 100644 +--- a/resources/freedesktop/org.wireshark.Wireshark.desktop ++++ b/resources/freedesktop/org.wireshark.Wireshark.desktop @@ -102,8 +102,8 @@ Comment[tr]=Ağ trafiği çözümleyicisi Comment[vi]=Trình phân tích giao thông mạng Comment[uk]=Аналізатор мережевого трафіку diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index 268cbaf..2c1ab0d 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -5,45 +5,45 @@ Subject: [PATCH] Move /tmp to /var/tmp Fedora is using tmpfs which is limited by the size of RAM, thus we need to use different directory on different filesystem. + --- ui/qt/about_dialog.cpp | 3 +- - ui/qt/iax2_analysis_dialog.cpp | 5 +-- - ui/qt/rtp_analysis_dialog.cpp | 5 +-- - ui/qt/rtp_audio_stream.cpp | 3 +- - wsutil/tempfile.c | 9 +++--- - wsutil/tempfile.h | 4 +-- - wsutil/wstmpdir.c | 70 ++++++++++++++++++++++++++++++++++++++++++ - wsutil/wstmpdir.h | 39 +++++++++++++++++++++++ - 8 files changed, 132 insertions(+), 11 deletions(-) + ui/qt/iax2_analysis_dialog.cpp | 5 ++- + ui/qt/utils/rtp_audio_file.cpp | 3 +- + wsutil/tempfile.c | 18 +++++++- + wsutil/tempfile.h | 2 +- + wsutil/wstmpdir.c | 71 ++++++++++++++++++++++++++++++++++ + wsutil/wstmpdir.h | 39 +++++++++++++++++++ + 7 files changed, 134 insertions(+), 7 deletions(-) create mode 100644 wsutil/wstmpdir.c create mode 100644 wsutil/wstmpdir.h diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp -index 31dc581..2f74285 100644 +index 752b669ac4..42c2be0fca 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp -@@ -26,6 +26,7 @@ +@@ -14,6 +14,7 @@ - #include "wireshark_application.h" + #include "main_application.h" #include +#include /* for get_tmp_dir() */ #include #include -@@ -206,7 +206,7 @@ FolderListModel::FolderListModel(QObject * parent): +@@ -185,7 +186,7 @@ FolderListModel::FolderListModel(QObject * parent): appendRow(QStringList() << tr("\"File\" dialogs") << get_last_open_dir() << tr("capture files")); /* temp */ -- appendRow(QStringList() << tr("Temp") << g_get_tmp_dir() << tr("untitled capture files")); -+ appendRow(QStringList() << tr("Temp") << get_tmp_dir() << tr("untitled capture files")); +- appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : g_get_tmp_dir()) << tr("untitled capture files")); ++ appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : get_tmp_dir()) << tr("untitled capture files")); /* pers conf */ appendRow(QStringList() << tr("Personal configuration") diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp -index ee4e5fd..fe17a95 100644 +index 07b9b42e01..fb09de989b 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp -@@ -37,6 +37,7 @@ +@@ -25,6 +25,7 @@ #include "ui/rtp_stream.h" #endif #include @@ -51,7 +51,7 @@ index ee4e5fd..fe17a95 100644 #include #include -@@ -271,10 +272,10 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) : +@@ -255,10 +256,10 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) : // We keep our temp files open for the lifetime of the dialog. The GTK+ // UI opens and closes at various points. @@ -65,7 +65,7 @@ index ee4e5fd..fe17a95 100644 rev_tempfile_->open(); diff --git a/ui/qt/utils/rtp_audio_file.cpp b/ui/qt/utils/rtp_audio_file.cpp -index 591a63b..203f5c5 100644 +index 591a63bbf3..203f5c5286 100644 --- a/ui/qt/utils/rtp_audio_file.cpp +++ b/ui/qt/utils/rtp_audio_file.cpp @@ -31,6 +31,7 @@ @@ -86,66 +86,67 @@ index 591a63b..203f5c5 100644 } else { sample_file_ = new QBuffer(this); diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c -index 5082452..f751a7c 100644 +index f93f96d538..73964a1def 100644 --- a/wsutil/tempfile.c +++ b/wsutil/tempfile.c -@@ -12,10 +12,12 @@ - - #include +@@ -14,10 +14,12 @@ + #include "tempfile.h" + #include "file_util.h" +#include +#include /* for get_tmp_dir() */ - + /** * Create a tempfile with the given prefix (e.g. "wireshark"). The path - * is created using g_file_open_tmp. + * is created using get_tmp_dir. * + * @param tempdir [in] If not NULL, the directory in which to create the file. * @param namebuf [in,out] If not NULL, receives the full path of the temp file. - * Must be freed. -@@ -30,6 +31,9 @@ create_tempfile(gchar **namebuf, const char *pfx, const char *sfx, GError **err) +@@ -33,6 +33,9 @@ create_tempfile(const char *tempdir, gchar **namebuf, const char *pfx, const cha { int fd; gchar *safe_pfx = NULL; + gchar *tmp_file; + const char *tmp_dir; + int old_mask; - + if (pfx) { /* The characters in "delimiters" come from: -@@ -49,7 +53,15 @@ create_tempfile(gchar **namebuf, const char *pfx, const char *sfx, GError **err) - gchar* filetmpl = g_strdup_printf("%sXXXXXX%s", safe_pfx ? safe_pfx : "", sfx ? sfx : ""); - g_free(safe_pfx); - -- fd = g_file_open_tmp(filetmpl, namebuf, err); -+ tmp_dir = get_tmp_dir(); -+ tmp_file = g_strconcat(tmp_dir, "/", filetmpl, NULL); +@@ -54,7 +57,16 @@ create_tempfile(const char *tempdir, gchar **namebuf, const char *pfx, const cha + gchar* filetmpl = ws_strdup_printf("%sXXXXXX%s", safe_pfx ? safe_pfx : "", sfx ? sfx : ""); + g_free(safe_pfx); + +- fd = g_file_open_tmp(filetmpl, namebuf, err); ++ tmp_dir = get_tmp_dir(); ++ tmp_file = g_strconcat(tmp_dir, "/", filetmpl, NULL); + -+ if (namebuf) -+ *namebuf = tmp_file; ++ if (namebuf) ++ *namebuf = tmp_file; + -+ old_mask = ws_umask(0077); -+ fd = mkstemps(tmp_file, sfx ? (int) strlen(sfx) : 0); -+ ws_umask(old_mask); - - g_free(filetmpl); - return fd; ++ old_mask = ws_umask(0077); ++ fd = mkstemps(tmp_file, sfx ? (int) strlen(sfx) : 0); ++ ws_umask(old_mask); ++ + g_free(filetmpl); + } + else { diff --git a/wsutil/tempfile.h b/wsutil/tempfile.h -index 1dca2df..bb3160c 100644 +index 70031b5419..72011e265a 100644 --- a/wsutil/tempfile.h +++ b/wsutil/tempfile.h -@@ -45,7 +45,7 @@ WS_DLL_PUBLIC char *get_tempfile_path(const char *filename); +@@ -23,7 +23,7 @@ extern "C" { /** * Create a tempfile with the given prefix (e.g. "wireshark"). The path - * is created using g_file_open_tmp. + * is created using get_tmp_dir and mkstemp. * + * @param tempdir [in] If not NULL, the directory in which to create the file. * @param namebuf [in,out] If not NULL, receives the full path of the temp file. - * Must be freed. diff --git a/wsutil/wstmpdir.c b/wsutil/wstmpdir.c new file mode 100644 -index 0000000..d8b733b +index 0000000000..9128d354ce --- /dev/null +++ b/wsutil/wstmpdir.c @@ -0,0 +1,71 @@ @@ -222,7 +223,7 @@ index 0000000..d8b733b +} diff --git a/wsutil/wstmpdir.h b/wsutil/wstmpdir.h new file mode 100644 -index 0000000..07ac583 +index 0000000000..07ac5837ac --- /dev/null +++ b/wsutil/wstmpdir.h @@ -0,0 +1,39 @@ @@ -266,4 +267,5 @@ index 0000000..07ac583 + +#endif -- -2.13.0 +2.37.3 + diff --git a/wireshark-0007-cmakelists.patch b/wireshark-0007-cmakelists.patch index 0d75fc3..b794372 100644 --- a/wireshark-0007-cmakelists.patch +++ b/wireshark-0007-cmakelists.patch @@ -1,20 +1,20 @@ diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt -index 0367cd1..6382a2c 100644 +index a55086c..0149801 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt -@@ -69,6 +69,7 @@ set(WSUTIL_PUBLIC_HEADERS - ws_mempbrk_int.h - ws_pipe.h +@@ -80,6 +80,7 @@ set(WSUTIL_PUBLIC_HEADERS ws_roundup.h + ws_return.h + wsgcrypt.h + wstmpdir.h wsjson.h wslog.h xtea.h -@@ -118,6 +118,7 @@ set(WSUTIL_COMMON_FILES - ws_getopt.c +@@ -135,6 +136,7 @@ set(WSUTIL_COMMON_FILES ws_mempbrk.c ws_pipe.c -+ wstmpdir.c wsgcrypt.c ++ wstmpdir.c wsjson.c wslog.c + xtea.c diff --git a/wireshark.spec b/wireshark.spec index 3d37710..6ca9275 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,13 +1,11 @@ %undefine __cmake_in_source_build %global with_lua 1 %global with_maxminddb 1 -%global plugins_version 3.6 -# added temporarily due to errors in libqt5core -%define _lto_cflags %{nil} +%global plugins_version 4.0 Summary: Network traffic analyzer Name: wireshark -Version: 3.6.8 +Version: 4.0.0 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -27,8 +25,8 @@ 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 -Patch7: wireshark-0007-cmakelists.patch +#Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch +#Patch7: wireshark-0007-cmakelists.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -58,15 +56,17 @@ BuildRequires: desktop-file-utils BuildRequires: xdg-utils BuildRequires: bison BuildRequires: flex -BuildRequires: pcre-devel BuildRequires: perl(Pod::Html) BuildRequires: perl(Pod::Man) BuildRequires: perl(open) +BuildRequires: pcre2-devel Buildrequires: libssh-devel -BuildRequires: qt5-linguist -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtmultimedia-devel -BuildRequires: qt5-qtsvg-devel +BuildRequires: qt6-qttools-devel +BuildRequires: qt6-linguist +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qt5compat-devel +BuildRequires: qt6-qtmultimedia-devel +BuildRequires: qt6-qtsvg-devel BuildRequires: zlib-devel BuildRequires: asciidoctor %if %{with_maxminddb} && 0%{?fedora} @@ -83,7 +83,6 @@ BuildRequires: systemd-devel BuildRequires: libnghttp2-devel BuildRequires: systemd-rpm-macros -Obsoletes: wireshark-qt, wireshark-gtk %description Wireshark allows you to examine protocol data stored in files or as it is @@ -124,6 +123,7 @@ and plugins. -DBUILD_wireshark=ON \ %if %{with_lua} && 0%{?fedora} -DENABLE_LUA=ON \ + -DLUA_VERSION_NUM=5.1 \ %else -DENABLE_LUA=OFF \ %endif @@ -135,11 +135,11 @@ and plugins. -DBUILD_randpktdump=OFF \ -DBUILD_androiddump=ON \ -DENABLE_SMI=ON \ + -DUSE_qt6=ON \ -DENABLE_PLUGINS=ON \ -DENABLE_NETLINK=ON \ -DBUILD_dcerpcidl2wrs=OFF \ - -DBUILD_sdjournal=ON \ - %{nil} + -DBUILD_sdjournal=ON %cmake_build @@ -162,7 +162,6 @@ mkdir -p "${IDIR}/wsutil" mkdir -p %{buildroot}%{_udevrulesdir} install -m 644 %{_vpath_builddir}/config.h epan/register.h "${IDIR}/" install -m 644 cfile.h file.h "${IDIR}/" -install -m 644 ws_symbol_export.h "${IDIR}/" install -m 644 epan/*.h "${IDIR}/epan/" install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt" install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes" @@ -170,7 +169,6 @@ install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wsutil/*.h "${IDIR}/wsutil" -install -m 644 ws_diag_control.h "${IDIR}/" install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir} install -Dpm 644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf @@ -226,6 +224,7 @@ fi %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 @@ -253,6 +252,7 @@ fi %{_mandir}/man1/reordercap.* %{_mandir}/man1/sshdump.* %{_mandir}/man1/udpdump.* +%{_mandir}/man1/wifidump.* %{_mandir}/man1/androiddump.* %{_mandir}/man1/captype.* %{_mandir}/man1/ciscodump.* @@ -274,6 +274,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Oct 06 2022 Kenneth Topp - 1:4.0.0-1 +- New version 4.0.0 + * Thu Sep 29 2022 Michal Ruprich - 1:3.6.8-2 - New version 3.6.8 - Fix for CVE-2022-3190 From 2cfc0a31f8876fbdfa057d9c94ac482f5ceab529 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 13 Oct 2022 07:48:42 +0200 Subject: [PATCH 049/120] Adding new sources for version 4.0.0 --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f35e147..44c0244 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-3.6.8.tar.xz) = c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a -SHA512 (SIGNATURES-3.6.8.txt) = 1f1eed9438efd47dc11ce7e2f69741bd1202f74ae43c324ce9b24eb2e38e614d0ac7d105118601507b726cc9f3ff5f9b38dbf6cd24bb2ead8b2026d43bf4671f +SHA512 (wireshark-4.0.0.tar.xz) = d16b67bacca479af419f47e000800bbc33098a00cdb56c789e6c0f354fbd4f13c3d25c496239a8836c4e5754af2e36d4baf5e8ae55eae71f80c93630b78128bc +SHA512 (SIGNATURES-4.0.0.txt) = a4f82ecdc126add673a0f613ddc244b048cdf3060738a650270a606d31f7d7636cdedefe3ddc32e29b2d619f8ff8a26c96e16873ff20b3c0a984cb873a5e5227 From 81fb795b6469c91ff8567c6d04304eda3f383cbb Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 14 Oct 2022 15:21:34 +0200 Subject: [PATCH 050/120] Adding a couple of tweaks for the latest rebased version --- wireshark.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 6ca9275..56b7509 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -25,8 +25,8 @@ 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 -#Patch7: wireshark-0007-cmakelists.patch +Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch +Patch7: wireshark-0007-cmakelists.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -72,7 +72,7 @@ BuildRequires: asciidoctor %if %{with_maxminddb} && 0%{?fedora} BuildRequires: libmaxminddb-devel %endif -%if %{with_lua} && 0%{?fedora} +%if %{with_lua} BuildRequires: compat-lua-devel %endif Buildrequires: git-core @@ -121,7 +121,7 @@ and plugins. %cmake -G "Unix Makefiles" \ -DDISABLE_WERROR=ON \ -DBUILD_wireshark=ON \ -%if %{with_lua} && 0%{?fedora} +%if %{with_lua} -DENABLE_LUA=ON \ -DLUA_VERSION_NUM=5.1 \ %else @@ -169,6 +169,8 @@ install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wsutil/*.h "${IDIR}/wsutil" +install -m 644 include/ws_symbol_export.h "${IDIR}/" +install -m 644 include/ws_diag_control.h "${IDIR}/" install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir} install -Dpm 644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf @@ -274,6 +276,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Oct 14 2022 Michal Ruprich - 1:4.0.0-2 +- Adding a couple of tweaks for the latest rebased version + * Thu Oct 06 2022 Kenneth Topp - 1:4.0.0-1 - New version 4.0.0 From 0d054c10eb8e917ed88128ceba5fb8864dfcbb08 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 27 Oct 2022 11:12:48 +0200 Subject: [PATCH 051/120] New version 4.0.1 Only compat-lua is supported, on Fedora only --- sources | 4 ++-- wireshark.spec | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 44c0244..1ffdbff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.0.0.tar.xz) = d16b67bacca479af419f47e000800bbc33098a00cdb56c789e6c0f354fbd4f13c3d25c496239a8836c4e5754af2e36d4baf5e8ae55eae71f80c93630b78128bc -SHA512 (SIGNATURES-4.0.0.txt) = a4f82ecdc126add673a0f613ddc244b048cdf3060738a650270a606d31f7d7636cdedefe3ddc32e29b2d619f8ff8a26c96e16873ff20b3c0a984cb873a5e5227 +SHA512 (wireshark-4.0.1.tar.xz) = 10ac8e738b4bd70ba4a1a9124e8c8e6238feb7c5a4cef79a03dae6adef08230700bb8ba700d2f89a5aad28cabdaf06b8825a1124d9d466de4e2e10cc55968525 +SHA512 (SIGNATURES-4.0.1.txt) = 46376e8d77a368317f484d3fc156eb0b6c544c5c18c83bdc40d182d28b068438c5bee8241c3c7e2c073a33058509be83574a5fc03ceaaa56c461b7d431e3f2a0 diff --git a/wireshark.spec b/wireshark.spec index 56b7509..adf2367 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.0.0 -Release: 2%{?dist} +Version: 4.0.1 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -72,7 +72,7 @@ BuildRequires: asciidoctor %if %{with_maxminddb} && 0%{?fedora} BuildRequires: libmaxminddb-devel %endif -%if %{with_lua} +%if %{with_lua} && 0%{fedora} BuildRequires: compat-lua-devel %endif Buildrequires: git-core @@ -121,9 +121,8 @@ and plugins. %cmake -G "Unix Makefiles" \ -DDISABLE_WERROR=ON \ -DBUILD_wireshark=ON \ -%if %{with_lua} +%if %{with_lua} && 0%{?fedora} -DENABLE_LUA=ON \ - -DLUA_VERSION_NUM=5.1 \ %else -DENABLE_LUA=OFF \ %endif @@ -276,6 +275,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Oct 27 2022 Michal Ruprich - 1:4.0.1-1 +- New version 4.0.1 +- Only compat-lua is supported, on Fedora only + * Fri Oct 14 2022 Michal Ruprich - 1:4.0.0-2 - Adding a couple of tweaks for the latest rebased version From 389e6ca1e3b8821df4772e2a1c7afacf374dca05 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 28 Oct 2022 07:15:47 -0700 Subject: [PATCH 052/120] Fix conditional --- wireshark.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index adf2367..008fda6 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -72,7 +72,7 @@ BuildRequires: asciidoctor %if %{with_maxminddb} && 0%{?fedora} BuildRequires: libmaxminddb-devel %endif -%if %{with_lua} && 0%{fedora} +%if %{with_lua} && 0%{?fedora} BuildRequires: compat-lua-devel %endif Buildrequires: git-core From 1ff990e05194d5a8ce162f3db3eeba5c47f1075a Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 25 Nov 2022 17:17:20 +0100 Subject: [PATCH 053/120] Moving sysusers to -cli subpackage --- wireshark.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 008fda6..01da30b 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -199,7 +199,6 @@ fi %{_datadir}/icons/hicolor/*/mimetypes/* %{_bindir}/wireshark %{_mandir}/man1/wireshark.* -%{_sysusersdir}/%{name}.conf %files cli %license COPYING @@ -267,6 +266,7 @@ fi %endif %dir %{_datadir}/wireshark %{_datadir}/wireshark/* +%{_sysusersdir}/%{name}.conf %files devel %doc doc/README.* ChangeLog From 71af06e491f8edafdf291da43569ecae8ab7a5bd Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 8 Dec 2022 10:43:43 +0100 Subject: [PATCH 054/120] New version 4.0.2 --- sources | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 1ffdbff..5f931ad 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.0.1.tar.xz) = 10ac8e738b4bd70ba4a1a9124e8c8e6238feb7c5a4cef79a03dae6adef08230700bb8ba700d2f89a5aad28cabdaf06b8825a1124d9d466de4e2e10cc55968525 -SHA512 (SIGNATURES-4.0.1.txt) = 46376e8d77a368317f484d3fc156eb0b6c544c5c18c83bdc40d182d28b068438c5bee8241c3c7e2c073a33058509be83574a5fc03ceaaa56c461b7d431e3f2a0 +SHA512 (wireshark-4.0.2.tar.xz) = 0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5 +SHA512 (SIGNATURES-4.0.2.txt) = 6693a961fe532121b84fa1d6548367a9fdd1ca43d58ad39a988753dc76dbb3c50299f476b4a5bb594b75d809f7d759135d64241d96bd1e49e263c3e837a6c1ee diff --git a/wireshark.spec b/wireshark.spec index 01da30b..8b4ffcf 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.0.1 +Version: 4.0.2 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -275,6 +275,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Dec 08 2022 Michal Ruprich - 1:4.0.2-1 +- New version 4.0.2 + * Thu Oct 27 2022 Michal Ruprich - 1:4.0.1-1 - New version 4.0.1 - Only compat-lua is supported, on Fedora only From 753eeb74cac31a4aab828bd0c306e8ec3c00b38d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:52:34 +0000 Subject: [PATCH 055/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 8b4ffcf..93d9a76 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -275,6 +275,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1:4.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 08 2022 Michal Ruprich - 1:4.0.2-1 - New version 4.0.2 From 76e69798e9a84a61fc386a67e3e7b7a4622c8038 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 2 Feb 2023 14:53:24 +0100 Subject: [PATCH 056/120] New version 4.0.3 --- rpminspect.yaml | 8 ++++++++ sources | 4 ++-- wireshark.spec | 7 +++++-- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 rpminspect.yaml diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..c1c92dc --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,8 @@ +--- +ownership: + #dumpcap is the only binary that has group wireshark + ignore: + - /usr/bin/dumpcap + +inspections: + xml: off diff --git a/sources b/sources index 5f931ad..c667207 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.0.2.tar.xz) = 0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5 -SHA512 (SIGNATURES-4.0.2.txt) = 6693a961fe532121b84fa1d6548367a9fdd1ca43d58ad39a988753dc76dbb3c50299f476b4a5bb594b75d809f7d759135d64241d96bd1e49e263c3e837a6c1ee +SHA512 (wireshark-4.0.3.tar.xz) = ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c +SHA512 (SIGNATURES-4.0.3.txt) = ab8abcadb076635897aa5db75ccebf916796a90cd46fb0fe1713e2e44ed525d25b1152831e70996d728e690fc21e9eb6b0bdf7080111401377ed62774f650d41 diff --git a/wireshark.spec b/wireshark.spec index 93d9a76..9f89cf3 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.0.2 -Release: 2%{?dist} +Version: 4.0.3 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -275,6 +275,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Feb 02 2023 Michal Ruprich - 1:4.0.3-1 +- New version 4.0.3 + * Sat Jan 21 2023 Fedora Release Engineering - 1:4.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 079bb7a40c905e13210d547ea49504a31a82e02f Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 14 Feb 2023 10:07:30 +0100 Subject: [PATCH 057/120] Adding Requires in -devel package for libwireshark.so --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 9f89cf3..d02c087 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -106,7 +106,10 @@ Wireshark. %package devel Summary: Development headers and libraries for wireshark -Requires: %{name} = %{epoch}:%{version}-%{release} glibc-devel glib2-devel +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-cli = %{epoch}:%{version}-%{release} +Requires: glibc-devel +Requires: glib2-devel %description devel The wireshark-devel package contains the header files, developer From bb46d550471760a5ba80407615a83af54b7bbbcd Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 7 Mar 2023 10:26:22 +0100 Subject: [PATCH 058/120] New version 4.0.4 --- sources | 4 ++-- wireshark-0008-glib2-g_strdup-build.patch | 13 +++++++++++++ wireshark.spec | 6 +++++- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 wireshark-0008-glib2-g_strdup-build.patch diff --git a/sources b/sources index c667207..9603f87 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.0.3.tar.xz) = ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c -SHA512 (SIGNATURES-4.0.3.txt) = ab8abcadb076635897aa5db75ccebf916796a90cd46fb0fe1713e2e44ed525d25b1152831e70996d728e690fc21e9eb6b0bdf7080111401377ed62774f650d41 +SHA512 (wireshark-4.0.4.tar.xz) = e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff +SHA512 (SIGNATURES-4.0.4.txt) = 9c24a1b4c8ceb16fbb46fed03db21860efbb9a4adf5152679599190f42f64c84023375dd59ff4951d1c1a07694be941cddf6acccb7136731b1aaa00f9246459b diff --git a/wireshark-0008-glib2-g_strdup-build.patch b/wireshark-0008-glib2-g_strdup-build.patch new file mode 100644 index 0000000..6c4f931 --- /dev/null +++ b/wireshark-0008-glib2-g_strdup-build.patch @@ -0,0 +1,13 @@ +diff --git a/ui/qt/wireshark_main_window_slots.cpp b/ui/qt/wireshark_main_window_slots.cpp +index 0594ff6..3068797 100644 +--- a/ui/qt/wireshark_main_window_slots.cpp ++++ b/ui/qt/wireshark_main_window_slots.cpp +@@ -2513,7 +2513,7 @@ void WiresharkMainWindow::showHideMainWidgets(QAction *action) + if (widget == toolbar) { + GList *entry = g_list_find_custom(recent.interface_toolbars, action->text().toUtf8(), (GCompareFunc)strcmp); + if (show && !entry) { +- recent.interface_toolbars = g_list_append(recent.interface_toolbars, g_strdup(action->text().toUtf8())); ++ recent.interface_toolbars = g_list_append(recent.interface_toolbars, g_strdup(action->text().toUtf8().constData())); + } else if (!show && entry) { + recent.interface_toolbars = g_list_remove(recent.interface_toolbars, entry->data); + } diff --git a/wireshark.spec b/wireshark.spec index d02c087..68b2b17 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Epoch: 1 License: GPL+ @@ -27,6 +27,7 @@ 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-glib2-g_strdup-build.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -278,6 +279,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Mar 07 2023 Michal Ruprich - 1:4.0.4-1 +- New version 4.0.4 + * Thu Feb 02 2023 Michal Ruprich - 1:4.0.3-1 - New version 4.0.3 From d8a7e7ffb2e159d918baf5a9c4a65793debc504b Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 22 Mar 2023 11:44:20 +0100 Subject: [PATCH 059/120] SPDX migration --- wireshark.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 68b2b17..abe7311 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,9 +6,9 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 -License: GPL+ +License: BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND MIT AND GPL-2.0-or-later AND LGPL-2.0-or-later AND Zlib AND ISC AND (BSD-3-Clause OR GPL-2.0-only) AND (GPL-2.0-or-later AND Zlib) Url: http://www.wireshark.org/ Source0: https://wireshark.org/download/src/%{name}-%{version}.tar.xz @@ -279,6 +279,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Mar 22 2023 Michal Ruprich - 1:4.0.4-2 +- SPDX migration + * Tue Mar 07 2023 Michal Ruprich - 1:4.0.4-1 - New version 4.0.4 From 3c541c0ee186366167a79572a225a72de569e8ef Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 9 Mar 2023 00:19:30 -0500 Subject: [PATCH 060/120] Drop unneeded systemd Requires(post) --- wireshark.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index abe7311..a369198 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -99,7 +99,6 @@ transferred over HTTP or CIFS, or play back an RTP audio stream. %package cli Summary: Network traffic analyzer Requires(pre): shadow-utils -Requires(post): systemd-udev %description cli This package contains command-line utilities, plugins, and documentation for From 9c0159e57b2982a023eac5a9160ce64325662d36 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 9 Mar 2023 00:19:30 -0500 Subject: [PATCH 061/120] Fix flatpak build --- wireshark.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index a369198..8e00301 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -262,7 +262,7 @@ fi %{_mandir}/man1/randpktdump.* %{_mandir}/man1/dpauxmon.* %{_mandir}/man1/sdjournal.* -%{_mandir}/man1/etwdump.1.gz +%{_mandir}/man1/etwdump.* %{_mandir}/man4/extcap.* %if %{with_maxminddb} && 0%{?fedora} %{_mandir}/man1/mmdbresolve.* From 2a86f75a7e67a08166e9c4d1cddf9a87d0e608af Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 13 Apr 2023 08:25:58 +0200 Subject: [PATCH 062/120] New version 4.0.5 --- sources | 4 ++-- wireshark.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 9603f87..794f6dd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.0.4.tar.xz) = e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff -SHA512 (SIGNATURES-4.0.4.txt) = 9c24a1b4c8ceb16fbb46fed03db21860efbb9a4adf5152679599190f42f64c84023375dd59ff4951d1c1a07694be941cddf6acccb7136731b1aaa00f9246459b +SHA512 (wireshark-4.0.5.tar.xz) = fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9 +SHA512 (SIGNATURES-4.0.5.txt) = c8bc9bd91aab5ab7ff163fc5aa6c341e190efd918c0eafa62b015eb290687b3b1b92c51208f127d46bff4100a1c5212a2bf3577146eece3fa9d8d3c473b979e6 diff --git a/wireshark.spec b/wireshark.spec index 8e00301..1d2a4fe 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.0.4 -Release: 2%{?dist} +Version: 4.0.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) Url: http://www.wireshark.org/ @@ -278,6 +278,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Apr 13 2023 Michal Ruprich - 1:4.0.5-1 +- New version 4.0.5 +- Fix for bug #2159392 + * Wed Mar 22 2023 Michal Ruprich - 1:4.0.4-2 - SPDX migration From 99027dbe741abb2e1e056f3999cfd54070dd7343 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 25 May 2023 11:43:39 +0200 Subject: [PATCH 063/120] New version 4.0.6 --- sources | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 794f6dd..1b7e085 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.0.5.tar.xz) = fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9 -SHA512 (SIGNATURES-4.0.5.txt) = c8bc9bd91aab5ab7ff163fc5aa6c341e190efd918c0eafa62b015eb290687b3b1b92c51208f127d46bff4100a1c5212a2bf3577146eece3fa9d8d3c473b979e6 +SHA512 (wireshark-4.0.6.tar.xz) = 651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b +SHA512 (SIGNATURES-4.0.6.txt) = 401731292f806eca678a6d1a20097a4657637dc49bfe4551dc79baa652da187d04acf73e3591d842b65ee2ce8fcd37ccd89abb6bc226b317e8559f9bc837e042 diff --git a/wireshark.spec b/wireshark.spec index 1d2a4fe..a2bd064 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.0.5 +Version: 4.0.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) @@ -278,6 +278,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu May 25 2023 Michal Ruprich - 1:4.0.6-1 +- New version 4.0.6 + * Thu Apr 13 2023 Michal Ruprich - 1:4.0.5-1 - New version 4.0.5 - Fix for bug #2159392 From cd554497c9ebed93283a8f95dd2dad75f01a943f Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 14 Jul 2023 13:27:58 +0200 Subject: [PATCH 064/120] New version 4.0.7 --- sources | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 1b7e085..4bd6d69 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.0.6.tar.xz) = 651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b -SHA512 (SIGNATURES-4.0.6.txt) = 401731292f806eca678a6d1a20097a4657637dc49bfe4551dc79baa652da187d04acf73e3591d842b65ee2ce8fcd37ccd89abb6bc226b317e8559f9bc837e042 +SHA512 (wireshark-4.0.7.tar.xz) = 98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab +SHA512 (SIGNATURES-4.0.7.txt) = 4c89bffd394df2ffbd9050ff22ef1672a72d4b2c496b4790569acf7a14e29638533b51b272e73b59c31ebf6e63d34954c3482c76b30ba1cb2c82fee3780e19f2 diff --git a/wireshark.spec b/wireshark.spec index a2bd064..71af95f 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.0.6 +Version: 4.0.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) @@ -278,6 +278,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 14 2023 Michal Ruprich - 1:4.0.7-1 +- New version 4.0.7 + * Thu May 25 2023 Michal Ruprich - 1:4.0.6-1 - New version 4.0.6 From cb4bfa04b654b10a34d223b7948758ef5b97b2b4 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Mon, 17 Jul 2023 17:17:04 +0200 Subject: [PATCH 065/120] Fixing a build error with asn2wrs --- wireshark-0009-fix-asn2wrs-cmake.patch | 213 +++++++++++++++++++++++++ wireshark.spec | 1 + 2 files changed, 214 insertions(+) create mode 100644 wireshark-0009-fix-asn2wrs-cmake.patch diff --git a/wireshark-0009-fix-asn2wrs-cmake.patch b/wireshark-0009-fix-asn2wrs-cmake.patch new file mode 100644 index 0000000..fc1d7bc --- /dev/null +++ b/wireshark-0009-fix-asn2wrs-cmake.patch @@ -0,0 +1,213 @@ +From 601bf39e6b2eaff9e77588ff1b1a8a987dad404d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= +Date: Fri, 26 May 2023 14:16:06 +0100 +Subject: [PATCH] CMake: Remove module LocatePythonModule.cmake + +This module is unnecessary and frequently causes hard-to-debug +issues during CMake's configure run. Nuke it. +--- + cmake/modules/LocatePythonModule.cmake | 53 -------------------------- + cmake/modules/UseAsn2Wrs.cmake | 13 ++----- + cmake/modules/UseMakePluginReg.cmake | 7 +--- + 3 files changed, 6 insertions(+), 67 deletions(-) + delete mode 100644 cmake/modules/LocatePythonModule.cmake + +diff --git a/cmake/modules/LocatePythonModule.cmake b/cmake/modules/LocatePythonModule.cmake +deleted file mode 100644 +index 3fbe0c7..0000000 +--- a/cmake/modules/LocatePythonModule.cmake ++++ /dev/null +@@ -1,53 +0,0 @@ +-#LOCATE_PYTHON_MODULE( [PATHS ... ] [REQUIRED]) +-# +-# This function tries to find the given python module. +-# If found the path is provided in and <_FOUND> is set to TRUE. +-# +-# After PATHS additional paths for python to search can be provided. +-# When REQUIRED is set, the function will abort the cmake execution is the module is not found +-function(LOCATE_PYTHON_MODULE module) +- if(NOT PYTHON_EXECUTABLE) +- find_package(PythonInterp) +- endif() +- +- # Parse (additional) arguments +- set(options REQUIRED) +- set(multiValueArgs PATHS) +- cmake_parse_arguments(LPM "${options}" "" "${multiValueArgs}" ${ARGN}) +- +- string(TOUPPER ${module} module_upper) +- if(NOT PY_${module_upper}) +- +- if(LPM_PATHS) +- # Append LPM_PATHS to PYTHONPATH to search at provided location (first) +- file(TO_CMAKE_PATH "$ENV{PYTHONPATH}" CMAKE_PATH) +- list(INSERT CMAKE_PATH 0 ${LPM_PATHS}) +- file(TO_NATIVE_PATH "${CMAKE_PATH}" NATIVE_PATH) +- if(UNIX) +- string(REPLACE ";" ":" NATIVE_PATH "${NATIVE_PATH}") +- endif(UNIX) +- set(ENV{PYTHONPATH} "${NATIVE_PATH}") +- endif(LPM_PATHS) +- +- # Use the (native) python impl module to find the location of the requested module +- execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" +- "import imp; print(imp.find_module('${module}')[1])" +- RESULT_VARIABLE _${module}_status +- OUTPUT_VARIABLE _${module}_location +- ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) +- +- if(NOT _${module}_status) +- set(PY_${module_upper} ${_${module}_location} CACHE STRING +- "Location of Python module ${module}") +- set(${module_upper}_FOUND TRUE) +- message(STATUS "Found python module ${module}: ${PY_${module_upper}}") +- else(NOT _${module}_status) +- set(${module_upper}_FOUND FALSE) +- if(LPM_REQUIRED) +- message(FATAL_ERROR "Could NOT find python module ${module}") +- else(LPM_REQUIRED) +- message(STATUS "Could NOT find python module ${module}") +- endif(LPM_REQUIRED) +- endif(NOT _${module}_status) +- endif(NOT PY_${module_upper}) +-endfunction(LOCATE_PYTHON_MODULE) +diff --git a/cmake/modules/UseMakePluginReg.cmake b/cmake/modules/UseMakePluginReg.cmake +index e6e6a91..fe57381 100644 +--- a/cmake/modules/UseMakePluginReg.cmake ++++ b/cmake/modules/UseMakePluginReg.cmake +@@ -1,20 +1,17 @@ + # + function(register_plugin_files _outputfile _registertype) +- include(LocatePythonModule) +- locate_python_module(make-plugin-reg REQUIRED PATHS ${CMAKE_SOURCE_DIR}/tools) +- + file(RELATIVE_PATH output "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/${_outputfile}") + add_custom_command( + OUTPUT + ${_outputfile} + COMMAND ${PYTHON_EXECUTABLE} +- ${PY_MAKE-PLUGIN-REG} ++ ${CMAKE_SOURCE_DIR}/tools/make-plugin-reg.py + ${CMAKE_CURRENT_SOURCE_DIR} + ${_registertype} + ${ARGN} + COMMENT "Generating ${output}" + DEPENDS + ${ARGN} +- ${PY_MAKE-PLUGIN-REG} ++ ${CMAKE_SOURCE_DIR}/tools/make-plugin-reg.py + ) + endfunction() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6db2e46..21e71e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3825,7 +3825,6 @@ install( + ${WS_CMAKE_MODULE_PATH}/FindWSLibrary.cmake + ${WS_CMAKE_MODULE_PATH}/FindWSWinLibs.cmake + ${WS_CMAKE_MODULE_PATH}/UseAsn2Wrs.cmake +- ${WS_CMAKE_MODULE_PATH}/LocatePythonModule.cmake + ${WS_CMAKE_MODULE_PATH}/UseMakePluginReg.cmake + DESTINATION + ${WIRESHARK_INSTALL_CMAKEDIR} +diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake +index 67cbc8d..929a4eb 100644 +--- a/cmake/modules/FindAsciidoctor.cmake ++++ b/cmake/modules/FindAsciidoctor.cmake +@@ -124,7 +124,7 @@ if(ASCIIDOCTOR_EXECUTABLE) + ADD_CUSTOM_COMMAND( + OUTPUT + ${_output_txt} +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/html2text.py ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/html2text.py + ${_output_html} + > ${_output_txt} + DEPENDS +diff --git a/cmake/modules/UseMakePluginReg.cmake b/cmake/modules/UseMakePluginReg.cmake +index fe57381..0c7198d 100644 +--- a/cmake/modules/UseMakePluginReg.cmake ++++ b/cmake/modules/UseMakePluginReg.cmake +@@ -4,7 +4,7 @@ function(register_plugin_files _outputfile _registertype) + add_custom_command( + OUTPUT + ${_outputfile} +- COMMAND ${PYTHON_EXECUTABLE} ++ COMMAND ${Python3_EXECUTABLE} + ${CMAKE_SOURCE_DIR}/tools/make-plugin-reg.py + ${CMAKE_CURRENT_SOURCE_DIR} + ${_registertype} +diff --git a/cmake/modules/UseMakeTaps.cmake b/cmake/modules/UseMakeTaps.cmake +index aed9318..56fd628 100644 +--- a/cmake/modules/UseMakeTaps.cmake ++++ b/cmake/modules/UseMakeTaps.cmake +@@ -5,7 +5,7 @@ MACRO(REGISTER_TAP_FILES _outputfile) + OUTPUT + ${_outputfile} + COMMAND +- ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/make-regs.py taps ${_outputfile} ${_sources} ++ ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/make-regs.py taps ${_outputfile} ${_sources} + DEPENDS + ${CMAKE_SOURCE_DIR}/tools/make-regs.py + ${_sources} +diff --git a/cmake/modules/UseAsn2Wrs.cmake b/cmake/modules/UseAsn2Wrs.cmake +index 9d7cdfe..6b0c46c 100644 +--- a/cmake/modules/UseAsn2Wrs.cmake ++++ b/cmake/modules/UseAsn2Wrs.cmake +@@ -6,11 +6,6 @@ + # absolute path (e.g. "${CMAKE_CURRENT_SOURCE_DIR}"). + + function(ASN2WRS) +- if(NOT PY_ASN2WRS) +- include(LocatePythonModule) +- locate_python_module(asn2wrs REQUIRED PATHS "${CMAKE_SOURCE_DIR}/tools") +- endif() +- + if(NOT PROTO_OPT) + set(PROTO_OPT -p ${PROTOCOL_NAME}) + elseif(PROTO_OPT STREQUAL "_EMPTY_") +@@ -38,8 +33,8 @@ function(ASN2WRS) + # Creates a dissector in the source directory and store the timestamp. + add_custom_command( + OUTPUT packet-${PROTOCOL_NAME}-stamp +- COMMAND "${PYTHON_EXECUTABLE}" +- ${PY_ASN2WRS} ++ COMMAND "${Python3_EXECUTABLE}" ++ ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py + ${A2W_FLAGS} + ${PROTO_OPT} + -c "${CMAKE_CURRENT_SOURCE_DIR}/${PROTOCOL_NAME}.cnf" +@@ -48,12 +43,12 @@ function(ASN2WRS) + -O "${A2W_OUTPUT_DIR}" + ${EXT_ASN_FILE_LIST} ${ASN_FILE_LIST} ${EXT_ASN_FILE_LIST_LATE} + COMMAND +- "${PYTHON_EXECUTABLE}" -c ++ "${Python3_EXECUTABLE}" -c + "import shutil, sys; x,s,d=sys.argv; open(d, 'w'); shutil.copystat(s, d)" + "${A2W_OUTPUT_DIR}/packet-${PROTOCOL_NAME}.c" + packet-${PROTOCOL_NAME}-stamp + DEPENDS +- "${PY_ASN2WRS}" ++ ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py + ${SRC_FILES} + ${EXTRA_CNF_targets} + ${EXTRA_CNF} +@@ -67,8 +62,8 @@ function(ASN2WRS) + foreach(_asn2wrs_export_file IN LISTS EXPORT_FILES) + add_custom_command( + OUTPUT ${_asn2wrs_export_file} +- COMMAND "${PYTHON_EXECUTABLE}" +- "${PY_ASN2WRS}" ++ COMMAND "${Python3_EXECUTABLE}" ++ ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py + -E + ${A2W_FLAGS} + ${PROTO_OPT} +@@ -76,7 +71,7 @@ function(ASN2WRS) + -D "${CMAKE_CURRENT_SOURCE_DIR}" + ${EXT_ASN_FILE_LIST} ${ASN_FILE_LIST} ${EXT_ASN_FILE_LIST_LATE} + DEPENDS +- "${PY_ASN2WRS}" ++ ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py + ${SRC_FILES} + ${EXPORT_DEPENDS_targets} + ${EXPORT_DEPENDS} diff --git a/wireshark.spec b/wireshark.spec index 71af95f..1438a27 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -28,6 +28,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-glib2-g_strdup-build.patch +Patch9: wireshark-0009-fix-asn2wrs-cmake.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} From bd2c02866c4a6ec6b58c5a6ebe28db5bff54bdf8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:15:38 +0000 Subject: [PATCH 066/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 1438a27..2f29538 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.0.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/ @@ -279,6 +279,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1:4.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jul 14 2023 Michal Ruprich - 1:4.0.7-1 - New version 4.0.7 From 936697e45ca1249261908d5fb0b569032d3c5e13 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 28 Jul 2023 20:54:52 +0200 Subject: [PATCH 067/120] Resolves: #2227004 - capinfos aborts in FIPS --- wireshark-0010-ripemd-fips-core-dump.patch | 164 +++++++++++++++++++++ wireshark.spec | 22 +-- 2 files changed, 177 insertions(+), 9 deletions(-) create mode 100644 wireshark-0010-ripemd-fips-core-dump.patch diff --git a/wireshark-0010-ripemd-fips-core-dump.patch b/wireshark-0010-ripemd-fips-core-dump.patch new file mode 100644 index 0000000..f09dc1a --- /dev/null +++ b/wireshark-0010-ripemd-fips-core-dump.patch @@ -0,0 +1,164 @@ +diff --git a/capinfos.c b/capinfos.c +index 3c7866befd..da576f88c5 100644 +--- a/capinfos.c ++++ b/capinfos.c +@@ -141,7 +141,6 @@ static gboolean cap_file_hashes = TRUE; /* Calculate file hashes */ + + // Strongest to weakest + #define HASH_SIZE_SHA256 32 +-#define HASH_SIZE_RMD160 20 + #define HASH_SIZE_SHA1 20 + + #define HASH_STR_SIZE (65) /* Max hash size * 2 + '\0' */ +@@ -743,7 +742,6 @@ print_stats(const gchar *filename, capture_info *cf_info) + } + if (cap_file_hashes) { + printf ("SHA256: %s\n", file_sha256); +- printf ("RIPEMD160: %s\n", file_rmd160); + printf ("SHA1: %s\n", file_sha1); + } + if (cap_order) printf ("Strict time order: %s\n", order_string(cf_info->order)); +@@ -857,7 +855,6 @@ print_stats_table_header(void) + if (cap_packet_rate) print_stats_table_header_label("Average packet rate (packets/sec)"); + if (cap_file_hashes) { + print_stats_table_header_label("SHA256"); +- print_stats_table_header_label("RIPEMD160"); + print_stats_table_header_label("SHA1"); + } + if (cap_order) print_stats_table_header_label("Strict time order"); +@@ -1182,7 +1179,6 @@ calculate_hashes(const char *filename) + } + gcry_md_final(hd); + hash_to_str(gcry_md_read(hd, GCRY_MD_SHA256), HASH_SIZE_SHA256, file_sha256); +- hash_to_str(gcry_md_read(hd, GCRY_MD_RMD160), HASH_SIZE_RMD160, file_rmd160); + hash_to_str(gcry_md_read(hd, GCRY_MD_SHA1), HASH_SIZE_SHA1, file_sha1); + } + if (fh) fclose(fh); +@@ -1489,7 +1485,7 @@ print_usage(FILE *output) + fprintf(output, " -E display the capture file encapsulation\n"); + fprintf(output, " -I display the capture file interface information\n"); + fprintf(output, " -F display additional capture file information\n"); +- fprintf(output, " -H display the SHA256, RIPEMD160, and SHA1 hashes of the file\n"); ++ fprintf(output, " -H display the SHA256 and SHA1 hashes of the file\n"); + fprintf(output, " -k display the capture comment\n"); + fprintf(output, "\n"); + fprintf(output, "Size infos:\n"); +@@ -1842,10 +1838,9 @@ main(int argc, char *argv[]) + if (cap_file_hashes) { + gcry_check_version(NULL); + gcry_md_open(&hd, GCRY_MD_SHA256, 0); +- if (hd) { +- gcry_md_enable(hd, GCRY_MD_RMD160); ++ if (hd) + gcry_md_enable(hd, GCRY_MD_SHA1); +- } ++ + hash_buf = (char *)g_malloc(HASH_BUF_SIZE); + } + +diff --git a/doc/capinfos.adoc b/doc/capinfos.adoc +index 16ed2e300a..124fb56694 100644 +--- a/doc/capinfos.adoc ++++ b/doc/capinfos.adoc +@@ -200,7 +200,7 @@ Prints the help listing and exits. + -H:: + + + -- +-Displays the SHA256, RIPEMD160, and SHA1 hashes for the file. ++Displays the SHA256 and SHA1 hashes for the file. + SHA1 output may be removed in the future. + -- + +diff --git a/capinfos.c b/capinfos.c +index f0059f4e54..e153097219 100644 +--- a/capinfos.c ++++ b/capinfos.c +@@ -148,7 +148,6 @@ static gboolean cap_file_hashes = TRUE; /* Calculate file hashes */ + + + static gchar file_sha256[HASH_STR_SIZE]; +-static gchar file_rmd160[HASH_STR_SIZE]; + static gchar file_sha1[HASH_STR_SIZE]; + + static char *hash_buf = NULL; +@@ -1024,11 +1023,6 @@ print_stats_table(const gchar *filename, capture_info *cf_info) + printf("%s", file_sha256); + putquote(); + +- putsep(); +- putquote(); +- printf("%s", file_rmd160); +- putquote(); +- + putsep(); + putquote(); + printf("%s", file_sha1); +@@ -1168,7 +1162,6 @@ calculate_hashes(const char *filename) + size_t hash_bytes; + + (void) g_strlcpy(file_sha256, "", HASH_STR_SIZE); +- (void) g_strlcpy(file_rmd160, "", HASH_STR_SIZE); + (void) g_strlcpy(file_sha1, "", HASH_STR_SIZE); + + if (cap_file_hashes) { +diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp +index 9e5b86a7fd..c77056818c 100644 +--- a/ui/qt/capture_file_properties_dialog.cpp ++++ b/ui/qt/capture_file_properties_dialog.cpp +@@ -175,11 +175,6 @@ QString CaptureFilePropertiesDialog::summaryToHtml() + << table_data_tmpl.arg(summary.file_sha256) + << table_row_end; + +- out << table_row_begin +- << table_vheader_tmpl.arg(tr("Hash (RIPEMD160)")) +- << table_data_tmpl.arg(summary.file_rmd160) +- << table_row_end; +- + out << table_row_begin + << table_vheader_tmpl.arg(tr("Hash (SHA1)")) + << table_data_tmpl.arg(summary.file_sha1) +diff --git a/ui/summary.c b/ui/summary.c +index 127698fd5c..58c7cd68a4 100644 +--- a/ui/summary.c ++++ b/ui/summary.c +@@ -21,7 +21,6 @@ + + // Strongest to weakest + #define HASH_SIZE_SHA256 32 +-#define HASH_SIZE_RMD160 20 + #define HASH_SIZE_SHA1 20 + + #define HASH_BUF_SIZE (1024 * 1024) +@@ -213,12 +212,10 @@ summary_fill_in(capture_file *cf, summary_tally *st) + g_free(idb_info); + + (void) g_strlcpy(st->file_sha256, "", HASH_STR_SIZE); +- (void) g_strlcpy(st->file_rmd160, "", HASH_STR_SIZE); + (void) g_strlcpy(st->file_sha1, "", HASH_STR_SIZE); + + gcry_md_open(&hd, GCRY_MD_SHA256, 0); + if (hd) { +- gcry_md_enable(hd, GCRY_MD_RMD160); + gcry_md_enable(hd, GCRY_MD_SHA1); + } + hash_buf = (char *)g_malloc(HASH_BUF_SIZE); +@@ -230,7 +227,6 @@ summary_fill_in(capture_file *cf, summary_tally *st) + } + gcry_md_final(hd); + hash_to_str(gcry_md_read(hd, GCRY_MD_SHA256), HASH_SIZE_SHA256, st->file_sha256); +- hash_to_str(gcry_md_read(hd, GCRY_MD_RMD160), HASH_SIZE_RMD160, st->file_rmd160); + hash_to_str(gcry_md_read(hd, GCRY_MD_SHA1), HASH_SIZE_SHA1, st->file_sha1); + } + if (fh) fclose(fh); +diff --git a/ui/summary.h b/ui/summary.h +index 9063b99b77..95a51a38c0 100644 +--- a/ui/summary.h ++++ b/ui/summary.h +@@ -56,7 +56,6 @@ typedef struct _summary_tally { + const char *filename; /**< path of capture file */ + gint64 file_length; /**< file length in bytes */ + gchar file_sha256[HASH_STR_SIZE]; /**< SHA256 hash of capture file */ +- gchar file_rmd160[HASH_STR_SIZE]; /**< RIPEMD160 hash of capture file */ + gchar file_sha1[HASH_STR_SIZE]; /**< SHA1 hash of capture file */ + int file_type; /**< wiretap file type */ + wtap_compression_type compression_type; /**< compression type of file, or uncompressed */ diff --git a/wireshark.spec b/wireshark.spec index 2f29538..1a247c3 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.0.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/ @@ -17,18 +17,19 @@ Source2: 90-wireshark-usbmon.rules Source3: wireshark.sysusers # Fedora-specific -Patch2: wireshark-0002-Customize-permission-denied-error.patch +Patch2: wireshark-0002-Customize-permission-denied-error.patch # Will be proposed upstream -Patch3: wireshark-0003-fix-string-overrun-in-plugins-profinet.patch +Patch3: wireshark-0003-fix-string-overrun-in-plugins-profinet.patch # Fedora-specific -Patch4: wireshark-0004-Restore-Fedora-specific-groups.patch +Patch4: wireshark-0004-Restore-Fedora-specific-groups.patch # Fedora-specific -Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch +Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch # Fedora-specific -Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch -Patch7: wireshark-0007-cmakelists.patch -Patch8: wireshark-0008-glib2-g_strdup-build.patch -Patch9: wireshark-0009-fix-asn2wrs-cmake.patch +Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch +Patch7: wireshark-0007-cmakelists.patch +Patch8: wireshark-0008-glib2-g_strdup-build.patch +Patch9: wireshark-0009-fix-asn2wrs-cmake.patch +Patch10: wireshark-0010-ripemd-fips-core-dump.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -279,6 +280,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 28 2023 Michal Ruprich - 1:4.0.7-3 +- Resolves: #2227004 - capinfos aborts in FIPS + * Sat Jul 22 2023 Fedora Release Engineering - 1:4.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 09b6821e743b5e7c61095a5b2ae2d9003b910e8f Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 29 Aug 2023 12:25:59 +0200 Subject: [PATCH 068/120] New version 4.0.8 --- sources | 4 ++-- wireshark.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 4bd6d69..da78e0b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.0.7.tar.xz) = 98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab -SHA512 (SIGNATURES-4.0.7.txt) = 4c89bffd394df2ffbd9050ff22ef1672a72d4b2c496b4790569acf7a14e29638533b51b272e73b59c31ebf6e63d34954c3482c76b30ba1cb2c82fee3780e19f2 +SHA512 (wireshark-4.0.8.tar.xz) = f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65 +SHA512 (SIGNATURES-4.0.8.txt) = 7da9141c6b0768121245df9e19eebb4976e2f5f16811730cd03f4088efae5fe21ec43563ff9cc68c5089722c1e4d2d90817dbd5b0c55e36a4851c0b3184d5249 diff --git a/wireshark.spec b/wireshark.spec index 1a247c3..783eca5 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.0.7 -Release: 3%{?dist} +Version: 4.0.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/ @@ -280,6 +280,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Aug 29 2023 Michal Ruprich - 1:4.0.8-1 +- New version 4.0.8 +- Resolves: #2235577 - possible Denial of Service via crafted package + * Fri Jul 28 2023 Michal Ruprich - 1:4.0.7-3 - Resolves: #2227004 - capinfos aborts in FIPS From 7ced997b9e43728d079f67f1568e0c67bbd63fdd Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 31 Aug 2023 09:09:32 +0200 Subject: [PATCH 069/120] wireshark crash in managed interfaces --- wireshark-0011-manage-interfaces-crash.patch | 74 ++++++++++++++++++++ wireshark.spec | 6 +- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 wireshark-0011-manage-interfaces-crash.patch diff --git a/wireshark-0011-manage-interfaces-crash.patch b/wireshark-0011-manage-interfaces-crash.patch new file mode 100644 index 0000000..f2eb347 --- /dev/null +++ b/wireshark-0011-manage-interfaces-crash.patch @@ -0,0 +1,74 @@ +From 2d55e5672b07a8a102024e0af66e821bba51213b Mon Sep 17 00:00:00 2001 +From: Gerald Combs +Date: Sun, 27 Aug 2023 14:47:52 -0700 +Subject: [PATCH] Qt: Fix ManageInterfacesDialog cleanup + +Handle our ManageInterfacesDialog cleanup tasks inside our destructor. +If we try to handle them in on_buttonBox_accepted we run into a race +condition with WA_DeleteOnClose. + +Fixes #19287 +--- + ui/qt/manage_interfaces_dialog.cpp | 25 ++++++++++++------------- + ui/qt/manage_interfaces_dialog.h | 2 -- + 2 files changed, 12 insertions(+), 15 deletions(-) + +diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp +index cb9da8697b5..a8529e265a9 100644 +--- a/ui/qt/manage_interfaces_dialog.cpp ++++ b/ui/qt/manage_interfaces_dialog.cpp +@@ -209,6 +209,18 @@ ManageInterfacesDialog::ManageInterfacesDialog(QWidget *parent) : + + ManageInterfacesDialog::~ManageInterfacesDialog() + { ++ if (result() == QDialog::Accepted) { ++#ifdef HAVE_LIBPCAP ++ sourceModel->save(); ++#endif ++#ifdef HAVE_PCAP_REMOTE ++ remoteAccepted(); ++#endif ++ prefs_main_write(); ++ mainApp->refreshLocalInterfaces(); ++ emit ifsChanged(); ++ } ++ + delete ui; + } + +@@ -252,19 +264,6 @@ void ManageInterfacesDialog::updateWidgets() + ui->hintLabel->setText(hint); + } + +-void ManageInterfacesDialog::on_buttonBox_accepted() +-{ +-#ifdef HAVE_LIBPCAP +- sourceModel->save(); +-#endif +-#ifdef HAVE_PCAP_REMOTE +- remoteAccepted(); +-#endif +- prefs_main_write(); +- mainApp->refreshLocalInterfaces(); +- emit ifsChanged(); +-} +- + #ifdef HAVE_LIBPCAP + void ManageInterfacesDialog::on_addPipe_clicked() + { +diff --git a/ui/qt/manage_interfaces_dialog.h b/ui/qt/manage_interfaces_dialog.h +index 80b78afbe7a..79e9d0d9bfa 100644 +--- a/ui/qt/manage_interfaces_dialog.h ++++ b/ui/qt/manage_interfaces_dialog.h +@@ -59,8 +59,6 @@ signals: + private slots: + void updateWidgets(); + +- void on_buttonBox_accepted(); +- + #ifdef HAVE_LIBPCAP + void on_addPipe_clicked(); + void on_delPipe_clicked(); +-- +GitLab + diff --git a/wireshark.spec b/wireshark.spec index 783eca5..c4cedd1 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.0.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/ @@ -30,6 +30,7 @@ Patch7: wireshark-0007-cmakelists.patch Patch8: wireshark-0008-glib2-g_strdup-build.patch Patch9: wireshark-0009-fix-asn2wrs-cmake.patch Patch10: wireshark-0010-ripemd-fips-core-dump.patch +Patch11: wireshark-0011-manage-interfaces-crash.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -280,6 +281,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Aug 31 2023 Michal Ruprich - 1:4.0.8-2 +- Resolves: #2236246 - wireshark crash in managed interfaces + * Tue Aug 29 2023 Michal Ruprich - 1:4.0.8-1 - New version 4.0.8 - Resolves: #2235577 - possible Denial of Service via crafted package From c48825402c3c38e913cf69a0ba98e7c15634d1e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:53:11 +0000 Subject: [PATCH 070/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index c4cedd1..87e67b2 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.0.8 -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/ @@ -281,6 +281,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1:4.0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Aug 31 2023 Michal Ruprich - 1:4.0.8-2 - Resolves: #2236246 - wireshark crash in managed interfaces From 4cdb9e8c1cc9b9716249b3baeb62c97e7c9d7da0 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 1 Feb 2024 10:06:23 +0100 Subject: [PATCH 071/120] New version 4.2.2 --- sources | 4 +- ...02-Customize-permission-denied-error.patch | 71 ++---- wireshark-0006-Move-tmp-to-var-tmp.patch | 23 +- wireshark-0007-cmakelists.patch | 4 +- wireshark-0008-glib2-g_strdup-build.patch | 13 -- wireshark-0009-fix-asn2wrs-cmake.patch | 213 ------------------ wireshark-0010-ripemd-fips-core-dump.patch | 164 -------------- wireshark-0011-manage-interfaces-crash.patch | 74 ------ wireshark.spec | 21 +- 9 files changed, 46 insertions(+), 541 deletions(-) delete mode 100644 wireshark-0008-glib2-g_strdup-build.patch delete mode 100644 wireshark-0009-fix-asn2wrs-cmake.patch delete mode 100644 wireshark-0010-ripemd-fips-core-dump.patch delete mode 100644 wireshark-0011-manage-interfaces-crash.patch diff --git a/sources b/sources index da78e0b..690f70c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.0.8.tar.xz) = f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65 -SHA512 (SIGNATURES-4.0.8.txt) = 7da9141c6b0768121245df9e19eebb4976e2f5f16811730cd03f4088efae5fe21ec43563ff9cc68c5089722c1e4d2d90817dbd5b0c55e36a4851c0b3184d5249 +SHA512 (wireshark-4.2.2.tar.xz) = a72c4957c7458da85ec9d121330c0c185fa047823b00be88e1218efda5ce43a7e4a3581afefadc003f376da8b89668d835bbead049009a1fdb5d8fbce08ddbb2 +SHA512 (SIGNATURES-4.2.2.txt) = f4b8c98ecac26353a41405fea532301a50244827c3d1f71bbde4cf46f9ef47f13019b0cadf1a946bdaf8e7e99363664316d4ccbe389f4bbd4a6416efcdd72f16 diff --git a/wireshark-0002-Customize-permission-denied-error.patch b/wireshark-0002-Customize-permission-denied-error.patch index 0b07ae0..5c9d237 100644 --- a/wireshark-0002-Customize-permission-denied-error.patch +++ b/wireshark-0002-Customize-permission-denied-error.patch @@ -1,55 +1,22 @@ -From: Jan Safranek -Date: Fri, 26 Nov 2010 14:30:45 +0300 -Subject: [PATCH] Customize 'permission denied' error. - -Add Fedora-specific message to error output when dumpcap cannot be started -because of permissions. - -Signed-off-by: Jan Safranek - diff --git a/capture/capture_sync.c b/capture/capture_sync.c -index 47a30a70c4..84d19568b0 100644 +index af08b32..2e0fcb7 100644 --- a/capture/capture_sync.c +++ b/capture/capture_sync.c -@@ -336,6 +336,7 @@ sync_pipe_start(capture_options *capture_opts, GPtrArray *capture_comments, - gchar *signal_pipe_name; - #else - char errmsg[1024+1]; -+ const char *securitymsg = ""; - int sync_pipe[2]; /* pipe used to send messages from child to parent */ - enum PIPES { PIPE_READ, PIPE_WRITE }; /* Constants 0 and 1 for PIPE_READ and PIPE_WRITE */ - #endif -@@ -741,8 +742,10 @@ sync_pipe_start(capture_options *capture_opts, GPtrArray *capture_comments, - dup2(sync_pipe[PIPE_WRITE], 2); - ws_close(sync_pipe[PIPE_READ]); - execv(argv[0], argv); -- snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", -- argv[0], g_strerror(errno)); -+ if (errno == EPERM || errno == EACCES) -+ securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; -+ snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", -+ argv[0], g_strerror(errno), securitymsg); - sync_pipe_errmsg_to_parent(2, errmsg, ""); - - /* Exit with "_exit()", so that we don't close the connection -@@ -846,6 +849,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, - int i; - #else - char errmsg[1024+1]; -+ const char *securitymsg = ""; - int sync_pipe[2]; /* pipe used to send messages from child to parent */ - int data_pipe[2]; /* pipe used to send data from child to parent */ - #endif -@@ -994,8 +998,10 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, - ws_close(sync_pipe[PIPE_READ]); - ws_close(sync_pipe[PIPE_WRITE]); - execv(argv[0], argv); -- snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", -- argv[0], g_strerror(errno)); -+ if (errno == EPERM || errno == EACCES) -+ securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; -+ snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", -+ argv[0], g_strerror(errno), securitymsg); - sync_pipe_errmsg_to_parent(2, errmsg, ""); - - /* Exit with "_exit()", so that we don't close the connection +@@ -1825,8 +1832,16 @@ sync_pipe_input_cb(GIOChannel *pipe_io, capture_session *cap_session) + if (!ws_strtoi32(buffer, NULL, &exec_errno)) { + ws_warning("Invalid errno: %s", buffer); + } +- primary_msg = ws_strdup_printf("Couldn't run dumpcap in child process: %s", ++ if (exec_errno == EPERM || exec_errno == EACCES) { ++ const char *securitymsg = "\nAre you a member of the 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root."; ++ primary_msg = ws_strdup_printf("Couldn't run dumpcap in child process: %s%s", ++ g_strerror(exec_errno), securitymsg); ++ } ++ else { ++ primary_msg = ws_strdup_printf("Couldn't run dumpcap in child process: %s", + g_strerror(exec_errno)); ++ } ++ + cap_session->error(cap_session, primary_msg, NULL); + /* the capture child will close the sync_pipe, nothing to do for now */ + /* (an error message doesn't mean we have to stop capturing) */ diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index 2c1ab0d..f7a1637 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -31,7 +31,7 @@ index 752b669ac4..42c2be0fca 100644 #include #include @@ -185,7 +186,7 @@ FolderListModel::FolderListModel(QObject * parent): - appendRow(QStringList() << tr("\"File\" dialogs") << get_last_open_dir() << tr("capture files")); + appendRow(QStringList() << tr("\"File\" dialogs") << get_open_dialog_initial_dir() << tr("capture files")); /* temp */ - appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : g_get_tmp_dir()) << tr("untitled capture files")); @@ -86,16 +86,20 @@ index 591a63bbf3..203f5c5286 100644 } else { sample_file_ = new QBuffer(this); diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c -index f93f96d538..73964a1def 100644 +index 531ed91..bd6fd60 100644 --- a/wsutil/tempfile.c +++ b/wsutil/tempfile.c -@@ -14,10 +14,12 @@ +@@ -10,6 +10,8 @@ + #include "config.h" #include "tempfile.h" - #include "file_util.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. @@ -103,18 +107,17 @@ index f93f96d538..73964a1def 100644 * * @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. -@@ -33,6 +33,9 @@ create_tempfile(const char *tempdir, gchar **namebuf, const char *pfx, const cha +@@ -55,13 +57,25 @@ create_tempfile(const char *tempdir, char **namebuf, const char *pfx, const char { int fd; - gchar *safe_pfx = NULL; + char *safe_pfx = sanitize_prefix(pfx); + gchar *tmp_file; + const char *tmp_dir; + int old_mask; - if (pfx) { - /* The characters in "delimiters" come from: -@@ -54,7 +57,16 @@ create_tempfile(const char *tempdir, gchar **namebuf, const char *pfx, const cha - gchar* filetmpl = ws_strdup_printf("%sXXXXXX%s", safe_pfx ? safe_pfx : "", sfx ? sfx : ""); + 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); diff --git a/wireshark-0007-cmakelists.patch b/wireshark-0007-cmakelists.patch index b794372..18064e2 100644 --- a/wireshark-0007-cmakelists.patch +++ b/wireshark-0007-cmakelists.patch @@ -4,15 +4,15 @@ index a55086c..0149801 100644 +++ b/wsutil/CMakeLists.txt @@ -80,6 +80,7 @@ set(WSUTIL_PUBLIC_HEADERS ws_roundup.h - ws_return.h + ws_strptime.h wsgcrypt.h + wstmpdir.h wsjson.h wslog.h xtea.h @@ -135,6 +136,7 @@ set(WSUTIL_COMMON_FILES - ws_mempbrk.c ws_pipe.c + ws_strptime.c wsgcrypt.c + wstmpdir.c wsjson.c diff --git a/wireshark-0008-glib2-g_strdup-build.patch b/wireshark-0008-glib2-g_strdup-build.patch deleted file mode 100644 index 6c4f931..0000000 --- a/wireshark-0008-glib2-g_strdup-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ui/qt/wireshark_main_window_slots.cpp b/ui/qt/wireshark_main_window_slots.cpp -index 0594ff6..3068797 100644 ---- a/ui/qt/wireshark_main_window_slots.cpp -+++ b/ui/qt/wireshark_main_window_slots.cpp -@@ -2513,7 +2513,7 @@ void WiresharkMainWindow::showHideMainWidgets(QAction *action) - if (widget == toolbar) { - GList *entry = g_list_find_custom(recent.interface_toolbars, action->text().toUtf8(), (GCompareFunc)strcmp); - if (show && !entry) { -- recent.interface_toolbars = g_list_append(recent.interface_toolbars, g_strdup(action->text().toUtf8())); -+ recent.interface_toolbars = g_list_append(recent.interface_toolbars, g_strdup(action->text().toUtf8().constData())); - } else if (!show && entry) { - recent.interface_toolbars = g_list_remove(recent.interface_toolbars, entry->data); - } diff --git a/wireshark-0009-fix-asn2wrs-cmake.patch b/wireshark-0009-fix-asn2wrs-cmake.patch deleted file mode 100644 index fc1d7bc..0000000 --- a/wireshark-0009-fix-asn2wrs-cmake.patch +++ /dev/null @@ -1,213 +0,0 @@ -From 601bf39e6b2eaff9e77588ff1b1a8a987dad404d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= -Date: Fri, 26 May 2023 14:16:06 +0100 -Subject: [PATCH] CMake: Remove module LocatePythonModule.cmake - -This module is unnecessary and frequently causes hard-to-debug -issues during CMake's configure run. Nuke it. ---- - cmake/modules/LocatePythonModule.cmake | 53 -------------------------- - cmake/modules/UseAsn2Wrs.cmake | 13 ++----- - cmake/modules/UseMakePluginReg.cmake | 7 +--- - 3 files changed, 6 insertions(+), 67 deletions(-) - delete mode 100644 cmake/modules/LocatePythonModule.cmake - -diff --git a/cmake/modules/LocatePythonModule.cmake b/cmake/modules/LocatePythonModule.cmake -deleted file mode 100644 -index 3fbe0c7..0000000 ---- a/cmake/modules/LocatePythonModule.cmake -+++ /dev/null -@@ -1,53 +0,0 @@ --#LOCATE_PYTHON_MODULE( [PATHS ... ] [REQUIRED]) --# --# This function tries to find the given python module. --# If found the path is provided in and <_FOUND> is set to TRUE. --# --# After PATHS additional paths for python to search can be provided. --# When REQUIRED is set, the function will abort the cmake execution is the module is not found --function(LOCATE_PYTHON_MODULE module) -- if(NOT PYTHON_EXECUTABLE) -- find_package(PythonInterp) -- endif() -- -- # Parse (additional) arguments -- set(options REQUIRED) -- set(multiValueArgs PATHS) -- cmake_parse_arguments(LPM "${options}" "" "${multiValueArgs}" ${ARGN}) -- -- string(TOUPPER ${module} module_upper) -- if(NOT PY_${module_upper}) -- -- if(LPM_PATHS) -- # Append LPM_PATHS to PYTHONPATH to search at provided location (first) -- file(TO_CMAKE_PATH "$ENV{PYTHONPATH}" CMAKE_PATH) -- list(INSERT CMAKE_PATH 0 ${LPM_PATHS}) -- file(TO_NATIVE_PATH "${CMAKE_PATH}" NATIVE_PATH) -- if(UNIX) -- string(REPLACE ";" ":" NATIVE_PATH "${NATIVE_PATH}") -- endif(UNIX) -- set(ENV{PYTHONPATH} "${NATIVE_PATH}") -- endif(LPM_PATHS) -- -- # Use the (native) python impl module to find the location of the requested module -- execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" -- "import imp; print(imp.find_module('${module}')[1])" -- RESULT_VARIABLE _${module}_status -- OUTPUT_VARIABLE _${module}_location -- ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -- -- if(NOT _${module}_status) -- set(PY_${module_upper} ${_${module}_location} CACHE STRING -- "Location of Python module ${module}") -- set(${module_upper}_FOUND TRUE) -- message(STATUS "Found python module ${module}: ${PY_${module_upper}}") -- else(NOT _${module}_status) -- set(${module_upper}_FOUND FALSE) -- if(LPM_REQUIRED) -- message(FATAL_ERROR "Could NOT find python module ${module}") -- else(LPM_REQUIRED) -- message(STATUS "Could NOT find python module ${module}") -- endif(LPM_REQUIRED) -- endif(NOT _${module}_status) -- endif(NOT PY_${module_upper}) --endfunction(LOCATE_PYTHON_MODULE) -diff --git a/cmake/modules/UseMakePluginReg.cmake b/cmake/modules/UseMakePluginReg.cmake -index e6e6a91..fe57381 100644 ---- a/cmake/modules/UseMakePluginReg.cmake -+++ b/cmake/modules/UseMakePluginReg.cmake -@@ -1,20 +1,17 @@ - # - function(register_plugin_files _outputfile _registertype) -- include(LocatePythonModule) -- locate_python_module(make-plugin-reg REQUIRED PATHS ${CMAKE_SOURCE_DIR}/tools) -- - file(RELATIVE_PATH output "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/${_outputfile}") - add_custom_command( - OUTPUT - ${_outputfile} - COMMAND ${PYTHON_EXECUTABLE} -- ${PY_MAKE-PLUGIN-REG} -+ ${CMAKE_SOURCE_DIR}/tools/make-plugin-reg.py - ${CMAKE_CURRENT_SOURCE_DIR} - ${_registertype} - ${ARGN} - COMMENT "Generating ${output}" - DEPENDS - ${ARGN} -- ${PY_MAKE-PLUGIN-REG} -+ ${CMAKE_SOURCE_DIR}/tools/make-plugin-reg.py - ) - endfunction() -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6db2e46..21e71e8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3825,7 +3825,6 @@ install( - ${WS_CMAKE_MODULE_PATH}/FindWSLibrary.cmake - ${WS_CMAKE_MODULE_PATH}/FindWSWinLibs.cmake - ${WS_CMAKE_MODULE_PATH}/UseAsn2Wrs.cmake -- ${WS_CMAKE_MODULE_PATH}/LocatePythonModule.cmake - ${WS_CMAKE_MODULE_PATH}/UseMakePluginReg.cmake - DESTINATION - ${WIRESHARK_INSTALL_CMAKEDIR} -diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake -index 67cbc8d..929a4eb 100644 ---- a/cmake/modules/FindAsciidoctor.cmake -+++ b/cmake/modules/FindAsciidoctor.cmake -@@ -124,7 +124,7 @@ if(ASCIIDOCTOR_EXECUTABLE) - ADD_CUSTOM_COMMAND( - OUTPUT - ${_output_txt} -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/html2text.py -+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/html2text.py - ${_output_html} - > ${_output_txt} - DEPENDS -diff --git a/cmake/modules/UseMakePluginReg.cmake b/cmake/modules/UseMakePluginReg.cmake -index fe57381..0c7198d 100644 ---- a/cmake/modules/UseMakePluginReg.cmake -+++ b/cmake/modules/UseMakePluginReg.cmake -@@ -4,7 +4,7 @@ function(register_plugin_files _outputfile _registertype) - add_custom_command( - OUTPUT - ${_outputfile} -- COMMAND ${PYTHON_EXECUTABLE} -+ COMMAND ${Python3_EXECUTABLE} - ${CMAKE_SOURCE_DIR}/tools/make-plugin-reg.py - ${CMAKE_CURRENT_SOURCE_DIR} - ${_registertype} -diff --git a/cmake/modules/UseMakeTaps.cmake b/cmake/modules/UseMakeTaps.cmake -index aed9318..56fd628 100644 ---- a/cmake/modules/UseMakeTaps.cmake -+++ b/cmake/modules/UseMakeTaps.cmake -@@ -5,7 +5,7 @@ MACRO(REGISTER_TAP_FILES _outputfile) - OUTPUT - ${_outputfile} - COMMAND -- ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/make-regs.py taps ${_outputfile} ${_sources} -+ ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/make-regs.py taps ${_outputfile} ${_sources} - DEPENDS - ${CMAKE_SOURCE_DIR}/tools/make-regs.py - ${_sources} -diff --git a/cmake/modules/UseAsn2Wrs.cmake b/cmake/modules/UseAsn2Wrs.cmake -index 9d7cdfe..6b0c46c 100644 ---- a/cmake/modules/UseAsn2Wrs.cmake -+++ b/cmake/modules/UseAsn2Wrs.cmake -@@ -6,11 +6,6 @@ - # absolute path (e.g. "${CMAKE_CURRENT_SOURCE_DIR}"). - - function(ASN2WRS) -- if(NOT PY_ASN2WRS) -- include(LocatePythonModule) -- locate_python_module(asn2wrs REQUIRED PATHS "${CMAKE_SOURCE_DIR}/tools") -- endif() -- - if(NOT PROTO_OPT) - set(PROTO_OPT -p ${PROTOCOL_NAME}) - elseif(PROTO_OPT STREQUAL "_EMPTY_") -@@ -38,8 +33,8 @@ function(ASN2WRS) - # Creates a dissector in the source directory and store the timestamp. - add_custom_command( - OUTPUT packet-${PROTOCOL_NAME}-stamp -- COMMAND "${PYTHON_EXECUTABLE}" -- ${PY_ASN2WRS} -+ COMMAND "${Python3_EXECUTABLE}" -+ ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py - ${A2W_FLAGS} - ${PROTO_OPT} - -c "${CMAKE_CURRENT_SOURCE_DIR}/${PROTOCOL_NAME}.cnf" -@@ -48,12 +43,12 @@ function(ASN2WRS) - -O "${A2W_OUTPUT_DIR}" - ${EXT_ASN_FILE_LIST} ${ASN_FILE_LIST} ${EXT_ASN_FILE_LIST_LATE} - COMMAND -- "${PYTHON_EXECUTABLE}" -c -+ "${Python3_EXECUTABLE}" -c - "import shutil, sys; x,s,d=sys.argv; open(d, 'w'); shutil.copystat(s, d)" - "${A2W_OUTPUT_DIR}/packet-${PROTOCOL_NAME}.c" - packet-${PROTOCOL_NAME}-stamp - DEPENDS -- "${PY_ASN2WRS}" -+ ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py - ${SRC_FILES} - ${EXTRA_CNF_targets} - ${EXTRA_CNF} -@@ -67,8 +62,8 @@ function(ASN2WRS) - foreach(_asn2wrs_export_file IN LISTS EXPORT_FILES) - add_custom_command( - OUTPUT ${_asn2wrs_export_file} -- COMMAND "${PYTHON_EXECUTABLE}" -- "${PY_ASN2WRS}" -+ COMMAND "${Python3_EXECUTABLE}" -+ ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py - -E - ${A2W_FLAGS} - ${PROTO_OPT} -@@ -76,7 +71,7 @@ function(ASN2WRS) - -D "${CMAKE_CURRENT_SOURCE_DIR}" - ${EXT_ASN_FILE_LIST} ${ASN_FILE_LIST} ${EXT_ASN_FILE_LIST_LATE} - DEPENDS -- "${PY_ASN2WRS}" -+ ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py - ${SRC_FILES} - ${EXPORT_DEPENDS_targets} - ${EXPORT_DEPENDS} diff --git a/wireshark-0010-ripemd-fips-core-dump.patch b/wireshark-0010-ripemd-fips-core-dump.patch deleted file mode 100644 index f09dc1a..0000000 --- a/wireshark-0010-ripemd-fips-core-dump.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff --git a/capinfos.c b/capinfos.c -index 3c7866befd..da576f88c5 100644 ---- a/capinfos.c -+++ b/capinfos.c -@@ -141,7 +141,6 @@ static gboolean cap_file_hashes = TRUE; /* Calculate file hashes */ - - // Strongest to weakest - #define HASH_SIZE_SHA256 32 --#define HASH_SIZE_RMD160 20 - #define HASH_SIZE_SHA1 20 - - #define HASH_STR_SIZE (65) /* Max hash size * 2 + '\0' */ -@@ -743,7 +742,6 @@ print_stats(const gchar *filename, capture_info *cf_info) - } - if (cap_file_hashes) { - printf ("SHA256: %s\n", file_sha256); -- printf ("RIPEMD160: %s\n", file_rmd160); - printf ("SHA1: %s\n", file_sha1); - } - if (cap_order) printf ("Strict time order: %s\n", order_string(cf_info->order)); -@@ -857,7 +855,6 @@ print_stats_table_header(void) - if (cap_packet_rate) print_stats_table_header_label("Average packet rate (packets/sec)"); - if (cap_file_hashes) { - print_stats_table_header_label("SHA256"); -- print_stats_table_header_label("RIPEMD160"); - print_stats_table_header_label("SHA1"); - } - if (cap_order) print_stats_table_header_label("Strict time order"); -@@ -1182,7 +1179,6 @@ calculate_hashes(const char *filename) - } - gcry_md_final(hd); - hash_to_str(gcry_md_read(hd, GCRY_MD_SHA256), HASH_SIZE_SHA256, file_sha256); -- hash_to_str(gcry_md_read(hd, GCRY_MD_RMD160), HASH_SIZE_RMD160, file_rmd160); - hash_to_str(gcry_md_read(hd, GCRY_MD_SHA1), HASH_SIZE_SHA1, file_sha1); - } - if (fh) fclose(fh); -@@ -1489,7 +1485,7 @@ print_usage(FILE *output) - fprintf(output, " -E display the capture file encapsulation\n"); - fprintf(output, " -I display the capture file interface information\n"); - fprintf(output, " -F display additional capture file information\n"); -- fprintf(output, " -H display the SHA256, RIPEMD160, and SHA1 hashes of the file\n"); -+ fprintf(output, " -H display the SHA256 and SHA1 hashes of the file\n"); - fprintf(output, " -k display the capture comment\n"); - fprintf(output, "\n"); - fprintf(output, "Size infos:\n"); -@@ -1842,10 +1838,9 @@ main(int argc, char *argv[]) - if (cap_file_hashes) { - gcry_check_version(NULL); - gcry_md_open(&hd, GCRY_MD_SHA256, 0); -- if (hd) { -- gcry_md_enable(hd, GCRY_MD_RMD160); -+ if (hd) - gcry_md_enable(hd, GCRY_MD_SHA1); -- } -+ - hash_buf = (char *)g_malloc(HASH_BUF_SIZE); - } - -diff --git a/doc/capinfos.adoc b/doc/capinfos.adoc -index 16ed2e300a..124fb56694 100644 ---- a/doc/capinfos.adoc -+++ b/doc/capinfos.adoc -@@ -200,7 +200,7 @@ Prints the help listing and exits. - -H:: - + - -- --Displays the SHA256, RIPEMD160, and SHA1 hashes for the file. -+Displays the SHA256 and SHA1 hashes for the file. - SHA1 output may be removed in the future. - -- - -diff --git a/capinfos.c b/capinfos.c -index f0059f4e54..e153097219 100644 ---- a/capinfos.c -+++ b/capinfos.c -@@ -148,7 +148,6 @@ static gboolean cap_file_hashes = TRUE; /* Calculate file hashes */ - - - static gchar file_sha256[HASH_STR_SIZE]; --static gchar file_rmd160[HASH_STR_SIZE]; - static gchar file_sha1[HASH_STR_SIZE]; - - static char *hash_buf = NULL; -@@ -1024,11 +1023,6 @@ print_stats_table(const gchar *filename, capture_info *cf_info) - printf("%s", file_sha256); - putquote(); - -- putsep(); -- putquote(); -- printf("%s", file_rmd160); -- putquote(); -- - putsep(); - putquote(); - printf("%s", file_sha1); -@@ -1168,7 +1162,6 @@ calculate_hashes(const char *filename) - size_t hash_bytes; - - (void) g_strlcpy(file_sha256, "", HASH_STR_SIZE); -- (void) g_strlcpy(file_rmd160, "", HASH_STR_SIZE); - (void) g_strlcpy(file_sha1, "", HASH_STR_SIZE); - - if (cap_file_hashes) { -diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp -index 9e5b86a7fd..c77056818c 100644 ---- a/ui/qt/capture_file_properties_dialog.cpp -+++ b/ui/qt/capture_file_properties_dialog.cpp -@@ -175,11 +175,6 @@ QString CaptureFilePropertiesDialog::summaryToHtml() - << table_data_tmpl.arg(summary.file_sha256) - << table_row_end; - -- out << table_row_begin -- << table_vheader_tmpl.arg(tr("Hash (RIPEMD160)")) -- << table_data_tmpl.arg(summary.file_rmd160) -- << table_row_end; -- - out << table_row_begin - << table_vheader_tmpl.arg(tr("Hash (SHA1)")) - << table_data_tmpl.arg(summary.file_sha1) -diff --git a/ui/summary.c b/ui/summary.c -index 127698fd5c..58c7cd68a4 100644 ---- a/ui/summary.c -+++ b/ui/summary.c -@@ -21,7 +21,6 @@ - - // Strongest to weakest - #define HASH_SIZE_SHA256 32 --#define HASH_SIZE_RMD160 20 - #define HASH_SIZE_SHA1 20 - - #define HASH_BUF_SIZE (1024 * 1024) -@@ -213,12 +212,10 @@ summary_fill_in(capture_file *cf, summary_tally *st) - g_free(idb_info); - - (void) g_strlcpy(st->file_sha256, "", HASH_STR_SIZE); -- (void) g_strlcpy(st->file_rmd160, "", HASH_STR_SIZE); - (void) g_strlcpy(st->file_sha1, "", HASH_STR_SIZE); - - gcry_md_open(&hd, GCRY_MD_SHA256, 0); - if (hd) { -- gcry_md_enable(hd, GCRY_MD_RMD160); - gcry_md_enable(hd, GCRY_MD_SHA1); - } - hash_buf = (char *)g_malloc(HASH_BUF_SIZE); -@@ -230,7 +227,6 @@ summary_fill_in(capture_file *cf, summary_tally *st) - } - gcry_md_final(hd); - hash_to_str(gcry_md_read(hd, GCRY_MD_SHA256), HASH_SIZE_SHA256, st->file_sha256); -- hash_to_str(gcry_md_read(hd, GCRY_MD_RMD160), HASH_SIZE_RMD160, st->file_rmd160); - hash_to_str(gcry_md_read(hd, GCRY_MD_SHA1), HASH_SIZE_SHA1, st->file_sha1); - } - if (fh) fclose(fh); -diff --git a/ui/summary.h b/ui/summary.h -index 9063b99b77..95a51a38c0 100644 ---- a/ui/summary.h -+++ b/ui/summary.h -@@ -56,7 +56,6 @@ typedef struct _summary_tally { - const char *filename; /**< path of capture file */ - gint64 file_length; /**< file length in bytes */ - gchar file_sha256[HASH_STR_SIZE]; /**< SHA256 hash of capture file */ -- gchar file_rmd160[HASH_STR_SIZE]; /**< RIPEMD160 hash of capture file */ - gchar file_sha1[HASH_STR_SIZE]; /**< SHA1 hash of capture file */ - int file_type; /**< wiretap file type */ - wtap_compression_type compression_type; /**< compression type of file, or uncompressed */ diff --git a/wireshark-0011-manage-interfaces-crash.patch b/wireshark-0011-manage-interfaces-crash.patch deleted file mode 100644 index f2eb347..0000000 --- a/wireshark-0011-manage-interfaces-crash.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 2d55e5672b07a8a102024e0af66e821bba51213b Mon Sep 17 00:00:00 2001 -From: Gerald Combs -Date: Sun, 27 Aug 2023 14:47:52 -0700 -Subject: [PATCH] Qt: Fix ManageInterfacesDialog cleanup - -Handle our ManageInterfacesDialog cleanup tasks inside our destructor. -If we try to handle them in on_buttonBox_accepted we run into a race -condition with WA_DeleteOnClose. - -Fixes #19287 ---- - ui/qt/manage_interfaces_dialog.cpp | 25 ++++++++++++------------- - ui/qt/manage_interfaces_dialog.h | 2 -- - 2 files changed, 12 insertions(+), 15 deletions(-) - -diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp -index cb9da8697b5..a8529e265a9 100644 ---- a/ui/qt/manage_interfaces_dialog.cpp -+++ b/ui/qt/manage_interfaces_dialog.cpp -@@ -209,6 +209,18 @@ ManageInterfacesDialog::ManageInterfacesDialog(QWidget *parent) : - - ManageInterfacesDialog::~ManageInterfacesDialog() - { -+ if (result() == QDialog::Accepted) { -+#ifdef HAVE_LIBPCAP -+ sourceModel->save(); -+#endif -+#ifdef HAVE_PCAP_REMOTE -+ remoteAccepted(); -+#endif -+ prefs_main_write(); -+ mainApp->refreshLocalInterfaces(); -+ emit ifsChanged(); -+ } -+ - delete ui; - } - -@@ -252,19 +264,6 @@ void ManageInterfacesDialog::updateWidgets() - ui->hintLabel->setText(hint); - } - --void ManageInterfacesDialog::on_buttonBox_accepted() --{ --#ifdef HAVE_LIBPCAP -- sourceModel->save(); --#endif --#ifdef HAVE_PCAP_REMOTE -- remoteAccepted(); --#endif -- prefs_main_write(); -- mainApp->refreshLocalInterfaces(); -- emit ifsChanged(); --} -- - #ifdef HAVE_LIBPCAP - void ManageInterfacesDialog::on_addPipe_clicked() - { -diff --git a/ui/qt/manage_interfaces_dialog.h b/ui/qt/manage_interfaces_dialog.h -index 80b78afbe7a..79e9d0d9bfa 100644 ---- a/ui/qt/manage_interfaces_dialog.h -+++ b/ui/qt/manage_interfaces_dialog.h -@@ -59,8 +59,6 @@ signals: - private slots: - void updateWidgets(); - -- void on_buttonBox_accepted(); -- - #ifdef HAVE_LIBPCAP - void on_addPipe_clicked(); - void on_delPipe_clicked(); --- -GitLab - diff --git a/wireshark.spec b/wireshark.spec index 87e67b2..14dbdf7 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,12 +1,12 @@ %undefine __cmake_in_source_build %global with_lua 1 %global with_maxminddb 1 -%global plugins_version 4.0 +%global plugins_version 4.2 Summary: Network traffic analyzer Name: wireshark -Version: 4.0.8 -Release: 3%{?dist} +Version: 4.2.2 +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/ @@ -27,10 +27,6 @@ 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-glib2-g_strdup-build.patch -Patch9: wireshark-0009-fix-asn2wrs-cmake.patch -Patch10: wireshark-0010-ripemd-fips-core-dump.patch -Patch11: wireshark-0011-manage-interfaces-crash.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -82,6 +78,7 @@ BuildRequires: compat-lua-devel Buildrequires: git-core Buildrequires: python3-devel Buildrequires: cmake +Buildrequires: speexdsp-devel #needed for sdjournal external capture interface BuildRequires: systemd-devel BuildRequires: libnghttp2-devel @@ -235,8 +232,6 @@ fi %{_libdir}/wireshark/extcap/sdjournal %{_libdir}/wireshark/extcap/dpauxmon %{_libdir}/wireshark/extcap/androiddump -%dir %{_libdir}/wireshark/cmake -%{_libdir}/wireshark/cmake/*.cmake #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 @@ -253,7 +248,6 @@ fi %{_mandir}/man1/dumpcap.* %{_mandir}/man4/wireshark-filter.* %{_mandir}/man1/rawshark.* -%{_mandir}/man1/dftest.* %{_mandir}/man1/randpkt.* %{_mandir}/man1/reordercap.* %{_mandir}/man1/sshdump.* @@ -266,7 +260,10 @@ fi %{_mandir}/man1/dpauxmon.* %{_mandir}/man1/sdjournal.* %{_mandir}/man1/etwdump.* +%{_mandir}/man1/falcodump.* %{_mandir}/man4/extcap.* +%{_datadir}/doc/wireshark/* + %if %{with_maxminddb} && 0%{?fedora} %{_mandir}/man1/mmdbresolve.* %endif @@ -278,9 +275,11 @@ fi %doc doc/README.* ChangeLog %{_includedir}/wireshark %{_libdir}/lib*.so -%{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Feb 01 2024 Michal Ruprich - 1:4.2.2-1 +- New version 4.2.2 + * Sat Jan 27 2024 Fedora Release Engineering - 1:4.0.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 85d9580754823eed1055639abd83a27cc0a76ed5 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Sun, 11 Feb 2024 17:11:06 +0100 Subject: [PATCH 072/120] Making sure that wireshark.pc is created and installed --- wireshark-0008-pkgconfig.patch | 14 ++++++++++++++ wireshark.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 wireshark-0008-pkgconfig.patch diff --git a/wireshark-0008-pkgconfig.patch b/wireshark-0008-pkgconfig.patch new file mode 100644 index 0000000..3ef90b0 --- /dev/null +++ b/wireshark-0008-pkgconfig.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27fa752..7bdc036 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4037,9 +4037,6 @@ install( + "${CMAKE_BINARY_DIR}/wireshark.pc" + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/pkgconfig +- COMPONENT +- "Development" +- EXCLUDE_FROM_ALL + ) + + install( diff --git a/wireshark.spec b/wireshark.spec index 14dbdf7..21942aa 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.2.2 -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/ @@ -27,6 +27,7 @@ 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 #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -275,8 +276,12 @@ fi %doc doc/README.* ChangeLog %{_includedir}/wireshark %{_libdir}/lib*.so +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Feb 11 2024 Michal Ruprich - 1:4.2.2-2 +- Making sure that wireshark.pc is created and installed + * Thu Feb 01 2024 Michal Ruprich - 1:4.2.2-1 - New version 4.2.2 From 5943ebdae68ea572048224e04296133f62519465 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 18 Feb 2024 16:21:18 -0500 Subject: [PATCH 073/120] Install more devel headers The internal header structure changed in 4.2, and more headers are required by those already installed in previous versions. This is needed to fix the build of libvirt with wireshark-devel 4.2.2. --- wireshark.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 21942aa..e2c8ed2 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.2.2 -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/ @@ -159,11 +159,12 @@ mkdir -p "${IDIR}/epan/crypt" mkdir -p "${IDIR}/epan/ftypes" mkdir -p "${IDIR}/epan/dfilter" mkdir -p "${IDIR}/epan/dissectors" -mkdir -p "${IDIR}/epan/wmem" mkdir -p "${IDIR}/wiretap" mkdir -p "${IDIR}/wsutil" +mkdir -p "${IDIR}/wsutil/wmem" mkdir -p %{buildroot}%{_udevrulesdir} install -m 644 %{_vpath_builddir}/config.h epan/register.h "${IDIR}/" +install -m 644 %{_vpath_builddir}/ws_version.h "${IDIR}/" install -m 644 cfile.h file.h "${IDIR}/" install -m 644 epan/*.h "${IDIR}/epan/" install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt" @@ -172,8 +173,8 @@ install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wsutil/*.h "${IDIR}/wsutil" -install -m 644 include/ws_symbol_export.h "${IDIR}/" -install -m 644 include/ws_diag_control.h "${IDIR}/" +install -m 644 wsutil/wmem/*.h "${IDIR}/wsutil/wmem" +install -m 644 include/*.h "${IDIR}/" install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir} install -Dpm 644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf @@ -279,6 +280,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Feb 18 2024 Yaakov Selkowitz - 1:4.2.2-3 +- Install more devel headers + * Sun Feb 11 2024 Michal Ruprich - 1:4.2.2-2 - Making sure that wireshark.pc is created and installed From 1597f988309f5b6ea3e2c4c06dc36b8a58ae8b33 Mon Sep 17 00:00:00 2001 From: Marie Loise Nolden Date: Mon, 11 Mar 2024 16:47:13 +0100 Subject: [PATCH 074/120] rebase --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 690f70c..bd86c8a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.2.2.tar.xz) = a72c4957c7458da85ec9d121330c0c185fa047823b00be88e1218efda5ce43a7e4a3581afefadc003f376da8b89668d835bbead049009a1fdb5d8fbce08ddbb2 -SHA512 (SIGNATURES-4.2.2.txt) = f4b8c98ecac26353a41405fea532301a50244827c3d1f71bbde4cf46f9ef47f13019b0cadf1a946bdaf8e7e99363664316d4ccbe389f4bbd4a6416efcdd72f16 +SHA512 (wireshark-4.2.3.tar.xz) = c62b3a14dd7e0526c340aa3f19d12e1f1a21f0ab3b343bbcb6236327304b35f7fdbebf538f9895aadcd351933e6a8dc739632b67e6ba16a0547805de6fa04987 +SHA512 (SIGNATURES-4.2.3.txt) = 0fc93ec2ebe97425c04c613f010a6556ac9eced1126ac6d550c6a5b37e2b610f6bd8767173b6ea5e5b4ff67cdbd5f1e1f508a6b34b75e2cff597c30fda9063f3 diff --git a/wireshark.spec b/wireshark.spec index e2c8ed2..1da1d4b 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.2.2 -Release: 3%{?dist} +Version: 4.2.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/ @@ -280,6 +280,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Feb 15 2024 Marie Loise Nolden - 1:4.2.3-1 +- New version 4.2.3-1 + * Sun Feb 18 2024 Yaakov Selkowitz - 1:4.2.2-3 - Install more devel headers From 458399d009a759eea5af587080eb2471e55eb5af Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 4 Apr 2024 14:13:07 +0200 Subject: [PATCH 075/120] Rebuild (qt6) --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 1da1d4b..9653159 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.2.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/ @@ -280,6 +280,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Apr 04 2024 Jan Grulich - 1:4.2.3-2 +- Rebuild (qt6) + * Thu Feb 15 2024 Marie Loise Nolden - 1:4.2.3-1 - New version 4.2.3-1 From 6420a261eca2e0569943285123321be169c9326b Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Mon, 8 Apr 2024 10:35:06 +0200 Subject: [PATCH 076/120] New version 4.2.4 --- sources | 4 ++-- wireshark.spec | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sources b/sources index bd86c8a..baa87e9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.2.3.tar.xz) = c62b3a14dd7e0526c340aa3f19d12e1f1a21f0ab3b343bbcb6236327304b35f7fdbebf538f9895aadcd351933e6a8dc739632b67e6ba16a0547805de6fa04987 -SHA512 (SIGNATURES-4.2.3.txt) = 0fc93ec2ebe97425c04c613f010a6556ac9eced1126ac6d550c6a5b37e2b610f6bd8767173b6ea5e5b4ff67cdbd5f1e1f508a6b34b75e2cff597c30fda9063f3 +SHA512 (SIGNATURES-4.2.4.txt) = 273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9 +SHA512 (wireshark-4.2.4.tar.xz) = 963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6 diff --git a/wireshark.spec b/wireshark.spec index 9653159..9512abf 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.2.3 -Release: 2%{?dist} +Version: 4.2.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/ @@ -280,10 +280,13 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog -* Thu Apr 04 2024 Jan Grulich - 1:4.2.3-2 +* Mon Apr 08 2024 Michal Ruprich - 1:4.2.4-1 +- New version 4.2.4 + +* Tue Apr 04 2024 Jan Grulich - 1:4.2.3-2 - Rebuild (qt6) -* Thu Feb 15 2024 Marie Loise Nolden - 1:4.2.3-1 +* Thu Mar 12 2024 Marie Loise Nolden - 1:4.2.3-1 - New version 4.2.3-1 * Sun Feb 18 2024 Yaakov Selkowitz - 1:4.2.2-3 From e3df12a5f18ad118c5b407a8ef2022f22bf76a37 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Sun, 5 May 2024 10:15:45 +0200 Subject: [PATCH 077/120] Enabling additional features (rhbz#2278136) --- wireshark.spec | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 9512abf..7ceb691 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.2.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/ @@ -68,6 +68,7 @@ BuildRequires: qt6-qtbase-devel BuildRequires: qt6-qt5compat-devel BuildRequires: qt6-qtmultimedia-devel BuildRequires: qt6-qtsvg-devel +BuildRequires: qt6-qtimageformats BuildRequires: zlib-devel BuildRequires: asciidoctor %if %{with_maxminddb} && 0%{?fedora} @@ -76,14 +77,29 @@ BuildRequires: libmaxminddb-devel %if %{with_lua} && 0%{?fedora} BuildRequires: compat-lua-devel %endif -Buildrequires: git-core -Buildrequires: python3-devel -Buildrequires: cmake -Buildrequires: speexdsp-devel +Buildrequires: git-core +Buildrequires: python3-devel +Buildrequires: cmake +Buildrequires: speexdsp-devel #needed for sdjournal external capture interface -BuildRequires: systemd-devel -BuildRequires: libnghttp2-devel -BuildRequires: systemd-rpm-macros +BuildRequires: systemd-devel +BuildRequires: libnghttp2-devel +BuildRequires: systemd-rpm-macros +BuildRequires: lz4-devel +BuildRequires: snappy-devel +BuildRequires: brotli-devel +BuildRequires: opus-devel +BuildRequires: sbc-devel +%if 0%{?fedora} +BuildRequires: ilbc-devel +BuildRequires: opencore-amr-devel +# bcg729 for G.729 +BuildRequires: bcg729-devel +# spandsp for G.722 and G.726 +BuildRequires: spandsp-devel +# wireshark needs the -compat package +BuildRequires: minizip-ng-compat-devel +%endif %description @@ -280,13 +296,16 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat May 04 2024 Michal Ruprich - 1:4.2.4-2 +- Enabling additional features (rhbz#2278136) + * Mon Apr 08 2024 Michal Ruprich - 1:4.2.4-1 - New version 4.2.4 -* Tue Apr 04 2024 Jan Grulich - 1:4.2.3-2 +* Thu Apr 04 2024 Jan Grulich - 1:4.2.3-2 - Rebuild (qt6) -* Thu Mar 12 2024 Marie Loise Nolden - 1:4.2.3-1 +* Tue Mar 12 2024 Marie Loise Nolden - 1:4.2.3-1 - New version 4.2.3-1 * Sun Feb 18 2024 Yaakov Selkowitz - 1:4.2.2-3 From 8cd86f692d76d6a34ee878f23082f1b703959a6b Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 21 May 2024 22:14:07 +0200 Subject: [PATCH 078/120] Rebuild (qt6) --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 7ceb691..3727f50 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.2.4 -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/ @@ -296,6 +296,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue May 21 2024 Jan Grulich - 1:4.2.4-3 +- Rebuild (qt6) + * Sat May 04 2024 Michal Ruprich - 1:4.2.4-2 - Enabling additional features (rhbz#2278136) From f725712d47f4b52b92adbbc6fee05cf134f76a5d Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 22 May 2024 09:48:17 +0200 Subject: [PATCH 079/120] New version 4.2.5 --- wireshark.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 3727f50..65d7e2d 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.2.4 -Release: 3%{?dist} +Version: 4.2.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) Url: http://www.wireshark.org/ @@ -296,6 +296,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed May 22 2024 Michal Ruprich - 1:4.2.5-1 +- New version 4.2.5 + * Tue May 21 2024 Jan Grulich - 1:4.2.4-3 - Rebuild (qt6) From b544a872c77cde5a2dd97b5fb76d3271b40dd461 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 22 May 2024 10:10:29 +0200 Subject: [PATCH 080/120] Uploading new sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index baa87e9..4692f7c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (SIGNATURES-4.2.4.txt) = 273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9 -SHA512 (wireshark-4.2.4.tar.xz) = 963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6 +SHA512 (wireshark-4.2.5.tar.xz) = 92a8fb08af5a1da30ca469fa45bd982638069907d289fa716068ac71141b7d9726ca0b01adc2910da4c928db23760da75a1c6a7c2eb795ac66ba003a90abb87b +SHA512 (SIGNATURES-4.2.5.txt) = 050cb90e8958b73428fc7dc6c9801ba3b361f8cf4df8f22505789d759edf7967867915a0cbf351fa251d4d28b211920a3fb34e8fa209d475a10b4bcd2957fcc0 From ae2d2f6a446df7addd00d379cce9e11b3cca72f3 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 24 May 2024 00:59:53 -0400 Subject: [PATCH 081/120] Rebuild (Qt6) --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 65d7e2d..121ac0b 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.2.5 -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/ @@ -296,6 +296,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri May 24 2024 Neal Gompa - 1:4.2.5-2 +- Rebuild (Qt6) + * Wed May 22 2024 Michal Ruprich - 1:4.2.5-1 - New version 4.2.5 From 3b551e750fdb352bb39c3cd37ab84ff73f7fd41e Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 11 Jul 2024 09:47:41 +0200 Subject: [PATCH 082/120] New version 4.2.6 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 4692f7c..d4b7952 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.2.5.tar.xz) = 92a8fb08af5a1da30ca469fa45bd982638069907d289fa716068ac71141b7d9726ca0b01adc2910da4c928db23760da75a1c6a7c2eb795ac66ba003a90abb87b -SHA512 (SIGNATURES-4.2.5.txt) = 050cb90e8958b73428fc7dc6c9801ba3b361f8cf4df8f22505789d759edf7967867915a0cbf351fa251d4d28b211920a3fb34e8fa209d475a10b4bcd2957fcc0 +SHA512 (wireshark-4.2.6.tar.xz) = 265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516 +SHA512 (SIGNATURES-4.2.6.txt) = 287342d1ccb36326a9bab5e50c48442a41b599e258611e9046eedb078a84f2840d16f29f91b1259b3b4d37486e48d85596192ea5c6b9d1fa7ad3e78543193e0b diff --git a/wireshark.spec b/wireshark.spec index 121ac0b..8d18ffa 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.2.5 -Release: 2%{?dist} +Version: 4.2.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/ @@ -296,6 +296,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 11 2024 Michal Ruprich - 1:4.2.6-1 +- New version 4.2.6 + * Fri May 24 2024 Neal Gompa - 1:4.2.5-2 - Rebuild (Qt6) From 12321ec85872dc741ab60f7ebd10e5fe12432b29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:24:39 +0000 Subject: [PATCH 083/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index 8d18ffa..e9ee176 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.2.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/ @@ -296,6 +296,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1:4.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jul 11 2024 Michal Ruprich - 1:4.2.6-1 - New version 4.2.6 From 9f9fd3d2ed99a7062a56561e9e839b9dd161df38 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 29 Aug 2024 14:20:16 +0200 Subject: [PATCH 084/120] New version 4.4.0 --- sources | 4 +- ...x-string-overrun-in-plugins-profinet.patch | 12 +++--- wireshark-0006-Move-tmp-to-var-tmp.patch | 42 +++++++++---------- wireshark-0008-pkgconfig.patch | 13 +++--- wireshark.spec | 14 ++++--- 5 files changed, 43 insertions(+), 42 deletions(-) diff --git a/sources b/sources index d4b7952..70d9c89 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.2.6.tar.xz) = 265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516 -SHA512 (SIGNATURES-4.2.6.txt) = 287342d1ccb36326a9bab5e50c48442a41b599e258611e9046eedb078a84f2840d16f29f91b1259b3b4d37486e48d85596192ea5c6b9d1fa7ad3e78543193e0b +SHA512 (wireshark-4.4.0.tar.xz) = a00275ffcc7c5bdf546e3e1c95a2fa77b86232d008f77b1b2f3de8e63f1862321d7a439cba2d136be4407131e07e20071d972a4efb7db2bc55388a347f47ce9e +SHA512 (SIGNATURES-4.4.0.txt) = ea26f56ad55d4f9d7faaab1bd0529f363ae715d1a187acf0008a23f1b91a0b5865918402a5596dfd74195ad07a49d040a01316c1c1ece1e5981ce8644a1343f7 diff --git a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch b/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch index b71f99c..7e9cb39 100644 --- a/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch +++ b/wireshark-0003-fix-string-overrun-in-plugins-profinet.patch @@ -8,11 +8,11 @@ index 52c5017e1f..fb980269db 100644 --- a/plugins/epan/profinet/packet-dcom-cba.c +++ b/plugins/epan/profinet/packet-dcom-cba.c @@ -543,7 +543,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) + packet_info *pinfo, proto_tree *tree, dcerpc_info *di, uint8_t *drep) { - guint32 u32Pointer; -- gchar szStr[1000]; -+ gchar szStr[1000] = ""; - guint32 u32MaxStr = sizeof(szStr); - gchar *call; + uint32_t u32Pointer; +- char szStr[1000]; ++ char szStr[1000] = ""; + uint32_t u32MaxStr = sizeof(szStr); + char *call; diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index f7a1637..a856286 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -18,27 +18,6 @@ to use different directory on different filesystem. create mode 100644 wsutil/wstmpdir.c create mode 100644 wsutil/wstmpdir.h -diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp -index 752b669ac4..42c2be0fca 100644 ---- a/ui/qt/about_dialog.cpp -+++ b/ui/qt/about_dialog.cpp -@@ -14,6 +14,7 @@ - - #include "main_application.h" - #include -+#include /* for get_tmp_dir() */ - - #include - #include -@@ -185,7 +186,7 @@ FolderListModel::FolderListModel(QObject * parent): - appendRow(QStringList() << tr("\"File\" dialogs") << get_open_dialog_initial_dir() << tr("capture files")); - - /* temp */ -- appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : g_get_tmp_dir()) << tr("untitled capture files")); -+ appendRow(QStringList() << tr("Temp") << (global_capture_opts.temp_dir && global_capture_opts.temp_dir[0] ? global_capture_opts.temp_dir : get_tmp_dir()) << tr("untitled capture files")); - - /* pers conf */ - appendRow(QStringList() << tr("Personal configuration") diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index 07b9b42e01..fb09de989b 100644 --- a/ui/qt/iax2_analysis_dialog.cpp @@ -272,3 +251,24 @@ index 0000000000..07ac5837ac -- 2.37.3 +diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp +index ea11122..982ba1a 100644 +--- a/ui/qt/about_dialog.cpp ++++ b/ui/qt/about_dialog.cpp +@@ -14,6 +14,7 @@ + + #include "main_application.h" + #include ++#include /* for get_tmp_dir() */ + + #include + #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-0008-pkgconfig.patch b/wireshark-0008-pkgconfig.patch index 3ef90b0..e32958a 100644 --- a/wireshark-0008-pkgconfig.patch +++ b/wireshark-0008-pkgconfig.patch @@ -1,13 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 27fa752..7bdc036 100644 +index 17fa031..6876018 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -4037,9 +4037,6 @@ install( - "${CMAKE_BINARY_DIR}/wireshark.pc" - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/pkgconfig -- COMPONENT -- "Development" +@@ -4175,8 +4175,6 @@ endif() + + install(FILES "${CMAKE_BINARY_DIR}/resources/wireshark.pc" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig +- COMPONENT "Development" - EXCLUDE_FROM_ALL ) diff --git a/wireshark.spec b/wireshark.spec index e9ee176..a35c035 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,12 +1,12 @@ %undefine __cmake_in_source_build %global with_lua 1 %global with_maxminddb 1 -%global plugins_version 4.2 +%global plugins_version 4.4 Summary: Network traffic analyzer Name: wireshark -Version: 4.2.6 -Release: 2%{?dist} +Version: 4.4.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) Url: http://www.wireshark.org/ @@ -75,7 +75,7 @@ BuildRequires: asciidoctor BuildRequires: libmaxminddb-devel %endif %if %{with_lua} && 0%{?fedora} -BuildRequires: compat-lua-devel +BuildRequires: lua-devel %endif Buildrequires: git-core Buildrequires: python3-devel @@ -98,7 +98,6 @@ BuildRequires: bcg729-devel # spandsp for G.722 and G.726 BuildRequires: spandsp-devel # wireshark needs the -compat package -BuildRequires: minizip-ng-compat-devel %endif @@ -223,7 +222,7 @@ fi %files cli %license COPYING -%doc AUTHORS INSTALL NEWS README* +%doc AUTHORS INSTALL README* %{_bindir}/capinfos %{_bindir}/captype %{_bindir}/editcap @@ -296,6 +295,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Aug 29 2024 Michal Ruprich - 1:4.4.0-1 +- New version 4.4.0 + * Sat Jul 20 2024 Fedora Release Engineering - 1:4.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 208badf42077b733f502e2f2254e9057ce8e7f2c Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 20 Sep 2024 11:45:12 +0200 Subject: [PATCH 085/120] Using cmake install for development headers and .cmake files --- wireshark.spec | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index a35c035..3f09afc 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.4.0 -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/ @@ -163,33 +163,14 @@ and plugins. %install %cmake_install +%cmake_install --component Development desktop-file-validate %{buildroot}%{_datadir}/applications/org.wireshark.Wireshark.desktop #install devel files (inspired by debian/wireshark-dev.header-files) install -d -m 0755 %{buildroot}%{_includedir}/wireshark IDIR="%{buildroot}%{_includedir}/wireshark" -mkdir -p "${IDIR}/epan" -mkdir -p "${IDIR}/epan/crypt" -mkdir -p "${IDIR}/epan/ftypes" -mkdir -p "${IDIR}/epan/dfilter" -mkdir -p "${IDIR}/epan/dissectors" -mkdir -p "${IDIR}/wiretap" -mkdir -p "${IDIR}/wsutil" -mkdir -p "${IDIR}/wsutil/wmem" mkdir -p %{buildroot}%{_udevrulesdir} -install -m 644 %{_vpath_builddir}/config.h epan/register.h "${IDIR}/" -install -m 644 %{_vpath_builddir}/ws_version.h "${IDIR}/" -install -m 644 cfile.h file.h "${IDIR}/" -install -m 644 epan/*.h "${IDIR}/epan/" -install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt" -install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes" -install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" -install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" -install -m 644 wiretap/*.h "${IDIR}/wiretap" -install -m 644 wsutil/*.h "${IDIR}/wsutil" -install -m 644 wsutil/wmem/*.h "${IDIR}/wsutil/wmem" -install -m 644 include/*.h "${IDIR}/" install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir} install -Dpm 644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf @@ -290,11 +271,16 @@ fi %files devel %doc doc/README.* ChangeLog -%{_includedir}/wireshark +%dir %{_includedir}/wireshark +%{_includedir}/wireshark/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/%{name}/*.cmake %changelog +* Fri Sep 20 2024 Michal Ruprich - 1:4.4.0-2 +- Using cmake install for development headers and .cmake files + * Thu Aug 29 2024 Michal Ruprich - 1:4.4.0-1 - New version 4.4.0 From f6940146952d48f96dec3a462e6cab53d4ec6396 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 11 Oct 2024 10:33:05 +0200 Subject: [PATCH 086/120] New version 4.4.1 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 70d9c89..9776c68 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.4.0.tar.xz) = a00275ffcc7c5bdf546e3e1c95a2fa77b86232d008f77b1b2f3de8e63f1862321d7a439cba2d136be4407131e07e20071d972a4efb7db2bc55388a347f47ce9e -SHA512 (SIGNATURES-4.4.0.txt) = ea26f56ad55d4f9d7faaab1bd0529f363ae715d1a187acf0008a23f1b91a0b5865918402a5596dfd74195ad07a49d040a01316c1c1ece1e5981ce8644a1343f7 +SHA512 (SIGNATURES-4.4.1.txt) = 145c6739d092f0068666c4317b58efdfd34690511ff30797c0fa153abc847f96fb84ea8bde4e09c681ca28b32ddb7dc25683c8e40ccb55b83c23328f2e732f62 +SHA512 (wireshark-4.4.1.tar.xz) = 66c5e035a5a0d2bbb82fba67b652e0e37c296ab470da59b8ed71ef4e6d6d061d6a2649b5af544b737cdf31d808a7f8f07a64a9e4d805674ce8965eff23081de4 diff --git a/wireshark.spec b/wireshark.spec index 3f09afc..68836fc 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.4.0 -Release: 2%{?dist} +Version: 4.4.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) Url: http://www.wireshark.org/ @@ -278,6 +278,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Thu Oct 10 2024 Michal Ruprich - 1:4.4.1-1 +- New version 4.4.1 + * Fri Sep 20 2024 Michal Ruprich - 1:4.4.0-2 - Using cmake install for development headers and .cmake files From 3e218c38e74c94e08928315ba44af76c026b2b27 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 21 Nov 2024 10:35:42 +0100 Subject: [PATCH 087/120] New version 4.4.2 --- sources | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 9776c68..1a22b48 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (SIGNATURES-4.4.1.txt) = 145c6739d092f0068666c4317b58efdfd34690511ff30797c0fa153abc847f96fb84ea8bde4e09c681ca28b32ddb7dc25683c8e40ccb55b83c23328f2e732f62 -SHA512 (wireshark-4.4.1.tar.xz) = 66c5e035a5a0d2bbb82fba67b652e0e37c296ab470da59b8ed71ef4e6d6d061d6a2649b5af544b737cdf31d808a7f8f07a64a9e4d805674ce8965eff23081de4 +SHA512 (wireshark-4.4.2.tar.xz) = df80c98a2d00ba46a853acfe3aec9dfc0d4484f490a276b8b8390b6d108634b7e0fa38e8f02f8d93afe5c2394c463a0d89611027032898d7d0390d2111b70ca6 +SHA512 (SIGNATURES-4.4.2.txt) = c809085b69c909702b3390b93891a19b8a8c0812d448ac9399eb59991618737b3bfeb737bd569267dcffc46290d59b34664f967e88c1a38b1678faaecd76d445 diff --git a/wireshark.spec b/wireshark.spec index 68836fc..e1dcddc 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,7 +5,7 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.4.1 +Version: 4.4.2 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) @@ -278,6 +278,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Thu Nov 21 2024 Michal Ruprich - 1:4.4.2-1 +- New version 4.4.2 + * Thu Oct 10 2024 Michal Ruprich - 1:4.4.1-1 - New version 4.4.1 From 3b5e1ca1f0e235fe7eddaef8a3fd33a66458714a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:05:45 +0000 Subject: [PATCH 088/120] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wireshark.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wireshark.spec b/wireshark.spec index e1dcddc..d9f0d56 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.4.2 -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/ @@ -278,6 +278,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1:4.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Nov 21 2024 Michal Ruprich - 1:4.4.2-1 - New version 4.4.2 From df5d338c91c0f454e44ef9edbe5368079dcef468 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 22 Jan 2025 12:20:15 +0100 Subject: [PATCH 089/120] New version 4.4.3 --- sources | 4 ++-- wireshark.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 1a22b48..a6b1cec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-4.4.2.tar.xz) = df80c98a2d00ba46a853acfe3aec9dfc0d4484f490a276b8b8390b6d108634b7e0fa38e8f02f8d93afe5c2394c463a0d89611027032898d7d0390d2111b70ca6 -SHA512 (SIGNATURES-4.4.2.txt) = c809085b69c909702b3390b93891a19b8a8c0812d448ac9399eb59991618737b3bfeb737bd569267dcffc46290d59b34664f967e88c1a38b1678faaecd76d445 +SHA512 (wireshark-4.4.3.tar.xz) = d100b562fbd452f52945502ecd918b26a15084b9c942754af43ffb221d49229f5a93eafd18b9bacc0cfcd60a38935d51a6ac809a2060d65faf1157ec9dae16e7 +SHA512 (SIGNATURES-4.4.3.txt) = 5dfbc85bb41b009022cd67148c44051971e2c3f0bf865c4755a41596b25f9018bae125cda3477c5e7d19f9a0c1c60de424ddbad60abd4b19da697349849c8b9b diff --git a/wireshark.spec b/wireshark.spec index d9f0d56..dc7f8e6 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -5,8 +5,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 4.4.2 -Release: 2%{?dist} +Version: 4.4.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/ @@ -278,6 +278,9 @@ fi %{_libdir}/cmake/%{name}/*.cmake %changelog +* Wed Jan 22 2025 Michal Ruprich - 1:4.4.3-1 +- New version 4.4.3 + * Sun Jan 19 2025 Fedora Release Engineering - 1:4.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 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 090/120] 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 091/120] 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 092/120] 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 093/120] 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 094/120] 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 095/120] 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 096/120] 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 097/120] 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 098/120] 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 099/120] 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 100/120] 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 101/120] 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 102/120] 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 103/120] 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 104/120] 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 105/120] 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 106/120] 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 107/120] 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 108/120] 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 109/120] 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 110/120] 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 111/120] 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 112/120] 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 113/120] 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 114/120] 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 115/120] 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 116/120] 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 117/120] 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 118/120] 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 119/120] 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 120/120] 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