pool/libguestfs
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Newer cpio versions must be told to extract over symlinks

Browse Source 
libguestfs.test.simple.create-opensuse-guest-crypt-on-lvm.sh
  libguestfs.test.simple.create-opensuse-guest.sh
  libguestfs.test.simple.create-sles12-guest-crypt-on-lvm.sh
  libguestfs.test.simple.create-sles12-guest.sh
- Allow the use busybox dhcp client
  appliance.patch
  netconfig.patch

- Update to version 1.44.2
  makefile-ocaml-find-guestfs.patch
  * Port libguestfs to use pcre2 instead of pcre
  * inspection: More reliable detection of Linux split /usr configurations
  * python: Relicense setup.py to LGPLv2+ (originally GPLv2+)
  * lib: qemu: Don't use -enable-fips option.
  * rust: Fix deprecated use of panic!(format!(...))
  * point users to Libera Chat rather than FreeNode
  * python: Don't leak fields when creating Python structs
  * appliance: Add IBM850 iconv converter for syslinux
  * launch: board model for RISC-V
  * lib: Add osinfo information for Windows Server 2022 Datacenter
  * lib: Autodetect backing format for qemu-img create -b
  * appliance: Fix searching for shared libraries on usr-merged Debian systems
  * appliance: Add mount package for Debian
  * m4/guestfs-appliance.m4: Add support for Alma and Cloud Linux
  * daemon/luks.c: Ignore bogus GCC -fanalyzer double-free warning
  * daemon/xattr.c: Increase size of temporary buffer for %zu
  * daemon/utils.c: Fix potential unbounded stack usage
  * Various other bug fixes
