Accepting request 945304 from home:rfrohl:branches:network:utilities

fix SLE build issue

OBS-URL: https://build.opensuse.org/request/show/945304
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=358
This commit is contained in:
Robert Frohl 2022-01-10 12:30:26 +00:00 committed by Git OBS Bridge
parent 07aa1744e1
commit 1250a67e2d
3 changed files with 21 additions and 0 deletions

View File

@ -0,0 +1,14 @@
Index: wireshark-3.6.1/wsutil/glib-compat.h
===================================================================
--- wireshark-3.6.1.orig/wsutil/glib-compat.h
+++ wireshark-3.6.1/wsutil/glib-compat.h
@@ -21,6 +21,9 @@ extern "C" {
#endif /* __cplusplus */
#if !GLIB_CHECK_VERSION(2, 68, 0)
+
+#include <string.h>
+
static inline gpointer
g_memdup2(gconstpointer mem, gsize byte_size)
{

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 10 10:30:10 UTC 2022 - Robert Frohl <rfrohl@suse.com>
- Fix SLE15 build issue
added wireshark-0000-wsutil-implicit_declaration_memcpy.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 30 09:41:01 UTC 2021 - Robert Frohl <rfrohl@suse.com> Thu Dec 30 09:41:01 UTC 2021 - Robert Frohl <rfrohl@suse.com>

View File

@ -37,6 +37,7 @@ URL: https://www.wireshark.org/
Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz 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 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 Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshark.keyring
Patch1: wireshark-0000-wsutil-implicit_declaration_memcpy.patch
Patch10: wireshark-0001-dumpcap-permission-denied.patch Patch10: wireshark-0001-dumpcap-permission-denied.patch
BuildRequires: %{rb_default_ruby_suffix}-rubygem-asciidoctor BuildRequires: %{rb_default_ruby_suffix}-rubygem-asciidoctor
BuildRequires: bison BuildRequires: bison