From 66721a71b2f5b0b254a3fe04a71f55f48f5515b8 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Aug 17 2017 11:10:05 +0000
Subject: 3.13.0-7 - Add valgrind-3.13.0-xml-socket.patch


---

diff --git a/valgrind-3.13.0-xml-socket.patch b/valgrind-3.13.0-xml-socket.patch
new file mode 100644
index 0000000..e1b79d3
--- /dev/null
+++ b/valgrind-3.13.0-xml-socket.patch
@@ -0,0 +1,25 @@
+commit 34dd8493de39314033509bb7ad62673f33dcf3db
+Author: Ivo Raisr <ivosh@ivosh.net>
+Date:   Thu Aug 3 05:22:01 2017 +0000
+
+    Fix handling command line option --xml-socket.
+    Fixes BZ#382998
+    Patch by: Orgad Shaneh <orgads@gmail.com>
+    
+    
+    
+    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16467
+
+diff --git a/coregrind/m_libcprint.c b/coregrind/m_libcprint.c
+index d66c67d..f6ba202 100644
+--- a/coregrind/m_libcprint.c
++++ b/coregrind/m_libcprint.c
+@@ -526,7 +526,7 @@ void VG_(init_log_xml_sinks)(VgLogTo log_to, VgLogTo xml_to,
+          break;
+ 
+       case VgLogTo_Socket:
+-         log_fd = prepare_sink_socket(VG_(clo_xml_fname_unexpanded),
++         xml_fd = prepare_sink_socket(VG_(clo_xml_fname_unexpanded),
+                                       &VG_(xml_output_sink), True);
+          break;
+    }
diff --git a/valgrind.spec b/valgrind.spec
index a74842d..5422ba4 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.13.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -118,6 +118,9 @@ Patch10: valgrind-3.13.0-gdb-8-testfix.patch
 # valgrind svn r16454. disable vgdb poll in the child after fork
 Patch11: valgrind-3.13.0-disable-vgdb-child.patch
 
+# KDE#382998 xml-socket doesn't work
+Patch12: valgrind-3.13.0-xml-socket.patch
+
 %if %{build_multilib}
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -243,6 +246,7 @@ Valgrind User Manual for details.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 # We need to use the software collection compiler and binutils if available.
@@ -445,6 +449,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Thu Aug 17 2017 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-7
+- Add valgrind-3.13.0-xml-socket.patch
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.13.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild