diff --git a/0004-libguestfs-Support-openEuler.patch b/0004-libguestfs-Support-openEuler.patch deleted file mode 100644 index b1c0fb3dfa5c86b7887da07d85e3751f42850ebd..0000000000000000000000000000000000000000 --- a/0004-libguestfs-Support-openEuler.patch +++ /dev/null @@ -1,134 +0,0 @@ -From ea2bbd2f9f334baee64e46cf5739368c9a266668 Mon Sep 17 00:00:00 2001 -From: Wang Guoquan -Date: Sun, 8 Sep 2024 00:03:48 +0800 -Subject: [PATCH] libguestfs: Support openEuler - -openEuler is simliar to CentOS, -but the ID is not lower-case string which doesn't meet the specifications, as below, - - NAME="openEuler" - VERSION="24.03 (LTS)" - ID="openEuler" - VERSION_ID="24.03" - PRETTY_NAME="openEuler 24.03 (LTS)" - ANSI_COLOR="0;31" - -Considering the impact on the released versions, support 'ID=openEuler' in libguestfs. - -Signed-off-by: Wang Guoquan ---- - daemon/inspect_fs.ml | 4 ++++ - daemon/inspect_fs_unix.ml | 1 + - daemon/inspect_types.ml | 2 ++ - daemon/inspect_types.mli | 1 + - generator/actions_inspection.ml | 4 ++++ - m4/guestfs-appliance.m4 | 5 +++-- - 6 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml -index 9c73d97..4ca2433 100644 ---- a/daemon/inspect_fs.ml -+++ b/daemon/inspect_fs.ml -@@ -265,6 +265,7 @@ and check_package_format { distro } = - | Some DISTRO_MANDRIVA - | Some DISTRO_MEEGO - | Some DISTRO_NEOKYLIN -+ | Some DISTRO_OPENEULER - | Some DISTRO_OPENMANDRIVA - | Some DISTRO_OPENSUSE - | Some DISTRO_ORACLE_LINUX -@@ -377,6 +378,9 @@ and check_package_management { distro; version } = - | Some DISTRO_VOID_LINUX -> - Some PACKAGE_MANAGEMENT_XBPS - -+ | Some DISTRO_OPENEULER-> -+ Some PACKAGE_MANAGEMENT_DNF -+ - | Some DISTRO_OPENMANDRIVA -> - Some PACKAGE_MANAGEMENT_DNF - -diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml -index 8045ef0..2f5bf6c 100644 ---- a/daemon/inspect_fs_unix.ml -+++ b/daemon/inspect_fs_unix.ml -@@ -151,6 +151,7 @@ and distro_of_os_release_id = function - | "kylin" -> Some DISTRO_KYLIN - | "mageia" -> Some DISTRO_MAGEIA - | "neokylin" -> Some DISTRO_NEOKYLIN -+ | "openEuler" -> Some DISTRO_OPENEULER - | "openmandriva" -> Some DISTRO_OPENMANDRIVA - | "opensuse" -> Some DISTRO_OPENSUSE - | s when String.is_prefix s "opensuse-" -> Some DISTRO_OPENSUSE -diff --git a/daemon/inspect_types.ml b/daemon/inspect_types.ml -index 9395c51..e27d9f3 100644 ---- a/daemon/inspect_types.ml -+++ b/daemon/inspect_types.ml -@@ -88,6 +88,7 @@ and distro = - | DISTRO_NEOKYLIN - | DISTRO_NETBSD - | DISTRO_OPENBSD -+ | DISTRO_OPENEULER - | DISTRO_OPENMANDRIVA - | DISTRO_OPENSUSE - | DISTRO_ORACLE_LINUX -@@ -222,6 +223,7 @@ and string_of_distro = function - | DISTRO_NEOKYLIN -> "neokylin" - | DISTRO_NETBSD -> "netbsd" - | DISTRO_OPENBSD -> "openbsd" -+ | DISTRO_OPENEULER -> "openeuler" - | DISTRO_OPENMANDRIVA -> "openmandriva" - | DISTRO_OPENSUSE -> "opensuse" - | DISTRO_ORACLE_LINUX -> "oraclelinux" -diff --git a/daemon/inspect_types.mli b/daemon/inspect_types.mli -index 29c76e8..9cf61f3 100644 ---- a/daemon/inspect_types.mli -+++ b/daemon/inspect_types.mli -@@ -95,6 +95,7 @@ and distro = - | DISTRO_NEOKYLIN - | DISTRO_NETBSD - | DISTRO_OPENBSD -+ | DISTRO_OPENEULER - | DISTRO_OPENMANDRIVA - | DISTRO_OPENSUSE - | DISTRO_ORACLE_LINUX -diff --git a/generator/actions_inspection.ml b/generator/actions_inspection.ml -index f8b7449..4721033 100644 ---- a/generator/actions_inspection.ml -+++ b/generator/actions_inspection.ml -@@ -250,6 +250,10 @@ NetBSD. - - OpenBSD. - -+=item \"openeuler\" -+ -+openEuler. -+ - =item \"openmandriva\" - - OpenMandriva Lx. -diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4 -index a371092..29770c6 100644 ---- a/m4/guestfs-appliance.m4 -+++ b/m4/guestfs-appliance.m4 -@@ -119,7 +119,8 @@ if test "x$ENABLE_APPLIANCE" = "xyes"; then - [DISTRO=REDHAT], - [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], - [ARCH | MANJARO | ARTIX],[DISTRO=ARCHLINUX], -- [OPENMANDRIVA],[DISTRO=OPENMANDRIVA]) -+ [OPENMANDRIVA],[DISTRO=OPENMANDRIVA], -+ [OPENEULER],[DISTRO=OPENEULER]) - AC_MSG_RESULT([$DISTRO (from /etc/os-release)]) - - elif test -f /etc/openEuler-release; then -@@ -150,7 +151,7 @@ if test "x$ENABLE_APPLIANCE" = "xyes"; then - AC_SUBST([DISTRO]) - fi - AM_CONDITIONAL([HAVE_RPM], -- [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true], -+ [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA | OPENEULER], [true], - [*], [false])]) - AM_CONDITIONAL([HAVE_DPKG], - [AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true], --- -2.43.0 - diff --git a/fix-not-striped.patch b/fix-not-striped.patch index 87df2ca242c36d3fc9f0908cf53c45796cd54f78..0e518ed617e8dcbbbe5e6916a9cc4970da561134 100644 --- a/fix-not-striped.patch +++ b/fix-not-striped.patch @@ -1,20 +1,24 @@ -From 77c67d0e597f5408c3d005ef624ef3d417271e0e Mon Sep 17 00:00:00 2001 +From 1c194cb8cf3b2dc5846d3bb58fa835f7ba28bd2a Mon Sep 17 00:00:00 2001 From: sunguoshuai -Date: Thu, 9 Sep 2021 21:34:40 +0800 +Date: Sun, 15 Jun 2025 00:09:19 +0800 Subject: [PATCH] fix not striped --- appliance/Makefile.am | 1 + - 1 files changed, 1 insertions(+) + 1 file changed, 1 insertion(+) -diff -ruN libguestfs/appliance/Makefile.am libguestfs-1.49.5/appliance/Makefile.am ---- libguestfs/appliance/Makefile.am 2022-11-16 02:11:11.123199053 +0800 -+++ libguestfs-1.49.5/appliance/Makefile.am 2022-11-16 02:13:36.113261902 +0800 -@@ -118,6 +118,7 @@ +diff --git a/appliance/Makefile.am b/appliance/Makefile.am +index 66d43ac..f14af5d 100644 +--- a/appliance/Makefile.am ++++ b/appliance/Makefile.am +@@ -124,6 +124,7 @@ supermin.d/daemon.tar.gz: ../daemon/guestfsd rm -rf tmp-d mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd + strip tmp-d/usr/sbin/guestfsd - ( cd tmp-d && tar zcf - * ) > $@-t + ( cd tmp-d && tar $(TAR_OPTIONS) -cf - * ) > $@-t rm -r tmp-d mv $@-t $@ +-- +2.47.1 + diff --git a/libguestfs-1.50.2.tar.gz b/libguestfs-1.56.0.tar.gz similarity index 32% rename from libguestfs-1.50.2.tar.gz rename to libguestfs-1.56.0.tar.gz index baac9d15f65ebe4c538b687683d2ebb7dc5d728d..c89eed135ec0f56f6e66dcb7be030f7424f1b965 100644 --- a/libguestfs-1.50.2.tar.gz +++ b/libguestfs-1.56.0.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da11090bca076f17c50395971238fa994d50cf4510f7ff8448836f2f64c17923 -size 19010409 +oid sha256:0484a69e799e5837a0da0aab0ebb019bd644532d53109c8bef9154637b2be9e2 +size 19017357 diff --git a/libguestfs.spec b/libguestfs.spec index 0a3a262de03081c987d2bf5445dd54e8e62cebbd..9ab1d15d81cade4335cbb47f705313a442f068af 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -3,23 +3,21 @@ %undefine _strict_symbol_defs_build Name: libguestfs -Version: 1.50.2 -Release: 3 +Version: 1.56.0 +Release: 1 Epoch: 1 Summary: A set of tools for accessing and modifying virtual machine (VM) disk images License: LGPL-2.1-or-later URL: https://libguestfs.org/ -Source0: https://download.libguestfs.org/1.50-stable/%{name}-%{version}.tar.gz +Source0: https://download.libguestfs.org/1.56-stable/%{name}-%{version}.tar.gz Source1: guestfish.sh Source2: yum.conf.in Patch0001: 001-port-to-php-8.0.0.patch Patch0002: fix-not-striped.patch -Patch0003: support_OPENEULER_to_configure.patch -Patch0004: 0004-libguestfs-Support-openEuler.patch BuildRequires: gcc-c++, rpcgen, libtirpc-devel, supermin-devel >= 5.1.18, hivex-devel >= 1.2.7-7, ocaml-hivex-devel, perl(Pod::Simple), perl(Pod::Man) BuildRequires: /usr/bin/pod2text, po4a, augeas-devel >= 1.7.0, readline-devel, genisoimage, libxml2-devel, createrepo, glibc-static, libselinux-utils -BuildRequires: libselinux-devel, fuse, fuse-devel, pcre2-devel, zstd-devel, file-devel, libvirt-devel, gperf, flex, bison, libdb-utils, cpio, libconfig-devel, xz-devel +BuildRequires: libselinux-devel, fuse, fuse-devel, pcre2-devel, zstd-devel, libvirt-devel, gperf, flex, bison, libdb-utils, cpio, libconfig-devel BuildRequires: zip, unzip, systemd-units, netpbm-progs, icoutils, libvirt-daemon-qemu, perl(Expect), libacl-devel, libcap-devel, libldm-devel, jansson-devel BuildRequires: systemd-devel, bash-completion, /usr/bin/ping, /usr/bin/wget, curl, xz, gtk3-devel, dbus-devel, /usr/bin/qemu-img BuildRequires: ocaml, ocaml-ocamldoc, ocaml-findlib-devel, ocaml-gettext-devel, ocaml-ounit-devel, ocaml-libvirt-devel >= 0.6.1.4-5 @@ -32,6 +30,7 @@ BuildRequires: grep, gzip, hivex, iproute, iputils, jfsutils, kmod, kpartx, less BuildRequires: openssh-clients, parted, pciutils, pcre2, policycoreutils, procps, psmisc, qemu-img, reiserfs-utils, rsync, scrub, sed, sleuthkit, squashfs-tools BuildRequires: systemd, tar, udev, util-linux, vim-minimal, which, xfsprogs, yajl, zerofree, hfsplus-tools, ntfs-3g, ntfsprogs gettext-devel binutils BuildRequires: vala ocaml-augeas-devel +BuildRequires: pkgconfig(json-c) >= 0.14 %ifarch x86_64 BuildRequires: syslinux syslinux-extlinux %endif @@ -338,6 +337,9 @@ rm -rf ocaml/html/.gitignore %lang(uk) %{_mandir}/uk/man*/* %changelog +* Sun Jun 15 2025 Funda Wang - 1:1.56.0-1 +- update to 1.56.0 + * Wed May 14 2025 Funda Wang - 1:1.50.2-3 - fix build with gettext 0.24.1 diff --git a/support_OPENEULER_to_configure.patch b/support_OPENEULER_to_configure.patch deleted file mode 100644 index bb49d06eaeefd0a346dcc2d7d932a64d82cab6ae..0000000000000000000000000000000000000000 --- a/support_OPENEULER_to_configure.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 77c67d0e597f5408c3d005ef624ef3d417271e0e Mon Sep 17 00:00:00 2001 -From: sunguoshuai -Date: Thu, 9 Sep 2021 21:34:40 +0800 -Subject: [PATCH] fix not striped - ---- - libguestfs/m4/guestfs-appliance.m4 | 22 + 1 - - 1 files changed, 22 insertions(+), 1 deletions(-) - -diff -ruN libguestfs/m4/guestfs-appliance.m4 libguestfs-1.49.5/m4/guestfs-appliance.m4 ---- libguestfs/m4/guestfs-appliance.m4 2022-11-16 23:45:04.608664963 +0800 -+++ libguestfs-1.49.5/m4/guestfs-appliance.m4 2022-11-17 00:54:05.276385306 +0800 -@@ -114,13 +114,34 @@ - fi ) | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' - )" - AS_CASE([$DISTRO], -- [FEDORA | RHEL | CENTOS | ALMALINUX | CLOUDLINUX \ -+ [FEDORA | RHEL | CENTOS | OPENEULER | ALMALINUX | CLOUDLINUX \ - | ROCKY | VIRTUOZZO], - [DISTRO=REDHAT], - [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], - [ARCH | MANJARO | ARTIX],[DISTRO=ARCHLINUX], - [OPENMANDRIVA],[DISTRO=OPENMANDRIVA]) - AC_MSG_RESULT([$DISTRO (from /etc/os-release)]) -+ -+ elif test -f /etc/openEuler-release; then -+ echo "/etc/openEuler-release:" >&AS_MESSAGE_LOG_FD -+ cat /etc/openEuler-release >&AS_MESSAGE_LOG_FD -+ DISTRO="$( -+ . /etc/openEuler-release -+ ( if test -n "$ID_LIKE"; then -+ echo $ID_LIKE | $AWK '{print $1}' -+ else -+ echo $ID -+ fi ) | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' -+ )" -+ AS_CASE([$DISTRO], -+ [FEDORA | RHEL | CENTOS | OPENEULER | ALMALINUX | CLOUDLINUX \ -+ | ROCKY], -+ [DISTRO=REDHAT], -+ [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], -+ [ARCH | MANJARO | ARTIX],[DISTRO=ARCHLINUX], -+ [OPENMANDRIVA],[DISTRO=OPENMANDRIVA]) -+ AC_MSG_RESULT([$DISTRO (from /etc/openEuler-release)]) -+ - else - AC_MSG_ERROR([/etc/os-release not available, please specify the distro using --with-distro=DISTRO]) - fi