[libguestfs/el5] Small patch for missing O_CLOEXEC symbol.
Richard W.M. Jones
rjones at fedoraproject.org
Mon Mar 11 11:07:26 UTC 2013
commit 0a1dbf29ccd74493543bad954408695ba8f8f700
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Mar 11 11:07:10 2013 +0000
Small patch for missing O_CLOEXEC symbol.
...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 +-
0004-RHEL-5-tests-Use-gnulib.patch | 2 +-
...emove-checks-which-fail-with-ancient-qemu.patch | 2 +-
...L-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch | 2 +-
...ace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch | 2 +-
...t-use-C99-style-variable-decls-in-for-loo.patch | 2 +-
0009-EPEL-5-Remove-Erlang-bindings.patch | 2 +-
...ve-GObject-GObject-Introspection-GJS-bind.patch | 2 +-
0011-EPEL-5-Remove-PHP-bindings.patch | 2 +-
...L-5-Define-le64toh-le32toh-if-not-defined.patch | 2 +-
0013-EPEL-5-Add-gnulib-utimensat-module.patch | 2 +-
...ocamlopt-didn-t-support-debugging-g-optio.patch | 2 +-
...ace-format6-with-format4-in-OCaml-gettext.patch | 2 +-
...s-preserve-dup-deps-explicitly-to-libtool.patch | 2 +-
...ve-id-from-drive-parameter-on-qemu-comman.patch | 2 +-
...null-vmchannel-back-for-qemu-without-virt.patch | 2 +-
0019-EPEL-5-Disable-libvirt-attach-method.patch | 2 +-
...5-Fix-blkid-to-return-LVM2_member-for-PVs.patch | 2 +-
...sify-Fix-command-line-options-for-old-qem.patch | 2 +-
0022-EPEL-5-Remove-Fedora-MD-test-images.patch | 2 +-
0023-EPEL-5-Add-mkisofs-to-package-list.patch | 2 +-
...1-second-pause-after-unmounting-any-files.patch | 2 +-
0025-EPEL-5-podwrapper-Remove-HTML-output.patch | 2 +-
0026-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch | 2 +-
...rt-Mac-OS-X-Use-libtool-mode-execute-inst.patch | 2 +-
0028-EPEL-5-Don-t-use-sgabios.patch | 2 +-
...rt-daemon-Remove-e2prog-hack-only-needed-.patch | 2 +-
0030-EPEL-5-Disable-tar-xz-test.patch | 2 +-
...re-sparsify-error-if-qemu-img-help-is-kil.patch | 2 +-
...rt-daemon-remove-call-to-obsolete-udevset.patch | 2 +-
0033-EPEL-5-No-libtoolize-install-option.patch | 2 +-
0034-EPEL-5-Disable-valgrind.patch | 2 +-
0035-EPEL-5-Remove-Linux-capabilities.patch | 2 +-
...-Use-old-rake-rdoctask-and-rake-gempackag.patch | 2 +-
...Custom-replacement-for-Unix.isatty-stdout.patch | 2 +-
...s-xml-Define-O_CLOEXEC-in-LD_PRELOAD-libr.patch | 32 ++++++++++++++++++++
libguestfs.spec | 5 ++-
39 files changed, 72 insertions(+), 39 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 f762a9a..deac3f6 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/37] gnulib: Use module mkstemps for RHEL 5 glibc which lacked this function.
+Subject: [PATCH 01/38] 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 42de648..89b1c12 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/37] RHEL 5: inspect: Add macro for be32toh if one is not defined in the header files.
+Subject: [PATCH 02/38] 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 9281483..282623c 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/37] Move Ruby-related checks from autoconf to extconf.rb; add extra check for rb_alloc_func_t
+Subject: [PATCH 03/38] 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/0004-RHEL-5-tests-Use-gnulib.patch b/0004-RHEL-5-tests-Use-gnulib.patch
index fd9a164..4fa0be0 100644
--- a/0004-RHEL-5-tests-Use-gnulib.patch
+++ b/0004-RHEL-5-tests-Use-gnulib.patch
@@ -1,7 +1,7 @@
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 04/37] RHEL 5: tests: Use gnulib.
+Subject: [PATCH 04/38] RHEL 5: tests: Use gnulib.
Gnulib defines O_CLOEXEC which is missing on RHEL 5.
---
diff --git a/0005-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch b/0005-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
index e5232bc..c1a2181 100644
--- a/0005-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 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 05/37] EPEL 5: Remove checks which fail with ancient qemu.
+Subject: [PATCH 05/38] 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/0006-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch b/0006-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
index 3636261..89c00e4 100644
--- a/0006-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 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 06/37] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
+Subject: [PATCH 06/38] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
---
configure.ac | 28 ++++++++++++++--------------
diff --git a/0007-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
index d29fb33..af6055e 100644
--- a/0007-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 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 07/37] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
+Subject: [PATCH 07/38] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
---
configure.ac | 2 +-
diff --git a/0008-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
index 8113a1f..386e854 100644
--- a/0008-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 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 08/37] EPEL 5: Don't use C99-style variable decls in for-loop.
+Subject: [PATCH 08/38] EPEL 5: Don't use C99-style variable decls in for-loop.
---
daemon/btrfs.c | 3 ++-
diff --git a/0009-EPEL-5-Remove-Erlang-bindings.patch b/0009-EPEL-5-Remove-Erlang-bindings.patch
index 726d6fc..97214cd 100644
--- a/0009-EPEL-5-Remove-Erlang-bindings.patch
+++ b/0009-EPEL-5-Remove-Erlang-bindings.patch
@@ -1,7 +1,7 @@
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 09/37] EPEL 5: Remove Erlang bindings.
+Subject: [PATCH 09/38] EPEL 5: Remove Erlang bindings.
---
Makefile.am | 3 ---
diff --git a/0010-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch b/0010-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
index 9a9619b..b3097c7 100644
--- a/0010-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 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 10/37] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
+Subject: [PATCH 10/38] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
---
Makefile.am | 3 --
diff --git a/0011-EPEL-5-Remove-PHP-bindings.patch b/0011-EPEL-5-Remove-PHP-bindings.patch
index 3c0a88d..d9fbcce 100644
--- a/0011-EPEL-5-Remove-PHP-bindings.patch
+++ b/0011-EPEL-5-Remove-PHP-bindings.patch
@@ -1,7 +1,7 @@
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 11/37] EPEL 5: Remove PHP bindings.
+Subject: [PATCH 11/38] EPEL 5: Remove PHP bindings.
---
Makefile.am | 3 ---
diff --git a/0012-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch b/0012-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
index a0adfb7..6e1084c 100644
--- a/0012-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 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 12/37] EPEL 5: Define le64toh, le32toh if not defined.
+Subject: [PATCH 12/38] EPEL 5: Define le64toh, le32toh if not defined.
---
src/inspect-fs-windows.c | 16 ++++++++++++++++
diff --git a/0013-EPEL-5-Add-gnulib-utimensat-module.patch b/0013-EPEL-5-Add-gnulib-utimensat-module.patch
index 893b649..3bff756 100644
--- a/0013-EPEL-5-Add-gnulib-utimensat-module.patch
+++ b/0013-EPEL-5-Add-gnulib-utimensat-module.patch
@@ -1,7 +1,7 @@
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 13/37] EPEL 5: Add gnulib utimensat module.
+Subject: [PATCH 13/38] EPEL 5: Add gnulib utimensat module.
This function is missing in RHEL 5-era kernels.
---
diff --git a/0014-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch b/0014-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
index b4e077b..6e8bfee 100644
--- a/0014-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 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 14/37] EPEL 5: Old ocamlopt didn't support debugging (-g option).
+Subject: [PATCH 14/38] EPEL 5: Old ocamlopt didn't support debugging (-g option).
---
ocaml/Makefile.am | 2 +-
diff --git a/0015-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch b/0015-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
index 883dcd6..4cd236f 100644
--- a/0015-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 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 15/37] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
+Subject: [PATCH 15/38] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
---
configure.ac | 10 +++++-----
diff --git a/0016-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch b/0016-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
index ce7aa56..4007b0b 100644
--- a/0016-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 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 16/37] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
+Subject: [PATCH 16/38] 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/0017-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch b/0017-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
index c1872c4..be48334 100644
--- a/0017-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 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 17/37] EPEL 5: Remove id= from -drive parameter on qemu command line.
+Subject: [PATCH 17/38] EPEL 5: Remove id= from -drive parameter on qemu command line.
---
src/launch-appliance.c | 5 ++---
diff --git a/0018-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch b/0018-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
index e177c5e..92b6ead 100644
--- a/0018-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 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 18/37] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
+Subject: [PATCH 18/38] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
---
appliance/init | 4 +-
diff --git a/0019-EPEL-5-Disable-libvirt-attach-method.patch b/0019-EPEL-5-Disable-libvirt-attach-method.patch
index 631082e..c96dff5 100644
--- a/0019-EPEL-5-Disable-libvirt-attach-method.patch
+++ b/0019-EPEL-5-Disable-libvirt-attach-method.patch
@@ -1,7 +1,7 @@
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 19/37] EPEL 5: Disable libvirt attach method.
+Subject: [PATCH 19/38] EPEL 5: Disable libvirt attach method.
---
src/launch-libvirt.c | 2 +-
diff --git a/0020-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch b/0020-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
index 69c5b54..0d5a698 100644
--- a/0020-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,7 +1,7 @@
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 20/37] EPEL 5: Fix blkid to return "LVM2_member" for PVs.
+Subject: [PATCH 20/38] 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/0021-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch b/0021-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
index 73ad7fd..d066099 100644
--- a/0021-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 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 21/37] EPEL 5: sparsify: Fix command line options for old qemu-img.
+Subject: [PATCH 21/38] 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/0022-EPEL-5-Remove-Fedora-MD-test-images.patch b/0022-EPEL-5-Remove-Fedora-MD-test-images.patch
index 15b0cae..3693dda 100644
--- a/0022-EPEL-5-Remove-Fedora-MD-test-images.patch
+++ b/0022-EPEL-5-Remove-Fedora-MD-test-images.patch
@@ -1,7 +1,7 @@
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 22/37] EPEL 5: Remove Fedora MD test images.
+Subject: [PATCH 22/38] 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/0023-EPEL-5-Add-mkisofs-to-package-list.patch b/0023-EPEL-5-Add-mkisofs-to-package-list.patch
index e1fbc36..ee5ce4e 100644
--- a/0023-EPEL-5-Add-mkisofs-to-package-list.patch
+++ b/0023-EPEL-5-Add-mkisofs-to-package-list.patch
@@ -1,7 +1,7 @@
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 23/37] EPEL 5: Add mkisofs to package list.
+Subject: [PATCH 23/38] 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/0024-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch b/0024-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
index eaa851d..a469299 100644
--- a/0024-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 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 24/37] EPEL 5: Add 1 second pause after unmounting any filesystem.
+Subject: [PATCH 24/38] 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/0025-EPEL-5-podwrapper-Remove-HTML-output.patch b/0025-EPEL-5-podwrapper-Remove-HTML-output.patch
index 4585df7..8576fdc 100644
--- a/0025-EPEL-5-podwrapper-Remove-HTML-output.patch
+++ b/0025-EPEL-5-podwrapper-Remove-HTML-output.patch
@@ -1,7 +1,7 @@
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 25/37] EPEL 5: podwrapper: Remove HTML output.
+Subject: [PATCH 25/38] EPEL 5: podwrapper: Remove HTML output.
It requires perl Pod::Simple::XHTML which did not exist in
RHEL 5 era.
diff --git a/0026-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch b/0026-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
index 589e07e..b5423e7 100644
--- a/0026-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 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 26/37] EPEL 5: podwrapper: Don't use Pod::Man.
+Subject: [PATCH 26/38] 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/0027-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
index bdebe6b..dd0f853 100644
--- a/0027-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 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 27/37] EPEL 5: Revert "Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH"
+Subject: [PATCH 27/38] EPEL 5: Revert "Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH"
This reverts commit 61c9ea496e0579bb7d1bcf496595d66c3f08cfec.
---
diff --git a/0028-EPEL-5-Don-t-use-sgabios.patch b/0028-EPEL-5-Don-t-use-sgabios.patch
index 6ac08c0..0b6b31c 100644
--- a/0028-EPEL-5-Don-t-use-sgabios.patch
+++ b/0028-EPEL-5-Don-t-use-sgabios.patch
@@ -1,7 +1,7 @@
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 28/37] EPEL 5: Don't use sgabios.
+Subject: [PATCH 28/38] EPEL 5: Don't use sgabios.
Old qemu doesn't support '-device' parameter.
---
diff --git a/0029-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch b/0029-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
index a62dd34..a0149e4 100644
--- a/0029-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 931e7f8f2bd62c12420f5603271aa260e1da94c5 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 29/37] EPEL 5: Revert "daemon: Remove e2prog hack (only needed for RHEL 5)."
+Subject: [PATCH 29/38] EPEL 5: Revert "daemon: Remove e2prog hack (only needed for RHEL 5)."
This reverts commit 163e030ee13644ad9efe1e078aff47b879657333.
---
diff --git a/0030-EPEL-5-Disable-tar-xz-test.patch b/0030-EPEL-5-Disable-tar-xz-test.patch
index af212dd..8cc6129 100644
--- a/0030-EPEL-5-Disable-tar-xz-test.patch
+++ b/0030-EPEL-5-Disable-tar-xz-test.patch
@@ -1,7 +1,7 @@
From e7e641033e38b9cb712568089005789721f06948 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 30/37] EPEL 5: Disable tar --xz test.
+Subject: [PATCH 30/38] EPEL 5: Disable tar --xz test.
Although xz is available, ancient tar didn't have the --xz option.
---
diff --git a/0031-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
index a0cea50..4a6f79a 100644
--- a/0031-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 4ff785222b20b02fa13e24580c70abbed6da7c84 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 31/37] EPEL 5: Ignore sparsify error if qemu-img --help is killed by a signal.
+Subject: [PATCH 31/38] EPEL 5: Ignore sparsify error if qemu-img --help is killed by a signal.
---
sparsify/sparsify.ml | 3 +--
diff --git a/0032-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch b/0032-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
index 8c245d2..0d3083b 100644
--- a/0032-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 303f99313de2d5b267c394e3929a68ba86bd76db 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 32/37] EPEL 5: Revert "daemon: remove call to obsolete udevsettle"
+Subject: [PATCH 32/38] EPEL 5: Revert "daemon: remove call to obsolete udevsettle"
This reverts commit b6413f8dbef92c46c4baf9499366716a166f2163.
---
diff --git a/0033-EPEL-5-No-libtoolize-install-option.patch b/0033-EPEL-5-No-libtoolize-install-option.patch
index be6e391..b7315b5 100644
--- a/0033-EPEL-5-No-libtoolize-install-option.patch
+++ b/0033-EPEL-5-No-libtoolize-install-option.patch
@@ -1,7 +1,7 @@
From 9ca1ff60f311f0d794f53f7f539a488b51a24707 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 33/37] EPEL 5: No libtoolize --install option.
+Subject: [PATCH 33/38] EPEL 5: No libtoolize --install option.
---
bootstrap | 2 +-
diff --git a/0034-EPEL-5-Disable-valgrind.patch b/0034-EPEL-5-Disable-valgrind.patch
index 157e3c2..bffb51f 100644
--- a/0034-EPEL-5-Disable-valgrind.patch
+++ b/0034-EPEL-5-Disable-valgrind.patch
@@ -1,7 +1,7 @@
From b530e72996ee0d5b677221f5abe213b2489570d1 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 34/37] EPEL 5: Disable valgrind.
+Subject: [PATCH 34/38] EPEL 5: Disable valgrind.
Ancient automake didn't have AM_SUBST_NOTMAKE.
---
diff --git a/0035-EPEL-5-Remove-Linux-capabilities.patch b/0035-EPEL-5-Remove-Linux-capabilities.patch
index 5039cd8..1380375 100644
--- a/0035-EPEL-5-Remove-Linux-capabilities.patch
+++ b/0035-EPEL-5-Remove-Linux-capabilities.patch
@@ -1,7 +1,7 @@
From 1290a348a79f104a4d00c2f8445db986e9ca467b 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 35/37] EPEL 5: Remove Linux capabilities.
+Subject: [PATCH 35/38] 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/0036-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch b/0036-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
index 67056b0..fc76200 100644
--- a/0036-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 d4741296a204ff6f9cde938ba0bc9f370fa4b798 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 36/37] EPEL 5: ruby: Use old rake/rdoctask and rake/gempackagetask.
+Subject: [PATCH 36/38] 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/0037-EPEL-5-Custom-replacement-for-Unix.isatty-stdout.patch b/0037-EPEL-5-Custom-replacement-for-Unix.isatty-stdout.patch
index 11bab6c..5f2e7df 100644
--- a/0037-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 50348e9098ca48e6b93dee54d1b1079fa13840bb 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 37/37] EPEL 5: Custom replacement for 'Unix.isatty stdout'.
+Subject: [PATCH 37/38] EPEL 5: Custom replacement for 'Unix.isatty stdout'.
Unix.isatty missing on RHEL 5-era OCaml.
---
diff --git a/0038-RHEL-5-tests-xml-Define-O_CLOEXEC-in-LD_PRELOAD-libr.patch b/0038-RHEL-5-tests-xml-Define-O_CLOEXEC-in-LD_PRELOAD-libr.patch
new file mode 100644
index 0000000..6361346
--- /dev/null
+++ b/0038-RHEL-5-tests-xml-Define-O_CLOEXEC-in-LD_PRELOAD-libr.patch
@@ -0,0 +1,32 @@
+From 532a41c8fb4a31db10fb29554d51f9f50ba615d3 Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones at redhat.com>
+Date: Mon, 11 Mar 2013 11:03:55 +0000
+Subject: [PATCH 38/38] RHEL 5: tests/xml: Define O_CLOEXEC in LD_PRELOAD library.
+
+---
+ tests/xml/fake-libvirt-xml.c | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/tests/xml/fake-libvirt-xml.c b/tests/xml/fake-libvirt-xml.c
+index a34b700..b7ab7a8 100644
+--- a/tests/xml/fake-libvirt-xml.c
++++ b/tests/xml/fake-libvirt-xml.c
+@@ -25,6 +25,15 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
++/* We're not using gnulib here so that we don't have to link to gnulib
++ * rpl_* libraries (not possible since this is an LD_PRELOAD lib).
++ * However that does mean we have to define O_CLOEXEC explicitly for
++ * RHEL 5.
++ */
++#ifndef O_CLOEXEC
++#define O_CLOEXEC 0
++#endif
++
+ /* Old <libvirt.h> had a slightly different definition of
+ * virDomainGetXMLDesc (using 'int' for flags instead of 'unsigned
+ * int'). To avoid an error trying to redefine it with a different
+--
+1.7.4.1
+
diff --git a/libguestfs.spec b/libguestfs.spec
index d30adfd..5596fac 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: 4%{?dist}
+Release: 5%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -78,6 +78,7 @@ 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
+Patch0038: 0038-RHEL-5-tests-xml-Define-O_CLOEXEC-in-LD_PRELOAD-libr.patch
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
@@ -910,7 +911,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Mon Mar 11 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.3-4
+* Mon Mar 11 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.3-5
- Fix various small bugs and tests.
* Sun Mar 10 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.3-3
More information about the scm-commits
mailing list