From 03ab4225b5c1048ea59d5af6b39b3134d51ea7b2 Mon Sep 17 00:00:00 2001
From: maminjie <maminjie1@huawei.com>
Date: Mon, 1 Mar 2021 16:56:10 +0800
Subject: [PATCH] Fix php 8.0.0 warning about missing arginfo

---
 0003-port-to-php-8.0.0.patch | 34 +++++++++++++++++++++++++++-------
 libguestfs.spec              |  5 ++++-
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/0003-port-to-php-8.0.0.patch b/0003-port-to-php-8.0.0.patch
index 86bca2b..32bb213 100644
--- a/0003-port-to-php-8.0.0.patch
+++ b/0003-port-to-php-8.0.0.patch
@@ -1,14 +1,14 @@
-From fdeb579ae5c58a5da81c866a83d81e76da3347c1 Mon Sep 17 00:00:00 2001
+From 4e54db3b1f9560c05bf44ae1c5caf56a610ba878 Mon Sep 17 00:00:00 2001
 From: maminjie <maminjie1@huawei.com>
-Date: Tue, 1 Dec 2020 12:00:20 +0800
+Date: Thu, 4 Feb 2021 09:41:12 +0800
 Subject: [PATCH] port to php 8.0.0
 
 ---
- generator/php.ml | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ generator/php.ml | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/generator/php.ml b/generator/php.ml
-index e07813f..4046aa8 100644
+index e07813f..b2da116 100644
 --- a/generator/php.ml
 +++ b/generator/php.ml
 @@ -96,7 +96,7 @@ static int res_guestfs_h;
@@ -29,7 +29,27 @@ index e07813f..4046aa8 100644
  #endif
  {
    guestfs_h *g = (guestfs_h *) rsrc->ptr;
-@@ -247,7 +247,7 @@ PHP_FUNCTION (guestfs_last_error)
+@@ -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;
  
@@ -38,7 +58,7 @@ index e07813f..4046aa8 100644
                               &z_g) == FAILURE) {
      RETURN_FALSE;
    }
-@@ -353,7 +353,7 @@ PHP_FUNCTION (guestfs_last_error)
+@@ -353,7 +356,7 @@ PHP_FUNCTION (guestfs_last_error)
              )
          else param_string in
  
diff --git a/libguestfs.spec b/libguestfs.spec
index 8c2c352..e6ab8c4 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -4,7 +4,7 @@
 
 Name:          libguestfs
 Version:       1.40.2
-Release:       12
+Release:       13
 Epoch:         1
 Summary:       A set of tools for accessing and modifying virtual machine (VM) disk images
 License:       LGPLv2+
@@ -364,6 +364,9 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
 %exclude %{_mandir}/man1/virt-tar.1*
 
 %changelog
+* Mon Mar 01 2021 maminjie <maminjie1@huawei.com> - 1:1.40.2-13
+- Fix php 8.0.0 warning about missing arginfo
+
 * Wed Feb 10 2021 baizhonggui <baizhonggui@huawei.com> - 1:1.40.2-12
 - Delete python2 subpackage
 
-- 
Gitee