[libguestfs] Add fix for regressions/rhbz557655.sh so it works when tracing is enabled.

[Richard W.M. Jones]

commit 02f4972a3e7176996abc27dafbf8392516a916bb
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Feb 2 20:28:11 2011 +0000

    Add fix for regressions/rhbz557655.sh so it works when tracing is enabled.

 ...orce-etc-mtab-to-be-a-symlink-to-proc-mou.patch |    2 +-
 ...-Fix-rhbz557655.sh-so-it-works-with-traci.patch |   24 ++++++++++++++++++++
 libguestfs.spec                                    |    9 +++++-
 3 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch b/0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch
index 2190459..8ea56c2 100644
--- a/0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch
+++ b/0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch
@@ -1,7 +1,7 @@
 From 522da71ebdbca3b69978292a818b9317905a7d3c Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones at redhat.com>
 Date: Wed, 2 Feb 2011 18:33:25 +0000
-Subject: [PATCH] appliance: Force /etc/mtab to be a symlink to /proc/mounts
+Subject: [PATCH 1/2] appliance: Force /etc/mtab to be a symlink to /proc/mounts
 
 Since Fedora util-linux 2.19, the %post script has done:
 
diff --git a/0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch b/0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch
new file mode 100644
index 0000000..d07c22b
--- /dev/null
+++ b/0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch
@@ -0,0 +1,24 @@
+From 1668c3fcc9a67e59c98121a473d68087d105d334 Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones at redhat.com>
+Date: Wed, 2 Feb 2011 20:26:19 +0000
+Subject: [PATCH 2/2] regressions: Fix rhbz557655.sh so it works with tracing enabled.
+
+---
+ regressions/rhbz557655.sh |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/regressions/rhbz557655.sh b/regressions/rhbz557655.sh
+index 2306147..2bc10cd 100755
+--- a/regressions/rhbz557655.sh
++++ b/regressions/rhbz557655.sh
+@@ -77,6 +77,7 @@ EOF
+ # number of truncate_size.
+ mv test.err test.err~
+ grep -E 'set[-_]memsize|truncate[-_]size' test.err~ |
++  grep -Ev 'libguestfs: trace:' |
+   grep -Ev 'proc 200' > test.err
+ rm test.err~
+ 
+-- 
+1.7.3.5
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 31b5051..23b6449 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.9.7
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -44,6 +44,9 @@ Patch0:        libguestfs-1.7.13-no-fuse-test.patch
 # See: https://www.redhat.com/archives/libguestfs/2011-February/msg00006.html
 Patch1:        0001-appliance-Force-etc-mtab-to-be-a-symlink-to-proc-mou.patch
 
+# Fix for regressions/rhbz557655.sh so it works when tracing is enabled.
+Patch2:        0002-regressions-Fix-rhbz557655.sh-so-it-works-with-traci.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -431,6 +434,7 @@ php-%{name} contains PHP bindings for %{name}.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 mkdir -p daemon/m4
 
@@ -762,9 +766,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Feb  2 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.9.7-4
+* Wed Feb  2 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.9.7-5
 - Add temporary non-upstream patch to fix /etc/mtab.
   See: https://www.redhat.com/archives/libguestfs/2011-February/msg00006.html
+- Add fix for regressions/rhbz557655.sh so it works when tracing is enabled.
 
 * Tue Feb  1 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.9.7-3
 - Enable trace in 'make check' section.