rpm/wireshark
SHA256
1
0
Fork 0
forked from pool/wireshark
Code Pull Requests Activity

Accepting request 887485 from network:utilities

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/887485
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=173
This commit is contained in:
Dominique Leuenberger 2021-04-24 21:06:48 +00:00 committed by Git OBS Bridge
commit de61fcda8b
9 changed files with 82 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmake_3-20_compatibility_1.patch
View File

@ -1,31 +0,0 @@
commit 22cf2cb345b16f9783165e9cfc80ed9a97a11ca0
Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
Date: Mon Mar 29 01:32:20 2021 +0100
CMake: Set CMake Policy CMP0071 to NEW
This policy says: "Since version 3.10, CMake processes regular and GENERATED
source files in AUTOMOC and AUTOUIC. In earlier CMake versions, only regular
source files were processed. GENERATED source files were ignored silently."
We are currently running AUTOMOC/RCC/UIC on too many files unnecessarily and
that should be improved. CMake 3.20 introduced some changes related with this
that broke the build (issue #17314) and need further investigation.
Meanwhile setting this policy to NEW shouldn't break anything and silences
some noisy CMake warnings.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99ce96ba3c..fc2d491783 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,9 @@ endif()
if(POLICY CMP0069)
cmake_policy(SET CMP0069 NEW)
endif()
+if(POLICY CMP0071)
+ cmake_policy(SET CMP0071 NEW)
+endif()
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()

45
cmake_3-20_compatibility_2.patch
View File

@ -1,45 +0,0 @@
commit 4adb329c48fdc708f3911e9e785304cb7d1ad6ab
Author: Gerald Combs <gerald@wireshark.org>
Date: Fri Mar 26 12:52:01 2021 -0700
CMake: Enable AUTO{MOC,UIC,RCC} earlier.
Enable CMAKE_AUTOMOC, CMAKE_AUTOUIC, and CMAKE_AUTORCC before searching
for Qt packages. This is apparently required for CMake 3.20.0 and later.
Fixes #17314.
(cherry picked from commit be2b0fc810fb2f2a80e471138dc29f0cbe87b209)
Conflicts:
ui/qt/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc96707896..e99d486711 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1094,6 +1094,10 @@ ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD)
# Build the Qt GUI?
if(BUILD_wireshark)
+ set(CMAKE_AUTOMOC ON)
+ set(CMAKE_AUTOUIC ON)
+ set(CMAKE_AUTORCC ON)
+
# Untested, may not work if CMAKE_PREFIX_PATH gets overwritten
# somewhere. The if WIN32 in this place is annoying as well.
if(WIN32)
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 20f46802a1..85993a1c71 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -611,10 +611,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
-set(CMAKE_AUTOMOC TRUE)
-set(CMAKE_AUTOUIC TRUE)
-set(CMAKE_AUTORCC TRUE)
-
if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9")
# Drop the file modification time of source files from generated files
# to help with reproducible builds. We do not use QFileInfo.lastModified

312
wireshark-0008-move-glib.patch
View File

@ -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 <glib.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
-
/*
* 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 <glib.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
-
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 <glib.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
#include <epan/tvbuff.h>
#include <epan/prefs.h>
#include <epan/frame_data.h>
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 <glib.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
-
#include <epan/params.h>
#include <epan/range.h>
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 <glib.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
#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 <glib.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
#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 <glib.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
-
#include <epan/range.h>
#include <epan/frame_data.h>
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 <glib.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
#include <stdio.h>
#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 <glib.h>
+
/** @file
* "RTP Player" dialog box common routines.
* @ingroup main_ui_group
@@ -24,8 +26,6 @@
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
-
/****************************************************************************/
/* 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 <glib.h>
+
/** @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 <glib.h>
#include <stdio.h>
#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 <glib.h>
+
/** @file
* "VoIP Calls" dialog box common routines.
* @ingroup main_ui_group
@@ -31,7 +33,6 @@
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
#include <stdio.h>
#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 <glib.h>
+
#include "config.h"
#include "ws_symbol_export.h"
@@ -19,8 +21,6 @@
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
-
#ifdef _WIN32
#include <io.h> /* for _read(), _write(), etc. */
#include <gmodule.h>
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 <glib.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
#include <gmodule.h>
-
#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 <glib.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include <glib.h>
-
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 */

3
wireshark-3.4.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:729cd11e9715c600e5ad74ca472bacf8af32c20902192d5f2b271268511d4d29
size 32290424

