Hello community,
here is the log from the commit of package libguestfs for openSUSE:Factory checked in at 2014-04-05 16:47:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libguestfs (Old)
and /work/SRC/openSUSE:Factory/.libguestfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libguestfs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2014-03-09 18:27:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs.changes 2014-04-05 16:47:02.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Mar 28 14:03:57 CET 2014 - ohering@suse.de
+
+- Update to version 1.26.0
+ * virt-customize is a new tool for customizing disk images
+ * virt-diff is a new tool for showing differences between filesystems
+ * virt-sparsify has a new --in-place option
+ * new virt-sysprep operations
+ * many bug fixes
+ * full release notes: http://libguestfs.org/guestfs-release-notes.1.html
+- added 0000-hotfix.patch
+- removed 0001-ocamlopt.patch
+
+-------------------------------------------------------------------
Old:
----
0001-ocamlopt.patch
libguestfs-1.24.6.tar.xz
New:
----
0000-hotfix.patch
libguestfs-1.26.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libguestfs.spec ++++++
--- /var/tmp/diff_new_pack.UHiCsI/_old 2014-04-05 16:47:03.000000000 +0200
+++ /var/tmp/diff_new_pack.UHiCsI/_new 2014-04-05 16:47:03.000000000 +0200
@@ -17,7 +17,7 @@
#
-Version: 1.24.6
+Version: 1.26.0
Release: 0
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
@@ -109,7 +109,9 @@
%if %{with bash_completion}
BuildRequires: bash-completion >= 2.0
%endif
+BuildRequires: bison
BuildRequires: file-devel
+BuildRequires: flex
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gperf
@@ -151,8 +153,8 @@
Summary: Compatibility package for guestfs-tools
License: GPL-2.0
Group: System/Filesystems
+Patch0: 0000-hotfix.patch
Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch
-Patch1: 0001-ocamlopt.patch
Source0: %{name}-%{version}.tar.xz
Source42: libguestfs.mkinitrd.tar.bz2
Source789653: Pod-Simple-3.23.tar.xz
@@ -460,7 +462,7 @@
%prep
: _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
%setup -q -a 789653 -a 42
-%patch1 -p1
+%patch0 -p1
%patch1000 -p1
%build
@@ -803,16 +805,18 @@
%files -n guestfsd
%defattr(-,root,root)
-%{udevrulesdir}
%{_sbindir}/guestfsd
%{_mandir}/man8/*
%files -n guestfs-tools -f %{name}.lang
%defattr(-,root,root)
%doc COPYING
-%{_sbindir}/libguestfs-make-fixed-appliance
%{_bindir}/*
%config(noreplace) /etc/libguestfs-tools.conf
+/etc/virt-builder
+%dir /etc/xdg/virt-builder
+%dir /etc/xdg/virt-builder/repos.d
+%config /etc/xdg/virt-builder/repos.d/*
%if %{with bash_completion}
%{_datadir}/bash-completion
%endif
++++++ 0000-hotfix.patch ++++++
From 464eafba694aaaff8c5c49fd1f4f0c08d069833d Mon Sep 17 00:00:00 2001
From: Olaf Hering
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
Signed-off-by: Olaf Hering
---
builder/Makefile.am | 3 +++
builder/Makefile.in | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
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
+
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 ++++++
--- /var/tmp/diff_new_pack.UHiCsI/_old 2014-04-05 16:47:03.000000000 +0200
+++ /var/tmp/diff_new_pack.UHiCsI/_new 2014-04-05 16:47:03.000000000 +0200
@@ -1,4 +1,4 @@
-From 6ad9fa64944b23817e8fa642c81fc3ecc93a3464 Mon Sep 17 00:00:00 2001
+From 6e67537d571c86bfc0a112ffd8962d244714b11a Mon Sep 17 00:00:00 2001
From: Olaf Hering
Date: Mon, 3 Sep 2012 19:50:44 +0200
Subject: force virtio_blk in old guest kernel
@@ -10,14 +10,14 @@
src/handle.c | 16 ++++++++++++++++
src/inspect-fs-unix.c | 4 ++--
src/launch-direct.c | 2 ++
- test-tool/test-tool.c | 15 ++++++++++++---
- 6 files changed, 38 insertions(+), 7 deletions(-)
+ test-tool/test-tool.c | 1 +
+ 6 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/fish/options.c b/fish/options.c
-index 770576b..6f143e1 100644
+index 80b71ec..2cef1bc 100644
--- a/fish/options.c
+++ b/fish/options.c
-@@ -100,7 +100,10 @@ add_drives (struct drv *drv, char next_drive)
+@@ -100,7 +100,10 @@ add_drives_handle (guestfs_h *g, struct drv *drv, char next_drive)
{
int r;
struct guestfs_add_drive_opts_argv ad_optargs;
@@ -29,7 +29,7 @@
if (next_drive > 'z') {
fprintf (stderr,
_("%s: too many drives added on the command line\n"),
-@@ -114,7 +117,7 @@ add_drives (struct drv *drv, char next_drive)
+@@ -114,7 +117,7 @@ add_drives_handle (guestfs_h *g, struct drv *drv, char next_drive)
free (drv->device);
drv->device = NULL;
@@ -39,10 +39,10 @@
exit (EXIT_FAILURE);
}
diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
-index 8888603..d4f6e90 100644
+index 27fc857..d31af9f 100644
--- a/src/guestfs-internal.h
+++ b/src/guestfs-internal.h
-@@ -472,6 +472,7 @@ struct guestfs_h
+@@ -501,6 +501,7 @@ struct guestfs_h
unsigned int nr_requested_credentials;
virConnectCredentialPtr requested_credentials;
#endif
@@ -51,11 +51,11 @@
/* Per-filesystem data stored for inspect_os. */
diff --git a/src/handle.c b/src/handle.c
-index fffe825..4633df6 100644
+index 687f059..11291dd 100644
--- a/src/handle.c
+++ b/src/handle.c
-@@ -237,6 +237,22 @@ parse_environment (guestfs_h *g,
- }
+@@ -258,6 +258,22 @@ parse_environment (guestfs_h *g,
+ return -1;
}
+/*
@@ -78,10 +78,10 @@
}
diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c
-index 93e035f..6d38bf8 100644
+index 17b0b5f..20af3f7 100644
--- a/src/inspect-fs-unix.c
+++ b/src/inspect-fs-unix.c
-@@ -1419,7 +1419,7 @@ resolve_fstab_device_diskbyid (guestfs_h *g, const char *part,
+@@ -1438,7 +1438,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 @@
if (!is_partition (g, device)) {
free (device);
return 0;
-@@ -1512,7 +1512,7 @@ resolve_fstab_device (guestfs_h *g, const char *spec, Hash_table *md_map)
+@@ -1531,7 +1531,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 @@
}
else if ((part = match1 (g, spec, re_diskbyid)) != NULL) {
diff --git a/src/launch-direct.c b/src/launch-direct.c
-index f44cc20..d212b87 100644
+index 5c756b7..2dd4817 100644
--- a/src/launch-direct.c
+++ b/src/launch-direct.c
-@@ -1066,6 +1066,8 @@ qemu_supports_virtio_scsi (guestfs_h *g, struct backend_direct_data *data)
+@@ -1185,6 +1185,8 @@ qemu_supports_virtio_scsi (guestfs_h *g, struct backend_direct_data *data)
data->virtio_scsi = 3;
}
}
@@ -113,25 +113,10 @@
return data->virtio_scsi == 1;
}
diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
-index 3a35226..03565ac 100644
+index 7e8d88e..8d5ae34 100644
--- a/test-tool/test-tool.c
+++ b/test-tool/test-tool.c
-@@ -44,6 +44,14 @@
-
- #define DEFAULT_TIMEOUT 600
-
-+#ifdef GUESTFS_QEMU_NO_VIRTIO_BLK
-+static const char disk[] = "/dev/vda";
-+static const char part[] = "/dev/vda1";
-+#else
-+static const char disk[] = "/dev/sda";
-+static const char part[] = "/dev/sda1";
-+#endif
-+
- static int timeout = DEFAULT_TIMEOUT;
-
- static void set_qemu (guestfs_h *g, const char *path, int use_wrapper);
-@@ -186,6 +194,7 @@ main (int argc, char *argv[])
+@@ -187,6 +187,7 @@ main (int argc, char *argv[])
exit (EXIT_FAILURE);
}
guestfs_set_verbose (g, 1);
@@ -139,26 +124,3 @@
if (qemu)
set_qemu (g, qemu, qemu_use_wrapper);
-@@ -272,19 +281,19 @@ main (int argc, char *argv[])
- fflush (stdout);
-
- /* Create the filesystem and mount everything. */
-- if (guestfs_part_disk (g, "/dev/sda", "mbr") == -1) {
-+ if (guestfs_part_disk (g, disk, "mbr") == -1) {
- fprintf (stderr,
- _("libguestfs-test-tool: failed to run part-disk\n"));
- exit (EXIT_FAILURE);
- }
-
-- if (guestfs_mkfs (g, "ext2", "/dev/sda1") == -1) {
-+ if (guestfs_mkfs (g, "ext2", part) == -1) {
- fprintf (stderr,
- _("libguestfs-test-tool: failed to mkfs.ext2\n"));
- exit (EXIT_FAILURE);
- }
-
-- if (guestfs_mount (g, "/dev/sda1", "/") == -1) {
-+ if (guestfs_mount (g, part, "/") == -1) {
- fprintf (stderr,
- _("libguestfs-test-tool: failed to mount /dev/sda1 on /\n"));
- exit (EXIT_FAILURE);
++++++ libguestfs-1.24.6.tar.xz -> libguestfs-1.26.0.tar.xz ++++++
++++ 920423 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org