From 06798bfa5e7d9b73551d90a69559d4d7ab3f352e Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Jun 26 2012 14:43:28 +0000
Subject: New upstream version 1.19.12.


Rebase patches.

---

diff --git a/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch b/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
index 52500ef..1f69d97 100644
--- a/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
+++ b/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
@@ -1,7 +1,7 @@
-From 5313dea53275270882b3ad8a6d34e1bdbbc55110 Mon Sep 17 00:00:00 2001
+From dbd3527715c430c03a6a94871d0ed818bbc40771 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 10:19:39 +0100
-Subject: [PATCH 01/19] EPEL 5: Remove checks which fail with ancient qemu.
+Subject: [PATCH 01/20] EPEL 5: Remove checks which fail with ancient qemu.
 
 Note that g->qemu_version and g->qemu_devices will both
 be empty strings.
@@ -11,7 +11,7 @@ be empty strings.
  2 files changed, 2 insertions(+), 69 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 580ae18..d5f12a4 100644
+index 3b0ea11..8932f16 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -573,63 +573,6 @@ This could be a very old version of qemu, or qemu might not be
@@ -79,10 +79,10 @@ index 580ae18..d5f12a4 100644
  
  dnl Enable packet dumps when in verbose mode.  This generates lots
 diff --git a/src/launch.c b/src/launch.c
-index cd78501..5f0cdf1 100644
+index 3cd16f4..3bb41ae 100644
 --- a/src/launch.c
 +++ b/src/launch.c
-@@ -1384,18 +1384,8 @@ test_qemu (guestfs_h *g)
+@@ -1394,18 +1394,8 @@ test_qemu (guestfs_h *g)
      return -1;
    }
  
