Accepting request 234225 from Virtualization

- Update to version 1.26.2
  * sparsify: Add a note about qcow2 internal snapshots not being copied (RHBZ#1094746).
  * customize: random-seed file has moved again.
  * lib: xmlParse{File,Memory} -> xmlRead{File,Memory}
  * launch: direct: Supply -M option when testing qemu for devices.
  * tar-in: Fix places where we didn't cancel the receive (FileIn) correctly along error paths (RHBZ#1091803).
  * configure: Make sure grep matches qemu 2.x version string.
  * daemon: parted: part-get-name: switch from sgdisk to parted (RHBZ#1088424).
  * sparsify: If using -v (verbose), ensure #disk_create runs verbose too.
  * disk-create: Fix this API so it works correctly with block devices (RHBZ#1088262).
  * listfs: If LDM not available, don't inhibit partition detection (RHBZ#1079182).
  * mllib: utils: Add mapi function.
  * src/launch: improve the addition of the no-hpet option
  * handle: Free g->backend_settings.
  * python: Remove unnecessary library dependencies.
  * utils: Move guestfs___validate_guid out of utils.c.
  * utils: Remove for-loop variable decl.
  * rescue: Don't leak various variables when using --suggest option with multi-boot guests.
  * make-fs: Close FILE* along error path.
  * make-fs: Check for error return from guestfs_statvfs.
  * daemon: parted: part-get-name: Don't leak partition type string.

OBS-URL: https://build.opensuse.org/request/show/234225
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libguestfs?expand=0&rev=20

0000-hotfix.patch

@@ -1,57 +1,18 @@
-From 464eafba694aaaff8c5c49fd1f4f0c08d069833d Mon Sep 17 00:00:00 2001
+From 0c5d0904ac4699ba02af1815598fa57ba296d3fd Mon Sep 17 00:00:00 2001
 From: Olaf Hering <olaf@aepfle.de>
-Date: Fri, 28 Mar 2014 10:11:28 +0100
-Subject: fix virt-index-validate link errors
-
-[  288s] virt_index_validate-index-validate.o: In function `main':
-[  288s] index-validate.c:(.text+0x94): undefined reference to `rpl_getopt_long'
-[  288s] index-validate.c:(.text+0x165): undefined reference to `rpl_optind'
-[  288s] index-validate.c:(.text+0x177): undefined reference to `rpl_optind'
-[  288s] index-validate.c:(.text+0x18c): undefined reference to `rpl_optind'
-[  288s] index-validate.c:(.text+0x498): undefined reference to `rpl_perror'
-[  288s] collect2: ld returned 1 exit status
-[  288s] make[2]: *** [virt-index-validate] Error 1
+Date: Tue, 13 May 2014 15:31:21 +0200
+Subject: hotfix
 
 Signed-off-by: Olaf Hering <olaf@aepfle.de>
 ---
- builder/Makefile.am |    3 +++
- builder/Makefile.in |    5 ++++-
- 2 files changed, 7 insertions(+), 1 deletion(-)
+ pkg-hotfix.txt | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 pkg-hotfix.txt
 
-Index: libguestfs-1.26.0/builder/Makefile.am
-===================================================================
---- libguestfs-1.26.0.orig/builder/Makefile.am
-+++ libguestfs-1.26.0/builder/Makefile.am
-@@ -278,6 +278,9 @@ virt_index_validate_SOURCES = \
- virt_index_validate_CPPFLAGS = \
- 	-DLOCALEBASEDIR=\""$(datadir)/locale"\"
- 
-+virt_index_validate_LDADD = \
-+	../gnulib/lib/libgnu.la
+diff --git a/pkg-hotfix.txt b/pkg-hotfix.txt
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/pkg-hotfix.txt
+@@ -0,0 +1 @@
 +
- man_MANS += virt-index-validate.1
- noinst_DATA += $(top_builddir)/html/virt-index-validate.1.html
- 
-Index: libguestfs-1.26.0/builder/Makefile.in
-===================================================================
---- libguestfs-1.26.0.orig/builder/Makefile.in
-+++ libguestfs-1.26.0/builder/Makefile.in
-@@ -291,7 +291,7 @@ am_virt_index_validate_OBJECTS =  \
- 	virt_index_validate-index-struct.$(OBJEXT) \
- 	virt_index_validate-index-validate.$(OBJEXT)
- virt_index_validate_OBJECTS = $(am_virt_index_validate_OBJECTS)
--virt_index_validate_LDADD = $(LDADD)
-+virt_index_validate_DEPENDENCIES =
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -1660,6 +1660,9 @@ virt_index_validate_SOURCES = \
- virt_index_validate_CPPFLAGS = \
- 	-DLOCALEBASEDIR=\""$(datadir)/locale"\"
- 
-+virt_index_validate_LDADD = \
-+	../gnulib/lib/libgnu.la
-+
- all: all-am
- 
- .SUFFIXES:

1000-force-virtio_blk-in-old-guest-kernel.patch

@@ -1,4 +1,4 @@
-From 6e67537d571c86bfc0a112ffd8962d244714b11a Mon Sep 17 00:00:00 2001
+From ec0d8e661b5cb97ea3e2ed5ffb86bdfb538fca00 Mon Sep 17 00:00:00 2001
 From: Olaf Hering <olaf@aepfle.de>
 Date: Mon, 3 Sep 2012 19:50:44 +0200
 Subject: force virtio_blk in old guest kernel
@@ -39,7 +39,7 @@ index 80b71ec..2cef1bc 100644
        exit (EXIT_FAILURE);
      }
 diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
-index 27fc857..d31af9f 100644
+index 648f005..fd99253 100644
 --- a/src/guestfs-internal.h
 +++ b/src/guestfs-internal.h
 @@ -501,6 +501,7 @@ struct guestfs_h
@@ -51,10 +51,10 @@ index 27fc857..d31af9f 100644
  
  /* Per-filesystem data stored for inspect_os. */
 diff --git a/src/handle.c b/src/handle.c
-index 687f059..11291dd 100644
+index 393ac1e..1806570 100644
 --- a/src/handle.c
 +++ b/src/handle.c
-@@ -258,6 +258,22 @@ parse_environment (guestfs_h *g,
+@@ -259,6 +259,22 @@ parse_environment (guestfs_h *g,
        return -1;
    }
  
@@ -100,10 +100,10 @@ index 17b0b5f..20af3f7 100644
    }
    else if ((part = match1 (g, spec, re_diskbyid)) != NULL) {
 diff --git a/src/launch-direct.c b/src/launch-direct.c
-index 5c756b7..2dd4817 100644
+index 2332368..67b9fd4 100644
 --- a/src/launch-direct.c
 +++ b/src/launch-direct.c
-@@ -1185,6 +1185,8 @@ qemu_supports_virtio_scsi (guestfs_h *g, struct backend_direct_data *data)
+@@ -1183,6 +1183,8 @@ qemu_supports_virtio_scsi (guestfs_h *g, struct backend_direct_data *data)
          data->virtio_scsi = 3;
      }
    }

libguestfs-1.26.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5bd1128a34dc5104007386fcf62ac49a4a0649b824a74455f01ce09cd7556f7c
-size 4992824

libguestfs-1.26.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aca2e3129be1dc70b8d12803808752425ac489d4ad92bef5000f7d09281f416f
+size 5004072

libguestfs.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Tue May 13 15:16:11 CEST 2014 - ohering@suse.de
+
+- Update to version 1.26.2
+  * sparsify: Add a note about qcow2 internal snapshots not being copied (RHBZ#1094746).
+  * customize: random-seed file has moved again.
+  * lib: xmlParse{File,Memory} -> xmlRead{File,Memory}
+  * launch: direct: Supply -M option when testing qemu for devices.
+  * tar-in: Fix places where we didn't cancel the receive (FileIn) correctly along error paths (RHBZ#1091803).
+  * configure: Make sure grep matches qemu 2.x version string.
+  * daemon: parted: part-get-name: switch from sgdisk to parted (RHBZ#1088424).
+  * sparsify: If using -v (verbose), ensure #disk_create runs verbose too.
+  * disk-create: Fix this API so it works correctly with block devices (RHBZ#1088262).
+  * listfs: If LDM not available, don't inhibit partition detection (RHBZ#1079182).
+  * mllib: utils: Add mapi function.
+  * src/launch: improve the addition of the no-hpet option
+  * handle: Free g->backend_settings.
+  * python: Remove unnecessary library dependencies.
+  * utils: Move guestfs___validate_guid out of utils.c.
+  * utils: Remove for-loop variable decl.
+  * rescue: Don't leak various variables when using --suggest option with multi-boot guests.
+  * make-fs: Close FILE* along error path.
+  * make-fs: Check for error return from guestfs_statvfs.
+  * daemon: parted: part-get-name: Don't leak partition type string.
+
 -------------------------------------------------------------------
 Fri Mar 28 14:03:57 CET 2014 - ohering@suse.de
 

libguestfs.spec

@@ -17,7 +17,7 @@
 #
 
 
-Version:        1.26.0
+Version:        1.26.2
 Release:        0
 
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)