diff --git a/.gitignore b/.gitignore index 0ba5ef6..c36e9c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/guestfs-tools-1.51.6.tar.gz -SOURCES/libguestfs.keyring +guestfs-tools-1.52.1.tar.gz +libguestfs.keyring diff --git a/.guestfs-tools.metadata b/.guestfs-tools.metadata deleted file mode 100644 index 7f3840b..0000000 --- a/.guestfs-tools.metadata +++ /dev/null @@ -1,2 +0,0 @@ -7a64ba52bca3a3591d2e639a6bc9002d61e7d374 SOURCES/guestfs-tools-1.51.6.tar.gz -1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring diff --git a/SOURCES/0003-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch b/0001-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch similarity index 91% rename from SOURCES/0003-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch rename to 0001-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch index dc5d573..801f617 100644 --- a/SOURCES/0003-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch +++ b/0001-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch @@ -1,4 +1,4 @@ -From b5fdf9eac368a1c5df4ddd93ce40884924e6092a Mon Sep 17 00:00:00 2001 +From e827be5bb317f3d50086e2987ee88cd931e1f1b1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Jul 2015 09:28:03 -0400 Subject: [PATCH] RHEL: Reject use of libguestfs-winsupport features except for diff --git a/SOURCES/0004-RHEL-builder-Disable-opensuse-repository.patch b/0002-RHEL-builder-Disable-opensuse-repository.patch similarity index 94% rename from SOURCES/0004-RHEL-builder-Disable-opensuse-repository.patch rename to 0002-RHEL-builder-Disable-opensuse-repository.patch index a80dcfb..de0f328 100644 --- a/SOURCES/0004-RHEL-builder-Disable-opensuse-repository.patch +++ b/0002-RHEL-builder-Disable-opensuse-repository.patch @@ -1,4 +1,4 @@ -From 511de43cdca80381d52360e050bf57f7079f46d6 Mon Sep 17 00:00:00 2001 +From 6738e0638a0997e4551292eec91baf07ad0cefdc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 21 Nov 2022 13:03:22 +0000 Subject: [PATCH] RHEL: builder: Disable opensuse repository diff --git a/SOURCES/0014-customize-Implement-inject-blnsvr-operation.patch b/0003-customize-Implement-inject-blnsvr-operation.patch similarity index 99% rename from SOURCES/0014-customize-Implement-inject-blnsvr-operation.patch rename to 0003-customize-Implement-inject-blnsvr-operation.patch index c8303b0..ff7ae18 100644 --- a/SOURCES/0014-customize-Implement-inject-blnsvr-operation.patch +++ b/0003-customize-Implement-inject-blnsvr-operation.patch @@ -1,4 +1,4 @@ -From d326f1080aafe32d47b49064099f2e9d7759b2a0 Mon Sep 17 00:00:00 2001 +From 566e21933505606a64fe6e7c154ffb90209e7101 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 16 May 2024 12:49:24 +0100 Subject: [PATCH] customize: Implement --inject-blnsvr operation diff --git a/SOURCES/0015-Update-common-submodule.patch b/0004-Update-common-submodule.patch similarity index 99% rename from SOURCES/0015-Update-common-submodule.patch rename to 0004-Update-common-submodule.patch index 3f51270..3189ae8 100644 --- a/SOURCES/0015-Update-common-submodule.patch +++ b/0004-Update-common-submodule.patch @@ -1,4 +1,4 @@ -From a2faa7d57ea997e4194e95a5ccdf2b9e41376f55 Mon Sep 17 00:00:00 2001 +From f59b4fcf683f449a7dd1cad3c168f536cc10304a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 6 Aug 2024 08:51:29 +0100 Subject: [PATCH] Update common submodule diff --git a/SOURCES/0016-Update-common-submodule.patch b/0005-Update-common-submodule.patch similarity index 96% rename from SOURCES/0016-Update-common-submodule.patch rename to 0005-Update-common-submodule.patch index 2fa5601..e536917 100644 --- a/SOURCES/0016-Update-common-submodule.patch +++ b/0005-Update-common-submodule.patch @@ -1,4 +1,4 @@ -From 924bf9e6b76fa6c910c1708a20e0716384fbbe07 Mon Sep 17 00:00:00 2001 +From 7cffcb71c393da2ee636eb8bc9360bf83f5066f5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 10 Aug 2024 14:17:51 +0100 Subject: [PATCH] Update common submodule diff --git a/SOURCES/0001-Update-common-submodule.patch b/SOURCES/0001-Update-common-submodule.patch deleted file mode 100644 index 1970bb1..0000000 --- a/SOURCES/0001-Update-common-submodule.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 28ecb8693bbded3e1c70c1baa57f3498a6b8127e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sat, 9 Dec 2023 12:59:13 +0000 -Subject: [PATCH] Update common submodule - -Pick up this bug fix: - - mltools/libosinfo-c.c: Fix off-by-one error ---- - common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Submodule common cd29aee91..0dba002c2: -diff --git a/common/mltools/libosinfo-c.c b/common/mltools/libosinfo-c.c -index 93357fd91..a48c8989f 100644 ---- a/common/mltools/libosinfo-c.c -+++ b/common/mltools/libosinfo-c.c -@@ -296,7 +296,7 @@ v2v_osinfo_os_get_device_drivers (value osv) - - driver = OSINFO_DEVICE_DRIVER(osinfo_list_get_nth (OSINFO_LIST(list), i)); - -- vi = caml_alloc (6, 0); -+ vi = caml_alloc (7, 0); - str = osinfo_device_driver_get_architecture (driver); - copyv = caml_copy_string (str); - Store_field (vi, 0, copyv); diff --git a/SOURCES/0002-builder-Add-a-test-of-the-chown-parameter.patch b/SOURCES/0002-builder-Add-a-test-of-the-chown-parameter.patch deleted file mode 100644 index 751ebec..0000000 --- a/SOURCES/0002-builder-Add-a-test-of-the-chown-parameter.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5f9beb89443f84640efc52ee6cd68f7f880fb66b Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 19 Jan 2024 13:22:51 +0000 -Subject: [PATCH] builder: Add a test of the --chown parameter - -Also update the libguestfs common submodule, pulling in this change -from libguestfs: - - generator/customize.ml: Split --chown parameter on ':' character - -and this patch to common/mltools: - - mltools/libosinfo-c.c: Fix off-by-one error - -(cherry picked from commit 299dc5ec2a0bdd9adecef75adc6a5eca0dc685b1) ---- - builder/test-virt-builder.sh | 4 ++++ - common | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/builder/test-virt-builder.sh b/builder/test-virt-builder.sh -index 705788a3c..f839fd7af 100755 ---- a/builder/test-virt-builder.sh -+++ b/builder/test-virt-builder.sh -@@ -69,6 +69,7 @@ virt-builder phony-fedora \ - --write '/etc/append6: - ' \ - --append-line '/etc/append6:line2' \ -+ --chown 1:1:/etc/append6 \ - --firstboot Makefile --firstboot-command 'echo "hello"' \ - --firstboot-install "minicom,inkscape" - -@@ -112,6 +113,7 @@ echo append5: - cat /etc/append5 - echo append6: - cat /etc/append6 -+stat /etc/append6 | grep '^[ug]id:' - - echo ----- - EOF -@@ -154,6 +156,8 @@ append6: - - line2 - -+uid: 1 -+gid: 1 - -----" ]; then - echo "$0: unexpected output:" - cat test-virt-builder.out -Submodule common 0dba002c2..54869c987: -diff --git a/common/mlcustomize/customize_cmdline.ml b/common/mlcustomize/customize_cmdline.ml -index 245d9960a..48ee33445 100644 ---- a/common/mlcustomize/customize_cmdline.ml -+++ b/common/mlcustomize/customize_cmdline.ml -@@ -157,7 +157,7 @@ let rec argspec () = - let len = String.length arg in - String.sub arg 0 i, String.sub arg (i+1) (len-(i+1)) - and split_string_triplet option_name arg = -- match String.nsplit ~max:3 "," arg with -+ match String.nsplit ~max:3 ":" arg with - | [a; b; c] -> a, b, c - | _ -> - error (f_"invalid format for '--%s' parameter, see the man page") diff --git a/SOURCES/0005-inspector-inspector.c-Remove-extra-cases-covered-by-.patch b/SOURCES/0005-inspector-inspector.c-Remove-extra-cases-covered-by-.patch deleted file mode 100644 index 1bc04da..0000000 --- a/SOURCES/0005-inspector-inspector.c-Remove-extra-cases-covered-by-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 76080541ae09c6242e0a162009c5faec3ba94b41 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 29 Feb 2024 21:27:47 +0000 -Subject: [PATCH] inspector/inspector.c: Remove extra cases covered by default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In GCC 14: - -inspector.c: In function ‘do_xpath’: -inspector.c:770:3: error: case value ‘5’ not in enumerated type ‘xmlXPathObjectType’ [-Werror=switch] - 770 | case XPATH_POINT: - | ^~~~ -inspector.c:771:3: error: case value ‘6’ not in enumerated type ‘xmlXPathObjectType’ [-Werror=switch] - 771 | case XPATH_RANGE: - | ^~~~ -inspector.c:772:3: error: case value ‘7’ not in enumerated type ‘xmlXPathObjectType’ [-Werror=switch] - 772 | case XPATH_LOCATIONSET: - | ^~~~ - -We already have a default case here, remove the other cases. - -(cherry picked from commit 9d2ac9c9b48bf34f5fc3485303143302ead4cb4f) ---- - inspector/inspector.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/inspector/inspector.c b/inspector/inspector.c -index 73357c7d7..01abfae0c 100644 ---- a/inspector/inspector.c -+++ b/inspector/inspector.c -@@ -764,14 +764,6 @@ do_xpath (const char *query) - printf ("\n"); - break; - -- case XPATH_UNDEFINED: /* grrrrr ... switch-enum is a useless warning */ -- case XPATH_BOOLEAN: -- case XPATH_NUMBER: -- case XPATH_POINT: -- case XPATH_RANGE: -- case XPATH_LOCATIONSET: -- case XPATH_USERS: -- case XPATH_XSLT_TREE: - default: - r = (char *) xmlXPathCastToString (xpathObj); - printf ("%s\n", r); diff --git a/SOURCES/0006-m4-guestfs-c.m4-Re-add-.-configure-enable-werror.patch b/SOURCES/0006-m4-guestfs-c.m4-Re-add-.-configure-enable-werror.patch deleted file mode 100644 index ae13179..0000000 --- a/SOURCES/0006-m4-guestfs-c.m4-Re-add-.-configure-enable-werror.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dbc179ab026897be96651e7f9ca6026a3ebf540d Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 29 Feb 2024 21:20:59 +0000 -Subject: [PATCH] m4/guestfs-c.m4: Re-add ./configure --enable-werror - -Somewhere during removal of gnulib and splitting guestfs-tools from -libguestfs, this option was lost. Re-add it simply by copying the -configure fragment over from libguestfs. - -(cherry picked from commit 42426992a292b45611b00fcff42160854db09922) ---- - m4/guestfs-c.m4 | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4 -index bc7e3b2aa..67004d0a1 100644 ---- a/m4/guestfs-c.m4 -+++ b/m4/guestfs-c.m4 -@@ -29,6 +29,23 @@ test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant]) - - AM_PROG_CC_C_O - -+AC_ARG_ENABLE([werror], -+ [AS_HELP_STRING([--enable-werror], -+ [turn on lots of GCC warnings (for developers)])], -+ [case $enableval in -+ yes|no) ;; -+ *) AC_MSG_ERROR([bad value $enableval for werror option]) ;; -+ esac -+ gcc_warnings=$enableval], -+ [gcc_warnings=no] -+) -+WARN_CFLAGS="-Wall" -+AC_SUBST([WARN_CFLAGS]) -+if test "x$gcc_warnings" = "xyes"; then -+ WERROR_CFLAGS="-Werror" -+fi -+AC_SUBST([WERROR_CFLAGS]) -+ - # Provide a global place to set CFLAGS. (Note that setting AM_CFLAGS - # is no use because it doesn't override target_CFLAGS). - #--- diff --git a/SOURCES/0007-make-fs-Use-S-option-with-z.patch b/SOURCES/0007-make-fs-Use-S-option-with-z.patch deleted file mode 100644 index 71ac342..0000000 --- a/SOURCES/0007-make-fs-Use-S-option-with-z.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 51b0bf74b249ac6646b7e083a678553fc40d44d7 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 7 Mar 2024 12:00:45 +0000 -Subject: [PATCH] make-fs: Use -S option with -z - -Basically the file -z option is broken for distributions that enable -seccomp support in the 'file' command. Turn off seccomp when we know -we'll be using -z. - -We hit this before in the libguestfs daemon: -https://github.com/libguestfs/libguestfs/issues/100 - -It was reported upstream but the fix was rejected: -https://bugs.astron.com/view.php?id=406 - -See also libguestfs commit 23986d3c4f4d1f9cbac44cc743d3e6af721e4237 -("file: Use -S option with -z"). - -Note this requires file > 5.32. We could make it work for earlier -versions of file with some extra work: -https://listman.redhat.com/archives/libguestfs/2023-September/032613.html -& libguestfs commit c95d8c4cf64142bb707b42c32cf3e1ba3c4a5eb1 - -Reported-by: Jax Young -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2266201 -(cherry picked from commit a706f6f55345b06578fd1ca4af531524dc2131fb) ---- - make-fs/make-fs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/make-fs/make-fs.c b/make-fs/make-fs.c -index 7837b61be..b8aebccfb 100644 ---- a/make-fs/make-fs.c -+++ b/make-fs/make-fs.c -@@ -457,7 +457,7 @@ estimate_input (const char *input, uint64_t *estimate_rtn, char **ifmt_rtn) - } - else { - argv[0] = "file"; -- argv[1] = "-bsLz"; -+ argv[1] = "-bsSLz"; - argv[2] = input; - argv[3] = NULL; - diff --git a/SOURCES/0008-sysprep-Make-clearer-that-we-do-not-support-Windows.patch b/SOURCES/0008-sysprep-Make-clearer-that-we-do-not-support-Windows.patch deleted file mode 100644 index 54314af..0000000 --- a/SOURCES/0008-sysprep-Make-clearer-that-we-do-not-support-Windows.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cc0ae4acabfc857f2bcee828e725a9d69dab5735 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 12 Mar 2024 09:42:30 +0000 -Subject: [PATCH] sysprep: Make clearer that we do not support Windows - -Thanks: Dan Kenigsberg -(cherry picked from commit 82c0fb1231c1a9250104cff278f1c67ab482fa4b) ---- - sysprep/virt-sysprep.pod | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/sysprep/virt-sysprep.pod b/sysprep/virt-sysprep.pod -index 0bcdc4dec..b48ac55c1 100644 ---- a/sysprep/virt-sysprep.pod -+++ b/sysprep/virt-sysprep.pod -@@ -30,10 +30,8 @@ disk image to be writable as the non-root user running virt-sysprep. - - "Sysprep" stands for "system preparation" tool. The name comes from - the Microsoft program F which is used to unconfigure --Windows machines in preparation for cloning them. Having said that, --virt-sysprep does I currently work on Microsoft Windows guests. --We plan to support Windows sysprepping in a future version, and we --already have code to do it. -+Windows machines in preparation for cloning them. (Virt-sysprep does -+not work on Microsoft Windows guests.) - - =head1 OPTIONS - diff --git a/SOURCES/0009-build-Use-DISTCLEANFILES-for-a-generated-but-few-rar.patch b/SOURCES/0009-build-Use-DISTCLEANFILES-for-a-generated-but-few-rar.patch deleted file mode 100644 index 0299109..0000000 --- a/SOURCES/0009-build-Use-DISTCLEANFILES-for-a-generated-but-few-rar.patch +++ /dev/null @@ -1,63 +0,0 @@ -From a103e367c4fd6bd073c324253833289f6a8ecc3a Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 12 Mar 2024 10:04:34 +0000 -Subject: [PATCH] build: Use DISTCLEANFILES for a generated but few rarely - updated files - -We rarely change the generated test scripts or the sysprep mli files, -so we only need to delete them in 'make distclean', not 'make clean'. - -(cherry picked from commit 35e15c68ac9c4e5361e4cf8a49a60a4bc2708d89) ---- - builder/Makefile.am | 4 +++- - customize/Makefile.am | 6 ++++-- - sysprep/Makefile.am | 2 +- - 3 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/builder/Makefile.am b/builder/Makefile.am -index 42606aaf3..b474f0c9d 100644 ---- a/builder/Makefile.am -+++ b/builder/Makefile.am -@@ -412,8 +412,10 @@ test-console-%.sh: - chmod 0755 $@-t - mv $@-t $@ - -+DISTCLEANFILES += \ -+ $(console_test_scripts) -+ - CLEANFILES += \ -- $(console_test_scripts) \ - console-*.img \ - console-*.out - -diff --git a/customize/Makefile.am b/customize/Makefile.am -index 3a974590f..461629062 100644 ---- a/customize/Makefile.am -+++ b/customize/Makefile.am -@@ -285,9 +285,11 @@ test-settings-%.sh: - chmod 0755 $@-t - mv $@-t $@ - -+DISTCLEANFILES += \ -+ $(password_test_scripts) \ -+ $(settings_test_scripts) -+ - CLEANFILES += \ -- $(password_test_scripts) \ -- $(settings_test_scripts) \ - password-*.img \ - password-*.log \ - settings-*.img -diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am -index 4b29d4e10..4b1c23ce0 100644 ---- a/sysprep/Makefile.am -+++ b/sysprep/Makefile.am -@@ -179,7 +179,7 @@ virt_sysprep_LINK = \ - $(OBJECTS) -o $@ - - # The sysprep_operation_*.mli files are all empty and autogenerated. --CLEANFILES += \ -+DISTCLEANFILES += \ - $(patsubst %,sysprep_operation_%.mli,$(operations)) - - sysprep_operation_%.mli: diff --git a/SOURCES/0010-Fix-bytecode-compilation-to-output-whole-exe-instead.patch b/SOURCES/0010-Fix-bytecode-compilation-to-output-whole-exe-instead.patch deleted file mode 100644 index b4241da..0000000 --- a/SOURCES/0010-Fix-bytecode-compilation-to-output-whole-exe-instead.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6ea88c2011b02a47058ba6d89af156983bd52a91 Mon Sep 17 00:00:00 2001 -From: Jerry James -Date: Fri, 12 Apr 2024 20:11:50 +0100 -Subject: [PATCH] Fix bytecode compilation to output whole exe instead of using - -custom - -These binaries are more resistant to being stripped. - -Reported-by: Ilya Leoshkevich -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2274708 -(cherry picked from commit c249fd5caca8f1eed439f83e2bb1af46c8a28a27) ---- - subdir-rules.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/subdir-rules.mk b/subdir-rules.mk -index 6bd62b653..051dc9d5a 100644 ---- a/subdir-rules.mk -+++ b/subdir-rules.mk -@@ -49,7 +49,7 @@ LOG_DRIVER = env $(SHELL) $(top_srcdir)/build-aux/guestfs-test-driver - - if !HAVE_OCAMLOPT - MLARCHIVE = cma --LINK_CUSTOM_OCAMLC_ONLY = -custom -+LINK_CUSTOM_OCAMLC_ONLY = -output-complete-exe - BEST = c - else - MLARCHIVE = cmxa diff --git a/SOURCES/0011-po-docs-Run-po4a-translate-and-sed-commands-separate.patch b/SOURCES/0011-po-docs-Run-po4a-translate-and-sed-commands-separate.patch deleted file mode 100644 index de72f45..0000000 --- a/SOURCES/0011-po-docs-Run-po4a-translate-and-sed-commands-separate.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8a942cdd8e6d1aa526844c428660d0bb4ca02770 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 4 Apr 2024 09:38:28 +0100 -Subject: [PATCH] po-docs: Run po4a-translate and sed commands separately - -I noticed that 1-byte translated POD files were being generated in the -output directory (po-docs/ja/). This seems to have happened because -po4a-translate was generating an error, but because we were -immediately pipeing the output into sed the error was suppressed. - -By running them as two separate commands this cannot happen. - -Fixes: commit bd896d68c06d7f66303bd77daa666367b0de5f3a -(cherry picked from libguestfs commit d755070346c0498672517c844d7ced52e9263197) - -(cherry picked from commit 8c8da80adf8a9e3c350b010b5724a5ae7d9875b6) ---- - po-docs/language.mk | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/po-docs/language.mk b/po-docs/language.mk -index b4e3544ca..ba2e36998 100644 ---- a/po-docs/language.mk -+++ b/po-docs/language.mk -@@ -101,13 +101,16 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.po - # Remove both. - # XXX Fix po4a so it doesn't do this. - %.pod: $(srcdir)/../$(LINGUA).po -+ rm -f $@ $@-t - $(guestfs_am_v_po4a_translate)$(PO4A_TRANSLATE) \ - -f pod \ - -M utf-8 -L utf-8 \ - -k 0 \ - -m $(top_srcdir)/$(shell grep -E '/$(basename $@)(\.|$$)' $(top_srcdir)/po-docs/podfiles) \ - -p $< \ -- | $(SED) '0,/^=encoding/d' > $@ -+ -l $@-t -+ $(SED) '0,/^=encoding/d' < $@-t > $@ -+ rm $@-t - - # XXX Can automake do this properly? - install-data-hook: diff --git a/SOURCES/0012-po-docs-Remove-virt-dib-from-list-of-translated-man-.patch b/SOURCES/0012-po-docs-Remove-virt-dib-from-list-of-translated-man-.patch deleted file mode 100644 index 40e65be..0000000 --- a/SOURCES/0012-po-docs-Remove-virt-dib-from-list-of-translated-man-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 80806f5438c769b71e92a7669db029f5f243cfce Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 12 Apr 2024 22:06:55 +0100 -Subject: [PATCH] po-docs: Remove virt-dib from list of translated man pages - -This page no longer exists. - -Fixes: commit 57423d907270526ea664ff15601cce956353820e -(cherry picked from commit 2e797d3bb4c8a13305a948e3d87e4eabfd692e17) ---- - po-docs/language.mk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/po-docs/language.mk b/po-docs/language.mk -index ba2e36998..7328265e6 100644 ---- a/po-docs/language.mk -+++ b/po-docs/language.mk -@@ -30,7 +30,6 @@ MANPAGES = \ - virt-cat.1 \ - virt-customize.1 \ - virt-df.1 \ -- virt-dib.1 \ - virt-diff.1 \ - virt-edit.1 \ - virt-filesystems.1 \ diff --git a/SOURCES/0013-Update-common-submodule.patch b/SOURCES/0013-Update-common-submodule.patch deleted file mode 100644 index 7b86099..0000000 --- a/SOURCES/0013-Update-common-submodule.patch +++ /dev/null @@ -1,65 +0,0 @@ -From d0b1b1eaaebdff2cee004304e9d498cd2a720e23 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 24 Apr 2024 12:23:34 +0100 -Subject: [PATCH] Update common submodule - -In particular pick this: - - commit 93a7f3af5c23ece6a8e092827ed5928a8973fd3c - Author: Richard W.M. Jones - Date: Wed Apr 24 12:08:01 2024 +0100 - - options: Allow nbd+unix:// URIs - -(cherry picked from commit 21a507d8aeb2d264863e1fbdfadc0ff44455ffb4) ---- - common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Submodule common 54869c987..93a7f3af5: -diff --git a/common/options/uri.c b/common/options/uri.c -index 84d393c1e..9180d6a27 100644 ---- a/common/options/uri.c -+++ b/common/options/uri.c -@@ -99,7 +99,7 @@ is_uri (const char *arg) - return 0; - - for (p--; p >= arg; p--) { -- if (!c_islower (*p)) -+ if (! (c_islower (*p) || *p == '+')) - return 0; - } - -@@ -148,7 +148,10 @@ parse (const char *arg, char **path_ret, char **protocol_ret, - } - */ - -- *protocol_ret = strdup (uri->scheme); -+ if (STREQ (uri->scheme, "nbd+unix")) -+ *protocol_ret = strdup ("nbd"); -+ else -+ *protocol_ret = strdup (uri->scheme); - if (*protocol_ret == NULL) { - perror ("strdup: protocol"); - return -1; -@@ -194,7 +197,7 @@ parse (const char *arg, char **path_ret, char **protocol_ret, - if (path && path[0] == '/' && - (STREQ (uri->scheme, "gluster") || - STREQ (uri->scheme, "iscsi") || -- STREQ (uri->scheme, "nbd") || -+ STRPREFIX (uri->scheme, "nbd") || - STREQ (uri->scheme, "rbd") || - STREQ (uri->scheme, "sheepdog"))) - path++; -diff --git a/common/progress/progress.c b/common/progress/progress.c -index e4b30663f..5848abd70 100644 ---- a/common/progress/progress.c -+++ b/common/progress/progress.c -@@ -123,6 +123,7 @@ progress_bar_init (unsigned flags) - bar->machine_readable = 1; - bar->utf8_mode = 0; - bar->have_terminfo = 0; -+ bar->fp = NULL; - } else { - bar->machine_readable = 0; - diff --git a/SOURCES/guestfs-tools-1.51.6.tar.gz.sig b/SOURCES/guestfs-tools-1.51.6.tar.gz.sig deleted file mode 100644 index 0859703..0000000 --- a/SOURCES/guestfs-tools-1.51.6.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmV0UtkRHHJpY2hAYW5u -ZXhpYS5vcmcACgkQkXOPc+G3aKArQQ/8DR2NMjDy8zyXfLSAoSPcChx+wS36RRhj -rYGSNzD2aNhMzB+WGZHomiW4ahLqj7OAuXQlmpUMjLVsAfyja8aNW7rsnfTM1l5u -p6GS3DFTk34XgVrZO01pEBLWk9blr+xhAFP+qNIwWKv76+xO0QjNa0D5gJvBojZf -J3ct9l1ibKqDh4eG9ReSSUh76WOxm97JwP80ZRBKCpcNJe+fceJGHdBhl5UJFw/N -lAKY+d7MESk9aKZCNy6BRrls6IeIlsOBB8HbG5mXqMv4IfwarB91zZTG9NJRpmSN -MzZ/GIwSCJy9U9hmG3dA/70xFu3HQkshaCisXb4FrzCnlTHZFNCvwdhY2k3qIzZr -PuvsA3ETQqYUj66AlOOD/3TqAu36kFEeeateH75cIiOYfkUUmrO7FF76hY2jNs+q -puTm14dg/MA0OROQv5ykcuN2ukvfsyEsCFao+76am5MG8CViy1tSnL/ZSBN0itLl -jalFbag3GbDCwVt+lpPQbrLDTWNVabAEeN9LlMMcsciIGWDiz99Ntmwe1yxwLLl3 -kk8f9xFiWXU7C0yrPY4HzPGNjzklsaNlpzVnqgkWpR1gzpLr37HWx0E1Ct6OlJBJ -7vllv9L9bZErUwyvlSuGcY/6rHd+KnWSS0IBvEfE/eveQErzwgiuGiBUnvGB6NUT -l868E59pb84= -=cEbV ------END PGP SIGNATURE----- diff --git a/SOURCES/copy-patches.sh b/copy-patches.sh similarity index 98% rename from SOURCES/copy-patches.sh rename to copy-patches.sh index 13343e8..57ccf1f 100755 --- a/SOURCES/copy-patches.sh +++ b/copy-patches.sh @@ -7,7 +7,7 @@ set -e # ./copy-patches.sh project=guestfs-tools -rhel_version=9.5 +rhel_version=10.0 # Check we're in the right directory. if [ ! -f $project.spec ]; then diff --git a/guestfs-tools-1.52.1.tar.gz.sig b/guestfs-tools-1.52.1.tar.gz.sig new file mode 100644 index 0000000..d6c741b --- /dev/null +++ b/guestfs-tools-1.52.1.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmbOSloRHHJpY2hAYW5u +ZXhpYS5vcmcACgkQkXOPc+G3aKDJJg/8Du104+cALOWOzI9MHz0LuHZ7U1umcOTy +uvJHKTpzfanzVXzd3gHQD7fKaQla9pp+m6nguYVfmw6sk0YGP6rKkS23WJpl3ubt +hqt2ozsoBcLnwtcO5OZiBLCxaw12HqTYBGXROvAu7iTsiHwQcXAoqJ0wVGFY2lyf +uBEVxYhLzSZ9k7yK6nQut7wE/GfXRG5uOBOnTz6pAZBMYed4/cOyjiQ+xgSkcdaJ +uJd5JYqwBRfdBFFKufUg691HN/Zqr+qFIIhdGC/1Jt7JAvVx+PvwZGjpU+erJLuV +/B4rghY5NoB5yrc8+8Mun2Juxnq0mQwqLFCFGGc/4qcBBW02jzwERxoBi80LRdqo +Ifikf1qgiDRPqpYrSRKQfjxtGAix2DJhHRAs3U4JXTlY4EE0ZPSqmo+Nd7cvtf16 +Y7BT/fZ8egRXGi5wRHfCghnLdLNDgt8bjPriEezYOxwH+YwhB9tAdVDN+wBpDyC9 +fTXoHHVFxMPaee0yMh+qlbD6BswivzPzDm6lRekI55d+IuPMdr8fcFUqZK/ZhC8V +izBI4JW8+ZPwfvONAbv3h+jg2g67KhBvrZdZRLcjlzS6x4NBKI2tnqCrxGksjoYg +Yxd/UCKrBR0O1+aXkYMkcbyCgO/IhKlPvrnmOEFRLHdRY0AE+8pI/ULtJXcCYaZt +gVLJpe2gPzs= +=yepi +-----END PGP SIGNATURE----- diff --git a/SPECS/guestfs-tools.spec b/guestfs-tools.spec similarity index 68% rename from SPECS/guestfs-tools.spec rename to guestfs-tools.spec index 7e56904..b398490 100644 --- a/SPECS/guestfs-tools.spec +++ b/guestfs-tools.spec @@ -8,18 +8,18 @@ %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.51-development +%global source_directory 1.52-stable # Filter perl provides. %{?perl_default_filter} Summary: Tools to access and modify virtual machine disk images Name: guestfs-tools -Version: 1.51.6 -Release: 5%{?dist} +Version: 1.52.1 +Release: 1%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later # Build only for architectures that have a kernel @@ -45,25 +45,14 @@ Source2: libguestfs.keyring Source3: copy-patches.sh # Patches are maintained in the following repository: -# https://github.com/rwmjones/guestfs-tools/commits/rhel-9.5 +# https://github.com/rwmjones/guestfs-tools/commits/rhel-10.0 # Patches. -Patch0001: 0001-Update-common-submodule.patch -Patch0002: 0002-builder-Add-a-test-of-the-chown-parameter.patch -Patch0003: 0003-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch -Patch0004: 0004-RHEL-builder-Disable-opensuse-repository.patch -Patch0005: 0005-inspector-inspector.c-Remove-extra-cases-covered-by-.patch -Patch0006: 0006-m4-guestfs-c.m4-Re-add-.-configure-enable-werror.patch -Patch0007: 0007-make-fs-Use-S-option-with-z.patch -Patch0008: 0008-sysprep-Make-clearer-that-we-do-not-support-Windows.patch -Patch0009: 0009-build-Use-DISTCLEANFILES-for-a-generated-but-few-rar.patch -Patch0010: 0010-Fix-bytecode-compilation-to-output-whole-exe-instead.patch -Patch0011: 0011-po-docs-Run-po4a-translate-and-sed-commands-separate.patch -Patch0012: 0012-po-docs-Remove-virt-dib-from-list-of-translated-man-.patch -Patch0013: 0013-Update-common-submodule.patch -Patch0014: 0014-customize-Implement-inject-blnsvr-operation.patch -Patch0015: 0015-Update-common-submodule.patch -Patch0016: 0016-Update-common-submodule.patch +Patch0001: 0001-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch +Patch0002: 0002-RHEL-builder-Disable-opensuse-repository.patch +Patch0003: 0003-customize-Implement-inject-blnsvr-operation.patch +Patch0004: 0004-Update-common-submodule.patch +Patch0005: 0005-Update-common-submodule.patch %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel @@ -422,80 +411,157 @@ end %changelog -* Tue Aug 27 2024 Richard W.M. Jones - 1.51.6-5 +* Tue Aug 27 2024 Richard W.M. Jones - 1.52.1-1 +- New stable version 1.52.1 +- Rebase on top of patches from RHEL 9.5 - Reboot Windows between each firstboot script to improve reliability - resolves: RHEL-55759 - -* Thu May 16 2024 Richard W.M. Jones - 1.51.6-4 -- Add support for nbd+unix:// URIs - resolves: RHEL-33956 + resolves: RHEL-56319 - customize: Implement --inject-blnsvr operation - resolves: RHEL-36634 + resolves: RHEL-56330 +- Add support for nbd+unix:// URIs + resolves: RHEL-56332 -* Fri Jan 19 2024 Richard W.M. Jones - 1.51.6-2 -- Rebase to guestfs-tools 1.51.6 -- Implement --key all:... - resolves: RHEL-19030 -- Fix crash because of off-by-one error - resolves: RHEL-19062 -- Fix virt-customize --chown invalid format - resolves: RHEL-21899 +* Tue Jun 25 2024 Troy Dawson - 1.52.0-6 +- Bump release for June 2024 mass rebuild -* Thu Jun 08 2023 Laszlo Ersek - 1.50.1-3 -- let virt-inspector recognize "--key /dev/mapper/VG-LV:key:password" -- reenable "make check"; we now use "-cpu max" (libguestfs 30f74f38bd6e) - resolves: rhbz#2209280 +* Wed Jun 19 2024 Richard W.M. Jones - 1.52.0-5 +- OCaml 5.2.0 ppc64le fix -* Thu Apr 06 2023 Richard W.M. Jones - 1.50.1-1 -- Rebase to guestfs-tools 1.50.1 - resolves: rhbz#2168626 -- Fix virt-drivers inspection of RHEL 9.2 guests - resolves: rhbz#2184963 +* Fri May 31 2024 Richard W.M. Jones - 1.52.0-4 +- Rebuild for OCaml 5.2 -* Thu Nov 24 2022 Richard W.M. Jones - 1.48.2-8 -- Support Rocky Linux in virt-customize - resolves: rhbz#2133443 -- Disable OpenSUSE repo in virt-builder - resolves: rhbz#2145160 +* Wed Jan 24 2024 Fedora Release Engineering - 1.52.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Fri Jul 15 2022 Richard W.M. Jones - 1.48.2-5 -- Rebase to guestfs-tools 1.48.2 - resolves: rhbz#2059286 -- Default to --selinux-relabel in various tools - resolves: rhbz#2075718, rhbz#2089748 -- Add lvm system.devices cleanup operation to virt-sysprep - resolves: rhbz#2072493 -- Refactor virt-customize --install, --update options in common submodule -- Add support for Clevis & Tang - resolves: rhbz#1809453 -- Fix CVE-2022-2211 Denial of Service in --key parameter - resolves: rhbz#2102721 -- Fix virt-sysprep and LUKS-on-LVM guests - resolves: rhbz#2106286 +* Fri Jan 19 2024 Richard W.M. Jones - 1.52.0-2 +- Fix virt-customize --chown invalid format error +- New upstream github repository. -* Sat Dec 04 2021 Richard W.M. Jones - 1.46.1-6 -- Clean up NetworkManager connection files -- Add the copy-patches.sh script from virt-v2v - resolves: rhbz#1980922 +* Thu Jan 4 2024 Richard W.M. Jones - 1.52.0-1 +- New stable version 1.52.0 -* Tue Nov 23 2021 Richard W.M. Jones - 1.46.1-5 -- Fix detection of Kylin Desktop - resolves: rhbz#2025950 +* Tue Dec 19 2023 Richard W.M. Jones - 1.51.7-1 +- New development version 1.51.7 -* Mon Aug 09 2021 Mohan Boddu - 1.46.1-4.1 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon Dec 18 2023 Richard W.M. Jones - 1.51.6-5 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 -* Wed Jun 2 2021 Richard W.M. Jones - 1.46.1-3.el9.1 +* Tue Dec 12 2023 Richard W.M. Jones - 1.51.6-4 +- Bump release and rebuild + +* Tue Dec 12 2023 Richard W.M. Jones - 1.51.6-3 +- OCaml 5.1.1 rebuild for Fedora 40 + +* Sat Dec 9 2023 Richard W.M. Jones - 1.51.6-2 +- New development version 1.51.6 + +* Mon Nov 27 2023 Richard W.M. Jones - 1.51.5-2 +- Fix build for libxml2 2.12.1 + +* Thu Nov 02 2023 Richard W.M. Jones - 1.51.5-1 +- New development version 1.51.5 + +* Thu Oct 05 2023 Richard W.M. Jones - 1.51.4-2 +- OCaml 5.1 rebuild for Fedora 40 + +* Thu Jul 20 2023 Richard W.M. Jones - 1.51.4-1 +- New development version 1.51.4 + +* Thu Jul 20 2023 Fedora Release Engineering - 1.51.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 14 2023 Richard W.M. Jones - 1.51.3-1 +- New development version 1.51.3 + +* Mon Jun 05 2023 Richard W.M. Jones - 1.51.2-2 +- Migrated to SPDX license + +* Thu Apr 06 2023 Richard W.M. Jones - 1.51.2-1 +- New development version 1.51.2 + +* Tue Feb 21 2023 Richard W.M. Jones - 1.51.1-2 +- Fix BR hwdata-devel for PCI IDs data + +* Mon Feb 20 2023 Richard W.M. Jones - 1.51.1-1 +- New development version 1.51.1 +- virt-drivers: Add BuildRequires and runtime Recommends on hwdata. + +* Tue Feb 14 2023 Richard W.M. Jones - 1.50.0-2 +- Remove virt-dib (RHBZ#2169550) + +* Tue Feb 07 2023 Richard W.M. Jones - 1.50.0-1 +- New upstream stable version 1.50.0 + +* Thu Jan 26 2023 Richard W.M. Jones - 1.49.10-1 +- New upstream development version 1.49.10 + +* Thu Jan 19 2023 Richard W.M. Jones - 1.49.9-1 +- New upstream development version 1.49.9 +- New tool: virt-drivers +- Add BR glibc-static for tests on x86_64. + +* Thu Jan 19 2023 Fedora Release Engineering - 1.49.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 17 2023 Richard W.M. Jones - 1.49.8-2 +- New upstream development version 1.49.8 +- +BR libosinfo-devel + +* Sat Dec 10 2022 Richard W.M. Jones - 1.49.7-2 +- New upstream development version 1.49.7 + +* Fri Nov 25 2022 Richard W.M. Jones - 1.49.6-1 +- New upstream development version 1.49.6 +- Enable opensuse repository again + +* Mon Nov 21 2022 Richard W.M. Jones - 1.49.5-2 +- Disable opensuse repository + +* Wed Oct 12 2022 Richard W.M. Jones - 1.49.5-1 +- New upstream development version 1.49.5 + +* Mon Aug 01 2022 Richard W.M. Jones - 1.49.4-1 +- New upstream development version 1.49.4 + +* Thu Jul 21 2022 Fedora Release Engineering - 1.49.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 01 2022 Richard W.M. Jones - 1.49.3-1 +- New upstream development version 1.49.3 + +* Thu May 26 2022 Richard W.M. Jones - 1.49.2-1 +- New upstream development version 1.49.2 + +* Thu May 12 2022 Richard W.M. Jones - 1.49.1-1 +- New upstream development version 1.49.1 + +* Mon Mar 14 2022 Richard W.M. Jones - 1.48.0-1 +- New upstream stable branch version 1.48.0 + +* Tue Mar 08 2022 Richard W.M. Jones - 1.47.5-1 +- New upstream development version 1.47.8 +- Add new guestfs-tools-release-notes-1.48(1) man page. + +* Tue Mar 01 2022 Richard W.M. Jones - 1.47.4-1 +- New upstream development version 1.47.4 + +* Thu Jan 20 2022 Fedora Release Engineering - 1.47.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Dec 04 2021 Richard W.M. Jones - 1.47.3-1 +- New upstream development version 1.47.3 + +* Thu Jul 22 2021 Fedora Release Engineering - 1.47.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 16 2021 Richard W.M. Jones - 1.47.2-1 +- New upstream development version 1.47.2 + +* Wed Jun 2 2021 Richard W.M. Jones - 1.46.1-3 - Add gating tests (for RHEL 9) -* Mon May 17 2021 Richard W.M. Jones - 1.46.1-3 -- Fix virt-win-reg --version - resolves: rhbz#1961160 - * Thu May 13 2021 Richard W.M. Jones - 1.46.1-2 - BR perl-generators so deps of virt-win-reg subpackage are correct. - resolves: rhbz#1960191 * Sat May 08 2021 Richard W.M. Jones - 1.46.1-1 - New stable branch version 1.46.1. diff --git a/sources b/sources new file mode 100644 index 0000000..5d9e15f --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (guestfs-tools-1.52.1.tar.gz) = 0db4b6cc49b18d26cb9a3a1e8f76fcb16127d41fac65b2e6e40e823b697a5581be0b85d54d2a36dbf4e45aea72ecddfc2cf6d198093c8cc52ce1a2712cc26d25 +SHA512 (libguestfs.keyring) = 297a15edc7c220222b9f650e0a9361ae132d3f0fed04aeb2237a1d9c3f6dac6f336846434f66480faed72635a33f659e849b052e74b88d1508aeff03f8c9a2ac