From d78622b6788eabebfe1e0b9d844474d49a346fea Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Aug 25 2015 13:19:15 +0000
Subject: 3.10.1-22.svn20150825r15589


- Update to current valgrind svn (svn20150825r15589)
- Add valgrind-3.10.1-gdb-file-warning.patch

---

diff --git a/.gitignore b/.gitignore
index 9ff4e9a..9e6c249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /valgrind-3.10.1.TEST1.tar.bz2
 /valgrind-3.10.1.tar.bz2
 /valgrind-3.10.1-svn20150817r15561.tar.bz2
+/valgrind-3.10.1-svn20150825r15589.tar.bz2
diff --git a/sources b/sources
index 466c6b9..afc99ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3adec4c5dfe677b91dc27e4e946f71a1  valgrind-3.10.1-svn20150817r15561.tar.bz2
+2ac79449dac83b10347f825e7a869c0d  valgrind-3.10.1-svn20150825r15589.tar.bz2
diff --git a/valgrind-3.10.1-gdb-file-warning.patch b/valgrind-3.10.1-gdb-file-warning.patch
new file mode 100644
index 0000000..e8ad4b6
--- /dev/null
+++ b/valgrind-3.10.1-gdb-file-warning.patch
@@ -0,0 +1,11 @@
+--- a/gdbserver_tests/filter_stderr       (revision 15586)
++++ b/gdbserver_tests/filter_stderr       (working copy)
+@@ -10,4 +10,5 @@
+     -e '/\/path\/to\/gdb/d' \
+     -e '/and then give GDB the following command/d' \
+     -e '/target remote |/d' \
+-    -e '/pid is optional if only one valgrind process is running/d'
++    -e '/pid is optional if only one valgrind process is running/d' \
++    -e '/warning: remote target does not support file transfer, attempting to access files from local filesystem./d'
+
+
diff --git a/valgrind.spec b/valgrind.spec
index b023570..1338f11 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,12 +1,12 @@
 %{?scl:%scl_package valgrind}
 
-%define svn_date 20150817
-%define svn_rev 15561
+%define svn_date 20150825
+%define svn_rev 15589
 
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.10.1
-Release: 21.svn%{?svn_date}r%{?svn_rev}%{?dist}
+Release: 22.svn%{?svn_date}r%{?svn_rev}%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -69,6 +69,9 @@ Patch2: valgrind-3.9.0-helgrind-race-supp.patch
 # Make ld.so supressions slightly less specific.
 Patch3: valgrind-3.9.0-ldso-supp.patch
 
+# Filter out new gdb warning
+Patch4: valgrind-3.10.1-gdb-file-warning.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
@@ -174,6 +177,7 @@ Valgrind User Manual for details.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # We need to use the software collection compiler and binutils if available.
@@ -343,9 +347,11 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
-* Tue Aug 18 2015 Mark Wielaard <mjw@redhat.com>
+* Tue Aug 25 2015 Mark Wielaard <mjw@redhat.com> - 3.10.1-22.svn20150825r15589
 - Drop valgrind-3.9.0-stat_h.patch.
 - Add BuildRequires gcc-c++.
+- Update to current valgrind svn (svn20150825r15589)
+- Add valgrind-3.10.1-gdb-file-warning.patch
 
 * Mon Aug 17 2015 Mark Wielaard <mjw@redhat.com> - 3.10.1-21.svn20150817r15561
 - Update to current valgrind svn. Drop patches now upstream.