Accepting request 242704 from Virtualization

- Update to version 1.26.6
  * cleanups: add CLEANUP_FCLOSE (fclose on FILE*)
  * launch: Close file descriptors after fork (RHBZ#1123007).
  * virt-resize: Unmount filesystem after testing size.
  * daemon: Add extra debugging to umount_all command.
  * sparsify: Relax requirement that output device cannot be block device (RHBZ#1122557).
  * ocaml: Ignore Warning 3: deprecated feature: String.* functions.
  * sysprep: Standard exception handling, taken from virt-builder & virt-v2v.
  * customize: Use Common_utils.error function instead of failwith.
  * mllib: introduce Mkdtemp.temp_dir
  * inspect: ignore /etc/fstab with no entries (RHBZ#1113156).

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

0000-hotfix.patch

@@ -1,4 +1,4 @@
-From 032655f5dd4fcc06a0c4da91efde617ac1536080 Mon Sep 17 00:00:00 2001
+From 5198e6eb6878611616458cb561545d5dc0adcc35 Mon Sep 17 00:00:00 2001
 From: Olaf Hering <olaf@aepfle.de>
 Date: Tue, 13 May 2014 15:31:21 +0200
 Subject: hotfix

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

@@ -1,4 +1,4 @@
-From 01e40a5583c02603cb4fccaddfd06e60804d96f6 Mon Sep 17 00:00:00 2001
+From 6b70404b04a20323b6195d6c8cf3e09a13ed0d70 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
@@ -78,10 +78,10 @@ index 393ac1e..1806570 100644
  }
  
 diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c
-index 17b0b5f..20af3f7 100644
+index 7221f24..9045f13 100644
 --- a/src/inspect-fs-unix.c
 +++ b/src/inspect-fs-unix.c
-@@ -1438,7 +1438,7 @@ resolve_fstab_device_diskbyid (guestfs_h *g, const char *part,
+@@ -1433,7 +1433,7 @@ resolve_fstab_device_diskbyid (guestfs_h *g, const char *part,
      return 0;
  
    /* Make the partition name and check it exists. */
@@ -90,7 +90,7 @@ index 17b0b5f..20af3f7 100644
    if (!is_partition (g, device)) {
      free (device);
      return 0;
-@@ -1531,7 +1531,7 @@ resolve_fstab_device (guestfs_h *g, const char *spec, Hash_table *md_map)
+@@ -1526,7 +1526,7 @@ resolve_fstab_device (guestfs_h *g, const char *spec, Hash_table *md_map)
      if (disk_i != -1 && disk_i <= 26 &&
          slice_i > 0 && slice_i <= 1 /* > 4 .. see comment above */ &&
          part_i >= 0 && part_i < 26) {
@@ -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 070dfca..fa5d08b 100644
+index 3857f53..713282d 100644
 --- a/src/launch-direct.c
 +++ b/src/launch-direct.c
-@@ -1183,6 +1183,8 @@ qemu_supports_virtio_scsi (guestfs_h *g, struct backend_direct_data *data)
+@@ -1184,6 +1184,8 @@ qemu_supports_virtio_scsi (guestfs_h *g, struct backend_direct_data *data)
          data->virtio_scsi = 3;
      }
    }

libguestfs-1.26.5.tar.xz

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

libguestfs-1.26.6.tar.xz

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

libguestfs.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Jul 28 09:27:51 CEST 2014 - ohering@suse.de
+
+- Update to version 1.26.6
+  * cleanups: add CLEANUP_FCLOSE (fclose on FILE*)
+  * launch: Close file descriptors after fork (RHBZ#1123007).
+  * virt-resize: Unmount filesystem after testing size.
+  * daemon: Add extra debugging to umount_all command.
+  * sparsify: Relax requirement that output device cannot be block device (RHBZ#1122557).
+  * ocaml: Ignore Warning 3: deprecated feature: String.* functions.
+  * sysprep: Standard exception handling, taken from virt-builder & virt-v2v.
+  * customize: Use Common_utils.error function instead of failwith.
+  * mllib: introduce Mkdtemp.temp_dir
+  * inspect: ignore /etc/fstab with no entries (RHBZ#1113156).
+
 -------------------------------------------------------------------
 Wed Jul  9 09:54:31 CEST 2014 - ohering@suse.de
 

libguestfs.spec

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