Accepting request 919567 from Virtualization

Fixes broken build caused by new libguestfs OBS-URL: https://build.opensuse.org/request/show/919567 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-v2v?expand=0&rev=3
2021-09-16 21:15:05 +00:00 · 2021-09-16 21:15:05 +00:00 · 799c33bbf5
commit 799c33bbf5
parent 08c6e03ddc 60115e0f0c
6 changed files with 133 additions and 7 deletions
--- a/fix-linker-error.patch
+++ b/fix-linker-error.patch
@ -0,0 +1,90 @@
+Resolves the following error.
+Similar to libguestfs commit 489b14b75e5f30010d8a8c8d3a10ecc52b629563
+
+/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/ocaml/guestfs/libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): in function `guestfs_finalize':
+/home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c.c:86: undefined reference to `rpl_free'
+/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c.c:88: undefined reference to `rpl_free'
+/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/ocaml/guestfs/libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): in function `guestfs_int_ocaml_set_event_callback':
+/home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c.c:239: undefined reference to `rpl_free'
+/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/ocaml/guestfs/libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): in function `guestfs_int_ocaml_delete_event_callback':
+/home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c.c:266: undefined reference to `rpl_free'
+/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/ocaml/guestfs/libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): in function `guestfs_int_ocaml_event_to_string':
+/home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c.c:290: undefined reference to `rpl_free'
+/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/ocaml/guestfs/libmlguestfs.a(libguestfsocaml_a-guestfs-c-actions.o):/home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c-actions.c:1188: more undefined references to `rpl_free' follow
+collect2: error: ld returned 1 exit status
+File "caml_startup", line 1:
+Error: Error during linking
+
+
+Index: virt-v2v-1.44.0/gnulib/lib/free.c
+===================================================================
+--- /dev/null
+++ virt-v2v-1.44.0/gnulib/lib/free.c
+@@ -0,0 +1,53 @@
+/* Make free() preserve errno.
+
+   Copyright (C) 2003, 2006, 2009-2021 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* written by Paul Eggert */
+
+#include <config.h>
+
+/* Specification.  */
+#include <stdlib.h>
+
+/* A function definition is only needed if HAVE_FREE_POSIX is not defined.  */
+#if !HAVE_FREE_POSIX
+
+# include <errno.h>
+
+void
+rpl_free (void *p)
+# undef free
+{
+# if defined __GNUC__ && !defined __clang__
+  /* An invalid GCC optimization
+     <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98396>
+     would optimize away the assignments in the code below, when link-time
+     optimization (LTO) is enabled.  Make the code more complicated, so that
+     GCC does not grok how to optimize it.  */
+  int err[2];
+  err[0] = errno;
+  err[1] = errno;
+  errno = 0;
+  free (p);
+  errno = err[errno == 0];
+# else
+  int err = errno;
+  free (p);
+  errno = err;
+# endif
+}
+
+#endif
+Index: virt-v2v-1.44.0/gnulib/lib/Makefile.am
+===================================================================
+--- virt-v2v-1.44.0.orig/gnulib/lib/Makefile.am
+++ virt-v2v-1.44.0/gnulib/lib/Makefile.am
+@@ -35,7 +35,8 @@ libgnu_la_SOURCES = \
+ 	xstrtoll.c \
+ 	xstrtoul.c \
+ 	xstrtoull.c \
+-	xstrtoumax.c
+	xstrtoumax.c \
+	free.c
+ libutils_la_CFLAGS = \
+ 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+ 	$(GCC_VISIBILITY_HIDDEN)
--- a/virt-v2v-1.43.5.tar.gz
+++ b/virt-v2v-1.43.5.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:82f69f7b2f6c23def8c92ac3c75bee03a00dc2f90c2b261660f8b859f0fd446d
-size 3816915
--- a/virt-v2v-1.44.0.tar.gz
+++ b/virt-v2v-1.44.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa045c537eae5f6cc875980fc6a918df476468fe49fb12a31b69e293d2243575
+size 3817290
--- a/virt-v2v-1.44.0.tar.gz.sig
+++ b/virt-v2v-1.44.0.tar.gz.sig
@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmCMGQ4RHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKB5qxAAq1VvHPAksFn4JukXRp1bm0L19pGF9HSt
+0lhPiy74qIpsrU7tn6Rg7PtpCy9Jl5xQzohwyAauTRAVZ+eM6NxZ6LFQTtpR7rWz
+vPebdHDsDdGhdUFISE4ELRyb1J0hyuzYgJ4pfqoDfqUumZUe/ELFZTb8de5OHye3
+rZs47IgI5vdpBXYJCz1f4nKn5vNBYMIwNMNosxu2eO8NBbY0OhGwRi34xhoAzZQO
+whfDQ56beOACvNp7Ga1yeiI0PFuKh3TrNhtMXpH/cexOrr7YCW9wZFRCMQf6nqk2
+HEjyXwJCf7u07sDrE3DPvR4DlfGaCUh1TUwzec8++KdQva2Lskbday5o6ALx2yzO
+Dgb8WffK6qLCKoRNpo9Csuk+aLHqbPlzc9meAWaVdjmvbMnD3rmbBJ9LOWmKyfGh
+D+BJr5lKi2W1QQskDCOk3zGIBo96ikIril04vsZUiuZoYQ+DZuLNNS6Jbnk6TeK2
+5+s5EPQx+Csazha2WGlii3dKTFta5hsI4uZZodYygdVYfki9CbdGVEuO3icyYxIT
+g3v7VfDWwhDVrbdvi3A8nmLWH/1+GV/KYrfkayubbQTlXbQhMw92DX60PYgPz30N
+5upOdUybSjwRCSZSCaEBA06nNR+pthpZcmcpnFZtOuBuWHLGp/2SCdIKmR8kmx+Z
+uDntI0clC1c=
+=XbCj
+-----END PGP SIGNATURE-----
--- a/virt-v2v.changes
+++ b/virt-v2v.changes
@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Sep 16 11:58:59 MDT 2021 - carnold@suse.com
+
+- Fix ocaml linker error due to unresolved 'rpl_free'. For
+  comparison, see libguestfs commit 489b14b75e.
+  fix-linker-error.patch
+
+-------------------------------------------------------------------
+Fri May  7 14:34:45 MDT 2021 - carnold@suse.com
+
+- Update to version 1.44.0
+  Include virt-v2v-1.44.0.tar.gz.sig
+  * windows: Allow qxldod.inf as synonym for qxl.inf
+  * -i ova: Set LANG=C and --no-auto-compress when running tar.
+  * Increase required free space in Windows to 100 MB
+  * Tidy up error messages when mounting a virtio-win ISO
+
 -------------------------------------------------------------------
 Thu Apr 29 09:37:35 UTC 2021 - Predrag Ivanović <predivan@mts.rs>

--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@ -18,17 +18,19 @@


 # If there are patches which touch autotools files, set this to 1.
-%global patches_touch_autotools %{nil}
+%global patches_touch_autotools 1
 # The source directory.
-%global source_directory 1.43-development
+%global source_directory 1.44-stable
 Name:           virt-v2v
-Version:        1.43.5
+Version:        1.44.0
 Release:        0
 Summary:        Tools to convert a virtual machine to run on KVM
 License:        GPL-2.0-or-later
 Group:          System/Management
 URL:            https://github.com/libguestfs/virt-v2v
-Source0:        http://download.libguestfs.org/virt-v2v/%{source_directory}/%{name}-%{version}.tar.gz
+Patch0:         fix-linker-error.patch
+Source0:        https://download.libguestfs.org/virt-v2v/%{source_directory}/%{name}-%{version}.tar.gz
+Source1:        https://download.libguestfs.org/virt-v2v/%{source_directory}/%{name}-%{version}.tar.gz.sig
 BuildRequires:  augeas-devel
 BuildRequires:  file-devel
 #BuildRequires: /usr/bin/pod2man