[libguestfs/el5] Update patches.

[Richard W.M. Jones]

commit 28f000ff433532c90c969465fddcab3120e82951
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Jun 26 18:41:38 2012 +0100

    Update patches.

 ...w-parallel-mount-local-test-to-be-skipped.patch |   37 ++++++++++++++++++++
 libguestfs.spec                                    |    9 ++++-
 2 files changed, 44 insertions(+), 2 deletions(-)
---
diff --git a/0021-ocaml-Allow-parallel-mount-local-test-to-be-skipped.patch b/0021-ocaml-Allow-parallel-mount-local-test-to-be-skipped.patch
new file mode 100644
index 0000000..0d7285e
--- /dev/null
+++ b/0021-ocaml-Allow-parallel-mount-local-test-to-be-skipped.patch
@@ -0,0 +1,37 @@
+From 770d3912240a88bfc17f2bf9f9c04fa7f505251a Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones at redhat.com>
+Date: Tue, 26 Jun 2012 18:38:23 +0100
+Subject: [PATCH 21/21] ocaml: Allow parallel mount-local test to be skipped.
+
+FUSE is not very reliable on RHEL 5.
+---
+ ocaml/t/guestfs_500_parallel_mount_local.ml |   13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/ocaml/t/guestfs_500_parallel_mount_local.ml b/ocaml/t/guestfs_500_parallel_mount_local.ml
+index 779afc1..5a432f0 100644
+--- a/ocaml/t/guestfs_500_parallel_mount_local.ml
++++ b/ocaml/t/guestfs_500_parallel_mount_local.ml
+@@ -41,6 +41,19 @@ let clip low high v = min high (max low v)
+ let rec main () =
+   Random.self_init ();
+ 
++  (* Allow the test to be skipped by setting this environment variable.
++   * This is for RHEL 5, where FUSE doesn't work very reliably.
++   *)
++  let () =
++    let name = "SKIP_TEST_GUESTFS_500_PARALLEL_MOUNT_LOCAL_ML" in
++    let value = try Sys.getenv name with Not_found -> "" in
++    if value <> "" then (
++      printf "%s: test skipped because %s is set.\n"
++        Sys.executable_name name;
++      exit 0
++    )
++  in
++
+   (* Choose the number of threads based on the amount of free memory. *)
+   let nr_threads =
+     let mbytes =
+-- 
+1.7.4.1
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 5b8296a..7b553f0 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,7 +22,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.19.12
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -60,6 +60,10 @@ Patch0016:     0016-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
 Patch0017:     0017-EPEL-5-Remove-Fedora-MD-test-images.patch
 Patch0018:     0018-EPEL-5-Add-mkisofs-to-package-list.patch
 Patch0019:     0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
+Patch0020:     0020-EPEL-5-Disable-tracing-in-regression-test-for-bug-79.patch
+
+# Patch upstream in libguestfs >= 1.19.13.
+Patch0021:     0021-ocaml-Allow-parallel-mount-local-test-to-be-skipped.patch
 
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
@@ -678,6 +682,7 @@ export SKIP_TEST_MOUNT_LOCAL_SH=1
 export SKIP_TEST_SELINUX_XATTRS_FUSE=1
 export SKIP_TEST_SELINUX_SELINUX_FUSE=1
 export SKIP_TEST_VIRT_SYSPREP_SCRIPT_SH=1
+export SKIP_TEST_GUESTFS_500_PARALLEL_MOUNT_LOCAL_ML=1
 
 # blkid can't read NTFS labels.
 export SKIP_TEST_SET_LABEL_1=1
@@ -908,7 +913,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Jun 25 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.12-1
+* Tue Jun 25 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.12-2
 - New upstream version 1.19.12.
 - Update patches.