- Update to version 1.20.3
* trace: Put trace buffer on the stack instead of in the handle. * FAQ: Add question about running fsck on live filesystems * lib: Check calls to xmlXPathEvalExpression for nodesetval == NULL. * recipes: Add example converting from one format/filesystem to another * daemon: protocol: Fix memory leak when receiving FileIn file (RHBZ#914934). * protocol: Don't segfault if appliance crashes during FileIn upload (RHBZ#914931). * libutils: Add guestfs___count_strings utility function to common library * lib: Create libutils convenience library. * docs: Rewrite security section (thanks Dan Berrange) * lib: Fix memory leak when the 'lpj' setting is read from dmesg. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=191
This commit is contained in:
Git OBS Bridge
parent
518efff326
commit
e9e4eddbe0
@ -1,46 +0,0 @@
|
||||
From a1c89bf03dd432f0e4c8c26fe01fd9b2a50df97e Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 19 Feb 2013 15:37:18 +0000
|
||||
Subject: [PATCH] build: Only add 'serial-tests' for automake >= 1.12 (thanks
|
||||
Hilko Bengen).
|
||||
|
||||
Earlier versions of automake complain if they get a configuration
|
||||
parameter which they don't understand. The error is:
|
||||
|
||||
configure.ac:27: error: option 'serial-tests' not recognized
|
||||
|
||||
Use some m4 hackery to work around this.
|
||||
---
|
||||
configure.ac | 19 ++++++++++++++++++-
|
||||
1 file changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 105b2e7..d4495bf 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -24,7 +24,24 @@ m4_define([libguestfs_release], [11])
|
||||
|
||||
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
-AM_INIT_AUTOMAKE([foreign serial-tests])
|
||||
+
|
||||
+dnl Initialize automake. automake < 1.12 didn't have serial-tests and
|
||||
+dnl gives an error if it sees this, but for automake >= 1.13
|
||||
+dnl serial-tests is required so we have to include it. Solution is to
|
||||
+dnl test for the version of automake (by running an external command)
|
||||
+dnl and provide it if necessary. Note we have to do this entirely using
|
||||
+dnl m4 macros since automake queries this macro by running
|
||||
+dnl 'autoconf --trace'.
|
||||
+m4_define([serial_tests], [
|
||||
+ m4_esyscmd([automake --version | head -1 | awk '
|
||||
+ {
|
||||
+ split ($NF, version, ".");
|
||||
+ if (version[1] == 1 && version[2] >= 12)
|
||||
+ print "serial-tests";
|
||||
+ }'
|
||||
+ ])
|
||||
+])
|
||||
+AM_INIT_AUTOMAKE(foreign serial_tests) dnl NB: Do not [quote] this parameter.
|
||||
|
||||
m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
|
||||
AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
|
||||
@ -1,38 +0,0 @@
|
||||
From 8a06055533023aea942cdce548e0befaf7562ebc Mon Sep 17 00:00:00 2001
|
||||
From: Olaf Hering <olaf@aepfle.de>
|
||||
Date: Mon, 25 Feb 2013 10:53:24 +0100
|
||||
Subject: [PATCH] lib: avoid pragma usage in inspect-fs-windows
|
||||
|
||||
pragma GCC diagnostic is a gcc 4.6+ feature, compilation fails with
|
||||
older compilers:
|
||||
|
||||
inspect-fs-windows.c: In function 'map_registry_disk_blob':
|
||||
inspect-fs-windows.c:502: error: #pragma GCC diagnostic not allowed inside functions
|
||||
inspect-fs-windows.c:503: error: #pragma GCC diagnostic not allowed inside functions
|
||||
inspect-fs-windows.c:505: error: #pragma GCC diagnostic not allowed inside functions
|
||||
make[3]: *** [libguestfs_la-inspect-fs-windows.lo] Error 1
|
||||
|
||||
Use memcpy instead of pragma to fix compile error.
|
||||
|
||||
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
||||
---
|
||||
src/inspect-fs-windows.c | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/inspect-fs-windows.c b/src/inspect-fs-windows.c
|
||||
index 346cc55..68ae97c 100644
|
||||
--- a/src/inspect-fs-windows.c
|
||||
+++ b/src/inspect-fs-windows.c
|
||||
@@ -499,10 +499,8 @@ map_registry_disk_blob (guestfs_h *g, const void *blob)
|
||||
* Note deliberate cast-align violation here since the data is in a
|
||||
* very odd place within the blob. Thanks Microsoft!
|
||||
*/
|
||||
-#pragma GCC diagnostic push
|
||||
-#pragma GCC diagnostic ignored "-Wcast-align"
|
||||
- part_offset = le64toh (* (uint64_t *) ((char *) blob + 4));
|
||||
-#pragma GCC diagnostic pop
|
||||
+ memcpy(&part_offset, (char *) blob + 4, sizeof(part_offset));
|
||||
+ part_offset = le64toh (part_offset);
|
||||
|
||||
partitions = guestfs_part_list (g, devices[i]);
|
||||
if (partitions == NULL)
|
||||
@ -1,40 +0,0 @@
|
||||
From ff0269e80fcd2031afa7d48e414b7ca7e1ef4d7a Mon Sep 17 00:00:00 2001
|
||||
From: Hilko Bengen <bengen@hilluzination.de>
|
||||
Date: Mon, 18 Feb 2013 22:43:41 +0100
|
||||
Subject: [PATCH] out-of-tree build: fix test-tool
|
||||
|
||||
(Not entirely sure whether using Gnulib to replace standard functions
|
||||
is a good idea at all.)
|
||||
|
||||
link with libgnu:
|
||||
CCLD libguestfs-test-tool
|
||||
libguestfs_test_tool-test-tool.o: In function `main':
|
||||
/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:103: undefined reference to `rpl_getopt_long'
|
||||
/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:113: undefined reference to `rpl_optarg'
|
||||
/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:125: undefined reference to `rpl_optarg'
|
||||
/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:126: undefined reference to `rpl_optarg'
|
||||
/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:109: undefined reference to `rpl_optarg'
|
||||
libguestfs_test_tool-test-tool.o: In function `set_qemu':
|
||||
/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:382: undefined reference to `rpl_perror'
|
||||
/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:366: undefined reference to `rpl_perror'
|
||||
libguestfs_test_tool-test-tool.o: In function `make_files':
|
||||
/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:416: undefined reference to `rpl_perror'
|
||||
/home/bengen/src/deb/pkg-libvirt/libguestfs/debian/build-default/test-tool/../../../test-tool/test-tool.c:428: undefined reference to `rpl_perror'
|
||||
---
|
||||
test-tool/Makefile.am | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
|
||||
index 200f2cb..bb2e03c 100644
|
||||
--- a/test-tool/Makefile.am
|
||||
+++ b/test-tool/Makefile.am
|
||||
@@ -37,7 +37,8 @@ libguestfs_test_tool_CFLAGS = \
|
||||
$(GPROF_CFLAGS) $(GCOV_CFLAGS)
|
||||
|
||||
libguestfs_test_tool_LDADD = \
|
||||
- $(top_builddir)/src/libguestfs.la
|
||||
+ $(top_builddir)/src/libguestfs.la \
|
||||
+ $(top_builddir)/gnulib/lib/libgnu.la
|
||||
|
||||
libguestfs-test-tool.1 $(top_builddir)/html/libguestfs-test-tool.1.html: stamp-libguestfs-test-tool.pod
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d1c95b8ba5454d9bf6b0d239c0e6e8711a102bec1aabb5d03c8101725eafeb81
|
||||
size 9487688
|
||||
3
libguestfs-1.20.3.tar.gz
Normal file
3
libguestfs-1.20.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:77ad0001378d3a7e76e87bc92bf1236801ab3f803cce077eef394f7df82e0044
|
||||
size 9522530
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 6 20:27:13 CET 2013 - ohering@suse.de
|
||||
|
||||
- Update to version 1.20.3
|
||||
* trace: Put trace buffer on the stack instead of in the handle.
|
||||
* FAQ: Add question about running fsck on live filesystems
|
||||
* lib: Check calls to xmlXPathEvalExpression for nodesetval == NULL.
|
||||
* recipes: Add example converting from one format/filesystem to another
|
||||
* daemon: protocol: Fix memory leak when receiving FileIn file (RHBZ#914934).
|
||||
* protocol: Don't segfault if appliance crashes during FileIn upload (RHBZ#914931).
|
||||
* libutils: Add guestfs___count_strings utility function to common library
|
||||
* lib: Create libutils convenience library.
|
||||
* docs: Rewrite security section (thanks Dan Berrange)
|
||||
* lib: Fix memory leak when the 'lpj' setting is read from dmesg.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 25 21:51:17 CET 2013 - ohering@suse.de
|
||||
|
||||
|
||||
@ -131,11 +131,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Summary: Compatibility package for guestfs-tools
|
||||
License: GPL-2
|
||||
Group: System/Filesystems
|
||||
Version: 1.20.2
|
||||
Version: 1.20.3
|
||||
Release: 0
|
||||
Patch0: 0001-build-Only-add-serial-tests-for-automake-1.12-thanks.patch
|
||||
Patch1: 0001-lib-avoid-pragma-usage-in-inspect-fs-windows.patch
|
||||
Patch2: 0001-out-of-tree-build-fix-test-tool.patch
|
||||
Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source789653: Pod-Simple-3.23.tar.gz
|
||||
@ -416,9 +413,6 @@ virtual machines.
|
||||
%prep
|
||||
: _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
|
||||
%setup -q -a 789653
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch1000 -p1
|
||||
|
||||
%build
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user