- Upstream bug fixes post 1.44.2

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=480
This commit is contained in:
Charles Arnold 2021-09-14 17:44:16 +00:00 committed by Git OBS Bridge
parent 290c5249f3
commit 921cbcfab0
17 changed files with 305 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
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.c
create mode 100644 common/utils/libxml2-utils.h create mode 100644 common/utils/libxml2-utils.h
Index: libguestfs-1.43.2/common/mlxml/Makefile.am Index: libguestfs-1.44.2/common/mlxml/Makefile.am
=================================================================== ===================================================================
--- libguestfs-1.43.2.orig/common/mlxml/Makefile.am --- libguestfs-1.44.2.orig/common/mlxml/Makefile.am
+++ libguestfs-1.43.2/common/mlxml/Makefile.am +++ libguestfs-1.44.2/common/mlxml/Makefile.am
@@ -54,6 +54,7 @@ libmlxml_a_CPPFLAGS = \ @@ -54,6 +54,7 @@ libmlxml_a_CPPFLAGS = \
-I. \ -I. \
-I$(top_builddir) \ -I$(top_builddir) \
@ -49,10 +49,10 @@ Index: libguestfs-1.43.2/common/mlxml/Makefile.am
-I$(shell $(OCAMLC) -where) -I$(shell $(OCAMLC) -where)
libmlxml_a_CFLAGS = \ libmlxml_a_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \
Index: libguestfs-1.43.2/common/mlxml/xml-c.c Index: libguestfs-1.44.2/common/mlxml/xml-c.c
=================================================================== ===================================================================
--- libguestfs-1.43.2.orig/common/mlxml/xml-c.c --- libguestfs-1.44.2.orig/common/mlxml/xml-c.c
+++ libguestfs-1.43.2/common/mlxml/xml-c.c +++ libguestfs-1.44.2/common/mlxml/xml-c.c
@@ -27,17 +27,21 @@ @@ -27,17 +27,21 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -133,19 +133,19 @@ Index: libguestfs-1.43.2/common/mlxml/xml-c.c
+ xmlFreeURI (uri); + xmlFreeURI (uri);
CAMLreturn (rv); CAMLreturn (rv);
} }
Index: libguestfs-1.43.2/common/mlxml/xml.ml Index: libguestfs-1.44.2/common/mlxml/xml.ml
=================================================================== ===================================================================
--- libguestfs-1.43.2.orig/common/mlxml/xml.ml --- libguestfs-1.44.2.orig/common/mlxml/xml.ml
+++ libguestfs-1.43.2/common/mlxml/xml.ml +++ libguestfs-1.44.2/common/mlxml/xml.ml
@@ -162,3 +162,4 @@ type uri = { @@ -162,3 +162,4 @@ type uri = {
} }
external parse_uri : string -> uri = "mllib_xml_parse_uri" external parse_uri : string -> uri = "mllib_xml_parse_uri"
+external parse_nonstandard_uri : string -> uri = "mllib_xml_parse_nonstandard_uri" +external parse_nonstandard_uri : string -> uri = "mllib_xml_parse_nonstandard_uri"
Index: libguestfs-1.43.2/common/mlxml/xml.mli Index: libguestfs-1.44.2/common/mlxml/xml.mli
=================================================================== ===================================================================
--- libguestfs-1.43.2.orig/common/mlxml/xml.mli --- libguestfs-1.44.2.orig/common/mlxml/xml.mli
+++ libguestfs-1.43.2/common/mlxml/xml.mli +++ libguestfs-1.44.2/common/mlxml/xml.mli
@@ -115,3 +115,7 @@ val parse_uri : string -> uri @@ -115,3 +115,7 @@ val parse_uri : string -> uri
Note this is different from the {!URI} module which is specialized Note this is different from the {!URI} module which is specialized
for parsing the [-a] parameter on the command line. This function for parsing the [-a] parameter on the command line. This function
@ -154,10 +154,10 @@ Index: libguestfs-1.43.2/common/mlxml/xml.mli
+val parse_nonstandard_uri : string -> uri +val parse_nonstandard_uri : string -> uri
+(** Similar to {!parse_uri} but only for use with our non-standard +(** Similar to {!parse_uri} but only for use with our non-standard
+ URIs. See [guestfs_int_parse_nonstandard_uri] in [common/utils]. *) + URIs. See [guestfs_int_parse_nonstandard_uri] in [common/utils]. *)
Index: libguestfs-1.43.2/common/options/uri.c Index: libguestfs-1.44.2/common/options/uri.c
=================================================================== ===================================================================
--- libguestfs-1.43.2.orig/common/options/uri.c --- libguestfs-1.44.2.orig/common/options/uri.c
+++ libguestfs-1.43.2/common/options/uri.c +++ libguestfs-1.44.2/common/options/uri.c
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
#include "guestfs.h" #include "guestfs.h"
@ -178,13 +178,13 @@ Index: libguestfs-1.43.2/common/options/uri.c
getprogname (), arg); getprogname (), arg);
return -1; return -1;
} }
Index: libguestfs-1.43.2/common/utils/Makefile.am Index: libguestfs-1.44.2/common/utils/Makefile.am
=================================================================== ===================================================================
--- libguestfs-1.43.2.orig/common/utils/Makefile.am --- libguestfs-1.44.2.orig/common/utils/Makefile.am
+++ libguestfs-1.43.2/common/utils/Makefile.am +++ libguestfs-1.44.2/common/utils/Makefile.am
@@ -28,12 +28,15 @@ libutils_la_SOURCES = \ @@ -29,12 +29,15 @@ libutils_la_SOURCES = \
libxml2-cleanups.c \
libxml2-writer-macros.h \ libxml2-writer-macros.h \
pcre2-cleanups.c \
stringlists-utils.c \ stringlists-utils.c \
+ libxml2-utils.c \ + libxml2-utils.c \
+ libxml2-utils.h \ + libxml2-utils.h \
@ -199,10 +199,10 @@ Index: libguestfs-1.43.2/common/utils/Makefile.am
libutils_la_CFLAGS = \ libutils_la_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \
$(GCC_VISIBILITY_HIDDEN) \ $(GCC_VISIBILITY_HIDDEN) \
Index: libguestfs-1.43.2/common/utils/libxml2-utils.c Index: libguestfs-1.44.2/common/utils/libxml2-utils.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libguestfs-1.43.2/common/utils/libxml2-utils.c +++ libguestfs-1.44.2/common/utils/libxml2-utils.c
@@ -0,0 +1,178 @@ @@ -0,0 +1,178 @@
+/* libguestfs +/* libguestfs
+ * Copyright (C) 2017 Red Hat Inc. + * Copyright (C) 2017 Red Hat Inc.
@ -382,10 +382,10 @@ Index: libguestfs-1.43.2/common/utils/libxml2-utils.c
+ +
+ return out; + return out;
+} +}
Index: libguestfs-1.43.2/common/utils/libxml2-utils.h Index: libguestfs-1.44.2/common/utils/libxml2-utils.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libguestfs-1.43.2/common/utils/libxml2-utils.h +++ libguestfs-1.44.2/common/utils/libxml2-utils.h
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
+/* libguestfs +/* libguestfs
+ * Copyright (C) 2017 Red Hat Inc. + * Copyright (C) 2017 Red Hat Inc.

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

42
489b14b7-ocaml-examples-Link-examples-to-gnulib.patch Normal file
View File

@ -0,0 +1,42 @@
Subject: ocaml/examples: Link examples to gnulib
From: Richard W.M. Jones rjones@redhat.com Sat Sep 11 09:36:08 2021 +0100
Date: Sat Sep 11 09:36:08 2021 +0100:
Git: 489b14b75e5f30010d8a8c8d3a10ecc52b629563
It's unclear why exactly the OCaml library is using replacement
symbols, but it is so we need gnulib. Note this only applies in the
stable-1.44 branch since upstream we have finally got rid of gnulib,
because of exactly these kinds of problems that it causes everyone.
ocamlfind ocamlopt -cclib -L../../lib/.libs -package unix -linkpkg \
-warn-error A -I .. mlguestfs.cmxa create_disk.ml -o create_disk
../libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): In function `guestfs_finalize':
/home/rjones/d/libguestfs-1.44/ocaml/guestfs-c.c:86: undefined reference to `rpl_free'
/home/rjones/d/libguestfs-1.44/ocaml/guestfs-c.c:88: undefined reference to `rpl_free'
../libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): In function `guestfs_int_ocaml_set_event_callback':
/home/rjones/d/libguestfs-1.44/ocaml/guestfs-c.c:239: undefined reference to `rpl_free'
../libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): In function `guestfs_int_ocaml_delete_event_callback':
/home/rjones/d/libguestfs-1.44/ocaml/guestfs-c.c:266: undefined reference to `rpl_free'
../libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): In function `guestfs_int_ocaml_event_to_string':
/home/rjones/d/libguestfs-1.44/ocaml/guestfs-c.c:290: undefined reference to `rpl_free'
../libmlguestfs.a(libguestfsocaml_a-guestfs-c-actions.o):/home/rjones/d/libguestfs-1.44/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
make[2]: *** [Makefile:2272: create_disk] Error 2
diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am
index 19cbebdf9..d8c3dd4c5 100644
--- a/ocaml/examples/Makefile.am
+++ b/ocaml/examples/Makefile.am
@@ -48,7 +48,9 @@ if HAVE_OCAML
noinst_SCRIPTS = create_disk debug_logging inspect_vm
-OCAMLFINDFLAGS = -cclib -L$(top_builddir)/lib/.libs
+OCAMLFINDFLAGS = \
+ -cclib -L$(top_builddir)/lib/.libs \
+ -cclib -L$(top_builddir)/gnulib/lib/.libs -cclib -lgnu
if HAVE_OCAMLOPT
create_disk: create_disk.ml

55
68a02c2f-customize--resize--sparsify--sysprep-Link-explicitly-with-pthread.patch Normal file
View File

@ -0,0 +1,55 @@
Subject: customize, resize, sparsify, sysprep: Link explicitly with pthread
From: Richard W.M. Jones rjones@redhat.com Thu Mar 4 11:57:44 2021 +0000
Date: Sat Sep 11 09:42:12 2021 +0100:
Git: 68a02c2f6c7b4243ecb298c0d9539f0fc51a52ce
Cherry picked from guestfs-tools commit 87543dad61.
diff --git a/customize/Makefile.am b/customize/Makefile.am
index c926687b3..fb418d7bf 100644
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -169,6 +169,7 @@ OCAMLLINKFLAGS = \
$(LINK_CUSTOM_OCAMLC_ONLY)
OCAMLCLIBS = \
+ -pthread -lpthread \
-lutils \
$(LIBTINFO_LIBS) \
$(LIBCRYPT_LIBS) \
diff --git a/resize/Makefile.am b/resize/Makefile.am
index fa88cc634..936d2b05e 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -72,6 +72,7 @@ OCAMLPACKAGES += -package gettext-stub
endif
OCAMLCLIBS = \
+ -pthread -lpthread \
-lprogress \
-lutils \
$(LIBTINFO_LIBS) \
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index fa964e8af..4d1af85d6 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -80,6 +80,7 @@ OCAMLPACKAGES += -package gettext-stub
endif
OCAMLCLIBS = \
+ -pthread -lpthread \
-lprogress \
-lutils \
$(LIBTINFO_LIBS) \
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index 69bb92820..250c74913 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -129,6 +129,7 @@ OCAMLPACKAGES += -package gettext-stub
endif
OCAMLCLIBS = \
+ -pthread -lpthread \
-lvisit \
-lstructs \
-lutils \

12
appliance.patch
View File

@ -2,6 +2,18 @@ Index: libguestfs-1.42.0/appliance/init
=================================================================== ===================================================================
--- libguestfs-1.42.0.orig/appliance/init --- libguestfs-1.42.0.orig/appliance/init
+++ libguestfs-1.42.0/appliance/init +++ libguestfs-1.42.0/appliance/init
@@ -127,8 +127,10 @@ if test "$guestfs_network" = 1; then
rm -f /etc/dhcp/dhclient-enter-hooks.d/resolved
if dhclient --version >/dev/null 2>&1; then
dhclient $iface
- else
+ elif dhcpcd --version ; then
dhcpcd $iface
+ elif busybox udhcpc --help ; then
+ busybox udhcpc --quit -v
fi
fi
@@ -245,7 +245,8 @@ else @@ -245,7 +245,8 @@ else
echo "Note: The contents of / (root) are the rescue appliance." echo "Note: The contents of / (root) are the rescue appliance."
if ! test -d "/sysroot/dev"; then if ! test -d "/sysroot/dev"; then

26
e26cfa44-daemon-Build-with--pthread.patch Normal file
View File

@ -0,0 +1,26 @@
Subject: daemon: Build with -pthread
From: Richard W.M. Jones rjones@redhat.com Sat Sep 11 09:27:17 2021 +0100
Date: Sat Sep 11 09:27:17 2021 +0100:
Git: e26cfa445a1947503a03c55d8d65263530747062
The daemon failed to link with glibc < 2.34 because we didn't include
the separate pthread library. Adding -pthread fixes this.
Note this change was also make upstream in commit 733d2182b6 ("Remove
the tools.") although I think either by accident or unrelated.
Reported-by: Toolybird
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2003326
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 86aa920e8..b670bb1e2 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -255,6 +255,7 @@ guestfsd_CPPFLAGS = \
-I$(top_srcdir)/common/utils \
-I$(top_builddir)/common/utils
guestfsd_CFLAGS = \
+ -pthread \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
$(RPC_CFLAGS) \
$(AUGEAS_CFLAGS) \

3
libguestfs-1.44.1.tar.gz
View File

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

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

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

17
libguestfs-1.44.2.tar.gz.sig Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmE3zKERHHJpY2hAYW5u
ZXhpYS5vcmcACgkQkXOPc+G3aKBGyRAAiV+CFfaAi06iqJ6H9YTfNOB/wK6XPPmu
DG+sLCXBVR/YYe93Myt/T+6+6U9Ue7d1BTGQ6UhHc/E8IbnFPWNi/8tdQSL9W+Nm
KEkfZNDROnnO1vHX8nR/rAuwdcDCHZR5suh58K8TvY/1+i362zNFxY/YMFujExK5
z4kCcP9GjEECoPgvu/RtOJm9YrRdbF0QzF9Fu7ZqhQFbaMkCJg9IDB/mSz5t/mWE
e08rHqwqYsygBCfHCX9lALhNWQO0x/WX2QZrgbcIgMijgWrmTq5czTwkWGPG/CMO
+8tkyF6r1HKHtpz1UsIXsHflOCVk0f0twTncYYltifecZq2sR9UODLBgRPMaTSYa
TLz2jcuSd98yFmkSORr8JNIOGyX8jatFLQT85PqsDZ7MIIilMTT27rYQkY5/EJcN
Yetn3mc+hsbXYjk/eCeZvPVnkD98JQaOlW3+lybTkdS9HWNc3lzaS1M64OSYOzMo
PQL9OAm+ScLzQvvefCKGcLVUGoRvmcabvkg8buYRZb2WuM2uY+xHsLWGWLROxAwa
cI9N+bvD1qyDoze3yjti0WWwBDxCYG/Wz/bJpuwawDx60VEyFUARyk4182nCz2E/
PE+t2z0xLYsbj3bT1grI+Ay8EJEP0u6R88PO7CW7l2jZUYpZNHyFlOCgyG3nB1LF
u4tbE+OLPyA=
=06k/
-----END PGP SIGNATURE-----

45
libguestfs.changes
View File

@ -1,3 +1,43 @@
-------------------------------------------------------------------
Mon Sep 13 16:34:08 MDT 2021 - carnold@suse.com
- Newer cpio versions must be told to extract over symlinks
libguestfs.test.simple.create-opensuse-guest-crypt-on-lvm.sh
libguestfs.test.simple.create-opensuse-guest.sh
libguestfs.test.simple.create-sles12-guest-crypt-on-lvm.sh
libguestfs.test.simple.create-sles12-guest.sh
- Allow the use busybox dhcp client
appliance.patch
netconfig.patch
-------------------------------------------------------------------
Mon Sep 13 15:02:23 MDT 2021 - carnold@suse.com
- Update to version 1.44.2
makefile-ocaml-find-guestfs.patch
* Port libguestfs to use pcre2 instead of pcre
* inspection: More reliable detection of Linux split /usr configurations
* python: Relicense setup.py to LGPLv2+ (originally GPLv2+)
* lib: qemu: Don't use -enable-fips option.
* rust: Fix deprecated use of panic!(format!(...))
* point users to Libera Chat rather than FreeNode
* python: Don't leak fields when creating Python structs
* appliance: Add IBM850 iconv converter for syslinux
* launch: board model for RISC-V
* lib: Add osinfo information for Windows Server 2022 Datacenter
* lib: Autodetect backing format for qemu-img create -b
* appliance: Fix searching for shared libraries on usr-merged Debian systems
* appliance: Add mount package for Debian
* m4/guestfs-appliance.m4: Add support for Alma and Cloud Linux
* daemon/luks.c: Ignore bogus GCC -fanalyzer double-free warning
* daemon/xattr.c: Increase size of temporary buffer for %zu
* daemon/utils.c: Fix potential unbounded stack usage
* Various other bug fixes
- Upstream bug fixes post 1.44.2
e26cfa44-daemon-Build-with--pthread.patch
489b14b7-ocaml-examples-Link-examples-to-gnulib.patch
68a02c2f-customize--resize--sparsify--sysprep-Link-explicitly-with-pthread.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 19 01:01:01 UTC 2021 - ohering@suse.de Mon Jul 19 01:01:01 UTC 2021 - ohering@suse.de
@ -49,6 +89,11 @@ Tue Apr 13 13:13:13 UTC 2021 - ohering@suse.de
- Remove ocaml_native_compiler conditional - Remove ocaml_native_compiler conditional
build native target unconditionally build native target unconditionally
-------------------------------------------------------------------
Fri Apr 9 09:09:09 UTC 2021 - ohering@suse.de
- Require current ocaml-rpm-macros
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 12 05:38:44 MST 2021 - carnold@suse.com Tue Jan 12 05:38:44 MST 2021 - carnold@suse.com

12
libguestfs.spec
View File

@ -18,7 +18,7 @@
# needsbinariesforbuild # needsbinariesforbuild
Version: 1.44.1 Version: 1.44.2
Release: 0 Release: 0
%{?ocaml_preserve_bytecode} %{?ocaml_preserve_bytecode}
@ -101,11 +101,11 @@ BuildRequires: dhcp-client
BuildRequires: libjansson-devel BuildRequires: libjansson-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pkgconfig(python3)
BuildRequires: qemu-tools BuildRequires: qemu-tools
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: supermin >= 5.1.6 BuildRequires: supermin >= 5.1.6
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(python3)
# Required to build tools, its independent from bindings # Required to build tools, its independent from bindings
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: ocaml >= 4.01 BuildRequires: ocaml >= 4.01
@ -141,16 +141,24 @@ Summary: Compatibility package for guestfs-tools
# Upstream patches # Upstream patches
License: GPL-2.0-only License: GPL-2.0-only
# Upstream
Patch1: e26cfa44-daemon-Build-with--pthread.patch
Patch2: 489b14b7-ocaml-examples-Link-examples-to-gnulib.patch
Patch3: 68a02c2f-customize--resize--sparsify--sysprep-Link-explicitly-with-pthread.patch
# Pending upstram review # Pending upstram review
Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch
Patch51: 0002-common-extract-UTF-8-conversion-function.patch Patch51: 0002-common-extract-UTF-8-conversion-function.patch
Patch52: 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch Patch52: 0003-inspector-rpm-summary-and-description-may-not-be-utf.patch
Patch53: 0004-python-include-dirs.patch
# Our patches # Our patches
Patch100: appliance.patch Patch100: appliance.patch
Patch101: netconfig.patch Patch101: netconfig.patch
Patch102: libguestfs.env.patch Patch102: libguestfs.env.patch
Patch103: makefile-ocaml-find-guestfs.patch
Source0: https://download.libguestfs.org/1.44-stable/libguestfs-%{version}.tar.gz Source0: https://download.libguestfs.org/1.44-stable/libguestfs-%{version}.tar.gz
Source1: https://download.libguestfs.org/1.44-stable/libguestfs-%{version}.tar.gz.sig
Source3: libguestfs.rpmlintrc Source3: libguestfs.rpmlintrc
Source100: mount-rootfs-and-chroot.sh Source100: mount-rootfs-and-chroot.sh
Source101: README Source101: README

2
libguestfs.test.simple.create-opensuse-guest-crypt-on-lvm.sh
View File

@ -62,7 +62,7 @@ _exit() {
} }
_unrpm() { _unrpm() {
CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories" CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories --extract-over-symlinks"
FILES="$@" FILES="$@"
for f in $FILES; do for f in $FILES; do
echo -ne "$f:\t" echo -ne "$f:\t"

2
libguestfs.test.simple.create-opensuse-guest.sh
View File

@ -59,7 +59,7 @@ _exit() {
} }
_unrpm() { _unrpm() {
CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories" CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories --extract-over-symlinks"
FILES="$@" FILES="$@"
for f in $FILES; do for f in $FILES; do
echo -ne "$f:\t" echo -ne "$f:\t"

2
libguestfs.test.simple.create-sles12-guest-crypt-on-lvm.sh
View File

@ -63,7 +63,7 @@ _exit() {
} }
_unrpm() { _unrpm() {
CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories" CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories --extract-over-symlinks"
FILES="$@" FILES="$@"
for f in $FILES; do for f in $FILES; do
echo -ne "$f:\t" echo -ne "$f:\t"

2
libguestfs.test.simple.create-sles12-guest.sh
View File

@ -60,7 +60,7 @@ _exit() {
} }
_unrpm() { _unrpm() {
CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories" CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories --extract-over-symlinks"
FILES="$@" FILES="$@"
for f in $FILES; do for f in $FILES; do
echo -ne "$f:\t" echo -ne "$f:\t"

44
makefile-ocaml-find-guestfs.patch Normal file
View File

@ -0,0 +1,44 @@
--- libguestfs-1.44.2/common/mlprogress/Makefile.am.orig 2021-09-14 10:01:16.710596638 -0600
+++ libguestfs-1.44.2/common/mlprogress/Makefile.am 2021-09-14 10:01:25.526596848 -0600
@@ -67,7 +67,7 @@ BOBJECTS = $(SOURCES_ML:.ml=.cmo)
XOBJECTS = $(BOBJECTS:.cmo=.cmx)
OCAMLPACKAGES = \
- -package str,unix,guestfs \
+ -package str,unix \
-I $(top_builddir)/common/utils/.libs \
-I $(top_builddir)/ocaml \
-I $(builddir)
--- libguestfs-1.44.2/common/mlvisit/Makefile.am.orig 2021-09-14 10:37:51.790648944 -0600
+++ libguestfs-1.44.2/common/mlvisit/Makefile.am 2021-09-14 10:44:53.878659002 -0600
@@ -68,7 +68,7 @@ BOBJECTS = $(SOURCES_ML:.ml=.cmo)
XOBJECTS = $(BOBJECTS:.cmo=.cmx)
OCAMLPACKAGES = \
- -package str,unix,guestfs \
+ -package str,unix \
-I $(top_builddir)/common/mlutils \
-I $(top_builddir)/ocaml \
-I $(top_builddir)/common/utils/.libs \
--- libguestfs-1.44.2/common/mltools/Makefile.am.orig 2021-09-14 10:38:03.082649213 -0600
+++ libguestfs-1.44.2/common/mltools/Makefile.am 2021-09-14 10:45:08.230659344 -0600
@@ -114,7 +114,7 @@ BOBJECTS = $(SOURCES_ML:.ml=.cmo)
XOBJECTS = $(BOBJECTS:.cmo=.cmx)
OCAMLPACKAGES = \
- -package str,unix,guestfs \
+ -package str,unix \
-I $(top_builddir)/common/utils/.libs \
-I $(top_builddir)/gnulib/lib/.libs \
-I $(top_builddir)/ocaml \
--- libguestfs-1.44.2/common/mlcustomize/Makefile.am.orig 2021-09-14 10:44:24.598658304 -0600
+++ libguestfs-1.44.2/common/mlcustomize/Makefile.am 2021-09-14 10:44:35.654658567 -0600
@@ -82,7 +82,7 @@ BOBJECTS = $(SOURCES_ML:.ml=.cmo)
XOBJECTS = $(BOBJECTS:.cmo=.cmx)
OCAMLPACKAGES = \
- -package str,unix,guestfs \
+ -package str,unix \
-I $(top_builddir)/common/utils/.libs \
-I $(top_builddir)/ocaml \
-I $(top_builddir)/common/mlstdutils \

16
netconfig.patch
View File

@ -1,8 +1,16 @@
Index: libguestfs-1.44.0/appliance/packagelist.in Index: libguestfs-1.44.2/appliance/packagelist.in
=================================================================== ===================================================================
--- libguestfs-1.44.0.orig/appliance/packagelist.in --- libguestfs-1.44.2.orig/appliance/packagelist.in
+++ libguestfs-1.44.0/appliance/packagelist.in +++ libguestfs-1.44.2/appliance/packagelist.in
@@ -130,6 +130,7 @@ ifelse(SUSE,1, @@ -118,6 +118,7 @@ ifelse(SUSE,1,
dnl It seems no other augeas package depends on it.
augeas-lenses
btrfsprogs
+ busybox
cdrkit-cdrtools-compat
cryptsetup
dhcpcd
@@ -133,6 +134,7 @@ ifelse(SUSE,1,
ntfs-3g ntfs-3g
reiserfs reiserfs
squashfs squashfs