summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION4
-rw-r--r--grpc-noatfork.patch2
-rw-r--r--grpc-workaround.patch14
-rw-r--r--php-pecl-grpc.spec8
5 files changed, 25 insertions, 5 deletions
diff --git a/PHPINFO b/PHPINFO
index 72c950f..4af5348 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
grpc
grpc support => enabled
-grpc module version => 1.65.0
+grpc module version => 1.65.1
Directive => Local Value => Master Value
grpc.enable_fork_support => 0 => 0
diff --git a/REFLECTION b/REFLECTION
index 417e8b0..06ee923 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #109 grpc version 1.65.0 ] {
+Extension [ <persistent> extension #109 grpc version 1.65.1 ] {
- INI {
Entry [ grpc.enable_fork_support <SYSTEM> ]
@@ -57,7 +57,7 @@ Extension [ <persistent> extension #109 grpc version 1.65.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.65.0 }
+ Constant [ string Grpc\VERSION ] { 1.65.1 }
}
- Classes [7] {
diff --git a/grpc-noatfork.patch b/grpc-noatfork.patch
index f270ec7..e3bacd6 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.65.0\""')
+ -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.65.1\""')
diff --git a/grpc-workaround.patch b/grpc-workaround.patch
new file mode 100644
index 0000000..f78972b
--- /dev/null
+++ b/grpc-workaround.patch
@@ -0,0 +1,14 @@
+diff -up grpc-1.65.1/src/core/lib/experiments/config.cc.old grpc-1.65.1/src/core/lib/experiments/config.cc
+--- grpc-1.65.1/src/core/lib/experiments/config.cc.old 2024-07-17 09:22:02.841621161 +0200
++++ grpc-1.65.1/src/core/lib/experiments/config.cc 2024-07-17 09:22:06.744775200 +0200
+@@ -227,8 +227,10 @@ void PrintExperimentsList() {
+ }
+ if (experiment_status.empty()) {
+ if (!defaulted_on_experiments.empty()) {
++/* https://github.com/grpc/grpc/issues/37178
+ gpr_log(GPR_INFO, "gRPC experiments enabled: %s",
+ absl::StrJoin(defaulted_on_experiments, ", ").c_str());
++*/
+ }
+ } else {
+ if (defaulted_on_experiments.empty()) {
diff --git a/php-pecl-grpc.spec b/php-pecl-grpc.spec
index 9a822c7..b3b0b07 100644
--- a/php-pecl-grpc.spec
+++ b/php-pecl-grpc.spec
@@ -15,7 +15,7 @@
%global pecl_name grpc
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global ini_name 40-%{pecl_name}.ini
-%global upstream_version 1.65.0
+%global upstream_version 1.65.1
#global upstream_prever RC2
%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
%global _configure ../%{sources}/configure
@@ -30,6 +30,7 @@ Source0: https://pecl.php.net/get/%{sources}.tgz
Patch0: %{pecl_name}-build.patch
Patch1: %{pecl_name}-noatfork.patch
+Patch2: %{pecl_name}-workaround.patch
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc >= 7.0
@@ -70,6 +71,7 @@ cd %{sources}
%ifarch %{arm}
%patch -P1 -p1 -b .noatfork
%endif
+%patch -P2 -p1 -b .nolog
#sed -e '/PHP_GRPC_VERSION/s/RC3/RC2/' -i src/php/ext/grpc/version.h
@@ -177,6 +179,10 @@ cd ../ZTS
%changelog
+* Wed Jul 17 2024 Remi Collet <remi@remirepo.net> - 1.65.1-1
+- update to 1.65.1
+- add patch to workaround to https://github.com/grpc/grpc/issues/37178
+
* Tue Jul 9 2024 Remi Collet <remi@remirepo.net> - 1.65.0-1
- update to 1.65.0