diff --git a/0001-tests-Allow-SELinux-tests-to-be-skipped-with-an-envi.patch b/0001-tests-Allow-SELinux-tests-to-be-skipped-with-an-envi.patch
deleted file mode 100644
index bc18e90..0000000
--- a/0001-tests-Allow-SELinux-tests-to-be-skipped-with-an-envi.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 994545fb9636e46c9d255c04d75b00973d78c70b Mon Sep 17 00:00:00 2001
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Mon, 25 Jun 2012 15:14:46 +0100
-Subject: [PATCH 1/3] tests: Allow SELinux tests to be skipped with an environment variable.
-
----
- tests/selinux/run-test.pl |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/tests/selinux/run-test.pl b/tests/selinux/run-test.pl
-index 4a0ccee..6b0ffb5 100755
---- a/tests/selinux/run-test.pl
-+++ b/tests/selinux/run-test.pl
-@@ -45,6 +45,12 @@ die unless $test_type eq "xattrs" || $test_type eq "selinux";
- my $test_via = $ARGV[1];
- die unless $test_via eq "direct" || $test_via eq "fuse";
- 
-+my $env_name = "SKIP_TEST_SELINUX_" . uc ($test_type) . "_" . uc ($test_via);
-+if ($ENV{$env_name}) {
-+    print "$prog $test_type $test_via: test skipped because $env_name is set.\n";
-+    exit 0
-+}
-+
- # SELinux labelling won't work (and can be skipped) if SELinux isn't
- # installed or isn't enabled on the host.
- if ($test_type eq "selinux") {
--- 
-1.7.4.1
-
diff --git a/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch b/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
index 0baa8fc..def82eb 100644
--- a/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
+++ b/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
@@ -1,14 +1,14 @@
-From 06711d7973ef583b9b95253229d6082a5afd8e08 Mon Sep 17 00:00:00 2001
+From 7d8e72d40f3a0d23dc2b5ca3e2b20c8eae7aecae Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 10:23:19 +0100
-Subject: [PATCH 02/19] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
+Subject: [PATCH 02/20] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
 
 ---
  configure.ac |   26 +++++++++++++-------------
  1 files changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index d5f12a4..4b71ebc 100644
+index 8932f16..d0f5582 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1311,33 +1311,33 @@ echo
diff --git a/0002-fish-Allow-mount-local-test-to-be-skipped-with-envir.patch b/0002-fish-Allow-mount-local-test-to-be-skipped-with-envir.patch
deleted file mode 100644
index fce3053..0000000
--- a/0002-fish-Allow-mount-local-test-to-be-skipped-with-envir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 034274a51e8544b18add7a34eeaf3bdaa74c9bcd Mon Sep 17 00:00:00 2001
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Mon, 25 Jun 2012 15:19:19 +0100
-Subject: [PATCH 2/3] fish: Allow mount-local test to be skipped with environment variable.
-
-The test uses FUSE, so we need a way to disable it on RHEL 5.
----
- fish/test-mount-local.sh |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/fish/test-mount-local.sh b/fish/test-mount-local.sh
-index a71db04..c1b3f55 100755
---- a/fish/test-mount-local.sh
-+++ b/fish/test-mount-local.sh
-@@ -18,6 +18,11 @@
- 
- # Test guestfish mount-local / mount-local-run commands.
- 
-+if [ -n "$SKIP_TEST_MOUNT_LOCAL_SH" ]; then
-+    echo "$0: skipping test because SKIP_TEST_MOUNT_LOCAL_SH is set."
-+    exit 0
-+fi
-+
- # Skip if no FUSE.
- 
- test -w /dev/fuse || {
--- 
-1.7.4.1
-
diff --git a/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch b/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
index 5a6bf54..8f59881 100644
--- a/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
+++ b/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
@@ -1,14 +1,14 @@
-From e0313adcce407c4e3852be1c5d3d8f9cc0a2399b Mon Sep 17 00:00:00 2001
+From b21144431f382801194ac5407c5b9d24c41b941b Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 10:46:20 +0100
-Subject: [PATCH 03/19] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
+Subject: [PATCH 03/20] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
 
 ---
  configure.ac |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 4b71ebc..a99f84f 100644
+index d0f5582..d29bb4a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -176,7 +176,7 @@ dnl Check sizeof long.
diff --git a/0003-sysprep-Don-t-check-for-dev-fuse-before-running-the-.patch b/0003-sysprep-Don-t-check-for-dev-fuse-before-running-the-.patch
deleted file mode 100644
index e6983a1..0000000
--- a/0003-sysprep-Don-t-check-for-dev-fuse-before-running-the-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 448803d625b6673d233ce765412c784320d9923c Mon Sep 17 00:00:00 2001
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Mon, 25 Jun 2012 15:19:58 +0100
-Subject: [PATCH 3/3] sysprep: Don't check for /dev/fuse before running the test.
-
-The program doesn't actually require FUSE when used without
-any --script options.
----
- sysprep/test-virt-sysprep.sh |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git a/sysprep/test-virt-sysprep.sh b/sysprep/test-virt-sysprep.sh
-index 5e541fe..2443ce2 100755
---- a/sysprep/test-virt-sysprep.sh
-+++ b/sysprep/test-virt-sysprep.sh
-@@ -19,11 +19,6 @@
- export LANG=C
- set -e
- 
--if [ ! -w /dev/fuse ]; then
--    echo "$0: SKIPPING test, because there is no /dev/fuse."
--    exit 0
--fi
--
- # virt-sysprep with the -n option doesn't modify the guest.  It ought
- # to be able to sysprep any of our test guests.
- 
--- 
-1.7.4.1
-
diff --git a/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch b/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
index c77dfce..454c5b0 100644
--- a/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
+++ b/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
@@ -1,7 +1,7 @@
-From 492961827701196f4ee3c101d94e44652e5f67ed Mon Sep 17 00:00:00 2001
+From 26fa681c4c55fe15513c86cde67237f8364058f8 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 13:55:44 +0100
-Subject: [PATCH 04/19] EPEL 5: Don't use C99-style variable decls in for-loop.
+Subject: [PATCH 04/20] EPEL 5: Don't use C99-style variable decls in for-loop.
 
 ---
  daemon/md.c                      |    6 ++++--
diff --git a/0005-EPEL-5-Remove-Erlang-bindings.patch b/0005-EPEL-5-Remove-Erlang-bindings.patch
index 853f885..022eac9 100644
--- a/0005-EPEL-5-Remove-Erlang-bindings.patch
+++ b/0005-EPEL-5-Remove-Erlang-bindings.patch
@@ -1,7 +1,7 @@
-From 20ceae3b5ca57b3f108cc8c53a5073856d7f9305 Mon Sep 17 00:00:00 2001
+From d704229f97c5a63de5921b72ee96dc5cb4887d1b Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 14:34:25 +0100
-Subject: [PATCH 05/19] EPEL 5: Remove Erlang bindings.
+Subject: [PATCH 05/20] EPEL 5: Remove Erlang bindings.
 
 ---
  Makefile.am  |    3 ---
@@ -24,7 +24,7 @@ index be9191c..6bd6047 100644
  SUBDIRS += gobject
  endif
 diff --git a/configure.ac b/configure.ac
-index a99f84f..ed2c39f 100644
+index d29bb4a..63fd338 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1115,25 +1115,6 @@ AS_IF([test "x$enable_php" != "xno"],
diff --git a/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch b/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
index 3cac327..df0f70c 100644
--- a/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
+++ b/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
@@ -1,7 +1,7 @@
-From 44e154f116087b2fd7ce1c22d6f6b9e570254026 Mon Sep 17 00:00:00 2001
+From 52fe6ceb87d8716abe2d32c1b3ca6476d8519b50 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 14:35:06 +0100
-Subject: [PATCH 06/19] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
+Subject: [PATCH 06/20] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
 
 ---
  Makefile.am  |    3 --
@@ -24,7 +24,7 @@ index 6bd6047..88e3815 100644
  # Unconditional because nothing is built yet.
  SUBDIRS += csharp
 diff --git a/configure.ac b/configure.ac
-index ed2c39f..38281cb 100644
+index 63fd338..939abbf 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1136,67 +1136,6 @@ AS_IF([test "x$PERL" != "xno"],
diff --git a/0007-EPEL-5-Remove-PHP-bindings.patch b/0007-EPEL-5-Remove-PHP-bindings.patch
index 98f949a..1b62d6a 100644
--- a/0007-EPEL-5-Remove-PHP-bindings.patch
+++ b/0007-EPEL-5-Remove-PHP-bindings.patch
@@ -1,7 +1,7 @@
-From f25c54fab15a68dd3f9f0104fdc99b2f6848d636 Mon Sep 17 00:00:00 2001
+From 067a995aa89974ec39d9e1c7440e7b9a3c5fca87 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sun, 17 Jun 2012 23:01:43 +0100
-Subject: [PATCH 07/19] EPEL 5: Remove PHP bindings.
+Subject: [PATCH 07/20] EPEL 5: Remove PHP bindings.
 
 ---
  Makefile.am  |    3 ---
@@ -24,7 +24,7 @@ index 88e3815..5175bf3 100644
  # Unconditional because nothing is built yet.
  SUBDIRS += csharp
 diff --git a/configure.ac b/configure.ac
-index 38281cb..12ebb6c 100644
+index 939abbf..79058a0 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1101,20 +1101,6 @@ AS_IF([test "x$enable_haskell" != "xno"],
diff --git a/0008-EPEL-5-Define-le64toh-if-not-defined.patch b/0008-EPEL-5-Define-le64toh-if-not-defined.patch
index 77831f5..ffaab59 100644
--- a/0008-EPEL-5-Define-le64toh-if-not-defined.patch
+++ b/0008-EPEL-5-Define-le64toh-if-not-defined.patch
@@ -1,7 +1,7 @@
-From 08e82acedaa0e95991362857ace821cba8afdf5a Mon Sep 17 00:00:00 2001
+From 4712064a62cc47b3dfe4a5d55cd4ec2bca620f1d Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sun, 17 Jun 2012 22:17:06 +0100
-Subject: [PATCH 08/19] EPEL 5: Define le64toh if not defined.
+Subject: [PATCH 08/20] EPEL 5: Define le64toh if not defined.
 
 ---
  src/inspect_fs_windows.c |   10 ++++++++++
diff --git a/0009-EPEL-5-Add-gnulib-utimensat-module.patch b/0009-EPEL-5-Add-gnulib-utimensat-module.patch
index 171947a..ebcea66 100644
--- a/0009-EPEL-5-Add-gnulib-utimensat-module.patch
+++ b/0009-EPEL-5-Add-gnulib-utimensat-module.patch
@@ -1,7 +1,7 @@
-From 948bc6535ade9bbb3b468a97b65cdff8d61681bf Mon Sep 17 00:00:00 2001
+From e5cbefd66a60cae7fb2d4172c9077b4546ee1b58 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sun, 17 Jun 2012 22:58:58 +0100
-Subject: [PATCH 09/19] EPEL 5: Add gnulib utimensat module.
+Subject: [PATCH 09/20] EPEL 5: Add gnulib utimensat module.
 
 This function is missing in RHEL 5-era kernels.
 ---
diff --git a/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch b/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
index 4516ed1..b04b000 100644
--- a/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
+++ b/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
@@ -1,7 +1,7 @@
-From 287d9a213b9a9389864cb48762ce88bede038459 Mon Sep 17 00:00:00 2001
+From 2e6685e188d5661a16ebc21ba7fdac976e5a8e50 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sun, 17 Jun 2012 23:00:16 +0100
-Subject: [PATCH 10/19] EPEL 5: Old ocamlopt didn't support debugging (-g option).
+Subject: [PATCH 10/20] EPEL 5: Old ocamlopt didn't support debugging (-g option).
 
 ---
  ocaml/Makefile.am    |    2 +-
diff --git a/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch b/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
index a269c36..9db8f56 100644
--- a/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
+++ b/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
@@ -1,14 +1,14 @@
-From 1fe31abc33a571bda2c1283be58dc21155dfddc4 Mon Sep 17 00:00:00 2001
+From f4e0a0bbbb40124afd98d80f2b1b1a69df4b9d30 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Mon, 18 Jun 2012 08:35:14 +0100
-Subject: [PATCH 11/19] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
+Subject: [PATCH 11/20] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
 
 ---
  configure.ac |   10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 12ebb6c..2276c76 100644
+index 79058a0..84ce3a8 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -786,14 +786,14 @@ EOF
diff --git a/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch b/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
index c86d822..4a7512f 100644
--- a/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
+++ b/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
@@ -1,7 +1,7 @@
-From cf34afed82ce83e43e77abc615294d286839c993 Mon Sep 17 00:00:00 2001
+From c1b3d471bc4f7e754765559b20b25610e707d075 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Mon, 18 Jun 2012 12:18:35 +0100
-Subject: [PATCH 12/19] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
+Subject: [PATCH 12/20] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
 
 See this thread:
 https://lists.gnu.org/archive/html/bug-gnulib/2012-06/msg00162.html
@@ -10,7 +10,7 @@ https://lists.gnu.org/archive/html/bug-gnulib/2012-06/msg00162.html
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 2276c76..956e4a3 100644
+index 84ce3a8..53edfe4 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1128,7 +1128,7 @@ AC_SUBST(MAX_PROC_NR)
diff --git a/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch b/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
index cbd786b..500ccd9 100644
--- a/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
+++ b/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
@@ -1,14 +1,14 @@
-From 5de80c00ff117d0cdd1d4c6930849dfaf0c4e6cc Mon Sep 17 00:00:00 2001
+From dc0acbad966bf4bfa4e211957707ffe300a805d3 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Mon, 18 Jun 2012 17:21:30 +0100
-Subject: [PATCH 13/19] EPEL 5: Remove id= from -drive parameter on qemu command line.
+Subject: [PATCH 13/20] EPEL 5: Remove id= from -drive parameter on qemu command line.
 
 ---
  src/launch.c |    5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/src/launch.c b/src/launch.c
-index 5f0cdf1..ac318aa 100644
+index 3bb41ae..2037a67 100644
 --- a/src/launch.c
 +++ b/src/launch.c
 @@ -722,7 +722,7 @@ launch_appliance (guestfs_h *g)
@@ -20,7 +20,7 @@ index 5f0cdf1..ac318aa 100644
                  appliance, virtio_scsi ? "none" : "virtio", cachemode);
        add_cmdline (g, buf2);
  
-@@ -1560,12 +1560,11 @@ qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index)
+@@ -1568,12 +1568,11 @@ qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index)
    else
      iface = "virtio";
  
diff --git a/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch b/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
index c12e343..e4cde38 100644
--- a/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
+++ b/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
@@ -1,7 +1,7 @@
-From 550ed74ae3f41a52882db8408572ca9e9c20053c Mon Sep 17 00:00:00 2001
+From cb8e7f77d5dd32ab6760db4fd10bb654f6dd225f Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Mon, 18 Jun 2012 16:06:34 +0100
-Subject: [PATCH 14/19] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
+Subject: [PATCH 14/20] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
 
 ---
  appliance/init    |    4 +-
@@ -173,7 +173,7 @@ index b09f74e..eedd3cc 100644
    main_loop (sock);
  
 diff --git a/src/launch.c b/src/launch.c
-index ac318aa..edafe3b 100644
+index 2037a67..4d02c62 100644
 --- a/src/launch.c
 +++ b/src/launch.c
 @@ -73,10 +73,14 @@
@@ -198,7 +198,7 @@ index ac318aa..edafe3b 100644
 -  struct sockaddr_un addr;
 +  struct sockaddr_in addr;
 +  socklen_t addrlen = sizeof addr;
-+  int null_vmchannel_sock;
++  int null_vmchannel_port;
  
    /* At present you must add drives before starting the appliance.  In
     * future when we enable hotplugging you won't need to do this.
@@ -255,8 +255,8 @@ index ac318aa..edafe3b 100644
      goto cleanup0;
    }
  
-+  null_vmchannel_sock = ntohs (addr.sin_port);
-+  debug (g, "null_vmchannel_sock = %d\n", null_vmchannel_sock);
++  null_vmchannel_port = ntohs (addr.sin_port);
++  debug (g, "null_vmchannel_port = %d", null_vmchannel_port);
 +
    if (!g->direct) {
      if (pipe (wfd) == -1 || pipe (rfd) == -1) {
@@ -298,7 +298,7 @@ index ac318aa..edafe3b 100644
 +
 +    snprintf (buf, sizeof buf,
 +              "guestfs_vmchannel=tcp:" ROUTER ":%d",
-+              null_vmchannel_sock);
++              null_vmchannel_port);
 +    char *vmchannel = strdup (buf);
  
  #ifdef VALGRIND_DAEMON
@@ -332,7 +332,7 @@ index ac318aa..edafe3b 100644
                g->verbose ? "guestfs_verbose=1" : "",
                getenv ("TERM") ? : "linux",
                g->append ? g->append : "");
-@@ -1034,19 +1030,30 @@ launch_appliance (guestfs_h *g)
+@@ -1036,19 +1032,30 @@ launch_appliance (guestfs_h *g)
  
    g->state = LAUNCHING;
  
@@ -365,16 +365,16 @@ index ac318aa..edafe3b 100644
 +    if (uid != geteuid ()) {
 +      fprintf (stderr,
 +               "libguestfs: warning: unexpected connection from UID %d to port %d\n",
-+               uid, null_vmchannel_sock);
++               uid, null_vmchannel_port);
 +      close (r);
 +      r = -1;
 +      continue;
 +    }
 +  }
  
-   close (g->sock); /* Close the listening socket. */
-   g->sock = r; /* This is the accepted data socket. */
-@@ -1582,6 +1589,83 @@ drive_name (size_t index, char *ret)
+   /* Close the listening socket. */
+   if (close (g->sock) != 0) {
+@@ -1590,6 +1597,83 @@ drive_name (size_t index, char *ret)
    return ret;
  }
  
diff --git a/0015-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch b/0015-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
index 348d688..106c50c 100644
--- a/0015-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
+++ b/0015-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
@@ -1,7 +1,7 @@
-From ecb74a38bc511924c7cb17d64b500fade7f1ed23 Mon Sep 17 00:00:00 2001
+From 80f897a296f6a9eab6fcabaff372338a4441e0d3 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 22 Jun 2012 10:06:47 +0100
-Subject: [PATCH 15/19] EPEL 5: Fix blkid to return "LVM2_member" for PVs.
+Subject: [PATCH 15/20] EPEL 5: Fix blkid to return "LVM2_member" for PVs.
 
 Old blkid in RHEL 5 didn't return the right thing for PVs.
 ---
diff --git a/0016-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch b/0016-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
index 8800d68..52d721a 100644
--- a/0016-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
+++ b/0016-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
@@ -1,7 +1,7 @@
-From 30e28a64f12981b6df118c7d9b3baa1836177b42 Mon Sep 17 00:00:00 2001
+From ce21f625938f8f8bd0dfdf603c5d89b5ebc9666b Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 22 Jun 2012 10:24:48 +0100
-Subject: [PATCH 16/19] EPEL 5: sparsify: Fix command line options for old qemu-img.
+Subject: [PATCH 16/20] EPEL 5: sparsify: Fix command line options for old qemu-img.
 
 This didn't have -o backing_file etc.  Use old -b and -F options instead.
 ---
diff --git a/0017-EPEL-5-Remove-Fedora-MD-test-images.patch b/0017-EPEL-5-Remove-Fedora-MD-test-images.patch
index 0259cb3..76dfd54 100644
--- a/0017-EPEL-5-Remove-Fedora-MD-test-images.patch
+++ b/0017-EPEL-5-Remove-Fedora-MD-test-images.patch
@@ -1,7 +1,7 @@
-From 8e2fc4a49c5f9187aabb7ac27a22aa96b19193d1 Mon Sep 17 00:00:00 2001
+From 44bdc038ddeb4cf85eeef3d611e7c53b859450f7 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 22 Jun 2012 13:15:49 +0100
-Subject: [PATCH 17/19] EPEL 5: Remove Fedora MD test images.
+Subject: [PATCH 17/20] EPEL 5: Remove Fedora MD test images.
 
 On RHEL 5, mdadm is not able to create md devices with aliases,
 eg. '/dev/md/boot'.
diff --git a/0018-EPEL-5-Add-mkisofs-to-package-list.patch b/0018-EPEL-5-Add-mkisofs-to-package-list.patch
index 18b900c..51aa6d0 100644
--- a/0018-EPEL-5-Add-mkisofs-to-package-list.patch
+++ b/0018-EPEL-5-Add-mkisofs-to-package-list.patch
@@ -1,7 +1,7 @@
-From 3fd80b4a0f77fa388d252777ed54c814efcd2e2b Mon Sep 17 00:00:00 2001
+From db0c35d9e0c903a8ef81dcf1ed743c0b14f9da52 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 22 Jun 2012 14:46:43 +0100
-Subject: [PATCH 18/19] EPEL 5: Add mkisofs to package list.
+Subject: [PATCH 18/20] EPEL 5: Add mkisofs to package list.
 
 This package contains the 'isoinfo' program which is required
 to implement the corresponding API and for tests to pass.
diff --git a/0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch b/0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
index 4e05164..01ca046 100644
--- a/0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
+++ b/0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
@@ -1,7 +1,7 @@
-From 4c02df1f17155e310be92816b4ea9b1d77dc6466 Mon Sep 17 00:00:00 2001
+From 38543d688e3894815088ae98ad200fa5bbc3fdec Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 22 Jun 2012 21:58:32 +0100
-Subject: [PATCH 19/19] EPEL 5: Add 1 second pause after unmounting any filesystem.
+Subject: [PATCH 19/20] EPEL 5: Add 1 second pause after unmounting any filesystem.
 
 This fixes the test-charset-fidelity test case.  A simpler example
 which fails without this is:
diff --git a/0020-EPEL-5-Disable-tracing-in-regression-test-for-bug-79.patch b/0020-EPEL-5-Disable-tracing-in-regression-test-for-bug-79.patch
new file mode 100644
index 0000000..097007c
--- /dev/null
+++ b/0020-EPEL-5-Disable-tracing-in-regression-test-for-bug-79.patch
@@ -0,0 +1,31 @@
+From c479015862ab0dad8926bf796a0d58ac4e6aba1e Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones@redhat.com>
+Date: Tue, 26 Jun 2012 14:52:20 +0100
+Subject: [PATCH 20/20] EPEL 5: Disable tracing in regression test for bug 790721.
+
+Works around a problem in RHEL 5 glibc impl of open_memstream
+in threaded programs.
+---
+ tests/regressions/rhbz790721.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/tests/regressions/rhbz790721.c b/tests/regressions/rhbz790721.c
+index bcb5820..13cf7f1 100644
+--- a/tests/regressions/rhbz790721.c
++++ b/tests/regressions/rhbz790721.c
+@@ -107,6 +107,12 @@ start_thread (void *vi)
+     pthread_exit (vi);
+   }
+ 
++  /* Hack for RHEL 5: open_memstream occasionally returns a bogus
++   * pointer, causing trace to segfault.  Only appears to happen in
++   * multithreaded programs though.
++   */
++  guestfs_set_trace (g, 0);
++
+   if (guestfs_add_drive_opts (g, "/dev/null",
+                               GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
+                               GUESTFS_ADD_DRIVE_OPTS_READONLY, 1,
+-- 
+1.7.4.1
+
diff --git a/README.EPEL-5 b/README.EPEL-5
index f4ff3fe..8cbaa2e 100644
--- a/README.EPEL-5
+++ b/README.EPEL-5
@@ -111,6 +111,9 @@ The following features may not work in this version of libguestfs:
 
  - Adding drives using non-virtio-blk interfaces.
 
+ - Enabling trace in multi-threaded programs may cause a segfault.
+   Appears to be caused by a bug in RHEL 5 glibc open_memstream(3).
+
 
 (5) Other notes
 ---------------
diff --git a/libguestfs.spec b/libguestfs.spec
index 88efee5..5b8296a 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -21,8 +21,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.19.11
-Release:       2%{?dist}
+Version:       1.19.12
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -39,6 +39,8 @@ Source12:      gnulib-4fb7ea20122.tar.gz
 
 BuildRequires: autoconf, automake, libtool
 
+# These patches come from the "oldlinux" branch upstream.
+# https://github.com/libguestfs/libguestfs/commits/oldlinux
 Patch0001:     0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
 Patch0002:     0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
 Patch0003:     0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
@@ -59,11 +61,6 @@ 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
 
-# Upstream in libguestfs >= 1.19.12.
-Patch0101:     0001-tests-Allow-SELinux-tests-to-be-skipped-with-an-envi.patch
-Patch0102:     0002-fish-Allow-mount-local-test-to-be-skipped-with-envir.patch
-Patch0103:     0003-sysprep-Don-t-check-for-dev-fuse-before-running-the-.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -911,6 +908,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 25 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.12-1
+- New upstream version 1.19.12.
+- Update patches.
+
 * Mon Jun 25 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.11-2
 - New upstream version 1.19.11.
 
diff --git a/sources b/sources
index bd9befd..66c136c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 f2577d577727581a1eee95df18bf5624  gnulib-4fb7ea20122.tar.gz
-e55f60b5f4a3dec1acf88e31c5d0a8d0  libguestfs-1.19.11.tar.gz
+ffb422af2c1bc3c47883f4a55298ec55  libguestfs-1.19.12.tar.gz