[libguestfs/f20] New stable branch version 1.24.2.
Richard W.M. Jones
rjones at fedoraproject.org
Sat Dec 7 15:27:36 UTC 2013
commit c6b17344667f5a1a6180ebadef336c549c9d6ca4
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sat Dec 7 11:08:42 2013 +0000
New stable branch version 1.24.2.
- Rebase patches.
...-Don-t-run-virt-resize-when-not-necessary.patch | 4 +-
...s-Upstream-btrfs-device-add-command-now-n.patch | 79 -
...e-xzcat-binary-configurable-and-use-AC_PA.patch | 6 +-
...-pxzcat-optionally-to-speed-up-xzcat-step.patch | 6 +-
...-Add-no-sync-option-to-avoid-sync-on-exit.patch | 10 +-
...er-Add-mkdir-option-to-create-directories.patch | 20 +-
0006-builder-Allow-upload-to-a-directory.patch | 63 +-
...-Add-write-option-to-write-a-literal-file.patch | 14 +-
...ument-how-to-boot-VMs-directly-in-qemu-or.patch | 4 +-
...end-the-output-to-the-console-as-well-as-.patch | 2 +-
...dd-a-section-on-performance-to-the-manual.patch | 6 +-
...dd-m-memsize-and-smp-command-line-options.patch | 10 +-
...low-multiple-source-paths-to-be-specified.patch | 14 +-
...Add-a-real-scanner-parser-for-index-files.patch | 24 +-
...-t-use-git-tree-libguestfs.git-to-refer-t.patch | 39 -
...4-builder-Fix-missing-files-in-EXTRA_DIST.patch | 10 +-
...-check-valgrind-so-it-does-something-in-t.patch | 41 -
...-website-Add-index-validation-test-script.patch | 6 +-
...ernal-implementation-of-parallel-xzcat-px.patch | 18 +-
...d-an-extra-Makefile.am-to-builder-website.patch | 141 --
...site-Add-validate.sh-test-script-to-EXTRA.patch | 8 +-
...ch => 0018-builder-Add-missing-dependency.patch | 6 +-
...er-Add-some-generated-files-to-CLEANFILES.patch | 6 +-
...-dependency-from-index-parse.h-to-index-v.patch | 6 +-
...lace-fedora-NN-shell-kickstart-with-a-sin.patch | 493 -----
...-dependencies-which-automake-doesn-t-gene.patch | 10 +-
...eplace-ubuntu-NN-.sh-with-a-single-script.patch | 2081 --------------------
...22-builder-Fail-if-bison-is-not-installed.patch | 4 +-
...eplace-debian-NN-.sh-with-a-single-script.patch | 1578 ---------------
...0023-builder-Fail-if-lex-is-not-installed.patch | 4 +-
...-Replace-centos-6.sh-with-a-single-script.patch | 343 ----
...x-centos-script-output-filename-was-wrong.patch | 28 -
...ow-upload-to-directory-when-target-is-a-s.patch | 27 -
...ow-tmp-or-Temp-to-be-symlinks-to-a-direct.patch | 31 -
...per-virt-install-is-not-a-libguestfs-page.patch | 31 -
...rify-architecture-section-of-the-document.patch | 40 -
...-utility-function-for-safely-reading-from.patch | 192 --
...modulo-bias-in-random-password-generation.patch | 120 --
libguestfs.spec | 47 +-
39 files changed, 122 insertions(+), 5450 deletions(-)
---
diff --git a/0001-builder-Don-t-run-virt-resize-when-not-necessary.patch b/0001-builder-Don-t-run-virt-resize-when-not-necessary.patch
index 883bd09..3174e6b 100644
--- a/0001-builder-Don-t-run-virt-resize-when-not-necessary.patch
+++ b/0001-builder-Don-t-run-virt-resize-when-not-necessary.patch
@@ -1,4 +1,4 @@
-From 1e5b73563918c762542d5251a2fc79ec609a4547 Mon Sep 17 00:00:00 2001
+From 0d7c35a684c9786b0467bef4272d19f5881574eb Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 22 Oct 2013 13:52:25 +0100
Subject: [PATCH] builder: Don't run virt-resize when not necessary.
@@ -16,7 +16,7 @@ the template directly to the output file.
1 file changed, 48 insertions(+), 17 deletions(-)
diff --git a/builder/builder.ml b/builder/builder.ml
-index 286fd7d..6750deb 100644
+index fa34743..edeacea 100644
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -232,7 +232,12 @@ let main () =
diff --git a/0002-builder-Make-xzcat-binary-configurable-and-use-AC_PA.patch b/0002-builder-Make-xzcat-binary-configurable-and-use-AC_PA.patch
index daf5ed0..c1b5452 100644
--- a/0002-builder-Make-xzcat-binary-configurable-and-use-AC_PA.patch
+++ b/0002-builder-Make-xzcat-binary-configurable-and-use-AC_PA.patch
@@ -1,4 +1,4 @@
-From 6c92d98723e72d3e47066c53ea9fae0e95e4e7b1 Mon Sep 17 00:00:00 2001
+From 77155f16291e3b18ad3ff4c0e8ca22c9d5aa4947 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 22 Oct 2013 14:09:20 +0100
Subject: [PATCH] builder: Make xzcat binary configurable and use AC_PATH_PROG.
@@ -11,7 +11,7 @@ Subject: [PATCH] builder: Make xzcat binary configurable and use AC_PATH_PROG.
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/builder/builder.ml b/builder/builder.ml
-index 6750deb..ae642d0 100644
+index edeacea..6251192 100644
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -323,13 +323,18 @@ let main () =
@@ -44,7 +44,7 @@ index 6750deb..ae642d0 100644
msg (f_"Uncompressing: %s") file_uri;
let r = Sys.command cmd in
diff --git a/configure.ac b/configure.ac
-index 8dc4e7f..b31abbc 100644
+index 5af0eae..c91314a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -698,6 +698,10 @@ if test "x$WRESTOOL" != "xno"; then
diff --git a/0003-builder-Use-pxzcat-optionally-to-speed-up-xzcat-step.patch b/0003-builder-Use-pxzcat-optionally-to-speed-up-xzcat-step.patch
index 771bcb3..11caed3 100644
--- a/0003-builder-Use-pxzcat-optionally-to-speed-up-xzcat-step.patch
+++ b/0003-builder-Use-pxzcat-optionally-to-speed-up-xzcat-step.patch
@@ -1,4 +1,4 @@
-From 6ae9a5c40b4c19869e4843317c8884977cdd16b3 Mon Sep 17 00:00:00 2001
+From b29a8f27a9684342d5562019050714c62d6695d4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 22 Oct 2013 14:22:46 +0100
Subject: [PATCH] builder: Use pxzcat (optionally) to speed up xzcat step.
@@ -26,7 +26,7 @@ index 676bb2f..cdf492e 100644
+--------------+-------------+---+-----------------------------------------+
| ocaml-gettext| | O | For localizing OCaml virt-* tools. |
diff --git a/builder/builder.ml b/builder/builder.ml
-index ae642d0..477fc3e 100644
+index 6251192..01fb042 100644
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -323,9 +323,11 @@ let main () =
@@ -44,7 +44,7 @@ index ae642d0..477fc3e 100644
if not do_resize then (
diff --git a/configure.ac b/configure.ac
-index b31abbc..00cb151 100644
+index c91314a..a5e8783 100644
--- a/configure.ac
+++ b/configure.ac
@@ -702,6 +702,9 @@ dnl Check for xzcat (required).
diff --git a/0004-builder-Add-no-sync-option-to-avoid-sync-on-exit.patch b/0004-builder-Add-no-sync-option-to-avoid-sync-on-exit.patch
index 827236d..9db54b3 100644
--- a/0004-builder-Add-no-sync-option-to-avoid-sync-on-exit.patch
+++ b/0004-builder-Add-no-sync-option-to-avoid-sync-on-exit.patch
@@ -1,4 +1,4 @@
-From 5cfe8a0e678468318d8af403c197367979ba62a0 Mon Sep 17 00:00:00 2001
+From fcd3c70379bb87776d42eac25776e30c9d61f8d8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 22 Oct 2013 22:28:27 +0100
Subject: [PATCH] builder: Add --no-sync option to avoid sync on exit.
@@ -11,7 +11,7 @@ Subject: [PATCH] builder: Add --no-sync option to avoid sync on exit.
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/builder/builder.ml b/builder/builder.ml
-index 477fc3e..7a46174 100644
+index 01fb042..ed83554 100644
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -38,7 +38,7 @@ let main () =
@@ -23,7 +23,7 @@ index 477fc3e..7a46174 100644
parse_cmdline () in
(* Timestamped messages in ordinary, non-debug non-quiet mode. *)
-@@ -727,7 +727,8 @@ exec >>%s 2>&1
+@@ -735,7 +735,8 @@ exec >>%s 2>&1
* and therefore bypasses the host cache). In general you should not
* use cache=none.
*)
@@ -34,7 +34,7 @@ index 477fc3e..7a46174 100644
(* Now that we've finished the build, don't delete the output file on
* exit.
diff --git a/builder/cmdline.ml b/builder/cmdline.ml
-index 780e171..41d2a64 100644
+index b1fb003..43909cc 100644
--- a/builder/cmdline.ml
+++ b/builder/cmdline.ml
@@ -161,6 +161,8 @@ let parse_cmdline () =
@@ -69,7 +69,7 @@ index 780e171..41d2a64 100644
- upload
+ sync, upload
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
-index 094b327..c3ea581 100644
+index 5de1e51..aa543bb 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -410,6 +410,23 @@ You don't have a host network (eg. in secure/restricted environments).
diff --git a/0005-builder-Add-mkdir-option-to-create-directories.patch b/0005-builder-Add-mkdir-option-to-create-directories.patch
index 690d672..e3ba749 100644
--- a/0005-builder-Add-mkdir-option-to-create-directories.patch
+++ b/0005-builder-Add-mkdir-option-to-create-directories.patch
@@ -1,4 +1,4 @@
-From f29f1c655df5fe7beee82ae663ede60440d28d06 Mon Sep 17 00:00:00 2001
+From 47a44bec0a20a32ec470fdc9da92be04b4253286 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Fri, 25 Oct 2013 13:35:51 +0100
Subject: [PATCH] builder: Add --mkdir option to create directories.
@@ -12,7 +12,7 @@ Subject: [PATCH] builder: Add --mkdir option to create directories.
4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/builder/builder.ml b/builder/builder.ml
-index 7a46174..f4f0951 100644
+index ed83554..0c8f3b1 100644
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -36,9 +36,9 @@ let main () =
@@ -28,7 +28,7 @@ index 7a46174..f4f0951 100644
parse_cmdline () in
(* Timestamped messages in ordinary, non-debug non-quiet mode. *)
-@@ -582,6 +582,13 @@ exec >>%s 2>&1
+@@ -575,6 +575,13 @@ exec >>%s 2>&1
do_run ~display:cmd cmd
);
@@ -43,7 +43,7 @@ index 7a46174..f4f0951 100644
List.iter (
fun (file, dest) ->
diff --git a/builder/cmdline.ml b/builder/cmdline.ml
-index 41d2a64..dbf49f2 100644
+index 43909cc..36c63a2 100644
--- a/builder/cmdline.ml
+++ b/builder/cmdline.ml
@@ -119,6 +119,10 @@ let parse_cmdline () =
@@ -84,23 +84,23 @@ index 41d2a64..dbf49f2 100644
+ network, output, password_crypto, quiet, root_password, scrub,
+ scrub_logfile, size, source, sync, upload
diff --git a/builder/test-virt-builder.sh b/builder/test-virt-builder.sh
-index fbc52a0..a5df027 100755
+index cec76fa..93fed4e 100755
--- a/builder/test-virt-builder.sh
+++ b/builder/test-virt-builder.sh
-@@ -54,6 +54,7 @@ rm -f $output
+@@ -54,6 +54,7 @@ $VG ./virt-builder phony-fedora \
-o $output --size 2G --format $format \
--hostname test.example.com \
--root-password password:123456 \
+ --mkdir /etc/foo/bar/baz \
--upload Makefile:/Makefile \
+ --upload Makefile:/etc \
--delete /Makefile \
- --firstboot Makefile --firstboot-command 'echo "hello"' \
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
-index c3ea581..42d0d8a 100644
+index aa543bb..55dba90 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -18,6 +18,7 @@ virt-builder - Build virtual machine images quickly
- [--root-password ...]
+ [--root-password SELECTOR]
[--hostname HOSTNAME]
[--install PKG,[PKG...]]
+ [--mkdir DIR]
@@ -121,7 +121,7 @@ index c3ea581..42d0d8a 100644
=item B<--network>
=item B<--no-network>
-@@ -749,6 +757,10 @@ Packages are installed (I<--install>).
+@@ -756,6 +764,10 @@ Packages are installed (I<--install>).
=item *
diff --git a/0006-builder-Allow-upload-to-a-directory.patch b/0006-builder-Allow-upload-to-a-directory.patch
index fd50106..2bb8e93 100644
--- a/0006-builder-Allow-upload-to-a-directory.patch
+++ b/0006-builder-Allow-upload-to-a-directory.patch
@@ -1,4 +1,4 @@
-From ddf6681c75d3ca2a6e94a051a3d3650ac9f79d97 Mon Sep 17 00:00:00 2001
+From 01d6db9a46d45c327f30d611d2721b2283702eba Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Sat, 26 Oct 2013 11:27:06 +0100
Subject: [PATCH] builder: Allow --upload to a directory.
@@ -7,73 +7,22 @@ Also set the owner and permissions on the destination file correctly.
(cherry picked from commit 10c849ed1cb4375c5ef811197fa0a3206d365b86)
---
- builder/builder.ml | 19 +++++++++++++++++--
- builder/test-virt-builder.sh | 1 +
- builder/virt-builder.pod | 9 ++++++++-
- 3 files changed, 26 insertions(+), 3 deletions(-)
+ builder/test-virt-builder.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/builder/builder.ml b/builder/builder.ml
-index f4f0951..dab8b41 100644
---- a/builder/builder.ml
-+++ b/builder/builder.ml
-@@ -592,8 +592,23 @@ exec >>%s 2>&1
- (* Upload files. *)
- List.iter (
- fun (file, dest) ->
-- msg (f_"Uploading: %s") dest;
-- g#upload file dest
-+ msg (f_"Uploading: %s to %s") file dest;
-+ let dest =
-+ if g#is_dir dest then
-+ dest ^ "/" ^ Filename.basename file
-+ else
-+ dest in
-+ (* Do the file upload. *)
-+ g#upload file dest;
-+
-+ (* Copy (some of) the permissions from the local file to the
-+ * uploaded file.
-+ *)
-+ let statbuf = stat file in
-+ let perms = statbuf.st_perm land 0o7777 (* sticky & set*id *) in
-+ g#chmod perms dest;
-+ let uid, gid = statbuf.st_uid, statbuf.st_gid in
-+ g#chown uid gid dest
- ) upload;
-
- (* Edit files. *)
diff --git a/builder/test-virt-builder.sh b/builder/test-virt-builder.sh
-index a5df027..b39bc3f 100755
+index 93fed4e..c69774c 100755
--- a/builder/test-virt-builder.sh
+++ b/builder/test-virt-builder.sh
-@@ -56,6 +56,7 @@ rm -f $output
+@@ -56,7 +56,7 @@ $VG ./virt-builder phony-fedora \
--root-password password:123456 \
--mkdir /etc/foo/bar/baz \
--upload Makefile:/Makefile \
+- --upload Makefile:/etc \
+ --upload Makefile:/etc/foo/bar/baz \
--delete /Makefile \
--firstboot Makefile --firstboot-command 'echo "hello"' \
--firstboot-install "minicom,inkscape"
-diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
-index 42d0d8a..810cee7 100644
---- a/builder/virt-builder.pod
-+++ b/builder/virt-builder.pod
-@@ -559,7 +559,14 @@ Upload local file C<FILE> to destination C<DEST> in the disk image.
- File owner and permissions from the original are preserved, so you
- should set them to what you want them to be in the disk image.
-
--See also: I<--delete>, I<--scrub>.
-+C<DEST> could be the final filename. This can be used to rename
-+the file on upload.
-+
-+If C<DEST> is a directory name (which must already exist in the guest)
-+then the file is uploaded into that directory, and it keeps the same
-+name as on the local filesystem.
-+
-+See also: I<--mkdir>, I<--delete>, I<--scrub>.
-
- =item B<-v>
-
--
1.8.3.1
diff --git a/0007-builder-Add-write-option-to-write-a-literal-file.patch b/0007-builder-Add-write-option-to-write-a-literal-file.patch
index 0859ad0..1ae0c89 100644
--- a/0007-builder-Add-write-option-to-write-a-literal-file.patch
+++ b/0007-builder-Add-write-option-to-write-a-literal-file.patch
@@ -1,4 +1,4 @@
-From 3c0dacb066a7aff4b55747862898e418f31dce9c Mon Sep 17 00:00:00 2001
+From 82ddc2d25e1bffbb5932492f25f45ada2aaeb67a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Sat, 26 Oct 2013 11:40:48 +0100
Subject: [PATCH] builder: Add --write option to write a literal file.
@@ -12,7 +12,7 @@ Subject: [PATCH] builder: Add --write option to write a literal file.
4 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/builder/builder.ml b/builder/builder.ml
-index dab8b41..803de0c 100644
+index 0c8f3b1..c765610 100644
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -38,7 +38,7 @@ let main () =
@@ -24,7 +24,7 @@ index dab8b41..803de0c 100644
parse_cmdline () in
(* Timestamped messages in ordinary, non-debug non-quiet mode. *)
-@@ -589,6 +589,13 @@ exec >>%s 2>&1
+@@ -582,6 +582,13 @@ exec >>%s 2>&1
g#mkdir_p dir
) mkdirs;
@@ -39,7 +39,7 @@ index dab8b41..803de0c 100644
List.iter (
fun (file, dest) ->
diff --git a/builder/cmdline.ml b/builder/cmdline.ml
-index dbf49f2..d92fcb9 100644
+index 36c63a2..6611fad 100644
--- a/builder/cmdline.ml
+++ b/builder/cmdline.ml
@@ -184,6 +184,19 @@ let parse_cmdline () =
@@ -85,10 +85,10 @@ index dbf49f2..d92fcb9 100644
- scrub_logfile, size, source, sync, upload
+ scrub_logfile, size, source, sync, upload, writes
diff --git a/builder/test-virt-builder.sh b/builder/test-virt-builder.sh
-index b39bc3f..159f013 100755
+index c69774c..6296d16 100755
--- a/builder/test-virt-builder.sh
+++ b/builder/test-virt-builder.sh
-@@ -55,6 +55,7 @@ rm -f $output
+@@ -55,6 +55,7 @@ $VG ./virt-builder phony-fedora \
--hostname test.example.com \
--root-password password:123456 \
--mkdir /etc/foo/bar/baz \
@@ -97,7 +97,7 @@ index b39bc3f..159f013 100755
--upload Makefile:/etc/foo/bar/baz \
--delete /Makefile \
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
-index 810cee7..13d342d 100644
+index 55dba90..f795e7a 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -19,6 +19,7 @@ virt-builder - Build virtual machine images quickly
diff --git a/0008-builder-Document-how-to-boot-VMs-directly-in-qemu-or.patch b/0008-builder-Document-how-to-boot-VMs-directly-in-qemu-or.patch
index fd3d322..086e6bc 100644
--- a/0008-builder-Document-how-to-boot-VMs-directly-in-qemu-or.patch
+++ b/0008-builder-Document-how-to-boot-VMs-directly-in-qemu-or.patch
@@ -1,4 +1,4 @@
-From a80de72193e4a3fc379628b56035748436e2bcca Mon Sep 17 00:00:00 2001
+From f9d8a69ee0d853cffac2f7d628b928de9570876a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Sat, 26 Oct 2013 14:45:30 +0100
Subject: [PATCH] builder: Document how to boot VMs directly in qemu or KVM.
@@ -9,7 +9,7 @@ Subject: [PATCH] builder: Document how to boot VMs directly in qemu or KVM.
1 file changed, 15 insertions(+)
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
-index 13d342d..770d359 100644
+index f795e7a..7768366 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -841,6 +841,21 @@ XXX
diff --git a/0009-firstboot-Send-the-output-to-the-console-as-well-as-.patch b/0009-firstboot-Send-the-output-to-the-console-as-well-as-.patch
index d8aad17..290ac52 100644
--- a/0009-firstboot-Send-the-output-to-the-console-as-well-as-.patch
+++ b/0009-firstboot-Send-the-output-to-the-console-as-well-as-.patch
@@ -1,4 +1,4 @@
-From 044198313cda55e0f002d44459c7a09c3b3afdc5 Mon Sep 17 00:00:00 2001
+From 61749ab267f66f304a5bc27138a49c8db016bdaf Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Sat, 26 Oct 2013 17:09:06 +0100
Subject: [PATCH] firstboot: Send the output to the console as well as to the
diff --git a/0010-builder-Add-a-section-on-performance-to-the-manual.patch b/0010-builder-Add-a-section-on-performance-to-the-manual.patch
index bc581c2..e2a1cb3 100644
--- a/0010-builder-Add-a-section-on-performance-to-the-manual.patch
+++ b/0010-builder-Add-a-section-on-performance-to-the-manual.patch
@@ -1,4 +1,4 @@
-From bf28209da7771951de0f113a5b9175fd75e27439 Mon Sep 17 00:00:00 2001
+From 230def3aec1e56c09fef3f75ce9545322f4268ae Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Sun, 27 Oct 2013 14:59:39 +0000
Subject: [PATCH] builder: Add a section on performance to the manual.
@@ -9,10 +9,10 @@ Subject: [PATCH] builder: Add a section on performance to the manual.
1 file changed, 44 insertions(+), 1 deletion(-)
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
-index 770d359..442bbec 100644
+index 7768366..a603fcf 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
-@@ -1290,7 +1290,50 @@ etc are truly random when the guest boots.
+@@ -1288,7 +1288,50 @@ etc are truly random when the guest boots.
You should check digital signatures and not ignore any signing errors.
diff --git a/0011-builder-Add-m-memsize-and-smp-command-line-options.patch b/0011-builder-Add-m-memsize-and-smp-command-line-options.patch
index 4d3ec5a..78c7058 100644
--- a/0011-builder-Add-m-memsize-and-smp-command-line-options.patch
+++ b/0011-builder-Add-m-memsize-and-smp-command-line-options.patch
@@ -1,4 +1,4 @@
-From 8a98e37fde47ad310e8cee3c041f401d8d9739a8 Mon Sep 17 00:00:00 2001
+From 0c82e27a75028553f6a549b548dd57b9e061bf6c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 29 Oct 2013 19:23:33 +0000
Subject: [PATCH] builder: Add -m/--memsize and --smp command line options.
@@ -11,7 +11,7 @@ Subject: [PATCH] builder: Add -m/--memsize and --smp command line options.
3 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/builder/builder.ml b/builder/builder.ml
-index 803de0c..c9fd291 100644
+index c765610..8c8e2d4 100644
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -36,9 +36,9 @@ let main () =
@@ -36,7 +36,7 @@ index 803de0c..c9fd291 100644
(* The output disk is being created, so use cache=unsafe here. *)
diff --git a/builder/cmdline.ml b/builder/cmdline.ml
-index d92fcb9..f8e604e 100644
+index 6611fad..aaeb763 100644
--- a/builder/cmdline.ml
+++ b/builder/cmdline.ml
@@ -120,6 +120,9 @@ let parse_cmdline () =
@@ -102,7 +102,7 @@ index d92fcb9..f8e604e 100644
- scrub_logfile, size, source, sync, upload, writes
+ scrub_logfile, size, smp, source, sync, upload, writes
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
-index 442bbec..70e19c3 100644
+index a603fcf..3905880 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -366,6 +366,18 @@ the image was built, use this option.
@@ -135,7 +135,7 @@ index 442bbec..70e19c3 100644
=item B<--source> URL
Set the source URL to look for templates. If not specified it
-@@ -1368,12 +1384,6 @@ are actually interpreted by L<curl(1)>, not virt-builder.
+@@ -1366,12 +1382,6 @@ are actually interpreted by L<curl(1)>, not virt-builder.
Used to determine the location of the template cache. See L</CACHING>.
diff --git a/0012-builder-Allow-multiple-source-paths-to-be-specified.patch b/0012-builder-Allow-multiple-source-paths-to-be-specified.patch
index be5152c..d8de2f9 100644
--- a/0012-builder-Allow-multiple-source-paths-to-be-specified.patch
+++ b/0012-builder-Allow-multiple-source-paths-to-be-specified.patch
@@ -1,4 +1,4 @@
-From 2c081f7d45a250220860a3a21938a3f2d7d39a9b Mon Sep 17 00:00:00 2001
+From 2583c9e669e69eb799c16b9d72241297ec6744d4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Fri, 1 Nov 2013 14:16:34 +0000
Subject: [PATCH] builder: Allow multiple source paths to be specified.
@@ -27,7 +27,7 @@ There is still only one built-in path, but we can add more later.
10 files changed, 143 insertions(+), 46 deletions(-)
diff --git a/builder/builder.ml b/builder/builder.ml
-index c9fd291..fc6078c 100644
+index 8c8e2d4..6a4ef70 100644
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -35,22 +35,27 @@ let prog = Filename.basename Sys.executable_name
@@ -102,7 +102,7 @@ index c9fd291..fc6078c 100644
(match mode with
| `Notes -> (* --notes *)
diff --git a/builder/cmdline.ml b/builder/cmdline.ml
-index f8e604e..5256390 100644
+index aaeb763..632b227 100644
--- a/builder/cmdline.ml
+++ b/builder/cmdline.ml
@@ -37,6 +37,8 @@ let default_cachedir =
@@ -342,7 +342,7 @@ index 4d89129..cdd800e 100644
val verify : t -> string -> unit
(** Verify the file is signed (if check_signature is true). *)
diff --git a/builder/test-virt-builder-list.sh b/builder/test-virt-builder-list.sh
-index 01e4d1b..823f774 100755
+index 134ca7c..256d993 100755
--- a/builder/test-virt-builder-list.sh
+++ b/builder/test-virt-builder-list.sh
@@ -39,6 +39,7 @@ fi
@@ -354,7 +354,7 @@ index 01e4d1b..823f774 100755
os-version: phony-debian
Full name: Phony Debian
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
-index 70e19c3..4e33bc8 100644
+index 3905880..fb99d7c 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -264,10 +264,14 @@ Check that the index and templates are signed by the key with the
@@ -390,7 +390,7 @@ index 70e19c3..4e33bc8 100644
See also L</CREATING YOUR OWN TEMPLATES> below.
-@@ -1202,6 +1209,36 @@ Now run virt-builder commands as normal, eg:
+@@ -1201,6 +1208,36 @@ Now run virt-builder commands as normal, eg:
To debug problems, add the C<-v> option to these commands.
@@ -427,7 +427,7 @@ index 70e19c3..4e33bc8 100644
=head3 Licensing of templates
You should be aware of the licensing of images that you distribute.
-@@ -1386,13 +1423,13 @@ Used to determine the location of the template cache. See L</CACHING>.
+@@ -1384,13 +1421,13 @@ Used to determine the location of the template cache. See L</CACHING>.
=item C<VIRT_BUILDER_FINGERPRINT>
diff --git a/0014-builder-Add-a-real-scanner-parser-for-index-files.patch b/0013-builder-Add-a-real-scanner-parser-for-index-files.patch
similarity index 98%
rename from 0014-builder-Add-a-real-scanner-parser-for-index-files.patch
rename to 0013-builder-Add-a-real-scanner-parser-for-index-files.patch
index 74852a7..ebcf9f1 100644
--- a/0014-builder-Add-a-real-scanner-parser-for-index-files.patch
+++ b/0013-builder-Add-a-real-scanner-parser-for-index-files.patch
@@ -1,4 +1,4 @@
-From 4785b527ce69d0aa1c7983f81a70f30d9837ee88 Mon Sep 17 00:00:00 2001
+From b85acab733df612e43efc8070df4d9959bf8d6ed Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Mon, 4 Nov 2013 14:53:41 +0000
Subject: [PATCH] builder: Add a real scanner/parser for index files.
@@ -36,7 +36,7 @@ This adds a tool called virt-index-validate to validate index files.
create mode 100644 builder/virt-index-validate.pod
diff --git a/.gitignore b/.gitignore
-index 8a1ffef..e2ea9ce 100644
+index 8c5fbe7..43f9f40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,10 +58,16 @@ Makefile.in
@@ -80,7 +80,7 @@ index cdf492e..461915d 100644
+--------------+-------------+---+-----------------------------------------+
| genisoimage | | R | mkisofs may work. |
diff --git a/builder/Makefile.am b/builder/Makefile.am
-index b995c90..cb490e1 100644
+index e3878dc..2a1e448 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -17,6 +17,12 @@
@@ -96,7 +96,7 @@ index b995c90..cb490e1 100644
EXTRA_DIST = \
$(SOURCES) \
virt-builder.pod \
-@@ -71,6 +77,9 @@ SOURCES = \
+@@ -42,6 +48,9 @@ SOURCES = \
sigchecker.mli \
sigchecker.ml
@@ -106,7 +106,7 @@ index b995c90..cb490e1 100644
if HAVE_OCAML
# Note this list must be in dependency order.
-@@ -87,6 +96,10 @@ OBJECTS = \
+@@ -59,6 +68,10 @@ OBJECTS = \
$(top_builddir)/mllib/fsync.cmx \
$(top_builddir)/mllib/password.cmx \
$(top_builddir)/mllib/config.cmx \
@@ -117,7 +117,7 @@ index b995c90..cb490e1 100644
get_kernel.cmx \
downloader.cmx \
sigchecker.cmx \
-@@ -127,24 +140,10 @@ virt-builder: $(OBJECTS)
+@@ -99,24 +112,10 @@ virt-builder: $(OBJECTS)
.ml.cmx:
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -c $< -o $@
@@ -144,7 +144,7 @@ index b995c90..cb490e1 100644
virt-builder.1 $(top_builddir)/html/virt-builder.1.html: stamp-virt-builder.pod
-@@ -200,3 +199,28 @@ endif
+@@ -172,3 +171,28 @@ endif
DISTCLEANFILES = .depend
.PHONY: depend docs
@@ -996,7 +996,7 @@ index 04a65ca..8c24fe2 100644
printf "\n"
)
diff --git a/builder/test-virt-builder-list.sh b/builder/test-virt-builder-list.sh
-index 823f774..0a7c0d4 100755
+index 256d993..11305a9 100755
--- a/builder/test-virt-builder-list.sh
+++ b/builder/test-virt-builder-list.sh
@@ -46,28 +46,32 @@ Full name: Phony Debian
@@ -1037,7 +1037,7 @@ index 823f774..0a7c0d4 100755
echo "$long_list"
exit 1
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
-index 5eba666..6497c0a 100644
+index fb99d7c..b9fd69c 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -1245,6 +1245,23 @@ For open source guests, provide a link to the source code in the
@@ -1163,7 +1163,7 @@ index 0000000..6b03703
+
+Copyright (C) 2013 Red Hat Inc.
diff --git a/configure.ac b/configure.ac
-index 00cb151..30040e0 100644
+index a5e8783..9d551af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -705,6 +705,10 @@ test "x$XZCAT" = "xno" && AC_MSG_ERROR([xzcat must be installed])
@@ -1178,7 +1178,7 @@ index 00cb151..30040e0 100644
dnl back to basic 'qemu'. Allow the user to override it.
qemu_system="$(
diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am
-index b053be0..f74ee42 100644
+index 75d47a8..da1bcc3 100644
--- a/po-docs/ja/Makefile.am
+++ b/po-docs/ja/Makefile.am
@@ -60,6 +60,7 @@ MANPAGES = \
@@ -1202,7 +1202,7 @@ index 5ff9447..dd2898c 100644
../cat/virt-filesystems.pod
../cat/virt-ls.pod
diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am
-index b053be0..f74ee42 100644
+index 75d47a8..da1bcc3 100644
--- a/po-docs/uk/Makefile.am
+++ b/po-docs/uk/Makefile.am
@@ -60,6 +60,7 @@ MANPAGES = \
diff --git a/0016-builder-Fix-missing-files-in-EXTRA_DIST.patch b/0014-builder-Fix-missing-files-in-EXTRA_DIST.patch
similarity index 80%
rename from 0016-builder-Fix-missing-files-in-EXTRA_DIST.patch
rename to 0014-builder-Fix-missing-files-in-EXTRA_DIST.patch
index 88cf641..f4df3af 100644
--- a/0016-builder-Fix-missing-files-in-EXTRA_DIST.patch
+++ b/0014-builder-Fix-missing-files-in-EXTRA_DIST.patch
@@ -1,4 +1,4 @@
-From 736e8d289efb5a1e749dc9961fcc4fd519fa8b4c Mon Sep 17 00:00:00 2001
+From 83d58ef9bdb030fe011b92fcf99575ac5e303f11 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 5 Nov 2013 07:15:19 +0000
Subject: [PATCH] builder: Fix missing files in EXTRA_DIST.
@@ -11,7 +11,7 @@ This fixes commit a4800e2d4fc50f372a8b626333c4fbb9b8ca9633.
1 file changed, 2 insertions(+)
diff --git a/builder/Makefile.am b/builder/Makefile.am
-index cb490e1..9dbe51e 100644
+index 2a1e448..0af3f95 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -26,6 +26,7 @@ AM_CFLAGS = \
@@ -20,9 +20,9 @@ index cb490e1..9dbe51e 100644
virt-builder.pod \
+ virt-index-validate.pod \
test-virt-builder.sh \
- test-virt-builder-list.sh \
- website/.gitignore \
-@@ -70,6 +71,7 @@ SOURCES = \
+ test-virt-builder-list.sh
+
+@@ -41,6 +42,7 @@ SOURCES = \
get_kernel.ml \
index_parser.mli \
index_parser.ml \
diff --git a/0018-builder-website-Add-index-validation-test-script.patch b/0015-builder-website-Add-index-validation-test-script.patch
similarity index 93%
rename from 0018-builder-website-Add-index-validation-test-script.patch
rename to 0015-builder-website-Add-index-validation-test-script.patch
index 8647d1b..6db5abf 100644
--- a/0018-builder-website-Add-index-validation-test-script.patch
+++ b/0015-builder-website-Add-index-validation-test-script.patch
@@ -1,4 +1,4 @@
-From 919c22ead98cce4368425259f882ba7ed47c98fa Mon Sep 17 00:00:00 2001
+From 94271fa21ac01b583257f2cdff5ba3d9520d206a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 5 Nov 2013 07:25:46 +0000
Subject: [PATCH] builder/website: Add index validation test script.
@@ -11,10 +11,10 @@ Subject: [PATCH] builder/website: Add index validation test script.
create mode 100755 builder/website/validate.sh
diff --git a/builder/website/Makefile.am b/builder/website/Makefile.am
-index ba74485..2a3bbe6 100644
+index 4567dd9..b45d98a 100644
--- a/builder/website/Makefile.am
+++ b/builder/website/Makefile.am
-@@ -49,3 +49,7 @@ EXTRA_DIST = \
+@@ -43,3 +43,7 @@ EXTRA_DIST = \
ubuntu-13.10.xz.sig
CLEANFILES = *~
diff --git a/0019-builder-Internal-implementation-of-parallel-xzcat-px.patch b/0016-builder-Internal-implementation-of-parallel-xzcat-px.patch
similarity index 98%
rename from 0019-builder-Internal-implementation-of-parallel-xzcat-px.patch
rename to 0016-builder-Internal-implementation-of-parallel-xzcat-px.patch
index 35fbc48..e55b54e 100644
--- a/0019-builder-Internal-implementation-of-parallel-xzcat-px.patch
+++ b/0016-builder-Internal-implementation-of-parallel-xzcat-px.patch
@@ -1,4 +1,4 @@
-From e20aea882e564c537b7ce8f7db6c618e5b4ffaee Mon Sep 17 00:00:00 2001
+From 27041ccc22eed8fb94a0b389c1b186234174d396 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 5 Nov 2013 10:21:32 +0000
Subject: [PATCH] builder: Internal implementation of parallel xzcat (pxzcat).
@@ -42,7 +42,7 @@ index 461915d..baf4de4 100644
+--------------+-------------+---+-----------------------------------------+
| findlib | | O | For the OCaml bindings. |
diff --git a/builder/Makefile.am b/builder/Makefile.am
-index c3719d1..2027203 100644
+index 0af3f95..9430d62 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -21,7 +21,9 @@ AM_YFLAGS = -d
@@ -66,7 +66,7 @@ index c3719d1..2027203 100644
sigchecker.mli \
sigchecker.ml
-@@ -73,6 +78,8 @@ OBJECTS = \
+@@ -74,6 +79,8 @@ OBJECTS = \
index-struct.o \
index-parse.o \
index-parser-c.o \
@@ -75,7 +75,7 @@ index c3719d1..2027203 100644
get_kernel.cmx \
downloader.cmx \
sigchecker.cmx \
-@@ -102,7 +109,7 @@ OCAMLOPTFLAGS = $(OCAMLCFLAGS)
+@@ -103,7 +110,7 @@ OCAMLOPTFLAGS = $(OCAMLCFLAGS)
virt-builder: $(OBJECTS)
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
mlguestfs.cmxa -linkpkg $^ \
@@ -85,7 +85,7 @@ index c3719d1..2027203 100644
-o $@
diff --git a/builder/builder.ml b/builder/builder.ml
-index fc6078c..a5a4dfe 100644
+index 6a4ef70..4f000fd 100644
--- a/builder/builder.ml
+++ b/builder/builder.ml
@@ -24,6 +24,7 @@ open Common_utils
@@ -860,10 +860,10 @@ index 0000000..a2830f0
+ implementation of parallel xzcat. Otherwise regular xzcat is
+ used. *)
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
-index 6497c0a..bad59c1 100644
+index b9fd69c..19dc3ea 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
-@@ -1397,10 +1397,9 @@ the output format is the same as the template format (usually raw).
+@@ -1396,10 +1396,9 @@ the output format is the same as the template format (usually raw).
=head3 pxzcat
@@ -878,7 +878,7 @@ index 6497c0a..bad59c1 100644
=head3 User-Mode Linux
diff --git a/configure.ac b/configure.ac
-index d797187..7a18b8e 100644
+index 9d551af..bd3078f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -701,9 +701,15 @@ fi
@@ -926,7 +926,7 @@ index aa52b75..4bf805f 100644
cat/filesystems.c
cat/ls.c
diff --git a/po/POTFILES-ml b/po/POTFILES-ml
-index 185f87b..39ca2a0 100644
+index 2ca1042..efeb75d 100644
--- a/po/POTFILES-ml
+++ b/po/POTFILES-ml
@@ -5,6 +5,7 @@ builder/get_kernel.ml
diff --git a/0024-builder-website-Add-validate.sh-test-script-to-EXTRA.patch b/0017-builder-website-Add-validate.sh-test-script-to-EXTRA.patch
similarity index 78%
rename from 0024-builder-website-Add-validate.sh-test-script-to-EXTRA.patch
rename to 0017-builder-website-Add-validate.sh-test-script-to-EXTRA.patch
index 5f0404c..bff5583 100644
--- a/0024-builder-website-Add-validate.sh-test-script-to-EXTRA.patch
+++ b/0017-builder-website-Add-validate.sh-test-script-to-EXTRA.patch
@@ -1,4 +1,4 @@
-From 6f548264f40339e829c3bb2023f3352b4e69b490 Mon Sep 17 00:00:00 2001
+From 0c9b6f8109dec616b5c03c56391cf6e2795da726 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 5 Nov 2013 15:15:17 +0000
Subject: [PATCH] builder/website: Add validate.sh test script to EXTRA_DIST.
@@ -11,12 +11,12 @@ This fixes commit 154bfb7dd46e7998eed1d40ead95923590763739.
1 file changed, 1 insertion(+)
diff --git a/builder/website/Makefile.am b/builder/website/Makefile.am
-index cdf263a..ec1ca65 100644
+index b45d98a..680fd54 100644
--- a/builder/website/Makefile.am
+++ b/builder/website/Makefile.am
-@@ -20,6 +20,7 @@ include $(top_srcdir)/subdir-rules.mk
- EXTRA_DIST = \
+@@ -21,6 +21,7 @@ EXTRA_DIST = \
.gitignore \
+ compress.sh \
test-guest.sh \
+ validate.sh \
README \
diff --git a/0025-builder-Add-missing-dependency.patch b/0018-builder-Add-missing-dependency.patch
similarity index 85%
rename from 0025-builder-Add-missing-dependency.patch
rename to 0018-builder-Add-missing-dependency.patch
index edd4420..c71d9b9 100644
--- a/0025-builder-Add-missing-dependency.patch
+++ b/0018-builder-Add-missing-dependency.patch
@@ -1,4 +1,4 @@
-From 7ae728b1a5db0290ca2ed488ae3e67c968d2f477 Mon Sep 17 00:00:00 2001
+From ffd1610a3d2a32905532d149faa335915a229cd1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 5 Nov 2013 15:42:05 +0000
Subject: [PATCH] builder: Add missing dependency.
@@ -16,10 +16,10 @@ This fixes commit a4800e2d4fc50f372a8b626333c4fbb9b8ca9633.
1 file changed, 2 insertions(+)
diff --git a/builder/Makefile.am b/builder/Makefile.am
-index 2027203..a44f820 100644
+index 9430d62..606ecc4 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
-@@ -120,6 +120,8 @@ virt-builder: $(OBJECTS)
+@@ -121,6 +121,8 @@ virt-builder: $(OBJECTS)
.ml.cmx:
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -c $< -o $@
diff --git a/0026-builder-Add-some-generated-files-to-CLEANFILES.patch b/0019-builder-Add-some-generated-files-to-CLEANFILES.patch
similarity index 80%
rename from 0026-builder-Add-some-generated-files-to-CLEANFILES.patch
rename to 0019-builder-Add-some-generated-files-to-CLEANFILES.patch
index 956efff..083ab9e 100644
--- a/0026-builder-Add-some-generated-files-to-CLEANFILES.patch
+++ b/0019-builder-Add-some-generated-files-to-CLEANFILES.patch
@@ -1,4 +1,4 @@
-From 88ffe2a4e415e7502f6749938a621899d2de0251 Mon Sep 17 00:00:00 2001
+From 6324def6424e891a74b2aca01325c4999e9178ca Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 5 Nov 2013 15:43:24 +0000
Subject: [PATCH] builder: Add some generated files to CLEANFILES.
@@ -11,10 +11,10 @@ This updates commit a4800e2d4fc50f372a8b626333c4fbb9b8ca9633.
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/builder/Makefile.am b/builder/Makefile.am
-index a44f820..44384d9 100644
+index 606ecc4..97550a8 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
-@@ -205,4 +205,8 @@ stamp-virt-index-validate.pod: virt-index-validate.pod
+@@ -206,4 +206,8 @@ stamp-virt-index-validate.pod: virt-index-validate.pod
$<
touch $@
diff --git a/0027-builder-Add-dependency-from-index-parse.h-to-index-v.patch b/0020-builder-Add-dependency-from-index-parse.h-to-index-v.patch
similarity index 83%
rename from 0027-builder-Add-dependency-from-index-parse.h-to-index-v.patch
rename to 0020-builder-Add-dependency-from-index-parse.h-to-index-v.patch
index 5da91eb..d231f85 100644
--- a/0027-builder-Add-dependency-from-index-parse.h-to-index-v.patch
+++ b/0020-builder-Add-dependency-from-index-parse.h-to-index-v.patch
@@ -1,4 +1,4 @@
-From 5ab8da71343c6f8c0dd16111480893730db2cc84 Mon Sep 17 00:00:00 2001
+From 9eb2f0b6b875eff242dfbd50d7488713c69f1b9c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 5 Nov 2013 15:56:34 +0000
Subject: [PATCH] builder: Add dependency from index-parse.h to index-validate.
@@ -13,10 +13,10 @@ rest of the build.
1 file changed, 2 insertions(+)
diff --git a/builder/Makefile.am b/builder/Makefile.am
-index 44384d9..593e3ef 100644
+index 97550a8..3ad18cc 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
-@@ -192,6 +192,8 @@ virt_index_validate_SOURCES = \
+@@ -193,6 +193,8 @@ virt_index_validate_SOURCES = \
index-struct.c \
index-validate.c
diff --git a/0029-builder-Add-dependencies-which-automake-doesn-t-gene.patch b/0021-builder-Add-dependencies-which-automake-doesn-t-gene.patch
similarity index 84%
rename from 0029-builder-Add-dependencies-which-automake-doesn-t-gene.patch
rename to 0021-builder-Add-dependencies-which-automake-doesn-t-gene.patch
index 64e64a9..3f546ff 100644
--- a/0029-builder-Add-dependencies-which-automake-doesn-t-gene.patch
+++ b/0021-builder-Add-dependencies-which-automake-doesn-t-gene.patch
@@ -1,4 +1,4 @@
-From 90b8f20a41798ba4a38e7681783a5a14a13ef541 Mon Sep 17 00:00:00 2001
+From b3f77a6519ba5abf67a1815521bb702d40dcb7b5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 5 Nov 2013 17:40:20 +0000
Subject: [PATCH] builder: Add dependencies which automake doesn't generate
@@ -14,10 +14,10 @@ commit dfe97b352d6b398c3cb3ddb1c9984767722e514b
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/builder/Makefile.am b/builder/Makefile.am
-index 593e3ef..a828ffd 100644
+index 3ad18cc..30ada87 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
-@@ -120,8 +120,6 @@ virt-builder: $(OBJECTS)
+@@ -121,8 +121,6 @@ virt-builder: $(OBJECTS)
.ml.cmx:
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -c $< -o $@
@@ -26,7 +26,7 @@ index 593e3ef..a828ffd 100644
# Manual pages and HTML files for the website.
man_MANS += virt-builder.1
-@@ -192,8 +190,6 @@ virt_index_validate_SOURCES = \
+@@ -193,8 +191,6 @@ virt_index_validate_SOURCES = \
index-struct.c \
index-validate.c
@@ -35,7 +35,7 @@ index 593e3ef..a828ffd 100644
man_MANS += virt-index-validate.1
noinst_DATA += $(top_builddir)/html/virt-index-validate.1.html
-@@ -212,3 +208,10 @@ CLEANFILES += \
+@@ -213,3 +209,10 @@ CLEANFILES += \
index-parse.h \
index-scan.c \
stamp-virt-index-validate.pod
diff --git a/0030-builder-Fail-if-bison-is-not-installed.patch b/0022-builder-Fail-if-bison-is-not-installed.patch
similarity index 91%
rename from 0030-builder-Fail-if-bison-is-not-installed.patch
rename to 0022-builder-Fail-if-bison-is-not-installed.patch
index 4f92554..829aee9 100644
--- a/0030-builder-Fail-if-bison-is-not-installed.patch
+++ b/0022-builder-Fail-if-bison-is-not-installed.patch
@@ -1,4 +1,4 @@
-From c52aab412ac2a4f3cf6578fee801ee4952e65ca8 Mon Sep 17 00:00:00 2001
+From 914eda77f8aa33a68c61f2620dc487dc5a104215 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Tue, 5 Nov 2013 22:25:59 +0000
Subject: [PATCH] builder: Fail if bison is not installed.
@@ -11,7 +11,7 @@ This partially fixes commit a4800e2d4fc50f372a8b626333c4fbb9b8ca9633.
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 7a18b8e..2e99699 100644
+index bd3078f..9b4ae12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -711,9 +711,14 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma],[
diff --git a/0031-builder-Fail-if-lex-is-not-installed.patch b/0023-builder-Fail-if-lex-is-not-installed.patch
similarity index 89%
rename from 0031-builder-Fail-if-lex-is-not-installed.patch
rename to 0023-builder-Fail-if-lex-is-not-installed.patch
index cb26348..db7febd 100644
--- a/0031-builder-Fail-if-lex-is-not-installed.patch
+++ b/0023-builder-Fail-if-lex-is-not-installed.patch
@@ -1,4 +1,4 @@
-From e2267f00b947249b7cc38d88b083995db85b8f76 Mon Sep 17 00:00:00 2001
+From 172f9091feb77d512de290cdfae40d4d04c8f1c6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Wed, 6 Nov 2013 15:08:08 +0000
Subject: [PATCH] builder: Fail if lex is not installed.
@@ -11,7 +11,7 @@ This completes the fix for commit a4800e2d4fc50f372a8b626333c4fbb9b8ca9633.
1 file changed, 3 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 2e99699..ab09a6d 100644
+index 9b4ae12..72fc5c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -716,6 +716,9 @@ dnl XXX Could be optional with some work.
diff --git a/libguestfs.spec b/libguestfs.spec
index 3bf0de6..a2b5cca 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -11,8 +11,8 @@
Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
-Version: 1.24.1
-Release: 5%{?dist}
+Version: 1.24.2
+Release: 1%{?dist}
License: LGPLv2+
# Source and patches.
@@ -37,36 +37,19 @@ Patch0009: 0009-firstboot-Send-the-output-to-the-console-as-well-as-.patch
Patch0010: 0010-builder-Add-a-section-on-performance-to-the-manual.patch
Patch0011: 0011-builder-Add-m-memsize-and-smp-command-line-options.patch
Patch0012: 0012-builder-Allow-multiple-source-paths-to-be-specified.patch
-Patch0013: 0013-builder-Don-t-use-git-tree-libguestfs.git-to-refer-t.patch
-Patch0014: 0014-builder-Add-a-real-scanner-parser-for-index-files.patch
-Patch0015: 0015-builder-Fix-check-valgrind-so-it-does-something-in-t.patch
-Patch0016: 0016-builder-Fix-missing-files-in-EXTRA_DIST.patch
-Patch0017: 0017-builder-Add-an-extra-Makefile.am-to-builder-website.patch
-Patch0018: 0018-builder-website-Add-index-validation-test-script.patch
-Patch0019: 0019-builder-Internal-implementation-of-parallel-xzcat-px.patch
-Patch0020: 0020-builder-Replace-fedora-NN-shell-kickstart-with-a-sin.patch
-Patch0021: 0021-builder-Replace-ubuntu-NN-.sh-with-a-single-script.patch
-Patch0022: 0022-builder-Replace-debian-NN-.sh-with-a-single-script.patch
-Patch0023: 0023-builder-Replace-centos-6.sh-with-a-single-script.patch
-Patch0024: 0024-builder-website-Add-validate.sh-test-script-to-EXTRA.patch
-Patch0025: 0025-builder-Add-missing-dependency.patch
-Patch0026: 0026-builder-Add-some-generated-files-to-CLEANFILES.patch
-Patch0027: 0027-builder-Add-dependency-from-index-parse.h-to-index-v.patch
-Patch0028: 0028-builder-Fix-centos-script-output-filename-was-wrong.patch
-Patch0029: 0029-builder-Add-dependencies-which-automake-doesn-t-gene.patch
-Patch0030: 0030-builder-Fail-if-bison-is-not-installed.patch
-Patch0031: 0031-builder-Fail-if-lex-is-not-installed.patch
-Patch0032: 0032-builder-Allow-upload-to-directory-when-target-is-a-s.patch
-Patch0033: 0033-builder-Allow-tmp-or-Temp-to-be-symlinks-to-a-direct.patch
-Patch0034: 0034-podwrapper-virt-install-is-not-a-libguestfs-page.patch
-Patch0035: 0035-builder-Clarify-architecture-section-of-the-document.patch
-Patch0036: 0036-mllib-Add-a-utility-function-for-safely-reading-from.patch
-Patch0037: 0037-Avoid-modulo-bias-in-random-password-generation.patch
+Patch0013: 0013-builder-Add-a-real-scanner-parser-for-index-files.patch
+Patch0014: 0014-builder-Fix-missing-files-in-EXTRA_DIST.patch
+Patch0015: 0015-builder-website-Add-index-validation-test-script.patch
+Patch0016: 0016-builder-Internal-implementation-of-parallel-xzcat-px.patch
+Patch0017: 0017-builder-website-Add-validate.sh-test-script-to-EXTRA.patch
+Patch0018: 0018-builder-Add-missing-dependency.patch
+Patch0019: 0019-builder-Add-some-generated-files-to-CLEANFILES.patch
+Patch0020: 0020-builder-Add-dependency-from-index-parse.h-to-index-v.patch
+Patch0021: 0021-builder-Add-dependencies-which-automake-doesn-t-gene.patch
+Patch0022: 0022-builder-Fail-if-bison-is-not-installed.patch
+Patch0023: 0023-builder-Fail-if-lex-is-not-installed.patch
# Add any non-git patches here.
-# Upstream (but not 1.24) patch to workaround changed btrfs behaviour.
-Patch1000: 0001-daemon-btrfs-Upstream-btrfs-device-add-command-now-n.patch
-
# Use git for patch management.
BuildRequires: git
@@ -1056,6 +1039,10 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
%changelog
+* Sat Dec 07 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.24.2-1
+- New stable branch version 1.24.2.
+- Rebase patches.
+
* Thu Dec 05 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.24.1-5
- Rebuild to push change to PPC (secondary arches) RHBZ#1036742.
- Backport upstream (but not 1.24) patch to workaround changed btrfs behaviour.
More information about the scm-commits
mailing list