From 65b6f4ec6cfee1a3c203efce3a0b84908961a717527e8f1c9594ff9cc27b7e0a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 23 Nov 2012 19:21:05 +0000 Subject: [PATCH] - Update to version 1.19.63 (fate#312159) OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=163 --- ...-error-due-to-LUA_GLOBALSINDEX-usage.patch | 29 +++++++++++++++++++ ...force-virtio_blk-in-old-guest-kernel.patch | 22 +++++++------- libguestfs-1.19.62.tar.gz | 3 -- libguestfs-1.19.63.tar.gz | 3 ++ libguestfs.changes | 4 +-- libguestfs.spec | 6 +++- 6 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 0001-lua-fix-build-error-due-to-LUA_GLOBALSINDEX-usage.patch delete mode 100644 libguestfs-1.19.62.tar.gz create mode 100644 libguestfs-1.19.63.tar.gz diff --git a/0001-lua-fix-build-error-due-to-LUA_GLOBALSINDEX-usage.patch b/0001-lua-fix-build-error-due-to-LUA_GLOBALSINDEX-usage.patch new file mode 100644 index 0000000..0b7d132 --- /dev/null +++ b/0001-lua-fix-build-error-due-to-LUA_GLOBALSINDEX-usage.patch @@ -0,0 +1,29 @@ +From 7331665b7c0009e77e1f5004f427b4d9b2cf4940 Mon Sep 17 00:00:00 2001 +From: Olaf Hering +Date: Fri, 23 Nov 2012 20:10:00 +0100 +Subject: [PATCH] lua: fix build error due to LUA_GLOBALSINDEX usage + +lua 5.2 changed API, LUA_GLOBALSINDEX is no longer available. +http://www.lua.org/manual/5.2/manual.html#8.3 + +Signed-off-by: Olaf Hering +--- + generator/lua.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/generator/lua.ml b/generator/lua.ml +index 88748ae..7461cbd 100644 +--- a/generator/lua.ml ++++ b/generator/lua.ml +@@ -723,7 +723,7 @@ push_int64_array (lua_State *L, const int64_t *array, size_t len) + static void + print_any (lua_State *L, int index, FILE *out) + { +- lua_getfield (L, LUA_GLOBALSINDEX, \"tostring\"); ++ lua_getglobal(L, \"tostring\"); + lua_pushvalue (L, index >= 0 ? index : index-1); + lua_call (L, 1, 1); + fprintf (out, \"%%s\", luaL_checkstring (L, -1)); +-- +1.8.0 + diff --git a/1000-force-virtio_blk-in-old-guest-kernel.patch b/1000-force-virtio_blk-in-old-guest-kernel.patch index ac9e557..5732f44 100644 --- a/1000-force-virtio_blk-in-old-guest-kernel.patch +++ b/1000-force-virtio_blk-in-old-guest-kernel.patch @@ -1,4 +1,4 @@ -From 61db8e97180efa70243d8b7b116f11ca1f36b375 Mon Sep 17 00:00:00 2001 +From 345ae9b244b4327c5b3a55326d9487d1d4c0617a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 3 Sep 2012 19:50:44 +0200 Subject: [PATCH] force virtio_blk in old guest kernel @@ -101,7 +101,7 @@ index 0db790e..54190bc 100644 exit (EXIT_FAILURE); } diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h -index 6e0b368..fe7b7dd 100644 +index 07689ff..71e0321 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -350,6 +350,8 @@ struct guestfs_h @@ -163,10 +163,10 @@ index a48d176..b2d6766 100644 } else if ((part = match1 (g, spec, re_diskbyid)) != NULL) { diff --git a/src/launch-appliance.c b/src/launch-appliance.c -index 17e90d9..902cf9a 100644 +index f5647cf..5e4113f 100644 --- a/src/launch-appliance.c +++ b/src/launch-appliance.c -@@ -875,6 +875,9 @@ qemu_supports_virtio_scsi (guestfs_h *g) +@@ -847,6 +847,9 @@ qemu_supports_virtio_scsi (guestfs_h *g) g->app.virtio_scsi = 3; } @@ -177,7 +177,7 @@ index 17e90d9..902cf9a 100644 } diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c -index e4df2a6..dbeb97a 100644 +index 8e9b5ad..c0a648a 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 e4df2a6..dbeb97a 100644 TRACE0 (launch_libvirt_start); diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c -index 67e778b..74ea6d6 100644 +index abbb1c5..cd60bc4 100644 --- a/test-tool/test-tool.c +++ b/test-tool/test-tool.c @@ -35,6 +35,7 @@ @@ -215,10 +215,10 @@ index 67e778b..74ea6d6 100644 +#ifdef GUESTFS_QEMU_NO_VIRTIO_BLK + use_virtio_blk = 1; +#endif - /* Everyone ignores the documentation, so ... */ - printf (" ************************************************************\n" - " * IMPORTANT NOTICE\n" -@@ -129,6 +134,11 @@ main (int argc, char *argv[]) + /* Create the handle. */ + g = guestfs_create (); + if (g == NULL) { +@@ -118,6 +123,11 @@ main (int argc, char *argv[]) exit (EXIT_FAILURE); } @@ -230,7 +230,7 @@ index 67e778b..74ea6d6 100644 for (;;) { c = getopt_long (argc, argv, options, long_options, &option_index); if (c == -1) break; -@@ -257,19 +267,19 @@ main (int argc, char *argv[]) +@@ -258,19 +268,19 @@ main (int argc, char *argv[]) fflush (stdout); /* Create the filesystem and mount everything. */ diff --git a/libguestfs-1.19.62.tar.gz b/libguestfs-1.19.62.tar.gz deleted file mode 100644 index 5a2cab5..0000000 --- a/libguestfs-1.19.62.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:632b20cf2ef8635ff9c275f9728a7164c3363feb47d0f9bdcceba524653f9fd6 -size 8986639 diff --git a/libguestfs-1.19.63.tar.gz b/libguestfs-1.19.63.tar.gz new file mode 100644 index 0000000..eb7e488 --- /dev/null +++ b/libguestfs-1.19.63.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29490cf0a132a20e0f582c15b76b9cb1801ea5814dc38146305eb19b86fba055 +size 9009081 diff --git a/libguestfs.changes b/libguestfs.changes index 69ae9a0..ab7c14b 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- -Fri Nov 23 17:37:54 CET 2012 - ohering@suse.de +Fri Nov 23 19:55:26 CET 2012 - ohering@suse.de - include Pod-Simple-3.23.tar.gz to get perl(Pod::Simple::XHTML) at build time (bnc#789653) -- Update to version 1.19.62 (fate#312159) +- Update to version 1.19.63 (fate#312159) ------------------------------------------------------------------- Mon Nov 19 18:26:16 CET 2012 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 222afd4..6a17db5 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -53,6 +53,7 @@ # Name: libguestfs ExclusiveArch: %ix86 x86_64 +BuildRequires: libacl-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: aaa_base @@ -64,6 +65,7 @@ BuildRequires: file-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gperf +BuildRequires: libcap-devel %if %suse_version >= 1220 BuildRequires: libconfig-devel %endif @@ -98,8 +100,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Compatibility package for guestfs-tools License: GPL-2 Group: System/Filesystems -Version: 1.19.62 +Version: 1.19.63 Release: 0 +Patch0: 0001-lua-fix-build-error-due-to-LUA_GLOBALSINDEX-usage.patch Patch5: libguestfs-1.13.14-ruby.patch Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch Source0: %{name}-%{version}.tar.gz @@ -366,6 +369,7 @@ virtual machines. %prep %setup -q -a 789653 +%patch0 -p1 %patch5 -p1 %patch1000 -p1