[libguestfs/el5] Fix double-free bug in EPEL5-specific patch.
Richard W.M. Jones
rjones at fedoraproject.org
Sun Mar 10 22:38:52 UTC 2013
commit c04646d7c2ef2963f2f54c3b64446d6fb3a65085
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sun Mar 10 22:38:19 2013 +0000
Fix double-free bug in EPEL5-specific patch.
...module-mkstemps-for-RHEL-5-glibc-which-la.patch | 2 +-
...ect-Add-macro-for-be32toh-if-one-is-not-d.patch | 2 +-
...elated-checks-from-autoconf-to-extconf.rb.patch | 2 +-
...lib.patch => 0004-RHEL-5-tests-Use-gnulib.patch | 4 +-
...emove-checks-which-fail-with-ancient-qemu.patch | 4 +-
...L-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch | 4 +-
...ace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch | 4 +-
...t-use-C99-style-variable-decls-in-for-loo.patch | 4 +-
...tch => 0009-EPEL-5-Remove-Erlang-bindings.patch | 4 +-
...ve-GObject-GObject-Introspection-GJS-bind.patch | 4 +-
....patch => 0011-EPEL-5-Remove-PHP-bindings.patch | 4 +-
...L-5-Define-le64toh-le32toh-if-not-defined.patch | 4 +-
...> 0013-EPEL-5-Add-gnulib-utimensat-module.patch | 4 +-
...ocamlopt-didn-t-support-debugging-g-optio.patch | 4 +-
...ace-format6-with-format4-in-OCaml-gettext.patch | 4 +-
...s-preserve-dup-deps-explicitly-to-libtool.patch | 4 +-
...ve-id-from-drive-parameter-on-qemu-comman.patch | 4 +-
...null-vmchannel-back-for-qemu-without-virt.patch | 4 +-
...0019-EPEL-5-Disable-libvirt-attach-method.patch | 4 +-
...5-Fix-blkid-to-return-LVM2_member-for-PVs.patch | 14 ++--
...sify-Fix-command-line-options-for-old-qem.patch | 4 +-
... 0022-EPEL-5-Remove-Fedora-MD-test-images.patch | 4 +-
...> 0023-EPEL-5-Add-mkisofs-to-package-list.patch | 4 +-
...1-second-pause-after-unmounting-any-files.patch | 4 +-
...0025-EPEL-5-podwrapper-Remove-HTML-output.patch | 4 +-
... 0026-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch | 4 +-
...rt-Mac-OS-X-Use-libtool-mode-execute-inst.patch | 4 +-
...os.patch => 0028-EPEL-5-Don-t-use-sgabios.patch | 4 +-
...rt-daemon-Remove-e2prog-hack-only-needed-.patch | 4 +-
....patch => 0030-EPEL-5-Disable-tar-xz-test.patch | 4 +-
...re-sparsify-error-if-qemu-img-help-is-kil.patch | 4 +-
...rt-daemon-remove-call-to-obsolete-udevset.patch | 4 +-
... 0033-EPEL-5-No-libtoolize-install-option.patch | 4 +-
...ind.patch => 0034-EPEL-5-Disable-valgrind.patch | 4 +-
... => 0035-EPEL-5-Remove-Linux-capabilities.patch | 4 +-
...-Use-old-rake-rdoctask-and-rake-gempackag.patch | 4 +-
...Custom-replacement-for-Unix.isatty-stdout.patch | 4 +-
libguestfs.spec | 74 ++++++++++----------
38 files changed, 112 insertions(+), 114 deletions(-)
---
diff --git a/0001-gnulib-Use-module-mkstemps-for-RHEL-5-glibc-which-la.patch b/0001-gnulib-Use-module-mkstemps-for-RHEL-5-glibc-which-la.patch
index 01e7213..f762a9a 100644
--- a/0001-gnulib-Use-module-mkstemps-for-RHEL-5-glibc-which-la.patch
+++ b/0001-gnulib-Use-module-mkstemps-for-RHEL-5-glibc-which-la.patch
@@ -1,7 +1,7 @@
From 5706aaf0542fb67ba9398076f2531911bdd95dd3 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 9 Mar 2013 18:36:09 +0000
-Subject: [PATCH 01/36] gnulib: Use module mkstemps for RHEL 5 glibc which lacked this function.
+Subject: [PATCH 01/37] gnulib: Use module mkstemps for RHEL 5 glibc which lacked this function.
---
bootstrap | 1 +
diff --git a/0002-RHEL-5-inspect-Add-macro-for-be32toh-if-one-is-not-d.patch b/0002-RHEL-5-inspect-Add-macro-for-be32toh-if-one-is-not-d.patch
index 90131ba..42de648 100644
--- a/0002-RHEL-5-inspect-Add-macro-for-be32toh-if-one-is-not-d.patch
+++ b/0002-RHEL-5-inspect-Add-macro-for-be32toh-if-one-is-not-d.patch
@@ -1,7 +1,7 @@
From 1fe7310e8564915508158f68e9d2f3187f7bdfbe Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 8 Mar 2013 20:16:04 +0000
-Subject: [PATCH 02/36] RHEL 5: inspect: Add macro for be32toh if one is not defined in the header files.
+Subject: [PATCH 02/37] RHEL 5: inspect: Add macro for be32toh if one is not defined in the header files.
---
configure.ac | 1 +
diff --git a/0003-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch b/0003-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
index 9d35657..9281483 100644
--- a/0003-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
+++ b/0003-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
@@ -1,7 +1,7 @@
From d736ed25f446fdf5544b36f5139c69b2cbce961b Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen at hilluzination.de>
Date: Thu, 7 Mar 2013 19:59:26 +0100
-Subject: [PATCH 03/36] Move Ruby-related checks from autoconf to extconf.rb; add extra check for rb_alloc_func_t
+Subject: [PATCH 03/37] Move Ruby-related checks from autoconf to extconf.rb; add extra check for rb_alloc_func_t
Ruby ships its own config.h which may or may not define the same
relevant constants as our autoconf-generated config.h. Instead of
diff --git a/0001-RHEL-5-tests-Use-gnulib.patch b/0004-RHEL-5-tests-Use-gnulib.patch
similarity index 94%
rename from 0001-RHEL-5-tests-Use-gnulib.patch
rename to 0004-RHEL-5-tests-Use-gnulib.patch
index 8e62061..fd9a164 100644
--- a/0001-RHEL-5-tests-Use-gnulib.patch
+++ b/0004-RHEL-5-tests-Use-gnulib.patch
@@ -1,7 +1,7 @@
-From d75fb430169050f781d1772b88495d398022c6b2 Mon Sep 17 00:00:00 2001
+From e3dea245858bb856930815ad52c9b2485bd60ab7 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sun, 10 Mar 2013 20:08:06 +0000
-Subject: [PATCH] RHEL 5: tests: Use gnulib.
+Subject: [PATCH 04/37] RHEL 5: tests: Use gnulib.
Gnulib defines O_CLOEXEC which is missing on RHEL 5.
---
diff --git a/0004-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch b/0005-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
similarity index 96%
rename from 0004-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
rename to 0005-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
index 6b45790..e5232bc 100644
--- a/0004-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
+++ b/0005-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
@@ -1,7 +1,7 @@
-From b1c9301708b4e4d456ef45ccb2afbd22f38d0584 Mon Sep 17 00:00:00 2001
+From eab32a7781af5012b11face2eb675bebc65a5b41 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 04/36] EPEL 5: Remove checks which fail with ancient qemu.
+Subject: [PATCH 05/37] 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.
diff --git a/0005-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch b/0006-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
similarity index 96%
rename from 0005-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
rename to 0006-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
index dab321b..3636261 100644
--- a/0005-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
+++ b/0006-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
@@ -1,7 +1,7 @@
-From bb3f18070e589c6be3e6a8d9e20cbf88cf9a8cdb Mon Sep 17 00:00:00 2001
+From 120acb40d674957a3b4cfe8a88877430cdc50493 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 05/36] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
+Subject: [PATCH 06/37] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
---
configure.ac | 28 ++++++++++++++--------------
diff --git a/0006-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch b/0007-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
similarity index 84%
rename from 0006-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
rename to 0007-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
index ddf6e97..d29fb33 100644
--- a/0006-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
+++ b/0007-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
@@ -1,7 +1,7 @@
-From 21e884d68eefc155a07eb184e650637b90b4780b Mon Sep 17 00:00:00 2001
+From 03263b3a4fe4abce8dcdd53fb1880eca64ef46ef 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 06/36] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
+Subject: [PATCH 07/37] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
---
configure.ac | 2 +-
diff --git a/0007-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch b/0008-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
similarity index 97%
rename from 0007-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
rename to 0008-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
index 3c74034..8113a1f 100644
--- a/0007-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
+++ b/0008-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
@@ -1,7 +1,7 @@
-From a0be4e9a2503869dd90e94f4cfa4dbde7e85a1ee Mon Sep 17 00:00:00 2001
+From 4cfbf4f295a06897329d20037efe66ee35c92b62 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 07/36] EPEL 5: Don't use C99-style variable decls in for-loop.
+Subject: [PATCH 08/37] EPEL 5: Don't use C99-style variable decls in for-loop.
---
daemon/btrfs.c | 3 ++-
diff --git a/0008-EPEL-5-Remove-Erlang-bindings.patch b/0009-EPEL-5-Remove-Erlang-bindings.patch
similarity index 95%
rename from 0008-EPEL-5-Remove-Erlang-bindings.patch
rename to 0009-EPEL-5-Remove-Erlang-bindings.patch
index 951f864..726d6fc 100644
--- a/0008-EPEL-5-Remove-Erlang-bindings.patch
+++ b/0009-EPEL-5-Remove-Erlang-bindings.patch
@@ -1,7 +1,7 @@
-From 55d66110bf342aa05c54cf1ee5c3f83bbd98bb3f Mon Sep 17 00:00:00 2001
+From ec782cc14643e71bb5d7cc07647a369a95fb005b 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 08/36] EPEL 5: Remove Erlang bindings.
+Subject: [PATCH 09/37] EPEL 5: Remove Erlang bindings.
---
Makefile.am | 3 ---
diff --git a/0009-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch b/0010-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
similarity index 98%
rename from 0009-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
rename to 0010-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
index d2e0129..9a9619b 100644
--- a/0009-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
+++ b/0010-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
@@ -1,7 +1,7 @@
-From f31016c7d8e57fa6cdb22506c7fadf0a408fbbfe Mon Sep 17 00:00:00 2001
+From 01d681c8be082b4d44845f34c51cc4f07e6ffa80 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 09/36] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
+Subject: [PATCH 10/37] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
---
Makefile.am | 3 --
diff --git a/0010-EPEL-5-Remove-PHP-bindings.patch b/0011-EPEL-5-Remove-PHP-bindings.patch
similarity index 95%
rename from 0010-EPEL-5-Remove-PHP-bindings.patch
rename to 0011-EPEL-5-Remove-PHP-bindings.patch
index 457d761..3c0a88d 100644
--- a/0010-EPEL-5-Remove-PHP-bindings.patch
+++ b/0011-EPEL-5-Remove-PHP-bindings.patch
@@ -1,7 +1,7 @@
-From 1671ac91128a3f54b9a3761aa8583f0fa07d7a6f Mon Sep 17 00:00:00 2001
+From 40b7aaec13ed51f0876ab26ff264a8caba90f6ed 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 10/36] EPEL 5: Remove PHP bindings.
+Subject: [PATCH 11/37] EPEL 5: Remove PHP bindings.
---
Makefile.am | 3 ---
diff --git a/0011-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch b/0012-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
similarity index 88%
rename from 0011-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
rename to 0012-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
index dcb2cab..a0adfb7 100644
--- a/0011-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
+++ b/0012-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
@@ -1,7 +1,7 @@
-From 90271bd375465a71437724287d814c0ca7237d18 Mon Sep 17 00:00:00 2001
+From 937bcc4cf2fc038dd3acff7a6dbb8c497513a627 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 11/36] EPEL 5: Define le64toh, le32toh if not defined.
+Subject: [PATCH 12/37] EPEL 5: Define le64toh, le32toh if not defined.
---
src/inspect-fs-windows.c | 16 ++++++++++++++++
diff --git a/0012-EPEL-5-Add-gnulib-utimensat-module.patch b/0013-EPEL-5-Add-gnulib-utimensat-module.patch
similarity index 84%
rename from 0012-EPEL-5-Add-gnulib-utimensat-module.patch
rename to 0013-EPEL-5-Add-gnulib-utimensat-module.patch
index 413ac45..893b649 100644
--- a/0012-EPEL-5-Add-gnulib-utimensat-module.patch
+++ b/0013-EPEL-5-Add-gnulib-utimensat-module.patch
@@ -1,7 +1,7 @@
-From fae035aa5c616179c1c6b638ac14f5f268bf41c2 Mon Sep 17 00:00:00 2001
+From 8f367f478a1219252ff2ed77d55f831f7b1a4889 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 12/36] EPEL 5: Add gnulib utimensat module.
+Subject: [PATCH 13/37] EPEL 5: Add gnulib utimensat module.
This function is missing in RHEL 5-era kernels.
---
diff --git a/0013-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch b/0014-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
similarity index 93%
rename from 0013-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
rename to 0014-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
index 34fa3f5..b4e077b 100644
--- a/0013-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
+++ b/0014-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
@@ -1,7 +1,7 @@
-From c7a9bdeeb7f3ae457c384cf62b664b978502932f Mon Sep 17 00:00:00 2001
+From b597ef3e655bbc3d44972baab83800b9e50261d5 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 13/36] EPEL 5: Old ocamlopt didn't support debugging (-g option).
+Subject: [PATCH 14/37] EPEL 5: Old ocamlopt didn't support debugging (-g option).
---
ocaml/Makefile.am | 2 +-
diff --git a/0014-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch b/0015-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
similarity index 88%
rename from 0014-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
rename to 0015-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
index c117981..883dcd6 100644
--- a/0014-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
+++ b/0015-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
@@ -1,7 +1,7 @@
-From 154de10cc6f0b318d120523ca97306bcce6de872 Mon Sep 17 00:00:00 2001
+From 50048d8ed4e6ca760d475c5f7e712f1ef7989ac0 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 14/36] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
+Subject: [PATCH 15/37] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
---
configure.ac | 10 +++++-----
diff --git a/0015-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch b/0016-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
similarity index 86%
rename from 0015-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
rename to 0016-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
index ec78af4..ce7aa56 100644
--- a/0015-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
+++ b/0016-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
@@ -1,7 +1,7 @@
-From fedc248bd1f29c608530e81cbf39aa36e056c85b Mon Sep 17 00:00:00 2001
+From bcbd094830abf6431d2cc6c54909ec04313409b7 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 15/36] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
+Subject: [PATCH 16/37] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
See this thread:
https://lists.gnu.org/archive/html/bug-gnulib/2012-06/msg00162.html
diff --git a/0016-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch b/0017-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
similarity index 91%
rename from 0016-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
rename to 0017-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
index f568c67..c1872c4 100644
--- a/0016-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
+++ b/0017-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
@@ -1,7 +1,7 @@
-From ad25114b2b3f996d476b6fd22608a811f86eb92f Mon Sep 17 00:00:00 2001
+From dd6987286760d8423b8cc7f5fba5b9720adc85a2 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 16/36] EPEL 5: Remove id= from -drive parameter on qemu command line.
+Subject: [PATCH 17/37] EPEL 5: Remove id= from -drive parameter on qemu command line.
---
src/launch-appliance.c | 5 ++---
diff --git a/0017-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch b/0018-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
similarity index 99%
rename from 0017-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
rename to 0018-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
index d0fe18c..e177c5e 100644
--- a/0017-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
+++ b/0018-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
@@ -1,7 +1,7 @@
-From 16a1d7d70609283c75ddcfd59b2289d4411519ba Mon Sep 17 00:00:00 2001
+From 37048556d6e2a0179b8344956875c5a64efb6904 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 17/36] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
+Subject: [PATCH 18/37] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
---
appliance/init | 4 +-
diff --git a/0018-EPEL-5-Disable-libvirt-attach-method.patch b/0019-EPEL-5-Disable-libvirt-attach-method.patch
similarity index 82%
rename from 0018-EPEL-5-Disable-libvirt-attach-method.patch
rename to 0019-EPEL-5-Disable-libvirt-attach-method.patch
index 852aa80..631082e 100644
--- a/0018-EPEL-5-Disable-libvirt-attach-method.patch
+++ b/0019-EPEL-5-Disable-libvirt-attach-method.patch
@@ -1,7 +1,7 @@
-From 4285778047a444c8f5fb09c09d4e5ea59a7c0c33 Mon Sep 17 00:00:00 2001
+From 5e79cdd4edfcf8a50c4c1454c6fcacbdf33e0e75 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 18/36] EPEL 5: Disable libvirt attach method.
+Subject: [PATCH 19/37] EPEL 5: Disable libvirt attach method.
---
src/launch-libvirt.c | 2 +-
diff --git a/0019-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch b/0020-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
similarity index 73%
rename from 0019-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
rename to 0020-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
index 64f8c5a..69c5b54 100644
--- a/0019-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
+++ b/0020-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
@@ -1,18 +1,18 @@
-From 33bfbbf0f983f6c84131c3ae96d71cad6665dc37 Mon Sep 17 00:00:00 2001
+From 45eb8e29c1b9f9bb92ce17cbc1d2fbc1c40c7f6b 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 19/36] EPEL 5: Fix blkid to return "LVM2_member" for PVs.
+Subject: [PATCH 20/37] EPEL 5: Fix blkid to return "LVM2_member" for PVs.
Old blkid in RHEL 5 didn't return the right thing for PVs.
---
- daemon/blkid.c | 20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
+ daemon/blkid.c | 18 ++++++++++++++++++
+ 1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/daemon/blkid.c b/daemon/blkid.c
-index 64919dd..6d94a38 100644
+index 64919dd..cbd9b1f 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
-@@ -51,6 +51,26 @@ get_blkid_tag (const char *device, const char *tag)
+@@ -51,6 +51,24 @@ get_blkid_tag (const char *device, const char *tag)
}
if (r == 2) { /* means UUID etc not found */
@@ -25,10 +25,8 @@ index 64919dd..6d94a38 100644
+ if (command (&out, &err, "file", "-bsL", device, NULL) == -1) {
+ reply_with_error ("file: %s", err);
+ free (out);
-+ free (err);
+ return NULL;
+ }
-+ free (err);
+ if (STRPREFIX (out, "LVM2 (Linux Logical Volume Manager)")) {
+ strcpy (out, "LVM2_member");
+ return out;
diff --git a/0020-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch b/0021-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
similarity index 91%
rename from 0020-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
rename to 0021-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
index 473d58d..73ad7fd 100644
--- a/0020-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
+++ b/0021-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
@@ -1,7 +1,7 @@
-From 158e74b852d369d83fa194bd6329d7a82d47fa8c Mon Sep 17 00:00:00 2001
+From dbb535379a5d301954fd0363f4aa3cdccb2f6ea8 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 20/36] EPEL 5: sparsify: Fix command line options for old qemu-img.
+Subject: [PATCH 21/37] 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/0021-EPEL-5-Remove-Fedora-MD-test-images.patch b/0022-EPEL-5-Remove-Fedora-MD-test-images.patch
similarity index 90%
rename from 0021-EPEL-5-Remove-Fedora-MD-test-images.patch
rename to 0022-EPEL-5-Remove-Fedora-MD-test-images.patch
index 187cb21..15b0cae 100644
--- a/0021-EPEL-5-Remove-Fedora-MD-test-images.patch
+++ b/0022-EPEL-5-Remove-Fedora-MD-test-images.patch
@@ -1,7 +1,7 @@
-From 61d883225c87a58f8df1ab9d6e17cdb7a7425d97 Mon Sep 17 00:00:00 2001
+From 6fade02acfac987837c928ef47ab7d380764297e 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 21/36] EPEL 5: Remove Fedora MD test images.
+Subject: [PATCH 22/37] 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/0022-EPEL-5-Add-mkisofs-to-package-list.patch b/0023-EPEL-5-Add-mkisofs-to-package-list.patch
similarity index 82%
rename from 0022-EPEL-5-Add-mkisofs-to-package-list.patch
rename to 0023-EPEL-5-Add-mkisofs-to-package-list.patch
index 53125b4..e1fbc36 100644
--- a/0022-EPEL-5-Add-mkisofs-to-package-list.patch
+++ b/0023-EPEL-5-Add-mkisofs-to-package-list.patch
@@ -1,7 +1,7 @@
-From 80df69f2d15f83bd748c4eb592bf7c0e4462c985 Mon Sep 17 00:00:00 2001
+From 4c1329584c1ff6ca60133bfe7ad2ec172d57f6a0 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 22/36] EPEL 5: Add mkisofs to package list.
+Subject: [PATCH 23/37] 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/0023-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch b/0024-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
similarity index 88%
rename from 0023-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
rename to 0024-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
index bff4e50..eaa851d 100644
--- a/0023-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
+++ b/0024-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
@@ -1,7 +1,7 @@
-From 999fad1fc600a50e51dc019b7d9c53cb735734cd Mon Sep 17 00:00:00 2001
+From 01115314a3c12073e5e6d4e02970867527c66e86 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 23/36] EPEL 5: Add 1 second pause after unmounting any filesystem.
+Subject: [PATCH 24/37] 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/0024-EPEL-5-podwrapper-Remove-HTML-output.patch b/0025-EPEL-5-podwrapper-Remove-HTML-output.patch
similarity index 96%
rename from 0024-EPEL-5-podwrapper-Remove-HTML-output.patch
rename to 0025-EPEL-5-podwrapper-Remove-HTML-output.patch
index 80f1db0..4585df7 100644
--- a/0024-EPEL-5-podwrapper-Remove-HTML-output.patch
+++ b/0025-EPEL-5-podwrapper-Remove-HTML-output.patch
@@ -1,7 +1,7 @@
-From 371194e75da68e141c2a33dba53c863ebd8bf329 Mon Sep 17 00:00:00 2001
+From b770d0ba1ae9bdd44b7aa5ae1f934d8fb6dd9143 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 24/36] EPEL 5: podwrapper: Remove HTML output.
+Subject: [PATCH 25/37] EPEL 5: podwrapper: Remove HTML output.
It requires perl Pod::Simple::XHTML which did not exist in
RHEL 5 era.
diff --git a/0025-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch b/0026-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
similarity index 84%
rename from 0025-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
rename to 0026-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
index 57c58a8..589e07e 100644
--- a/0025-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
+++ b/0026-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
@@ -1,7 +1,7 @@
-From deedfc2c5b28d95bd4d305034379fa584e939cb9 Mon Sep 17 00:00:00 2001
+From 350478ca7dae7a742d2b9154f8922bbc33a612a7 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 25/36] EPEL 5: podwrapper: Don't use Pod::Man.
+Subject: [PATCH 26/37] 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
diff --git a/0026-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch b/0027-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
similarity index 96%
rename from 0026-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
rename to 0027-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
index c407135..bdebe6b 100644
--- a/0026-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
+++ b/0027-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
@@ -1,7 +1,7 @@
-From e08f04f9c508fa0748453a0a2631d3373d7c67b4 Mon Sep 17 00:00:00 2001
+From 92682dfc73b9a0c2e21d5d4311bfd350af496ad8 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 26/36] EPEL 5: Revert "Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH"
+Subject: [PATCH 27/37] EPEL 5: Revert "Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH"
This reverts commit 61c9ea496e0579bb7d1bcf496595d66c3f08cfec.
---
diff --git a/0027-EPEL-5-Don-t-use-sgabios.patch b/0028-EPEL-5-Don-t-use-sgabios.patch
similarity index 90%
rename from 0027-EPEL-5-Don-t-use-sgabios.patch
rename to 0028-EPEL-5-Don-t-use-sgabios.patch
index 2528eb1..6ac08c0 100644
--- a/0027-EPEL-5-Don-t-use-sgabios.patch
+++ b/0028-EPEL-5-Don-t-use-sgabios.patch
@@ -1,7 +1,7 @@
-From 84c0abdf9bd1cc84dc3cd6d0fcd85ffd8a33f7e5 Mon Sep 17 00:00:00 2001
+From d4180d13c025f66f2b9b853b7a6277dfae52e2b9 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 27/36] EPEL 5: Don't use sgabios.
+Subject: [PATCH 28/37] EPEL 5: Don't use sgabios.
Old qemu doesn't support '-device' parameter.
---
diff --git a/0028-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch b/0029-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
similarity index 98%
rename from 0028-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
rename to 0029-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
index 79a227e..dd0df1d 100644
--- a/0028-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
+++ b/0029-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
@@ -1,7 +1,7 @@
-From 437b53bab6f8594ea4b84c881fc75cb86df29490 Mon Sep 17 00:00:00 2001
+From b4c66073b348c95e01ef743ee8e15a891ba41725 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 28/36] EPEL 5: Revert "daemon: Remove e2prog hack (only needed for RHEL 5)."
+Subject: [PATCH 29/37] EPEL 5: Revert "daemon: Remove e2prog hack (only needed for RHEL 5)."
This reverts commit 163e030ee13644ad9efe1e078aff47b879657333.
---
diff --git a/0029-EPEL-5-Disable-tar-xz-test.patch b/0030-EPEL-5-Disable-tar-xz-test.patch
similarity index 88%
rename from 0029-EPEL-5-Disable-tar-xz-test.patch
rename to 0030-EPEL-5-Disable-tar-xz-test.patch
index e6bb6e4..c20e11d 100644
--- a/0029-EPEL-5-Disable-tar-xz-test.patch
+++ b/0030-EPEL-5-Disable-tar-xz-test.patch
@@ -1,7 +1,7 @@
-From e1a657f74be5dc3f349732112e68c7f2064a95b8 Mon Sep 17 00:00:00 2001
+From 3c027d28c1de034ecdb5cc5837944dfebe5d769a 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 29/36] EPEL 5: Disable tar --xz test.
+Subject: [PATCH 30/37] EPEL 5: Disable tar --xz test.
Although xz is available, ancient tar didn't have the --xz option.
---
diff --git a/0030-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch b/0031-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
similarity index 84%
rename from 0030-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
rename to 0031-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
index c273275..29ad623 100644
--- a/0030-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
+++ b/0031-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
@@ -1,7 +1,7 @@
-From aeb92a6862d385ece1280baabb5bc03214a2ed4f Mon Sep 17 00:00:00 2001
+From 59d5706d06a71e624670c10c8286fad76c04c386 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 30/36] EPEL 5: Ignore sparsify error if qemu-img --help is killed by a signal.
+Subject: [PATCH 31/37] EPEL 5: Ignore sparsify error if qemu-img --help is killed by a signal.
---
sparsify/sparsify.ml | 3 +--
diff --git a/0031-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch b/0032-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
similarity index 90%
rename from 0031-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
rename to 0032-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
index f3c20d7..b27584a 100644
--- a/0031-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
+++ b/0032-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
@@ -1,7 +1,7 @@
-From 5d30392d9083428a4ad64cc7389cd9adc18979d9 Mon Sep 17 00:00:00 2001
+From c5c98b399e2353c05253ab7a606fda74424243b4 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 31/36] EPEL 5: Revert "daemon: remove call to obsolete udevsettle"
+Subject: [PATCH 32/37] EPEL 5: Revert "daemon: remove call to obsolete udevsettle"
This reverts commit b6413f8dbef92c46c4baf9499366716a166f2163.
---
diff --git a/0032-EPEL-5-No-libtoolize-install-option.patch b/0033-EPEL-5-No-libtoolize-install-option.patch
similarity index 82%
rename from 0032-EPEL-5-No-libtoolize-install-option.patch
rename to 0033-EPEL-5-No-libtoolize-install-option.patch
index e9add75..918917d 100644
--- a/0032-EPEL-5-No-libtoolize-install-option.patch
+++ b/0033-EPEL-5-No-libtoolize-install-option.patch
@@ -1,7 +1,7 @@
-From f941916d6d765a1afae4c0d2e833c4d10fd5c39c Mon Sep 17 00:00:00 2001
+From 880785a2d52495c7ca010242e32cab5f5714e698 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 32/36] EPEL 5: No libtoolize --install option.
+Subject: [PATCH 33/37] EPEL 5: No libtoolize --install option.
---
bootstrap | 2 +-
diff --git a/0033-EPEL-5-Disable-valgrind.patch b/0034-EPEL-5-Disable-valgrind.patch
similarity index 85%
rename from 0033-EPEL-5-Disable-valgrind.patch
rename to 0034-EPEL-5-Disable-valgrind.patch
index 321878b..53353bd 100644
--- a/0033-EPEL-5-Disable-valgrind.patch
+++ b/0034-EPEL-5-Disable-valgrind.patch
@@ -1,7 +1,7 @@
-From e4ac2bc51e0ef216f57e961414f13a3be6c1fbdd Mon Sep 17 00:00:00 2001
+From ac0ae2bfb19668e8de48902e553ff318a8825f1b 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 33/36] EPEL 5: Disable valgrind.
+Subject: [PATCH 34/37] EPEL 5: Disable valgrind.
Ancient automake didn't have AM_SUBST_NOTMAKE.
---
diff --git a/0034-EPEL-5-Remove-Linux-capabilities.patch b/0035-EPEL-5-Remove-Linux-capabilities.patch
similarity index 89%
rename from 0034-EPEL-5-Remove-Linux-capabilities.patch
rename to 0035-EPEL-5-Remove-Linux-capabilities.patch
index 31cac4b..06bc54c 100644
--- a/0034-EPEL-5-Remove-Linux-capabilities.patch
+++ b/0035-EPEL-5-Remove-Linux-capabilities.patch
@@ -1,7 +1,7 @@
-From 24654a3936d14c985776ef7264fc57a3553d7328 Mon Sep 17 00:00:00 2001
+From bf562086eaee769c13cfe4673ede68b03cb03070 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 34/36] EPEL 5: Remove Linux capabilities.
+Subject: [PATCH 35/37] 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
diff --git a/0035-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch b/0036-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
similarity index 89%
rename from 0035-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
rename to 0036-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
index d195538..1ab8cf1 100644
--- a/0035-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
+++ b/0036-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
@@ -1,7 +1,7 @@
-From 1b46d0a8391a4a643df3a35c7310eb4cd21fb2c1 Mon Sep 17 00:00:00 2001
+From 18d8e9d4f6ee7b2273077f91d0ba5f564d1d582a 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 35/36] EPEL 5: ruby: Use old rake/rdoctask and rake/gempackagetask.
+Subject: [PATCH 36/37] 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/0036-EPEL-5-Custom-replacement-for-Unix.isatty-stdout.patch b/0037-EPEL-5-Custom-replacement-for-Unix.isatty-stdout.patch
similarity index 92%
rename from 0036-EPEL-5-Custom-replacement-for-Unix.isatty-stdout.patch
rename to 0037-EPEL-5-Custom-replacement-for-Unix.isatty-stdout.patch
index dfd9918..589d4f7 100644
--- a/0036-EPEL-5-Custom-replacement-for-Unix.isatty-stdout.patch
+++ b/0037-EPEL-5-Custom-replacement-for-Unix.isatty-stdout.patch
@@ -1,7 +1,7 @@
-From 8421edcf024f7328da721a8ac52f349290ed5714 Mon Sep 17 00:00:00 2001
+From a511d139e98dbab61f84bee513f0221ba98e1c39 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 9 Mar 2013 19:25:33 +0000
-Subject: [PATCH 36/36] EPEL 5: Custom replacement for 'Unix.isatty stdout'.
+Subject: [PATCH 37/37] EPEL 5: Custom replacement for 'Unix.isatty stdout'.
Unix.isatty missing on RHEL 5-era OCaml.
---
diff --git a/libguestfs.spec b/libguestfs.spec
index 2eccb44..9e8d3f2 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.20.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -44,41 +44,40 @@ BuildRequires: autoconf, automake, libtool
Patch0001: 0001-gnulib-Use-module-mkstemps-for-RHEL-5-glibc-which-la.patch
Patch0002: 0002-RHEL-5-inspect-Add-macro-for-be32toh-if-one-is-not-d.patch
Patch0003: 0003-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
-Patch0004: 0004-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
-Patch0005: 0005-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
-Patch0006: 0006-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
-Patch0007: 0007-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
-Patch0008: 0008-EPEL-5-Remove-Erlang-bindings.patch
-Patch0009: 0009-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
-Patch0010: 0010-EPEL-5-Remove-PHP-bindings.patch
-Patch0011: 0011-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
-Patch0012: 0012-EPEL-5-Add-gnulib-utimensat-module.patch
-Patch0013: 0013-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
-Patch0014: 0014-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
-Patch0015: 0015-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
-Patch0016: 0016-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
-Patch0017: 0017-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
-Patch0018: 0018-EPEL-5-Disable-libvirt-attach-method.patch
-Patch0019: 0019-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
-Patch0020: 0020-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
-Patch0021: 0021-EPEL-5-Remove-Fedora-MD-test-images.patch
-Patch0022: 0022-EPEL-5-Add-mkisofs-to-package-list.patch
-Patch0023: 0023-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
-Patch0024: 0024-EPEL-5-podwrapper-Remove-HTML-output.patch
-Patch0025: 0025-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
-Patch0026: 0026-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
-Patch0027: 0027-EPEL-5-Don-t-use-sgabios.patch
-Patch0028: 0028-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
-Patch0029: 0029-EPEL-5-Disable-tar-xz-test.patch
-Patch0030: 0030-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
-Patch0031: 0031-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
-Patch0032: 0032-EPEL-5-No-libtoolize-install-option.patch
-Patch0033: 0033-EPEL-5-Disable-valgrind.patch
-Patch0034: 0034-EPEL-5-Remove-Linux-capabilities.patch
-Patch0035: 0035-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
-Patch0036: 0036-EPEL-5-Custom-replacement-for-Unix.isatty-stdout.patch
-
-Patch1001: 0001-RHEL-5-tests-Use-gnulib.patch
+Patch0004: 0004-RHEL-5-tests-Use-gnulib.patch
+Patch0005: 0005-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
+Patch0006: 0006-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
+Patch0007: 0007-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
+Patch0008: 0008-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
+Patch0009: 0009-EPEL-5-Remove-Erlang-bindings.patch
+Patch0010: 0010-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
+Patch0011: 0011-EPEL-5-Remove-PHP-bindings.patch
+Patch0012: 0012-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
+Patch0013: 0013-EPEL-5-Add-gnulib-utimensat-module.patch
+Patch0014: 0014-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
+Patch0015: 0015-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
+Patch0016: 0016-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
+Patch0017: 0017-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
+Patch0018: 0018-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
+Patch0019: 0019-EPEL-5-Disable-libvirt-attach-method.patch
+Patch0020: 0020-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
+Patch0021: 0021-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
+Patch0022: 0022-EPEL-5-Remove-Fedora-MD-test-images.patch
+Patch0023: 0023-EPEL-5-Add-mkisofs-to-package-list.patch
+Patch0024: 0024-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
+Patch0025: 0025-EPEL-5-podwrapper-Remove-HTML-output.patch
+Patch0026: 0026-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
+Patch0027: 0027-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
+Patch0028: 0028-EPEL-5-Don-t-use-sgabios.patch
+Patch0029: 0029-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
+Patch0030: 0030-EPEL-5-Disable-tar-xz-test.patch
+Patch0031: 0031-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
+Patch0032: 0032-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
+Patch0033: 0033-EPEL-5-No-libtoolize-install-option.patch
+Patch0034: 0034-EPEL-5-Disable-valgrind.patch
+Patch0035: 0035-EPEL-5-Remove-Linux-capabilities.patch
+Patch0036: 0036-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
+Patch0037: 0037-EPEL-5-Custom-replacement-for-Unix.isatty-stdout.patch
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
@@ -904,8 +903,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun Mar 10 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.3-2
+* Sun Mar 10 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.3-3
- Add patch to define O_CLOEXEC in tests.
+- Fix double-free bug in EPEL5-specific patch.
* Sat Mar 9 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.3-1
- Rebase to upstream stable branch version 1.20.3.
More information about the scm-commits
mailing list