From 14c3a4d97869d2fd67df80d58c7773ee6407460e Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Mon, 6 Apr 2020 14:55:04 +0200 Subject: [PATCH 01/10] 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 7d7f314c6e3f30096b990b8c909d1fddf68dab92 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 22 May 2020 10:29:18 +0200 Subject: [PATCH 02/10] 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 a45ede1dc9d055bb1f7c6e7801acc5bdfc7ff1c6 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 2 Jul 2020 14:50:14 +0200 Subject: [PATCH 03/10] 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 878a05fc884c8dfa5b7520be1f71d021c1b6a271 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 30 Jul 2020 15:38:28 +0200 Subject: [PATCH 04/10] 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 8fca215a55ddd3ecd44220eeb0f88e16cedbb2ee Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 19 Aug 2020 10:20:20 +0200 Subject: [PATCH 05/10] 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 7ba536c11dcb9f53dcb78583cdaa01fe6c532100 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 9 Oct 2020 09:49:59 +0200 Subject: [PATCH 06/10] 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 acc398e6bbb4c517adf3aba482ef63bf006d2516 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 3 Dec 2020 15:05:10 +0100 Subject: [PATCH 07/10] 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 5b0d900df66f3593ac301295f81d28ce81c014aa Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 29 Jan 2021 14:01:38 +0100 Subject: [PATCH 08/10] 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 47808811b55bdb67a70af90fb8f47f1e7fc7019f Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 16 Feb 2021 14:22:44 +0100 Subject: [PATCH 09/10] 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 d79d166c75e1e8a0560bbece5efe738f55f74efe Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Tue, 16 Mar 2021 10:55:39 +0100 Subject: [PATCH 10/10] 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