Combine and tidy up the patches fixing RHBZ557655 test program from

upstream.

0002-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch

@@ -1,33 +0,0 @@
-From 3cd7ce75f1ce5048a4d9f6aeaf66aff3194e1096 Mon Sep 17 00:00:00 2001
-From: Richard Jones <rjones@redhat.com>
-Date: Thu, 28 Jan 2010 22:35:16 +0000
-Subject: [PATCH 2/2] Fix regressions/rhbz557655.sh when debugging is enabled.
-
-The regression test for RHBZ#557655 would fail if debugging was
-enabled, because debug output would get mixed up with the test
-output.
-
-To reproduce the error do:
-
-LIBGUESTFS_DEBUG=1 make -C regressions TESTS=rhbz557655.sh check
-
-This commit disables debug for just this test.
----
- regressions/rhbz557655.sh |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/regressions/rhbz557655.sh b/regressions/rhbz557655.sh
-index 6ef0b70..aa74bc1 100755
---- a/regressions/rhbz557655.sh
-+++ b/regressions/rhbz557655.sh
-@@ -23,6 +23,7 @@
- set -e
- rm -f test.out
- export LANG=C
-+unset LIBGUESTFS_DEBUG
- 
- ../fish/guestfish >> test.out 2>&1 <<EOF
- # set-memsize is just a convenient non-daemon function that
--- 
-1.6.5.2
-

libguestfs-1.0.82-fix-rhbz557655-regression-test.patch

@@ -1,36 +1,3 @@
-From 2a224424acc47dc0f50fe605463bf2936fceb27c Mon Sep 17 00:00:00 2001
-From: Richard Jones <rjones@redhat.com>
-Date: Fri, 29 Jan 2010 09:02:14 +0000
-Subject: [PATCH] Fix regressions/rhbz557655.sh when debugging is enabled (v2).
-
-The previous fix didn't cope with ordinary warnings emitted by
-qemu (eg. "open /dev/kvm: No such file or directory").  This
-is a hopefully more complete fix for the problem.
-
-See also commit 3cd7ce75f1ce5048a4d9f6aeaf66aff3194e1096.
----
- .gitignore                             |    1 +
- regressions/rhbz557655-expected.out    |   22 ----------------------
- regressions/rhbz557655-expected.stderr |   14 ++++++++++++++
- regressions/rhbz557655-expected.stdout |    8 ++++++++
- regressions/rhbz557655.sh              |   21 +++++++++++++++------
- 5 files changed, 38 insertions(+), 28 deletions(-)
- delete mode 100644 regressions/rhbz557655-expected.out
- create mode 100644 regressions/rhbz557655-expected.stderr
- create mode 100644 regressions/rhbz557655-expected.stdout
-
-diff --git a/.gitignore b/.gitignore
-index 829f807..5b4d356 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -203,6 +203,7 @@ python/guestfs.py
- python/guestfs-py.c
- python/guestfs.pyc
- regressions/test1.img
-+regressions/test.err
- regressions/test.out
- ruby/bindtests.rb
- ruby/ext/guestfs/extconf.h
 diff --git a/regressions/rhbz557655-expected.out b/regressions/rhbz557655-expected.out
 deleted file mode 100644
 index 7d37e84..0000000
@@ -94,24 +61,23 @@ index 0000000..80bc8bc
 +1234
 +1234
 diff --git a/regressions/rhbz557655.sh b/regressions/rhbz557655.sh
-index aa74bc1..85cfb1e 100755
+index 6ef0b70..85cfb1e 100755
 --- a/regressions/rhbz557655.sh
 +++ b/regressions/rhbz557655.sh
-@@ -21,11 +21,10 @@
+@@ -21,10 +21,10 @@
  # "guestfish number parsing should not use atoi, should support '0...' for octal and '0x...' for hexadecimal"
  
  set -e
 -rm -f test.out
 +rm -f test.out test.err
  export LANG=C
--unset LIBGUESTFS_DEBUG
  
 -../fish/guestfish >> test.out 2>&1 <<EOF
 +../fish/guestfish >> test.out 2>> test.err <<EOF
  # set-memsize is just a convenient non-daemon function that
  # takes a single integer argument.
  set-memsize 0
-@@ -50,7 +49,7 @@ get-memsize
+@@ -49,7 +49,7 @@ get-memsize
  -set-memsize 123L
  EOF
  
@@ -120,7 +86,7 @@ index aa74bc1..85cfb1e 100755
  alloc test1.img 10M
  run
  part-disk /dev/sda mbr
-@@ -80,5 +79,15 @@ filesize /test
+@@ -79,5 +79,15 @@ filesize /test
  -truncate-size /test 123L
  EOF
  
@@ -138,6 +104,3 @@ index aa74bc1..85cfb1e 100755
 +diff -u test.out rhbz557655-expected.stdout
 +diff -u test.err rhbz557655-expected.stderr
 +rm test.out test.err test1.img
--- 
-1.6.5.2
-

libguestfs.spec

@@ -5,7 +5,7 @@ Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.82
-Release:     4%{?dist}
+Release:     5%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -16,8 +16,7 @@ BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch0:      libguestfs-1.0.79-no-fuse-test.patch
 
 # Backport RHBZ557655 test fix from upstream.
-Patch1:      0002-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch
-Patch2:      0001-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch
+Patch1:      libguestfs-1.0.82-fix-rhbz557655-regression-test.patch
 
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
@@ -339,7 +338,6 @@ Requires:    jpackage-utils
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 mkdir -p daemon/m4
 
@@ -615,7 +613,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jan 29 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.82-4
+* Fri Jan 29 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.82-5
 - Backport a better fix for RHBZ557655 test from upstream.
 
 * Thu Jan 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.82-3