From b287e8fc176dba6abf21564ec0685631d167a99e Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Jun 03 2013 16:10:40 +0000
Subject: Rebase to upstream stable branch version 1.20.8.


- This contains a complete fix for CVE-2013-2124.

---

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 45bc8b5..3104e4a 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 0ac56223f3bdda38007ec11b15992e16f29915b2 Mon Sep 17 00:00:00 2001
+From 8f5ea9ebe047912e1850180926c1baa25830d3f0 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/36] EPEL 5: Remove checks which fail with ancient qemu.
+Subject: [PATCH 01/33] EPEL 5: Remove checks which fail with ancient qemu.
 
 Note that g->app.qemu_version and g->app.qemu_devices will both
 be empty strings.
@@ -11,7 +11,7 @@ be empty strings.
  2 files changed, 2 insertions(+), 78 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ef07d31..796b0c5 100644
+index cf505e4..9f5371b 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -697,63 +697,6 @@ This could be a very old version of qemu, or qemu might not be
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 1c88444..811674d 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 8a00cc50640d2eb08c31f0807d722ce163871a2c Mon Sep 17 00:00:00 2001
+From e89db097fd2bba5888f56faa06c7f7420ce372c7 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/36] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
+Subject: [PATCH 02/33] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
 
 ---
  configure.ac |   28 ++++++++++++++--------------
  1 files changed, 14 insertions(+), 14 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 796b0c5..fb4bf18 100644
+index 9f5371b..a0d8007 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1559,33 +1559,33 @@ echo       "Appliance ........................... $enable_appliance"
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 51dcaa7..6715549 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 9871e1d5255c6d15cea3832767bf90e3f47c4d18 Mon Sep 17 00:00:00 2001
+From 66035f3e05e6cd9a87f8b59605d38bc5cd7b97fa 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/36] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
+Subject: [PATCH 03/33] 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 fb4bf18..c8924e5 100644
+index a0d8007..81f5466 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -258,7 +258,7 @@ The code will still compile, but is likely to leak memory and other
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 0383dcf..e498a22 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 c8f8e45763bc22912b41a4180ba5033e568b380f Mon Sep 17 00:00:00 2001
+From 14afa058957a45100e87f391423d4d953ce50108 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/36] EPEL 5: Don't use C99-style variable decls in for-loop.
+Subject: [PATCH 04/33] EPEL 5: Don't use C99-style variable decls in for-loop.
 
 ---
  daemon/btrfs.c         |    3 ++-
@@ -63,10 +63,10 @@ index 55c39cb..6650547 100644
               pr "  }\n";
               pr "  return r;\n"
 diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c
-index d3dae37..67e83b7 100644
+index c2f8dba..7127162 100644
 --- a/src/inspect-fs-unix.c
 +++ b/src/inspect-fs-unix.c
-@@ -999,7 +999,8 @@ uuid_hash(const void *x, size_t table_size)
+@@ -1000,7 +1000,8 @@ uuid_hash(const void *x, size_t table_size)
    const md_uuid *a = x;
  
    size_t h = a->uuid[0];
@@ -76,7 +76,7 @@ index d3dae37..67e83b7 100644
      h ^= a->uuid[i];
    }
  
-@@ -1012,7 +1013,8 @@ uuid_cmp(const void *x, const void *y)
+@@ -1013,7 +1014,8 @@ uuid_cmp(const void *x, const void *y)
    const md_uuid *a = x;
    const md_uuid *b = y;
  
@@ -86,7 +86,7 @@ index d3dae37..67e83b7 100644
      if (a->uuid[i] != b->uuid[i]) return 0;
    }
  
-@@ -1076,7 +1078,8 @@ map_app_md_devices (guestfs_h *g, Hash_table **map)
+@@ -1077,7 +1079,8 @@ map_app_md_devices (guestfs_h *g, Hash_table **map)
    mds = guestfs_list_md_devices(g);
    if (mds == NULL) goto error;
  
@@ -96,7 +96,7 @@ index d3dae37..67e83b7 100644
      CLEANUP_FREE_STRING_LIST char **detail = guestfs_md_detail (g, *md);
      if (detail == NULL) goto error;
  
-@@ -1187,7 +1190,8 @@ map_md_devices(guestfs_h *g, Hash_table **map)
+@@ -1188,7 +1191,8 @@ map_md_devices(guestfs_h *g, Hash_table **map)
                                     mdadm_app_free);
    if (!*map) g->abort_cb();
  
@@ -106,7 +106,7 @@ index d3dae37..67e83b7 100644
      /* Get device name and uuid for each array */
      CLEANUP_FREE char *dev_path = safe_asprintf (g, "%s/devicename", *m);
      char *dev = guestfs_aug_get (g, dev_path);
