update to 3.1.6HEADmaster

drop patch merged upstream

4 files changed, 12 insertions, 109 deletions

diff --git a/0001-Fix-build-with-PHP-8.6.0alpha2.patch b/0001-Fix-build-with-PHP-8.6.0alpha2.patch
deleted file mode 100644
index 43643a8..0000000
--- a/0001-Fix-build-with-PHP-8.6.0alpha2.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From b8aec911441a7acb7d2d0863f2893f0ea978d285 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 16 Jul 2026 09:47:59 +0200
-Subject: [PATCH] Fix build with PHP 8.6.0alpha2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-  . The zval_dtor() alias of zval_ptr_dtor_nogc() has been removed.
-    Call zval_ptr_dtor_nogc() directly instead.
-
-  . The XtOffsetOf() alias of C’s offsetof() macro has been removed. Use
-    offsetof() directly.
----
- php8/classes/buffer.c | 2 +-
- php8/src/util.c       | 8 ++++----
- php8/src/util.h       | 4 ++--
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/php8/classes/buffer.c b/php8/classes/buffer.c
-index 73f74db..4e3551c 100644
---- a/php8/classes/buffer.c
-+++ b/php8/classes/buffer.c
-@@ -399,7 +399,7 @@ PHP_EVENT_METHOD(EventBuffer, copyout)
- 
- 	if (ret > 0) {
- 		convert_to_string(zdata);
--		zval_dtor(zdata);
-+		zval_ptr_dtor_nogc(zdata);
- 		ZVAL_STRINGL(zdata, data, ret);
- 	}
- 
-diff --git a/php8/src/util.c b/php8/src/util.c
-index f4727b5..bc32e63 100644
---- a/php8/src/util.c
-+++ b/php8/src/util.c
-@@ -132,7 +132,7 @@ int _php_event_getsockname(evutil_socket_t fd, zval *pzaddr, zval *pzport)/*{{{*
- 				if (evutil_inet_ntop(sa->sa_family, &sin->sin_addr,
- 							(void *) &addr, sizeof(addr))) {
- 					if (!Z_ISUNDEF_P(pzaddr)) {
--						zval_dtor(pzaddr);
-+						zval_ptr_dtor_nogc(pzaddr);
- 					}
- 					ZVAL_STRING(pzaddr, addr);
- 
-@@ -151,7 +151,7 @@ int _php_event_getsockname(evutil_socket_t fd, zval *pzaddr, zval *pzport)/*{{{*
- 				if (evutil_inet_ntop(sa->sa_family, &sin6->sin6_addr,
- 							(void *) &addr6, sizeof(addr6))) {
- 					if (!Z_ISUNDEF_P(pzaddr)) {
--						zval_dtor(pzaddr);
-+						zval_ptr_dtor_nogc(pzaddr);
- 					}
- 					ZVAL_STRING(pzaddr, addr6);
- 
-@@ -168,7 +168,7 @@ int _php_event_getsockname(evutil_socket_t fd, zval *pzaddr, zval *pzport)/*{{{*
- 				struct sockaddr_un *ua = (struct sockaddr_un *) sa;
- 
- 				if (!Z_ISUNDEF_P(pzaddr)) {
--					zval_dtor(pzaddr);
-+					zval_ptr_dtor_nogc(pzaddr);
- 				}
- 				ZVAL_STRING(pzaddr, ua->sun_path);
- 			}
-@@ -182,7 +182,7 @@ int _php_event_getsockname(evutil_socket_t fd, zval *pzaddr, zval *pzport)/*{{{*
- 
- 	if (port != -1) {
- 		if (pzport && !Z_ISUNDEF_P(pzport)) {
--			zval_dtor(pzport);
-+			zval_ptr_dtor_nogc(pzport);
- 		}
- 		ZVAL_LONG(pzport, port);
- 	}
-diff --git a/php8/src/util.h b/php8/src/util.h
-index 4b0ed18..26be773 100644
---- a/php8/src/util.h
-+++ b/php8/src/util.h
-@@ -119,7 +119,7 @@ static zend_always_inline void php_event_replace_zval(zval *zdst, zval *zsrc) {/
- 	PHP_EVENT_X_OBJ_HANDLERS(x).name = php_event_ ## x ## _ ## name
- 
- #define PHP_EVENT_SET_X_OBJ_HANDLERS(x) do { \
--	PHP_EVENT_X_OBJ_HANDLERS(x).offset = XtOffsetOf(Z_EVENT_X_OBJ_T(x), zo); \
-+	PHP_EVENT_X_OBJ_HANDLERS(x).offset = offsetof(Z_EVENT_X_OBJ_T(x), zo); \
- 	PHP_EVENT_X_OBJ_HANDLERS(x).get_gc = get_gc; \
- 	PHP_EVENT_X_OBJ_HANDLERS(x).clone_obj = NULL; \
- 	PHP_EVENT_SET_X_OBJ_HANDLER(x, free_obj); \
-@@ -136,7 +136,7 @@ static zend_always_inline void php_event_replace_zval(zval *zdst, zval *zsrc) {/
- #define Z_EVENT_X_FETCH_OBJ(x, pzo) php_event_ ## x ## _fetch_object(pzo)
- #define Z_EVENT_X_FETCH_OBJ_DECL(x) \
- 	static zend_always_inline Z_EVENT_X_OBJ_T(x) * Z_EVENT_X_FETCH_OBJ(x, zend_object *obj) { \
--		return (EXPECTED(obj) ? (Z_EVENT_X_OBJ_T(x) *)((char *)obj - XtOffsetOf(Z_EVENT_X_OBJ_T(x), zo)) : NULL); \
-+		return (EXPECTED(obj) ? (Z_EVENT_X_OBJ_T(x) *)((char *)obj - offsetof(Z_EVENT_X_OBJ_T(x), zo)) : NULL); \
- 	}
- 
- #define Z_EVENT_X_OBJ_P(x, zv) (EXPECTED(zv) ? Z_EVENT_X_FETCH_OBJ(x, Z_OBJ_P(zv)) : NULL)
--- 
-2.55.0
-
diff --git a/PHPINFO b/PHPINFO
index fe2238f..4945fcd 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -7,5 +7,5 @@ Debug support => disabled
 Extra functionality support including HTTP, DNS, and RPC => enabled
 OpenSSL support => enabled
 Thread safety support => disabled
-Extension version => 3.1.5
+Extension version => 3.1.6
 libevent2 headers version => 2.1.12-stable
diff --git a/REFLECTION b/REFLECTION
index 1cc4e8b..c208986 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #78 event version 3.1.5 ] {
+Extension [ <persistent> extension #81 event version 3.1.6 ] {
 
   - Dependencies {
     Dependency [ sockets (Required) ]
@@ -1677,8 +1677,8 @@ Extension [ <persistent> extension #78 event version 3.1.5 ] {
         Constant [ public int OPT_CIPHER_SERVER_PREFERENCE ] { 15 }
         Constant [ public int OPT_REQUIRE_CLIENT_CERT ] { 16 }
         Constant [ public int OPT_VERIFY_CLIENT_ONCE ] { 17 }
-        Constant [ public string OPENSSL_VERSION_TEXT ] { OpenSSL 3.5.4 30 Sep 2025 }
-        Constant [ public int OPENSSL_VERSION_NUMBER ] { 810549312 }
+        Constant [ public string OPENSSL_VERSION_TEXT ] { OpenSSL 3.5.7 9 Jun 2026 }
+        Constant [ public int OPENSSL_VERSION_NUMBER ] { 810549360 }
         Constant [ public int SSL3_VERSION ] { 768 }
         Constant [ public int TLS1_VERSION ] { 769 }
         Constant [ public int TLS1_1_VERSION ] { 770 }
diff --git a/php-pecl-event.spec b/php-pecl-event.spec
index b3f8b66..0eba33d 100644
--- a/php-pecl-event.spec
+++ b/php-pecl-event.spec
@@ -24,7 +24,7 @@
 %global with_zts         0%{!?_without_zts:%{?__ztsphp:1}}
 # After 20-sockets.so
 %global ini_name         40-%{pecl_name}.ini
-%global upstream_version 3.1.5
+%global upstream_version 3.1.6
 #global upstream_prever  RC1
 #global upstream_postver r1
 %global sources          %{archivename}
@@ -35,7 +35,7 @@
 %global gh_proj          pecl-event
 %global forgeurl         https://bitbucket.org/%{gh_vend}/%{gh_proj}
 %global tag              %{upstream_version}%{?upstream_prever}
-%global commit           e14e0f5e134e
+%global commit           63cb86c26995
 # Mandatory for bitbucket on EL-8
 %global archivename      %{gh_vend}-%{gh_proj}-%{commit}
 
@@ -43,13 +43,11 @@ Name:          %{?scl_prefix}php-pecl-%{pecl_name}
 Summary:       Provides interface to libevent library
 License:       PHP-3.01
 Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}%{?upstream_postver:+%{upstream_postver}}
-Release:       5%{?dist}
+Release:       1%{?dist}
 %forgemeta
 URL:           %{forgeurl}
 Source0:       %{forgesource}
 
-Patch0:        0001-Fix-build-with-PHP-8.6.0alpha2.patch
-
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
@@ -95,15 +93,13 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %setup -q -c 
 
 cd %{sources}
-%patch -P0 -p1
-
 # Sanity check, really often broken
 DIR=$(%{__php} -r 'echo "php" . PHP_MAJOR_VERSION;')
 #sed -e '/PHP_EVENT_VERSION/s/2.4.2/2.4.3/' -i $DIR/php_event.h
 
 extver=$(sed -n '/#define PHP_EVENT_VERSION/{s/.* "//;s/".*$//;p}' $DIR/php_event.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?upstream_postver}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?upstream_postver}.
+   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?upstream_postver}
    exit 1
 fi
 cd ..
@@ -223,6 +219,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Thu Jul 16 2026 Remi Collet <remi@remirepo.net> - 3.1.6-1
+- update to 3.1.6
+- drop patch merged upstream
+
 * Thu Jul 16 2026 Remi Collet <remi@remirepo.net> - 3.1.5-5
 - fix build with PHP 8.6.0alpha2 using patch sent upsttream