From 3ff9212d6864c554339d0a602280e6ea0cdb7033 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 17 Oct 2024 09:32:53 +0200
Subject: update to 1.67.0

---
 PHPINFO             |  2 +-
 REFLECTION          |  4 ++--
 grpc-noatfork.patch |  2 +-
 php-pecl-grpc.spec  | 15 ++++++++++-----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 3808861..c739c59 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 grpc
 
 grpc support => enabled
-grpc module version => 1.66.0
+grpc module version => 1.67.0
 
 Directive => Local Value => Master Value
 grpc.enable_fork_support => 0 => 0
diff --git a/REFLECTION b/REFLECTION
index 8e8294e..12ba1d8 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #113 grpc version 1.66.0 ] {
+Extension [ <persistent> extension #125 grpc version 1.67.0 ] {
 
   - INI {
     Entry [ grpc.enable_fork_support <SYSTEM> ]
@@ -57,7 +57,7 @@ Extension [ <persistent> extension #113 grpc version 1.66.0 ] {
     Constant [ int Grpc\CHANNEL_READY ] { 2 }
     Constant [ int Grpc\CHANNEL_TRANSIENT_FAILURE ] { 3 }
     Constant [ int Grpc\CHANNEL_FATAL_FAILURE ] { 4 }
-    Constant [ string Grpc\VERSION ] { 1.66.0 }
+    Constant [ string Grpc\VERSION ] { 1.67.0 }
   }
 
   - Classes [7] {
diff --git a/grpc-noatfork.patch b/grpc-noatfork.patch
index 7a5eee5..a0e27f9 100644
--- a/grpc-noatfork.patch
+++ b/grpc-noatfork.patch
@@ -7,5 +7,5 @@ diff -up ./config.m4.noatfork ./config.m4
      -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
 -    -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \
      -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
-     -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.66.0\""')
+     -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.67.0\""')
  
diff --git a/php-pecl-grpc.spec b/php-pecl-grpc.spec
index 4cd886b..7af2422 100644
--- a/php-pecl-grpc.spec
+++ b/php-pecl-grpc.spec
@@ -22,7 +22,7 @@
 %global pecl_name        grpc
 %global with_zts         0%{!?_without_zts:%{?__ztsphp:1}}
 %global ini_name         40-%{pecl_name}.ini
-%global upstream_version 1.66.0
+%global upstream_version 1.67.0
 #global upstream_prever  RC5
 %global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}
 %global _configure       ../%{sources}/configure
@@ -126,6 +126,8 @@ EOF
 
 cd %{sources}
 %{__phpize}
+[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global
+sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL
 
 cd ../NTS
 %configure \
@@ -134,7 +136,7 @@ cd ../NTS
     --with-libdir=%{_lib} \
     --with-php-config=%{__phpconfig}
 
-make %{?_smp_mflags}
+%make_build
 
 %if %{with_zts}
 cd ../ZTS
@@ -144,14 +146,14 @@ cd ../ZTS
     --with-libdir=%{_lib} \
     --with-php-config=%{__ztsphpconfig}
 
-make %{?_smp_mflags}
+%make_build
 %endif
 
 
 %install
 %{?dtsenable}
 
-make -C NTS install INSTALL_ROOT=%{buildroot}
+%make_install -C NTS
 
 # install config file
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
@@ -160,7 +162,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 %if %{with_zts}
-make -C ZTS install INSTALL_ROOT=%{buildroot}
+%make_install -C ZTS
 
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
@@ -201,6 +203,9 @@ cd ../ZTS
 
 
 %changelog
+* Thu Oct 17 2024 Remi Collet <remi@remirepo.net> - 1.67.0-1
+- update to 1.67.0
+
 * Mon Aug 26 2024 Remi Collet <remi@remirepo.net> - 1.66.0-1
 - update to 1.66.0
 
-- 
cgit