From 6ddb96979f151a59cad32e4b7282f18327703642e76e01fb903c97807db7246a Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 21 Jul 2020 19:00:34 +0000 Subject: [PATCH 1/6] - Update to version 1.43.1 - Drop 31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch 7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=459 --- ...on-extract-UTF-8-conversion-function.patch | 20 +++++----- ...related-dependency-from-POTFILES-ml..patch | 34 ----------------- ...move-extra-LIBS-from-pkg-config-file.patch | 19 ---------- libguestfs-1.42.0.tar.gz | 3 -- libguestfs-1.43.1.tar.gz | 3 ++ libguestfs.changes | 8 ++++ libguestfs.spec | 37 ++----------------- 7 files changed, 25 insertions(+), 99 deletions(-) delete mode 100644 31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch delete mode 100644 7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch delete mode 100644 libguestfs-1.42.0.tar.gz create mode 100644 libguestfs-1.43.1.tar.gz diff --git a/0002-common-extract-UTF-8-conversion-function.patch b/0002-common-extract-UTF-8-conversion-function.patch index 08de7b9..d65d21b 100644 --- a/0002-common-extract-UTF-8-conversion-function.patch +++ b/0002-common-extract-UTF-8-conversion-function.patch @@ -13,10 +13,10 @@ guestfs-utils.h as guestfs_int_string_to_utf8() common/utils/utils.c | 64 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 68 deletions(-) -Index: libguestfs-1.42.0/common/utils/guestfs-utils.h +Index: libguestfs-1.43.1/common/utils/guestfs-utils.h =================================================================== ---- libguestfs-1.42.0.orig/common/utils/guestfs-utils.h -+++ libguestfs-1.42.0/common/utils/guestfs-utils.h +--- libguestfs-1.43.1.orig/common/utils/guestfs-utils.h ++++ libguestfs-1.43.1/common/utils/guestfs-utils.h @@ -33,6 +33,7 @@ #define GUESTFS_UTILS_H_ @@ -43,10 +43,10 @@ Index: libguestfs-1.42.0/common/utils/guestfs-utils.h /* Not all language bindings know how to deal with Pointer arguments. * Those that don't will use this macro which complains noisily and * returns NULL. -Index: libguestfs-1.42.0/common/utils/libxml2-utils.c +Index: libguestfs-1.43.1/common/utils/libxml2-utils.c =================================================================== ---- libguestfs-1.42.0.orig/common/utils/libxml2-utils.c -+++ libguestfs-1.42.0/common/utils/libxml2-utils.c +--- libguestfs-1.43.1.orig/common/utils/libxml2-utils.c ++++ libguestfs-1.43.1/common/utils/libxml2-utils.c @@ -30,8 +30,6 @@ #include #include @@ -141,10 +141,10 @@ Index: libguestfs-1.42.0/common/utils/libxml2-utils.c - - return out; -} -Index: libguestfs-1.42.0/common/utils/utils.c +Index: libguestfs-1.43.1/common/utils/utils.c =================================================================== ---- libguestfs-1.42.0.orig/common/utils/utils.c -+++ libguestfs-1.42.0/common/utils/utils.c +--- libguestfs-1.43.1.orig/common/utils/utils.c ++++ libguestfs-1.43.1/common/utils/utils.c @@ -35,6 +35,7 @@ #include #include @@ -153,7 +153,7 @@ Index: libguestfs-1.42.0/common/utils/utils.c /* NB: MUST NOT require linking to gnulib, because that will break the * Python 'sdist' which includes a copy of this file. It's OK to -@@ -641,3 +642,66 @@ guestfs_int_hexdump (const void *data, s +@@ -640,3 +641,66 @@ guestfs_int_hexdump (const void *data, s fprintf (fp, "|\n"); } } diff --git a/31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch b/31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch deleted file mode 100644 index 96843f0..0000000 --- a/31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch +++ /dev/null @@ -1,34 +0,0 @@ -Subject: po: Remove virt-v2v related dependency from POTFILES-ml. -From: Richard W.M. Jones rjones@redhat.com Mon Mar 9 17:31:55 2020 +0000 -Date: Mon Mar 9 17:31:55 2020 +0000: -Git: 31e6b187100626cae44bcb505db153088245155c - -Causes this error if you compile libguestfs 1.42.0 from the tarball -without invoking the generator: - -make[4]: *** No rule to make target '../common/mlv2v/uefi.ml', needed by 'libguestfs.pot'. Stop. - -diff --git a/Makefile.am b/Makefile.am -index 27f2c6eed..2f0446d60 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -345,6 +345,7 @@ po/POTFILES-ml: configure.ac - cd $(srcdir); \ - find builder common/ml* customize dib get-kernel resize sparsify sysprep -name '*.ml' | \ - grep -v '^builder/templates/' | \ -+ grep -v '^common/mlv2v/' | \ - grep -v -E '.*_tests\.ml$$' | \ - LC_ALL=C sort > $@-t - mv $@-t $@ -diff --git a/po/POTFILES-ml b/po/POTFILES-ml -index a9b6efdaa..2fbdff03d 100644 ---- a/po/POTFILES-ml -+++ b/po/POTFILES-ml -@@ -41,7 +41,6 @@ common/mltools/urandom.ml - common/mltools/xpath_helpers.ml - common/mlutils/c_utils.ml - common/mlutils/unix_utils.ml --common/mlv2v/uefi.ml - common/mlvisit/visit.ml - common/mlxml/xml.ml - customize/append_line.ml diff --git a/7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch b/7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch deleted file mode 100644 index ad40a18..0000000 --- a/7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch +++ /dev/null @@ -1,19 +0,0 @@ -Subject: lib: remove extra @LIBS@ from pkg-config file -From: Pino Toscano ptoscano@redhat.com Wed Mar 11 13:19:31 2020 +0100 -Date: Thu Mar 12 11:45:30 2020 +0100: -Git: 7265f08ce99e592a63a9470afad2da95167a800c - -At the moment it is empty, so probably it does not exist. Remove it to -avoid adding spurious content to the pkg-config file in case that -variable will get a value in the future. - -diff --git a/lib/libguestfs.pc.in b/lib/libguestfs.pc.in -index 679ed7eba..013bf0f28 100644 ---- a/lib/libguestfs.pc.in -+++ b/lib/libguestfs.pc.in -@@ -8,4 +8,4 @@ Version: @VERSION@ - Description: libguestfs library for accessing and modifying VM images - Requires: - Cflags: --Libs: -lguestfs @LIBS@ -+Libs: -lguestfs diff --git a/libguestfs-1.42.0.tar.gz b/libguestfs-1.42.0.tar.gz deleted file mode 100644 index 881c430..0000000 --- a/libguestfs-1.42.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4fee192cf3aaa597f142afb21fa2d7f380fdabcf34d054e37090163e4a74f024 -size 23614321 diff --git a/libguestfs-1.43.1.tar.gz b/libguestfs-1.43.1.tar.gz new file mode 100644 index 0000000..4d4fb90 --- /dev/null +++ b/libguestfs-1.43.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38672e8dbd08fa5cf8b59df27e013d372919048939f07550d2af5388e705147b +size 23643652 diff --git a/libguestfs.changes b/libguestfs.changes index f04e95d..a9b9281 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 20 17:16:28 MDT 2020 - carnold@suse.com + +- Update to version 1.43.1 +- Drop + 31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch + 7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch + ------------------------------------------------------------------- Tue Jul 7 15:48:08 MDT 2020 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index fb24ecf..2e88691 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -18,7 +18,7 @@ # needsbinariesforbuild -Version: 1.42.0 +Version: 1.43.1 Release: 0 %{ocaml_preserve_bytecode} @@ -102,6 +102,7 @@ BuildRequires: dhcp-client BuildRequires: libjansson-devel BuildRequires: pcre-devel BuildRequires: pkg-config +BuildRequires: python3-devel BuildRequires: qemu-tools BuildRequires: readline-devel BuildRequires: supermin >= 5.1.6 @@ -143,8 +144,6 @@ Summary: Compatibility package for guestfs-tools # Upstream patches License: GPL-2.0-only Group: System/Filesystems -Patch1: 31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch -Patch2: 7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch # Pending upstram review Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch @@ -304,25 +303,7 @@ Allows lua scripts to directly use libguestfs. # %if %{with python_bindings} -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%package -n python2-libguestfs -Summary: Python 2 bindings for libguestfs -License: GPL-2.0-only -Group: Development/Languages/Python -BuildRequires: %{python_module devel} -BuildRequires: %{python_module setuptools} -BuildRequires: python -BuildRequires: python-devel -BuildRequires: python-rpm-macros -%define _configure_python --enable-python -# -Obsoletes: libguestfs-python < %{version} -Obsoletes: python-libguestfs < %{version} -Provides: python-libguestfs = %{version} - -%description -n python2-libguestfs -Allows Python 2 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 @@ -560,8 +541,7 @@ It can import a variety of guest operating systems from libvirt-managed hosts. %prep : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' %setup -q -a 789653 -%patch1 -p1 -%patch2 -p1 +#%setup -q -a 1 -a 2 -a 789653 %patch50 -p1 %patch51 -p1 %patch52 -p1 @@ -663,12 +643,6 @@ mv t %{name}.files pushd python sed -i -e "s:libraries=:library_dirs=['%{buildroot}/%{_libdir}'], libraries=:" setup.py make stamp-extra-files -# Build needs libguestfs library to be installed - -# HACKY! Change config.h for python2 -echo '#define HAVE_PYSTRING_ASSTRING 1' >> config.h -%python2_build -%python2_install # HACKY! Change config.h for python3 sed 's/\(#define HAVE_PYSTRING_ASSTRING 1\)/\/* \1 *\//' -i config.h @@ -797,9 +771,6 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in %endif # %if %{with python_bindings} -%files -n python2-libguestfs -%defattr(-,root,root) -%{python2_sitearch}/* %files -n python3-libguestfs %defattr(-,root,root) From c8a6e6d9c96fcec58d219a50379032cf67e424750c3979b76f5726e943a23b72 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 6 Oct 2020 20:23:44 +0000 Subject: [PATCH 2/6] - Update to version 1.43.2 * Bug fix release * Updated language files * Drop support for python 2 * builder: New templates added * sysprep: ca-certificates: request system CA store update * Various other bug fixes OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=460 --- libguestfs-1.43.1.tar.gz | 3 --- libguestfs-1.43.2.tar.gz | 3 +++ libguestfs.changes | 11 +++++++++++ libguestfs.spec | 8 ++++---- 4 files changed, 18 insertions(+), 7 deletions(-) delete mode 100644 libguestfs-1.43.1.tar.gz create mode 100644 libguestfs-1.43.2.tar.gz diff --git a/libguestfs-1.43.1.tar.gz b/libguestfs-1.43.1.tar.gz deleted file mode 100644 index 4d4fb90..0000000 --- a/libguestfs-1.43.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38672e8dbd08fa5cf8b59df27e013d372919048939f07550d2af5388e705147b -size 23643652 diff --git a/libguestfs-1.43.2.tar.gz b/libguestfs-1.43.2.tar.gz new file mode 100644 index 0000000..f12602d --- /dev/null +++ b/libguestfs-1.43.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11e48a5630aba7779b9e3fe1bd08fa3a1a3ec3dda777214a844e0b8b1ff8bca9 +size 23320958 diff --git a/libguestfs.changes b/libguestfs.changes index a9b9281..3e08c6e 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,7 +1,18 @@ +------------------------------------------------------------------- +Tue Oct 6 14:07:12 MDT 2020 - carnold@suse.com + +- Update to version 1.43.2 + * Bug fix release + * Updated language files + ------------------------------------------------------------------- Mon Jul 20 17:16:28 MDT 2020 - carnold@suse.com - Update to version 1.43.1 + * Drop support for python 2 + * builder: New templates added + * sysprep: ca-certificates: request system CA store update + * Various other bug fixes - Drop 31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch 7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch diff --git a/libguestfs.spec b/libguestfs.spec index 2e88691..5a36f98 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2011 Michal Hrusecky # # All modifications and additions to the file contributed by third parties @@ -13,12 +13,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # needsbinariesforbuild -Version: 1.43.1 +Version: 1.43.2 Release: 0 %{ocaml_preserve_bytecode} @@ -138,7 +138,7 @@ BuildRequires: hivex-devel BuildRequires: gtk2-devel %endif # -Url: http://libguestfs.org/ +URL: http://libguestfs.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Compatibility package for guestfs-tools # Upstream patches From 1f8c975e36dd41ff5f1ff0b7931df54688e28ab498fe060dcacca386a248bc86 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 6 Oct 2020 22:07:16 +0000 Subject: [PATCH 3/6] - Added upstream bug fixes dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch bfd08867-golang-Fix-path-to-include-guestfs.h..patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=461 --- ...olang-Fix-path-to-include-guestfs.h..patch | 24 +++++++++++++++++++ ...ludedir-in-uninstalled-libguestfs.pc.patch | 22 +++++++++++++++++ libguestfs.changes | 3 +++ libguestfs.spec | 5 ++++ 4 files changed, 54 insertions(+) create mode 100644 bfd08867-golang-Fix-path-to-include-guestfs.h..patch create mode 100644 dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch diff --git a/bfd08867-golang-Fix-path-to-include-guestfs.h..patch b/bfd08867-golang-Fix-path-to-include-guestfs.h..patch new file mode 100644 index 0000000..1187c23 --- /dev/null +++ b/bfd08867-golang-Fix-path-to-include-guestfs.h..patch @@ -0,0 +1,24 @@ +Subject: golang: Fix path to include/guestfs.h. +From: Richard W.M. Jones rjones@redhat.com Tue Oct 6 15:25:32 2020 +0100 +Date: Tue Oct 6 15:26:14 2020 +0100: +Git: bfd0886765fef19a8c7313402f882b543a7dfb6d + +Thanks: Martin Kletzander +Fixes: commit 75abec1f706e555cd6c9915be03c732b56a94596 + +diff --git a/run.in b/run.in +index 90552fb04..10844a651 100755 +--- a/run.in ++++ b/run.in +@@ -181,9 +181,9 @@ export GOLANG="@GOLANG@" + prepend GOPATH "$b/golang" + export GOPATH + if [ -z "$CGO_CFLAGS" ]; then +- CGO_CFLAGS="-I$s/lib" ++ CGO_CFLAGS="-I$s/include" + else +- CGO_CFLAGS="$CGO_CFLAGS -I$s/lib" ++ CGO_CFLAGS="$CGO_CFLAGS -I$s/include" + fi + export CGO_CFLAGS + if [ -z "$CGO_CFLAGS_ALLOW" ]; then diff --git a/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch b/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch new file mode 100644 index 0000000..7c1cc47 --- /dev/null +++ b/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch @@ -0,0 +1,22 @@ +Subject: build: fix includedir in uninstalled libguestfs.pc +From: Pino Toscano ptoscano@redhat.com Tue Sep 22 18:12:05 2020 +0200 +Date: Tue Sep 22 18:12:05 2020 +0200: +Git: dbfab7d3b283181ec6ef685fff0862cdd4da76c0 + +Update includedir with the new directory that contains guestfs.h. + +Updates commit 75abec1f706e555cd6c9915be03c732b56a94596. + +diff --git a/lib/local/libguestfs.pc.in b/lib/local/libguestfs.pc.in +index 129682be8..46cef1e16 100644 +--- a/lib/local/libguestfs.pc.in ++++ b/lib/local/libguestfs.pc.in +@@ -26,7 +26,7 @@ + prefix=@abs_top_builddir@ + exec_prefix=@abs_top_builddir@ + libdir=@abs_top_builddir@/lib/.libs +-includedir=@abs_top_srcdir@/lib ++includedir=@abs_top_srcdir@/include + + Name: libguestfs + Version: @VERSION@ diff --git a/libguestfs.changes b/libguestfs.changes index 3e08c6e..d5f0f0a 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -4,6 +4,9 @@ Tue Oct 6 14:07:12 MDT 2020 - carnold@suse.com - Update to version 1.43.2 * Bug fix release * Updated language files +- Added upstream bug fixes + dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch + bfd08867-golang-Fix-path-to-include-guestfs.h..patch ------------------------------------------------------------------- Mon Jul 20 17:16:28 MDT 2020 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 5a36f98..5283804 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -145,6 +145,9 @@ Summary: Compatibility package for guestfs-tools License: GPL-2.0-only Group: System/Filesystems +Patch1: dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch +Patch2: bfd08867-golang-Fix-path-to-include-guestfs.h..patch + # Pending upstram review Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch Patch51: 0002-common-extract-UTF-8-conversion-function.patch @@ -542,6 +545,8 @@ It can import a variety of guest operating systems from libvirt-managed hosts. : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' %setup -q -a 789653 #%setup -q -a 1 -a 2 -a 789653 +%patch1 -p1 +%patch2 -p1 %patch50 -p1 %patch51 -p1 %patch52 -p1 From c3e8b0607394b488a86b2afd48f47f379c0c0412c347f40a6da64563f148a2fa Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Wed, 7 Oct 2020 19:07:09 +0000 Subject: [PATCH 4/6] The location of guestfs.h has moved. 0004-python-include-dirs.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=462 --- ...troduce-a-wrapper-around-xmlParseURI.patch | 54 +++++++++++-------- 0004-python-include-dirs.patch | 11 ++++ libguestfs.changes | 1 + libguestfs.spec | 2 + 4 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 0004-python-include-dirs.patch diff --git a/0001-Introduce-a-wrapper-around-xmlParseURI.patch b/0001-Introduce-a-wrapper-around-xmlParseURI.patch index 5866929..a0c676f 100644 --- a/0001-Introduce-a-wrapper-around-xmlParseURI.patch +++ b/0001-Introduce-a-wrapper-around-xmlParseURI.patch @@ -37,10 +37,10 @@ libvirt URLs. create mode 100644 common/utils/libxml2-utils.c create mode 100644 common/utils/libxml2-utils.h -Index: libguestfs-1.42.0/common/mlxml/Makefile.am +Index: libguestfs-1.43.2/common/mlxml/Makefile.am =================================================================== ---- libguestfs-1.42.0.orig/common/mlxml/Makefile.am -+++ libguestfs-1.42.0/common/mlxml/Makefile.am +--- libguestfs-1.43.2.orig/common/mlxml/Makefile.am ++++ libguestfs-1.43.2/common/mlxml/Makefile.am @@ -54,6 +54,7 @@ libmlxml_a_CPPFLAGS = \ -I. \ -I$(top_builddir) \ @@ -49,10 +49,10 @@ Index: libguestfs-1.42.0/common/mlxml/Makefile.am -I$(shell $(OCAMLC) -where) libmlxml_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ -Index: libguestfs-1.42.0/common/mlxml/xml-c.c +Index: libguestfs-1.43.2/common/mlxml/xml-c.c =================================================================== ---- libguestfs-1.42.0.orig/common/mlxml/xml-c.c -+++ libguestfs-1.42.0/common/mlxml/xml-c.c +--- libguestfs-1.43.2.orig/common/mlxml/xml-c.c ++++ libguestfs-1.43.2/common/mlxml/xml-c.c @@ -27,17 +27,21 @@ #include #include @@ -133,19 +133,19 @@ Index: libguestfs-1.42.0/common/mlxml/xml-c.c + xmlFreeURI (uri); CAMLreturn (rv); } -Index: libguestfs-1.42.0/common/mlxml/xml.ml +Index: libguestfs-1.43.2/common/mlxml/xml.ml =================================================================== ---- libguestfs-1.42.0.orig/common/mlxml/xml.ml -+++ libguestfs-1.42.0/common/mlxml/xml.ml +--- libguestfs-1.43.2.orig/common/mlxml/xml.ml ++++ libguestfs-1.43.2/common/mlxml/xml.ml @@ -162,3 +162,4 @@ type uri = { } external parse_uri : string -> uri = "mllib_xml_parse_uri" +external parse_nonstandard_uri : string -> uri = "mllib_xml_parse_nonstandard_uri" -Index: libguestfs-1.42.0/common/mlxml/xml.mli +Index: libguestfs-1.43.2/common/mlxml/xml.mli =================================================================== ---- libguestfs-1.42.0.orig/common/mlxml/xml.mli -+++ libguestfs-1.42.0/common/mlxml/xml.mli +--- libguestfs-1.43.2.orig/common/mlxml/xml.mli ++++ libguestfs-1.43.2/common/mlxml/xml.mli @@ -115,3 +115,7 @@ val parse_uri : string -> uri Note this is different from the {!URI} module which is specialized for parsing the [-a] parameter on the command line. This function @@ -154,10 +154,10 @@ Index: libguestfs-1.42.0/common/mlxml/xml.mli +val parse_nonstandard_uri : string -> uri +(** Similar to {!parse_uri} but only for use with our non-standard + URIs. See [guestfs_int_parse_nonstandard_uri] in [common/utils]. *) -Index: libguestfs-1.42.0/common/options/uri.c +Index: libguestfs-1.43.2/common/options/uri.c =================================================================== ---- libguestfs-1.42.0.orig/common/options/uri.c -+++ libguestfs-1.42.0/common/options/uri.c +--- libguestfs-1.43.2.orig/common/options/uri.c ++++ libguestfs-1.43.2/common/options/uri.c @@ -38,6 +38,7 @@ #include "guestfs.h" @@ -178,11 +178,11 @@ Index: libguestfs-1.42.0/common/options/uri.c getprogname (), arg); return -1; } -Index: libguestfs-1.42.0/common/utils/Makefile.am +Index: libguestfs-1.43.2/common/utils/Makefile.am =================================================================== ---- libguestfs-1.42.0.orig/common/utils/Makefile.am -+++ libguestfs-1.42.0/common/utils/Makefile.am -@@ -28,6 +28,8 @@ libutils_la_SOURCES = \ +--- libguestfs-1.43.2.orig/common/utils/Makefile.am ++++ libguestfs-1.43.2/common/utils/Makefile.am +@@ -28,12 +28,15 @@ libutils_la_SOURCES = \ libxml2-cleanups.c \ libxml2-writer-macros.h \ stringlists-utils.c \ @@ -191,10 +191,18 @@ Index: libguestfs-1.42.0/common/utils/Makefile.am utils.c libutils_la_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ -Index: libguestfs-1.42.0/common/utils/libxml2-utils.c + -DGUESTFS_PRIVATE=1 \ + -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ +- -I$(top_srcdir)/lib -I$(top_builddir)/lib ++ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ ++ -I$(top_builddir)/include + libutils_la_CFLAGS = \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(GCC_VISIBILITY_HIDDEN) \ +Index: libguestfs-1.43.2/common/utils/libxml2-utils.c =================================================================== --- /dev/null -+++ libguestfs-1.42.0/common/utils/libxml2-utils.c ++++ libguestfs-1.43.2/common/utils/libxml2-utils.c @@ -0,0 +1,178 @@ +/* libguestfs + * Copyright (C) 2017 Red Hat Inc. @@ -374,10 +382,10 @@ Index: libguestfs-1.42.0/common/utils/libxml2-utils.c + + return out; +} -Index: libguestfs-1.42.0/common/utils/libxml2-utils.h +Index: libguestfs-1.43.2/common/utils/libxml2-utils.h =================================================================== --- /dev/null -+++ libguestfs-1.42.0/common/utils/libxml2-utils.h ++++ libguestfs-1.43.2/common/utils/libxml2-utils.h @@ -0,0 +1,27 @@ +/* libguestfs + * Copyright (C) 2017 Red Hat Inc. diff --git a/0004-python-include-dirs.patch b/0004-python-include-dirs.patch new file mode 100644 index 0000000..996f05b --- /dev/null +++ b/0004-python-include-dirs.patch @@ -0,0 +1,11 @@ +--- libguestfs-1.43.2/python/setup.py.in.orig 2020-10-07 11:50:58.255281701 -0600 ++++ libguestfs-1.43.2/python/setup.py.in 2020-10-07 11:51:19.023282602 -0600 +@@ -64,7 +64,7 @@ This package contains the Python binding + 'structs.c', + 'stringlists-utils.c'], + +- include_dirs=['.', '../lib'], ++ include_dirs=['.', '../lib', '../include'], + libraries=['guestfs'], + define_macros=[('GUESTFS_PRIVATE', '1')], + ) diff --git a/libguestfs.changes b/libguestfs.changes index d5f0f0a..2ed946d 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -4,6 +4,7 @@ Tue Oct 6 14:07:12 MDT 2020 - carnold@suse.com - Update to version 1.43.2 * Bug fix release * Updated language files + 0004-python-include-dirs.patch - Added upstream bug fixes dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch bfd08867-golang-Fix-path-to-include-guestfs.h..patch diff --git a/libguestfs.spec b/libguestfs.spec index 5283804..e4292e0 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -152,6 +152,7 @@ Patch2: bfd08867-golang-Fix-path-to-include-guestfs.h..patch Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch Patch51: 0002-common-extract-UTF-8-conversion-function.patch Patch52: 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch +Patch53: 0004-python-include-dirs.patch # Our patches Patch100: appliance.patch Patch101: netconfig.patch @@ -550,6 +551,7 @@ It can import a variety of guest operating systems from libvirt-managed hosts. %patch50 -p1 %patch51 -p1 %patch52 -p1 +%patch53 -p1 %patch100 -p1 %patch101 -p1 From 02e1a0bd4ea45aee0a7f2936e5e80386ea8844cdccbfd364b840d2b53cc2523c Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 11 Jan 2021 22:42:53 +0000 Subject: [PATCH 5/6] =?UTF-8?q?-=20Update=20to=20version=201.44.0=20=20=20?= =?UTF-8?q?*=20The=20minimum=20version=20of=20Python=20required=20is=203.6?= =?UTF-8?q?.=20=20=20*=20Python=20bindings=20no=20longer=20use=20deprecate?= =?UTF-8?q?d=20=20=20=20=20"PyEval=5FThreadsInitialized".=20=20=20*=20Pyth?= =?UTF-8?q?on=20bindings=20now=20include=20type=20hints=20(Sam=20Eiderman)?= =?UTF-8?q?.=20=20=20*=20Erlang=20bindings=20now=20use=20libei=20instead?= =?UTF-8?q?=20of=20liberl=5Finterface=20=20=20=20=20(Sergei=20Golovan).=20?= =?UTF-8?q?=20=20*=20virt-get-kernel(1)=20can=20now=20find=20uncompressed?= =?UTF-8?q?=20kernels=20=20=20=20=20(Pino=20Toscano).=20=20=20*=20virt-sys?= =?UTF-8?q?prep(1)=20now=20regenerates=20the=20guest=20certificate=20store?= =?UTF-8?q?=20=20=20=20=20when=20a=20certificate=20is=20removed=20from=20t?= =?UTF-8?q?he=20guest=20(Pino=20Toscano).=20=20=20*=20virt-sysprep(1)=20ca?= =?UTF-8?q?n=20now=20remove=20IPA=20enrollment=20files=20and=20=20=20=20?= =?UTF-8?q?=20Kerberos=20keytabs=20=20=20=20=20(Pino=20Toscano,=20Christia?= =?UTF-8?q?n=20Heimes=20and=20Fran=C3=A7ois=20Cami).=20=20=20*=20"cryptset?= =?UTF-8?q?up-open"=20and=20"cryptsetup-close"=20replace=20"luks-open",=20?= =?UTF-8?q?=20=20=20=20luks-open-ro=20and=20luks-close.=20The=20new=20APIs?= =?UTF-8?q?=20add=20support=20for=20=20=20=20=20BitLocker=20encryption.=20?= =?UTF-8?q?=20=20*=20"lvm-canonical-lv"=20no=20longer=20produces=20a=20noi?= =?UTF-8?q?sy=20error=20message=20=20=20=20=20when=20called=20with=20a=20n?= =?UTF-8?q?on-LV=20parameter.=20=20=20*=20Various=20other=20bug=20fixes=20?= =?UTF-8?q?-=20Drop=20=20=20=20bfd08867-golang-Fix-path-to-include-guestfs?= =?UTF-8?q?.h..patch=20=20=20=20dbfab7d3-build-fix-includedir-in-uninstall?= =?UTF-8?q?ed-libguestfs.pc.patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Drop is_opensuse references to remove differences between Leap and SLES packaging libguestfs.spec OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=463 --- ...olang-Fix-path-to-include-guestfs.h..patch | 24 ----------- ...ludedir-in-uninstalled-libguestfs.pc.patch | 22 ---------- libguestfs-1.43.2.tar.gz | 3 -- libguestfs-1.44.0.tar.gz | 3 ++ libguestfs.changes | 34 +++++++++++++++ libguestfs.spec | 41 ++++++------------- netconfig.patch | 8 ++-- 7 files changed, 53 insertions(+), 82 deletions(-) delete mode 100644 bfd08867-golang-Fix-path-to-include-guestfs.h..patch delete mode 100644 dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch delete mode 100644 libguestfs-1.43.2.tar.gz create mode 100644 libguestfs-1.44.0.tar.gz diff --git a/bfd08867-golang-Fix-path-to-include-guestfs.h..patch b/bfd08867-golang-Fix-path-to-include-guestfs.h..patch deleted file mode 100644 index 1187c23..0000000 --- a/bfd08867-golang-Fix-path-to-include-guestfs.h..patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: golang: Fix path to include/guestfs.h. -From: Richard W.M. Jones rjones@redhat.com Tue Oct 6 15:25:32 2020 +0100 -Date: Tue Oct 6 15:26:14 2020 +0100: -Git: bfd0886765fef19a8c7313402f882b543a7dfb6d - -Thanks: Martin Kletzander -Fixes: commit 75abec1f706e555cd6c9915be03c732b56a94596 - -diff --git a/run.in b/run.in -index 90552fb04..10844a651 100755 ---- a/run.in -+++ b/run.in -@@ -181,9 +181,9 @@ export GOLANG="@GOLANG@" - prepend GOPATH "$b/golang" - export GOPATH - if [ -z "$CGO_CFLAGS" ]; then -- CGO_CFLAGS="-I$s/lib" -+ CGO_CFLAGS="-I$s/include" - else -- CGO_CFLAGS="$CGO_CFLAGS -I$s/lib" -+ CGO_CFLAGS="$CGO_CFLAGS -I$s/include" - fi - export CGO_CFLAGS - if [ -z "$CGO_CFLAGS_ALLOW" ]; then diff --git a/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch b/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch deleted file mode 100644 index 7c1cc47..0000000 --- a/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch +++ /dev/null @@ -1,22 +0,0 @@ -Subject: build: fix includedir in uninstalled libguestfs.pc -From: Pino Toscano ptoscano@redhat.com Tue Sep 22 18:12:05 2020 +0200 -Date: Tue Sep 22 18:12:05 2020 +0200: -Git: dbfab7d3b283181ec6ef685fff0862cdd4da76c0 - -Update includedir with the new directory that contains guestfs.h. - -Updates commit 75abec1f706e555cd6c9915be03c732b56a94596. - -diff --git a/lib/local/libguestfs.pc.in b/lib/local/libguestfs.pc.in -index 129682be8..46cef1e16 100644 ---- a/lib/local/libguestfs.pc.in -+++ b/lib/local/libguestfs.pc.in -@@ -26,7 +26,7 @@ - prefix=@abs_top_builddir@ - exec_prefix=@abs_top_builddir@ - libdir=@abs_top_builddir@/lib/.libs --includedir=@abs_top_srcdir@/lib -+includedir=@abs_top_srcdir@/include - - Name: libguestfs - Version: @VERSION@ diff --git a/libguestfs-1.43.2.tar.gz b/libguestfs-1.43.2.tar.gz deleted file mode 100644 index f12602d..0000000 --- a/libguestfs-1.43.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11e48a5630aba7779b9e3fe1bd08fa3a1a3ec3dda777214a844e0b8b1ff8bca9 -size 23320958 diff --git a/libguestfs-1.44.0.tar.gz b/libguestfs-1.44.0.tar.gz new file mode 100644 index 0000000..0bd5ad2 --- /dev/null +++ b/libguestfs-1.44.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ec7b44a4c50e928583c56099da31ceb9680766043bd7d468f3ca7b741c55d21 +size 23469286 diff --git a/libguestfs.changes b/libguestfs.changes index 2ed946d..9456b62 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Mon Jan 11 11:42:51 MST 2021 - carnold@suse.com + +- Update to version 1.44.0 + * The minimum version of Python required is 3.6. + * Python bindings no longer use deprecated + "PyEval_ThreadsInitialized". + * Python bindings now include type hints (Sam Eiderman). + * Erlang bindings now use libei instead of liberl_interface + (Sergei Golovan). + * virt-get-kernel(1) can now find uncompressed kernels + (Pino Toscano). + * virt-sysprep(1) now regenerates the guest certificate store + when a certificate is removed from the guest (Pino Toscano). + * virt-sysprep(1) can now remove IPA enrollment files and + Kerberos keytabs + (Pino Toscano, Christian Heimes and François Cami). + * "cryptsetup-open" and "cryptsetup-close" replace "luks-open", + luks-open-ro and luks-close. The new APIs add support for + BitLocker encryption. + * "lvm-canonical-lv" no longer produces a noisy error message + when called with a non-LV parameter. + * Various other bug fixes +- Drop + bfd08867-golang-Fix-path-to-include-guestfs.h..patch + dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch + +------------------------------------------------------------------- +Tue Oct 20 14:01:16 MDT 2020 - carnold@suse.com + +- Drop is_opensuse references to remove differences between Leap + and SLES packaging + libguestfs.spec + ------------------------------------------------------------------- Tue Oct 6 14:07:12 MDT 2020 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index e4292e0..621a850 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2011 Michal Hrusecky # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ # needsbinariesforbuild -Version: 1.43.2 +Version: 1.44.0 Release: 0 %{ocaml_preserve_bytecode} @@ -145,9 +145,6 @@ Summary: Compatibility package for guestfs-tools License: GPL-2.0-only Group: System/Filesystems -Patch1: dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch -Patch2: bfd08867-golang-Fix-path-to-include-guestfs.h..patch - # Pending upstram review Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch Patch51: 0002-common-extract-UTF-8-conversion-function.patch @@ -442,9 +439,7 @@ Recommends: mkisofs Recommends: genisoimage %endif Recommends: ldmtool -%if ! 0%{?is_opensuse} Recommends: guestfs-winsupport -%endif Summary: Virtual machine needed for libguestfs License: GPL-2.0-only @@ -456,7 +451,6 @@ Obsoletes: libguestfs-data < %{version} libguestfs needs for it's run a virtual machine image. This package provides such an image, an initrd and a kernel. -%if ! 0%{?is_opensuse} %package -n guestfs-winsupport Summary: Windows guest support in libguestfs License: GPL-2.0-or-later @@ -469,8 +463,6 @@ BuildRequires: rsync %description -n guestfs-winsupport Provides the needed pieces for libguestfs to handle Windows guests. -%endif - %package devel Summary: Development files for libguestfs License: GPL-2.0-only @@ -546,8 +538,6 @@ It can import a variety of guest operating systems from libvirt-managed hosts. : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' %setup -q -a 789653 #%setup -q -a 1 -a 2 -a 789653 -%patch1 -p1 -%patch2 -p1 %patch50 -p1 %patch51 -p1 %patch52 -p1 @@ -584,6 +574,14 @@ then export PYTHON_EXT_SUFFIX=.so fi +# Defines these if using --with-distro=SUSE with configure +export HAVE_RPM_TRUE= +export HAVE_RPM_FALSE="#" +export HAVE_DPKG_TRUE="#" +export HAVE_DPKG_FALSE="#" +export HAVE_PACMAN_TRUE="#" +export HAVE_PACMAN_FALSE="#" + #sed -i '1 s@^.*@#!/bin/sh -x@' configure %configure \ --docdir=%{guestfs_docdir} \ @@ -603,7 +601,8 @@ fi %{_configure_ruby} \ --disable-rpath \ --disable-static \ - --with-distro=SUSE + --with-distro=SUSE + #Workaround an autotools bug make -j1 -C builder index-parse.c # 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir instead of the site dir @@ -669,16 +668,6 @@ touch %{name}.lang %find_lang %{name} # Appliance NTFS files -%if 0%{?is_opensuse} -mkdir -p %{buildroot}/tmp/etc/alternatives -pushd %{buildroot}/tmp/etc/alternatives -ln -s /sbin/mount.ntfs-3g mount.ntfs -popd -pushd %{buildroot}/tmp -tar -czf %{buildroot}/%{_libdir}/guestfs/supermin.d/zz-ntfs-symlink.tar.gz etc -popd -rm -rf %{buildroot}/tmp -%else # Just copy the content of the ntfs packages mkdir winsupport for pkg in $(rpm -qa | grep ntfs); do @@ -696,7 +685,6 @@ cat > %{buildroot}%{_libdir}/guestfs/supermin.d/zz-packages-winsupport << EOF libfuse2 hwinfo EOF -%endif mkdir -p %{buildroot}/tmp/usr/bin cp %{S:100} %{buildroot}/tmp/usr/bin @@ -731,14 +719,9 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in %{_libdir}/guestfs/supermin.d/packages %{_libdir}/guestfs/supermin.d/zz-scripts.tar.gz -%if 0%{?is_opensuse} -%{_libdir}/guestfs/supermin.d/zz-ntfs-symlink.tar.gz -%else - %files -n guestfs-winsupport %defattr(-,root,root) %{_libdir}/guestfs/supermin.d/zz-*winsupport* -%endif %if %{with ocaml_bindings} %files -n ocaml-libguestfs diff --git a/netconfig.patch b/netconfig.patch index 4d6ff78..b4db54a 100644 --- a/netconfig.patch +++ b/netconfig.patch @@ -1,8 +1,8 @@ -Index: libguestfs-1.42.0/appliance/packagelist.in +Index: libguestfs-1.44.0/appliance/packagelist.in =================================================================== ---- libguestfs-1.42.0.orig/appliance/packagelist.in -+++ libguestfs-1.42.0/appliance/packagelist.in -@@ -164,6 +164,7 @@ ifelse(SUSE,1, +--- libguestfs-1.44.0.orig/appliance/packagelist.in ++++ libguestfs-1.44.0/appliance/packagelist.in +@@ -130,6 +130,7 @@ ifelse(SUSE,1, ntfs-3g reiserfs squashfs From fbdd88117edf7e75c9d08cb34db8248f593835d86a021b25658a8a865db2a949 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 12 Jan 2021 12:42:37 +0000 Subject: [PATCH 6/6] - Modify Source0 to point at the correct url for the source. libguestfs.spec OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=464 --- libguestfs.changes | 6 ++++++ libguestfs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 9456b62..fbd735f 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 12 05:38:44 MST 2021 - carnold@suse.com + +- Modify Source0 to point at the correct url for the source. + libguestfs.spec + ------------------------------------------------------------------- Mon Jan 11 11:42:51 MST 2021 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 621a850..887e6d9 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -154,7 +154,7 @@ Patch53: 0004-python-include-dirs.patch Patch100: appliance.patch Patch101: netconfig.patch -Source0: http://download.libguestfs.org/1.42-stable/libguestfs-%{version}.tar.gz +Source0: https://download.libguestfs.org/1.44-stable/libguestfs-%{version}.tar.gz Source3: libguestfs.rpmlintrc Source100: mount-rootfs-and-chroot.sh Source101: README