[libguestfs/el5] Rebase to upstream stable branch version 1.20.4.
Richard W.M. Jones
rjones at fedoraproject.org
Wed Mar 13 14:59:47 UTC 2013
commit aa5ae27a841b6a580094b5d78d0884b45d190362
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Wed Mar 13 13:20:38 2013 +0000
Rebase to upstream stable branch version 1.20.4.
...emove-checks-which-fail-with-ancient-qemu.patch | 10 ++--
...module-mkstemps-for-RHEL-5-glibc-which-la.patch | 37 ----------
...L-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch | 6 +-
...ect-Add-macro-for-be32toh-if-one-is-not-d.patch | 48 ------------
...ace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch | 6 +-
...elated-checks-from-autoconf-to-extconf.rb.patch | 67 -----------------
...t-use-C99-style-variable-decls-in-for-loo.patch | 4 +-
0004-RHEL-5-tests-Use-gnulib.patch | 66 -----------------
...tch => 0005-EPEL-5-Remove-Erlang-bindings.patch | 10 ++--
...ve-GObject-GObject-Introspection-GJS-bind.patch | 10 ++--
....patch => 0007-EPEL-5-Remove-PHP-bindings.patch | 10 ++--
...L-5-Define-le64toh-le32toh-if-not-defined.patch | 4 +-
...> 0009-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 | 6 +-
...s-preserve-dup-deps-explicitly-to-libtool.patch | 6 +-
...ve-id-from-drive-parameter-on-qemu-comman.patch | 10 ++--
...null-vmchannel-back-for-qemu-without-virt.patch | 24 +++---
...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 | 4 +-
... 0018-EPEL-5-Remove-Fedora-MD-test-images.patch | 4 +-
...> 0019-EPEL-5-Add-mkisofs-to-package-list.patch | 4 +-
...1-second-pause-after-unmounting-any-files.patch | 4 +-
...0021-EPEL-5-podwrapper-Remove-HTML-output.patch | 4 +-
... 0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch | 4 +-
...rt-Mac-OS-X-Use-libtool-mode-execute-inst.patch | 4 +-
...os.patch => 0024-EPEL-5-Don-t-use-sgabios.patch | 8 +-
...rt-daemon-Remove-e2prog-hack-only-needed-.patch | 4 +-
....patch => 0026-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 +-
... 0029-EPEL-5-No-libtoolize-install-option.patch | 4 +-
...ind.patch => 0030-EPEL-5-Disable-valgrind.patch | 6 +-
... => 0031-EPEL-5-Remove-Linux-capabilities.patch | 6 +-
...-Use-old-rake-rdoctask-and-rake-gempackag.patch | 6 +-
...Custom-replacement-for-Unix.isatty-stdout.patch | 58 ---------------
...s-xml-Define-O_CLOEXEC-in-LD_PRELOAD-libr.patch | 32 --------
libguestfs.spec | 77 ++++++++++----------
39 files changed, 136 insertions(+), 447 deletions(-)
---
diff --git a/0005-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch b/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
similarity index 94%
rename from 0005-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
rename to 0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
index c1a2181..4226d35 100644
--- a/0005-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 eab32a7781af5012b11face2eb675bebc65a5b41 Mon Sep 17 00:00:00 2001
+From 2766fa2cfff351a8db92432912f1457909868a36 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/38] EPEL 5: Remove checks which fail with ancient qemu.
+Subject: [PATCH 01/32] EPEL 5: Remove checks which fail with ancient qemu.
Note that g->app.qemu_version and g->app.qemu_devices will both
be empty strings.
@@ -11,7 +11,7 @@ be empty strings.
2 files changed, 2 insertions(+), 78 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 897e303..c1388ff 100644
+index 488937c..bd6c45b 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
@@ -79,10 +79,10 @@ index 897e303..c1388ff 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 a86a8cc..10f63f1 100644
+index d1fe326..3498787 100644
--- a/src/launch-appliance.c
+++ b/src/launch-appliance.c
-@@ -767,30 +767,11 @@ test_qemu (guestfs_h *g)
+@@ -770,30 +770,11 @@ test_qemu (guestfs_h *g)
if (r == -1 || !WIFEXITED (r) || WEXITSTATUS (r) != 0)
goto error;
diff --git a/0006-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch b/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
similarity index 95%
rename from 0006-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
rename to 0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
index 89c00e4..6e13ca6 100644
--- a/0006-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
+++ b/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
@@ -1,14 +1,14 @@
-From 120acb40d674957a3b4cfe8a88877430cdc50493 Mon Sep 17 00:00:00 2001
+From 396ba6859b31a9355a746af69e34d9966a47de0c 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/38] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
+Subject: [PATCH 02/32] 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 c1388ff..38998ee 100644
+index bd6c45b..7269f84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1525,33 +1525,33 @@ echo "Appliance ........................... $enable_appliance"
diff --git a/0007-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
similarity index 80%
rename from 0007-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
rename to 0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
index af6055e..98f1d6b 100644
--- a/0007-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
+++ b/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
@@ -1,14 +1,14 @@
-From 03263b3a4fe4abce8dcdd53fb1880eca64ef46ef Mon Sep 17 00:00:00 2001
+From af2d0e35b55a2dbe95da71b7238b20fcf3c5caaa 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/38] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
+Subject: [PATCH 03/32] 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 38998ee..ad2897d 100644
+index 7269f84..7cdcc2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251,7 +251,7 @@ The code will still compile, but is likely to leak memory and other
diff --git a/0008-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
similarity index 97%
rename from 0008-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
rename to 0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
index 386e854..6cf7231 100644
--- a/0008-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 4cfbf4f295a06897329d20037efe66ee35c92b62 Mon Sep 17 00:00:00 2001
+From 1ac1e2add57ceffd030e7fbf8bfab67e35ce060c 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/38] EPEL 5: Don't use C99-style variable decls in for-loop.
+Subject: [PATCH 04/32] 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/0005-EPEL-5-Remove-Erlang-bindings.patch
similarity index 92%
rename from 0009-EPEL-5-Remove-Erlang-bindings.patch
rename to 0005-EPEL-5-Remove-Erlang-bindings.patch
index 97214cd..04c3e86 100644
--- a/0009-EPEL-5-Remove-Erlang-bindings.patch
+++ b/0005-EPEL-5-Remove-Erlang-bindings.patch
@@ -1,7 +1,7 @@
-From ec782cc14643e71bb5d7cc07647a369a95fb005b Mon Sep 17 00:00:00 2001
+From c3ed6982ea6ed1d4c2997503f0733592d9b6f9bd 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/38] EPEL 5: Remove Erlang bindings.
+Subject: [PATCH 05/32] EPEL 5: Remove Erlang bindings.
---
Makefile.am | 3 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 09/38] EPEL 5: Remove Erlang bindings.
3 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 842008a..340a6d6 100644
+index a069223..c887512 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -91,9 +91,6 @@ endif
+@@ -89,9 +89,6 @@ endif
if HAVE_PHP
SUBDIRS += php
endif
@@ -24,7 +24,7 @@ index 842008a..340a6d6 100644
SUBDIRS += lua lua/examples
endif
diff --git a/configure.ac b/configure.ac
-index ad2897d..6f72688 100644
+index 7cdcc2b..4a9a027 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1290,25 +1290,6 @@ AS_IF([test "x$enable_php" != "xno"],[
diff --git a/0010-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch b/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
similarity index 96%
rename from 0010-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
rename to 0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
index b3097c7..6c0b442 100644
--- a/0010-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 01d681c8be082b4d44845f34c51cc4f07e6ffa80 Mon Sep 17 00:00:00 2001
+From f890c324ce3b8140b48aef989c6b56402fc6c88b 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/38] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
+Subject: [PATCH 06/32] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
---
Makefile.am | 3 --
@@ -10,10 +10,10 @@ Subject: [PATCH 10/38] EPEL 5: Remove GObject / GObject Introspection / GJS bind
3 files changed, 0 insertions(+), 126 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 340a6d6..ee680dc 100644
+index c887512..406bc16 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -94,9 +94,6 @@ endif
+@@ -92,9 +92,6 @@ endif
if HAVE_LUA
SUBDIRS += lua lua/examples
endif
@@ -24,7 +24,7 @@ index 340a6d6..ee680dc 100644
# Unconditional because nothing is built yet.
SUBDIRS += csharp
diff --git a/configure.ac b/configure.ac
-index 6f72688..d596c52 100644
+index 4a9a027..f7cc808 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1341,58 +1341,6 @@ AS_IF([test "x$PERL" != "xno"],[
diff --git a/0011-EPEL-5-Remove-PHP-bindings.patch b/0007-EPEL-5-Remove-PHP-bindings.patch
similarity index 91%
rename from 0011-EPEL-5-Remove-PHP-bindings.patch
rename to 0007-EPEL-5-Remove-PHP-bindings.patch
index d9fbcce..adf1eee 100644
--- a/0011-EPEL-5-Remove-PHP-bindings.patch
+++ b/0007-EPEL-5-Remove-PHP-bindings.patch
@@ -1,7 +1,7 @@
-From 40b7aaec13ed51f0876ab26ff264a8caba90f6ed Mon Sep 17 00:00:00 2001
+From f67ea782da268768265c6518d6c1badf44fc8b38 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/38] EPEL 5: Remove PHP bindings.
+Subject: [PATCH 07/32] EPEL 5: Remove PHP bindings.
---
Makefile.am | 3 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 11/38] EPEL 5: Remove PHP bindings.
3 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index ee680dc..d263c0d 100644
+index 406bc16..2a4ae39 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -88,9 +88,6 @@ endif
+@@ -86,9 +86,6 @@ endif
if HAVE_HASKELL
SUBDIRS += haskell
endif
@@ -24,7 +24,7 @@ index ee680dc..d263c0d 100644
SUBDIRS += lua lua/examples
endif
diff --git a/configure.ac b/configure.ac
-index d596c52..944df72 100644
+index f7cc808..4d5a976 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1277,19 +1277,6 @@ AS_IF([test "x$enable_haskell" != "xno"],[
diff --git a/0012-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch b/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
similarity index 88%
rename from 0012-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
rename to 0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
index 6e1084c..d451cf1 100644
--- a/0012-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 937bcc4cf2fc038dd3acff7a6dbb8c497513a627 Mon Sep 17 00:00:00 2001
+From 656dba3cb40825a78867f8564562383776f7c3df 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/38] EPEL 5: Define le64toh, le32toh if not defined.
+Subject: [PATCH 08/32] 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/0009-EPEL-5-Add-gnulib-utimensat-module.patch
similarity index 84%
rename from 0013-EPEL-5-Add-gnulib-utimensat-module.patch
rename to 0009-EPEL-5-Add-gnulib-utimensat-module.patch
index 3bff756..5555393 100644
--- a/0013-EPEL-5-Add-gnulib-utimensat-module.patch
+++ b/0009-EPEL-5-Add-gnulib-utimensat-module.patch
@@ -1,7 +1,7 @@
-From 8f367f478a1219252ff2ed77d55f831f7b1a4889 Mon Sep 17 00:00:00 2001
+From acd550327883814c7cc6dbaee1d4a543c5cb4f21 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/38] EPEL 5: Add gnulib utimensat module.
+Subject: [PATCH 09/32] 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/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
similarity index 93%
rename from 0014-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
rename to 0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
index 6e8bfee..a7fdd99 100644
--- a/0014-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 b597ef3e655bbc3d44972baab83800b9e50261d5 Mon Sep 17 00:00:00 2001
+From 58d711b387356a0d08bc24ca21df4fc5e6a8c01f 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/38] EPEL 5: Old ocamlopt didn't support debugging (-g option).
+Subject: [PATCH 10/32] 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/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
similarity index 86%
rename from 0015-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
rename to 0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
index 4cd236f..0ba745d 100644
--- a/0015-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
+++ b/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
@@ -1,14 +1,14 @@
-From 50048d8ed4e6ca760d475c5f7e712f1ef7989ac0 Mon Sep 17 00:00:00 2001
+From 5cec4c634e31f8bb8d0d2614c0d7cd5efdc10401 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/38] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
+Subject: [PATCH 11/32] 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 944df72..c72038c 100644
+index 4d5a976..7268b59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -961,14 +961,14 @@ EOF
diff --git a/0016-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch b/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
similarity index 83%
rename from 0016-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
rename to 0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
index 4007b0b..0dc8876 100644
--- a/0016-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 bcbd094830abf6431d2cc6c54909ec04313409b7 Mon Sep 17 00:00:00 2001
+From 29e5db8e696ca805063954db07c2a6b6b4dc1fa8 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/38] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
+Subject: [PATCH 12/32] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
See this thread:
https://lists.gnu.org/archive/html/bug-gnulib/2012-06/msg00162.html
@@ -10,7 +10,7 @@ https://lists.gnu.org/archive/html/bug-gnulib/2012-06/msg00162.html
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
-index c72038c..d26b815 100644
+index 7268b59..a6ad077 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1334,7 +1334,7 @@ AC_SUBST(MAX_PROC_NR)
diff --git a/0017-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch b/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
similarity index 81%
rename from 0017-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
rename to 0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
index be48334..76246df 100644
--- a/0017-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,17 +1,17 @@
-From dd6987286760d8423b8cc7f5fba5b9720adc85a2 Mon Sep 17 00:00:00 2001
+From 7cd10e61a0b03ed034de3a6900eb8e291b96ecbd 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/38] EPEL 5: Remove id= from -drive parameter on qemu command line.
+Subject: [PATCH 13/32] 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 10f63f1..62ab76e 100644
+index 3498787..3fb967e 100644
--- a/src/launch-appliance.c
+++ b/src/launch-appliance.c
-@@ -339,7 +339,7 @@ launch_appliance (guestfs_h *g, const char *arg)
+@@ -332,7 +332,7 @@ launch_appliance (guestfs_h *g, const char *arg)
size_t buf2_len = strlen (appliance) + 64;
char buf2[buf2_len];
add_cmdline (g, "-drive");
@@ -20,7 +20,7 @@ index 10f63f1..62ab76e 100644
appliance, virtio_scsi ? "none" : "virtio", cachemode);
add_cmdline (g, buf2);
-@@ -957,14 +957,13 @@ qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index)
+@@ -960,14 +960,13 @@ qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index)
else
iface = "virtio";
diff --git a/0018-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch b/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
similarity index 95%
rename from 0018-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
rename to 0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
index 92b6ead..8c82100 100644
--- a/0018-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 37048556d6e2a0179b8344956875c5a64efb6904 Mon Sep 17 00:00:00 2001
+From af0e598258c74a3df824499cfaa16af7fc7482d8 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/38] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
+Subject: [PATCH 14/32] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
---
appliance/init | 4 +-
@@ -175,10 +175,10 @@ index 254e0ea..bcb836a 100644
main_loop (sock);
diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
-index dab8224..a40682a 100644
+index a048a83..6369e87 100644
--- a/src/guestfs-internal.h
+++ b/src/guestfs-internal.h
-@@ -510,7 +510,7 @@ extern void guestfs___rollback_drives (guestfs_h *g, size_t);
+@@ -512,7 +512,7 @@ extern void guestfs___rollback_drives (guestfs_h *g, size_t);
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);
@@ -188,7 +188,7 @@ index dab8224..a40682a 100644
/* launch-appliance.c */
diff --git a/src/launch-appliance.c b/src/launch-appliance.c
-index 62ab76e..570f6cf 100644
+index 3fb967e..57a8bbc 100644
--- a/src/launch-appliance.c
+++ b/src/launch-appliance.c
@@ -74,12 +74,16 @@ free_regexps (void)
@@ -278,7 +278,7 @@ index 62ab76e..570f6cf 100644
if (!g->direct) {
if (pipe (wfd) == -1 || pipe (rfd) == -1) {
perrorf (g, "pipe");
-@@ -412,23 +424,9 @@ launch_appliance (guestfs_h *g, const char *arg)
+@@ -398,23 +410,9 @@ launch_appliance (guestfs_h *g, const char *arg)
if (qemu_supports (g, "-rtc-td-hack"))
add_cmdline (g, "-rtc-td-hack");
@@ -303,7 +303,7 @@ index 62ab76e..570f6cf 100644
if (qemu_supports_device (g, "Serial Graphics Adapter")) {
/* Use sgabios instead of vgabios. This means we'll see BIOS
-@@ -441,12 +439,16 @@ launch_appliance (guestfs_h *g, const char *arg)
+@@ -427,12 +425,16 @@ launch_appliance (guestfs_h *g, const char *arg)
add_cmdline (g, "sga");
}
@@ -326,7 +326,7 @@ index 62ab76e..570f6cf 100644
#ifdef VALGRIND_DAEMON
/* Set up virtio-serial channel for valgrind messages. */
-@@ -458,14 +460,6 @@ launch_appliance (guestfs_h *g, const char *arg)
+@@ -444,14 +446,6 @@ launch_appliance (guestfs_h *g, const char *arg)
add_cmdline (g, "virtserialport,chardev=valgrind,name=org.libguestfs.valgrind");
#endif
@@ -341,7 +341,7 @@ index 62ab76e..570f6cf 100644
add_cmdline (g, "-kernel");
add_cmdline (g, kernel);
add_cmdline (g, "-initrd");
-@@ -473,7 +467,7 @@ launch_appliance (guestfs_h *g, const char *arg)
+@@ -459,7 +453,7 @@ launch_appliance (guestfs_h *g, const char *arg)
add_cmdline (g, "-append");
CLEANUP_FREE char *cmdline =
@@ -349,8 +349,8 @@ index 62ab76e..570f6cf 100644
+ guestfs___appliance_command_line (g, appliance_dev, 0, vmchannel);
add_cmdline (g, cmdline);
- /* Finish off the command line. */
-@@ -617,19 +611,30 @@ launch_appliance (guestfs_h *g, const char *arg)
+ /* Note: custom command line parameters must come last so that
+@@ -620,19 +614,30 @@ launch_appliance (guestfs_h *g, const char *arg)
g->state = LAUNCHING;
@@ -392,7 +392,7 @@ index 62ab76e..570f6cf 100644
/* Close the listening socket. */
if (close (g->sock) != 0) {
-@@ -981,6 +986,83 @@ guestfs___drive_name (size_t index, char *ret)
+@@ -984,6 +989,83 @@ guestfs___drive_name (size_t index, char *ret)
return ret;
}
diff --git a/0019-EPEL-5-Disable-libvirt-attach-method.patch b/0015-EPEL-5-Disable-libvirt-attach-method.patch
similarity index 78%
rename from 0019-EPEL-5-Disable-libvirt-attach-method.patch
rename to 0015-EPEL-5-Disable-libvirt-attach-method.patch
index c96dff5..efccefe 100644
--- a/0019-EPEL-5-Disable-libvirt-attach-method.patch
+++ b/0015-EPEL-5-Disable-libvirt-attach-method.patch
@@ -1,14 +1,14 @@
-From 5e79cdd4edfcf8a50c4c1454c6fcacbdf33e0e75 Mon Sep 17 00:00:00 2001
+From e763e1518eb05376a3a0a31226b608bcbdfc8992 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/38] EPEL 5: Disable libvirt attach method.
+Subject: [PATCH 15/32] 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 e549ae8..c013dee 100644
+index 03c2744..d2d63f7 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -72,7 +72,7 @@
diff --git a/0020-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch b/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
similarity index 90%
rename from 0020-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
rename to 0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
index 0d5a698..bbec2d0 100644
--- a/0020-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 45eb8e29c1b9f9bb92ce17cbc1d2fbc1c40c7f6b Mon Sep 17 00:00:00 2001
+From 3579815ae24033f8eb1ef1521e4ad2bad4ea43c2 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/38] EPEL 5: Fix blkid to return "LVM2_member" for PVs.
+Subject: [PATCH 16/32] 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/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
similarity index 91%
rename from 0021-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
rename to 0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
index d066099..9e37cf7 100644
--- a/0021-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 dbb535379a5d301954fd0363f4aa3cdccb2f6ea8 Mon Sep 17 00:00:00 2001
+From 67f0bcc28d7612546e254e6eb9074dbf1a124ef7 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/38] EPEL 5: sparsify: Fix command line options for old qemu-img.
+Subject: [PATCH 17/32] 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/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
similarity index 90%
rename from 0022-EPEL-5-Remove-Fedora-MD-test-images.patch
rename to 0018-EPEL-5-Remove-Fedora-MD-test-images.patch
index 3693dda..0385244 100644
--- a/0022-EPEL-5-Remove-Fedora-MD-test-images.patch
+++ b/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
@@ -1,7 +1,7 @@
-From 6fade02acfac987837c928ef47ab7d380764297e Mon Sep 17 00:00:00 2001
+From 2e47c852f0887a3d042a6052c2f8f72169cb2277 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/38] EPEL 5: Remove Fedora MD test images.
+Subject: [PATCH 18/32] 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/0019-EPEL-5-Add-mkisofs-to-package-list.patch
similarity index 82%
rename from 0023-EPEL-5-Add-mkisofs-to-package-list.patch
rename to 0019-EPEL-5-Add-mkisofs-to-package-list.patch
index ee5ce4e..c351324 100644
--- a/0023-EPEL-5-Add-mkisofs-to-package-list.patch
+++ b/0019-EPEL-5-Add-mkisofs-to-package-list.patch
@@ -1,7 +1,7 @@
-From 4c1329584c1ff6ca60133bfe7ad2ec172d57f6a0 Mon Sep 17 00:00:00 2001
+From b20759c481f057d80f8b4651b9801e63cfdd4a09 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/38] EPEL 5: Add mkisofs to package list.
+Subject: [PATCH 19/32] 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/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
similarity index 88%
rename from 0024-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
rename to 0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
index a469299..29189e3 100644
--- a/0024-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 01115314a3c12073e5e6d4e02970867527c66e86 Mon Sep 17 00:00:00 2001
+From bef780a2fa47e0752eca69751c7cb17e8e7bf5f2 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/38] EPEL 5: Add 1 second pause after unmounting any filesystem.
+Subject: [PATCH 20/32] 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/0021-EPEL-5-podwrapper-Remove-HTML-output.patch
similarity index 96%
rename from 0025-EPEL-5-podwrapper-Remove-HTML-output.patch
rename to 0021-EPEL-5-podwrapper-Remove-HTML-output.patch
index 8576fdc..ad5b22a 100644
--- a/0025-EPEL-5-podwrapper-Remove-HTML-output.patch
+++ b/0021-EPEL-5-podwrapper-Remove-HTML-output.patch
@@ -1,7 +1,7 @@
-From b770d0ba1ae9bdd44b7aa5ae1f934d8fb6dd9143 Mon Sep 17 00:00:00 2001
+From 9fcd3ae0199933e52bad4c83b487f9895d4766f3 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/38] EPEL 5: podwrapper: Remove HTML output.
+Subject: [PATCH 21/32] 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/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
similarity index 84%
rename from 0026-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
rename to 0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
index b5423e7..ac5dafb 100644
--- a/0026-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 350478ca7dae7a742d2b9154f8922bbc33a612a7 Mon Sep 17 00:00:00 2001
+From 4de1e2fc78d798c069ab6483b100dd4c0aeb62be 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/38] EPEL 5: podwrapper: Don't use Pod::Man.
+Subject: [PATCH 22/32] 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/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
similarity index 96%
rename from 0027-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
rename to 0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
index dd0f853..b634156 100644
--- a/0027-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
+++ b/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
@@ -1,7 +1,7 @@
-From 92682dfc73b9a0c2e21d5d4311bfd350af496ad8 Mon Sep 17 00:00:00 2001
+From 8f02ef77a49d93c4f2163c5c32495de08bd77e86 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/38] EPEL 5: Revert "Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH"
+Subject: [PATCH 23/32] 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/0024-EPEL-5-Don-t-use-sgabios.patch
similarity index 82%
rename from 0028-EPEL-5-Don-t-use-sgabios.patch
rename to 0024-EPEL-5-Don-t-use-sgabios.patch
index 0b6b31c..3f16dd9 100644
--- a/0028-EPEL-5-Don-t-use-sgabios.patch
+++ b/0024-EPEL-5-Don-t-use-sgabios.patch
@@ -1,7 +1,7 @@
-From d4180d13c025f66f2b9b853b7a6277dfae52e2b9 Mon Sep 17 00:00:00 2001
+From 6935509b343f62f1e8f42455934a7c030498881d 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/38] EPEL 5: Don't use sgabios.
+Subject: [PATCH 24/32] EPEL 5: Don't use sgabios.
Old qemu doesn't support '-device' parameter.
---
@@ -9,10 +9,10 @@ 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 570f6cf..ee815aa 100644
+index 57a8bbc..ad9bb31 100644
--- a/src/launch-appliance.c
+++ b/src/launch-appliance.c
-@@ -428,17 +428,6 @@ launch_appliance (guestfs_h *g, const char *arg)
+@@ -414,17 +414,6 @@ launch_appliance (guestfs_h *g, const char *arg)
add_cmdline (g, "-serial");
add_cmdline (g, "stdio");
diff --git a/0029-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch b/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
similarity index 98%
rename from 0029-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
rename to 0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
index a0149e4..c1e713f 100644
--- a/0029-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 931e7f8f2bd62c12420f5603271aa260e1da94c5 Mon Sep 17 00:00:00 2001
+From 7685c27d85865a50fb96962a44e141a15459ed26 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/38] EPEL 5: Revert "daemon: Remove e2prog hack (only needed for RHEL 5)."
+Subject: [PATCH 25/32] 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/0026-EPEL-5-Disable-tar-xz-test.patch
similarity index 88%
rename from 0030-EPEL-5-Disable-tar-xz-test.patch
rename to 0026-EPEL-5-Disable-tar-xz-test.patch
index 8cc6129..c76abd5 100644
--- a/0030-EPEL-5-Disable-tar-xz-test.patch
+++ b/0026-EPEL-5-Disable-tar-xz-test.patch
@@ -1,7 +1,7 @@
-From e7e641033e38b9cb712568089005789721f06948 Mon Sep 17 00:00:00 2001
+From 70b6451ef7c69731b81678c953110b7a8b88ca03 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/38] EPEL 5: Disable tar --xz test.
+Subject: [PATCH 26/32] 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/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
similarity index 84%
rename from 0031-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
rename to 0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
index 4a6f79a..42236f8 100644
--- a/0031-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
+++ b/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
@@ -1,7 +1,7 @@
-From 4ff785222b20b02fa13e24580c70abbed6da7c84 Mon Sep 17 00:00:00 2001
+From 90afed5463f5fb56d2859ea6598738da80218d29 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/38] EPEL 5: Ignore sparsify error if qemu-img --help is killed by a signal.
+Subject: [PATCH 27/32] 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/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
similarity index 90%
rename from 0032-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
rename to 0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
index 0d3083b..334a005 100644
--- a/0032-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 303f99313de2d5b267c394e3929a68ba86bd76db Mon Sep 17 00:00:00 2001
+From bb109430630cbe399cbaff81fca231278b33a5d6 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/38] EPEL 5: Revert "daemon: remove call to obsolete udevsettle"
+Subject: [PATCH 28/32] 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/0029-EPEL-5-No-libtoolize-install-option.patch
similarity index 82%
rename from 0033-EPEL-5-No-libtoolize-install-option.patch
rename to 0029-EPEL-5-No-libtoolize-install-option.patch
index b7315b5..ccb0a10 100644
--- a/0033-EPEL-5-No-libtoolize-install-option.patch
+++ b/0029-EPEL-5-No-libtoolize-install-option.patch
@@ -1,7 +1,7 @@
-From 9ca1ff60f311f0d794f53f7f539a488b51a24707 Mon Sep 17 00:00:00 2001
+From f107d53382e0f9a21c142aebda192d8c5b1287a1 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/38] EPEL 5: No libtoolize --install option.
+Subject: [PATCH 29/32] EPEL 5: No libtoolize --install option.
---
bootstrap | 2 +-
diff --git a/0034-EPEL-5-Disable-valgrind.patch b/0030-EPEL-5-Disable-valgrind.patch
similarity index 81%
rename from 0034-EPEL-5-Disable-valgrind.patch
rename to 0030-EPEL-5-Disable-valgrind.patch
index bffb51f..c6ca062 100644
--- a/0034-EPEL-5-Disable-valgrind.patch
+++ b/0030-EPEL-5-Disable-valgrind.patch
@@ -1,7 +1,7 @@
-From b530e72996ee0d5b677221f5abe213b2489570d1 Mon Sep 17 00:00:00 2001
+From 45a9a3c329040da7c57fe0d252ec18fe2be01ff0 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/38] EPEL 5: Disable valgrind.
+Subject: [PATCH 30/32] EPEL 5: Disable valgrind.
Ancient automake didn't have AM_SUBST_NOTMAKE.
---
@@ -9,7 +9,7 @@ Ancient automake didn't have AM_SUBST_NOTMAKE.
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index d26b815..7978cad 100644
+index a6ad077..435d1b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -848,8 +848,8 @@ AS_IF([test "x$VALGRIND" != "xno"],[
diff --git a/0035-EPEL-5-Remove-Linux-capabilities.patch b/0031-EPEL-5-Remove-Linux-capabilities.patch
similarity index 87%
rename from 0035-EPEL-5-Remove-Linux-capabilities.patch
rename to 0031-EPEL-5-Remove-Linux-capabilities.patch
index 1380375..d7ade8f 100644
--- a/0035-EPEL-5-Remove-Linux-capabilities.patch
+++ b/0031-EPEL-5-Remove-Linux-capabilities.patch
@@ -1,7 +1,7 @@
-From 1290a348a79f104a4d00c2f8445db986e9ca467b Mon Sep 17 00:00:00 2001
+From 980f48fec16fcac31c895b206031b9615b45f081 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/38] EPEL 5: Remove Linux capabilities.
+Subject: [PATCH 31/32] EPEL 5: Remove Linux capabilities.
Linux file capabilities are not supported in RHEL 5, and the
cap_*_file functions don't exist in the libcap library (although
@@ -11,7 +11,7 @@ confusingly they are in the header file).
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 7978cad..0150d4e 100644
+index 435d1b5..2ca6736 100644
--- a/configure.ac
+++ b/configure.ac
@@ -731,14 +731,6 @@ AC_CHECK_LIB([acl],[acl_from_text],[
diff --git a/0036-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch b/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
similarity index 87%
rename from 0036-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
rename to 0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
index fc76200..0d94f1b 100644
--- a/0036-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 d4741296a204ff6f9cde938ba0bc9f370fa4b798 Mon Sep 17 00:00:00 2001
+From 8c2ebd5ba8e7d272eb6d91a8da1c0fa1bc5c4c40 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/38] EPEL 5: ruby: Use old rake/rdoctask and rake/gempackagetask.
+Subject: [PATCH 32/32] 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
@@ -11,7 +11,7 @@ ancient Ruby 1.8.5 in RHEL 5.
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
-index f832abd..76f00ec 100644
+index a74e191..fbf8ccc 100644
--- a/ruby/Rakefile.in
+++ b/ruby/Rakefile.in
@@ -20,21 +20,12 @@ require 'rake/clean'
diff --git a/libguestfs.spec b/libguestfs.spec
index 89e909e..684c9e7 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.3
-Release: 6%{?dist}
+Version: 1.20.4
+Release: 1%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -41,44 +41,38 @@ BuildRequires: autoconf, automake, libtool
# These patches come from the "oldlinux" branch upstream.
# https://github.com/libguestfs/libguestfs/commits/oldlinux
-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-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
-Patch0038: 0038-RHEL-5-tests-xml-Define-O_CLOEXEC-in-LD_PRELOAD-libr.patch
+Patch0001: 0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
+Patch0002: 0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
+Patch0003: 0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
+Patch0004: 0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
+Patch0005: 0005-EPEL-5-Remove-Erlang-bindings.patch
+Patch0006: 0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
+Patch0007: 0007-EPEL-5-Remove-PHP-bindings.patch
+Patch0008: 0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
+Patch0009: 0009-EPEL-5-Add-gnulib-utimensat-module.patch
+Patch0010: 0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
+Patch0011: 0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
+Patch0012: 0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
+Patch0013: 0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
+Patch0014: 0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
+Patch0015: 0015-EPEL-5-Disable-libvirt-attach-method.patch
+Patch0016: 0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
+Patch0017: 0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
+Patch0018: 0018-EPEL-5-Remove-Fedora-MD-test-images.patch
+Patch0019: 0019-EPEL-5-Add-mkisofs-to-package-list.patch
+Patch0020: 0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
+Patch0021: 0021-EPEL-5-podwrapper-Remove-HTML-output.patch
+Patch0022: 0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
+Patch0023: 0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
+Patch0024: 0024-EPEL-5-Don-t-use-sgabios.patch
+Patch0025: 0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
+Patch0026: 0026-EPEL-5-Disable-tar-xz-test.patch
+Patch0027: 0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
+Patch0028: 0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
+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
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
@@ -917,6 +911,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Mar 13 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.4-1
+- Rebase to upstream stable branch version 1.20.4.
+
* Mon Mar 11 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.3-6
- Fix various small bugs and tests.
- Remove Fedora RPM database files from the tarball.
More information about the scm-commits
mailing list