[libguestfs/el5] Rebase to upstream stable branch version 1.20.7. Includes fix for inspection vulnerability (RHBZ#968
Richard W.M. Jones
rjones at fedoraproject.org
Wed May 29 14:31:52 UTC 2013
commit 7dda85dc8fe7ab2ae5b21b86fe35df09864dc45b
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Wed May 29 15:24:25 2013 +0100
Rebase to upstream stable branch version 1.20.7.
Includes fix for inspection vulnerability (RHBZ#968315).
.gitignore | 2 +
...emove-checks-which-fail-with-ancient-qemu.patch | 10 ++--
...L-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch | 8 ++--
...ace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch | 8 ++--
...t-use-C99-style-variable-decls-in-for-loo.patch | 18 ++++----
0005-EPEL-5-Remove-Erlang-bindings.patch | 16 ++++----
...ve-GObject-GObject-Introspection-GJS-bind.patch | 16 ++++----
0007-EPEL-5-Remove-PHP-bindings.patch | 16 ++++----
...L-5-Define-le64toh-le32toh-if-not-defined.patch | 4 +-
0009-EPEL-5-Add-gnulib-utimensat-module.patch | 8 ++--
...ocamlopt-didn-t-support-debugging-g-optio.patch | 16 ++++----
...ace-format6-with-format4-in-OCaml-gettext.patch | 10 ++--
...s-preserve-dup-deps-explicitly-to-libtool.patch | 8 ++--
...ve-id-from-drive-parameter-on-qemu-comman.patch | 8 ++--
...null-vmchannel-back-for-qemu-without-virt.patch | 26 ++++++------
0015-EPEL-5-Disable-libvirt-attach-method.patch | 6 +-
...5-Fix-blkid-to-return-LVM2_member-for-PVs.patch | 4 +-
...sify-Fix-command-line-options-for-old-qem.patch | 6 +-
0018-EPEL-5-Remove-Fedora-MD-test-images.patch | 20 +++++----
0019-EPEL-5-Add-mkisofs-to-package-list.patch | 8 ++--
...1-second-pause-after-unmounting-any-files.patch | 4 +-
0021-EPEL-5-podwrapper-Remove-HTML-output.patch | 6 +-
0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch | 6 +-
...rt-Mac-OS-X-Use-libtool-mode-execute-inst.patch | 43 ++++++++++----------
0024-EPEL-5-Don-t-use-sgabios.patch | 6 +-
...rt-daemon-Remove-e2prog-hack-only-needed-.patch | 4 +-
0026-EPEL-5-Disable-tar-xz-test.patch | 6 +-
...re-sparsify-error-if-qemu-img-help-is-kil.patch | 6 +-
...rt-daemon-remove-call-to-obsolete-udevset.patch | 4 +-
0029-EPEL-5-No-libtoolize-install-option.patch | 6 +-
0030-EPEL-5-Disable-valgrind.patch | 8 ++--
0031-EPEL-5-Remove-Linux-capabilities.patch | 8 ++--
...-Use-old-rake-rdoctask-and-rake-gempackag.patch | 4 +-
...et-abs_builddir-for-old-RHEL-5-which-didn.patch | 26 ++++++++++++
libguestfs.spec | 9 +++-
sources | 2 +-
36 files changed, 201 insertions(+), 165 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5612c4f..68cd309 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+*~
.build*.log
*.rpm
+/clog
/x86_64/
/i386/
/noarch/
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 4226d35..836950c 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 2766fa2cfff351a8db92432912f1457909868a36 Mon Sep 17 00:00:00 2001
+From 0ac56223f3bdda38007ec11b15992e16f29915b2 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 10:19:39 +0100
-Subject: [PATCH 01/32] 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,10 +11,10 @@ be empty strings.
2 files changed, 2 insertions(+), 78 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 488937c..bd6c45b 100644
+index ef07d31..796b0c5 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -677,63 +677,6 @@ This could be a very old version of qemu, or qemu might not be
+@@ -697,63 +697,6 @@ This could be a very old version of qemu, or qemu might not be
working.
])
fi
@@ -79,7 +79,7 @@ index 488937c..bd6c45b 100644
dnl Enable packet dumps when in verbose mode. This generates lots
diff --git a/src/launch-appliance.c b/src/launch-appliance.c
-index d1fe326..3498787 100644
+index 86f8ad8..9fb0bbd 100644
--- a/src/launch-appliance.c
+++ b/src/launch-appliance.c
@@ -770,30 +770,11 @@ test_qemu (guestfs_h *g)
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 6e13ca6..c448382 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,17 +1,17 @@
-From 396ba6859b31a9355a746af69e34d9966a47de0c Mon Sep 17 00:00:00 2001
+From 8a00cc50640d2eb08c31f0807d722ce163871a2c Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 10:23:19 +0100
-Subject: [PATCH 02/32] 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 bd6c45b..7269f84 100644
+index 796b0c5..fb4bf18 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1525,33 +1525,33 @@ echo "Appliance ........................... $enable_appliance"
+@@ -1559,33 +1559,33 @@ echo "Appliance ........................... $enable_appliance"
echo "QEMU ................................ $QEMU $QEMU_OPTIONS"
echo "guestfish and C-based virt tools .... yes"
echo "FUSE filesystem ..................... $enable_fuse"
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 98f1d6b..b00d10e 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,17 +1,17 @@
-From af2d0e35b55a2dbe95da71b7238b20fcf3c5caaa Mon Sep 17 00:00:00 2001
+From 9871e1d5255c6d15cea3832767bf90e3f47c4d18 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 10:46:20 +0100
-Subject: [PATCH 03/32] 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 7269f84..7cdcc2b 100644
+index fb4bf18..c8924e5 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -251,7 +251,7 @@ The code will still compile, but is likely to leak memory and other
+@@ -258,7 +258,7 @@ The code will still compile, but is likely to leak memory and other
resources when it runs.])])
dnl Check if dirent (readdir) supports d_type member.
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 6cf7231..6eb6486 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 1ac1e2add57ceffd030e7fbf8bfab67e35ce060c Mon Sep 17 00:00:00 2001
+From c8f8e45763bc22912b41a4180ba5033e568b380f Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 13:55:44 +0100
-Subject: [PATCH 04/32] 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 40f797d..0917a8d 100644
+index d3dae37..67e83b7 100644
--- a/src/inspect-fs-unix.c
+++ b/src/inspect-fs-unix.c
-@@ -994,7 +994,8 @@ uuid_hash(const void *x, size_t table_size)
+@@ -999,7 +999,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 40f797d..0917a8d 100644
h ^= a->uuid[i];
}
-@@ -1007,7 +1008,8 @@ uuid_cmp(const void *x, const void *y)
+@@ -1012,7 +1013,8 @@ uuid_cmp(const void *x, const void *y)
const md_uuid *a = x;
const md_uuid *b = y;
@@ -86,7 +86,7 @@ index 40f797d..0917a8d 100644
if (a->uuid[i] != b->uuid[i]) return 0;
}
-@@ -1071,7 +1073,8 @@ map_app_md_devices (guestfs_h *g, Hash_table **map)
+@@ -1076,7 +1078,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 40f797d..0917a8d 100644
CLEANUP_FREE_STRING_LIST char **detail = guestfs_md_detail (g, *md);
if (detail == NULL) goto error;
-@@ -1182,7 +1185,8 @@ map_md_devices(guestfs_h *g, Hash_table **map)
+@@ -1187,7 +1190,8 @@ map_md_devices(guestfs_h *g, Hash_table **map)
mdadm_app_free);
if (!*map) g->abort_cb();
@@ -106,7 +106,7 @@ index 40f797d..0917a8d 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);
-@@ -1475,7 +1479,8 @@ inspect_with_augeas (guestfs_h *g, struct inspect_fs *fs,
+@@ -1480,7 +1484,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 40f797d..0917a8d 100644
if (guestfs_exists(g, *i) == 0) continue;
int64_t size = guestfs_filesize (g, *i);
-@@ -1514,7 +1519,7 @@ inspect_with_augeas (guestfs_h *g, struct inspect_fs *fs,
+@@ -1519,7 +1524,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 04c3e86..f6c69a6 100644
--- a/0005-EPEL-5-Remove-Erlang-bindings.patch
+++ b/0005-EPEL-5-Remove-Erlang-bindings.patch
@@ -1,7 +1,7 @@
-From c3ed6982ea6ed1d4c2997503f0733592d9b6f9bd Mon Sep 17 00:00:00 2001
+From 68ef51fac452cfac5864b3524c41ce57104e31d5 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 14:34:25 +0100
-Subject: [PATCH 05/32] EPEL 5: Remove Erlang bindings.
+Subject: [PATCH 05/33] EPEL 5: Remove Erlang bindings.
---
Makefile.am | 3 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 05/32] EPEL 5: Remove Erlang bindings.
3 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index a069223..c887512 100644
+index 3908d01..7f53159 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,9 +89,6 @@ endif
@@ -24,10 +24,10 @@ index a069223..c887512 100644
SUBDIRS += lua lua/examples
endif
diff --git a/configure.ac b/configure.ac
-index 7cdcc2b..4a9a027 100644
+index c8924e5..2ba6a80 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1290,25 +1290,6 @@ AS_IF([test "x$enable_php" != "xno"],[
+@@ -1311,25 +1311,6 @@ AS_IF([test "x$enable_php" != "xno"],[
])
AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"])
@@ -53,7 +53,7 @@ index 7cdcc2b..4a9a027 100644
dnl Lua
AC_ARG_ENABLE([lua],
AS_HELP_STRING([--disable-lua], [disable Lua language bindings]),
-@@ -1442,8 +1423,6 @@ AC_CONFIG_FILES([Makefile
+@@ -1476,8 +1457,6 @@ AC_CONFIG_FILES([Makefile
daemon/Makefile
df/Makefile
edit/Makefile
@@ -62,7 +62,7 @@ index 7cdcc2b..4a9a027 100644
examples/Makefile
fish/Makefile
format/Makefile
-@@ -1545,8 +1524,6 @@ echo -n "Haskell bindings .................... "
+@@ -1579,8 +1558,6 @@ echo -n "Haskell bindings .................... "
if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo -n "PHP bindings ........................ "
if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi
@@ -72,7 +72,7 @@ index 7cdcc2b..4a9a027 100644
if test "x$HAVE_LUA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo -n "gobject bindings .................... "
diff --git a/po/POTFILES b/po/POTFILES
-index 1c272b8..e51d543 100644
+index e64492b..89eda53 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -101,8 +101,6 @@ df/domains.c
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 6c0b442..1409f4e 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 f890c324ce3b8140b48aef989c6b56402fc6c88b Mon Sep 17 00:00:00 2001
+From 3772113b6a431974abaed1cabc1b055881193938 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 14:35:06 +0100
-Subject: [PATCH 06/32] 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/32] EPEL 5: Remove GObject / GObject Introspection / GJS bind
3 files changed, 0 insertions(+), 126 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index c887512..406bc16 100644
+index 7f53159..04a6565 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,9 +92,6 @@ endif
@@ -24,10 +24,10 @@ index c887512..406bc16 100644
# Unconditional because nothing is built yet.
SUBDIRS += csharp
diff --git a/configure.ac b/configure.ac
-index 4a9a027..f7cc808 100644
+index 2ba6a80..07c360e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1341,58 +1341,6 @@ AS_IF([test "x$PERL" != "xno"],[
+@@ -1362,58 +1362,6 @@ AS_IF([test "x$PERL" != "xno"],[
AM_CONDITIONAL([HAVE_TOOLS],
[test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
@@ -86,7 +86,7 @@ index 4a9a027..f7cc808 100644
dnl Library versioning.
MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
AC_SUBST(MAX_PROC_NR)
-@@ -1430,10 +1378,6 @@ AC_CONFIG_FILES([Makefile
+@@ -1464,10 +1412,6 @@ AC_CONFIG_FILES([Makefile
generator/Makefile
gnulib/lib/Makefile
gnulib/tests/Makefile
@@ -97,7 +97,7 @@ index 4a9a027..f7cc808 100644
haskell/Makefile
inspector/Makefile
java/Makefile
-@@ -1526,10 +1470,6 @@ echo -n "PHP bindings ........................ "
+@@ -1560,10 +1504,6 @@ echo -n "PHP bindings ........................ "
if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo -n "Lua bindings ........................ "
if test "x$HAVE_LUA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
@@ -109,7 +109,7 @@ index 4a9a027..f7cc808 100644
echo "If any optional component is configured 'no' when you expected 'yes'"
echo "then you should check the preceding messages."
diff --git a/po/POTFILES b/po/POTFILES
-index e51d543..1d6227c 100644
+index 89eda53..c3f1d67 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -140,69 +140,6 @@ fish/tilde.c
diff --git a/0007-EPEL-5-Remove-PHP-bindings.patch b/0007-EPEL-5-Remove-PHP-bindings.patch
index adf1eee..c48d0a5 100644
--- a/0007-EPEL-5-Remove-PHP-bindings.patch
+++ b/0007-EPEL-5-Remove-PHP-bindings.patch
@@ -1,7 +1,7 @@
-From f67ea782da268768265c6518d6c1badf44fc8b38 Mon Sep 17 00:00:00 2001
+From 21943f8c165ce6a971d063fe7bed474a3271aed9 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sun, 17 Jun 2012 23:01:43 +0100
-Subject: [PATCH 07/32] EPEL 5: Remove PHP bindings.
+Subject: [PATCH 07/33] EPEL 5: Remove PHP bindings.
---
Makefile.am | 3 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 07/32] EPEL 5: Remove PHP bindings.
3 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 406bc16..2a4ae39 100644
+index 04a6565..327e0c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,9 +86,6 @@ endif
@@ -24,10 +24,10 @@ index 406bc16..2a4ae39 100644
SUBDIRS += lua lua/examples
endif
diff --git a/configure.ac b/configure.ac
-index f7cc808..4d5a976 100644
+index 07c360e..0e49b34 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1277,19 +1277,6 @@ AS_IF([test "x$enable_haskell" != "xno"],[
+@@ -1298,19 +1298,6 @@ AS_IF([test "x$enable_haskell" != "xno"],[
])
AM_CONDITIONAL([HAVE_HASKELL],[test "x$GHC" != "xno"])
@@ -47,7 +47,7 @@ index f7cc808..4d5a976 100644
dnl Lua
AC_ARG_ENABLE([lua],
AS_HELP_STRING([--disable-lua], [disable Lua language bindings]),
-@@ -1390,7 +1377,6 @@ AC_CONFIG_FILES([Makefile
+@@ -1424,7 +1411,6 @@ AC_CONFIG_FILES([Makefile
perl/Makefile
perl/Makefile.PL
perl/examples/Makefile
@@ -55,7 +55,7 @@ index f7cc808..4d5a976 100644
po-docs/Makefile
po-docs/ja/Makefile
po-docs/uk/Makefile
-@@ -1466,8 +1452,6 @@ echo -n "Java bindings ....................... "
+@@ -1500,8 +1486,6 @@ echo -n "Java bindings ....................... "
if test "x$HAVE_JAVA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo -n "Haskell bindings .................... "
if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi
@@ -65,7 +65,7 @@ index f7cc808..4d5a976 100644
if test "x$HAVE_LUA_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo
diff --git a/po/POTFILES b/po/POTFILES
-index 1d6227c..eda59e1 100644
+index c3f1d67..14eb1e8 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -149,7 +149,6 @@ perl/Guestfs.c
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 d451cf1..fa159a3 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 656dba3cb40825a78867f8564562383776f7c3df Mon Sep 17 00:00:00 2001
+From 8bf1fe18c7c28e6d8a31be83be4d553956a6628f Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sun, 17 Jun 2012 22:17:06 +0100
-Subject: [PATCH 08/32] 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 5555393..01a9728 100644
--- a/0009-EPEL-5-Add-gnulib-utimensat-module.patch
+++ b/0009-EPEL-5-Add-gnulib-utimensat-module.patch
@@ -1,7 +1,7 @@
-From acd550327883814c7cc6dbaee1d4a543c5cb4f21 Mon Sep 17 00:00:00 2001
+From 62c4d0423fcffee04c0016865787f6f614d6f304 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sun, 17 Jun 2012 22:58:58 +0100
-Subject: [PATCH 09/32] 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.
---
@@ -10,10 +10,10 @@ This function is missing in RHEL 5-era kernels.
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/bootstrap b/bootstrap
-index 931646b..da650ca 100755
+index 4c35dab..08de293 100755
--- a/bootstrap
+++ b/bootstrap
-@@ -89,6 +89,7 @@ strndup
+@@ -88,6 +88,7 @@ strndup
symlinkat
sys_select
sys_wait
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 a7fdd99..0ba7944 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 58d711b387356a0d08bc24ca21df4fc5e6a8c01f Mon Sep 17 00:00:00 2001
+From 5d03f944054585f0117af4c85584e0f15f1ff4cc Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sun, 17 Jun 2012 23:00:16 +0100
-Subject: [PATCH 10/32] 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 +-
@@ -11,7 +11,7 @@ Subject: [PATCH 10/32] EPEL 5: Old ocamlopt didn't support debugging (-g option)
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
-index 5e8cba5..48ddc2c 100644
+index 520cce9..46acde5 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -44,7 +44,7 @@ CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so
@@ -24,7 +24,7 @@ index 5e8cba5..48ddc2c 100644
noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
diff --git a/resize/Makefile.am b/resize/Makefile.am
-index c69ab44..542ae9a 100644
+index 9ce473e..e19693c 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -62,7 +62,7 @@ OCAMLPACKAGES += -package gettext-stub
@@ -37,10 +37,10 @@ index c69ab44..542ae9a 100644
virt-resize: $(OBJECTS)
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
-index b5eba63..329d801 100644
+index f5428d7..93f2c32 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
-@@ -58,7 +58,7 @@ OCAMLPACKAGES += -package gettext-stub
+@@ -56,7 +56,7 @@ OCAMLPACKAGES += -package gettext-stub
endif
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
@@ -50,10 +50,10 @@ index b5eba63..329d801 100644
virt-sparsify: $(OBJECTS)
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
-index e16a19d..392dd91 100644
+index b663143..179713a 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
-@@ -108,7 +108,7 @@ OCAMLPACKAGES += -package gettext-stub
+@@ -105,7 +105,7 @@ OCAMLPACKAGES += -package gettext-stub
endif
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
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 0ba745d..4a827bd 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,18 +1,18 @@
-From 5cec4c634e31f8bb8d0d2614c0d7cd5efdc10401 Mon Sep 17 00:00:00 2001
+From fdc5c9eeaccf9c3f25d3a5d943fbbf08ef936233 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Mon, 18 Jun 2012 08:35:14 +0100
-Subject: [PATCH 11/32] 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 4d5a976..7268b59 100644
+index 0e49b34..d0f6f1e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -961,14 +961,14 @@ EOF
- cat <<EOF >>$output
+@@ -978,14 +978,14 @@ EOF
+ cat <<EOF >>resize/common_gettext.ml
module Gettext = struct
external s_ : string -> string = "%identity"
- external f_ : ('a, 'b, 'c, 'd, 'e, 'f) format6
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 0dc8876..a781eb5 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 29e5db8e696ca805063954db07c2a6b6b4dc1fa8 Mon Sep 17 00:00:00 2001
+From 2ae8a1ffcb8af8902a7e7ed57cdb3d6055a78d83 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Mon, 18 Jun 2012 12:18:35 +0100
-Subject: [PATCH 12/32] 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,10 +10,10 @@ 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 7268b59..a6ad077 100644
+index d0f6f1e..6d04e90 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1334,7 +1334,7 @@ AC_SUBST(MAX_PROC_NR)
+@@ -1355,7 +1355,7 @@ AC_SUBST(MAX_PROC_NR)
dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
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 76246df..a296a8c 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 7cd10e61a0b03ed034de3a6900eb8e291b96ecbd Mon Sep 17 00:00:00 2001
+From 10a6018ca0a019920629591d82d60a433b882b17 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Mon, 18 Jun 2012 17:21:30 +0100
-Subject: [PATCH 13/32] 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 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/launch-appliance.c b/src/launch-appliance.c
-index 3498787..3fb967e 100644
+index 9fb0bbd..5de3b0a 100644
--- a/src/launch-appliance.c
+++ b/src/launch-appliance.c
@@ -332,7 +332,7 @@ launch_appliance (guestfs_h *g, const char *arg)
@@ -20,7 +20,7 @@ index 3498787..3fb967e 100644
appliance, virtio_scsi ? "none" : "virtio", cachemode);
add_cmdline (g, buf2);
-@@ -960,14 +960,13 @@ qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index)
+@@ -963,14 +963,13 @@ 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 8c82100..ab822ec 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 af0e598258c74a3df824499cfaa16af7fc7482d8 Mon Sep 17 00:00:00 2001
+From 52af6f30a0efc4990ea2302e2467851af3ffd61d Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Mon, 18 Jun 2012 16:06:34 +0100
-Subject: [PATCH 14/32] 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,10 +12,10 @@ Subject: [PATCH 14/32] 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 dee4efc..813cd20 100755
+index 290d6ac..20c8870 100755
--- a/appliance/init
+++ b/appliance/init
-@@ -77,10 +77,10 @@ hwclock -u -s
+@@ -80,10 +80,10 @@ hwclock -u -s
ip addr add 127.0.0.1/8 brd + dev lo scope host
ip link set dev lo up
@@ -175,20 +175,20 @@ index 254e0ea..bcb836a 100644
main_loop (sock);
diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
-index a048a83..6369e87 100644
+index aaa9d41..cb812ed 100644
--- a/src/guestfs-internal.h
+++ b/src/guestfs-internal.h
-@@ -512,7 +512,7 @@ extern void guestfs___rollback_drives (guestfs_h *g, size_t);
+@@ -516,7 +516,7 @@ extern int64_t guestfs___timeval_diff (const struct timeval *x, const struct tim
+ extern void guestfs___print_timestamped_message (guestfs_h *g, const char *fs, ...) __attribute__((format (printf,2,3)));
+ extern void guestfs___launch_send_progress (guestfs_h *g, int perdozen);
extern void guestfs___launch_failed_error (guestfs_h *g);
- extern void guestfs___add_dummy_appliance_drive (guestfs_h *g);
- extern void guestfs___free_drives (guestfs_h *g);
-extern char *guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev, int flags);
+extern char *guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev, int flags, const char *vmchannel);
#define APPLIANCE_COMMAND_LINE_IS_TCG 1
/* launch-appliance.c */
diff --git a/src/launch-appliance.c b/src/launch-appliance.c
-index 3fb967e..57a8bbc 100644
+index 5de3b0a..71d7aa6 100644
--- a/src/launch-appliance.c
+++ b/src/launch-appliance.c
@@ -74,12 +74,16 @@ free_regexps (void)
@@ -392,7 +392,7 @@ index 3fb967e..57a8bbc 100644
/* Close the listening socket. */
if (close (g->sock) != 0) {
-@@ -984,6 +989,83 @@ guestfs___drive_name (size_t index, char *ret)
+@@ -987,6 +992,83 @@ guestfs___drive_name (size_t index, char *ret)
return ret;
}
@@ -477,10 +477,10 @@ index 3fb967e..57a8bbc 100644
shutdown_appliance (guestfs_h *g, int check_for_errors)
{
diff --git a/src/launch.c b/src/launch.c
-index 7c37667..b634b32 100644
+index 4333821..c77c229 100644
--- a/src/launch.c
+++ b/src/launch.c
-@@ -809,7 +809,7 @@ guestfs__get_state (guestfs_h *g)
+@@ -316,7 +316,7 @@ guestfs__config (guestfs_h *g,
char *
guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev,
@@ -489,7 +489,7 @@ index 7c37667..b634b32 100644
{
char *term = getenv ("TERM");
char *ret;
-@@ -837,12 +837,14 @@ guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev,
+@@ -344,12 +344,14 @@ guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev,
" cgroup_disable=memory" /* saves us about 5 MB of RAM */
" root=%s" /* root (appliance_dev) */
" %s" /* selinux */
diff --git a/0015-EPEL-5-Disable-libvirt-attach-method.patch b/0015-EPEL-5-Disable-libvirt-attach-method.patch
index efccefe..f70102a 100644
--- a/0015-EPEL-5-Disable-libvirt-attach-method.patch
+++ b/0015-EPEL-5-Disable-libvirt-attach-method.patch
@@ -1,14 +1,14 @@
-From e763e1518eb05376a3a0a31226b608bcbdfc8992 Mon Sep 17 00:00:00 2001
+From a447dcd5b5131cde034d6a2a9e26e3a27eca9689 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Thu, 30 Aug 2012 17:57:46 +0100
-Subject: [PATCH 15/32] EPEL 5: Disable libvirt attach method.
+Subject: [PATCH 15/33] EPEL 5: Disable libvirt attach method.
---
src/launch-libvirt.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
-index 03c2744..d2d63f7 100644
+index 5849421..b0e9ea3 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -72,7 +72,7 @@
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 bbec2d0..627551e 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 3579815ae24033f8eb1ef1521e4ad2bad4ea43c2 Mon Sep 17 00:00:00 2001
+From ebb923ed81316ba931ec74cd81a4b23e739e5e92 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 22 Jun 2012 10:06:47 +0100
-Subject: [PATCH 16/32] 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 9e37cf7..3102897 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 67f0bcc28d7612546e254e6eb9074dbf1a124ef7 Mon Sep 17 00:00:00 2001
+From 962689dedb6356c0f04a9eaaf1d23835ed8a2283 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 22 Jun 2012 10:24:48 +0100
-Subject: [PATCH 17/32] 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.
---
@@ -9,7 +9,7 @@ This didn't have -o backing_file etc. Use old -b and -F options instead.
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/sparsify/sparsify.ml b/sparsify/sparsify.ml
-index f77f4eb..5ee2adb 100644
+index 6ea34ee..8554bc6 100644
--- a/sparsify/sparsify.ml
+++ b/sparsify/sparsify.ml
@@ -228,18 +228,12 @@ let overlaydisk =
diff --git a/0018-EPEL-5-Remove-Fedora-MD-test-images.patch b/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
index 0385244..b2277be 100644
--- a/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
+++ b/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
@@ -1,19 +1,19 @@
-From 2e47c852f0887a3d042a6052c2f8f72169cb2277 Mon Sep 17 00:00:00 2001
+From 98d5a48143b0d409ac76fc6c6e15fdef2cc33b65 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 22 Jun 2012 13:15:49 +0100
-Subject: [PATCH 18/32] 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'.
---
- tests/guests/Makefile.am | 12 ------------
- 1 files changed, 0 insertions(+), 12 deletions(-)
+ tests/guests/Makefile.am | 14 --------------
+ 1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am
-index f5570e9..3e8443f 100644
+index b55259f..669296b 100644
--- a/tests/guests/Makefile.am
+++ b/tests/guests/Makefile.am
-@@ -47,8 +47,6 @@ check_DATA = \
+@@ -46,8 +46,6 @@ disk_images = \
blank-bootrootlv.img \
debian.img \
fedora.img \
@@ -22,9 +22,9 @@ index f5570e9..3e8443f 100644
ubuntu.img \
windows.img
-@@ -70,16 +68,6 @@ fedora.img: guest-aux/make-fedora-img.pl \
- guest-aux/fedora-packages.db
+@@ -85,18 +83,6 @@ fedora.img: guest-aux/make-fedora-img.pl \
SRCDIR=$(srcdir) LAYOUT=partitions $(top_builddir)/run --test $<
+ $(call display,$@)
-# Make a (dummy) Fedora image using md devices
-fedora-md1.img fedora-md2.img: stamp-fedora-md.img
@@ -34,11 +34,13 @@ index f5570e9..3e8443f 100644
- guest-aux/fedora-packages.db
- rm -f $@
- SRCDIR=$(srcdir) LAYOUT=partitions-md $(top_builddir)/run --test $<
+- $(call display,fedora-md1.img)
+- $(call display,fedora-md2.img)
- touch $@
-
guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
rm -f $@ $@-t
- mkdir -p guest-aux
+ $(DB_LOAD) $@-t < $<
--
1.7.4.1
diff --git a/0019-EPEL-5-Add-mkisofs-to-package-list.patch b/0019-EPEL-5-Add-mkisofs-to-package-list.patch
index c351324..8846044 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 b20759c481f057d80f8b4651b9801e63cfdd4a09 Mon Sep 17 00:00:00 2001
+From bb99ad810f2535c1a78871de4cb2831f110593e4 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 22 Jun 2012 14:46:43 +0100
-Subject: [PATCH 19/32] 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.
@@ -10,10 +10,10 @@ to implement the corresponding API and for tests to pass.
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index d7c2639..803a694 100644
+index 1ba5bf3..d37b1be 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
-@@ -129,6 +129,7 @@ lsscsi
+@@ -131,6 +131,7 @@ lsscsi
lvm2
lzop
mdadm
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 29189e3..cfb9c02 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 bef780a2fa47e0752eca69751c7cb17e8e7bf5f2 Mon Sep 17 00:00:00 2001
+From f3dd167b8801d5eb05958205556b1092a196368b Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 22 Jun 2012 21:58:32 +0100
-Subject: [PATCH 20/32] 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 ad5b22a..8a6ef20 100644
--- a/0021-EPEL-5-podwrapper-Remove-HTML-output.patch
+++ b/0021-EPEL-5-podwrapper-Remove-HTML-output.patch
@@ -1,7 +1,7 @@
-From 9fcd3ae0199933e52bad4c83b487f9895d4766f3 Mon Sep 17 00:00:00 2001
+From 257c8f7a07fc0b5fcbc19260e643bf753a49ce76 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Thu, 30 Aug 2012 18:01:00 +0100
-Subject: [PATCH 21/32] 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 cb6e9b2..53a13cd 100755
+index bbc0b7c..a40655a 100755
--- a/podwrapper.pl.in
+++ b/podwrapper.pl.in
@@ -25,7 +25,6 @@ use Getopt::Long;
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 ac5dafb..c2bfda9 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 4de1e2fc78d798c069ab6483b100dd4c0aeb62be Mon Sep 17 00:00:00 2001
+From 32705d2e9a13cfb248b4db1ad8b7349ed465f914 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Thu, 30 Aug 2012 18:16:18 +0100
-Subject: [PATCH 22/32] 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,7 +11,7 @@ method.
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/podwrapper.pl.in b/podwrapper.pl.in
-index 53a13cd..415fa67 100755
+index a40655a..ea19444 100755
--- a/podwrapper.pl.in
+++ b/podwrapper.pl.in
@@ -387,7 +387,7 @@ SUBMAN: {
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 b634156..b7e5a33 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,85 +1,86 @@
-From 8f02ef77a49d93c4f2163c5c32495de08bd77e86 Mon Sep 17 00:00:00 2001
+From 9f4d530ca5e1cba66039ae25e2472fcebb3bb916 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Thu, 30 Aug 2012 18:19:28 +0100
-Subject: [PATCH 23/32] 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.
---
- ocaml/Makefile.am | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
+ ocaml/Makefile.am | 24 ++++++++++++++++--------
+ 1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
-index 48ddc2c..b5dbd5f 100644
+index 46acde5..9e07fbc 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
-@@ -114,7 +114,7 @@ noinst_DATA += \
+@@ -112,56 +112,64 @@ noinst_DATA += \
+ $(test_progs:%=%.opt)
bindtests.bc: bindtests.cmo mlguestfs.cma
- mkdir -p t
- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \
++ mkdir -p t
+ LD_LIBRARY_PATH=../src/.libs \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@
bindtests.opt: bindtests.cmx mlguestfs.cmxa
-@@ -123,7 +123,7 @@ bindtests.opt: bindtests.cmx mlguestfs.cmxa
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_005_load.bc: t/guestfs_005_load.cmo mlguestfs.cma
- mkdir -p t
- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \
++ mkdir -p t
+ LD_LIBRARY_PATH=../src/.libs \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@
t/guestfs_005_load.opt: t/guestfs_005_load.cmx mlguestfs.cmxa
-@@ -132,7 +132,7 @@ t/guestfs_005_load.opt: t/guestfs_005_load.cmx mlguestfs.cmxa
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_010_basic.bc: t/guestfs_010_basic.cmo mlguestfs.cma
- mkdir -p t
- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \
++ mkdir -p t
+ LD_LIBRARY_PATH=../src/.libs \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@
t/guestfs_010_basic.opt: t/guestfs_010_basic.cmx mlguestfs.cmxa
-@@ -141,7 +141,7 @@ t/guestfs_010_basic.opt: t/guestfs_010_basic.cmx mlguestfs.cmxa
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_070_threads.bc: t/guestfs_070_threads.cmo mlguestfs.cma
- mkdir -p t
- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \
++ mkdir -p t
+ LD_LIBRARY_PATH=../src/.libs \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix,threads -thread -linkpkg mlguestfs.cma $< -o $@
t/guestfs_070_threads.opt: t/guestfs_070_threads.cmx mlguestfs.cmxa
-@@ -150,7 +150,7 @@ t/guestfs_070_threads.opt: t/guestfs_070_threads.cmx mlguestfs.cmxa
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix,threads -thread -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_080_optargs.bc: t/guestfs_080_optargs.cmo mlguestfs.cma
- mkdir -p t
- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \
++ mkdir -p t
+ LD_LIBRARY_PATH=../src/.libs \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@
t/guestfs_080_optargs.opt: t/guestfs_080_optargs.cmx mlguestfs.cmxa
-@@ -159,7 +159,7 @@ t/guestfs_080_optargs.opt: t/guestfs_080_optargs.cmx mlguestfs.cmxa
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_400_events.bc: t/guestfs_400_events.cmo mlguestfs.cma
- mkdir -p t
- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \
++ mkdir -p t
+ LD_LIBRARY_PATH=../src/.libs \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@
t/guestfs_400_events.opt: t/guestfs_400_events.cmx mlguestfs.cmxa
-@@ -168,7 +168,7 @@ t/guestfs_400_events.opt: t/guestfs_400_events.cmx mlguestfs.cmxa
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_400_progress.bc: t/guestfs_400_progress.cmo mlguestfs.cma
- mkdir -p t
- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \
++ mkdir -p t
+ LD_LIBRARY_PATH=../src/.libs \
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@
t/guestfs_400_progress.opt: t/guestfs_400_progress.cmx mlguestfs.cmxa
-@@ -177,7 +177,7 @@ t/guestfs_400_progress.opt: t/guestfs_400_progress.cmx mlguestfs.cmxa
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_500_mount_local.bc: t/guestfs_500_mount_local.cmo mlguestfs.cma
- mkdir -p t
- $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \
++ mkdir -p t
+ LD_LIBRARY_PATH=../src/.libs \
$(OCAMLFIND) ocamlc -custom $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@
diff --git a/0024-EPEL-5-Don-t-use-sgabios.patch b/0024-EPEL-5-Don-t-use-sgabios.patch
index 3f16dd9..52e756b 100644
--- a/0024-EPEL-5-Don-t-use-sgabios.patch
+++ b/0024-EPEL-5-Don-t-use-sgabios.patch
@@ -1,7 +1,7 @@
-From 6935509b343f62f1e8f42455934a7c030498881d Mon Sep 17 00:00:00 2001
+From 1810496e8aa5ff35b8ec5acd3ae64ff7635154b3 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 31 Aug 2012 10:24:06 +0100
-Subject: [PATCH 24/32] EPEL 5: Don't use sgabios.
+Subject: [PATCH 24/33] EPEL 5: Don't use sgabios.
Old qemu doesn't support '-device' parameter.
---
@@ -9,7 +9,7 @@ Old qemu doesn't support '-device' parameter.
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/src/launch-appliance.c b/src/launch-appliance.c
-index 57a8bbc..ad9bb31 100644
+index 71d7aa6..8e17793 100644
--- a/src/launch-appliance.c
+++ b/src/launch-appliance.c
@@ -414,17 +414,6 @@ launch_appliance (guestfs_h *g, const char *arg)
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 c1e713f..6066592 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 7685c27d85865a50fb96962a44e141a15459ed26 Mon Sep 17 00:00:00 2001
+From a46b654e1052506abb81bc1678ed55bfc0175202 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 31 Aug 2012 13:48:18 +0100
-Subject: [PATCH 25/32] 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 c76abd5..edc6b8a 100644
--- a/0026-EPEL-5-Disable-tar-xz-test.patch
+++ b/0026-EPEL-5-Disable-tar-xz-test.patch
@@ -1,7 +1,7 @@
-From 70b6451ef7c69731b81678c953110b7a8b88ca03 Mon Sep 17 00:00:00 2001
+From 6c13992cc7e40319eed96365f04e2873516ba19f Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 31 Aug 2012 14:59:25 +0100
-Subject: [PATCH 26/32] 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.
---
@@ -9,7 +9,7 @@ Although xz is available, ancient tar didn't have the --xz option.
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/generator/actions.ml b/generator/actions.ml
-index 06e4211..aa69db3 100644
+index ba380cf..7231f05 100644
--- a/generator/actions.ml
+++ b/generator/actions.ml
@@ -4105,7 +4105,7 @@ To get the checksums for many files, use C<guestfs_checksums_out>." };
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 42236f8..49bcc8f 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,14 +1,14 @@
-From 90afed5463f5fb56d2859ea6598738da80218d29 Mon Sep 17 00:00:00 2001
+From 997e1c72b40609777e5ea166a6b8ac5837c355f4 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 31 Aug 2012 22:12:59 +0100
-Subject: [PATCH 27/32] 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 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/sparsify/sparsify.ml b/sparsify/sparsify.ml
-index 5ee2adb..0606ebe 100644
+index 8554bc6..6226330 100644
--- a/sparsify/sparsify.ml
+++ b/sparsify/sparsify.ml
@@ -168,8 +168,7 @@ let qemu_img_version =
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 334a005..fede7b4 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 bb109430630cbe399cbaff81fca231278b33a5d6 Mon Sep 17 00:00:00 2001
+From d4aec723e9f35871b068e106a464f3d36f2a6222 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Mon, 3 Sep 2012 11:04:39 +0100
-Subject: [PATCH 28/32] 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 ccb0a10..54898d6 100644
--- a/0029-EPEL-5-No-libtoolize-install-option.patch
+++ b/0029-EPEL-5-No-libtoolize-install-option.patch
@@ -1,14 +1,14 @@
-From f107d53382e0f9a21c142aebda192d8c5b1287a1 Mon Sep 17 00:00:00 2001
+From 6c29724ee7bb159aed59d5dddb0a12d5b67933ec Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 8 Mar 2013 19:09:21 +0000
-Subject: [PATCH 29/32] EPEL 5: No libtoolize --install option.
+Subject: [PATCH 29/33] EPEL 5: No libtoolize --install option.
---
bootstrap | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bootstrap b/bootstrap
-index da650ca..4de0c0e 100755
+index 08de293..441b274 100755
--- a/bootstrap
+++ b/bootstrap
@@ -29,7 +29,7 @@ GNULIB_SRCDIR=.gnulib
diff --git a/0030-EPEL-5-Disable-valgrind.patch b/0030-EPEL-5-Disable-valgrind.patch
index c6ca062..5268d26 100644
--- a/0030-EPEL-5-Disable-valgrind.patch
+++ b/0030-EPEL-5-Disable-valgrind.patch
@@ -1,7 +1,7 @@
-From 45a9a3c329040da7c57fe0d252ec18fe2be01ff0 Mon Sep 17 00:00:00 2001
+From 6edc5f2cda3c08345e8a31d2dc25a67d0c219b2e Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 8 Mar 2013 19:19:43 +0000
-Subject: [PATCH 30/32] EPEL 5: Disable valgrind.
+Subject: [PATCH 30/33] EPEL 5: Disable valgrind.
Ancient automake didn't have AM_SUBST_NOTMAKE.
---
@@ -9,10 +9,10 @@ Ancient automake didn't have AM_SUBST_NOTMAKE.
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index a6ad077..435d1b5 100644
+index 6d04e90..c27cad1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -848,8 +848,8 @@ AS_IF([test "x$VALGRIND" != "xno"],[
+@@ -868,8 +868,8 @@ AS_IF([test "x$VALGRIND" != "xno"],[
# No valgrind, so substitute VG with something that will break.
VG=VALGRIND_IS_NOT_INSTALLED
])
diff --git a/0031-EPEL-5-Remove-Linux-capabilities.patch b/0031-EPEL-5-Remove-Linux-capabilities.patch
index d7ade8f..b7a6242 100644
--- a/0031-EPEL-5-Remove-Linux-capabilities.patch
+++ b/0031-EPEL-5-Remove-Linux-capabilities.patch
@@ -1,7 +1,7 @@
-From 980f48fec16fcac31c895b206031b9615b45f081 Mon Sep 17 00:00:00 2001
+From c32692da782d5febcbda9b449550873697977f81 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 8 Mar 2013 20:20:23 +0000
-Subject: [PATCH 31/32] 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,10 +11,10 @@ confusingly they are in the header file).
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 435d1b5..2ca6736 100644
+index c27cad1..0fd6bf0 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -731,14 +731,6 @@ AC_CHECK_LIB([acl],[acl_from_text],[
+@@ -751,14 +751,6 @@ AC_CHECK_LIB([acl],[acl_from_text],[
], [])
],[AC_MSG_WARN([POSIX acl library not found])])
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 0d94f1b..c222c16 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 8c2ebd5ba8e7d272eb6d91a8da1c0fa1bc5c4c40 Mon Sep 17 00:00:00 2001
+From 3a79e5714a38873aed9ad1847f77c4e2710c458b Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 9 Mar 2013 19:24:29 +0000
-Subject: [PATCH 32/32] 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-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch b/0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch
new file mode 100644
index 0000000..a7b7fe5
--- /dev/null
+++ b/0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch
@@ -0,0 +1,26 @@
+From 4ef4ff4158c0a7672ee784b1ff2df1ac5380ed2b Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones at redhat.com>
+Date: Wed, 29 May 2013 14:35:54 +0100
+Subject: [PATCH 33/33] 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/libguestfs.spec b/libguestfs.spec
index 43de449..fc39704 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.4
-Release: 2%{?dist}
+Version: 1.20.7
+Release: 1%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -76,6 +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
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
@@ -914,6 +915,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed May 29 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.7-1
+- Rebase to upstream stable branch version 1.20.7.
+- Includes fix for inspection vulnerability (RHBZ#968315).
+
* Wed Mar 13 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.4-2
- Rebase to upstream stable branch version 1.20.4.
diff --git a/sources b/sources
index b50a483..8780199 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-169bcb12858781bae1b2646d675b5315 libguestfs-1.20.4.tar.gz
da5f7fcd0f48f4e17dca4ce33a52cc7a gnulib-4a8c422f.tar.gz
+1340c31b41ca46f77a49f720e3930e7b libguestfs-1.20.7.tar.gz
More information about the scm-commits
mailing list