From a7c0f2faa157cdd844393c486a53afb0af763885731da6c15c00528c542356ef Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 5 Oct 2021 21:57:32 +0000 Subject: [PATCH 1/2] - Update spec file licenses to GPL-2.0-or-later OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=485 --- libguestfs.changes | 5 +++++ libguestfs.spec | 17 +---------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index 9852985..bcc2b8b 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 5 15:53:39 MDT 2021 - carnold@suse.com + +- Update spec file licenses to GPL-2.0-or-later + ------------------------------------------------------------------- Wed Sep 15 10:31:29 MDT 2021 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index a603bad..53f65b3 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -139,7 +139,7 @@ BuildRequires: gtk2-devel URL: http://libguestfs.org/ Summary: Compatibility package for guestfs-tools # Upstream patches -License: GPL-2.0-only +License: GPL-2.0-or-later # Upstream Patch1: e26cfa44-daemon-Build-with--pthread.patch @@ -185,7 +185,6 @@ performing partial backups, cloning VMs, and much else besides. %package -n guestfs-tools Summary: Tools for accessing and modifying virtual machine disk images -License: GPL-2.0-only Provides: %{name} = %{version} Obsoletes: %{name} < %{version} Requires: libguestfs0 = %{version} @@ -237,7 +236,6 @@ virtual machines. %package -n guestfsd Summary: Daemon for the libguestfs appliance -License: GPL-2.0-only Conflicts: libaugeas0 < 1.0.0 %description -n guestfsd @@ -250,14 +248,12 @@ This package is only required for building the appliance. %package -n ocaml-libguestfs Summary: OCaml bindings for libguestfs # -License: GPL-2.0-only %description -n ocaml-libguestfs Allows OCaml scripts to directly use libguestfs. %package -n ocaml-libguestfs-devel Summary: Development files for libguesfs OCaml bindings -License: GPL-2.0-only %description -n ocaml-libguestfs-devel Allows OCaml scripts to directly use libguestfs. @@ -266,7 +262,6 @@ Allows OCaml scripts to directly use libguestfs. %if %{with perl_bindings} %package -n perl-Sys-Guestfs Summary: Perl bindings for libguestfs -License: GPL-2.0-only BuildRequires: perl BuildRequires: perl(Data::Dumper) BuildRequires: perl(Getopt::Long) @@ -293,7 +288,6 @@ Allows Perl scripts to directly use libguestfs. %if %{with lua_bindings} %package -n lua-libguestfs Summary: Lua bindings for libguestfs -License: GPL-2.0-only BuildRequires: lua-devel %define _configure_lua --enable-lua # @@ -307,7 +301,6 @@ Allows lua scripts to directly use libguestfs. %{?!python_module:%define python_module() python3-%{**}} %package -n python3-libguestfs Summary: Python 3 bindings for libguestfs -License: GPL-2.0-only BuildRequires: pkgconfig(python3) %define _configure_python --enable-python # @@ -322,7 +315,6 @@ Allows Python 3 scripts to directly use libguestfs. %if %{with ruby_bindings} %package -n rubygem-libguestfs Summary: Ruby bindings for libguestfs -License: GPL-2.0-only BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: rubygem(rake) @@ -335,7 +327,6 @@ Allows Ruby scripts to directly use libguestfs. %package test Summary: Testcases for libguestfs -License: GPL-2.0-only Requires: %{name} %description test @@ -438,7 +429,6 @@ Recommends: ldmtool Recommends: guestfs-winsupport Summary: Virtual machine needed for libguestfs -License: GPL-2.0-only Provides: libguestfs-data = %{version} Obsoletes: libguestfs-data < %{version} @@ -448,7 +438,6 @@ This package provides such an image, an initrd and a kernel. %package -n guestfs-winsupport Summary: Windows guest support in libguestfs -License: GPL-2.0-or-later Requires: libguestfs >= 1.32 BuildRequires: ntfs-3g BuildRequires: ntfsprogs @@ -459,7 +448,6 @@ Provides the needed pieces for libguestfs to handle Windows guests. %package devel Summary: Development files for libguestfs -License: GPL-2.0-only Requires: libguestfs0 = %{version} %description devel @@ -472,7 +460,6 @@ performing partial backups, cloning VMs, and much else besides. %package -n libguestfs0 Summary: Runtime library of libguestfs -License: LGPL-2.1-only Requires: %{kvm_binary} Requires: db48-utils Requires: guestfs-data >= %{version} @@ -501,7 +488,6 @@ virtual machines. %package -n virt-v2v Summary: Convert a virtual machine to run on KVM -License: GPL-2.0-only Requires: libguestfs0 = %{version} Requires: qemu-block-ssh # Conflicts with the old perl version @@ -515,7 +501,6 @@ from libvirt-managed hosts. %if %{with p2v} %package -n virt-p2v Summary: Convert a physical machine to run on KVM -License: GPL-2.0-only Requires: gawk Requires: virt-v2v = %{version} From cfd5004acfea798858c8b20b79b1c5a4c6a8c8b356531ec35efbd441abd9843d Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Wed, 27 Oct 2021 03:27:22 +0000 Subject: [PATCH 2/2] - Fix build errors in Factory * Alert ocaml_deprecated_cli: Setting a warning with a sequence of lowercase or uppercase letters, like 'CDEFLMPSUVYZX', is deprecated. 63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch * Error (warning 6 [labels-omitted]): label verbose was omitted in the application of this function. a4930f5f-customize-Suppress-OCaml-warning.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=486 --- ...aml.m4-Fix-deprecated-warning-format.patch | 27 +++++++++++++++++++ ...f5f-customize-Suppress-OCaml-warning.patch | 23 ++++++++++++++++ libguestfs.changes | 12 +++++++++ libguestfs.spec | 2 ++ 4 files changed, 64 insertions(+) create mode 100644 63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch create mode 100644 a4930f5f-customize-Suppress-OCaml-warning.patch diff --git a/63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch b/63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch new file mode 100644 index 0000000..6e64cf1 --- /dev/null +++ b/63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch @@ -0,0 +1,27 @@ +Subject: m4/guestfs-ocaml.m4: Fix deprecated warning format +From: Richard W.M. Jones rjones@redhat.com Tue Oct 5 20:51:19 2021 +0100 +Date: Tue Oct 5 21:08:07 2021 +0100: +Git: 63c9cd933af75ca759fa2f2bbdbb07a699df5b30 + +In OCaml 4.13: + +Alert ocaml_deprecated_cli: Setting a warning with a sequence of lowercase or uppercase letters, +like 'CDEFLMPSUVYZX', is deprecated. +Use the equivalent signed form: +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3. + +(cherry picked from +guestfs-tools commit fa4f59e1d99c08d7e0bae2a7cb54f254a6506d67) + +diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 +index 4b8a44dee..d7f9462ea 100644 +--- a/m4/guestfs-ocaml.m4 ++++ b/m4/guestfs-ocaml.m4 +@@ -232,7 +232,7 @@ EOF + ]) + + dnl Flags we want to pass to every OCaml compiler call. +-OCAML_WARN_ERROR="-warn-error CDEFLMPSUVYZX+52-3" ++OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3" + AC_SUBST([OCAML_WARN_ERROR]) + OCAML_FLAGS="-g -annot $safe_string_option" + AC_SUBST([OCAML_FLAGS]) diff --git a/a4930f5f-customize-Suppress-OCaml-warning.patch b/a4930f5f-customize-Suppress-OCaml-warning.patch new file mode 100644 index 0000000..07ff01d --- /dev/null +++ b/a4930f5f-customize-Suppress-OCaml-warning.patch @@ -0,0 +1,23 @@ +Subject: customize: Suppress OCaml warning +From: Richard W.M. Jones rjones@redhat.com Tue Oct 5 20:53:25 2021 +0100 +Date: Tue Oct 5 20:53:25 2021 +0100: +Git: a4930f5fad82e5358d565b8cf3610970e9646259 + +In OCaml 4.13: + +File "perl_edit.ml", line 30, characters 2-13: +30 | c_edit_file (verbose ()) g (Guestfs.c_pointer g) file expr + ^^^^^^^^^^^ +Error (warning 6 [labels-omitted]): label verbose was omitted in the application of this function. + +--- a/m4/guestfs-ocaml.m4 ++++ b/m4/guestfs-ocaml.m4 +@@ -232,7 +232,7 @@ EOF + ]) + + dnl Flags we want to pass to every OCaml compiler call. +-OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3" ++OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6" + AC_SUBST([OCAML_WARN_ERROR]) + OCAML_FLAGS="-g -annot $safe_string_option" + AC_SUBST([OCAML_FLAGS]) diff --git a/libguestfs.changes b/libguestfs.changes index bcc2b8b..32a236f 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Oct 26 20:44:52 MDT 2021 - carnold@suse.com + +- Fix build errors in Factory + * Alert ocaml_deprecated_cli: Setting a warning with a sequence + of lowercase or uppercase letters, like 'CDEFLMPSUVYZX', is + deprecated. + 63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch + * Error (warning 6 [labels-omitted]): label verbose was omitted + in the application of this function. + a4930f5f-customize-Suppress-OCaml-warning.patch + ------------------------------------------------------------------- Tue Oct 5 15:53:39 MDT 2021 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 53f65b3..d35943d 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -148,6 +148,8 @@ Patch3: 68a02c2f-customize--resize--sparsify--sysprep-Link-explicitly-wi Patch4: c0de4de9-appliance-add-reboot-and-netconfig-for-SUSE.patch Patch5: 9db0c98c-appliance-enable-bashs-Process-Substitution-feature.patch Patch6: f47e0bb6-appliance-reorder-mounting-of-special-filesystems-in-init.patch +Patch7: 63c9cd93-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch +Patch8: a4930f5f-customize-Suppress-OCaml-warning.patch # Pending upstram review Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch