!80 Remove buildrequires ocaml-gettext-devel, ocaml-ounit-devel, ocaml-libvirt-devel

From: @wk333 
Reviewed-by: @wu-leilei 
Signed-off-by: @wu-leilei

0003-port-to-php-8.0.0.patch

@@ -0,0 +1,72 @@
+From 4e54db3b1f9560c05bf44ae1c5caf56a610ba878 Mon Sep 17 00:00:00 2001
+From: maminjie <maminjie1@huawei.com>
+Date: Thu, 4 Feb 2021 09:41:12 +0800
+Subject: [PATCH] port to php 8.0.0
+
+---
+ generator/php.ml | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/generator/php.ml b/generator/php.ml
+index e07813f..b2da116 100644
+--- a/generator/php.ml
++++ b/generator/php.ml
+@@ -96,7 +96,7 @@ static int res_guestfs_h;
+ 
+ #if ZEND_MODULE_API_NO >= 20151012
+ # define GUESTFS_RETURN_STRING(x, duplicate) \\
+-    do { if (duplicate) RETURN_STRING(x) else { RETVAL_STRING(x); efree ((char *)x); return; } } while (0)
++    do { if (duplicate) { RETURN_STRING(x); } else { RETVAL_STRING(x); efree ((char *)x); return; } } while (0)
+ # define guestfs_add_assoc_string(arg, key, str, dup) \\
+     add_assoc_string(arg, key, str)
+ # define guestfs_add_assoc_stringl(arg, key, str, len, dup) \\
+@@ -177,7 +177,7 @@ static void
+ guestfs_php_handle_dtor (zend_resource *rsrc)
+ #else
+ static void
+-guestfs_php_handle_dtor (zend_rsrc_list_entry *rsrc TSRMLS_DC)
++guestfs_php_handle_dtor (zend_rsrc_list_entry *rsrc)
+ #endif
+ {
+   guestfs_h *g = (guestfs_h *) rsrc->ptr;
+@@ -193,13 +193,16 @@ PHP_MINIT_FUNCTION (guestfs_php)
+   return SUCCESS;
+ }
+ 
++ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
+ static zend_function_entry guestfs_php_functions[] = {
+-  PHP_FE (guestfs_create, NULL)
+-  PHP_FE (guestfs_last_error, NULL)
++  PHP_FE (guestfs_create, arginfo_void)
++  PHP_FE (guestfs_last_error, arginfo_void)
+ ";
+ 
+   List.iter (
+-    fun { name } -> pr "  PHP_FE (guestfs_%s, NULL)\n" name
++    fun { name } -> pr "  PHP_FE (guestfs_%s, arginfo_void)\n" name
+   ) (actions |> external_functions |> sort);
+ 
+   pr "  { NULL, NULL, NULL }
+@@ -247,7 +250,7 @@ PHP_FUNCTION (guestfs_last_error)
+   zval *z_g;
+   guestfs_h *g;
+ 
+-  if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, \"r\",
++  if (zend_parse_parameters (ZEND_NUM_ARGS(), \"r\",
+                              &z_g) == FAILURE) {
+     RETURN_FALSE;
+   }
+@@ -353,7 +356,7 @@ PHP_FUNCTION (guestfs_last_error)
+             )
+         else param_string in
+ 
+-      pr "  if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, \"r%s\",\n"
++      pr "  if (zend_parse_parameters (ZEND_NUM_ARGS(), \"r%s\",\n"
+         param_string;
+       pr "        &z_g";
+       List.iter (
+-- 
+2.23.0
+

libguestfs.spec

@@ -4,7 +4,7 @@
 
 Name:          libguestfs
 Version:       1.40.2
-Release:       9
+Release:       14
 Epoch:         1
 Summary:       A set of tools for accessing and modifying virtual machine (VM) disk images
 License:       LGPLv2+
@@ -13,13 +13,14 @@ Source0:       http://download.libguestfs.org/1.40-stable/libguestfs-1.40.2.tar.
 Source1:       guestfish.sh
 Source2:       yum.conf.in
 Patch0000:     0002-fts-remove-NOSTAT_LEAF_OPTIMIZATION.patch 
+Patch0001:     0003-port-to-php-8.0.0.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, pcre-devel, file-devel, libvirt-devel, gperf, flex, bison, libdb-utils, cpio, libconfig-devel, xz-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, perl(Win::Hivex)
-BuildRequires: perl(Win::Hivex::Regedit), ocaml, ocaml-ocamldoc, ocaml-findlib-devel, ocaml-gettext-devel, ocaml-ounit-devel, ocaml-libvirt-devel >= 0.6.1.4-5
+BuildRequires: perl(Win::Hivex::Regedit), ocaml, ocaml-ocamldoc, ocaml-findlib-devel
 BuildRequires: lua, lua-devel, perl-devel, perl-generators, perl-macros, perl(Sys::Virt), perl(Test::More), perl(Test::Pod) >= 1.00, perl(Test::Pod::Coverage) >= 1.00
 BuildRequires: perl(Module::Build), perl(ExtUtils::CBuilder), perl(Locale::TextDomain), python2-devel, python-unversioned-command, python3-libvirt, python3-devel
 BuildRequires: ruby-devel, rubygem-rake, rubygem(json), rubygem(rdoc), rubygem(test-unit), ruby-irb, java-1.8.0-openjdk, java-1.8.0-openjdk-devel
@@ -27,7 +28,7 @@ BuildRequires: jpackage-utils, php-devel, gobject-introspection-devel, gjs, acl,
 BuildRequires: bzip2, coreutils, cpio, cryptsetup, debootstrap, dhclient, diffutils, dosfstools, e2fsprogs, file, findutils, gawk, gdisk, gfs2-utils
 BuildRequires: grep, gzip, hivex, iproute, iputils, jfsutils, kernel, kmod, kpartx, less, libcap, libldm, libselinux, libxml2, lsof, lsscsi, lvm2, strace
 BuildRequires: openssh-clients, parted, pciutils, pcre, 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
+BuildRequires: systemd, tar, udev, util-linux, vim-minimal, which, xfsprogs, yajl, zerofree, hfsplus-tools, ntfs-3g, ntfsprogs gettext-devel
 %ifarch x86_64
 BuildRequires: syslinux syslinux-extlinux
 %endif
@@ -200,18 +201,17 @@ sed -i 's/FEDORA | RHEL | CENTOS)/FEDORA | RHEL | CENTOS | OPENEULER | GENERIC)/
 %build
 ip addr list ||:
 ip route list ||:
-if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
+if ping -c 3 -w 20 8.8.8.8; then
   extra=
 else
-  if [ ! -d "/.pkgs" ];then
-    extra=
-  else
-    install -d cachedir repo
-    find /.pkgs/ -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo
-    createrepo repo
-    sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf
-    extra=--with-supermin-packager-config=$(pwd)/yum.conf
-  fi
+  mkdir cachedir repo
+  findres=`find /var/cache/dnf -type f -name '*.rpm' -print0`
+if [ ! -z "$findres"]; then
+  echo $find_res | xargs -0 -n 1 cp -t repo
+fi
+  createrepo repo
+  sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf
+  extra=--with-supermin-packager-config=$(pwd)/yum.conf
 fi
 
 %global localconfigure \
@@ -220,7 +220,7 @@ fi
     --with-extra="libvirt" \\\
     --without-java \\\
     $extra
-%global localconfigure %{localconfigure} --disable-golang --disable-appliance
+%global localconfigure %{localconfigure} --disable-golang
 
 %global localmake \
   make -j1 -C builder index-parse.c \
@@ -308,6 +308,7 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
 %{_libdir}/libguestfs.so
 %{_includedir}/guestfs.h
 %{_libdir}/pkgconfig/libguestfs.pc
+%{_sbindir}/libguestfs-make-fixed-appliance
 
 %files -n ocaml-%{name}
 %{_libdir}/ocaml/guestfs
@@ -378,6 +379,21 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
 %exclude %{_mandir}/man1/virt-tar.1*
 
 %changelog
+* Thu Oct 12 2023 wangkai <13474090681@163.com> - 1:1.40.2-14
+- Remove buildrequires ocaml-gettext-devel, ocaml-ounit-devel, ocaml-libvirt-devel
+
+* Tue 20 Jul 2021 sunguoshuai <sunguoshuai@huawei.com> - 1:1.40.2-13
+- No /var/cache/yum in build environment and add test incase no cached rpms.
+
+* Thu Mar 25 2021 lingsheng <lingsheng@huawei.com> - 1:1.40.2-12
+- Remove wget check
+
+* Thu Dec 31 2020 maminjie <maminjie1@huawei.com> - 1:1.40.2-11
+- Port to php 8.0.0
+
+* Wed Dec 16 2020 maminjie <maminjie1@huawei.com> - 1:1.40.2-10
+- Enable appliance that is necessary
+
 * Tue Jul 21 2020 sunguoshuai <sunguoshuai@huawei.com> - 1:1.40.2-9
 - Del the optimization for xfs, which can lead to du and find command aborted.