- Update to version 1.19.59

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=152

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

@@ -1,4 +1,4 @@
-From cc07a2762371abf8959a0c1ff8954dce11a4af2c Mon Sep 17 00:00:00 2001
+From 61db8e97180efa70243d8b7b116f11ca1f36b375 Mon Sep 17 00:00:00 2001
 From: Olaf Hering <olaf@aepfle.de>
 Date: Mon, 3 Sep 2012 19:50:44 +0200
 Subject: [PATCH] force virtio_blk in old guest kernel
@@ -8,7 +8,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
  df/output.c            | 13 +++++++++----
  fish/options.c         |  8 +++++++-
  src/guestfs-internal.h |  2 ++
- src/guestfs.c          | 16 ++++++++++++++++
+ src/handle.c           | 16 ++++++++++++++++
  src/inspect-fs-unix.c  |  4 ++--
  src/launch-appliance.c |  3 +++
  src/launch-libvirt.c   |  7 +++++++
@@ -101,10 +101,10 @@ index 0db790e..54190bc 100644
        exit (EXIT_FAILURE);
      }
 diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
-index 2cfa35b..cb0cbb9 100644
+index 6e0b368..fe7b7dd 100644
 --- a/src/guestfs-internal.h
 +++ b/src/guestfs-internal.h
-@@ -331,6 +331,8 @@ struct guestfs_h
+@@ -350,6 +350,8 @@ struct guestfs_h
      virDomainPtr dom;           /* libvirt domain */
    } virt;
  #endif
@@ -113,11 +113,11 @@ index 2cfa35b..cb0cbb9 100644
  };
  
  /* Per-filesystem data stored for inspect_os. */
-diff --git a/src/guestfs.c b/src/guestfs.c
+diff --git a/src/handle.c b/src/handle.c
-index e755ffa..7e1d242 100644
+index fd7db69..d9ecc5d 100644
---- a/src/guestfs.c
+--- a/src/handle.c
-+++ b/src/guestfs.c
++++ b/src/handle.c
-@@ -222,6 +222,22 @@ parse_environment (guestfs_h *g,
+@@ -210,6 +210,22 @@ parse_environment (guestfs_h *g,
        return -1;
    }
  
@@ -141,10 +141,10 @@ index e755ffa..7e1d242 100644
  }
  
 diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c
-index 33c5ee9..c7d5398 100644
+index a48d176..b2d6766 100644
 --- a/src/inspect-fs-unix.c
 +++ b/src/inspect-fs-unix.c
-@@ -1412,7 +1412,7 @@ resolve_fstab_device_diskbyid (guestfs_h *g, const char *part,
+@@ -1411,7 +1411,7 @@ resolve_fstab_device_diskbyid (guestfs_h *g, const char *part,
      return 0;
  
    /* Make the partition name and check it exists. */
@@ -153,7 +153,7 @@ index 33c5ee9..c7d5398 100644
    if (!is_partition (g, device)) {
      free (device);
      return 0;
-@@ -1489,7 +1489,7 @@ resolve_fstab_device (guestfs_h *g, const char *spec, Hash_table *md_map)
+@@ -1488,7 +1488,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) {
@@ -177,7 +177,7 @@ index 17e90d9..902cf9a 100644
  }
  
 diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
-index 8bdf117..63f1656 100644
+index e4df2a6..dbeb97a 100644
 --- a/src/launch-libvirt.c
 +++ b/src/launch-libvirt.c
 @@ -150,6 +150,13 @@ launch_libvirt (guestfs_h *g, const char *libvirt_uri)
@@ -195,7 +195,7 @@ index 8bdf117..63f1656 100644
    TRACE0 (launch_libvirt_start);
  
 diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
-index 6f26e33..754f09d 100644
+index 67e778b..74ea6d6 100644
 --- a/test-tool/test-tool.c
 +++ b/test-tool/test-tool.c
 @@ -35,6 +35,7 @@
@@ -230,7 +230,7 @@ index 6f26e33..754f09d 100644
    for (;;) {
      c = getopt_long (argc, argv, options, long_options, &option_index);
      if (c == -1) break;
-@@ -251,19 +261,19 @@ main (int argc, char *argv[])
+@@ -257,19 +267,19 @@ main (int argc, char *argv[])
    fflush (stdout);
  
    /* Create the filesystem and mount everything. */
@@ -254,5 +254,5 @@ index 6f26e33..754f09d 100644
               _("libguestfs-test-tool: failed to mount /dev/sda1 on /\n"));
      exit (EXIT_FAILURE);
 -- 
-1.7.12.3
+1.8.0
 

libguestfs-1.19.58.tar.gz

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

libguestfs-1.19.59.tar.gz

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

libguestfs.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
-Tue Nov 13 23:41:50 CET 2012 - ohering@suse.de
+Tue Nov 13 23:47:18 CET 2012 - ohering@suse.de
 
-- Update to version 1.19.58
+- Update to version 1.19.59
 
 -------------------------------------------------------------------
 Tue Nov 13 23:40:45 CET 2012 - ohering@suse.de

libguestfs.spec

@@ -93,7 +93,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Compatibility package for guestfs-tools
 License:        LGPL-2.1
 Group:          System/Filesystems
-Version:        1.19.58
+Version:        1.19.59
 Release:        0
 Patch5:         libguestfs-1.13.14-ruby.patch
 Patch1000:      1000-force-virtio_blk-in-old-guest-kernel.patch
@@ -525,14 +525,12 @@ a \
 ' mkinitrd/scripts/boot-guestfs.sh
 diff -u mkinitrd/scripts/boot-guestfs.sh~ mkinitrd/scripts/boot-guestfs.sh || :
 #
+%if %suse_version < 1230
 patched=
 for p in \
 	%{S:1220} \
 	%{S:1210} \
 	%{S:1110} \
-%if 0
-	%{S:1140} \
-%endif
 	;
 do
 	if patch --dry-run -p1 < $p
@@ -547,6 +545,7 @@ do
 	fi
 done
 test -n "$patched"
+%endif
 
 /sbin/mkinitrd_setup  \
 	-s $PWD/mkinitrd/scripts \