60
wireshark-3.4.4.tar.xz.asc
View File

@ -1,60 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-3.4.4.tar.xz: 32290424 bytes
SHA256(wireshark-3.4.4.tar.xz)=729cd11e9715c600e5ad74ca472bacf8af32c20902192d5f2b271268511d4d29
RIPEMD160(wireshark-3.4.4.tar.xz)=677c151b94af472ae3ae390e51781ec0cc371ddd
SHA1(wireshark-3.4.4.tar.xz)=fa5c553596dcc6a59735f96a9a0845e3c40abab2
Wireshark-win64-3.4.4.exe: 61473376 bytes
SHA256(Wireshark-win64-3.4.4.exe)=568d5b3f7dcca301d4f4069b72fd458cd6fb9562c4f06227ccb2a1804b260b26
RIPEMD160(Wireshark-win64-3.4.4.exe)=6b96ee9476eb489c73c0492a9f4280d89b816f78
SHA1(Wireshark-win64-3.4.4.exe)=6a9d141fdb5f7ca20542b30ab6292cc3122ff051
Wireshark-win32-3.4.4.exe: 56510344 bytes
SHA256(Wireshark-win32-3.4.4.exe)=673b677da839d3fe2840e5b0cf3fc243550c9c927d1ae2a933357da2c915e215
RIPEMD160(Wireshark-win32-3.4.4.exe)=cea7826baf220ccd8c3bcd512372560fed32e982
SHA1(Wireshark-win32-3.4.4.exe)=b36eb29de4ad7e5c220b2cc86482946e504ea7c5
Wireshark-win64-3.4.4.msi: 49799168 bytes
SHA256(Wireshark-win64-3.4.4.msi)=1e8829be797e3668b17db8407e93dd045095034b520d0d4f0178c7bda159fba5
RIPEMD160(Wireshark-win64-3.4.4.msi)=52dae81fc928431bd3b40adb9daf4d1038b6397e
SHA1(Wireshark-win64-3.4.4.msi)=6ce20d8985bc7c91a4b1ae11794f17d3f2fbfd69
Wireshark-win32-3.4.4.msi: 44765184 bytes
SHA256(Wireshark-win32-3.4.4.msi)=dc4f5d8f07e866ff5bfb2dd963daaaf8556d8e8ba768cf45839c7a9f955bfb07
RIPEMD160(Wireshark-win32-3.4.4.msi)=125999a47e7505f3ac7dc5cb68ec599265b3f6f7
SHA1(Wireshark-win32-3.4.4.msi)=c38bc9105e2badf609865b140ad3a366dc96a796
WiresharkPortable_3.4.4.paf.exe: 38391936 bytes
SHA256(WiresharkPortable_3.4.4.paf.exe)=494567df57b8cce9f66d1c2167b86fa8e29d4509eef2a938ece22ad6e82b0ce5
RIPEMD160(WiresharkPortable_3.4.4.paf.exe)=5a2429471f8e533a7cabe97fa6967f5318fe4ec0
SHA1(WiresharkPortable_3.4.4.paf.exe)=39bddbade8230e4cc21f0be9c4ffd0194a497047
Wireshark 3.4.4 Intel 64.dmg: 130951404 bytes
SHA256(Wireshark 3.4.4 Intel 64.dmg)=23cee0b900ef2d421ae190c8226bea2a5ac834e02925778202e3ed4c75e9da6f
RIPEMD160(Wireshark 3.4.4 Intel 64.dmg)=9f167b7c3063f616dd522f8f7f70e17d8b75997d
SHA1(Wireshark 3.4.4 Intel 64.dmg)=2b538e068a1d0e8ef37cdae0c2d45ba3ef1b63b7
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 Intel 64.dmg"
Other: openssl sha256 wireshark-x.y.z.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmBJH8sACgkQgiRKeOb+
rupySA//fac78zQqP48trG/MF3Xz53/TAPjTJH1tcrXRQqIlMyLm/cT5oMEUEfm3
lc7Jzn9wNkrxRTRNJ6jwn2JjKqnIT3XI4cdkZPq/99hI0ob/nK1MjaeJ51XiYJ2E
8y0eU+Rcig9eOX6S5M+O0wQiN/rXpD5JuY3OZsh55C1R+cxiDkNL5AknuwByxaCr
WTw8nTBOvMG5RiKVPyPQYEX6vCmulFzIx97zO20FBUbncKec6BA/h5t93tf55N6e
NmV7cQm/lu41r+t0dBWa4fe/7+XI2NHTbPcgYpIWlviNVzUpY85smXIB2fGoLnmd
kR/TLDDLj5fXjz09P0psRxvNPbSv9St5CAIlPNgESwL8H7us/FOkoiSkcYEySG7p
E4nQ9Q0zCfw0OkNdRvyyuJaiFYWt3BktfpWRgqAZKOHIJl7WR/nY3+Ut4BG3XtC8
IznUHo9M4dXBYYWd+BYCScpD1+yEHFnATf2y52MHUAackdg/+piNrFnBiJ69KrvE
3jET1MpKqIvfe6/QOSJs4Fyd89x/gRhzxWxtxXXieeEhTuqSRvktecq0P9raGlbZ
QcKJ+7D/uu4C70iHPl/57AzOrAKFKcbhrGed4MUSzuwmTiGy8IiazcHiSVbf3PXQ
ogPHN9sA5uva9z9VqJH/OjHKn7WXmxov5/x65LeIbr6GAKgXW+g=
=Rswq
-----END PGP SIGNATURE-----

3
wireshark-3.4.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333
size 32300144

60
wireshark-3.4.5.tar.xz.asc Normal file
View File

@ -0,0 +1,60 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-3.4.5.tar.xz: 32300144 bytes
SHA256(wireshark-3.4.5.tar.xz)=de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333
RIPEMD160(wireshark-3.4.5.tar.xz)=9f97f8bd34d09cbe6afc2bf655b44940a90154b6
SHA1(wireshark-3.4.5.tar.xz)=d01a9b5f58206fb458fe9fc2dac88ad0ea7152ce
Wireshark-win32-3.4.5.exe: 56531712 bytes
SHA256(Wireshark-win32-3.4.5.exe)=bc46bdc14dac4c67033bc5ad5590e4b221d5724ba28569b9134c13528fa37fed
RIPEMD160(Wireshark-win32-3.4.5.exe)=3ff3fc99c3abd8d1e1fb143140a2e51b3cd66473
SHA1(Wireshark-win32-3.4.5.exe)=14b1372e0a1e1bd709cb0c10d1b21d92bb6a5310
Wireshark-win64-3.4.5.exe: 61475448 bytes
SHA256(Wireshark-win64-3.4.5.exe)=e6a7f8b48221b642b8b0911dd1519d3436a5a90e99525e80f1764bf4938b35e5
RIPEMD160(Wireshark-win64-3.4.5.exe)=047d9c8b23cd7522f2bd1bf03b28c53e0bdfa0d5
SHA1(Wireshark-win64-3.4.5.exe)=501f87fdc7aeaed6c704ee5a4974f02f13b9d7b0
Wireshark-win32-3.4.5.msi: 44761088 bytes
SHA256(Wireshark-win32-3.4.5.msi)=381aeaac7fbd7d7fbfc45292caf93de2bdbf46f57fa30e6af0d6522ba5350ffb
RIPEMD160(Wireshark-win32-3.4.5.msi)=243ffdf35fc3d92cbf977558441fc3de074815be
SHA1(Wireshark-win32-3.4.5.msi)=ee6ae0bd87052fd1e8a59102df7351a557b27c5d
Wireshark-win64-3.4.5.msi: 49807360 bytes
SHA256(Wireshark-win64-3.4.5.msi)=e6a94b71faaf29c5c3804dcb6aabb26d1d7bf3cbece502fc1f119830d3ea8abf
RIPEMD160(Wireshark-win64-3.4.5.msi)=527b4aa7eff5bd90ba305ef927276cef645cdb4b
SHA1(Wireshark-win64-3.4.5.msi)=c41d1dbb84b77987fcde157d6dddd7b954a186af
WiresharkPortable_3.4.5.paf.exe: 38402968 bytes
SHA256(WiresharkPortable_3.4.5.paf.exe)=210c688bf7f4efb0995e25939de64d611faf6400798f6eb4b3c9c1f168f522c5
RIPEMD160(WiresharkPortable_3.4.5.paf.exe)=a61a7f8de529a274b256a3c407d04a3c9564d542
SHA1(WiresharkPortable_3.4.5.paf.exe)=2b91c30068d9504339dde4d9ed603f71f45ac15f
Wireshark 3.4.5 Intel 64.dmg: 130985157 bytes
SHA256(Wireshark 3.4.5 Intel 64.dmg)=d5565b525d71a9effe64ff4a84b896c9ce0d0d34959a8e9d2f7093dcf3c8ca68
RIPEMD160(Wireshark 3.4.5 Intel 64.dmg)=933200a194579946dcb5b42b018fc0abbe6375db
SHA1(Wireshark 3.4.5 Intel 64.dmg)=c0b6bf94349451230724c1e320750136f82d4f4b
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 Intel 64.dmg"
Other: openssl sha256 wireshark-x.y.z.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmCAb4AACgkQgiRKeOb+
rur5zw/9H2hx3aoA40DeoS8fBsGtHd4T9u9nqhwpmpRfVvIOJNL35CQPAykOaDOV
HxtlCzJ2g2thxTwqZFTsL95t1xlgZuLWXQ9htrtUyTxeNaDV4zXe5fALcgrUuy6v
lsQsGeTyu0XnCnrj5IGRbd7aYR72vCt8tTIP4kC7lgDFTunMvRQW1A5nURCxGVOK
2+O4Gk64Oh1l1LZCEfKfGkpt7cT0QziOcb5Kk62qCdf45oluM8UIa/9PmT2jwMW8
VSotJxoj5vubYJiek16FUFcQwIpYQ28rGoBjquCkeHaY07S+E3fhHCmMOZ92tyCB
GwRbcxDpmRFywzOncU9j3c1zpBIB3DldmTVYICySDUT0cGR/2d/lJ7FePO36pTJv
zgHkIiGBd06O+nkVOgz6LnBq+TsWa2MbDNQ8jPz5g0IdBYe5OG3A5OvHn/BYFeuc
wCJeNA7qYBK9tBYWuFkuUZBHG83shfmmsb1uOCXn4/vbw/BiaLmQQCHXnk4kvRcK
3iWMtLGFlVgWhl1cqbUERWrOeTJjHKHkTDZPjn8RabMDxQ/wxbKLIPik/CyQyFKh
H4QQvWAHelB147JWf6bzQXU7zHTFguftzDSpw90afMMTbGHh9G7O89mN4D4smjfE
uwJIuTD8yyQnKoWk45LTmwTig/NcrYEsLrJijhnEuMA/+gYBaPc=
=UqYi
-----END PGP SIGNATURE-----

