rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

Accepting request 862660 from Virtualization

Browse Source 
Update to libguestfs version 1.44.0

OBS-URL: https://build.opensuse.org/request/show/862660
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libguestfs?expand=0&rev=73
This commit is contained in:
Dominique Leuenberger 2021-02-19 22:42:44 +00:00 committed by Git OBS Bridge
commit 9a3b2d7ace
10 changed files with 142 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
0001-Introduce-a-wrapper-around-xmlParseURI.patch
View File

@ -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 <stdlib.h>
#include <string.h>
@ -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.

20
0002-common-extract-UTF-8-conversion-function.patch
View File

@ -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 <string.h>
#include <errno.h>
@ -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 <sys/types.h>
#include <sys/wait.h>
@ -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");
}
}

11
0004-python-include-dirs.patch Normal file
View File

@ -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')],
)

34
31e6b187-po-Remove-virt-v2v-related-dependency-from-POTFILES-ml..patch
View File

@ -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

19
7265f08c-lib-remove-extra-LIBS-from-pkg-config-file.patch
View File

@ -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

3
libguestfs-1.42.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fee192cf3aaa597f142afb21fa2d7f380fdabcf34d054e37090163e4a74f024
size 23614321

3
libguestfs-1.44.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0ec7b44a4c50e928583c56099da31ceb9680766043bd7d468f3ca7b741c55d21
size 23469286

63
libguestfs.changes
View File

@ -1,3 +1,66 @@
-------------------------------------------------------------------
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
- 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
- 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
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Tue Jul 7 15:48:08 MDT 2020 - carnold@suse.com

77
libguestfs.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libguestfs
#
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2011 Michal Hrusecky <mhrusecky@novell.com>
#
# 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.42.0
Version: 1.44.0
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
@ -137,24 +138,23 @@ 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
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
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
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
@ -304,25 +304,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
@ -457,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
@ -471,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
@ -484,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
@ -560,11 +537,11 @@ 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
%patch53 -p1
%patch100 -p1
%patch101 -p1
@ -597,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} \
@ -617,6 +602,7 @@ fi
--disable-rpath \
--disable-static \
--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
@ -663,12 +649,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
@ -688,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
@ -715,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
@ -750,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
@ -797,9 +761,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)

8
netconfig.patch
View File

@ -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