summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--grpc-gcc14.patch44
-rw-r--r--grpc-noatfork.patch2
-rw-r--r--php-pecl-grpc.spec40
3 files changed, 7 insertions, 79 deletions
diff --git a/grpc-gcc14.patch b/grpc-gcc14.patch
deleted file mode 100644
index 1d73348..0000000
--- a/grpc-gcc14.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c70190368c7040c37c1d655f0690bcde2b109a0d Mon Sep 17 00:00:00 2001
-From: David Benjamin <davidben@google.com>
-Date: Thu, 16 May 2024 11:00:42 -0400
-Subject: [PATCH 1/3] Don't define CRYPTO_addc_* and CRYPTO_subc_* in C++
-
-GCC does not support C11 _Generic in C++ mode.
-
-Change-Id: I974a0b04bbe4900419736044d0d8050f2b856d56
-Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/68507
-Auto-Submit: David Benjamin <davidben@google.com>
-Commit-Queue: David Benjamin <davidben@google.com>
-Reviewed-by: Adam Langley <agl@google.com>
----
- crypto/internal.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/crypto/internal.h b/crypto/internal.h
-index a77102d76..a45f97bcc 100644
---- a/crypto/internal.h
-+++ b/crypto/internal.h
-@@ -1174,6 +1174,11 @@ static inline uint64_t CRYPTO_rotr_u64(uint64_t value, int shift) {
-
- // Arithmetic functions.
-
-+// The most efficient versions of these functions on GCC and Clang depend on C11
-+// |_Generic|. If we ever need to call these from C++, we'll need to add a
-+// variant that uses C++ overloads instead.
-+#if !defined(__cplusplus)
-+
- // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry
- // bit. |carry| must be zero or one.
- #if OPENSSL_HAS_BUILTIN(__builtin_addc)
-@@ -1275,6 +1280,8 @@ static inline uint64_t CRYPTO_subc_u64(uint64_t x, uint64_t y, uint64_t borrow,
- #define CRYPTO_subc_w CRYPTO_subc_u32
- #endif
-
-+#endif // !__cplusplus
-+
-
- // FIPS functions.
-
---
-2.45.0
-
diff --git a/grpc-noatfork.patch b/grpc-noatfork.patch
index 5d12454..dc7ffd1 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.64.1\""')
+ -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.65.0RC2\""')
diff --git a/php-pecl-grpc.spec b/php-pecl-grpc.spec
index a2adaa6..ff34c38 100644
--- a/php-pecl-grpc.spec
+++ b/php-pecl-grpc.spec
@@ -15,8 +15,8 @@
%global pecl_name grpc
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global ini_name 40-%{pecl_name}.ini
-%global upstream_version 1.64.1
-#global upstream_prever RC2
+%global upstream_version 1.65.0
+%global upstream_prever RC2
%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
%global _configure ../%{sources}/configure
@@ -30,14 +30,7 @@ Source0: https://pecl.php.net/get/%{sources}.tgz
Patch0: %{pecl_name}-build.patch
Patch1: %{pecl_name}-noatfork.patch
-Patch2: %{pecl_name}-gcc14.patch
-%if 0%{?rhel} == 7 && 0%{?dtsversion} < 7
-BuildRequires: devtoolset-7-toolchain
-%global dtsversion 7
-%global dtsenable source /opt/rh/devtoolset-7/enable
-%global dtsprefix devtoolset-7-
-%endif
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc >= 7.0
BuildRequires: %{?dtsprefix}gcc-c++
@@ -69,7 +62,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
# Don't install/register tests
sed -e 's/role="test"/role="src"/' \
- %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+ -e '/LICENSE/s/role="doc"/role="src"/' \
-i package.xml
cd %{sources}
@@ -77,9 +70,6 @@ cd %{sources}
%ifarch %{arm}
%patch -P1 -p1 -b .noatfork
%endif
-pushd third_party/boringssl-with-bazel/src
-%patch -P2 -p1 -b .gcc14
-popd
#sed -e '/PHP_GRPC_VERSION/s/RC3/RC2/' -i src/php/ext/grpc/version.h
@@ -158,26 +148,6 @@ do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
- %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
%check
: Minimal load test for NTS extension
cd NTS
@@ -195,7 +165,6 @@ cd ../ZTS
%files
-%{!?_licensedir:%global license %%doc}
%license %{sources}/LICENSE
%{pecl_xmldir}/%{name}.xml
@@ -209,6 +178,9 @@ cd ../ZTS
%changelog
+* Mon Jul 8 2024 Remi Collet <remi@remirepo.net> - 1.65.0~RC2-1
+- update to 1.65.0RC2
+
* Mon Jun 3 2024 Remi Collet <remi@remirepo.net> - 1.64.1-1
- update to 1.64.1