From 36b9471c71ae51c811917c49947fac27cc41fdc3a22d78ce0f7d04888a0c2620 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 30 Oct 2017 11:05:45 +0000
Subject: [PATCH] - add epoll-wait-fix.patch (bsc#1064958)

OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=161
---
 epoll-wait-fix.patch | 35 +++++++++++++++++++++++++++++++++++
 valgrind.changes     |  5 +++++
 valgrind.spec        |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 epoll-wait-fix.patch

diff --git a/epoll-wait-fix.patch b/epoll-wait-fix.patch
new file mode 100644
index 0000000..b61217d
--- /dev/null
+++ b/epoll-wait-fix.patch
@@ -0,0 +1,35 @@
+backport of https://bugs.kde.org/show_bug.cgi?id=381289
+see https://bugzilla.suse.com/show_bug.cgi?id=1064958
+
+--- coregrind/m_syswrap/syswrap-linux.c	(revision 16470)
++++ coregrind/m_syswrap/syswrap-linux.c	(working copy)
+@@ -1901,7 +1901,7 @@ PRE(sys_epoll_pwait)
+                  int, maxevents, int, timeout, vki_sigset_t *, sigmask,
+                  vki_size_t, sigsetsize);
+    PRE_MEM_WRITE( "epoll_pwait(events)", ARG2, sizeof(struct vki_epoll_event)*ARG3);
+-   if (ARG4)
++   if (ARG5)
+       PRE_MEM_READ( "epoll_pwait(sigmask)", ARG5, sizeof(vki_sigset_t) );
+ }
+ POST(sys_epoll_pwait)
+Index: memcheck/tests/linux/syscalls-2007.c
+===================================================================
+--- memcheck/tests/linux/syscalls-2007.c	(revision 16470)
++++ memcheck/tests/linux/syscalls-2007.c	(working copy)
+@@ -79,5 +79,16 @@ int main (void)
+   }
+ #endif
+ 
++#if defined(HAVE_EPOLL_CREATE) && defined(HAVE_EPOLL_PWAIT)
++  {
++    int fd3;
++    struct epoll_event evs[10];
++
++    fd3 = epoll_create (10);
++    /* epoll_pwait can take a NULL sigmask. */
++    epoll_pwait (fd3, evs, 10, 1, NULL);
++  }
++#endif
++
+   return 0;
+ }
diff --git a/valgrind.changes b/valgrind.changes
index f713f07..61ce56c 100644
--- a/valgrind.changes
+++ b/valgrind.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 30 11:00:12 UTC 2017 - dmueller@suse.com
+
+- add epoll-wait-fix.patch (bsc#1064958)
+
 -------------------------------------------------------------------
 Sun Jun 25 11:06:19 UTC 2017 - dmueller@suse.com
 
diff --git a/valgrind.spec b/valgrind.spec
index 65b58ca..923e072 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -36,6 +36,7 @@ Source0:        ftp://sourceware.org/pub/valgrind/valgrind-%{version}.tar.bz2
 # svn  di svn://svn.valgrind.org/vex/tags/VEX_3_5_0 svn://svn.valgrind.org/vex/branches/VEX_3_5_BRANCH > VEX_3_5_BRANCH.diff
 Patch1:         jit-register-unregister.diff
 Patch2:         armv6-support.diff
+Patch3:         epoll-wait-fix.patch
 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook_4
@@ -110,6 +111,7 @@ but it has been successfully used to optimize several KDE applications.
 # needs porting to 3.11
 ##%patch1
 %patch2
+%patch3
 
 %build
 export FLAGS="%{optflags}"