diff --git a/wireshark-0100-glib-extern.patch b/wireshark-0100-glib-extern.patch new file mode 100644 index 0000000000000000000000000000000000000000..d36cc22764566b9ba9da7580e2b1c9460b78ede2 --- /dev/null +++ b/wireshark-0100-glib-extern.patch @@ -0,0 +1,281 @@ +diff --git a/caputils/capture_ifinfo.h b/caputils/capture_ifinfo.h +index 8e42b64..0e2c792 100644 +--- a/caputils/capture_ifinfo.h ++++ b/caputils/capture_ifinfo.h +@@ -10,12 +10,12 @@ + #ifndef __CAPTURE_IFINFO_H__ + #define __CAPTURE_IFINFO_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include +- + typedef enum { + IF_WIRED, + IF_AIRPCAP, +diff --git a/epan/conversation.h b/epan/conversation.h +index 0059703..480629a 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/epan/dissectors/dissectors.h b/epan/dissectors/dissectors.h +index 5ff81d2..f5c6902 100644 +--- a/epan/dissectors/dissectors.h ++++ b/epan/dissectors/dissectors.h +@@ -13,12 +13,12 @@ + + #include "ws_symbol_export.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 67e54dc..95f47f8 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/epan_dissect.h b/epan/epan_dissect.h +index 956a147..9279892 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/prefs.h b/epan/prefs.h +index 7010a45..29e4eaf 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/register.h b/epan/register.h +index 491badd..1cd4f5d 100644 +--- a/epan/register.h ++++ b/epan/register.h +@@ -13,12 +13,12 @@ + + #include "ws_symbol_export.h" + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include +- + typedef enum { + RA_NONE, /* For initialization */ + RA_DISSECTORS, /* Initializing dissectors */ +diff --git a/epan/value_string.h b/epan/value_string.h +index 5fccabb..e6ddd1a 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 79ff154..fbbdd9e 100644 +--- a/epan/wmem/wmem_user_cb_int.h ++++ b/epan/wmem/wmem_user_cb_int.h +@@ -12,11 +12,11 @@ + #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 9b0b5eb..e9b63c0 100644 +--- a/ui/packet_range.h ++++ b/ui/packet_range.h +@@ -13,12 +13,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 cfafcc6..3993c43 100644 +--- a/ui/recent.h ++++ b/ui/recent.h +@@ -12,11 +12,11 @@ + #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 3842582..d29f3d4 100644 +--- a/ui/rtp_media.h ++++ b/ui/rtp_media.h +@@ -19,12 +19,12 @@ + * @ingroup main_ui_group + */ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include +- + /****************************************************************************/ + /* INTERFACE */ + /****************************************************************************/ +diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h +index f280879..85e809d 100644 +--- a/ui/rtp_stream.h ++++ b/ui/rtp_stream.h +@@ -19,12 +19,13 @@ + * @ingroup main_ui_group + */ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + + #include "tap-rtp-analysis.h" +-#include + #include + + #include "cfile.h" +diff --git a/ui/taps.h b/ui/taps.h +index 7718354..bc205d9 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/ui/voip_calls.h b/ui/voip_calls.h +index 5a72475..5b3abf4 100644 +--- a/ui/voip_calls.h ++++ b/ui/voip_calls.h +@@ -27,11 +27,12 @@ + * @ingroup main_ui_group + */ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include + #include + + #include "epan/address.h" diff --git a/wireshark.spec b/wireshark.spec index 2c7e29b2045b639e0907b14b200491897bbee2e4..4cc58acab41a32622ebe5f9a6c611c04d9fdb165 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -64,6 +64,9 @@ Patch27: wireshark-0027-ibm-smc.patch #Change in libssh header files forces a different technique on finding definitons Patch28: wireshark-0028-find-libssh.patch +#c linked C ++ template errors caused by compilation of gcc 8.5 or above +Patch100: wireshark-0100-glib-extern.patch + #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -311,6 +314,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Mar 15 2024 Xiaoloneg Yue - 2.40.1-43.0.2 +- Added glib extern patch + * Wed Aug 24 2022 Michal Ruprich - 1:2.6.2-15 - Resolves: #2119126 - Wireshark source rpm fails to build due to looking for incorrect libssh header files