From 57035853a9ceb18bfe84de194a9b2b9b8e3b0258 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Mar 2021 19:49:22 +0100 Subject: [PATCH] New upstream version 1.45.3. Fix symlink replacement of virt-builder directory (RHBZ#1943838). --- ...s-Fix-bogus-directories-in-this-file.patch | 53 ----- ...y-to-install-.3-and-.5-files-which-d.patch | 26 --- ...-dependency-on-gobject-introspection.patch | 129 ----------- ...d-Remove-dependency-on-perl-Sys-Virt.patch | 30 --- ...of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch | 203 ------------------ 0006-builder-Use-correct-ounit2-module.patch | 64 ------ 0007-Update-common-submodule-to-latest.patch | 95 -------- guestfs-tools.spec | 21 +- sources | 4 +- 9 files changed, 8 insertions(+), 617 deletions(-) delete mode 100644 0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch delete mode 100644 0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch delete mode 100644 0003-build-Remove-dependency-on-gobject-introspection.patch delete mode 100644 0004-build-Remove-dependency-on-perl-Sys-Virt.patch delete mode 100644 0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch delete mode 100644 0006-builder-Use-correct-ounit2-module.patch delete mode 100644 0007-Update-common-submodule-to-latest.patch diff --git a/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch b/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch deleted file mode 100644 index 831030c..0000000 --- a/0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3bcb261f69dab9121a30aa452ef5bb6001c2f58e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 23 Mar 2021 14:09:44 +0000 -Subject: [PATCH 1/7] po-docs/podfiles: Fix bogus directories in this file. - -These were caused by a partial dist directory having been created, and -then "make podfiles" being run at the wrong moment. - -Fixes: commit 3e6e0b4fd4365118bdc011aaa76347272fa16abd ---- - po-docs/podfiles | 26 -------------------------- - 1 file changed, 26 deletions(-) - -diff --git a/po-docs/podfiles b/po-docs/podfiles -index bf7091320c..d7ef138938 100644 ---- a/po-docs/podfiles -+++ b/po-docs/podfiles -@@ -19,32 +19,6 @@ diff/virt-diff.pod - edit/virt-edit.pod - format/virt-format.pod - get-kernel/virt-get-kernel.pod --guestfs-tools-1.45.2/align/virt-alignment-scan.pod --guestfs-tools-1.45.2/builder/virt-builder-repository.pod --guestfs-tools-1.45.2/builder/virt-builder.pod --guestfs-tools-1.45.2/builder/virt-index-validate.pod --guestfs-tools-1.45.2/cat/virt-cat.pod --guestfs-tools-1.45.2/cat/virt-filesystems.pod --guestfs-tools-1.45.2/cat/virt-log.pod --guestfs-tools-1.45.2/cat/virt-ls.pod --guestfs-tools-1.45.2/cat/virt-tail.pod --guestfs-tools-1.45.2/common/mlcustomize/customize-options.pod --guestfs-tools-1.45.2/common/mlcustomize/customize-synopsis.pod --guestfs-tools-1.45.2/common/options/blocksize-option.pod --guestfs-tools-1.45.2/common/options/key-option.pod --guestfs-tools-1.45.2/common/options/keys-from-stdin-option.pod --guestfs-tools-1.45.2/customize/virt-customize.pod --guestfs-tools-1.45.2/df/virt-df.pod --guestfs-tools-1.45.2/dib/virt-dib.pod --guestfs-tools-1.45.2/diff/virt-diff.pod --guestfs-tools-1.45.2/edit/virt-edit.pod --guestfs-tools-1.45.2/format/virt-format.pod --guestfs-tools-1.45.2/get-kernel/virt-get-kernel.pod --guestfs-tools-1.45.2/inspector/virt-inspector.pod --guestfs-tools-1.45.2/make-fs/virt-make-fs.pod --guestfs-tools-1.45.2/resize/virt-resize.pod --guestfs-tools-1.45.2/sparsify/virt-sparsify.pod --guestfs-tools-1.45.2/sysprep/virt-sysprep.pod - inspector/virt-inspector.pod - make-fs/virt-make-fs.pod - resize/virt-resize.pod --- -2.29.0.rc2 - diff --git a/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch b/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch deleted file mode 100644 index bb002aa..0000000 --- a/0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cba4cc0f5148fae6a8ba34c03559b9328749cbf1 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 23 Mar 2021 12:19:01 +0000 -Subject: [PATCH 2/7] po-docs: Don't try to install *.3 and *.5 files which - don't exist. - -Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342 ---- - po-docs/language.mk | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/po-docs/language.mk b/po-docs/language.mk -index 2c8f7aff6b..ee05183c57 100644 ---- a/po-docs/language.mk -+++ b/po-docs/language.mk -@@ -117,7 +117,3 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.po - install-data-hook: - $(MKDIR_P) $(DESTDIR)$(mandir)/$(LINGUA)/man1 - $(INSTALL) -m 0644 $(srcdir)/*.1 $(DESTDIR)$(mandir)/$(LINGUA)/man1 -- $(MKDIR_P) $(DESTDIR)$(mandir)/$(LINGUA)/man3 -- $(INSTALL) -m 0644 $(srcdir)/*.3 $(DESTDIR)$(mandir)/$(LINGUA)/man3 -- $(MKDIR_P) $(DESTDIR)$(mandir)/$(LINGUA)/man5 -- $(INSTALL) -m 0644 $(srcdir)/*.5 $(DESTDIR)$(mandir)/$(LINGUA)/man5 --- -2.29.0.rc2 - diff --git a/0003-build-Remove-dependency-on-gobject-introspection.patch b/0003-build-Remove-dependency-on-gobject-introspection.patch deleted file mode 100644 index db3e9c7..0000000 --- a/0003-build-Remove-dependency-on-gobject-introspection.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 6bfe41474937bbaabd7c953ac62dc9a28aa6fa30 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 23 Mar 2021 13:38:56 +0000 -Subject: [PATCH 3/7] build: Remove dependency on gobject-introspection. - -Only required for libguestfs GObject bindings, not for these tools. - -Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342 ---- - Makefile.am | 1 - - m4/introspection.m4 | 94 --------------------------------------------- - 2 files changed, 95 deletions(-) - delete mode 100644 m4/introspection.m4 - -diff --git a/Makefile.am b/Makefile.am -index 382f2db130..b5c1bc0b87 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -75,7 +75,6 @@ EXTRA_DIST = \ - common/README \ - lib/guestfs-internal-all.h \ - m4/.gitignore \ -- m4/introspection.m4 \ - podcheck.pl \ - test-functions.sh \ - tmp/.gitignore \ -diff --git a/m4/introspection.m4 b/m4/introspection.m4 -deleted file mode 100644 -index 586d679eea..0000000000 ---- a/m4/introspection.m4 -+++ /dev/null -@@ -1,94 +0,0 @@ --dnl -*- mode: autoconf -*- --dnl Copyright 2009 Johan Dahlin --dnl --dnl This file is free software; the author(s) gives unlimited --dnl permission to copy and/or distribute it, with or without --dnl modifications, as long as this notice is preserved. --dnl -- --# serial 1 -- --m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], --[ -- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -- -- dnl enable/disable introspection -- m4_if([$2], [require], -- [dnl -- enable_introspection=yes -- ],[dnl -- AC_ARG_ENABLE(introspection, -- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -- [enable introspection for this build]),, -- [enable_introspection=auto]) -- ])dnl -- -- AC_MSG_CHECKING([for gobject-introspection]) -- -- dnl presence/version checking -- AS_CASE([$enable_introspection], -- [no], [dnl -- found_introspection="no (disabled, use --enable-introspection to enable)" -- ],dnl -- [yes],[dnl -- PKG_CHECK_EXISTS([gobject-introspection-1.0],, -- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -- found_introspection=yes, -- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -- ],dnl -- [auto],[dnl -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -- ],dnl -- [dnl -- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -- ])dnl -- -- AC_MSG_RESULT([$found_introspection]) -- -- INTROSPECTION_SCANNER= -- INTROSPECTION_COMPILER= -- INTROSPECTION_GENERATE= -- INTROSPECTION_GIRDIR= -- INTROSPECTION_TYPELIBDIR= -- if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -- fi -- AC_SUBST(INTROSPECTION_SCANNER) -- AC_SUBST(INTROSPECTION_COMPILER) -- AC_SUBST(INTROSPECTION_GENERATE) -- AC_SUBST(INTROSPECTION_GIRDIR) -- AC_SUBST(INTROSPECTION_TYPELIBDIR) -- AC_SUBST(INTROSPECTION_CFLAGS) -- AC_SUBST(INTROSPECTION_LIBS) -- AC_SUBST(INTROSPECTION_MAKEFILE) -- -- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") --]) -- -- --dnl Usage: --dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -- --AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], --[ -- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) --]) -- --dnl Usage: --dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -- -- --AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], --[ -- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) --]) --- -2.29.0.rc2 - diff --git a/0004-build-Remove-dependency-on-perl-Sys-Virt.patch b/0004-build-Remove-dependency-on-perl-Sys-Virt.patch deleted file mode 100644 index e11a19e..0000000 --- a/0004-build-Remove-dependency-on-perl-Sys-Virt.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 47efe06984ae1e0ba914ebcf9306d348a5ecd366 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 23 Mar 2021 13:52:19 +0000 -Subject: [PATCH 4/7] build: Remove dependency on perl Sys::Virt. - -In libguestfs this used to be required to run tests against local -guests, but it's not needed in either libguestfs or guestfs-tools any -longer. - -Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342 ---- - m4/guestfs-perl.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/guestfs-perl.m4 b/m4/guestfs-perl.m4 -index 4c889d843a..c8337ed9b5 100644 ---- a/m4/guestfs-perl.m4 -+++ b/m4/guestfs-perl.m4 -@@ -66,7 +66,7 @@ AM_CONDITIONAL([HAVE_PERL], - dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.) - AS_IF([test "x$PERL" != "xno"],[ - missing_perl_modules=no -- for pm in Pod::Usage Getopt::Long Sys::Virt Locale::TextDomain Win::Hivex Win::Hivex::Regedit ; do -+ for pm in Pod::Usage Getopt::Long Locale::TextDomain Win::Hivex Win::Hivex::Regedit ; do - AC_MSG_CHECKING([for $pm]) - if ! $PERL -M$pm -e1 >&AS_MESSAGE_LOG_FD 2>&1; then - AC_MSG_RESULT([no]) --- -2.29.0.rc2 - diff --git a/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch b/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch deleted file mode 100644 index 2b7563f..0000000 --- a/0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch +++ /dev/null @@ -1,203 +0,0 @@ -From f66af6b6ddfefcbd6ecd6f4d47e0fa4ca231b125 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 23 Mar 2021 14:06:12 +0000 -Subject: [PATCH 5/7] builder: Get rid of /etc/xdg and XDG_CONFIG_DIRS - nonsense. - -Put the configuration in /etc/virt-builder as god intended. ---- - builder/Makefile.am | 8 ++------ - builder/libguestfs.conf.in | 4 ++-- - builder/opensuse.conf.in | 2 +- - builder/paths.ml | 4 ++-- - builder/paths.mli | 4 ++-- - builder/test-virt-builder-cacheall.sh | 2 +- - builder/test-virt-builder-list-simplestreams.sh | 2 +- - builder/test-virt-builder-list.sh | 2 +- - builder/test-virt-builder-planner.sh | 2 +- - builder/test-virt-builder.sh | 2 +- - builder/virt-builder.pod | 8 ++++---- - run.in | 6 +++--- - 12 files changed, 21 insertions(+), 25 deletions(-) - -diff --git a/builder/Makefile.am b/builder/Makefile.am -index d67c8e0ded..4d2e07843c 100644 ---- a/builder/Makefile.am -+++ b/builder/Makefile.am -@@ -423,12 +423,8 @@ endif - - # virt-builder's default repository - --repoconfdir = $(sysconfdir)/xdg/virt-builder/repos.d --repoconf_DATA = libguestfs.conf libguestfs.gpg \ -- opensuse.conf opensuse.gpg -- --install-exec-hook: -- $(LN_S) -f xdg/virt-builder $(DESTDIR)$(sysconfdir)/virt-builder -+repoconfdir = $(sysconfdir)/virt-builder/repos.d -+repoconf_DATA = libguestfs.conf libguestfs.gpg opensuse.conf opensuse.gpg - - # Build a small C index validator program. - bin_PROGRAMS += virt-index-validate -diff --git a/builder/libguestfs.conf.in b/builder/libguestfs.conf.in -index 412079df64..8d8feab756 100644 ---- a/builder/libguestfs.conf.in -+++ b/builder/libguestfs.conf.in -@@ -1,7 +1,7 @@ - [libguestfs.org] - uri=http://builder.libguestfs.org/index.asc --gpgkey=file://@SYSCONFDIR@/xdg/virt-builder/repos.d/libguestfs.gpg -+gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/libguestfs.gpg - - [archive.libguestfs.org] - uri=http://archive.libguestfs.org/builder/index.asc --gpgkey=file://@SYSCONFDIR@/xdg/virt-builder/repos.d/libguestfs.gpg -+gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/libguestfs.gpg -diff --git a/builder/opensuse.conf.in b/builder/opensuse.conf.in -index 80db267113..19f9796992 100644 ---- a/builder/opensuse.conf.in -+++ b/builder/opensuse.conf.in -@@ -1,3 +1,3 @@ - [opensuse.org] - uri=http://download.opensuse.org/repositories/Virtualization:/virt-builder-images/images/index --gpgkey=file://@SYSCONFDIR@/xdg/virt-builder/repos.d/opensuse.gpg -+gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/opensuse.gpg -diff --git a/builder/paths.ml b/builder/paths.ml -index b8ce57191e..a7b1f4cc63 100644 ---- a/builder/paths.ml -+++ b/builder/paths.ml -@@ -35,8 +35,8 @@ let xdg_config_home () = - - let xdg_config_dirs () = - let dirs = -- try Sys.getenv "XDG_CONFIG_DIRS" -- with Not_found -> "/etc/xdg" in -+ try Sys.getenv "VIRT_BUILDER_DIRS" -+ with Not_found -> "/etc" in - let dirs = String.nsplit ":" dirs in - let dirs = List.filter (fun x -> x <> "") dirs in - List.map (fun x -> x // prog) dirs -diff --git a/builder/paths.mli b/builder/paths.mli -index 566c323e57..f4897da952 100644 ---- a/builder/paths.mli -+++ b/builder/paths.mli -@@ -23,6 +23,6 @@ val xdg_config_home : unit -> string option - (** [$XDG_CONFIG_HOME/prog] or [$HOME/.config/prog] or [None]. *) - - val xdg_config_dirs : unit -> string list --(** [$XDG_CONFIG_DIRS] (which is a colon-separated path), split. Empty -+(** [$VIRT_BUILDER_DIRS] (which is a colon-separated path), split. Empty - elements are removed from the list. If the environment variable -- is not set [["/etc/xdg"]] is returned instead. *) -+ is not set [["/etc/virt-builder"]] is returned instead. *) -diff --git a/builder/test-virt-builder-cacheall.sh b/builder/test-virt-builder-cacheall.sh -index c80d9ecd2a..26298228a0 100755 ---- a/builder/test-virt-builder-cacheall.sh -+++ b/builder/test-virt-builder-cacheall.sh -@@ -68,7 +68,7 @@ uri=$indexfile - EOF - - export XDG_CONFIG_HOME= --export XDG_CONFIG_DIRS="$tmpdir" -+export VIRT_BUILDER_DIRS="$tmpdir" - export XDG_CACHE_HOME="$cachedir" - - short_list=$($VG virt-builder --no-check-signature --no-cache --list) -diff --git a/builder/test-virt-builder-list-simplestreams.sh b/builder/test-virt-builder-list-simplestreams.sh -index 3158066b16..4467971a90 100755 ---- a/builder/test-virt-builder-list-simplestreams.sh -+++ b/builder/test-virt-builder-list-simplestreams.sh -@@ -22,7 +22,7 @@ $TEST_FUNCTIONS - skip_if_skipped - - export XDG_CONFIG_HOME= --export XDG_CONFIG_DIRS="$abs_builddir/test-simplestreams" -+export VIRT_BUILDER_DIRS="$abs_builddir/test-simplestreams" - - short_list=$($VG virt-builder --no-check-signature --no-cache --list) - -diff --git a/builder/test-virt-builder-list.sh b/builder/test-virt-builder-list.sh -index 66910fcc3d..a66c1b5d0f 100755 ---- a/builder/test-virt-builder-list.sh -+++ b/builder/test-virt-builder-list.sh -@@ -24,7 +24,7 @@ $TEST_FUNCTIONS - skip_if_skipped - - export XDG_CONFIG_HOME= --export XDG_CONFIG_DIRS="$abs_builddir/test-config" -+export VIRT_BUILDER_DIRS="$abs_builddir/test-config" - - short_list=$($VG virt-builder --no-check-signature --no-cache --list) - -diff --git a/builder/test-virt-builder-planner.sh b/builder/test-virt-builder-planner.sh -index 108b70e95f..135319398c 100755 ---- a/builder/test-virt-builder-planner.sh -+++ b/builder/test-virt-builder-planner.sh -@@ -24,7 +24,7 @@ skip_if_skipped - skip_if_backend uml - - export XDG_CONFIG_HOME= --export XDG_CONFIG_DIRS="$abs_builddir/test-config" -+export VIRT_BUILDER_DIRS="$abs_builddir/test-config" - - if [ ! -f fedora.xz -o ! -f fedora.qcow2 -o ! -f fedora.qcow2.xz ]; then - echo "$0: test skipped because there is no fedora.xz, fedora.qcow2 or fedora.qcow2.xz in the build directory" -diff --git a/builder/test-virt-builder.sh b/builder/test-virt-builder.sh -index 18673874a3..fe06071370 100755 ---- a/builder/test-virt-builder.sh -+++ b/builder/test-virt-builder.sh -@@ -22,7 +22,7 @@ $TEST_FUNCTIONS - skip_if_skipped - - export XDG_CONFIG_HOME= --export XDG_CONFIG_DIRS="$abs_builddir/test-config" -+export VIRT_BUILDER_DIRS="$abs_builddir/test-config" - - if [ ! -f fedora.xz ]; then - echo "$0: test skipped because there is no fedora.xz in the build directory" -diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod -index eddadc7962..a56fa89cb1 100644 ---- a/builder/virt-builder.pod -+++ b/builder/virt-builder.pod -@@ -1146,9 +1146,9 @@ F<$HOME/.config> if not set). - - =item * - --$XDG_CONFIG_DIRS/virt-builder/repos.d/ (where C<$XDG_CONFIG_DIRS> --means any of the directories in that environment variable, or just F --if not set) -+$VIRT_BUILDER_DIRS/virt-builder/repos.d/ (where C<$VIRT_BUILDER_DIRS> -+means any of the directories in that environment variable, or just F -+if not set). - - =back - -@@ -1866,7 +1866,7 @@ Used to determine the location of the template cache. See L. - Used to determine the location of the user' sources. See - L. - --=item C -+=item C - - Used to determine the location of the system sources. See - L. -diff --git a/run.in b/run.in -index 5e36aa819b..7b401870d5 100755 ---- a/run.in -+++ b/run.in -@@ -95,9 +95,9 @@ export PATH - - # Make virt-builder use the local website copy to avoid hitting - # the network all the time. --if [ -z "$XDG_CONFIG_DIRS" ]; then -- prepend XDG_CONFIG_DIRS "$b/builder/test-website" -- export XDG_CONFIG_DIRS -+if [ -z "$VIRT_BUILDER_DIRS" ]; then -+ prepend VIRT_BUILDER_DIRS "$b/builder/test-website" -+ export VIRT_BUILDER_DIRS - fi - - # This is a cheap way to find some use-after-free and uninitialized --- -2.29.0.rc2 - diff --git a/0006-builder-Use-correct-ounit2-module.patch b/0006-builder-Use-correct-ounit2-module.patch deleted file mode 100644 index 6d0ed19..0000000 --- a/0006-builder-Use-correct-ounit2-module.patch +++ /dev/null @@ -1,64 +0,0 @@ -From b470270d44e8dc37a2417c1157eefdd9c3d65dd1 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 24 Mar 2021 18:30:45 +0000 -Subject: [PATCH 6/7] builder: Use correct ounit2 module. - -Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342 ---- - builder/Makefile.am | 2 +- - m4/guestfs-ocaml.m4 | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/builder/Makefile.am b/builder/Makefile.am -index 4d2e07843c..f49a3b0aaa 100644 ---- a/builder/Makefile.am -+++ b/builder/Makefile.am -@@ -192,7 +192,7 @@ if HAVE_OCAML_PKG_GETTEXT - OCAMLPACKAGES += -package gettext-stub - endif - if HAVE_OCAML_PKG_OUNIT --OCAMLPACKAGES_TESTS += -package oUnit -+OCAMLPACKAGES_TESTS += -package ounit2 - endif - - OCAMLCLIBS = \ -diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 -index a2f6cada9f..f5ac7eff29 100644 ---- a/m4/guestfs-ocaml.m4 -+++ b/m4/guestfs-ocaml.m4 -@@ -105,7 +105,7 @@ if test "x$OCAML_PKG_guestfs" = "xno"; then - fi - - OCAML_PKG_gettext=no --OCAML_PKG_oUnit=no -+OCAML_PKG_ounit2=no - ounit_is_v2=no - have_Bytes_module=no - AS_IF([test "x$OCAMLC" != "xno"],[ -@@ -117,11 +117,11 @@ AS_IF([test "x$OCAMLC" != "xno"],[ - - GUESTFS_CREATE_COMMON_GETTEXT_ML([common/mlgettext/common_gettext.ml]) - -- AC_CHECK_OCAML_PKG(oUnit) -+ AC_CHECK_OCAML_PKG(ounit2) - - # oUnit >= 2 is required, so check that it has OUnit2. -- if test "x$OCAML_PKG_oUnit" != "xno"; then -- AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+oUnit]) -+ if test "x$OCAML_PKG_ounit2" != "xno"; then -+ AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+ounit2]) - fi - - # Check if we have the 'Bytes' module. If not (OCaml < 4.02) then -@@ -141,7 +141,7 @@ AS_IF([test "x$OCAMLC" != "xno"],[ - AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT], - [test "x$OCAML_PKG_gettext" != "xno"]) - AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT], -- [test "x$OCAML_PKG_oUnit" != "xno" && test "x$ounit_is_v2" != "xno"]) -+ [test "x$OCAML_PKG_ounit2" != "xno" && test "x$ounit_is_v2" != "xno"]) - - AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no]) - AM_CONDITIONAL([HAVE_OCAML_GETTEXT], --- -2.29.0.rc2 - diff --git a/0007-Update-common-submodule-to-latest.patch b/0007-Update-common-submodule-to-latest.patch deleted file mode 100644 index 19f7cd2..0000000 --- a/0007-Update-common-submodule-to-latest.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 6e80a33b70f89c18cd2fbde739243e8c5a7efc25 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 25 Mar 2021 08:14:49 +0000 -Subject: [PATCH 7/7] Update common submodule to latest. - ---- - common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Submodule common ca8a16a926..7c39a06fe3: -diff --git a/common/mlstdutils/Makefile.am b/common/mlstdutils/Makefile.am -index 2b4aed8..650f18c 100644 ---- a/common/mlstdutils/Makefile.am -+++ b/common/mlstdutils/Makefile.am -@@ -85,7 +85,7 @@ OCAMLPACKAGES = \ - -I $(builddir) - OCAMLPACKAGES_TESTS = $(MLSTDUTILS_CMA) - if HAVE_OCAML_PKG_OUNIT --OCAMLPACKAGES_TESTS += -package oUnit -+OCAMLPACKAGES_TESTS += -package ounit2 - endif - - OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)' -diff --git a/common/mltools/Makefile.am b/common/mltools/Makefile.am -index 6bb2b88..5cec178 100644 ---- a/common/mltools/Makefile.am -+++ b/common/mltools/Makefile.am -@@ -129,7 +129,7 @@ if HAVE_OCAML_PKG_GETTEXT - OCAMLPACKAGES += -package gettext-stub - endif - if HAVE_OCAML_PKG_OUNIT --OCAMLPACKAGES_TESTS += -package oUnit -+OCAMLPACKAGES_TESTS += -package ounit2 - endif - - OCAMLCLIBS = \ -@@ -263,7 +263,8 @@ tools_utils_tests_DEPENDENCIES = \ - $(MLTOOLS_CMA) \ - $(top_srcdir)/ocaml-link.sh - tools_utils_tests_LINK = \ -- $(top_srcdir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \ -+ $(top_srcdir)/ocaml-link.sh \ -+ -cclib '-pthread -lpthread -lutils $(LIBXML2_LIBS) -lgnu' -- \ - $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \ - $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ - $(tools_utils_tests_THEOBJECTS) -o $@ -@@ -290,7 +291,8 @@ JSON_tests_DEPENDENCIES = \ - $(MLTOOLS_CMA) \ - $(top_srcdir)/ocaml-link.sh - JSON_tests_LINK = \ -- $(top_srcdir)/ocaml-link.sh -- \ -+ $(top_srcdir)/ocaml-link.sh \ -+ -cclib '-pthread -lpthread' -- \ - $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \ - $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ - $(JSON_tests_THEOBJECTS) -o $@ -@@ -303,7 +305,8 @@ JSON_parser_tests_DEPENDENCIES = \ - $(MLTOOLS_CMA) \ - $(top_srcdir)/ocaml-link.sh - JSON_parser_tests_LINK = \ -- $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ -+ $(top_srcdir)/ocaml-link.sh \ -+ -cclib '-pthread -lpthread $(OCAMLCLIBS)' -- \ - $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \ - $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \ - $(JSON_parser_tests_THEOBJECTS) -o $@ -diff --git a/common/mlutils/Makefile.am b/common/mlutils/Makefile.am -index e86d7bb..17dfac3 100644 ---- a/common/mlutils/Makefile.am -+++ b/common/mlutils/Makefile.am -@@ -112,10 +112,10 @@ c_utils_unit_tests_CFLAGS = $(libmlcutils_a_CFLAGS) - if !HAVE_OCAMLOPT - # Can't call this c_utils_unit_tests_OBJECTS because automake gets confused. - c_utils_unit_tests_THEOBJECTS = $(c_utils_unit_tests_BOBJECTS) --c_utils_unit_tests.cmo: OCAMLPACKAGES += -package oUnit -+c_utils_unit_tests.cmo: OCAMLPACKAGES += -package ounit2 - else - c_utils_unit_tests_THEOBJECTS = $(c_utils_unit_tests_XOBJECTS) --c_utils_unit_tests.cmx: OCAMLPACKAGES += -package oUnit -+c_utils_unit_tests.cmx: OCAMLPACKAGES += -package ounit2 - endif - - OCAMLLINKFLAGS = \ -@@ -131,7 +131,7 @@ c_utils_unit_tests_DEPENDENCIES = \ - c_utils_unit_tests_LINK = \ - $(top_srcdir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \ - $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) \ -- $(OCAMLPACKAGES) -package oUnit \ -+ $(OCAMLPACKAGES) -package ounit2 \ - $(OCAMLLINKFLAGS) \ - $(c_utils_unit_tests_THEOBJECTS) -o $@ - --- -2.29.0.rc2 - diff --git a/guestfs-tools.spec b/guestfs-tools.spec index 019823c..b6455fd 100644 --- a/guestfs-tools.spec +++ b/guestfs-tools.spec @@ -15,7 +15,7 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools 1 +%global patches_touch_autotools %{nil} # The source directory. %global source_directory 1.45-development @@ -25,8 +25,8 @@ Summary: Tools to access and modify virtual machine disk images Name: guestfs-tools -Version: 1.45.2 -Release: 6%{?dist} +Version: 1.45.3 +Release: 1%{?dist} License: GPLv2+ # Build only for architectures that have a kernel @@ -44,16 +44,6 @@ Source1: http://download.libguestfs.org/guestfs-tools/%{source_directory}/ Source2: libguestfs.keyring %endif -# Upstream patches to fix various build issues discovered while -# packaging this for Fedora. -Patch1: 0001-po-docs-podfiles-Fix-bogus-directories-in-this-file.patch -Patch2: 0002-po-docs-Don-t-try-to-install-.3-and-.5-files-which-d.patch -Patch3: 0003-build-Remove-dependency-on-gobject-introspection.patch -Patch4: 0004-build-Remove-dependency-on-perl-Sys-Virt.patch -Patch5: 0005-builder-Get-rid-of-etc-xdg-and-XDG_CONFIG_DIRS-nonse.patch -Patch6: 0006-builder-Use-correct-ounit2-module.patch -Patch7: 0007-Update-common-submodule-to-latest.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel %endif @@ -61,7 +51,7 @@ BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. BuildRequires: gcc, gcc-c++ BuildRequires: make -BuildRequires: libguestfs-devel >= 1.44.0 +BuildRequires: libguestfs-devel >= 1.45.3-1 BuildRequires: libguestfs-xfs BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Man) @@ -408,7 +398,8 @@ end %changelog -* Mon Mar 29 2021 Richard W.M. Jones - 1.45.2-6 +* Mon Mar 29 2021 Richard W.M. Jones - 1.45.3-1 +- New upstream version 1.45.3. - Fix symlink replacement of virt-builder directory (RHBZ#1943838). * Fri Mar 26 2021 Richard W.M. Jones - 1.45.2-5 diff --git a/sources b/sources index 7dd9501..8556357 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (guestfs-tools-1.45.2.tar.gz) = 8cf9a77209ad5f724b68dba8865cd5ea1d2d65f22a7c6c85796eccbff9fd9591cc9cf9d95c5426c60d15005b7bb4e23ce392cefc641e46fa4c0dfca4a6541edd -SHA512 (guestfs-tools-1.45.2.tar.gz.sig) = 52a49d652766e896390e135dd9efa5d109b4094cc1e4a34e5ec8540f992b491754e10c889e3d545a5e4d08bafe3f0ec64af69d494fb39221a4a0f5e74ff18268 +SHA512 (guestfs-tools-1.45.3.tar.gz) = c4fceba9e04222d573eb9bc4d4eff93a868073e43a5a78b994fd970885149dcc7a91c9c05b8564645fe7a201869c05368f400090fce731c51a3f0a30511e3c4c +SHA512 (guestfs-tools-1.45.3.tar.gz.sig) = 86bffa47d7e230c121a756d97d52349bf7cd40e23bf72ee64aa45188262fe0d542d7059cef1a440c412e5eab1fdd7d6ff5a039a897b7f9c669fb46886aec07ad