From 3f27c698db509265da4c572c201d91e31bfd8315 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 21 Oct 2024 14:38:09 +0100 Subject: [PATCH 01/62] Use stable owner, group and mtime in appliance tarballs (RHBZ#2320025) Add support for Windows Server 2025 --- ...s-for-1.54-and-1.55-download-locatio.patch | 28 ++ ...-expand-gpt.pl-Implement-SKIP-rule-f.patch | 31 ++ ...nfo.c-Add-Windows-Server-2025-osinfo.patch | 44 ++ ...e-__attribute__-cleanup-always-works.patch | 412 ++++++++++++++++++ ...able-owner-group-and-mtime-in-applia.patch | 56 +++ libguestfs.spec | 16 +- 6 files changed, 586 insertions(+), 1 deletion(-) create mode 100644 0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch create mode 100644 0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch create mode 100644 0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch create mode 100644 0004-build-Assume-__attribute__-cleanup-always-works.patch create mode 100644 0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch diff --git a/0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch b/0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch new file mode 100644 index 0000000..e04202e --- /dev/null +++ b/0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch @@ -0,0 +1,28 @@ +From 0edaea8f91bf08025651eeff32f53b9335003842 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 8 Oct 2024 14:53:38 +0100 +Subject: [PATCH 1/5] website: Add links for 1.54 and 1.55 download locations + +--- + website/index.html.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/website/index.html.in b/website/index.html.in +index a61fca9247..2a0d32217e 100644 +--- a/website/index.html.in ++++ b/website/index.html.in +@@ -186,9 +186,10 @@ git clone https://github.com/ + LATEST-URL: http://libguestfs.org/download/1.53-development/libguestfs-@PACKAGE_VERSION@.tar.gz + LATEST-VERSION: @PACKAGE_VERSION@ + --> +- Latest development version: @PACKAGE_VERSION@ (released @RELEASE_DATE@).
++ Latest development version: @PACKAGE_VERSION@ (released @RELEASE_DATE@).
+ Stable branch: + ++ 1.54.x, + 1.52.x, + 1.50.x, + 1.48.x +-- +2.46.0 + diff --git a/0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch b/0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch new file mode 100644 index 0000000..75cf5c7 --- /dev/null +++ b/0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch @@ -0,0 +1,31 @@ +From c25ff1a8022cf345d3ce29682207ed3732a4244a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 14 Oct 2024 10:43:08 +0100 +Subject: [PATCH 2/5] tests/gdisk/test-expand-gpt.pl: Implement SKIP rule for + this test + +Reported-by: David Runge +Related: https://github.com/libguestfs/libguestfs/issues/155 +--- + tests/gdisk/test-expand-gpt.pl | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/tests/gdisk/test-expand-gpt.pl b/tests/gdisk/test-expand-gpt.pl +index 23a52b23ce..5c77247c00 100755 +--- a/tests/gdisk/test-expand-gpt.pl ++++ b/tests/gdisk/test-expand-gpt.pl +@@ -20,6 +20,11 @@ use warnings; + + use Sys::Guestfs; + ++if ($ENV{SKIP_TEST_EXPAND_GPT_PL}) { ++ print "$0: test skipped because SKIP_TEST_EXPAND_GPT_PL is set\n"; ++ exit 77; ++} ++ + sub tests { + my $g = Sys::Guestfs->new (); + +-- +2.46.0 + diff --git a/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch b/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch new file mode 100644 index 0000000..5258290 --- /dev/null +++ b/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch @@ -0,0 +1,44 @@ +From 0f489f8eec0c02e9ed1d606a2032edccf81ef025 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 17 Oct 2024 08:59:49 +0100 +Subject: [PATCH 3/5] lib/inspect-osinfo.c: Add Windows Server 2025 osinfo + +The guest was found to have these inspection fields: + + type: windows + distro: windows + product_name: Windows Server 2025 Standard + product_variant: Server + version: 10.0 + arch: x86_64 + hostname: WIN-84V4KKQ30SM + build ID: 26080 + windows_systemroot: /Windows + windows_software_hive: /Windows/System32/config/SOFTWARE + windows_system_hive: /Windows/System32/config/SYSTEM + windows_current_control_set: ControlSet001 + +Reported-by: Ming Xie +Fixes: https://issues.redhat.com/browse/RHEL-62935 +--- + lib/inspect-osinfo.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/inspect-osinfo.c b/lib/inspect-osinfo.c +index c77344f63d..f792d771a8 100644 +--- a/lib/inspect-osinfo.c ++++ b/lib/inspect-osinfo.c +@@ -142,7 +142,9 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root) + switch (minor) { + case 0: + if (strstr (product_variant, "Server")) { +- if (strstr (product_name, "2022")) ++ if (strstr (product_name, "2025")) ++ return safe_strdup (g, "win2k25"); ++ else if (strstr (product_name, "2022")) + return safe_strdup (g, "win2k22"); + else if (strstr (product_name, "2019")) + return safe_strdup (g, "win2k19"); +-- +2.46.0 + diff --git a/0004-build-Assume-__attribute__-cleanup-always-works.patch b/0004-build-Assume-__attribute__-cleanup-always-works.patch new file mode 100644 index 0000000..1ffc2ba --- /dev/null +++ b/0004-build-Assume-__attribute__-cleanup-always-works.patch @@ -0,0 +1,412 @@ +From e37768d8892d6f467c7834f8b142b89f8f0af7dc Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 18 Oct 2024 21:52:21 +0100 +Subject: [PATCH 4/5] build: Assume __attribute__((cleanup)) always works + +All recent compilers support this (except MS compilers which we don't +care about). Assume it is supported. We test it in ./configure and +hard fail if it doesn't work. + +We still define HAVE_ATTRIBUTE_CLEANUP but you can now assume it is +always defined and don't have to check it. +--- + common | 2 +- + daemon/daemon.h | 9 --------- + daemon/sh.c | 5 ----- + daemon/yara.c | 8 -------- + generator/c.ml | 10 ---------- + generator/daemon.ml | 15 --------------- + lib/guestfs-internal.h | 8 -------- + lib/info.c | 5 ----- + lib/launch-libvirt.c | 5 ----- + lib/qemu.c | 5 ----- + m4/guestfs-c.m4 | 7 ++----- + 11 files changed, 3 insertions(+), 76 deletions(-) + +Submodule common b6e703dccb..01c5322606: +diff --git a/common/structs/structs-cleanups.h b/common/structs/structs-cleanups.h +index b43dbd750..c6e7fd1e2 100644 +--- a/common/structs/structs-cleanups.h ++++ b/common/structs/structs-cleanups.h +@@ -28,7 +28,6 @@ + #ifndef GUESTFS_STRUCTS_CLEANUPS_H_ + #define GUESTFS_STRUCTS_CLEANUPS_H_ + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_FREE_INT_BOOL \ + __attribute__((cleanup(guestfs_int_cleanup_free_int_bool))) + #define CLEANUP_FREE_INT_BOOL_LIST \ +@@ -137,62 +136,6 @@ + __attribute__((cleanup(guestfs_int_cleanup_free_yara_detection))) + #define CLEANUP_FREE_YARA_DETECTION_LIST \ + __attribute__((cleanup(guestfs_int_cleanup_free_yara_detection_list))) +-#else /* !HAVE_ATTRIBUTE_CLEANUP */ +-#define CLEANUP_FREE_INT_BOOL +-#define CLEANUP_FREE_INT_BOOL_LIST +-#define CLEANUP_FREE_LVM_PV +-#define CLEANUP_FREE_LVM_PV_LIST +-#define CLEANUP_FREE_LVM_VG +-#define CLEANUP_FREE_LVM_VG_LIST +-#define CLEANUP_FREE_LVM_LV +-#define CLEANUP_FREE_LVM_LV_LIST +-#define CLEANUP_FREE_STAT +-#define CLEANUP_FREE_STAT_LIST +-#define CLEANUP_FREE_STATNS +-#define CLEANUP_FREE_STATNS_LIST +-#define CLEANUP_FREE_STATVFS +-#define CLEANUP_FREE_STATVFS_LIST +-#define CLEANUP_FREE_DIRENT +-#define CLEANUP_FREE_DIRENT_LIST +-#define CLEANUP_FREE_VERSION +-#define CLEANUP_FREE_VERSION_LIST +-#define CLEANUP_FREE_XATTR +-#define CLEANUP_FREE_XATTR_LIST +-#define CLEANUP_FREE_INOTIFY_EVENT +-#define CLEANUP_FREE_INOTIFY_EVENT_LIST +-#define CLEANUP_FREE_PARTITION +-#define CLEANUP_FREE_PARTITION_LIST +-#define CLEANUP_FREE_APPLICATION +-#define CLEANUP_FREE_APPLICATION_LIST +-#define CLEANUP_FREE_APPLICATION2 +-#define CLEANUP_FREE_APPLICATION2_LIST +-#define CLEANUP_FREE_ISOINFO +-#define CLEANUP_FREE_ISOINFO_LIST +-#define CLEANUP_FREE_MDSTAT +-#define CLEANUP_FREE_MDSTAT_LIST +-#define CLEANUP_FREE_BTRFSSUBVOLUME +-#define CLEANUP_FREE_BTRFSSUBVOLUME_LIST +-#define CLEANUP_FREE_BTRFSQGROUP +-#define CLEANUP_FREE_BTRFSQGROUP_LIST +-#define CLEANUP_FREE_BTRFSBALANCE +-#define CLEANUP_FREE_BTRFSBALANCE_LIST +-#define CLEANUP_FREE_BTRFSSCRUB +-#define CLEANUP_FREE_BTRFSSCRUB_LIST +-#define CLEANUP_FREE_XFSINFO +-#define CLEANUP_FREE_XFSINFO_LIST +-#define CLEANUP_FREE_UTSNAME +-#define CLEANUP_FREE_UTSNAME_LIST +-#define CLEANUP_FREE_HIVEX_NODE +-#define CLEANUP_FREE_HIVEX_NODE_LIST +-#define CLEANUP_FREE_HIVEX_VALUE +-#define CLEANUP_FREE_HIVEX_VALUE_LIST +-#define CLEANUP_FREE_INTERNAL_MOUNTABLE +-#define CLEANUP_FREE_INTERNAL_MOUNTABLE_LIST +-#define CLEANUP_FREE_TSK_DIRENT +-#define CLEANUP_FREE_TSK_DIRENT_LIST +-#define CLEANUP_FREE_YARA_DETECTION +-#define CLEANUP_FREE_YARA_DETECTION_LIST +-#endif /* !HAVE_ATTRIBUTE_CLEANUP */ + + /* These functions are used internally by the CLEANUP_* macros. + * Don't call them directly. +diff --git a/common/utils/cleanups.h b/common/utils/cleanups.h +index 932114f6e..be52d0728 100644 +--- a/common/utils/cleanups.h ++++ b/common/utils/cleanups.h +@@ -19,7 +19,6 @@ + #ifndef GUESTFS_CLEANUPS_H_ + #define GUESTFS_CLEANUPS_H_ + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_FREE \ + __attribute__((cleanup(guestfs_int_cleanup_free))) + #define CLEANUP_HASH_FREE \ +@@ -50,23 +49,6 @@ + __attribute__((cleanup(guestfs_int_cleanup_xmlXPathFreeObject))) + #define CLEANUP_PCRE2_MATCH_DATA_FREE \ + __attribute__((cleanup(guestfs_int_cleanup_pcre2_match_data_free))) +-#else +-#define CLEANUP_FREE +-#define CLEANUP_HASH_FREE +-#define CLEANUP_UNLINK_FREE +-#define CLEANUP_CLOSE +-#define CLEANUP_FCLOSE +-#define CLEANUP_PCLOSE +-#define CLEANUP_FREE_STRING_LIST +-#define CLEANUP_XMLFREE +-#define CLEANUP_XMLBUFFERFREE +-#define CLEANUP_XMLFREEDOC +-#define CLEANUP_XMLFREEURI +-#define CLEANUP_XMLFREETEXTWRITER +-#define CLEANUP_XMLXPATHFREECONTEXT +-#define CLEANUP_XMLXPATHFREEOBJECT +-#define CLEANUP_PCRE2_MATCH_DATA_FREE +-#endif + + /* These functions are used internally by the CLEANUP_* macros. + * Don't call them directly. +diff --git a/daemon/daemon.h b/daemon/daemon.h +index e050588cad..5fc53245c9 100644 +--- a/daemon/daemon.h ++++ b/daemon/daemon.h +@@ -93,11 +93,7 @@ extern char *read_whole_file (const char *filename, size_t *size_r); + extern char *mountable_to_string (const mountable_t *mountable); + extern void cleanup_free_mountable (mountable_t *mountable); + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_FREE_MOUNTABLE __attribute__((cleanup(cleanup_free_mountable))) +-#else +-#define CLEANUP_FREE_MOUNTABLE +-#endif + + /* cleanups.c */ + /* These functions are used internally by the CLEANUP_* macros. +@@ -106,13 +102,8 @@ extern void cleanup_free_mountable (mountable_t *mountable); + extern void cleanup_aug_close (void *ptr); + extern void cleanup_free_stringsbuf (void *ptr); + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_AUG_CLOSE __attribute__((cleanup(cleanup_aug_close))) + #define CLEANUP_FREE_STRINGSBUF __attribute__((cleanup(cleanup_free_stringsbuf))) +-#else +-#define CLEANUP_AUG_CLOSE +-#define CLEANUP_FREE_STRINGSBUF +-#endif + + /* mount.c */ + extern int is_root_mounted (void); +diff --git a/daemon/sh.c b/daemon/sh.c +index 92ce08be0f..21d4deeabc 100644 +--- a/daemon/sh.c ++++ b/daemon/sh.c +@@ -32,13 +32,8 @@ + + #include "ignore-value.h" + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_BIND_STATE __attribute__((cleanup(free_bind_state))) + #define CLEANUP_RESOLVER_STATE __attribute__((cleanup(free_resolver_state))) +-#else +-#define CLEANUP_BIND_STATE +-#define CLEANUP_RESOLVER_STATE +-#endif + + struct bind_state { + bool mounted; +diff --git a/daemon/yara.c b/daemon/yara.c +index 21137b7333..9350dd27b9 100644 +--- a/daemon/yara.c ++++ b/daemon/yara.c +@@ -39,12 +39,8 @@ + + #include + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_DESTROY_YARA_COMPILER \ + __attribute__((cleanup(cleanup_destroy_yara_compiler))) +-#else +-#define CLEANUP_DESTROY_YARA_COMPILER +-#endif + + struct write_callback_data { + int fd; +@@ -208,10 +204,6 @@ compile_rules_file (const char *rules_path) + } + + err: +-#ifndef HAVE_ATTRIBUTE_CLEANUP +- yr_compiler_destroy (compiler); +-#endif +- + return ret; + } + +diff --git a/generator/c.ml b/generator/c.ml +index 447059b8a3..838e7f4267 100644 +--- a/generator/c.ml ++++ b/generator/c.ml +@@ -817,7 +817,6 @@ and generate_client_structs_cleanups_h () = + #ifndef GUESTFS_STRUCTS_CLEANUPS_H_ + #define GUESTFS_STRUCTS_CLEANUPS_H_ + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + "; + + List.iter ( +@@ -828,16 +827,7 @@ and generate_client_structs_cleanups_h () = + pr " __attribute__((cleanup(guestfs_int_cleanup_free_%s_list)))\n" name + ) structs; + +- pr "#else /* !HAVE_ATTRIBUTE_CLEANUP */\n"; +- +- List.iter ( +- fun { s_name = name } -> +- pr "#define CLEANUP_FREE_%s\n" (String.uppercase_ascii name); +- pr "#define CLEANUP_FREE_%s_LIST\n" (String.uppercase_ascii name) +- ) structs; +- + pr "\ +-#endif /* !HAVE_ATTRIBUTE_CLEANUP */ + + /* These functions are used internally by the CLEANUP_* macros. + * Don't call them directly. +diff --git a/generator/daemon.ml b/generator/daemon.ml +index 78a2412d2e..9ab9e12dfb 100644 +--- a/generator/daemon.ml ++++ b/generator/daemon.ml +@@ -127,8 +127,6 @@ let generate_daemon_stubs actions () = + args_passed_to_daemon in + + if args_passed_to_daemon <> [] then ( +- pr "#ifdef HAVE_ATTRIBUTE_CLEANUP\n"; +- pr "\n"; + pr "#define CLEANUP_XDR_FREE_%s_ARGS \\\n" uc_name; + pr " __attribute__((cleanup(cleanup_xdr_free_%s_args)))\n" name; + pr "\n"; +@@ -140,9 +138,6 @@ let generate_daemon_stubs actions () = + name; + pr "}\n"; + pr "\n"; +- pr "#else /* !HAVE_ATTRIBUTE_CLEANUP */\n"; +- pr "#define CLEANUP_XDR_FREE_%s_ARGS\n" uc_name; +- pr "#endif /* !HAVE_ATTRIBUTE_CLEANUP */\n"; + pr "\n" + ); + +@@ -1315,7 +1310,6 @@ let generate_daemon_structs_cleanups_h () = + #ifndef GUESTFS_DAEMON_STRUCTS_CLEANUPS_H_ + #define GUESTFS_DAEMON_STRUCTS_CLEANUPS_H_ + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + "; + + List.iter ( +@@ -1326,16 +1320,7 @@ let generate_daemon_structs_cleanups_h () = + pr " __attribute__((cleanup(cleanup_free_int_%s_list)))\n" name + ) structs; + +- pr "#else /* !HAVE_ATTRIBUTE_CLEANUP */\n"; +- +- List.iter ( +- fun { s_name = name } -> +- pr "#define CLEANUP_FREE_%s\n" (String.uppercase_ascii name); +- pr "#define CLEANUP_FREE_%s_LIST\n" (String.uppercase_ascii name) +- ) structs; +- + pr "\ +-#endif /* !HAVE_ATTRIBUTE_CLEANUP */ + + /* These functions are used internally by the CLEANUP_* macros. + * Don't call them directly. +diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h +index 174ca135f7..f9f4628aa2 100644 +--- a/lib/guestfs-internal.h ++++ b/lib/guestfs-internal.h +@@ -661,11 +661,7 @@ extern void guestfs_int_end_stringsbuf (guestfs_h *g, struct stringsbuf *sb); + + extern void guestfs_int_free_stringsbuf (struct stringsbuf *sb); + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_FREE_STRINGSBUF __attribute__((cleanup(guestfs_int_cleanup_free_stringsbuf))) +-#else +-#define CLEANUP_FREE_STRINGSBUF +-#endif + extern void guestfs_int_cleanup_free_stringsbuf (struct stringsbuf *sb); + + /* proto.c */ +@@ -785,11 +781,7 @@ extern int guestfs_int_cmd_pipe_run (struct command *cmd, const char *mode); + extern int guestfs_int_cmd_pipe_wait (struct command *cmd); + extern char *guestfs_int_cmd_get_pipe_errors (struct command *cmd); + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_CMD_CLOSE __attribute__((cleanup(guestfs_int_cleanup_cmd_close))) +-#else +-#define CLEANUP_CMD_CLOSE +-#endif + extern void guestfs_int_cleanup_cmd_close (struct command **); + + /* launch-*.c constructors */ +diff --git a/lib/info.c b/lib/info.c +index 4dee7a26a6..b60fc8b39f 100644 +--- a/lib/info.c ++++ b/lib/info.c +@@ -43,7 +43,6 @@ + #include "guestfs-internal.h" + #include "guestfs-internal-actions.h" + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_JSON_T_DECREF __attribute__((cleanup(cleanup_json_t_decref))) + + static void +@@ -52,10 +51,6 @@ cleanup_json_t_decref (void *ptr) + json_decref (* (json_t **) ptr); + } + +-#else +-#define CLEANUP_JSON_T_DECREF +-#endif +- + static json_t *get_json_output (guestfs_h *g, const char *filename); + static int qemu_img_supports_U_option (guestfs_h *g); + static void set_child_rlimits (struct command *); +diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c +index fed6dcc863..d01f65780c 100644 +--- a/lib/launch-libvirt.c ++++ b/lib/launch-libvirt.c +@@ -97,7 +97,6 @@ xmlBufferDetach (xmlBufferPtr buf) + } + #endif + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_VIRSECRETFREE __attribute__((cleanup(cleanup_virSecretFree))) + + static void +@@ -108,10 +107,6 @@ cleanup_virSecretFree (void *ptr) + virSecretFree (secret_obj); + } + +-#else /* !HAVE_ATTRIBUTE_CLEANUP */ +-#define CLEANUP_VIRSECRETFREE +-#endif +- + /* List used to store a mapping of secret to libvirt secret UUID. */ + struct secret { + char *secret; +diff --git a/lib/qemu.c b/lib/qemu.c +index 027790e4e7..886c92e5db 100644 +--- a/lib/qemu.c ++++ b/lib/qemu.c +@@ -46,7 +46,6 @@ + #include "guestfs-internal.h" + #include "guestfs_protocol.h" + +-#ifdef HAVE_ATTRIBUTE_CLEANUP + #define CLEANUP_JSON_T_DECREF __attribute__((cleanup(cleanup_json_t_decref))) + + static void +@@ -55,10 +54,6 @@ cleanup_json_t_decref (void *ptr) + json_decref (* (json_t **) ptr); + } + +-#else +-#define CLEANUP_JSON_T_DECREF +-#endif +- + struct qemu_data { + int generation; /* MEMO_GENERATION read from qemu.stat */ + uint64_t prev_size; /* Size of qemu binary when cached. */ +diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4 +index 44c64b6d67..49109cc8fe 100644 +--- a/m4/guestfs-c.m4 ++++ b/m4/guestfs-c.m4 +@@ -109,15 +109,12 @@ main (int argc, char *argv[]) + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_ATTRIBUTE_CLEANUP],[1],[Define to 1 if '__attribute__((cleanup(...)))' works with this compiler.]) + ],[ +- AC_MSG_WARN( ++ AC_MSG_ERROR( + ['__attribute__((cleanup(...)))' does not work. + + You may not be using a sufficiently recent version of GCC or CLANG, or + you may be using a C compiler which does not support this attribute, +-or the configure test may be wrong. +- +-The code will still compile, but is likely to leak memory and other +-resources when it runs.])]) ++or the configure test may be wrong.])]) + dnl restore CFLAGS + CFLAGS="${acx_nbdkit_save_CFLAGS}" + +-- +2.46.0 + diff --git a/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch b/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch new file mode 100644 index 0000000..a1f81a5 --- /dev/null +++ b/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch @@ -0,0 +1,56 @@ +From 53632b4b8245a6dd67c95015d52d1f4c562b14ed Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 21 Oct 2024 11:50:05 +0100 +Subject: [PATCH 5/5] appliance: Use stable owner, group and mtime in appliance + tarballs + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2320025 +Signed-off-by: Richard W.M. Jones +--- + appliance/Makefile.am | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/appliance/Makefile.am b/appliance/Makefile.am +index 8cb9bd1fff..7edc90e61f 100644 +--- a/appliance/Makefile.am ++++ b/appliance/Makefile.am +@@ -113,12 +113,17 @@ packagelist: packagelist.in Makefile guestfsd.deps + cmp -s $@ $@-t || mv $@-t $@ + rm -f $@-t + ++# Use stable times and owner/group (RHBZ#2320025). ++TAR_COMMAND := tar -z \ ++ --owner=0 --group=0 \ ++ $${SOURCE_DATE_EPOCH:+--mtime=@"$$SOURCE_DATE_EPOCH"} ++ + supermin.d/daemon.tar.gz: ../daemon/guestfsd + rm -f $@ $@-t + rm -rf tmp-d + mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc + ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd +- ( cd tmp-d && tar zcf - * ) > $@-t ++ ( cd tmp-d && $(TAR_COMMAND) -cf - * ) > $@-t + rm -r tmp-d + mv $@-t $@ + +@@ -139,7 +144,7 @@ supermin.d/hostfiles: hostfiles.in Makefile + + supermin.d/init.tar.gz: init + rm -f $@ $@-t +- ( cd $(srcdir) && tar zcf - init ) > $@-t ++ ( cd $(srcdir) && $(TAR_COMMAND) -cf - init ) > $@-t + mv $@-t $@ + + # We should put this file in /lib/udev/rules.d, but put it in /etc so +@@ -149,7 +154,7 @@ supermin.d/udev-rules.tar.gz: 99-guestfs-serial.rules + rm -rf tmp-u + mkdir -p tmp-u/etc/udev/rules.d + for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$(basename $$f); done +- ( cd tmp-u && tar zcf - etc ) > $@-t ++ ( cd tmp-u && $(TAR_COMMAND) -cf - etc ) > $@-t + rm -r tmp-u + mv $@-t $@ + +-- +2.46.0 + diff --git a/libguestfs.spec b/libguestfs.spec index daf6f41..e3bb4a2 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.54.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -76,6 +76,16 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh +# All patches upstream in > 1.54.0 +Patch: 0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch +Patch: 0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch +# Add support for Windows Server 2025 +Patch: 0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch +Patch: 0004-build-Assume-__attribute__-cleanup-always-works.patch +# Use stable owner, group and mtime in appliance tarballs +# https://bugzilla.redhat.com/show_bug.cgi?id=2320025 +Patch: 0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch + BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. @@ -1100,6 +1110,10 @@ rm ocaml/html/.gitignore %changelog +* Mon Oct 21 2024 Richard W.M. Jones - 1:1.54.0-3 +- Use stable owner, group and mtime in appliance tarballs (RHBZ#2320025) +- Add support for Windows Server 2025 + * Mon Oct 14 2024 Remi Collet - 1:1.54.0-2 - rebuild for https://fedoraproject.org/wiki/Changes/php84 From edf179514551ad063be774a4991ae540cef84506 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 22 Oct 2024 16:54:58 +0100 Subject: [PATCH 02/62] Rebuild for Jansson 2.14 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) --- libguestfs.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index e3bb4a2..d1da8a0 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.54.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1110,6 +1110,10 @@ rm ocaml/html/.gitignore %changelog +* Tue Oct 22 2024 Richard W.M. Jones - 1:1.54.0-4 +- Rebuild for Jansson 2.14 + (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) + * Mon Oct 21 2024 Richard W.M. Jones - 1:1.54.0-3 - Use stable owner, group and mtime in appliance tarballs (RHBZ#2320025) - Add support for Windows Server 2025 From 9a92c16bc35204baf19c4f286f5eac23378307a2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 22 Oct 2024 17:26:03 +0100 Subject: [PATCH 03/62] New upstream development version 1.55.1 Replace jansson with json-c --- ...s-for-1.54-and-1.55-download-locatio.patch | 28 -- ...-expand-gpt.pl-Implement-SKIP-rule-f.patch | 31 -- ...nfo.c-Add-Windows-Server-2025-osinfo.patch | 44 -- ...e-__attribute__-cleanup-always-works.patch | 412 ------------------ ...able-owner-group-and-mtime-in-applia.patch | 56 --- libguestfs.spec | 24 +- sources | 4 +- 7 files changed, 11 insertions(+), 588 deletions(-) delete mode 100644 0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch delete mode 100644 0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch delete mode 100644 0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch delete mode 100644 0004-build-Assume-__attribute__-cleanup-always-works.patch delete mode 100644 0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch diff --git a/0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch b/0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch deleted file mode 100644 index e04202e..0000000 --- a/0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0edaea8f91bf08025651eeff32f53b9335003842 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 8 Oct 2024 14:53:38 +0100 -Subject: [PATCH 1/5] website: Add links for 1.54 and 1.55 download locations - ---- - website/index.html.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/website/index.html.in b/website/index.html.in -index a61fca9247..2a0d32217e 100644 ---- a/website/index.html.in -+++ b/website/index.html.in -@@ -186,9 +186,10 @@ git clone https://github.com/ - LATEST-URL: http://libguestfs.org/download/1.53-development/libguestfs-@PACKAGE_VERSION@.tar.gz - LATEST-VERSION: @PACKAGE_VERSION@ - --> -- Latest development version: @PACKAGE_VERSION@ (released @RELEASE_DATE@).
-+ Latest development version: @PACKAGE_VERSION@ (released @RELEASE_DATE@).
- Stable branch: - -+ 1.54.x, - 1.52.x, - 1.50.x, - 1.48.x --- -2.46.0 - diff --git a/0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch b/0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch deleted file mode 100644 index 75cf5c7..0000000 --- a/0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c25ff1a8022cf345d3ce29682207ed3732a4244a Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 14 Oct 2024 10:43:08 +0100 -Subject: [PATCH 2/5] tests/gdisk/test-expand-gpt.pl: Implement SKIP rule for - this test - -Reported-by: David Runge -Related: https://github.com/libguestfs/libguestfs/issues/155 ---- - tests/gdisk/test-expand-gpt.pl | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tests/gdisk/test-expand-gpt.pl b/tests/gdisk/test-expand-gpt.pl -index 23a52b23ce..5c77247c00 100755 ---- a/tests/gdisk/test-expand-gpt.pl -+++ b/tests/gdisk/test-expand-gpt.pl -@@ -20,6 +20,11 @@ use warnings; - - use Sys::Guestfs; - -+if ($ENV{SKIP_TEST_EXPAND_GPT_PL}) { -+ print "$0: test skipped because SKIP_TEST_EXPAND_GPT_PL is set\n"; -+ exit 77; -+} -+ - sub tests { - my $g = Sys::Guestfs->new (); - --- -2.46.0 - diff --git a/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch b/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch deleted file mode 100644 index 5258290..0000000 --- a/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0f489f8eec0c02e9ed1d606a2032edccf81ef025 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 17 Oct 2024 08:59:49 +0100 -Subject: [PATCH 3/5] lib/inspect-osinfo.c: Add Windows Server 2025 osinfo - -The guest was found to have these inspection fields: - - type: windows - distro: windows - product_name: Windows Server 2025 Standard - product_variant: Server - version: 10.0 - arch: x86_64 - hostname: WIN-84V4KKQ30SM - build ID: 26080 - windows_systemroot: /Windows - windows_software_hive: /Windows/System32/config/SOFTWARE - windows_system_hive: /Windows/System32/config/SYSTEM - windows_current_control_set: ControlSet001 - -Reported-by: Ming Xie -Fixes: https://issues.redhat.com/browse/RHEL-62935 ---- - lib/inspect-osinfo.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/inspect-osinfo.c b/lib/inspect-osinfo.c -index c77344f63d..f792d771a8 100644 ---- a/lib/inspect-osinfo.c -+++ b/lib/inspect-osinfo.c -@@ -142,7 +142,9 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root) - switch (minor) { - case 0: - if (strstr (product_variant, "Server")) { -- if (strstr (product_name, "2022")) -+ if (strstr (product_name, "2025")) -+ return safe_strdup (g, "win2k25"); -+ else if (strstr (product_name, "2022")) - return safe_strdup (g, "win2k22"); - else if (strstr (product_name, "2019")) - return safe_strdup (g, "win2k19"); --- -2.46.0 - diff --git a/0004-build-Assume-__attribute__-cleanup-always-works.patch b/0004-build-Assume-__attribute__-cleanup-always-works.patch deleted file mode 100644 index 1ffc2ba..0000000 --- a/0004-build-Assume-__attribute__-cleanup-always-works.patch +++ /dev/null @@ -1,412 +0,0 @@ -From e37768d8892d6f467c7834f8b142b89f8f0af7dc Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 18 Oct 2024 21:52:21 +0100 -Subject: [PATCH 4/5] build: Assume __attribute__((cleanup)) always works - -All recent compilers support this (except MS compilers which we don't -care about). Assume it is supported. We test it in ./configure and -hard fail if it doesn't work. - -We still define HAVE_ATTRIBUTE_CLEANUP but you can now assume it is -always defined and don't have to check it. ---- - common | 2 +- - daemon/daemon.h | 9 --------- - daemon/sh.c | 5 ----- - daemon/yara.c | 8 -------- - generator/c.ml | 10 ---------- - generator/daemon.ml | 15 --------------- - lib/guestfs-internal.h | 8 -------- - lib/info.c | 5 ----- - lib/launch-libvirt.c | 5 ----- - lib/qemu.c | 5 ----- - m4/guestfs-c.m4 | 7 ++----- - 11 files changed, 3 insertions(+), 76 deletions(-) - -Submodule common b6e703dccb..01c5322606: -diff --git a/common/structs/structs-cleanups.h b/common/structs/structs-cleanups.h -index b43dbd750..c6e7fd1e2 100644 ---- a/common/structs/structs-cleanups.h -+++ b/common/structs/structs-cleanups.h -@@ -28,7 +28,6 @@ - #ifndef GUESTFS_STRUCTS_CLEANUPS_H_ - #define GUESTFS_STRUCTS_CLEANUPS_H_ - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_FREE_INT_BOOL \ - __attribute__((cleanup(guestfs_int_cleanup_free_int_bool))) - #define CLEANUP_FREE_INT_BOOL_LIST \ -@@ -137,62 +136,6 @@ - __attribute__((cleanup(guestfs_int_cleanup_free_yara_detection))) - #define CLEANUP_FREE_YARA_DETECTION_LIST \ - __attribute__((cleanup(guestfs_int_cleanup_free_yara_detection_list))) --#else /* !HAVE_ATTRIBUTE_CLEANUP */ --#define CLEANUP_FREE_INT_BOOL --#define CLEANUP_FREE_INT_BOOL_LIST --#define CLEANUP_FREE_LVM_PV --#define CLEANUP_FREE_LVM_PV_LIST --#define CLEANUP_FREE_LVM_VG --#define CLEANUP_FREE_LVM_VG_LIST --#define CLEANUP_FREE_LVM_LV --#define CLEANUP_FREE_LVM_LV_LIST --#define CLEANUP_FREE_STAT --#define CLEANUP_FREE_STAT_LIST --#define CLEANUP_FREE_STATNS --#define CLEANUP_FREE_STATNS_LIST --#define CLEANUP_FREE_STATVFS --#define CLEANUP_FREE_STATVFS_LIST --#define CLEANUP_FREE_DIRENT --#define CLEANUP_FREE_DIRENT_LIST --#define CLEANUP_FREE_VERSION --#define CLEANUP_FREE_VERSION_LIST --#define CLEANUP_FREE_XATTR --#define CLEANUP_FREE_XATTR_LIST --#define CLEANUP_FREE_INOTIFY_EVENT --#define CLEANUP_FREE_INOTIFY_EVENT_LIST --#define CLEANUP_FREE_PARTITION --#define CLEANUP_FREE_PARTITION_LIST --#define CLEANUP_FREE_APPLICATION --#define CLEANUP_FREE_APPLICATION_LIST --#define CLEANUP_FREE_APPLICATION2 --#define CLEANUP_FREE_APPLICATION2_LIST --#define CLEANUP_FREE_ISOINFO --#define CLEANUP_FREE_ISOINFO_LIST --#define CLEANUP_FREE_MDSTAT --#define CLEANUP_FREE_MDSTAT_LIST --#define CLEANUP_FREE_BTRFSSUBVOLUME --#define CLEANUP_FREE_BTRFSSUBVOLUME_LIST --#define CLEANUP_FREE_BTRFSQGROUP --#define CLEANUP_FREE_BTRFSQGROUP_LIST --#define CLEANUP_FREE_BTRFSBALANCE --#define CLEANUP_FREE_BTRFSBALANCE_LIST --#define CLEANUP_FREE_BTRFSSCRUB --#define CLEANUP_FREE_BTRFSSCRUB_LIST --#define CLEANUP_FREE_XFSINFO --#define CLEANUP_FREE_XFSINFO_LIST --#define CLEANUP_FREE_UTSNAME --#define CLEANUP_FREE_UTSNAME_LIST --#define CLEANUP_FREE_HIVEX_NODE --#define CLEANUP_FREE_HIVEX_NODE_LIST --#define CLEANUP_FREE_HIVEX_VALUE --#define CLEANUP_FREE_HIVEX_VALUE_LIST --#define CLEANUP_FREE_INTERNAL_MOUNTABLE --#define CLEANUP_FREE_INTERNAL_MOUNTABLE_LIST --#define CLEANUP_FREE_TSK_DIRENT --#define CLEANUP_FREE_TSK_DIRENT_LIST --#define CLEANUP_FREE_YARA_DETECTION --#define CLEANUP_FREE_YARA_DETECTION_LIST --#endif /* !HAVE_ATTRIBUTE_CLEANUP */ - - /* These functions are used internally by the CLEANUP_* macros. - * Don't call them directly. -diff --git a/common/utils/cleanups.h b/common/utils/cleanups.h -index 932114f6e..be52d0728 100644 ---- a/common/utils/cleanups.h -+++ b/common/utils/cleanups.h -@@ -19,7 +19,6 @@ - #ifndef GUESTFS_CLEANUPS_H_ - #define GUESTFS_CLEANUPS_H_ - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_FREE \ - __attribute__((cleanup(guestfs_int_cleanup_free))) - #define CLEANUP_HASH_FREE \ -@@ -50,23 +49,6 @@ - __attribute__((cleanup(guestfs_int_cleanup_xmlXPathFreeObject))) - #define CLEANUP_PCRE2_MATCH_DATA_FREE \ - __attribute__((cleanup(guestfs_int_cleanup_pcre2_match_data_free))) --#else --#define CLEANUP_FREE --#define CLEANUP_HASH_FREE --#define CLEANUP_UNLINK_FREE --#define CLEANUP_CLOSE --#define CLEANUP_FCLOSE --#define CLEANUP_PCLOSE --#define CLEANUP_FREE_STRING_LIST --#define CLEANUP_XMLFREE --#define CLEANUP_XMLBUFFERFREE --#define CLEANUP_XMLFREEDOC --#define CLEANUP_XMLFREEURI --#define CLEANUP_XMLFREETEXTWRITER --#define CLEANUP_XMLXPATHFREECONTEXT --#define CLEANUP_XMLXPATHFREEOBJECT --#define CLEANUP_PCRE2_MATCH_DATA_FREE --#endif - - /* These functions are used internally by the CLEANUP_* macros. - * Don't call them directly. -diff --git a/daemon/daemon.h b/daemon/daemon.h -index e050588cad..5fc53245c9 100644 ---- a/daemon/daemon.h -+++ b/daemon/daemon.h -@@ -93,11 +93,7 @@ extern char *read_whole_file (const char *filename, size_t *size_r); - extern char *mountable_to_string (const mountable_t *mountable); - extern void cleanup_free_mountable (mountable_t *mountable); - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_FREE_MOUNTABLE __attribute__((cleanup(cleanup_free_mountable))) --#else --#define CLEANUP_FREE_MOUNTABLE --#endif - - /* cleanups.c */ - /* These functions are used internally by the CLEANUP_* macros. -@@ -106,13 +102,8 @@ extern void cleanup_free_mountable (mountable_t *mountable); - extern void cleanup_aug_close (void *ptr); - extern void cleanup_free_stringsbuf (void *ptr); - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_AUG_CLOSE __attribute__((cleanup(cleanup_aug_close))) - #define CLEANUP_FREE_STRINGSBUF __attribute__((cleanup(cleanup_free_stringsbuf))) --#else --#define CLEANUP_AUG_CLOSE --#define CLEANUP_FREE_STRINGSBUF --#endif - - /* mount.c */ - extern int is_root_mounted (void); -diff --git a/daemon/sh.c b/daemon/sh.c -index 92ce08be0f..21d4deeabc 100644 ---- a/daemon/sh.c -+++ b/daemon/sh.c -@@ -32,13 +32,8 @@ - - #include "ignore-value.h" - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_BIND_STATE __attribute__((cleanup(free_bind_state))) - #define CLEANUP_RESOLVER_STATE __attribute__((cleanup(free_resolver_state))) --#else --#define CLEANUP_BIND_STATE --#define CLEANUP_RESOLVER_STATE --#endif - - struct bind_state { - bool mounted; -diff --git a/daemon/yara.c b/daemon/yara.c -index 21137b7333..9350dd27b9 100644 ---- a/daemon/yara.c -+++ b/daemon/yara.c -@@ -39,12 +39,8 @@ - - #include - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_DESTROY_YARA_COMPILER \ - __attribute__((cleanup(cleanup_destroy_yara_compiler))) --#else --#define CLEANUP_DESTROY_YARA_COMPILER --#endif - - struct write_callback_data { - int fd; -@@ -208,10 +204,6 @@ compile_rules_file (const char *rules_path) - } - - err: --#ifndef HAVE_ATTRIBUTE_CLEANUP -- yr_compiler_destroy (compiler); --#endif -- - return ret; - } - -diff --git a/generator/c.ml b/generator/c.ml -index 447059b8a3..838e7f4267 100644 ---- a/generator/c.ml -+++ b/generator/c.ml -@@ -817,7 +817,6 @@ and generate_client_structs_cleanups_h () = - #ifndef GUESTFS_STRUCTS_CLEANUPS_H_ - #define GUESTFS_STRUCTS_CLEANUPS_H_ - --#ifdef HAVE_ATTRIBUTE_CLEANUP - "; - - List.iter ( -@@ -828,16 +827,7 @@ and generate_client_structs_cleanups_h () = - pr " __attribute__((cleanup(guestfs_int_cleanup_free_%s_list)))\n" name - ) structs; - -- pr "#else /* !HAVE_ATTRIBUTE_CLEANUP */\n"; -- -- List.iter ( -- fun { s_name = name } -> -- pr "#define CLEANUP_FREE_%s\n" (String.uppercase_ascii name); -- pr "#define CLEANUP_FREE_%s_LIST\n" (String.uppercase_ascii name) -- ) structs; -- - pr "\ --#endif /* !HAVE_ATTRIBUTE_CLEANUP */ - - /* These functions are used internally by the CLEANUP_* macros. - * Don't call them directly. -diff --git a/generator/daemon.ml b/generator/daemon.ml -index 78a2412d2e..9ab9e12dfb 100644 ---- a/generator/daemon.ml -+++ b/generator/daemon.ml -@@ -127,8 +127,6 @@ let generate_daemon_stubs actions () = - args_passed_to_daemon in - - if args_passed_to_daemon <> [] then ( -- pr "#ifdef HAVE_ATTRIBUTE_CLEANUP\n"; -- pr "\n"; - pr "#define CLEANUP_XDR_FREE_%s_ARGS \\\n" uc_name; - pr " __attribute__((cleanup(cleanup_xdr_free_%s_args)))\n" name; - pr "\n"; -@@ -140,9 +138,6 @@ let generate_daemon_stubs actions () = - name; - pr "}\n"; - pr "\n"; -- pr "#else /* !HAVE_ATTRIBUTE_CLEANUP */\n"; -- pr "#define CLEANUP_XDR_FREE_%s_ARGS\n" uc_name; -- pr "#endif /* !HAVE_ATTRIBUTE_CLEANUP */\n"; - pr "\n" - ); - -@@ -1315,7 +1310,6 @@ let generate_daemon_structs_cleanups_h () = - #ifndef GUESTFS_DAEMON_STRUCTS_CLEANUPS_H_ - #define GUESTFS_DAEMON_STRUCTS_CLEANUPS_H_ - --#ifdef HAVE_ATTRIBUTE_CLEANUP - "; - - List.iter ( -@@ -1326,16 +1320,7 @@ let generate_daemon_structs_cleanups_h () = - pr " __attribute__((cleanup(cleanup_free_int_%s_list)))\n" name - ) structs; - -- pr "#else /* !HAVE_ATTRIBUTE_CLEANUP */\n"; -- -- List.iter ( -- fun { s_name = name } -> -- pr "#define CLEANUP_FREE_%s\n" (String.uppercase_ascii name); -- pr "#define CLEANUP_FREE_%s_LIST\n" (String.uppercase_ascii name) -- ) structs; -- - pr "\ --#endif /* !HAVE_ATTRIBUTE_CLEANUP */ - - /* These functions are used internally by the CLEANUP_* macros. - * Don't call them directly. -diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h -index 174ca135f7..f9f4628aa2 100644 ---- a/lib/guestfs-internal.h -+++ b/lib/guestfs-internal.h -@@ -661,11 +661,7 @@ extern void guestfs_int_end_stringsbuf (guestfs_h *g, struct stringsbuf *sb); - - extern void guestfs_int_free_stringsbuf (struct stringsbuf *sb); - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_FREE_STRINGSBUF __attribute__((cleanup(guestfs_int_cleanup_free_stringsbuf))) --#else --#define CLEANUP_FREE_STRINGSBUF --#endif - extern void guestfs_int_cleanup_free_stringsbuf (struct stringsbuf *sb); - - /* proto.c */ -@@ -785,11 +781,7 @@ extern int guestfs_int_cmd_pipe_run (struct command *cmd, const char *mode); - extern int guestfs_int_cmd_pipe_wait (struct command *cmd); - extern char *guestfs_int_cmd_get_pipe_errors (struct command *cmd); - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_CMD_CLOSE __attribute__((cleanup(guestfs_int_cleanup_cmd_close))) --#else --#define CLEANUP_CMD_CLOSE --#endif - extern void guestfs_int_cleanup_cmd_close (struct command **); - - /* launch-*.c constructors */ -diff --git a/lib/info.c b/lib/info.c -index 4dee7a26a6..b60fc8b39f 100644 ---- a/lib/info.c -+++ b/lib/info.c -@@ -43,7 +43,6 @@ - #include "guestfs-internal.h" - #include "guestfs-internal-actions.h" - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_JSON_T_DECREF __attribute__((cleanup(cleanup_json_t_decref))) - - static void -@@ -52,10 +51,6 @@ cleanup_json_t_decref (void *ptr) - json_decref (* (json_t **) ptr); - } - --#else --#define CLEANUP_JSON_T_DECREF --#endif -- - static json_t *get_json_output (guestfs_h *g, const char *filename); - static int qemu_img_supports_U_option (guestfs_h *g); - static void set_child_rlimits (struct command *); -diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c -index fed6dcc863..d01f65780c 100644 ---- a/lib/launch-libvirt.c -+++ b/lib/launch-libvirt.c -@@ -97,7 +97,6 @@ xmlBufferDetach (xmlBufferPtr buf) - } - #endif - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_VIRSECRETFREE __attribute__((cleanup(cleanup_virSecretFree))) - - static void -@@ -108,10 +107,6 @@ cleanup_virSecretFree (void *ptr) - virSecretFree (secret_obj); - } - --#else /* !HAVE_ATTRIBUTE_CLEANUP */ --#define CLEANUP_VIRSECRETFREE --#endif -- - /* List used to store a mapping of secret to libvirt secret UUID. */ - struct secret { - char *secret; -diff --git a/lib/qemu.c b/lib/qemu.c -index 027790e4e7..886c92e5db 100644 ---- a/lib/qemu.c -+++ b/lib/qemu.c -@@ -46,7 +46,6 @@ - #include "guestfs-internal.h" - #include "guestfs_protocol.h" - --#ifdef HAVE_ATTRIBUTE_CLEANUP - #define CLEANUP_JSON_T_DECREF __attribute__((cleanup(cleanup_json_t_decref))) - - static void -@@ -55,10 +54,6 @@ cleanup_json_t_decref (void *ptr) - json_decref (* (json_t **) ptr); - } - --#else --#define CLEANUP_JSON_T_DECREF --#endif -- - struct qemu_data { - int generation; /* MEMO_GENERATION read from qemu.stat */ - uint64_t prev_size; /* Size of qemu binary when cached. */ -diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4 -index 44c64b6d67..49109cc8fe 100644 ---- a/m4/guestfs-c.m4 -+++ b/m4/guestfs-c.m4 -@@ -109,15 +109,12 @@ main (int argc, char *argv[]) - AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_ATTRIBUTE_CLEANUP],[1],[Define to 1 if '__attribute__((cleanup(...)))' works with this compiler.]) - ],[ -- AC_MSG_WARN( -+ AC_MSG_ERROR( - ['__attribute__((cleanup(...)))' does not work. - - You may not be using a sufficiently recent version of GCC or CLANG, or - you may be using a C compiler which does not support this attribute, --or the configure test may be wrong. -- --The code will still compile, but is likely to leak memory and other --resources when it runs.])]) -+or the configure test may be wrong.])]) - dnl restore CFLAGS - CFLAGS="${acx_nbdkit_save_CFLAGS}" - --- -2.46.0 - diff --git a/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch b/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch deleted file mode 100644 index a1f81a5..0000000 --- a/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 53632b4b8245a6dd67c95015d52d1f4c562b14ed Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 21 Oct 2024 11:50:05 +0100 -Subject: [PATCH 5/5] appliance: Use stable owner, group and mtime in appliance - tarballs - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2320025 -Signed-off-by: Richard W.M. Jones ---- - appliance/Makefile.am | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/appliance/Makefile.am b/appliance/Makefile.am -index 8cb9bd1fff..7edc90e61f 100644 ---- a/appliance/Makefile.am -+++ b/appliance/Makefile.am -@@ -113,12 +113,17 @@ packagelist: packagelist.in Makefile guestfsd.deps - cmp -s $@ $@-t || mv $@-t $@ - rm -f $@-t - -+# Use stable times and owner/group (RHBZ#2320025). -+TAR_COMMAND := tar -z \ -+ --owner=0 --group=0 \ -+ $${SOURCE_DATE_EPOCH:+--mtime=@"$$SOURCE_DATE_EPOCH"} -+ - supermin.d/daemon.tar.gz: ../daemon/guestfsd - rm -f $@ $@-t - rm -rf tmp-d - mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc - ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd -- ( cd tmp-d && tar zcf - * ) > $@-t -+ ( cd tmp-d && $(TAR_COMMAND) -cf - * ) > $@-t - rm -r tmp-d - mv $@-t $@ - -@@ -139,7 +144,7 @@ supermin.d/hostfiles: hostfiles.in Makefile - - supermin.d/init.tar.gz: init - rm -f $@ $@-t -- ( cd $(srcdir) && tar zcf - init ) > $@-t -+ ( cd $(srcdir) && $(TAR_COMMAND) -cf - init ) > $@-t - mv $@-t $@ - - # We should put this file in /lib/udev/rules.d, but put it in /etc so -@@ -149,7 +154,7 @@ supermin.d/udev-rules.tar.gz: 99-guestfs-serial.rules - rm -rf tmp-u - mkdir -p tmp-u/etc/udev/rules.d - for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$(basename $$f); done -- ( cd tmp-u && tar zcf - etc ) > $@-t -+ ( cd tmp-u && $(TAR_COMMAND) -cf - etc ) > $@-t - rm -r tmp-u - mv $@-t $@ - --- -2.46.0 - diff --git a/libguestfs.spec b/libguestfs.spec index d1da8a0..fb5e46b 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -30,7 +30,7 @@ ExcludeArch: %{ix86} %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.54-stable +%global source_directory 1.55-development # Filter perl provides. %{?perl_default_filter} @@ -41,8 +41,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.54.0 -Release: 4%{?dist} +Version: 1.55.1 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -76,16 +76,6 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh -# All patches upstream in > 1.54.0 -Patch: 0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch -Patch: 0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch -# Add support for Windows Server 2025 -Patch: 0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch -Patch: 0004-build-Assume-__attribute__-cleanup-always-works.patch -# Use stable owner, group and mtime in appliance tarballs -# https://bugzilla.redhat.com/show_bug.cgi?id=2320025 -Patch: 0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch - BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. @@ -136,7 +126,7 @@ BuildRequires: libcap-devel %if !0%{?rhel} BuildRequires: libldm-devel %endif -BuildRequires: jansson-devel +BuildRequires: json-c-devel BuildRequires: systemd-devel BuildRequires: bash-completion-devel BuildRequires: /usr/bin/ping @@ -295,7 +285,7 @@ Requires: (%{name}-appliance = %{epoch}:%{version}-%{release} or %{name}-no # The daemon dependencies are not included automatically, because it # is buried inside the appliance, so list them here. Requires: augeas-libs%{?_isa} >= 1.7.0 -Requires: jansson%{?_isa} +Requires: json-c%{?_isa} Requires: libacl%{?_isa} Requires: libcap%{?_isa} Requires: libselinux%{?_isa} @@ -1110,6 +1100,10 @@ rm ocaml/html/.gitignore %changelog +* Tue Oct 22 2024 Richard W.M. Jones - 1:1.55.1-1 +- New upstream development version 1.55.1 +- Replace jansson with json-c + * Tue Oct 22 2024 Richard W.M. Jones - 1:1.54.0-4 - Rebuild for Jansson 2.14 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) diff --git a/sources b/sources index e8f63e9..6a3639c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.54.0.tar.gz) = 45fd91a36384c15737820c9157d4a8a670c94177ab917a2600fef04ecbc8d6531ef04a4a86bea6540e04a550de7dfacbef9645f2869e7c5eab6cb63058ff2d86 -SHA512 (libguestfs-1.54.0.tar.gz.sig) = 97c27a5cafa533587ae2e22a54fed16d37c5366cca2a4c40cb098a8dacf62ee8b1bcee9d28f63b01e7034f0f211e8a8c71368ae418f1bfba4970ca1942bf40f3 +SHA512 (libguestfs-1.55.1.tar.gz) = 827f848aeee15c63ed8421f56000a86f532e6d106f85e603b6650185f608d25f4044db6999d10c3af2d8769f4a7f6d56c448fa2edeb4fb0c1bf479f527873655 +SHA512 (libguestfs-1.55.1.tar.gz.sig) = fde95a95cd32c3c275ac8baf1109e306202e3853b196b0eb1ab63995ca68bcf75be21eecdf1b1314a2305c47feec8ba687230922d675ed5f6c142a33af09e30e From 969d54fb5aef9c9177a5e7425839bcc262619ecd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Nov 2024 14:52:30 +0000 Subject: [PATCH 04/62] New upstream development version 1.55.2 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index fb5e46b..1ca2b3a 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,7 +41,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.1 +Version: 1.55.2 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1100,6 +1100,9 @@ rm ocaml/html/.gitignore %changelog +* Mon Nov 18 2024 Richard W.M. Jones - 1:1.55.2-1 +- New upstream development version 1.55.2 + * Tue Oct 22 2024 Richard W.M. Jones - 1:1.55.1-1 - New upstream development version 1.55.1 - Replace jansson with json-c diff --git a/sources b/sources index 6a3639c..40fe20c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.1.tar.gz) = 827f848aeee15c63ed8421f56000a86f532e6d106f85e603b6650185f608d25f4044db6999d10c3af2d8769f4a7f6d56c448fa2edeb4fb0c1bf479f527873655 -SHA512 (libguestfs-1.55.1.tar.gz.sig) = fde95a95cd32c3c275ac8baf1109e306202e3853b196b0eb1ab63995ca68bcf75be21eecdf1b1314a2305c47feec8ba687230922d675ed5f6c142a33af09e30e +SHA512 (libguestfs-1.55.2.tar.gz) = 86bed33d6cea563a2127f82a71ef91a3de4f4532b682341c64001d0fbe2f248d46eb5bcf892acdb50e87919094deadd88290667c2c25c7e950b3274ba1f432c8 +SHA512 (libguestfs-1.55.2.tar.gz.sig) = 9476c14c6ae4b6f7c0ac4cd7d212eed734a9712709dd01f24dd1bbedcd3254c7e259d4f9c1c2f6685aaeed3b7661fe9afc13df4278e8675e6cb4db12d565d517 From ff5b9715aa981d712b281069c260208d21aa40e8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Nov 2024 16:27:25 +0000 Subject: [PATCH 05/62] Make perl Guestfs.so writable https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/DH5N6XV2NJHBIMX226HPDFUMO5NODE2V/ --- libguestfs.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libguestfs.spec b/libguestfs.spec index 1ca2b3a..aa4d4f8 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -802,6 +802,10 @@ find $RPM_BUILD_ROOT -name .packlist -delete find $RPM_BUILD_ROOT -name '*.bs' -delete find $RPM_BUILD_ROOT -name 'bindtests.pl' -delete +# debuginfo generation fails with debugedit >= 5.1 unless the files +# are writable: +find $RPM_BUILD_ROOT -name Guestfs.so -exec chmod u+w {} \; + # golang: Ignore what libguestfs upstream installs, and just copy the # source files to %%{_datadir}/gocode/src. %ifarch %{golang_arches} From d08c746e966ee9975e99acc35fa97490153601d6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 26 Nov 2024 09:22:49 +0000 Subject: [PATCH 06/62] Remove squashfs-tools on RHEL Fixes: https://issues.redhat.com/browse/RHEL-68937 --- libguestfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index aa4d4f8..11a8277 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -248,8 +248,8 @@ BuildRequires: scrub BuildRequires: sed %if !0%{?rhel} BuildRequires: sleuthkit -%endif BuildRequires: squashfs-tools +%endif BuildRequires: strace %if !0%{?rhel} %ifarch %{ix86} x86_64 From 97c01ad3a0650644853dadfe86b9692eb6a9e55c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 15:16:17 +0900 Subject: [PATCH 07/62] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 11a8277..1334b4e 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.55.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1104,6 +1104,9 @@ rm ocaml/html/.gitignore %changelog +* Wed Jan 08 2025 Mamoru TASAKA - 1:1.55.2-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + * Mon Nov 18 2024 Richard W.M. Jones - 1:1.55.2-1 - New upstream development version 1.55.2 From 884fa6683d581f5e0c18797811c6a231970abb5e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 8 Jan 2025 17:31:25 +0000 Subject: [PATCH 08/62] New upstream development version 1.55.3 Baseline version of OCaml moved to 4.08 --- libguestfs.spec | 10 +++++++--- sources | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 1334b4e..2209790 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,8 +41,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.2 -Release: 2%{?dist} +Version: 1.55.3 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -141,7 +141,7 @@ BuildRequires: gnupg2 %endif # For language bindings. -BuildRequires: ocaml +BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel %if !0%{?rhel} @@ -1104,6 +1104,10 @@ rm ocaml/html/.gitignore %changelog +* Wed Jan 08 2025 Richard W.M. Jones - 1:1.55.3-1 +- New upstream development version 1.55.3 +- Baseline version of OCaml moved to 4.08 + * Wed Jan 08 2025 Mamoru TASAKA - 1:1.55.2-2 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 diff --git a/sources b/sources index 40fe20c..e7dc362 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.2.tar.gz) = 86bed33d6cea563a2127f82a71ef91a3de4f4532b682341c64001d0fbe2f248d46eb5bcf892acdb50e87919094deadd88290667c2c25c7e950b3274ba1f432c8 -SHA512 (libguestfs-1.55.2.tar.gz.sig) = 9476c14c6ae4b6f7c0ac4cd7d212eed734a9712709dd01f24dd1bbedcd3254c7e259d4f9c1c2f6685aaeed3b7661fe9afc13df4278e8675e6cb4db12d565d517 +SHA512 (libguestfs-1.55.3.tar.gz) = 88f8f6e55cd52904193cf4c026ebbe34c25c707bf6bf0a34ac1d6e4a9c9f69b478e55eb46581ea47e820015ca432c38ec6252007f00394f297003596567d2bf0 +SHA512 (libguestfs-1.55.3.tar.gz.sig) = 7fd680e69f4a226ca8dbbc9862347bd169a669f436fd191de2702b2ed56c4f21e81540ed5dca659852362dccfccb952c0377506409070c82ce0e803e4f6d78b1 From f7d93df6a3e34c88464f5cc49724543ab453e0c8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 9 Jan 2025 11:21:48 +0000 Subject: [PATCH 09/62] Rebuild for Ruby 3.4 again (RHBZ#2336525) --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 2209790..ba19e7e 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.55.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1104,6 +1104,9 @@ rm ocaml/html/.gitignore %changelog +* Thu Jan 09 2025 Richard W.M. Jones - 1:1.55.3-2 +- Rebuild for Ruby 3.4 again (RHBZ#2336525) + * Wed Jan 08 2025 Richard W.M. Jones - 1:1.55.3-1 - New upstream development version 1.55.3 - Baseline version of OCaml moved to 4.08 From b0b5282cc0a64e5adfe309b707e406a414e90f61 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 10 Jan 2025 14:03:26 -0700 Subject: [PATCH 10/62] OCaml 5.3.0 rebuild for Fedora 42 --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index ba19e7e..4623182 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.55.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1104,6 +1104,9 @@ rm ocaml/html/.gitignore %changelog +* Fri Jan 10 2025 Jerry James - 1:1.55.3-3 +- OCaml 5.3.0 rebuild for Fedora 42 + * Thu Jan 09 2025 Richard W.M. Jones - 1:1.55.3-2 - Rebuild for Ruby 3.4 again (RHBZ#2336525) From 64a8335772043010301ff060820f826a1d3b8a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Jan 2025 14:33:37 +0100 Subject: [PATCH 11/62] Rebuilt for the bin-sbin merge (2nd attempt) https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 4623182..d666772 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.55.3 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1104,6 +1104,9 @@ rm ocaml/html/.gitignore %changelog +* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 1:1.55.3-4 +- Rebuilt for the bin-sbin merge (2nd attempt) + * Fri Jan 10 2025 Jerry James - 1:1.55.3-3 - OCaml 5.3.0 rebuild for Fedora 42 From 655a9a1be9f2b46ae998a5697715cee4c84442e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 11:27:12 +0000 Subject: [PATCH 12/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index d666772..3933a40 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.55.3 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1104,6 +1104,9 @@ rm ocaml/html/.gitignore %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1:1.55.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 1:1.55.3-4 - Rebuilt for the bin-sbin merge (2nd attempt) From b4cbc4fbfc6efa7fbaa99c00b72716925c0b4438 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 5 Feb 2025 13:53:19 +0000 Subject: [PATCH 13/62] New upstream development version 1.55.4 Contains upstream fix for bin/sbin merge brokenness. --- libguestfs.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 3933a40..67821a9 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,8 +41,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.3 -Release: 5%{?dist} +Version: 1.55.4 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1104,6 +1104,9 @@ rm ocaml/html/.gitignore %changelog +* Wed Feb 05 2025 Richard W.M. Jones - 1:1.55.4-1 +- New upstream development version 1.55.4 + * Fri Jan 17 2025 Fedora Release Engineering - 1:1.55.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index e7dc362..783aa95 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.3.tar.gz) = 88f8f6e55cd52904193cf4c026ebbe34c25c707bf6bf0a34ac1d6e4a9c9f69b478e55eb46581ea47e820015ca432c38ec6252007f00394f297003596567d2bf0 -SHA512 (libguestfs-1.55.3.tar.gz.sig) = 7fd680e69f4a226ca8dbbc9862347bd169a669f436fd191de2702b2ed56c4f21e81540ed5dca659852362dccfccb952c0377506409070c82ce0e803e4f6d78b1 +SHA512 (libguestfs-1.55.4.tar.gz) = da8e56e57d0745a49bc01f6ba48d11a4c63ea7cef99616d97fdea4414d8574cc48c4ecfc70b4b64454c77c221d0cea3fef2734686d6e548a3ca4de703ed211ca +SHA512 (libguestfs-1.55.4.tar.gz.sig) = 7e55b047da6808c10540132abc03979a9758a5d9bd015335cb3ee3351ab0b2850bdc0629df8cf8f47de27e4bd2930f225c31469d5baca0b601e67616e242dfd4 From d0aaeeedabbc7876231e72f2771b687093529865 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 18 Feb 2025 11:25:02 +0000 Subject: [PATCH 14/62] New upstream development version 1.55.5 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 67821a9..ba350c0 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,7 +41,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.4 +Version: 1.55.5 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1104,6 +1104,9 @@ rm ocaml/html/.gitignore %changelog +* Tue Feb 18 2025 Richard W.M. Jones - 1:1.55.5-1 +- New upstream development version 1.55.5 + * Wed Feb 05 2025 Richard W.M. Jones - 1:1.55.4-1 - New upstream development version 1.55.4 diff --git a/sources b/sources index 783aa95..dcd8483 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.4.tar.gz) = da8e56e57d0745a49bc01f6ba48d11a4c63ea7cef99616d97fdea4414d8574cc48c4ecfc70b4b64454c77c221d0cea3fef2734686d6e548a3ca4de703ed211ca -SHA512 (libguestfs-1.55.4.tar.gz.sig) = 7e55b047da6808c10540132abc03979a9758a5d9bd015335cb3ee3351ab0b2850bdc0629df8cf8f47de27e4bd2930f225c31469d5baca0b601e67616e242dfd4 +SHA512 (libguestfs-1.55.5.tar.gz) = 01b08e0c72cb52c643406767b611599f2de776deea5927518f7dbceb590195655e4313fd17ce0f9d1a54bb8847943dcf816f6b63c17b570ce1a0bc68a5cf4381 +SHA512 (libguestfs-1.55.5.tar.gz.sig) = b54a392093677076d2ca0cf062fc87131f3bd62b0babb7ffba2ec874cc4837036a07a83793e06c8ae7a889b5275c20069af4668ccf87b8116b8a8ad67992b5f5 From 67218f97d2c921f12ae1bf5cb618b526a553e7e7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Feb 2025 17:03:34 +0000 Subject: [PATCH 15/62] New upstream development version 1.55.6 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index ba350c0..a734ad9 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,7 +41,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.5 +Version: 1.55.6 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1104,6 +1104,9 @@ rm ocaml/html/.gitignore %changelog +* Wed Feb 19 2025 Richard W.M. Jones - 1:1.55.6-1 +- New upstream development version 1.55.6 + * Tue Feb 18 2025 Richard W.M. Jones - 1:1.55.5-1 - New upstream development version 1.55.5 diff --git a/sources b/sources index dcd8483..6e57975 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.5.tar.gz) = 01b08e0c72cb52c643406767b611599f2de776deea5927518f7dbceb590195655e4313fd17ce0f9d1a54bb8847943dcf816f6b63c17b570ce1a0bc68a5cf4381 -SHA512 (libguestfs-1.55.5.tar.gz.sig) = b54a392093677076d2ca0cf062fc87131f3bd62b0babb7ffba2ec874cc4837036a07a83793e06c8ae7a889b5275c20069af4668ccf87b8116b8a8ad67992b5f5 +SHA512 (libguestfs-1.55.6.tar.gz) = 3dba2f8c2086024674375d054a214d34a028345e2f32cf439de38dfe2815ab2cc6cc64cff58b59ed2f38712006e1563fdf58713ccecfe155b7542742a4ee5104 +SHA512 (libguestfs-1.55.6.tar.gz.sig) = db4c89e918b2404f511734d34c98aedd58c3b1446d8831c7793958e1f70d24fe5378b331d015b53ad7f90ec04c9aa98fe7d6390b08e80fdac19691a4e30b95dd From 00b17b7430bd394c3381f2336ad85b5314a1cb5a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Mar 2025 15:34:52 +0000 Subject: [PATCH 16/62] New upstream development version 1.55.7 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index a734ad9..cdb66fd 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,7 +41,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.6 +Version: 1.55.7 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1104,6 +1104,9 @@ rm ocaml/html/.gitignore %changelog +* Tue Mar 11 2025 Richard W.M. Jones - 1:1.55.7-1 +- New upstream development version 1.55.7 + * Wed Feb 19 2025 Richard W.M. Jones - 1:1.55.6-1 - New upstream development version 1.55.6 diff --git a/sources b/sources index 6e57975..20c30e7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.6.tar.gz) = 3dba2f8c2086024674375d054a214d34a028345e2f32cf439de38dfe2815ab2cc6cc64cff58b59ed2f38712006e1563fdf58713ccecfe155b7542742a4ee5104 -SHA512 (libguestfs-1.55.6.tar.gz.sig) = db4c89e918b2404f511734d34c98aedd58c3b1446d8831c7793958e1f70d24fe5378b331d015b53ad7f90ec04c9aa98fe7d6390b08e80fdac19691a4e30b95dd +SHA512 (libguestfs-1.55.7.tar.gz) = aa00378699914495d4450e13bd67cbb248854b2134e95be637de8a1f99c94cb088a5af82f1b89a7ec4e30002e85896a1526000f1eab0db9e0ad82d4783fba157 +SHA512 (libguestfs-1.55.7.tar.gz.sig) = aa8ff17b3cefe39ef8074d56680c1c1a13d609fceeb4b110f3e94c68386e3bba078a63847023b0d29604a68e38fbbdffcd724eae481bc230702147a3a989510a From 04ee36056b514104808abf0d15dab6e0c490c383 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Apr 2025 19:10:06 +0100 Subject: [PATCH 17/62] New upstream development version 1.55.8 Remove oUnit --- libguestfs.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index cdb66fd..b6da4be 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,7 +41,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.7 +Version: 1.55.8 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -145,7 +145,6 @@ BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel %if !0%{?rhel} -BuildRequires: ocaml-ounit-devel BuildRequires: lua BuildRequires: lua-devel %endif @@ -1104,6 +1103,10 @@ rm ocaml/html/.gitignore %changelog +* Thu Apr 03 2025 Richard W.M. Jones - 1:1.55.8-1 +- New upstream development version 1.55.8 +- Remove oUnit + * Tue Mar 11 2025 Richard W.M. Jones - 1:1.55.7-1 - New upstream development version 1.55.7 diff --git a/sources b/sources index 20c30e7..fc72b4e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.7.tar.gz) = aa00378699914495d4450e13bd67cbb248854b2134e95be637de8a1f99c94cb088a5af82f1b89a7ec4e30002e85896a1526000f1eab0db9e0ad82d4783fba157 -SHA512 (libguestfs-1.55.7.tar.gz.sig) = aa8ff17b3cefe39ef8074d56680c1c1a13d609fceeb4b110f3e94c68386e3bba078a63847023b0d29604a68e38fbbdffcd724eae481bc230702147a3a989510a +SHA512 (libguestfs-1.55.8.tar.gz) = 86510eb82c03381d432bca2ef1d077a971e0d0f27c7852a81dff0228bd3745748a19dff597defb948dd182568a0a949aaa37a1bbd619a96f976b4974f7c81c92 +SHA512 (libguestfs-1.55.8.tar.gz.sig) = 08d64a4c1e885201961af6e48f95c7d2cccf6fa2ee5c50db5890b673f5e6397f09b89432a7ac1b5f6890424873b359c5f74d264bc2f243ed84fb1738c142cec1 From 566608b2fc4670d4039bc4d3cc196bc62d3ba1f8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Apr 2025 08:54:20 +0100 Subject: [PATCH 18/62] Disable tests on aarch64 https://gitlab.com/libvirt/libvirt/-/issues/762 --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index b6da4be..6763158 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -14,7 +14,10 @@ ExcludeArch: %{ix86} # broken. To perform the full test suite, see instructions here: # https://www.redhat.com/archives/libguestfs/2015-September/msg00078.html %if !0%{?rhel} -%global test_arches aarch64 %{power64} s390x x86_64 +#%%global test_arches aarch64 %{power64} s390x x86_64 +# aarch64 broken in Rawhide: +# https://gitlab.com/libvirt/libvirt/-/issues/762 +%global test_arches %{power64} s390x x86_64 %else # RHEL 9 only: # x86-64: "/lib64/libc.so.6: CPU ISA level is lower than required" From 1fc58abcdda7a5eea0a7521ec853833ead6e39f8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 16 Apr 2025 22:02:34 +0100 Subject: [PATCH 19/62] New upstream development version 1.55.9 Remove flex and bison --- libguestfs.spec | 8 +++++--- sources | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 6763158..2c760df 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -44,7 +44,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.8 +Version: 1.55.9 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -107,8 +107,6 @@ BuildRequires: pcre2-devel BuildRequires: file-devel BuildRequires: libvirt-devel BuildRequires: gperf -BuildRequires: flex -BuildRequires: bison BuildRequires: rpm-devel BuildRequires: cpio BuildRequires: libconfig-devel @@ -1106,6 +1104,10 @@ rm ocaml/html/.gitignore %changelog +* Wed Apr 16 2025 Richard W.M. Jones - 1:1.55.9-1 +- New upstream development version 1.55.9 +- Remove flex and bison + * Thu Apr 03 2025 Richard W.M. Jones - 1:1.55.8-1 - New upstream development version 1.55.8 - Remove oUnit diff --git a/sources b/sources index fc72b4e..62ea16b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.8.tar.gz) = 86510eb82c03381d432bca2ef1d077a971e0d0f27c7852a81dff0228bd3745748a19dff597defb948dd182568a0a949aaa37a1bbd619a96f976b4974f7c81c92 -SHA512 (libguestfs-1.55.8.tar.gz.sig) = 08d64a4c1e885201961af6e48f95c7d2cccf6fa2ee5c50db5890b673f5e6397f09b89432a7ac1b5f6890424873b359c5f74d264bc2f243ed84fb1738c142cec1 +SHA512 (libguestfs-1.55.9.tar.gz) = 0d73bc3d62d1902244a22d52cbbeb5c68f8bfab5402ad38d3b9d6e2ec4991f78063cf3263f48fa71d31e8a0c0ec9ea38433c9c428c83fa1ce6a9bdf3f16443e8 +SHA512 (libguestfs-1.55.9.tar.gz.sig) = 31715a343758dcec36cd7114e6a1882a020428078430c278711761433526f13596b5e7d54e510d724ad473e1abec34bab0249282b48f5f266ca8d13db7ee7d7b From a1eed9c04c9e64cf24bc83a0da2cd6b05f7400c3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 25 Apr 2025 17:05:22 +0100 Subject: [PATCH 20/62] Fix RHEL gating tests These would always fail because libvirt doesn't start up after being installed. You would see errors like: libguestfs: opening libvirt handle: URI = qemu:///system, auth = default+wrapper, flags = 0 libvirt: XML-RPC error : Failed to connect socket to '/var/run/libvirt/virtqemud-sock': No such file or directory libguestfs: error: could not connect to libvirt (URI = qemu:///system): Failed to connect socket to '/var/run/libvirt/virtqemud-sock': No such file or directory [code=38 int1=2] --- tests/run-libguestfs-test-tool.sh | 10 ++++++++++ tests/tests.yml | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 tests/run-libguestfs-test-tool.sh diff --git a/tests/run-libguestfs-test-tool.sh b/tests/run-libguestfs-test-tool.sh new file mode 100755 index 0000000..d36d5ea --- /dev/null +++ b/tests/run-libguestfs-test-tool.sh @@ -0,0 +1,10 @@ +#!/bin/bash - +set -e +set -x + +# This only makes sure that libguestfs isn't totally broken. + +# Fix libvirt. +systemctl restart virtqemud virtsecretd virtstoraged virtnetworkd + +libguestfs-test-tool diff --git a/tests/tests.yml b/tests/tests.yml index 180fe76..3809111 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -5,9 +5,10 @@ - role: standard-test-basic tags: - classic + required_packages: + - libguestfs + - libvirt-daemon-kvm tests: - libguestfs-test-tool: dir: . - run: libguestfs-test-tool - required_packages: - - libguestfs + run: ./run-libguestfs-test-tool.sh From d165325dd3ce053895d072781295a9eb5ef951b5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 26 Apr 2025 11:29:48 +0100 Subject: [PATCH 21/62] New upstream development version 1.55.10 Fix macro in comment --- libguestfs.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 2c760df..a71d7b9 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -14,7 +14,7 @@ ExcludeArch: %{ix86} # broken. To perform the full test suite, see instructions here: # https://www.redhat.com/archives/libguestfs/2015-September/msg00078.html %if !0%{?rhel} -#%%global test_arches aarch64 %{power64} s390x x86_64 +#%%global test_arches aarch64 %%{power64} s390x x86_64 # aarch64 broken in Rawhide: # https://gitlab.com/libvirt/libvirt/-/issues/762 %global test_arches %{power64} s390x x86_64 @@ -44,7 +44,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.9 +Version: 1.55.10 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1104,6 +1104,10 @@ rm ocaml/html/.gitignore %changelog +* Sat Apr 26 2025 Richard W.M. Jones - 1:1.55.10-1 +- New upstream development version 1.55.10 +- Fix macro in comment + * Wed Apr 16 2025 Richard W.M. Jones - 1:1.55.9-1 - New upstream development version 1.55.9 - Remove flex and bison diff --git a/sources b/sources index 62ea16b..1a834be 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.9.tar.gz) = 0d73bc3d62d1902244a22d52cbbeb5c68f8bfab5402ad38d3b9d6e2ec4991f78063cf3263f48fa71d31e8a0c0ec9ea38433c9c428c83fa1ce6a9bdf3f16443e8 -SHA512 (libguestfs-1.55.9.tar.gz.sig) = 31715a343758dcec36cd7114e6a1882a020428078430c278711761433526f13596b5e7d54e510d724ad473e1abec34bab0249282b48f5f266ca8d13db7ee7d7b +SHA512 (libguestfs-1.55.10.tar.gz) = c896bba5a14fb43a0889eb8e76b41a8cd2399c02decc2dc2c33777a9c247460d9e4972562fbc4ae0c3933257c11f15b35b0a8e719036d9ecf25887f7b848a677 +SHA512 (libguestfs-1.55.10.tar.gz.sig) = 31e6537b7ee25fe4eb9c8724333f8fd4fd5038da1bbbbeff6bd55209172e7562fee82dfe6bd479f818786ccea3fffe16464772f03b98c92a91fe965e3b5329e2 From 797a52157580e7cbde205731cdb4cb98de02b720 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 26 Apr 2025 13:18:45 +0100 Subject: [PATCH 22/62] Remove file-devel BR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is no longer needed because of: commit 2b2be31af09694761c3657d0f7d9299ed722b914 Author: Richard W.M. Jones Date: Tue Apr 22 11:59:25 2025 +0100 build: Remove test for libmagic libmagic (part of the "file" command) was required in earlier versions of libguestfs, but this requirement was effectively removed in commit b48da89dd6 ("daemon: Reimplement ‘file_architecture’ API in OCaml") back in 2017. Or to be more precise, we now use the "file" command inside the daemon, which may or may not use libmagic but we no longer link to the library directly. Reported-by: Mohamed Akram Fixes: commit b48da89dd6edce325f4c1f2956435c4d383ebe77 Related: https://github.com/libguestfs/libguestfs/issues/184 --- libguestfs.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index a71d7b9..e37ff36 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -104,7 +104,6 @@ BuildRequires: libselinux-utils BuildRequires: libselinux-devel BuildRequires: fuse, fuse-devel BuildRequires: pcre2-devel -BuildRequires: file-devel BuildRequires: libvirt-devel BuildRequires: gperf BuildRequires: rpm-devel From 958e08bd8184c15f6d55a02969d4b4bf8deed3db Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 30 Apr 2025 18:53:29 +0100 Subject: [PATCH 23/62] Remove libguestfs-zfs subpackage zfs-fuse has been unmaintained for a very long time. In fact, the website has gone. https://bugzilla.redhat.com/show_bug.cgi?id=2214965 --- libguestfs.spec | 44 +++++--------------------------------------- 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index e37ff36..cbf53f9 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -45,7 +45,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.55.10 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -265,12 +265,6 @@ BuildRequires: xz %if !0%{?rhel} BuildRequires: zerofree %endif -%if !0%{?rhel} -%ifnarch %{arm} aarch64 s390 s390x riscv64 -# http://zfs-fuse.net/issues/94 -BuildRequires: zfs-fuse -%endif -%endif BuildRequires: zstd # Main package requires the appliance. This allows the appliance to @@ -365,9 +359,6 @@ For enhanced features, install: libguestfs-ufs adds UFS (BSD) support %endif libguestfs-xfs adds XFS support -%if !0%{?rhel} - libguestfs-zfs adds ZFS support -%endif For developers: @@ -498,20 +489,6 @@ This adds XFS support to %{name}. Install it if you want to process disk images containing XFS. -%if !0%{?rhel} -%ifnarch %{arm} aarch64 s390 s390x riscv64 -%package zfs -Summary: ZFS support for %{name} -License: GPL-2.0-or-later -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description zfs -This adds ZFS support to %{name}. Install it if you want to process -disk images containing ZFS. -%endif -%endif - - %package inspect-icons Summary: Additional dependencies for inspecting guest icons License: LGPL-2.1-or-later @@ -850,13 +827,6 @@ move_to strace zz-packages-rescue move_to vim-minimal zz-packages-rescue move_to rsync zz-packages-rsync move_to xfsprogs zz-packages-xfs -%if !0%{?rhel} -%ifnarch %{arm} aarch64 s390 s390x riscv64 -move_to zfs-fuse zz-packages-zfs -%endif -%else -remove zfs-fuse -%endif %if !0%{?rhel} # On Fedora you need kernel-modules-extra to be able to mount @@ -974,14 +944,6 @@ rm ocaml/html/.gitignore %files xfs %{_libdir}/guestfs/supermin.d/zz-packages-xfs -%if !0%{?rhel} -%ifnarch %{arm} aarch64 s390 s390x riscv64 -%files zfs -%{_libdir}/guestfs/supermin.d/zz-packages-zfs -%endif -%endif - - %files inspect-icons # no files @@ -1103,6 +1065,10 @@ rm ocaml/html/.gitignore %changelog +* Wed May 07 2025 Richard W.M. Jones - 1:1.55.10-2 +- Remove file-devel BR +- Remove libguestfs-zfs subpackage + * Sat Apr 26 2025 Richard W.M. Jones - 1:1.55.10-1 - New upstream development version 1.55.10 - Fix macro in comment From bc325acc763bc429cfc087e4fe2750d4e8dd369e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 9 May 2025 15:46:34 +0100 Subject: [PATCH 24/62] New upstream development version 1.55.11 --- libguestfs.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index cbf53f9..988716c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -44,8 +44,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.10 -Release: 2%{?dist} +Version: 1.55.11 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1065,6 +1065,9 @@ rm ocaml/html/.gitignore %changelog +* Fri May 09 2025 Richard W.M. Jones - 1:1.55.11-1 +- New upstream development version 1.55.11 + * Wed May 07 2025 Richard W.M. Jones - 1:1.55.10-2 - Remove file-devel BR - Remove libguestfs-zfs subpackage diff --git a/sources b/sources index 1a834be..2317097 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.10.tar.gz) = c896bba5a14fb43a0889eb8e76b41a8cd2399c02decc2dc2c33777a9c247460d9e4972562fbc4ae0c3933257c11f15b35b0a8e719036d9ecf25887f7b848a677 -SHA512 (libguestfs-1.55.10.tar.gz.sig) = 31e6537b7ee25fe4eb9c8724333f8fd4fd5038da1bbbbeff6bd55209172e7562fee82dfe6bd479f818786ccea3fffe16464772f03b98c92a91fe965e3b5329e2 +SHA512 (libguestfs-1.55.11.tar.gz) = 3c2bf753ad1bf9dd1809f50e9e39dd154e97a33de7848b9d08feac23f543cc1100b928f1533a6ea4882125202793694c2917ea5561ccbd0c72154a7313cf9050 +SHA512 (libguestfs-1.55.11.tar.gz.sig) = 42764c07832f02349f8d28482aa2aefd394b66b940d84765623491879b8960b22f567c51565f32dab204cc83aa8fa26b46fd181c10a43da05db29d2ee704deb0 From 0893711f75be0da43099c6a37cb88fbd10845750 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 9 May 2025 15:54:59 +0100 Subject: [PATCH 25/62] Backport upstream patch to really remove zfs-fuse dependency --- 0001-appliance-Remove-zfs-fuse.patch | 38 ++++++++++++++++++++++++++++ libguestfs.spec | 8 ++++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 0001-appliance-Remove-zfs-fuse.patch diff --git a/0001-appliance-Remove-zfs-fuse.patch b/0001-appliance-Remove-zfs-fuse.patch new file mode 100644 index 0000000..bb32b09 --- /dev/null +++ b/0001-appliance-Remove-zfs-fuse.patch @@ -0,0 +1,38 @@ +From f6b1a7b57f96f002074e626d58b58f4244080ec9 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 9 May 2025 15:52:30 +0100 +Subject: [PATCH] appliance: Remove zfs-fuse + +zfs-fuse has been unmaintained for a very long time. In fact, the +website has gone. This means that whatever we need for zfs (probably +some kind of license-compatible kernel module) is not going to be +provided by zfs-fuse. + +See: https://bugzilla.redhat.com/show_bug.cgi?id=2214965 +--- + appliance/packagelist.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/appliance/packagelist.in b/appliance/packagelist.in +index d0637631d..f8c80af24 100644 +--- a/appliance/packagelist.in ++++ b/appliance/packagelist.in +@@ -51,7 +51,6 @@ ifelse(REDHAT,1, + systemd dnl for /sbin/reboot and udevd + vim-minimal + xz +- zfs-fuse + zstd + ) + +@@ -95,7 +94,6 @@ dnl isc-dhcp-client has been replaced with dhcpcd-base + ufsutils + vim-tiny + xz-utils +- zfs-fuse + zstd + uuid-runtime + ) +-- +2.49.0 + diff --git a/libguestfs.spec b/libguestfs.spec index 988716c..9124a4a 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -45,7 +45,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.55.11 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -79,6 +79,9 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh +# Upstream patch that removes zfs-fuse +Patch: 0001-appliance-Remove-zfs-fuse.patch + BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. @@ -1065,8 +1068,9 @@ rm ocaml/html/.gitignore %changelog -* Fri May 09 2025 Richard W.M. Jones - 1:1.55.11-1 +* Fri May 09 2025 Richard W.M. Jones - 1:1.55.11-2 - New upstream development version 1.55.11 +- Backport upstream patch to really remove zfs-fuse dependency * Wed May 07 2025 Richard W.M. Jones - 1:1.55.10-2 - Remove file-devel BR From 1317c346ab8f653a9d1a0586a7780518d01520ac Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 19 May 2025 14:59:53 +0100 Subject: [PATCH 26/62] New upstream development version 1.55.12 --- libguestfs.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 9124a4a..2ff1641 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -44,8 +44,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.11 -Release: 2%{?dist} +Version: 1.55.12 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1068,6 +1068,9 @@ rm ocaml/html/.gitignore %changelog +* Mon May 19 2025 Richard W.M. Jones - 1:1.55.12-1 +- New upstream development version 1.55.12 + * Fri May 09 2025 Richard W.M. Jones - 1:1.55.11-2 - New upstream development version 1.55.11 - Backport upstream patch to really remove zfs-fuse dependency diff --git a/sources b/sources index 2317097..31a585f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.11.tar.gz) = 3c2bf753ad1bf9dd1809f50e9e39dd154e97a33de7848b9d08feac23f543cc1100b928f1533a6ea4882125202793694c2917ea5561ccbd0c72154a7313cf9050 -SHA512 (libguestfs-1.55.11.tar.gz.sig) = 42764c07832f02349f8d28482aa2aefd394b66b940d84765623491879b8960b22f567c51565f32dab204cc83aa8fa26b46fd181c10a43da05db29d2ee704deb0 +SHA512 (libguestfs-1.55.12.tar.gz) = 87f7c209e5b5787c212746a1fb434342b75b9dd80dd4fc01b53877150f7d194d3d856b0acac0606236029601b595e2c0db8af582b00364cf162e91394c74be10 +SHA512 (libguestfs-1.55.12.tar.gz.sig) = 177730330cf94cf2a3d17fee3427482b2206d824f24928d4a5fa4bf0ef3248f319d648a17fa337f23af7b9c39b62b86eab6d0465454efda7b3c6e5a306a74c99 From 698d9ad820269c6c0f467e04b60ec0c19666cf9e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 19 May 2025 15:02:45 +0100 Subject: [PATCH 27/62] Remove patch that is now upstream --- 0001-appliance-Remove-zfs-fuse.patch | 38 ---------------------------- libguestfs.spec | 3 --- 2 files changed, 41 deletions(-) delete mode 100644 0001-appliance-Remove-zfs-fuse.patch diff --git a/0001-appliance-Remove-zfs-fuse.patch b/0001-appliance-Remove-zfs-fuse.patch deleted file mode 100644 index bb32b09..0000000 --- a/0001-appliance-Remove-zfs-fuse.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f6b1a7b57f96f002074e626d58b58f4244080ec9 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 9 May 2025 15:52:30 +0100 -Subject: [PATCH] appliance: Remove zfs-fuse - -zfs-fuse has been unmaintained for a very long time. In fact, the -website has gone. This means that whatever we need for zfs (probably -some kind of license-compatible kernel module) is not going to be -provided by zfs-fuse. - -See: https://bugzilla.redhat.com/show_bug.cgi?id=2214965 ---- - appliance/packagelist.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/appliance/packagelist.in b/appliance/packagelist.in -index d0637631d..f8c80af24 100644 ---- a/appliance/packagelist.in -+++ b/appliance/packagelist.in -@@ -51,7 +51,6 @@ ifelse(REDHAT,1, - systemd dnl for /sbin/reboot and udevd - vim-minimal - xz -- zfs-fuse - zstd - ) - -@@ -95,7 +94,6 @@ dnl isc-dhcp-client has been replaced with dhcpcd-base - ufsutils - vim-tiny - xz-utils -- zfs-fuse - zstd - uuid-runtime - ) --- -2.49.0 - diff --git a/libguestfs.spec b/libguestfs.spec index 2ff1641..124ab8d 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -79,9 +79,6 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh -# Upstream patch that removes zfs-fuse -Patch: 0001-appliance-Remove-zfs-fuse.patch - BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. From 383ca879905489826be71cb0684e42415da4dcfb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 19 May 2025 16:19:17 +0100 Subject: [PATCH 28/62] Add temporary workaround for gettext bug: https://bugzilla.redhat.com/show_bug.cgi?id=2366708 --- libguestfs.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libguestfs.spec b/libguestfs.spec index 124ab8d..6b59aab 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -669,6 +669,9 @@ for %{name}. %setup -q %autopatch -p1 +# ACLOCAL_PATH is temporarily required to work around +# https://bugzilla.redhat.com/show_bug.cgi?id=2366708 +export ACLOCAL_PATH=/usr/share/gettext/m4/ autoreconf -fiv # For sVirt to work, the local temporary directory we use in the tests From f00974982e2fca39b5decdb67dc5238053f5faee Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 20 May 2025 14:57:07 +0100 Subject: [PATCH 29/62] New upstream development version 1.55.13 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 6b59aab..9f25e87 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -44,7 +44,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.12 +Version: 1.55.13 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1068,6 +1068,9 @@ rm ocaml/html/.gitignore %changelog +* Tue May 20 2025 Richard W.M. Jones - 1:1.55.13-1 +- New upstream development version 1.55.13 + * Mon May 19 2025 Richard W.M. Jones - 1:1.55.12-1 - New upstream development version 1.55.12 diff --git a/sources b/sources index 31a585f..e17c099 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.12.tar.gz) = 87f7c209e5b5787c212746a1fb434342b75b9dd80dd4fc01b53877150f7d194d3d856b0acac0606236029601b595e2c0db8af582b00364cf162e91394c74be10 -SHA512 (libguestfs-1.55.12.tar.gz.sig) = 177730330cf94cf2a3d17fee3427482b2206d824f24928d4a5fa4bf0ef3248f319d648a17fa337f23af7b9c39b62b86eab6d0465454efda7b3c6e5a306a74c99 +SHA512 (libguestfs-1.55.13.tar.gz) = 7f66969e3217426ecf9155777f1b07512db289e0661c2736837c6ea25c9fb6db26854d9e0e1d1306007b8a70b6ccd96de55869db370c356106760437457eb422 +SHA512 (libguestfs-1.55.13.tar.gz.sig) = 8b7dd0daf6ca026d1d0796a2c4102248298e54ea841f2a6ca3b6f1eb314b7160732261e9d25f6c3be08090878a3c76ec24c9954be0517b477a98fac2a7fc3daf From 0209f60e48e6d484a27534c0462963edbf480a99 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 00:20:10 +0200 Subject: [PATCH 30/62] Rebuilt for Python 3.14 --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 9f25e87..220a31d 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -45,7 +45,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.55.13 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1068,6 +1068,9 @@ rm ocaml/html/.gitignore %changelog +* Mon Jun 02 2025 Python Maint - 1:1.55.13-2 +- Rebuilt for Python 3.14 + * Tue May 20 2025 Richard W.M. Jones - 1:1.55.13-1 - New upstream development version 1.55.13 From de1ecfc7384a2d16d03f3e245e193c7377b0e320 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 3 Jun 2025 16:35:34 +0100 Subject: [PATCH 31/62] New upstream development version 1.55.14 --- libguestfs.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 220a31d..25b25d4 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -44,8 +44,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.13 -Release: 2%{?dist} +Version: 1.55.14 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1068,6 +1068,9 @@ rm ocaml/html/.gitignore %changelog +* Tue Jun 03 2025 Richard W.M. Jones - 1:1.55.14-1 +- New upstream development version 1.55.14 + * Mon Jun 02 2025 Python Maint - 1:1.55.13-2 - Rebuilt for Python 3.14 diff --git a/sources b/sources index e17c099..0d433cc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.13.tar.gz) = 7f66969e3217426ecf9155777f1b07512db289e0661c2736837c6ea25c9fb6db26854d9e0e1d1306007b8a70b6ccd96de55869db370c356106760437457eb422 -SHA512 (libguestfs-1.55.13.tar.gz.sig) = 8b7dd0daf6ca026d1d0796a2c4102248298e54ea841f2a6ca3b6f1eb314b7160732261e9d25f6c3be08090878a3c76ec24c9954be0517b477a98fac2a7fc3daf +SHA512 (libguestfs-1.55.14.tar.gz) = 2830d9dca02f2dce654c2f9a09c4511e34862ee26d8c9823cf001ae159194e278f104da6b1b7d2c6ed23dfb8c6d24bf4324f4d81cf0d6b6d0403f4746dbe4266 +SHA512 (libguestfs-1.55.14.tar.gz.sig) = 304cfaf4cc449968fc5b4fcb85b2be9d16abbc6f8fefec82394e963e0e265038b0583fd0595893029794136321f8a9b7e0bd659980b00199c490ff75275dbb9a From a92e54d898556667cefb827c47787510960795a4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 6 Jun 2025 09:30:51 +0200 Subject: [PATCH 32/62] Rebuilt for Python 3.14 --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 25b25d4..2068358 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -45,7 +45,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.55.14 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1068,6 +1068,9 @@ rm ocaml/html/.gitignore %changelog +* Fri Jun 06 2025 Python Maint - 1:1.55.14-2 +- Rebuilt for Python 3.14 + * Tue Jun 03 2025 Richard W.M. Jones - 1:1.55.14-1 - New upstream development version 1.55.14 From 6a0f5623dc0b9b94b6e78a4bd225be6f68046c74 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 11 Jun 2025 14:50:08 +0100 Subject: [PATCH 33/62] New upstream stable version 1.56.0 Remove BR xz-devel as it is not needed. --- libguestfs.spec | 11 +++++++---- sources | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 2068358..ca1356a 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -33,7 +33,7 @@ ExcludeArch: %{ix86} %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.55-development +%global source_directory 1.56-stable # Filter perl provides. %{?perl_default_filter} @@ -44,8 +44,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.55.14 -Release: 2%{?dist} +Version: 1.56.0 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -109,7 +109,6 @@ BuildRequires: gperf BuildRequires: rpm-devel BuildRequires: cpio BuildRequires: libconfig-devel -BuildRequires: xz-devel %if !0%{?rhel} BuildRequires: zip BuildRequires: unzip @@ -1068,6 +1067,10 @@ rm ocaml/html/.gitignore %changelog +* Wed Jun 11 2025 Richard W.M. Jones - 1:1.56.0-1 +- New upstream stable version 1.56.0 +- Remove BR xz-devel as it is not needed. + * Fri Jun 06 2025 Python Maint - 1:1.55.14-2 - Rebuilt for Python 3.14 diff --git a/sources b/sources index 0d433cc..283bfab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.55.14.tar.gz) = 2830d9dca02f2dce654c2f9a09c4511e34862ee26d8c9823cf001ae159194e278f104da6b1b7d2c6ed23dfb8c6d24bf4324f4d81cf0d6b6d0403f4746dbe4266 -SHA512 (libguestfs-1.55.14.tar.gz.sig) = 304cfaf4cc449968fc5b4fcb85b2be9d16abbc6f8fefec82394e963e0e265038b0583fd0595893029794136321f8a9b7e0bd659980b00199c490ff75275dbb9a +SHA512 (libguestfs-1.56.0.tar.gz) = 2aae2a4222680000ff06954adf074825e2f6ef182694d84b3e0f39ba4b2e942b3a214f438f937341fd5c72be67620d97330639739720cde6312502fc81d868ae +SHA512 (libguestfs-1.56.0.tar.gz.sig) = 481ec244a787ea19343ee4b7e6820d5273b483a0c1e29b934a7608e9efefae9562db5fd6d33d6bf76997de4eeeff966e6d33a3873ecaee8432150b5a9d86d8f3 From c399a6571dfa3ec7b2cb2dc32c04042c9635ad47 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 11 Jun 2025 22:55:44 +0100 Subject: [PATCH 34/62] Add upstream patch to fix ACPI --- ...-Enable-ACPI-for-the-libvirt-backend.patch | 42 +++++++++++++++++++ libguestfs.spec | 3 ++ 2 files changed, 45 insertions(+) create mode 100644 0001-lib-Enable-ACPI-for-the-libvirt-backend.patch diff --git a/0001-lib-Enable-ACPI-for-the-libvirt-backend.patch b/0001-lib-Enable-ACPI-for-the-libvirt-backend.patch new file mode 100644 index 0000000..e4186d8 --- /dev/null +++ b/0001-lib-Enable-ACPI-for-the-libvirt-backend.patch @@ -0,0 +1,42 @@ +From 7cf0ed750ef7119503fc72cb19c29a269a893e8e Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 11 Jun 2025 22:45:51 +0100 +Subject: [PATCH] lib: Enable ACPI for the libvirt backend + +Many years ago we used to pass acpi=off on the Linux kernel command +line. In commit db1f811b2 we stopped doing that (around 2016). +However unless you also use: + + + + + +then it turns out that libvirt disables ACPI generation at the qemu +level. None of this mattered until SeaBIOS 1.17 changed its +behaviour, causing ACPI to be required for virtio devices to work. + +Updates: commit db1f811b29b055625ae1b03cf0daa9fed0d443ac +Related: https://bugzilla.redhat.com/show_bug.cgi?id=2372329 +Thanks: Gerd Hoffmann +--- + lib/launch-libvirt.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c +index aa9534c68..40b57f7ca 100644 +--- a/lib/launch-libvirt.c ++++ b/lib/launch-libvirt.c +@@ -1175,6 +1175,10 @@ construct_libvirt_xml_cpu (guestfs_h *g, + + single_element_format ("vcpu", "%d", g->smp); + ++ start_element ("features") { ++ empty_element ("acpi"); ++ } end_element (); ++ + start_element ("clock") { + attribute ("offset", "utc"); + +-- +2.49.0 + diff --git a/libguestfs.spec b/libguestfs.spec index ca1356a..94fb1db 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -79,6 +79,9 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh +# Upstream patch, fixing ACPI. +Patch: 0001-lib-Enable-ACPI-for-the-libvirt-backend.patch + BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. From aa5924b4a3dadd328f62b77776a66adf170b9e75 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 12 Jun 2025 08:14:17 +0100 Subject: [PATCH 35/62] Further upstream patch for ACPI https://bugzilla.redhat.com/show_bug.cgi?id=2372329 --- ...-Enable-ACPI-for-the-libvirt-backend.patch | 2 +- ...-ACPI-feature-flag-conditional-on-x8.patch | 36 +++++++++++++++++++ libguestfs.spec | 1 + 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0002-lib-Make-libvirt-ACPI-feature-flag-conditional-on-x8.patch diff --git a/0001-lib-Enable-ACPI-for-the-libvirt-backend.patch b/0001-lib-Enable-ACPI-for-the-libvirt-backend.patch index e4186d8..3908759 100644 --- a/0001-lib-Enable-ACPI-for-the-libvirt-backend.patch +++ b/0001-lib-Enable-ACPI-for-the-libvirt-backend.patch @@ -1,7 +1,7 @@ From 7cf0ed750ef7119503fc72cb19c29a269a893e8e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 11 Jun 2025 22:45:51 +0100 -Subject: [PATCH] lib: Enable ACPI for the libvirt backend +Subject: [PATCH 1/2] lib: Enable ACPI for the libvirt backend Many years ago we used to pass acpi=off on the Linux kernel command line. In commit db1f811b2 we stopped doing that (around 2016). diff --git a/0002-lib-Make-libvirt-ACPI-feature-flag-conditional-on-x8.patch b/0002-lib-Make-libvirt-ACPI-feature-flag-conditional-on-x8.patch new file mode 100644 index 0000000..8adee47 --- /dev/null +++ b/0002-lib-Make-libvirt-ACPI-feature-flag-conditional-on-x8.patch @@ -0,0 +1,36 @@ +From f6fe0611a8980694b8e4e33b9c824805d353679f Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 12 Jun 2025 08:11:56 +0100 +Subject: [PATCH 2/2] lib: Make libvirt ACPI feature flag conditional on x86 or + Arm + +On ppc64 and s390x it failed with an error like: + + unsupported configuration: machine type 'pseries-10.0' does not support ACPI + +Updates: commit 7cf0ed750ef7119503fc72cb19c29a269a893e8e +Related: https://bugzilla.redhat.com/show_bug.cgi?id=2372329 +--- + lib/launch-libvirt.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c +index 40b57f7ca..55a4ad41c 100644 +--- a/lib/launch-libvirt.c ++++ b/lib/launch-libvirt.c +@@ -1175,9 +1175,12 @@ construct_libvirt_xml_cpu (guestfs_h *g, + + single_element_format ("vcpu", "%d", g->smp); + ++#if defined(__i386__) || defined(__x86_64__) || \ ++ defined(__arm__) || defined(__aarch64__) + start_element ("features") { + empty_element ("acpi"); + } end_element (); ++#endif + + start_element ("clock") { + attribute ("offset", "utc"); +-- +2.49.0 + diff --git a/libguestfs.spec b/libguestfs.spec index 94fb1db..8eaf5ca 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -81,6 +81,7 @@ Source8: copy-patches.sh # Upstream patch, fixing ACPI. Patch: 0001-lib-Enable-ACPI-for-the-libvirt-backend.patch +Patch: 0002-lib-Make-libvirt-ACPI-feature-flag-conditional-on-x8.patch BuildRequires: autoconf, automake, libtool, gettext-devel From 091dfaf12e910b2266c7e7fa18822957235ef4d7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 16 Jun 2025 16:57:46 +0100 Subject: [PATCH 36/62] New upstream stable version 1.56.1 Remove upstream ACPI / seabios fixes included in this version. --- ...-Enable-ACPI-for-the-libvirt-backend.patch | 42 ------------------- ...-ACPI-feature-flag-conditional-on-x8.patch | 36 ---------------- libguestfs.spec | 10 ++--- 3 files changed, 5 insertions(+), 83 deletions(-) delete mode 100644 0001-lib-Enable-ACPI-for-the-libvirt-backend.patch delete mode 100644 0002-lib-Make-libvirt-ACPI-feature-flag-conditional-on-x8.patch diff --git a/0001-lib-Enable-ACPI-for-the-libvirt-backend.patch b/0001-lib-Enable-ACPI-for-the-libvirt-backend.patch deleted file mode 100644 index 3908759..0000000 --- a/0001-lib-Enable-ACPI-for-the-libvirt-backend.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7cf0ed750ef7119503fc72cb19c29a269a893e8e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 11 Jun 2025 22:45:51 +0100 -Subject: [PATCH 1/2] lib: Enable ACPI for the libvirt backend - -Many years ago we used to pass acpi=off on the Linux kernel command -line. In commit db1f811b2 we stopped doing that (around 2016). -However unless you also use: - - - - - -then it turns out that libvirt disables ACPI generation at the qemu -level. None of this mattered until SeaBIOS 1.17 changed its -behaviour, causing ACPI to be required for virtio devices to work. - -Updates: commit db1f811b29b055625ae1b03cf0daa9fed0d443ac -Related: https://bugzilla.redhat.com/show_bug.cgi?id=2372329 -Thanks: Gerd Hoffmann ---- - lib/launch-libvirt.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c -index aa9534c68..40b57f7ca 100644 ---- a/lib/launch-libvirt.c -+++ b/lib/launch-libvirt.c -@@ -1175,6 +1175,10 @@ construct_libvirt_xml_cpu (guestfs_h *g, - - single_element_format ("vcpu", "%d", g->smp); - -+ start_element ("features") { -+ empty_element ("acpi"); -+ } end_element (); -+ - start_element ("clock") { - attribute ("offset", "utc"); - --- -2.49.0 - diff --git a/0002-lib-Make-libvirt-ACPI-feature-flag-conditional-on-x8.patch b/0002-lib-Make-libvirt-ACPI-feature-flag-conditional-on-x8.patch deleted file mode 100644 index 8adee47..0000000 --- a/0002-lib-Make-libvirt-ACPI-feature-flag-conditional-on-x8.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f6fe0611a8980694b8e4e33b9c824805d353679f Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 12 Jun 2025 08:11:56 +0100 -Subject: [PATCH 2/2] lib: Make libvirt ACPI feature flag conditional on x86 or - Arm - -On ppc64 and s390x it failed with an error like: - - unsupported configuration: machine type 'pseries-10.0' does not support ACPI - -Updates: commit 7cf0ed750ef7119503fc72cb19c29a269a893e8e -Related: https://bugzilla.redhat.com/show_bug.cgi?id=2372329 ---- - lib/launch-libvirt.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c -index 40b57f7ca..55a4ad41c 100644 ---- a/lib/launch-libvirt.c -+++ b/lib/launch-libvirt.c -@@ -1175,9 +1175,12 @@ construct_libvirt_xml_cpu (guestfs_h *g, - - single_element_format ("vcpu", "%d", g->smp); - -+#if defined(__i386__) || defined(__x86_64__) || \ -+ defined(__arm__) || defined(__aarch64__) - start_element ("features") { - empty_element ("acpi"); - } end_element (); -+#endif - - start_element ("clock") { - attribute ("offset", "utc"); --- -2.49.0 - diff --git a/libguestfs.spec b/libguestfs.spec index 8eaf5ca..a093d15 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -44,7 +44,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.56.0 +Version: 1.56.1 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -79,10 +79,6 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh -# Upstream patch, fixing ACPI. -Patch: 0001-lib-Enable-ACPI-for-the-libvirt-backend.patch -Patch: 0002-lib-Make-libvirt-ACPI-feature-flag-conditional-on-x8.patch - BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. @@ -1071,6 +1067,10 @@ rm ocaml/html/.gitignore %changelog +* Mon Jun 16 2025 Richard W.M. Jones - 1:1.56.1-1 +- New upstream stable version 1.56.1 +- Remove upstream ACPI / seabios fixes included in this version. + * Wed Jun 11 2025 Richard W.M. Jones - 1:1.56.0-1 - New upstream stable version 1.56.0 - Remove BR xz-devel as it is not needed. From 5bc9c98e58eacdba7f648b65e1a4d7c18929a866 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 16 Jun 2025 16:59:45 +0100 Subject: [PATCH 37/62] Forgot to upload sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 283bfab..046d6b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.56.0.tar.gz) = 2aae2a4222680000ff06954adf074825e2f6ef182694d84b3e0f39ba4b2e942b3a214f438f937341fd5c72be67620d97330639739720cde6312502fc81d868ae -SHA512 (libguestfs-1.56.0.tar.gz.sig) = 481ec244a787ea19343ee4b7e6820d5273b483a0c1e29b934a7608e9efefae9562db5fd6d33d6bf76997de4eeeff966e6d33a3873ecaee8432150b5a9d86d8f3 +SHA512 (libguestfs-1.56.1.tar.gz) = 8ec8db8b3de7471c7ab77161fa98349d7b6f88a803ab563f1859606a2ef55737f323b1cf3ef2ebb3055770f4140aabb056f97099ef76fa7ad0f7bd792cc699fc +SHA512 (libguestfs-1.56.1.tar.gz.sig) = 80fcdf73e8a4b453e96b40b8a29d91dcad0418865d8472300f5e1d972f849b0d2cfd0e204bb20b79285471756c9180f259dc4aa10c56cfdf7153ffb1ef646036 From 712bdd9c94ffef40da1152a78138584835cb1fcf Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 16:01:36 +0200 Subject: [PATCH 38/62] Perl 5.42 rebuild --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index a093d15..35d5e98 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -45,7 +45,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.56.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1067,6 +1067,9 @@ rm ocaml/html/.gitignore %changelog +* Mon Jul 07 2025 Jitka Plesnikova - 1:1.56.1-2 +- Perl 5.42 rebuild + * Mon Jun 16 2025 Richard W.M. Jones - 1:1.56.1-1 - New upstream stable version 1.56.1 - Remove upstream ACPI / seabios fixes included in this version. From 17b450096e794849433d4502756a539f642404e8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 12 Jul 2025 13:13:15 -0600 Subject: [PATCH 39/62] Rebuild to fix OCaml dependencies --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 35d5e98..56d7c70 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -45,7 +45,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.56.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1067,6 +1067,9 @@ rm ocaml/html/.gitignore %changelog +* Sat Jul 12 2025 Jerry James - 1:1.56.1-3 +- Rebuild to fix OCaml dependencies + * Mon Jul 07 2025 Jitka Plesnikova - 1:1.56.1-2 - Perl 5.42 rebuild From e602e8ba97e0d15e4540906ac1a8cef13d728683 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:46:01 +0000 Subject: [PATCH 40/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 56d7c70..c73d72c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -45,7 +45,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.56.1 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1067,6 +1067,9 @@ rm ocaml/html/.gitignore %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1:1.56.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jul 12 2025 Jerry James - 1:1.56.1-3 - Rebuild to fix OCaml dependencies From ad9f3a5f157429e8205521a8bed0f7215580e1a9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 13 Aug 2025 17:12:57 +0100 Subject: [PATCH 41/62] New upstream development version 1.57.1 --- libguestfs.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index c73d72c..f17dfbc 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -33,7 +33,7 @@ ExcludeArch: %{ix86} %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.56-stable +%global source_directory 1.57-development # Filter perl provides. %{?perl_default_filter} @@ -44,8 +44,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.56.1 -Release: 4%{?dist} +Version: 1.57.1 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1067,6 +1067,9 @@ rm ocaml/html/.gitignore %changelog +* Wed Aug 13 2025 Richard W.M. Jones - 1:1.57.1-1 +- New upstream development version 1.57.1 + * Thu Jul 24 2025 Fedora Release Engineering - 1:1.56.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 046d6b3..7bd905b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.56.1.tar.gz) = 8ec8db8b3de7471c7ab77161fa98349d7b6f88a803ab563f1859606a2ef55737f323b1cf3ef2ebb3055770f4140aabb056f97099ef76fa7ad0f7bd792cc699fc -SHA512 (libguestfs-1.56.1.tar.gz.sig) = 80fcdf73e8a4b453e96b40b8a29d91dcad0418865d8472300f5e1d972f849b0d2cfd0e204bb20b79285471756c9180f259dc4aa10c56cfdf7153ffb1ef646036 +SHA512 (libguestfs-1.57.1.tar.gz) = 11aa4afc6ccfdf63af3afdebccf650a2ad4b378d1c89287b6c29303100041f2be120f12b9c4f4084f492b3584c55b56864756ba159413bd5955b09a176270309 +SHA512 (libguestfs-1.57.1.tar.gz.sig) = 47b0192c651c990b9eb9423a39a88750ff246af4a562a2e276653508e224288b083d802d8dbe154f5c69d8d05bec2b3719241ad0b9f88f9aa88620fa14fc430d From c5c2923895e982888675719be18075f1940139d6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 15 Aug 2025 10:58:57 +0100 Subject: [PATCH 42/62] New upstream development version 1.57.2 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index f17dfbc..64504dd 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -44,7 +44,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.57.1 +Version: 1.57.2 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1067,6 +1067,9 @@ rm ocaml/html/.gitignore %changelog +* Fri Aug 15 2025 Richard W.M. Jones - 1:1.57.2-1 +- New upstream development version 1.57.2 + * Wed Aug 13 2025 Richard W.M. Jones - 1:1.57.1-1 - New upstream development version 1.57.1 diff --git a/sources b/sources index 7bd905b..91132ae 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.57.1.tar.gz) = 11aa4afc6ccfdf63af3afdebccf650a2ad4b378d1c89287b6c29303100041f2be120f12b9c4f4084f492b3584c55b56864756ba159413bd5955b09a176270309 -SHA512 (libguestfs-1.57.1.tar.gz.sig) = 47b0192c651c990b9eb9423a39a88750ff246af4a562a2e276653508e224288b083d802d8dbe154f5c69d8d05bec2b3719241ad0b9f88f9aa88620fa14fc430d +SHA512 (libguestfs-1.57.2.tar.gz) = 3a63c218a755afbc824c158fd9999f75d1b2b4bc2c9b312eaf114414d1694ee5512a43ef806a5720eca83662f7203c5727a802721bc0bc77274e8b5362324fca +SHA512 (libguestfs-1.57.2.tar.gz.sig) = 660c5ad78b2a1c3066a02445e39eaf894b673afd840d25fe2920514152c20d2b2e7e34a10a0dcaec575ac8ddde9632952fb8fbbad3a99d9aea1b077ba90004e7 From 9eeb0986a8fc776b0b44930e73e7204a8066b1b7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:55:58 +0200 Subject: [PATCH 43/62] Rebuilt for Python 3.14.0rc2 bytecode --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 64504dd..23d6cf9 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -45,7 +45,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.57.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1067,6 +1067,9 @@ rm ocaml/html/.gitignore %changelog +* Fri Aug 15 2025 Python Maint - 1:1.57.2-2 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Aug 15 2025 Richard W.M. Jones - 1:1.57.2-1 - New upstream development version 1.57.2 From 82cadaec7f6d6745b358d6885e834ce232de92b1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 12:50:51 +0100 Subject: [PATCH 44/62] Unify Fedora and RHEL 10.2 spec files --- libguestfs.spec | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 23d6cf9..0a4ba6f 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -13,17 +13,10 @@ ExcludeArch: %{ix86} # we only do a sanity check that kernel/qemu/libvirt/appliance is not # broken. To perform the full test suite, see instructions here: # https://www.redhat.com/archives/libguestfs/2015-September/msg00078.html -%if !0%{?rhel} #%%global test_arches aarch64 %%{power64} s390x x86_64 # aarch64 broken in Rawhide: # https://gitlab.com/libvirt/libvirt/-/issues/762 %global test_arches %{power64} s390x x86_64 -%else -# RHEL 9 only: -# x86-64: "/lib64/libc.so.6: CPU ISA level is lower than required" -# (RHBZ#1919389) -%global test_arches NONE -%endif # Trim older changelog entries. # https://lists.fedoraproject.org/pipermail/devel/2013-April/thread.html#181627 @@ -127,7 +120,10 @@ BuildRequires: libldm-devel %endif BuildRequires: json-c-devel BuildRequires: systemd-devel +BuildRequires: bash-completion +%if !0%{?rhel} BuildRequires: bash-completion-devel +%endif BuildRequires: /usr/bin/ping BuildRequires: curl BuildRequires: xz @@ -951,6 +947,7 @@ rm ocaml/html/.gitignore %files bash-completion +%if !0%{?rhel} %dir %{bash_completions_dir} %{bash_completions_dir}/guestfish %{bash_completions_dir}/guestmount @@ -961,6 +958,18 @@ rm ocaml/html/.gitignore %{bash_completions_dir}/virt-rescue %{bash_completions_dir}/virt-tar-in %{bash_completions_dir}/virt-tar-out +%else +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/guestfish +%{_datadir}/bash-completion/completions/guestmount +%{_datadir}/bash-completion/completions/guestunmount +%{_datadir}/bash-completion/completions/libguestfs-test-tool +%{_datadir}/bash-completion/completions/virt-copy-in +%{_datadir}/bash-completion/completions/virt-copy-out +%{_datadir}/bash-completion/completions/virt-rescue +%{_datadir}/bash-completion/completions/virt-tar-in +%{_datadir}/bash-completion/completions/virt-tar-out +%endif %files -n ocaml-%{name} From 6fa34707b2d0729ac2d12c4580eb4c479d67fe6d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Sep 2025 19:17:48 +0100 Subject: [PATCH 45/62] New upstream development version 1.57.3 --- libguestfs.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 0a4ba6f..0e35b36 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -37,8 +37,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.57.2 -Release: 2%{?dist} +Version: 1.57.3 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1076,6 +1076,9 @@ rm ocaml/html/.gitignore %changelog +* Tue Sep 09 2025 Richard W.M. Jones - 1:1.57.3-1 +- New upstream development version 1.57.3 + * Fri Aug 15 2025 Python Maint - 1:1.57.2-2 - Rebuilt for Python 3.14.0rc2 bytecode diff --git a/sources b/sources index 91132ae..40d0b27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.57.2.tar.gz) = 3a63c218a755afbc824c158fd9999f75d1b2b4bc2c9b312eaf114414d1694ee5512a43ef806a5720eca83662f7203c5727a802721bc0bc77274e8b5362324fca -SHA512 (libguestfs-1.57.2.tar.gz.sig) = 660c5ad78b2a1c3066a02445e39eaf894b673afd840d25fe2920514152c20d2b2e7e34a10a0dcaec575ac8ddde9632952fb8fbbad3a99d9aea1b077ba90004e7 +SHA512 (libguestfs-1.57.3.tar.gz) = 09e0297c9ad47ca322c74f65eef6056dee140e6a625ab7bdd26ea76a9b1483288897ceaf24deff9c1373aa8dd791ce875261c5e07db14dc59a9c2a042ec99227 +SHA512 (libguestfs-1.57.3.tar.gz.sig) = c2c30b7728284156cc2ace79ce1f2eeb0b7d37064d09067033b0c4a2d3befac5e540eb1c436e41e1799f3133ab0c410d612312d66c66f237c4c7896b8a7a6cf6 From 83dda87efe69aaab5ecde0d1e07822bc76c20c34 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:26:34 +0200 Subject: [PATCH 46/62] Rebuilt for Python 3.14.0rc3 bytecode --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 0e35b36..fc92276 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -38,7 +38,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.57.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1076,6 +1076,9 @@ rm ocaml/html/.gitignore %changelog +* Fri Sep 19 2025 Python Maint - 1:1.57.3-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Tue Sep 09 2025 Richard W.M. Jones - 1:1.57.3-1 - New upstream development version 1.57.3 From af1ea247c4a71bde1e4449ba45d27918a68ce125 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 18 Sep 2025 12:26:32 -0400 Subject: [PATCH 47/62] Fix bash-completion conditional ELN (the future RHEL 11) tracks rawhide and therefore also has bash-completion-devel and the %bash_completions_dir macro. --- libguestfs.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index fc92276..f482ed7 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -121,7 +121,7 @@ BuildRequires: libldm-devel BuildRequires: json-c-devel BuildRequires: systemd-devel BuildRequires: bash-completion -%if !0%{?rhel} +%if 0%{?fedora} || 0%{?rhel} >= 11 BuildRequires: bash-completion-devel %endif BuildRequires: /usr/bin/ping @@ -947,7 +947,7 @@ rm ocaml/html/.gitignore %files bash-completion -%if !0%{?rhel} +%if 0%{?fedora} || 0%{?rhel} >= 11 %dir %{bash_completions_dir} %{bash_completions_dir}/guestfish %{bash_completions_dir}/guestmount From 10655b63e04e6c4f5ab5cf6ee781a2a1fd208208 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2025 09:49:21 +0100 Subject: [PATCH 48/62] Enable aarch64 tests The libvirt bug is now fixed. Thanks: Cole Robinson --- libguestfs.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index f482ed7..89dcd5c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -13,10 +13,7 @@ ExcludeArch: %{ix86} # we only do a sanity check that kernel/qemu/libvirt/appliance is not # broken. To perform the full test suite, see instructions here: # https://www.redhat.com/archives/libguestfs/2015-September/msg00078.html -#%%global test_arches aarch64 %%{power64} s390x x86_64 -# aarch64 broken in Rawhide: -# https://gitlab.com/libvirt/libvirt/-/issues/762 -%global test_arches %{power64} s390x x86_64 +%global test_arches aarch64 %%{power64} s390x x86_64 # Trim older changelog entries. # https://lists.fedoraproject.org/pipermail/devel/2013-April/thread.html#181627 From 9cb066543f52591aa1c036d7888d1d31637ae0f7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2025 09:50:43 +0100 Subject: [PATCH 49/62] New upstream development version 1.57.4 --- libguestfs.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 89dcd5c..3e94b99 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -34,8 +34,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.57.3 -Release: 2%{?dist} +Version: 1.57.4 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1073,6 +1073,10 @@ rm ocaml/html/.gitignore %changelog +* Tue Sep 30 2025 Richard W.M. Jones - 1:1.57.4-1 +- New upstream development version 1.57.4 +- Enable aarch64 tests + * Fri Sep 19 2025 Python Maint - 1:1.57.3-2 - Rebuilt for Python 3.14.0rc3 bytecode diff --git a/sources b/sources index 40d0b27..98b9840 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.57.3.tar.gz) = 09e0297c9ad47ca322c74f65eef6056dee140e6a625ab7bdd26ea76a9b1483288897ceaf24deff9c1373aa8dd791ce875261c5e07db14dc59a9c2a042ec99227 -SHA512 (libguestfs-1.57.3.tar.gz.sig) = c2c30b7728284156cc2ace79ce1f2eeb0b7d37064d09067033b0c4a2d3befac5e540eb1c436e41e1799f3133ab0c410d612312d66c66f237c4c7896b8a7a6cf6 +SHA512 (libguestfs-1.57.4.tar.gz) = 8f856323536866a0c000299bdce7de89bb66773f948943654e39dce37aee9359c486c626b9a1190bb4b44a53d70f76a86130363c285c9a2bfa504da1e470613d +SHA512 (libguestfs-1.57.4.tar.gz.sig) = bd83857dc81611e42edef8ec718a57399ecd9464479f4c5bc7b0dfe49a212a6428b098a835a49f54d47c3711bdbe0272c1ebc68c351733fdce608c82fe82a896 From 877a247a542c0385859cea868becbc4578008e08 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 19:38:00 +0100 Subject: [PATCH 50/62] OCaml 5.4.0 rebuild --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 3e94b99..f22e736 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -35,7 +35,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.57.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1073,6 +1073,9 @@ rm ocaml/html/.gitignore %changelog +* Mon Oct 13 2025 Richard W.M. Jones - 1:1.57.4-2 +- OCaml 5.4.0 rebuild + * Tue Sep 30 2025 Richard W.M. Jones - 1:1.57.4-1 - New upstream development version 1.57.4 - Enable aarch64 tests From 90bb4d2bafd39a9c7d383fa0d4760ce04a2e6104 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Oct 2025 08:32:40 +0200 Subject: [PATCH 51/62] rebuild for https://fedoraproject.org/wiki/Changes/php85 --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index f22e736..241a638 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -35,7 +35,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.57.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1073,6 +1073,9 @@ rm ocaml/html/.gitignore %changelog +* Wed Oct 15 2025 Remi Collet - 1:1.57.4-3 +- rebuild for https://fedoraproject.org/wiki/Changes/php85 + * Mon Oct 13 2025 Richard W.M. Jones - 1:1.57.4-2 - OCaml 5.4.0 rebuild From 1edc00676a6e26c1a062f302f966d0bef0cb4301 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 15 Oct 2025 12:04:09 +0100 Subject: [PATCH 52/62] Require passt https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/YDHKKQSDURTMSKSN6GW3QGQI43DTFXNH/ --- libguestfs.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 241a638..eecabc7 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -35,7 +35,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.57.4 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -305,7 +305,7 @@ Recommends: libvirt-daemon-config-network Requires: libvirt-daemon-driver-qemu >= 7.1.0 Requires: libvirt-daemon-driver-secret Requires: libvirt-daemon-driver-storage-core -Recommends: passt +Requires: passt Requires: (selinux-policy >= 3.11.1-63 if selinux-policy) %ifarch aarch64 @@ -1073,6 +1073,10 @@ rm ocaml/html/.gitignore %changelog +* Wed Oct 15 2025 Richard W.M. Jones - 1:1.57.4-4 +- Require passt +- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/YDHKKQSDURTMSKSN6GW3QGQI43DTFXNH/ + * Wed Oct 15 2025 Remi Collet - 1:1.57.4-3 - rebuild for https://fedoraproject.org/wiki/Changes/php85 From 737237a79ef195fd5cedd1157c1743aacba7289e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 17 Oct 2025 10:11:17 +0100 Subject: [PATCH 53/62] Test the direct backend in %check --- libguestfs.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libguestfs.spec b/libguestfs.spec index eecabc7..7626bee 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -753,6 +753,15 @@ if ! make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then cat $HOME/.cache/libvirt/qemu/log/* exit 1 fi + +# As libvirt is the default backend, test that the direct backend +# works too. It's a good place to get test coverage across all the +# architectures. +if ! LIBGUESTFS_BACKEND=direct \ + make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then + cat $HOME/.cache/libvirt/qemu/log/* + exit 1 +fi %endif From 1084cf6b179e7b86b44f5003aa4b7ec853e1d7ef Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 17 Oct 2025 11:07:52 +0100 Subject: [PATCH 54/62] New upstream development version 1.57.5 Test direct backend in %check --- libguestfs.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 7626bee..c0c91bc 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -34,8 +34,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.57.4 -Release: 4%{?dist} +Version: 1.57.5 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1082,6 +1082,10 @@ rm ocaml/html/.gitignore %changelog +* Fri Oct 17 2025 Richard W.M. Jones - 1:1.57.5-1 +- New upstream development version 1.57.5 +- Test direct backend in %%check + * Wed Oct 15 2025 Richard W.M. Jones - 1:1.57.4-4 - Require passt - https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/YDHKKQSDURTMSKSN6GW3QGQI43DTFXNH/ diff --git a/sources b/sources index 98b9840..9ed7f34 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.57.4.tar.gz) = 8f856323536866a0c000299bdce7de89bb66773f948943654e39dce37aee9359c486c626b9a1190bb4b44a53d70f76a86130363c285c9a2bfa504da1e470613d -SHA512 (libguestfs-1.57.4.tar.gz.sig) = bd83857dc81611e42edef8ec718a57399ecd9464479f4c5bc7b0dfe49a212a6428b098a835a49f54d47c3711bdbe0272c1ebc68c351733fdce608c82fe82a896 +SHA512 (libguestfs-1.57.5.tar.gz) = b8db1a16984db602dcee0b02386fbdbe7d06636da3934cccceca8b1907cff6c7cf38a87450acc856ff2b3eb1ee620cbb7d12144b6a51712d96bc136f5b8774a7 +SHA512 (libguestfs-1.57.5.tar.gz.sig) = c87208a79786cce2048abc79f2afbfd200b936ce142d50afccf777390735c74273bb5d19cc3dd700415d856a6b75998d11271157d681721772c612a217498bf9 From e7046fe55bc2dc7e7e7bf3c88eabedd1cee7ed80 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 4 Nov 2025 16:23:38 +0000 Subject: [PATCH 55/62] New upstream development version 1.57.6 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index c0c91bc..7d5b49b 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -34,7 +34,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.57.5 +Version: 1.57.6 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1082,6 +1082,9 @@ rm ocaml/html/.gitignore %changelog +* Tue Nov 04 2025 Richard W.M. Jones - 1:1.57.6-1 +- New upstream development version 1.57.6 + * Fri Oct 17 2025 Richard W.M. Jones - 1:1.57.5-1 - New upstream development version 1.57.5 - Test direct backend in %%check diff --git a/sources b/sources index 9ed7f34..3845e6b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.57.5.tar.gz) = b8db1a16984db602dcee0b02386fbdbe7d06636da3934cccceca8b1907cff6c7cf38a87450acc856ff2b3eb1ee620cbb7d12144b6a51712d96bc136f5b8774a7 -SHA512 (libguestfs-1.57.5.tar.gz.sig) = c87208a79786cce2048abc79f2afbfd200b936ce142d50afccf777390735c74273bb5d19cc3dd700415d856a6b75998d11271157d681721772c612a217498bf9 +SHA512 (libguestfs-1.57.6.tar.gz) = 35bd4e446a1126ff4fbe0aa1b5c6292a3dd474a0c1e34a6fbc0cedfc6dfad29b0b5610ab60b1dc73e21065da932c202189b106648c8b5743f9a8a9365b731d14 +SHA512 (libguestfs-1.57.6.tar.gz.sig) = cc865542c9bc9c97d2ea98d66f2b11e57d46d5d04026e2770a385ac6ba8a77fe83a25cbd2d1b2a10688c153b1d832b78080d28711622c19ea546f6c50f5ab9fa From 3ac14b503cbd06ae925083870ff929d2a34b50c3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Dec 2025 17:00:02 +0000 Subject: [PATCH 56/62] New upstream development version 1.57.7 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 7d5b49b..bb758ae 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -34,7 +34,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.57.6 +Version: 1.57.7 Release: 1%{?dist} License: LGPL-2.1-or-later @@ -1082,6 +1082,9 @@ rm ocaml/html/.gitignore %changelog +* Thu Dec 04 2025 Richard W.M. Jones - 1:1.57.7-1 +- New upstream development version 1.57.7 + * Tue Nov 04 2025 Richard W.M. Jones - 1:1.57.6-1 - New upstream development version 1.57.6 diff --git a/sources b/sources index 3845e6b..46d190f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.57.6.tar.gz) = 35bd4e446a1126ff4fbe0aa1b5c6292a3dd474a0c1e34a6fbc0cedfc6dfad29b0b5610ab60b1dc73e21065da932c202189b106648c8b5743f9a8a9365b731d14 -SHA512 (libguestfs-1.57.6.tar.gz.sig) = cc865542c9bc9c97d2ea98d66f2b11e57d46d5d04026e2770a385ac6ba8a77fe83a25cbd2d1b2a10688c153b1d832b78080d28711622c19ea546f6c50f5ab9fa +SHA512 (libguestfs-1.57.7.tar.gz) = edeafef8f8c11dd2ced85cd723a817d3696ce6b71441467b03645f335392fbc8f3a73a9fb8cd6b5a352055788228eedc14889fadf0c03ad8162ab775ca78a76d +SHA512 (libguestfs-1.57.7.tar.gz.sig) = b33f657439cf65ebc1ccd7f79f9db7a9e793c751282f7ca0b0fe026082d621a6df25b2af2c8d3560defd38584e0199ce1a34bbd723178302ce822fb49e5c431f From 12272cf017288df61859d4059e7a434adabdf087 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Wed, 17 Dec 2025 13:40:57 -0500 Subject: [PATCH 57/62] rebuild for new libconfig --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index bb758ae..47ac041 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -35,7 +35,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.57.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1082,6 +1082,9 @@ rm ocaml/html/.gitignore %changelog +* Wed Dec 17 2025 Tom Callaway - 1:1.57.7-2 +- rebuild for new libconfig + * Thu Dec 04 2025 Richard W.M. Jones - 1:1.57.7-1 - New upstream development version 1.57.7 From bba1b606eadfaf91cdc3545adb39c28b14bb0b68 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 5 Nov 2025 10:33:28 +0000 Subject: [PATCH 58/62] Fix double-% in macro --- libguestfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 47ac041..c1cbe86 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -13,7 +13,7 @@ ExcludeArch: %{ix86} # we only do a sanity check that kernel/qemu/libvirt/appliance is not # broken. To perform the full test suite, see instructions here: # https://www.redhat.com/archives/libguestfs/2015-September/msg00078.html -%global test_arches aarch64 %%{power64} s390x x86_64 +%global test_arches aarch64 %{power64} s390x x86_64 # Trim older changelog entries. # https://lists.fedoraproject.org/pipermail/devel/2013-April/thread.html#181627 From 8c9c0123024d4861a93db70ce36f7e85fbcf071e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 5 Jan 2026 16:14:55 +0000 Subject: [PATCH 59/62] New upstream development version 1.58.0 Require libvirt >= 11.10.0, qemu >= 7.2.0 and passt. --- libguestfs.spec | 22 +++++++++++++--------- sources | 4 ++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index c1cbe86..4226402 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -23,7 +23,7 @@ ExcludeArch: %{ix86} %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.57-development +%global source_directory 1.58-stable # Filter perl provides. %{?perl_default_filter} @@ -34,8 +34,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.57.7 -Release: 2%{?dist} +Version: 1.58.0 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -94,7 +94,7 @@ BuildRequires: libselinux-utils BuildRequires: libselinux-devel BuildRequires: fuse, fuse-devel BuildRequires: pcre2-devel -BuildRequires: libvirt-devel +BuildRequires: libvirt-devel >= 11.10.0 BuildRequires: gperf BuildRequires: rpm-devel BuildRequires: cpio @@ -106,7 +106,7 @@ BuildRequires: unzip BuildRequires: systemd-units BuildRequires: netpbm-progs BuildRequires: icoutils -BuildRequires: libvirt-daemon-kvm >= 7.1.0 +BuildRequires: libvirt-daemon-kvm %if !0%{?rhel} BuildRequires: perl(Expect) %endif @@ -126,7 +126,7 @@ BuildRequires: curl BuildRequires: xz BuildRequires: zstd BuildRequires: libzstd-devel -BuildRequires: /usr/bin/qemu-img +BuildRequires: qemu-img >= 7.2.0 %if 0%{verify_tarball_signature} BuildRequires: gnupg2 @@ -283,7 +283,7 @@ Requires: systemd-libs%{?_isa} Requires: fuse # For core APIs: -Requires: /usr/bin/qemu-img +Requires: qemu-img Requires: coreutils Requires: grep Requires: tar @@ -292,7 +292,7 @@ Requires: tar Requires: xz # For qemu direct and libvirt backends. -Requires: qemu-kvm-core +Requires: qemu-kvm-core >= 7.2.0 %if !0%{?rhel} Suggests: qemu-block-curl Suggests: qemu-block-iscsi @@ -302,7 +302,7 @@ Suggests: qemu-block-rbd Suggests: qemu-block-ssh %endif Recommends: libvirt-daemon-config-network -Requires: libvirt-daemon-driver-qemu >= 7.1.0 +Requires: libvirt-daemon-driver-qemu >= 11.10.0 Requires: libvirt-daemon-driver-secret Requires: libvirt-daemon-driver-storage-core Requires: passt @@ -1082,6 +1082,10 @@ rm ocaml/html/.gitignore %changelog +* Mon Jan 05 2026 Richard W.M. Jones - 1:1.58.0-1 +- New upstream development version 1.58.0 +- Require libvirt >= 11.10.0, qemu >= 7.2.0 and passt. + * Wed Dec 17 2025 Tom Callaway - 1:1.57.7-2 - rebuild for new libconfig diff --git a/sources b/sources index 46d190f..23cf369 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.57.7.tar.gz) = edeafef8f8c11dd2ced85cd723a817d3696ce6b71441467b03645f335392fbc8f3a73a9fb8cd6b5a352055788228eedc14889fadf0c03ad8162ab775ca78a76d -SHA512 (libguestfs-1.57.7.tar.gz.sig) = b33f657439cf65ebc1ccd7f79f9db7a9e793c751282f7ca0b0fe026082d621a6df25b2af2c8d3560defd38584e0199ce1a34bbd723178302ce822fb49e5c431f +SHA512 (libguestfs-1.58.0.tar.gz) = 67abbd37fe64935ae5cca13dbe1860fe2eab9df492fd134eacbdc1831e6034c849855e76118ce0002d3ac83205122947582dbe47b66f12b94dcb51155881501a +SHA512 (libguestfs-1.58.0.tar.gz.sig) = e07758ed3901f9ae95dace16cbb4de194dbbde788155efcde7982226785928d1805af6939f201d74770923ad55997f1d465f9594cb81bc2435c0ea882ce546d8 From 895518e9b79a163625fc7fef85dc929102f45b25 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 23:04:30 +0900 Subject: [PATCH 60/62] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- libguestfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 4226402..641a90a 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -35,7 +35,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.58.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -1082,6 +1082,9 @@ rm ocaml/html/.gitignore %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 1:1.58.0-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Mon Jan 05 2026 Richard W.M. Jones - 1:1.58.0-1 - New upstream development version 1.58.0 - Require libvirt >= 11.10.0, qemu >= 7.2.0 and passt. From 7adc61bd28a6cae7a370c7b198844b14b5993738 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 23:14:08 +0900 Subject: [PATCH 61/62] Change irb BR for ruby4.0 --- libguestfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 641a90a..a311561 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -158,7 +158,7 @@ BuildRequires: rubygem-rake BuildRequires: rubygem(json) BuildRequires: rubygem(rdoc) BuildRequires: rubygem(test-unit) -BuildRequires: ruby-irb +BuildRequires: rubygem(irb) BuildRequires: php-devel BuildRequires: gobject-introspection-devel BuildRequires: gjs From 27d75aee6dcd830c12e57987c8903b321b3ec8b1 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 12 Jan 2026 15:56:46 -0700 Subject: [PATCH 62/62] Fix a changelog entry --- libguestfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index a311561..66ef8e2 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1134,7 +1134,7 @@ rm ocaml/html/.gitignore * Thu Jul 24 2025 Fedora Release Engineering - 1:1.56.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Sat Jul 12 2025 Jerry James - 1:1.56.1-3 +* Sat Jul 12 2025 Jerry James - 1:1.56.1-3 - Rebuild to fix OCaml dependencies * Mon Jul 07 2025 Jitka Plesnikova - 1:1.56.1-2