-@@ -1480,7 +1484,8 @@ inspect_with_augeas (guestfs_h *g, struct inspect_fs *fs,
+@@ -1481,7 +1485,8 @@ inspect_with_augeas (guestfs_h *g, struct inspect_fs *fs,
                       int (*f) (guestfs_h *, struct inspect_fs *))
  {
    /* Security: Refuse to do this if a config file is too large. */
@@ -116,7 +116,7 @@ index d3dae37..67e83b7 100644
      if (guestfs_exists(g, *i) == 0) continue;
  
      int64_t size = guestfs_filesize (g, *i);
-@@ -1519,7 +1524,7 @@ inspect_with_augeas (guestfs_h *g, struct inspect_fs *fs,
+@@ -1520,7 +1525,7 @@ inspect_with_augeas (guestfs_h *g, struct inspect_fs *fs,
  
  #define EXCL " and . != \""
  #define EXCL_LEN (strlen(EXCL))
diff --git a/0005-EPEL-5-Remove-Erlang-bindings.patch b/0005-EPEL-5-Remove-Erlang-bindings.patch
index 72dc60b..672733c 100644
--- a/0005-EPEL-5-Remove-Erlang-bindings.patch
+++ b/0005-EPEL-5-Remove-Erlang-bindings.patch
@@ -1,7 +1,7 @@
-From 68ef51fac452cfac5864b3524c41ce57104e31d5 Mon Sep 17 00:00:00 2001
+From 53ff4ac0b5610226c73d07e5a5aa4e329aca5cdb 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/36] EPEL 5: Remove Erlang bindings.
+Subject: [PATCH 05/33] EPEL 5: Remove Erlang bindings.
 
 ---
  Makefile.am  |    3 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 05/36] EPEL 5: Remove Erlang bindings.
  3 files changed, 0 insertions(+), 28 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 3908d01..7f53159 100644
+index 5b541d8..baf7b9f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -89,9 +89,6 @@ endif
@@ -24,7 +24,7 @@ index 3908d01..7f53159 100644
  SUBDIRS += lua lua/examples
  endif
 diff --git a/configure.ac b/configure.ac
-index c8924e5..2ba6a80 100644
+index 81f5466..b78e98b 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1311,25 +1311,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 7965a79..11cc4c1 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 3772113b6a431974abaed1cabc1b055881193938 Mon Sep 17 00:00:00 2001
+From 08b2008ccd16d2a2f0b041100187607d5193f170 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/36] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
+Subject: [PATCH 06/33] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
 
 ---
  Makefile.am  |    3 --
@@ -10,7 +10,7 @@ Subject: [PATCH 06/36] EPEL 5: Remove GObject / GObject Introspection / GJS bind
  3 files changed, 0 insertions(+), 126 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 7f53159..04a6565 100644
+index baf7b9f..9a8062e 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -92,9 +92,6 @@ endif
@@ -24,7 +24,7 @@ index 7f53159..04a6565 100644
  # Unconditional because nothing is built yet.
  SUBDIRS += csharp
 diff --git a/configure.ac b/configure.ac
-index 2ba6a80..07c360e 100644
+index b78e98b..582ca44 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1362,58 +1362,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 e65dee2..6c4f9d1 100644
--- a/0007-EPEL-5-Remove-PHP-bindings.patch
+++ b/0007-EPEL-5-Remove-PHP-bindings.patch
@@ -1,7 +1,7 @@
-From 21943f8c165ce6a971d063fe7bed474a3271aed9 Mon Sep 17 00:00:00 2001
+From 56819cbece86d6051acc64ea70f6dda6dfe0cbd2 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/36] EPEL 5: Remove PHP bindings.
+Subject: [PATCH 07/33] EPEL 5: Remove PHP bindings.
 
 ---
  Makefile.am  |    3 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 07/36] EPEL 5: Remove PHP bindings.
  3 files changed, 0 insertions(+), 20 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 04a6565..327e0c4 100644
+index 9a8062e..a8154d3 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -86,9 +86,6 @@ endif
@@ -24,7 +24,7 @@ index 04a6565..327e0c4 100644
  SUBDIRS += lua lua/examples
  endif
 diff --git a/configure.ac b/configure.ac