18
wireshark.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Apr 22 07:18:30 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
- Wireshark 3.4.5:
* CVE-2021-22207: MS-WSP dissector excessive memory consumption
(boo#1185128, wnpa-sec-2021-04)
* Fix TShark not printing GeoIP information
* FIx TShark error when piping to "head"
* Fix missing parts of ASCII representation in Packet Bytes pane
* Fix dissection of NDPE attribute of NAN packet
* Fix TECMP: reserved flag interpreted as part of timestamp
* Fix DNS IXFR/AXFR multiple response
* Fix File too large issue
- drop patches:
* cmake_3-20_compatibility_1.patch
* cmake_3-20_compatibility_2.patch
* wireshark-0008-move-glib.patch
-------------------------------------------------------------------
Wed Mar 31 15:43:15 UTC 2021 - Robert Frohl <rfrohl@suse.com>

7
wireshark.spec
View File

@ -27,7 +27,7 @@
%bcond_with lz4
%endif
Name: wireshark
Version: 3.4.4
Version: 3.4.5
Release: 0
Summary: A Network Traffic Analyser
License: GPL-2.0-or-later AND GPL-3.0-or-later
@ -36,10 +36,6 @@ URL: https://www.wireshark.org/
Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz
Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt#/%{name}-%{version}.tar.xz.asc
Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshark.keyring
Patch1: cmake_3-20_compatibility_1.patch
Patch2: cmake_3-20_compatibility_2.patch
# Source: https://src.fedoraproject.org/rpms/wireshark/blob/f8e39e79bf25d6c3fb3f333e58f27165cc959781/f/wireshark-0008-move-glib.patch
Patch8: wireshark-0008-move-glib.patch
Patch10: wireshark-0001-dumpcap-permission-denied.patch
BuildRequires: bison
BuildRequires: flex
@ -172,7 +168,6 @@ This package contains the Qt based UI for Wireshark.
%prep
# The publisher doesn't sign the source tarball, but a signatures file containing multiple hashes.
# Verify hashes in that file against source tarball.
echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA1 | head -n1 | cut -d= -f2` %{SOURCE0}" | sha1sum -c
echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA256 | head -n1 | cut -d= -f2` %{SOURCE0}" | sha256sum -c
%autosetup -p1