From 9b65908a9031d4de111e52cb6d65f18f0d1655bce461cfd148fe328bef05d87b Mon Sep 17 00:00:00 2001
From: Robert Frohl <rfrohl@suse.com>
Date: Tue, 18 Jan 2022 10:14:38 +0000
Subject: [PATCH] Accepting request 947187 from
 home:rfrohl:branches:network:utilities

fix libvirt build after wireshark update to 3.6.x

OBS-URL: https://build.opensuse.org/request/show/947187
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=359
---
 wireshark-0001-pkgconfig.patch                | 22 +++++++++++++++++++
 ...shark-0010-dumpcap-permission-denied.patch |  0
 wireshark.changes                             |  9 ++++++++
 wireshark.spec                                |  5 +++--
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 wireshark-0001-pkgconfig.patch
 rename wireshark-0001-dumpcap-permission-denied.patch => wireshark-0010-dumpcap-permission-denied.patch (100%)

diff --git a/wireshark-0001-pkgconfig.patch b/wireshark-0001-pkgconfig.patch
new file mode 100644
index 0000000..10cfa32
--- /dev/null
+++ b/wireshark-0001-pkgconfig.patch
@@ -0,0 +1,22 @@
+commit ca61ee833ac886345ae5e6f4c239da7eae72f027
+Author: Robert Frohl <rfrohl@suse.com>
+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-0001-dumpcap-permission-denied.patch b/wireshark-0010-dumpcap-permission-denied.patch
similarity index 100%
rename from wireshark-0001-dumpcap-permission-denied.patch
rename to wireshark-0010-dumpcap-permission-denied.patch
diff --git a/wireshark.changes b/wireshark.changes
index e330f7a..56a571d 100644
--- a/wireshark.changes
+++ b/wireshark.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jan 18 09:42:36 UTC 2022 - Robert Frohl <rfrohl@suse.com>
+
+- Fix wireshark-plugin-libvirt build after wmem_alloc() moved from
+  libwireshark.so to libwsutil.so (bsc#1194780)
+  * Added wireshark-0001-pkgconfig.patch
+- Renamed wireshark-0001-dumpcap-permission-denied.patch
+  to  wireshark-0010-dumpcap-permission-denied.patch
+
 -------------------------------------------------------------------
 Mon Jan 10 10:30:10 UTC 2022 - Robert Frohl <rfrohl@suse.com>
 
diff --git a/wireshark.spec b/wireshark.spec
index 5b0d633..67df28b 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -37,8 +37,9 @@ 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:         wireshark-0000-wsutil-implicit_declaration_memcpy.patch
-Patch10:        wireshark-0001-dumpcap-permission-denied.patch
+Patch0:         wireshark-0000-wsutil-implicit_declaration_memcpy.patch
+Patch1:         wireshark-0001-pkgconfig.patch
+Patch10:        wireshark-0010-dumpcap-permission-denied.patch
 BuildRequires:  %{rb_default_ruby_suffix}-rubygem-asciidoctor
 BuildRequires:  bison
 BuildRequires:  flex