-index 07c360e..0e49b34 100644
+index 582ca44..9d1544e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1298,19 +1298,6 @@ AS_IF([test "x$enable_haskell" != "xno"],[
diff --git a/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch b/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
index 0ba0a43..3d0c722 100644
--- a/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
+++ b/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
@@ -1,7 +1,7 @@
-From 8bf1fe18c7c28e6d8a31be83be4d553956a6628f Mon Sep 17 00:00:00 2001
+From 2559e63836a7f87acba0e3c2d37b81b78b1de323 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/36] EPEL 5: Define le64toh, le32toh if not defined.
+Subject: [PATCH 08/33] EPEL 5: Define le64toh, le32toh if not defined.
 
 ---
  src/inspect-fs-windows.c |   16 ++++++++++++++++
diff --git a/0009-EPEL-5-Add-gnulib-utimensat-module.patch b/0009-EPEL-5-Add-gnulib-utimensat-module.patch
index 703e184..5992254 100644
--- a/0009-EPEL-5-Add-gnulib-utimensat-module.patch
+++ b/0009-EPEL-5-Add-gnulib-utimensat-module.patch
@@ -1,7 +1,7 @@
-From 62c4d0423fcffee04c0016865787f6f614d6f304 Mon Sep 17 00:00:00 2001
+From d8bc097cf9dadad2a73f195a197f5812f80388e4 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/36] EPEL 5: Add gnulib utimensat module.
+Subject: [PATCH 09/33] 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 99e78b1..4031590 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 5d03f944054585f0117af4c85584e0f15f1ff4cc Mon Sep 17 00:00:00 2001
+From 547f896280150d56f902308dd320417c5de938a5 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/36] EPEL 5: Old ocamlopt didn't support debugging (-g option).
+Subject: [PATCH 10/33] 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 f82a819..a996643 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 fdc5c9eeaccf9c3f25d3a5d943fbbf08ef936233 Mon Sep 17 00:00:00 2001
+From a35275200505c8457c4192bf144c5169c99e1e41 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/36] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
+Subject: [PATCH 11/33] 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 0e49b34..d0f6f1e 100644
+index 9d1544e..3d099a8 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -978,14 +978,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 3ae8797..f9ed0e3 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 2ae8a1ffcb8af8902a7e7ed57cdb3d6055a78d83 Mon Sep 17 00:00:00 2001
+From ba288405498c6e648cb3a043bc6941c49b69a3b8 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/36] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
+Subject: [PATCH 12/33] 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 d0f6f1e..6d04e90 100644
+index 3d099a8..0d5c655 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1355,7 +1355,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 40db0c5..118519f 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,7 +1,7 @@
-From 10a6018ca0a019920629591d82d60a433b882b17 Mon Sep 17 00:00:00 2001
+From 85db50303c7701b7ba4dea73ce937a0a456437d5 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/36] EPEL 5: Remove id= from -drive parameter on qemu command line.
+Subject: [PATCH 13/33] EPEL 5: Remove id= from -drive parameter on qemu command line.
 
 ---
  src/launch-appliance.c |    5 ++---
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 7e6649a..efe6925 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 52af6f30a0efc4990ea2302e2467851af3ffd61d Mon Sep 17 00:00:00 2001
+From c661a2588c92d2607e0b97c84db37844a45daf5c 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/36] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
+Subject: [PATCH 14/33] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
 
 ---
  appliance/init         |    4 +-
@@ -12,7 +12,7 @@ Subject: [PATCH 14/36] EPEL 5: Add "null vmchannel" back for qemu without virtio
  5 files changed, 236 insertions(+), 69 deletions(-)
 
 diff --git a/appliance/init b/appliance/init
-index 290d6ac..20c8870 100755
+index 30d4f60..4cd3861 100755
 --- a/appliance/init
 +++ b/appliance/init
 @@ -80,10 +80,10 @@ hwclock -u -s
diff --git a/0015-EPEL-5-Disable-libvirt-attach-method.patch b/0015-EPEL-5-Disable-libvirt-attach-method.patch
index 25349e0..59092f8 100644
--- a/0015-EPEL-5-Disable-libvirt-attach-method.patch
+++ b/0015-EPEL-5-Disable-libvirt-attach-method.patch
@@ -1,7 +1,7 @@
-From a447dcd5b5131cde034d6a2a9e26e3a27eca9689 Mon Sep 17 00:00:00 2001
+From d0abac9e46c5222457c0ee6f3cdbb6ef30b97fb2 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Thu, 30 Aug 2012 17:57:46 +0100
-Subject: [PATCH 15/36] EPEL 5: Disable libvirt attach method.
+Subject: [PATCH 15/33] EPEL 5: Disable libvirt attach method.
 
 ---
  src/launch-libvirt.c |    2 +-
diff --git a/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch b/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
index 02c015e..25a6b32 100644
--- a/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
+++ b/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
@@ -1,7 +1,7 @@
-From ebb923ed81316ba931ec74cd81a4b23e739e5e92 Mon Sep 17 00:00:00 2001
+From b514aa51bc4c9c63bc220b1220bea79a95e8fb67 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 16/36] EPEL 5: Fix blkid to return "LVM2_member" for PVs.
+Subject: [PATCH 16/33] 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/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch b/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
index 4187551..d909809 100644
--- a/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
+++ b/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
@@ -1,7 +1,7 @@
-From 962689dedb6356c0f04a9eaaf1d23835ed8a2283 Mon Sep 17 00:00:00 2001
+From 75155d928942470c9e0a00701c929cc6df02fc0e 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 17/36] EPEL 5: sparsify: Fix command line options for old qemu-img.
+Subject: [PATCH 17/33] 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/0018-EPEL-5-Remove-Fedora-MD-test-images.patch b/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
index 1ee7e67..aa1bab6 100644
--- a/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
+++ b/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
@@ -1,7 +1,7 @@
-From 98d5a48143b0d409ac76fc6c6e15fdef2cc33b65 Mon Sep 17 00:00:00 2001
+From b80cc1f8013dc4e4a52db0cb3db67d37b7801382 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 18/36] EPEL 5: Remove Fedora MD test images.
+Subject: [PATCH 18/33] 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/0019-EPEL-5-Add-mkisofs-to-package-list.patch b/0019-EPEL-5-Add-mkisofs-to-package-list.patch
index 6614da6..fb78a8c 100644
--- a/0019-EPEL-5-Add-mkisofs-to-package-list.patch
+++ b/0019-EPEL-5-Add-mkisofs-to-package-list.patch
@@ -1,7 +1,7 @@
-From bb99ad810f2535c1a78871de4cb2831f110593e4 Mon Sep 17 00:00:00 2001
+From b0fd7f38bda93f4aa1e717c66d1c662bfe9c7e5a 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 19/36] EPEL 5: Add mkisofs to package list.
+Subject: [PATCH 19/33] 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/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch b/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
index d6aab47..24b83f2 100644
--- a/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
+++ b/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
@@ -1,7 +1,7 @@
-From f3dd167b8801d5eb05958205556b1092a196368b Mon Sep 17 00:00:00 2001
+From 7b8e8343f44e35aef2d8fd45702999b814998cba 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 20/36] EPEL 5: Add 1 second pause after unmounting any filesystem.
+Subject: [PATCH 20/33] 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/0021-EPEL-5-podwrapper-Remove-HTML-output.patch b/0021-EPEL-5-podwrapper-Remove-HTML-output.patch
index 13b739d..8aed4a9 100644
--- a/0021-EPEL-5-podwrapper-Remove-HTML-output.patch
+++ b/0021-EPEL-5-podwrapper-Remove-HTML-output.patch
@@ -1,7 +1,7 @@
-From 257c8f7a07fc0b5fcbc19260e643bf753a49ce76 Mon Sep 17 00:00:00 2001
+From b3a067100238c12aae33d48abcaefe01e5ad8a2d Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Thu, 30 Aug 2012 18:01:00 +0100
-Subject: [PATCH 21/36] EPEL 5: podwrapper: Remove HTML output.
+Subject: [PATCH 21/33] EPEL 5: podwrapper: Remove HTML output.
 
 It requires perl Pod::Simple::XHTML which did not exist in
 RHEL 5 era.
