From cc17daf1097c56805db8d1adc84f847b624abda1fa17bb861642573db244b5e9 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 1 Apr 2010 01:17:41 +0000
Subject: [PATCH] Updating link to change in openSUSE:Factory/valgrind revision
 33.0

OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=312a3ea6d53c942807c3bb9870e76b80
---
 bnc558964.diff   | 87 ++++++++++++++++++++++++++++++++++++++++++++++++
 valgrind.changes |  5 +++
 valgrind.spec    |  4 ++-
 3 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 bnc558964.diff

diff --git a/bnc558964.diff b/bnc558964.diff
new file mode 100644
index 0000000..433e643
--- /dev/null
+++ b/bnc558964.diff
@@ -0,0 +1,87 @@
+--- coregrind/m_syswrap/priv_syswrap-linux.h
++++ coregrind/m_syswrap/priv_syswrap-linux.h
+@@ -116,6 +116,7 @@
+ DECL_TEMPLATE(linux, sys_get_mempolicy);
+ 
+ DECL_TEMPLATE(linux, sys_inotify_init);
++DECL_TEMPLATE(linux, sys_inotify_init1);
+ DECL_TEMPLATE(linux, sys_inotify_add_watch);
+ DECL_TEMPLATE(linux, sys_inotify_rm_watch);
+ 
+--- coregrind/m_syswrap/syswrap-amd64-linux.c
++++ coregrind/m_syswrap/syswrap-amd64-linux.c
+@@ -1374,8 +1374,8 @@
+    LINX_(__NR_eventfd2,          sys_eventfd2),         // 290
+    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 291
+    //   (__NR_dup3,              sys_ni_syscall)        // 292
+-   LINXY(__NR_pipe2,             sys_pipe2)             // 293
+-   //   (__NR_inotify_init1,     sys_ni_syscall)        // 294
++   LINXY(__NR_pipe2,             sys_pipe2),            // 293
++   LINXY(__NR_inotify_init1,     sys_inotify_init1)     // 294
+ };
+ 
+ const UInt ML_(syscall_table_size) = 
+--- coregrind/m_syswrap/syswrap-linux.c
++++ coregrind/m_syswrap/syswrap-linux.c
+@@ -1526,6 +1526,24 @@
+    }
+ }
+ 
++PRE(sys_inotify_init1)
++{
++   PRINT("sys_inotify_init ( %ld )", ARG1);
++   PRE_REG_READ1(long, "inotify_init", int, flag);
++}
++
++POST(sys_inotify_init1)
++{
++   vg_assert(SUCCESS);
++   if (!ML_(fd_allowed)(RES, "inotify_init", tid, True)) {
++      VG_(close)(RES);
++      SET_STATUS_Failure( VKI_EMFILE );
++   } else {
++      if (VG_(clo_track_fds))
++         ML_(record_fd_open_nameless) (tid, RES);
++   }
++}
++
+ PRE(sys_inotify_add_watch)
+ {
+    PRINT( "sys_inotify_add_watch ( %ld, %#lx, %lx )", ARG1,ARG2,ARG3);
+--- coregrind/m_syswrap/syswrap-ppc32-linux.c
++++ coregrind/m_syswrap/syswrap-ppc32-linux.c
+@@ -1866,8 +1866,8 @@
+    LINX_(__NR_eventfd2,          sys_eventfd2),         // 314
+    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 315
+    //   (__NR_dup3,              sys_ni_syscall)        // 316
+-   LINXY(__NR_pipe2,             sys_pipe2)             // 317
+-   //   (__NR_inotify_init1,     sys_ni_syscall)        // 318
++   LINXY(__NR_pipe2,             sys_pipe2),            // 317
++   LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 318
+ };
+ 
+ const UInt ML_(syscall_table_size) = 
+--- coregrind/m_syswrap/syswrap-ppc64-linux.c
++++ coregrind/m_syswrap/syswrap-ppc64-linux.c
+@@ -1507,7 +1507,7 @@
+    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 315
+    //   (__NR_dup3,              sys_ni_syscall)        // 316
+    LINXY(__NR_pipe2,             sys_pipe2)             // 317
+-   //   (__NR_inotify_init1,     sys_ni_syscall)        // 318
++   LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 318
+ };
+ 
+ const UInt ML_(syscall_table_size) = 
+--- coregrind/m_syswrap/syswrap-x86-linux.c
++++ coregrind/m_syswrap/syswrap-x86-linux.c
+@@ -2253,8 +2253,8 @@
+    LINXY(__NR_epoll_create1,     sys_epoll_create1),     // 329
+ 
+    //   (__NR_dup3,              sys_ni_syscall)        // 330
+-   LINXY(__NR_pipe2,             sys_pipe2)             // 331
+-   //   (__NR_inotify_init1,     sys_ni_syscall)        // 332
++   LINXY(__NR_pipe2,             sys_pipe2),            // 331
++   LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 332
+ };
+ 
+ const UInt ML_(syscall_table_size) = 
diff --git a/valgrind.changes b/valgrind.changes
index e0028e0..c7c15b2 100644
--- a/valgrind.changes
+++ b/valgrind.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 26 13:56:19 CET 2010 - dmueller@suse.de
+
+- handle inotify_init1 (bnc#558964)
+
 -------------------------------------------------------------------
 Wed Jan  6 17:54:54 CET 2010 - dmueller@suse.de
 
diff --git a/valgrind.spec b/valgrind.spec
index 4e0772e..b2509b0 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -28,13 +28,14 @@ Group:          Development/Tools/Debuggers
 Summary:        Valgrind Suite of Tools for Debugging and Profiling
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Version:        3.5.0
-Release:        3
+Release:        4
 Source0:        %{name}-%{version}.tar.bz2
 # svn  di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_2_1 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH > 3_2_BRANCH.diff
 # svn  di svn://svn.valgrind.org/vex/tags/VEX_3_2_1 svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH > VEX_3_2_BRANCH.diff
 Patch1:         jit-register-unregister.diff
 Patch2:         deprecated.diff
 Patch3:         glibc-211.diff
+Patch4:         bnc558964.diff
 Provides:       callgrind = %version
 Obsoletes:      callgrind < %version
 ExclusiveArch:  %ix86 x86_64 ppc ppc64
@@ -120,6 +121,7 @@ cd ..
 %patch1
 %patch2
 %patch3
+%patch4
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"