From ded8393c8fe626f20ea272e0c77e943033c3e49feafc7068c600729c80d0addf Mon Sep 17 00:00:00 2001 From: Robert Frohl Date: Thu, 6 Oct 2022 09:31:31 +0000 Subject: [PATCH] Accepting request 1008362 from home:rfrohl:branches:network:utilities wireshark 4.0.0 OBS-URL: https://build.opensuse.org/request/show/1008362 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=377 --- wireshark-0001-pkgconfig.patch | 22 ------- ...shark-0010-dumpcap-permission-denied.patch | 8 +-- wireshark-3.6.8.tar.xz | 3 - wireshark-3.6.8.tar.xz.hash | 61 ------------------- wireshark-4.0.0.tar.xz | 3 + wireshark-4.0.0.tar.xz.hash | 49 +++++++++++++++ wireshark.changes | 14 +++++ wireshark.spec | 24 +++----- 8 files changed, 77 insertions(+), 107 deletions(-) delete mode 100644 wireshark-0001-pkgconfig.patch delete mode 100644 wireshark-3.6.8.tar.xz delete mode 100644 wireshark-3.6.8.tar.xz.hash create mode 100644 wireshark-4.0.0.tar.xz create mode 100644 wireshark-4.0.0.tar.xz.hash diff --git a/wireshark-0001-pkgconfig.patch b/wireshark-0001-pkgconfig.patch deleted file mode 100644 index 10cfa32..0000000 --- a/wireshark-0001-pkgconfig.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit ca61ee833ac886345ae5e6f4c239da7eae72f027 -Author: Robert Frohl -Date: Tue Jan 18 10:32:42 2022 +0100 - - wmem_alloc() moved from libwireshark.so to libwsutil.so with 3.6.x - - Some external plugins use wmem_alloc() like wireshark-plugin-libvirt. - The linker needs to find it it after the move. - - Fixes wireshark/wireshark#17889 - -diff --git a/wireshark.pc.in b/wireshark.pc.in -index 588917812b..e755614bba 100644 ---- a/wireshark.pc.in -+++ b/wireshark.pc.in -@@ -10,5 +10,5 @@ Description: Network Packet Dissection Library - Version: @VERSION@ - - Requires: glib-2.0, gmodule-2.0, gthread-2.0 --Libs: -L${libdir} -lwireshark -+Libs: -L${libdir} -lwireshark -lwsutil - Cflags: -I${includedir}/wireshark diff --git a/wireshark-0010-dumpcap-permission-denied.patch b/wireshark-0010-dumpcap-permission-denied.patch index 8ea380f..0359ac1 100644 --- a/wireshark-0010-dumpcap-permission-denied.patch +++ b/wireshark-0010-dumpcap-permission-denied.patch @@ -27,7 +27,7 @@ index f31914886a..d3baab6c50 100644 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) { + struct stat statbuf; @@ -38,7 +38,7 @@ index f31914886a..d3baab6c50 100644 + } + } + } -+ g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", ++ snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", + argv[0], g_strerror(errno), grp_warning); + free(grp_warning); sync_pipe_errmsg_to_parent(2, errmsg, ""); @@ -56,7 +56,7 @@ index f31914886a..d3baab6c50 100644 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)); + if (errno == EPERM || errno == EACCES) { + struct stat statbuf; @@ -67,7 +67,7 @@ index f31914886a..d3baab6c50 100644 + } + } + } -+ g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", ++ snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", + argv[0], g_strerror(errno), grp_warning); + free(grp_warning); sync_pipe_errmsg_to_parent(2, errmsg, ""); diff --git a/wireshark-3.6.8.tar.xz b/wireshark-3.6.8.tar.xz deleted file mode 100644 index cbc0a1a..0000000 --- a/wireshark-3.6.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67ab23ee09a646ab8cc0ddcc985209f24f253337461e3d9644c6cfe1c097260c -size 39942580 diff --git a/wireshark-3.6.8.tar.xz.hash b/wireshark-3.6.8.tar.xz.hash deleted file mode 100644 index 709ce2f..0000000 --- a/wireshark-3.6.8.tar.xz.hash +++ /dev/null @@ -1,61 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -wireshark-3.6.8.tar.xz: 39942580 bytes -SHA256(wireshark-3.6.8.tar.xz)=67ab23ee09a646ab8cc0ddcc985209f24f253337461e3d9644c6cfe1c097260c -SHA1(wireshark-3.6.8.tar.xz)=e4b2cb5703f9d6cf0934469a2e8a2426cb308dad - -Wireshark-win64-3.6.8.exe: 77301408 bytes -SHA256(Wireshark-win64-3.6.8.exe)=17ce19def77592d4c0fb0b680e77e4712dd6c8c4af79c6d58a281eb509a4f34b -SHA1(Wireshark-win64-3.6.8.exe)=2160b0a85bf8131c7e9a912a4364f5019f98000d - -Wireshark-win32-3.6.8.exe: 61106552 bytes -SHA256(Wireshark-win32-3.6.8.exe)=332aff4889f73ee1daf656e3411554685796a51f8059e2cd531bb60fb754799c -SHA1(Wireshark-win32-3.6.8.exe)=a74431156d5f85c0cd51094200ebb32a603be79e - -Wireshark-win64-3.6.8.msi: 51019776 bytes -SHA256(Wireshark-win64-3.6.8.msi)=f0558d461a902cccdf35f44462e4bc9a0726ca8b0a90ceaa5854b10f0d49c325 -SHA1(Wireshark-win64-3.6.8.msi)=358696df8ebe3eaba626d0e59c5364577f225f36 - -Wireshark-win32-3.6.8.msi: 45662208 bytes -SHA256(Wireshark-win32-3.6.8.msi)=1028e5f498acf941fad4aa387f7bdbcc419389d1241e02333fa824ec48a87b7b -SHA1(Wireshark-win32-3.6.8.msi)=163404a19abbc20bd435c037c0d84b3fd4d886e9 - -WiresharkPortable32_3.6.8.paf.exe: 39683296 bytes -SHA256(WiresharkPortable32_3.6.8.paf.exe)=2a28cf101f35e8f6a53c3d973779d5ea940488b09a9b9ca09f4567c9da27dfa1 -SHA1(WiresharkPortable32_3.6.8.paf.exe)=ee1746e9a2bae5f148278f8834084ae716661474 - -WiresharkPortable64_3.6.8.paf.exe: 44428832 bytes -SHA256(WiresharkPortable64_3.6.8.paf.exe)=dd3c3a488c4aafc8ed87d7ed3a2abd64c2f8ee47eaf0676895d4b3ce986b0903 -SHA1(WiresharkPortable64_3.6.8.paf.exe)=5a616cf739a7675eaef8f9c18117153f4f5e186f - -Wireshark 3.6.8 Arm 64.dmg: 137659040 bytes -SHA256(Wireshark 3.6.8 Arm 64.dmg)=ae1735b05050da20d1a8d2d5c209bcd20743745ac23473bf034631f5b963970a -SHA1(Wireshark 3.6.8 Arm 64.dmg)=b5b6108ae0166b6d8b53473598e4fded1f57abb2 - -Wireshark 3.6.8 Intel 64.dmg: 139390338 bytes -SHA256(Wireshark 3.6.8 Intel 64.dmg)=c1e54f1af933486ac60da94bb1a366df5125959ef416e1a93c2a2fb9de78efa0 -SHA1(Wireshark 3.6.8 Intel 64.dmg)=8bf551f8e6c98ccdba95af3cc5912772af857f79 - -You can validate these hashes using the following commands (among others): - - Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256 - Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz - macOS: shasum -a 256 "Wireshark x.y.z Arm 64.dmg" - Other: openssl sha256 wireshark-x.y.z.tar.xz ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmMY3zAACgkQgiRKeOb+ -ruo0aBAAqAehgDXw+EgguywnW+hyUJ1epIps3/efQLpb/jw7nBlx+kMHdtRMlnhi -VcMnxBcjTxLwvbXNA1ijyEpnTNrr0IBgtDZfysT+jOJB6HAmnJBOHnW5krEQJfs/ -BurU39+mAFVAGnG96Ezm0AXfd5/0rYlwuwRQY7sBJZTcPLgRbBNAx9V2FXcB8gPJ -jtrQZd9iGVyn/dppjNVWCMJoZ9hDaiBdvRu9QFx2gPaAAH1IpHAuy5gpUKWNwHi3 -CFRoCk7WEhrLZRyAc2gxJxg72dWpu/Qm0NgoiwNEGDPZbPsOGsQR7vrxEhj20kh1 -mQ+nNdM07wfneW3YIBywOH8saqe9Vd0BBTKKi0A00gVokOTFzCaWuW49mlsa9nlF -P6vKjx1lqKQT1EKkyGLwp8X/oKRjTYeLAcVhfCzTtYSXRZEYT+Ld8b90m724qq1b -WY5E2YWHwCeKEEPCV26WUuynzhgpaiSjCFfPi+QKJfBpqqBYsHga/F7XRr+cjZ6u -y5dr+C+BkyIkIklNMOKUlQkdAdKaReYtWG7ZxU1QNO4Z0vcEJMTyCY1+lhbpqXp6 -WUpb/JrpxLcIbruN05CoyCwRxL3YT6myoMFUFywRZqOcBgEcJShRJUMvPsR2lszv -OwRcNNiVgLPzx+8eXiF8Dr6EGmkyWiOPJ4M2uE5CmvWmWAwIHWc= -=GXjp ------END PGP SIGNATURE----- diff --git a/wireshark-4.0.0.tar.xz b/wireshark-4.0.0.tar.xz new file mode 100644 index 0000000..a1c0ceb --- /dev/null +++ b/wireshark-4.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dc125ef85e85c2a756a74cc739b3eb11ce38e30a08e085e77d378ee7fdcaded +size 41323336 diff --git a/wireshark-4.0.0.tar.xz.hash b/wireshark-4.0.0.tar.xz.hash new file mode 100644 index 0000000..3fb1aae --- /dev/null +++ b/wireshark-4.0.0.tar.xz.hash @@ -0,0 +1,49 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +wireshark-4.0.0.tar.xz: 41323336 bytes +SHA256(wireshark-4.0.0.tar.xz)=3dc125ef85e85c2a756a74cc739b3eb11ce38e30a08e085e77d378ee7fdcaded +SHA1(wireshark-4.0.0.tar.xz)=2a495346c46dadeb405d0b89cec18fe7edc77e1a + +Wireshark-win64-4.0.0.exe: 78091728 bytes +SHA256(Wireshark-win64-4.0.0.exe)=aa4c3ae9d50113785c83b441cfdfdf484a308aa7d37bacb5803561e4d1c12902 +SHA1(Wireshark-win64-4.0.0.exe)=68a75a061db880ad0ed0b76ea37e38826c85d4e5 + +Wireshark-win64-4.0.0.msi: 51367936 bytes +SHA256(Wireshark-win64-4.0.0.msi)=e5c5d6c2e1f3dc6a0e31fb002f740158f741eb3a8d16cba8a418858366093e3f +SHA1(Wireshark-win64-4.0.0.msi)=9bbf17ed4deed17b81f411ff12732f2b2b3e497c + +WiresharkPortable64_4.0.0.paf.exe: 44811552 bytes +SHA256(WiresharkPortable64_4.0.0.paf.exe)=c36ad45773a17330e12ad2721a5518c30f5d96f62b3dbdae9b0f1175a7e419ea +SHA1(WiresharkPortable64_4.0.0.paf.exe)=8e98c7ac853e8fd7a2260133cdb43332fab1895d + +Wireshark 4.0.0 Arm 64.dmg: 62666456 bytes +SHA256(Wireshark 4.0.0 Arm 64.dmg)=acaf18778bc0025e48ac5b8795ae8c5adcadcd662c18bd6f8a232381f0bdbc34 +SHA1(Wireshark 4.0.0 Arm 64.dmg)=b054a29805b3cce5a577058e366f86400e80e2cb + +Wireshark 4.0.0 Intel 64.dmg: 65628576 bytes +SHA256(Wireshark 4.0.0 Intel 64.dmg)=3880cd9ad35ccdb233a757461ddc8821f26be0a4771fcbc46ccd6d7adca15903 +SHA1(Wireshark 4.0.0 Intel 64.dmg)=73b2ab66821a3af35181b53eff442aa140ea6ed6 + +You can validate these hashes using the following commands (among others): + + Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256 + Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz + macOS: shasum -a 256 "Wireshark x.y.z Arm 64.dmg" + Other: openssl sha256 wireshark-x.y.z.tar.xz +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmM8w9kACgkQgiRKeOb+ +rupN6RAA5tW3YEcFiWiWrh9H16X6jqQjZ0/PyHm/USmB51FikmXUg06uy3rqAQZS +oeDYlquBrv/0D/d7242TYehD6DMYUmUVZoMV/FEpO+NkK/sp10B29A29slQKaBrJ +687gVs403XOqXp5ujfbwcMUd+hge+eceYepawnh41JXGP7Yan7CH21N5i+2JWyLw +FqVIjqLzvJaRN8Z53SU+OVoBlMa3m12ZsBflwWfDRWv2TTxKDlr76o9RX8ccq632 +DdZjXImskYu/Hovp7ewOz95eey/USkAyXEBBnhtGWCZSwe+Ykox5K1PcX/xAqg+b +BkR7LfU2Wn14Y1dQ7Kw3f/kVtV7TU7KfbRGiVBmhBbjVljAlGpmrdMEiqGcA1Uj8 +FReoHduyhDrabqZfuWr9ZRY21ahm7Si5P6aHmS4pF3KYwP33c9iaP3ONt41rctYl +Q1t96SDVJMYloAzKLzMIUAqWF7xWbMRYjZRmO9ucAU5GfH2pFZBftmmGOJm73/BV +sKvfCN7VyNPhXA4GOePIkIWtlfhUPMODmkrNxoNhryRbdJiJj+vom5ItyAm3TJOE +Zy5kKywTmG/4gmYAfqZW5TSSOXOMbLS5mu8XzIi1l1k0OvBZGOncGFz2ZtqhFfgj +azXWK6BfS+ygdjQAFvhI37t3CjvveqPNjjBgkvWpm1vYZunbuTc= +=8Lk3 +-----END PGP SIGNATURE----- diff --git a/wireshark.changes b/wireshark.changes index 28a1564..5670cbf 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Oct 5 15:01:15 UTC 2022 - Robert Frohl + +- Wireshark 4.0.0: + * The display filter syntax is more powerful with many new extensions. + * The Conversation and Endpoint dialogs have been redesigned. + * The default main window layout has been changed so that the Packet Detail and Packet Bytes are side by side underneath the Packet List pane. + * Hex dump imports from Wireshark and from text2pcap have been improved. + * Speed when using MaxMind geolocation has been greatly improved. +- Further features, bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-4.0.0.html +- updated wireshark-0010-dumpcap-permission-denied.patch +- dropped wireshark-0001-pkgconfig.patch which was accepted upstream + ------------------------------------------------------------------- Thu Sep 8 07:45:05 UTC 2022 - Robert Frohl diff --git a/wireshark.spec b/wireshark.spec index 955e3de..8bdcd88 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -18,9 +18,9 @@ # define libraries %define libcodecs libwscodecs2 -%define libtap libwiretap12 -%define libutil libwsutil13 -%define libwire libwireshark15 +%define libtap libwiretap13 +%define libutil libwsutil14 +%define libwire libwireshark16 %define org_name org.wireshark.Wireshark %if 0%{?suse_version} >= 1500 %bcond_without lz4 @@ -28,7 +28,7 @@ %bcond_with lz4 %endif Name: wireshark -Version: 3.6.8 +Version: 4.0.0 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -39,8 +39,6 @@ Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt#/%{ Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshark.keyring # PATCH-FIX-UPSTREAM wireshark-0000-wsutil-implicit_declaration_memcpy.patch Patch0: wireshark-0000-wsutil-implicit_declaration_memcpy.patch -# PATCH-FIX-UPSTREAM wireshark-0001-pkgconfig.patch bsc#1194780 -Patch1: wireshark-0001-pkgconfig.patch # PATCH-FEATURE-SLE wireshark-0010-dumpcap-permission-denied.patch bsc#1180102 Patch10: wireshark-0010-dumpcap-permission-denied.patch BuildRequires: %{rb_default_ruby_suffix}-rubygem-asciidoctor @@ -60,6 +58,7 @@ BuildRequires: libpcap-devel BuildRequires: libqt5-linguist-devel BuildRequires: libsmi-devel BuildRequires: libtool +BuildRequires: lua51-devel BuildRequires: net-snmp-devel BuildRequires: openssl-devel BuildRequires: pcre-devel @@ -70,6 +69,7 @@ BuildRequires: spandsp-devel BuildRequires: tcpd-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.3.0 BuildRequires: pkgconfig(Qt5Core) >= 5.3.0 BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Multimedia) @@ -78,6 +78,7 @@ BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(libmaxminddb) BuildRequires: pkgconfig(libnghttp2) +BuildRequires: pkgconfig(libnl-3.0) BuildRequires: pkgconfig(libssh) >= 0.6.0 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libxml-2.0) @@ -103,14 +104,6 @@ BuildRequires: pkgconfig(liblz4) # in openSUSE Leap 42.3, lz4 was incorrectly packaged BuildConflicts: pkgconfig(liblz4) = 124 %endif -%if 0%{?suse_version} > 1310 -BuildRequires: pkgconfig(libnl-3.0) -%endif -%if 0%{?suse_version} > 1320 -BuildRequires: lua51-devel -%else -BuildRequires: lua-devel -%endif %description Wireshark is a network protocol analyzer. It allows examining data @@ -226,8 +219,6 @@ install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wsutil/*.h "${IDIR}/wsutil" -install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark.png -install -D -m 0644 %{org_name}.desktop %{buildroot}%{_datadir}/applications/%{org_name}.desktop %suse_update_desktop_file %{org_name} rm -f %{buildroot}%{_datadir}/doc/wireshark/*.html @@ -290,7 +281,6 @@ exit 0 %{_bindir}/wireshark %{_bindir}/ethereal %{_datadir}/applications/%{org_name}.desktop -%{_datadir}/pixmaps/wireshark.png %{_datadir}/icons/hicolor/*/apps/%{org_name}.png %{_datadir}/icons/hicolor/*/mimetypes/%{org_name}-mimetype.png %{_datadir}/icons/hicolor/scalable/apps/%{org_name}.svg