@@ -10,7 +10,7 @@ RHEL 5 era.
  1 files changed, 0 insertions(+), 92 deletions(-)
 
 diff --git a/podwrapper.pl.in b/podwrapper.pl.in
-index bbc0b7c..a40655a 100755
+index af21ef0..e7e1de2 100755
 --- a/podwrapper.pl.in
 +++ b/podwrapper.pl.in
 @@ -25,7 +25,6 @@ use Getopt::Long;
@@ -20,8 +20,8 @@ index bbc0b7c..a40655a 100755
 -use Pod::Simple::XHTML;
  use File::Basename;
  
- =encoding utf8
-@@ -417,97 +416,6 @@ if ($man) {
+ # https://www.redhat.com/archives/libguestfs/2013-May/thread.html#00088
+@@ -420,97 +419,6 @@ if ($man) {
      print "$progname: wrote $man\n";
  }
  
diff --git a/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch b/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
index 5cab0a0..e2e5d49 100644
--- a/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
+++ b/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
@@ -1,7 +1,7 @@
-From 32705d2e9a13cfb248b4db1ad8b7349ed465f914 Mon Sep 17 00:00:00 2001
+From a1cbdb766643f16035523f943bc8e876d7f9c13c Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Thu, 30 Aug 2012 18:16:18 +0100
-Subject: [PATCH 22/36] EPEL 5: podwrapper: Don't use Pod::Man.
+Subject: [PATCH 22/33] EPEL 5: podwrapper: Don't use Pod::Man.
 
 This unfortunately means the man pages are generated as plain text.
 However that's necessary as Pod::Man does not have an output_string
@@ -11,10 +11,10 @@ method.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/podwrapper.pl.in b/podwrapper.pl.in
-index a40655a..ea19444 100755
+index e7e1de2..1f84b3a 100755
 --- a/podwrapper.pl.in
 +++ b/podwrapper.pl.in
-@@ -387,7 +387,7 @@ SUBMAN: {
+@@ -390,7 +390,7 @@ SUBMAN: {
      package Podwrapper::Man;
  
      use vars qw(@ISA $VERSION);
diff --git a/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch b/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
index cb0b9f0..d4be3cd 100644
--- a/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
+++ b/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
@@ -1,7 +1,7 @@
-From 9f4d530ca5e1cba66039ae25e2472fcebb3bb916 Mon Sep 17 00:00:00 2001
+From 1a696970d8e6bf2a969c06cdf764cec16d419073 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Thu, 30 Aug 2012 18:19:28 +0100
-Subject: [PATCH 23/36] EPEL 5: Revert "Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH"
+Subject: [PATCH 23/33] EPEL 5: Revert "Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH"
 
 This reverts commit 61c9ea496e0579bb7d1bcf496595d66c3f08cfec.
 ---
diff --git a/0024-EPEL-5-Don-t-use-sgabios.patch b/0024-EPEL-5-Don-t-use-sgabios.patch
index ca24df4..c8346f6 100644
--- a/0024-EPEL-5-Don-t-use-sgabios.patch
+++ b/0024-EPEL-5-Don-t-use-sgabios.patch
@@ -1,7 +1,7 @@
-From 1810496e8aa5ff35b8ec5acd3ae64ff7635154b3 Mon Sep 17 00:00:00 2001
+From 9f157857641bd3797f545748392a3356a9a47c5c Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 31 Aug 2012 10:24:06 +0100
-Subject: [PATCH 24/36] EPEL 5: Don't use sgabios.
+Subject: [PATCH 24/33] EPEL 5: Don't use sgabios.
 
 Old qemu doesn't support '-device' parameter.
 ---
diff --git a/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch b/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
index c3db6d9..a62251a 100644
--- a/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
+++ b/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
@@ -1,7 +1,7 @@
-From a46b654e1052506abb81bc1678ed55bfc0175202 Mon Sep 17 00:00:00 2001
+From fb0ae7109ae5e85722cf7d38ea41fb696ccfe5e0 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 31 Aug 2012 13:48:18 +0100
-Subject: [PATCH 25/36] EPEL 5: Revert "daemon: Remove e2prog hack (only needed for RHEL 5)."
+Subject: [PATCH 25/33] EPEL 5: Revert "daemon: Remove e2prog hack (only needed for RHEL 5)."
 
 This reverts commit 163e030ee13644ad9efe1e078aff47b879657333.
 ---
diff --git a/0026-EPEL-5-Disable-tar-xz-test.patch b/0026-EPEL-5-Disable-tar-xz-test.patch
index 735cef5..2623608 100644
--- a/0026-EPEL-5-Disable-tar-xz-test.patch
+++ b/0026-EPEL-5-Disable-tar-xz-test.patch
@@ -1,7 +1,7 @@
-From 6c13992cc7e40319eed96365f04e2873516ba19f Mon Sep 17 00:00:00 2001
+From ce5760a6a6660aed36592958b21edc5bcb7616b5 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 31 Aug 2012 14:59:25 +0100
-Subject: [PATCH 26/36] EPEL 5: Disable tar --xz test.
+Subject: [PATCH 26/33] EPEL 5: Disable tar --xz test.
 
 Although xz is available, ancient tar didn't have the --xz option.
 ---
diff --git a/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch b/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
index a08dcad..bfcdc11 100644
--- a/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
+++ b/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
@@ -1,7 +1,7 @@
-From 997e1c72b40609777e5ea166a6b8ac5837c355f4 Mon Sep 17 00:00:00 2001
+From abdd04f42ccd7e07d665fb7e9549d5c33704ed55 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 31 Aug 2012 22:12:59 +0100
-Subject: [PATCH 27/36] EPEL 5: Ignore sparsify error if qemu-img --help is killed by a signal.
+Subject: [PATCH 27/33] EPEL 5: Ignore sparsify error if qemu-img --help is killed by a signal.
 
 ---
  sparsify/sparsify.ml |    3 +--
diff --git a/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch b/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
index 444b2be..b561749 100644
--- a/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
+++ b/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
@@ -1,7 +1,7 @@
-From d4aec723e9f35871b068e106a464f3d36f2a6222 Mon Sep 17 00:00:00 2001
+From a184fc93a2f7e1763ec135154f2442aa55a4605b Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Mon, 3 Sep 2012 11:04:39 +0100
-Subject: [PATCH 28/36] EPEL 5: Revert "daemon: remove call to obsolete udevsettle"
+Subject: [PATCH 28/33] EPEL 5: Revert "daemon: remove call to obsolete udevsettle"
 
 This reverts commit b6413f8dbef92c46c4baf9499366716a166f2163.
 ---
diff --git a/0029-EPEL-5-No-libtoolize-install-option.patch b/0029-EPEL-5-No-libtoolize-install-option.patch
index cca4dc3..5465f7b 100644
--- a/0029-EPEL-5-No-libtoolize-install-option.patch
+++ b/0029-EPEL-5-No-libtoolize-install-option.patch
@@ -1,7 +1,7 @@
-From 6c29724ee7bb159aed59d5dddb0a12d5b67933ec Mon Sep 17 00:00:00 2001
+From 2d8c62bda97fe92ccb0eabab9bd7775524a0e70d Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 8 Mar 2013 19:09:21 +0000
-Subject: [PATCH 29/36] EPEL 5: No libtoolize --install option.
+Subject: [PATCH 29/33] EPEL 5: No libtoolize --install option.
 
 ---
  bootstrap |    2 +-
diff --git a/0030-EPEL-5-Disable-valgrind.patch b/0030-EPEL-5-Disable-valgrind.patch
index e175e20..7fa5658 100644
--- a/0030-EPEL-5-Disable-valgrind.patch
+++ b/0030-EPEL-5-Disable-valgrind.patch
@@ -1,7 +1,7 @@
-From 6edc5f2cda3c08345e8a31d2dc25a67d0c219b2e Mon Sep 17 00:00:00 2001
+From a1f128cb4bbb231fba61e493c3825fbb538163f7 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 8 Mar 2013 19:19:43 +0000
-Subject: [PATCH 30/36] EPEL 5: Disable valgrind.
+Subject: [PATCH 30/33] EPEL 5: Disable valgrind.
 
 Ancient automake didn't have AM_SUBST_NOTMAKE.
 ---
@@ -9,7 +9,7 @@ Ancient automake didn't have AM_SUBST_NOTMAKE.
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6d04e90..c27cad1 100644
+index 0d5c655..3b28b49 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -868,8 +868,8 @@ AS_IF([test "x$VALGRIND" != "xno"],[
diff --git a/0031-EPEL-5-Remove-Linux-capabilities.patch b/0031-EPEL-5-Remove-Linux-capabilities.patch
index bccb2b6..4506df5 100644
--- a/0031-EPEL-5-Remove-Linux-capabilities.patch
+++ b/0031-EPEL-5-Remove-Linux-capabilities.patch
@@ -1,7 +1,7 @@
-From c32692da782d5febcbda9b449550873697977f81 Mon Sep 17 00:00:00 2001
+From 4c74438489ec8178a3890ffa14c09491f2739476 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 8 Mar 2013 20:20:23 +0000
-Subject: [PATCH 31/36] EPEL 5: Remove Linux capabilities.
+Subject: [PATCH 31/33] EPEL 5: Remove Linux capabilities.
 
 Linux file capabilities are not supported in RHEL 5, and the
 cap_*_file functions don't exist in the libcap library (although
@@ -11,7 +11,7 @@ confusingly they are in the header file).
  1 files changed, 0 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index c27cad1..0fd6bf0 100644
+index 3b28b49..25e15e2 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -751,14 +751,6 @@ AC_CHECK_LIB([acl],[acl_from_text],[
diff --git a/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch b/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
index 89a6fef..756cfec 100644
--- a/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
+++ b/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
@@ -1,7 +1,7 @@
-From 3a79e5714a38873aed9ad1847f77c4e2710c458b Mon Sep 17 00:00:00 2001
+From 0c40ac88a26e9645c568a5b8b37310257a0c4915 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 9 Mar 2013 19:24:29 +0000
-Subject: [PATCH 32/36] EPEL 5: ruby: Use old rake/rdoctask and rake/gempackagetask.
+Subject: [PATCH 32/33] EPEL 5: ruby: Use old rake/rdoctask and rake/gempackagetask.
 
 The 'begin ... rescue' code is supposed to ensure these old packages
 are required, but for reasons not understood this doesn't work on
diff --git a/0033-EPEL-5-Revert-Use-pkg-config-for-Python.patch b/0033-EPEL-5-Revert-Use-pkg-config-for-Python.patch
new file mode 100644
index 0000000..5a4dec4
--- /dev/null
+++ b/0033-EPEL-5-Revert-Use-pkg-config-for-Python.patch
@@ -0,0 +1,97 @@
+From 5f7acbb95e055efa840d2108e207e3ef8106761a Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones@redhat.com>
+Date: Wed, 29 May 2013 17:27:06 +0100
+Subject: [PATCH 33/33] EPEL 5: Revert "Use pkg-config for Python"
+
+In RHEL 5, python doesn't have pkg-config configuration.
+
+This reverts commit ba2e4f1794dabdb251823c86ee843a0fe3186a74.
+---
+ configure.ac       |   35 +++++++++++++++--------------------
+ python/Makefile.am |    2 +-
+ 2 files changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 25e15e2..e4f768d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1020,6 +1020,7 @@ AM_CONDITIONAL([HAVE_PERL],
+ dnl Check for Python (optional, for Python bindings).
+ PYTHON_PREFIX=
+ PYTHON_VERSION=
++PYTHON_INCLUDEDIR=
+ PYTHON_INSTALLDIR=
+ 
+ AC_ARG_ENABLE([python],
+@@ -1030,30 +1031,23 @@ AS_IF([test "x$enable_python" != "xno"],[
+     AC_CHECK_PROG([PYTHON],[python],[python],[no])
+ 
+     if test "x$PYTHON" != "xno"; then
++        AC_MSG_CHECKING([Python prefix])
++        PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
++        AC_MSG_RESULT([$PYTHON_PREFIX])
++
+ 	AC_MSG_CHECKING([Python version])
+         PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
+         PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
+         PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
+ 	AC_MSG_RESULT([$PYTHON_VERSION])
+-        # Debian: python-2.7.pc, python-3.2.pc
+-        PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[
+-            AC_SUBST([PYTHON_CFLAGS])
+-            AC_SUBST([PYTHON_LIBS])
+-            AC_SUBST([PYTHON_VERSION])
+-            AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
+-        ],[
+-            PKG_CHECK_MODULES([PYTHON], [python],[
+-                AC_SUBST([PYTHON_CFLAGS])
+-                AC_SUBST([PYTHON_LIBS])
+-                AC_SUBST([PYTHON_VERSION])
+-                AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
+-            ],[
+-                AC_MSG_WARN([python $PYTHON_VERSION not found])
+-            ])
+-        ])
+-        AC_MSG_CHECKING([Python prefix])
+-        PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
+-        AC_MSG_RESULT([$PYTHON_PREFIX])
++
++        AC_MSG_CHECKING([for Python include path])
++        if test -z "$PYTHON_INCLUDEDIR"; then
++            python_path=`$PYTHON -c "import distutils.sysconfig; \
++                                     print (distutils.sysconfig.get_python_inc ());"`
++            PYTHON_INCLUDEDIR=$python_path
++        fi
++        AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
+ 
+         AC_ARG_WITH([python-installdir],
+                     [AS_HELP_STRING([--with-python-installdir],
+@@ -1091,10 +1085,11 @@ AS_IF([test "x$enable_python" != "xno"],[
+ 
+     AC_SUBST(PYTHON_PREFIX)
+     AC_SUBST(PYTHON_VERSION)
++    AC_SUBST(PYTHON_INCLUDEDIR)
+     AC_SUBST(PYTHON_INSTALLDIR)
+ ])
+ AM_CONDITIONAL([HAVE_PYTHON],
+-    [test "x$PYTHON" != "xno" && test "x$PYTHON_LIBS" != "x" ])
++    [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
+ 
+ dnl Check for Ruby and rake (optional, for Ruby bindings).
+ AC_ARG_ENABLE([ruby],
+diff --git a/python/Makefile.am b/python/Makefile.am
+index c88b994..3bc01b5 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -43,7 +43,7 @@ libguestfsmod_la_SOURCES = guestfs-py.c guestfs-py.h guestfs-py-byhand.c
+ 
+ libguestfsmod_la_CPPFLAGS = \
+ 	-DGUESTFS_PRIVATE=1 \
+-	$(PYTHON_CFLAGS) \
++	-I$(PYTHON_INCLUDEDIR) \
+ 	-I$(top_srcdir)/src -I$(top_builddir)/src
+ 
+ libguestfsmod_la_CFLAGS = \
+-- 
+1.7.4.1
+
diff --git a/0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch b/0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch
deleted file mode 100644
index 0a54c43..0000000
--- a/0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4ef4ff4158c0a7672ee784b1ff2df1ac5380ed2b Mon Sep 17 00:00:00 2001
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Wed, 29 May 2013 14:35:54 +0100
-Subject: [PATCH 33/36] generator: Set abs_builddir for old RHEL 5 which didn't have this.
-
----
- generator/Makefile.am |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/generator/Makefile.am b/generator/Makefile.am
-index 3797876..fcf3a9e 100644
---- a/generator/Makefile.am
-+++ b/generator/Makefile.am
-@@ -15,6 +15,9 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
-+# Old RHEL 5 autoconf doesn't have abs_builddir.
-+abs_builddir ?= $(shell pwd)
-+
- # In alphabetical order.
- sources = \
- 	actions.ml \
--- 
-1.7.4.1
-
diff --git a/0034-generator-Set-abs_srcdir-for-old-RHEL-5-which-didn-t.patch b/0034-generator-Set-abs_srcdir-for-old-RHEL-5-which-didn-t.patch
deleted file mode 100644
index fa7dff9..0000000
--- a/0034-generator-Set-abs_srcdir-for-old-RHEL-5-which-didn-t.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9fbceb6949778b8daace7610e35991fadac087b5 Mon Sep 17 00:00:00 2001
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Wed, 29 May 2013 16:15:24 +0100
-Subject: [PATCH 34/36] generator: Set abs_srcdir for old RHEL 5 which didn't have this.
-
----
- generator/Makefile.am |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/generator/Makefile.am b/generator/Makefile.am
-index fcf3a9e..274860a 100644
---- a/generator/Makefile.am
-+++ b/generator/Makefile.am
-@@ -18,6 +18,9 @@
- # Old RHEL 5 autoconf doesn't have abs_builddir.
- abs_builddir ?= $(shell pwd)
- 
-+# Old RHEL 5 autoconf doesn't have abs_srcdir.
-+abs_srcdir ?= $(shell cd $(top_srcdir)/generator && pwd)
-+
- # In alphabetical order.
- sources = \
- 	actions.ml \
--- 
-1.7.4.1
-
diff --git a/0035-generator-Set-builddir-for-old-RHEL-5-which-didn-t-h.patch b/0035-generator-Set-builddir-for-old-RHEL-5-which-didn-t-h.patch
deleted file mode 100644
index 1d7506c..0000000
--- a/0035-generator-Set-builddir-for-old-RHEL-5-which-didn-t-h.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4d9ace3f868e4cb32f79b597910c5904cb522ea6 Mon Sep 17 00:00:00 2001
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Wed, 29 May 2013 16:22:02 +0100
-Subject: [PATCH 35/36] generator: Set builddir for old RHEL 5 which didn't have this.
-
----
- generator/Makefile.am |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/generator/Makefile.am b/generator/Makefile.am
-index 274860a..9903941 100644
---- a/generator/Makefile.am
-+++ b/generator/Makefile.am
-@@ -21,6 +21,9 @@ abs_builddir ?= $(shell pwd)
- # Old RHEL 5 autoconf doesn't have abs_srcdir.
- abs_srcdir ?= $(shell cd $(top_srcdir)/generator && pwd)
- 
-+# Old RHEL 5 autoconf doesn't have builddir.
-+builddir ?= .
-+
- # In alphabetical order.
- sources = \
- 	actions.ml \
--- 
-1.7.4.1
-
diff --git a/0036-EPEL-5-Revert-Use-pkg-config-for-Python.patch b/0036-EPEL-5-Revert-Use-pkg-config-for-Python.patch
deleted file mode 100644
index dc9ec5b..0000000
--- a/0036-EPEL-5-Revert-Use-pkg-config-for-Python.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From aff69dc6e3b4161cd538fb3d100a7fed9f91c9ac Mon Sep 17 00:00:00 2001
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Wed, 29 May 2013 17:27:06 +0100
-Subject: [PATCH 36/36] EPEL 5: Revert "Use pkg-config for Python"
-
-In RHEL 5, python doesn't have pkg-config configuration.
-
-This reverts commit ba2e4f1794dabdb251823c86ee843a0fe3186a74.
----
- configure.ac       |   35 +++++++++++++++--------------------
- python/Makefile.am |    2 +-
- 2 files changed, 16 insertions(+), 21 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0fd6bf0..b077c44 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1020,6 +1020,7 @@ AM_CONDITIONAL([HAVE_PERL],
- dnl Check for Python (optional, for Python bindings).
- PYTHON_PREFIX=
- PYTHON_VERSION=
-+PYTHON_INCLUDEDIR=
- PYTHON_INSTALLDIR=
- 
- AC_ARG_ENABLE([python],
-@@ -1030,30 +1031,23 @@ AS_IF([test "x$enable_python" != "xno"],[
-     AC_CHECK_PROG([PYTHON],[python],[python],[no])
- 
-     if test "x$PYTHON" != "xno"; then
-+        AC_MSG_CHECKING([Python prefix])
-+        PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
-+        AC_MSG_RESULT([$PYTHON_PREFIX])
-+
- 	AC_MSG_CHECKING([Python version])
-         PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
-         PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
-         PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
- 	AC_MSG_RESULT([$PYTHON_VERSION])
--        # Debian: python-2.7.pc, python-3.2.pc
--        PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[
--            AC_SUBST([PYTHON_CFLAGS])
--            AC_SUBST([PYTHON_LIBS])
--            AC_SUBST([PYTHON_VERSION])
--            AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
--        ],[
--            PKG_CHECK_MODULES([PYTHON], [python],[
--                AC_SUBST([PYTHON_CFLAGS])
--                AC_SUBST([PYTHON_LIBS])
--                AC_SUBST([PYTHON_VERSION])
--                AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
--            ],[
--                AC_MSG_WARN([python $PYTHON_VERSION not found])
--            ])
--        ])
--        AC_MSG_CHECKING([Python prefix])
--        PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
--        AC_MSG_RESULT([$PYTHON_PREFIX])
-+
-+        AC_MSG_CHECKING([for Python include path])
-+        if test -z "$PYTHON_INCLUDEDIR"; then
-+            python_path=`$PYTHON -c "import distutils.sysconfig; \
-+                                     print (distutils.sysconfig.get_python_inc ());"`
-+            PYTHON_INCLUDEDIR=$python_path
-+        fi
-+        AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
- 
-         AC_ARG_WITH([python-installdir],
-                     [AS_HELP_STRING([--with-python-installdir],
-@@ -1091,10 +1085,11 @@ AS_IF([test "x$enable_python" != "xno"],[
- 
-     AC_SUBST(PYTHON_PREFIX)
-     AC_SUBST(PYTHON_VERSION)
-+    AC_SUBST(PYTHON_INCLUDEDIR)
-     AC_SUBST(PYTHON_INSTALLDIR)
- ])
- AM_CONDITIONAL([HAVE_PYTHON],
--    [test "x$PYTHON" != "xno" && test "x$PYTHON_LIBS" != "x" ])
-+    [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
- 
- dnl Check for Ruby and rake (optional, for Ruby bindings).
- AC_ARG_ENABLE([ruby],
-diff --git a/python/Makefile.am b/python/Makefile.am
-index c88b994..3bc01b5 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -43,7 +43,7 @@ libguestfsmod_la_SOURCES = guestfs-py.c guestfs-py.h guestfs-py-byhand.c
- 
- libguestfsmod_la_CPPFLAGS = \
- 	-DGUESTFS_PRIVATE=1 \
--	$(PYTHON_CFLAGS) \
-+	-I$(PYTHON_INCLUDEDIR) \
- 	-I$(top_srcdir)/src -I$(top_builddir)/src
- 
- libguestfsmod_la_CFLAGS = \
--- 
-1.7.4.1
-
diff --git a/libguestfs.spec b/libguestfs.spec
index e0c3907..8e745ec 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.20.7
-Release:       3%{?dist}
+Version:       1.20.8
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -76,10 +76,7 @@ Patch0029:     0029-EPEL-5-No-libtoolize-install-option.patch
 Patch0030:     0030-EPEL-5-Disable-valgrind.patch
 Patch0031:     0031-EPEL-5-Remove-Linux-capabilities.patch
 Patch0032:     0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
-Patch0033:     0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch
-Patch0034:     0034-generator-Set-abs_srcdir-for-old-RHEL-5-which-didn-t.patch
-Patch0035:     0035-generator-Set-builddir-for-old-RHEL-5-which-didn-t-h.patch
-Patch0036:     0036-EPEL-5-Revert-Use-pkg-config-for-Python.patch
+Patch0033:     0033-EPEL-5-Revert-Use-pkg-config-for-Python.patch
 
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
@@ -915,6 +912,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun  3 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.8-1
+- Rebase to upstream stable branch version 1.20.8.
+  This contains a complete fix for CVE-2013-2124.
+
 * Wed May 29 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.7-3
 - Rebase to upstream stable branch version 1.20.7.
 - Includes fix for inspection vulnerability (RHBZ#968315).
diff --git a/sources b/sources
index 8780199..4e78577 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 da5f7fcd0f48f4e17dca4ce33a52cc7a  gnulib-4a8c422f.tar.gz
-1340c31b41ca46f77a49f720e3930e7b  libguestfs-1.20.7.tar.gz
+f05e8a9d1f852be4e85d00c9663493f2  libguestfs-1.20.8.tar.gz