Control: tags 1097581 + patch
Control: tags 1097581 + pending

Dear maintainer,

I've prepared an NMU for php-pecl-http (versioned as 4.2.6-3.1) and 
uploaded it to DELAYED/2. Please feel free to tell me if I should
cancel it.

cu
Adrian
diffstat for php-pecl-http-4.2.6 php-pecl-http-4.2.6

 changelog                                        |    7 ++++
 patches/0001-fix-incompatible-pointer-type.patch |   35 +++++++++++++++++++++++
 patches/series                                   |    1 
 3 files changed, 43 insertions(+)

diff -Nru php-pecl-http-4.2.6/debian/changelog php-pecl-http-4.2.6/debian/changelog
--- php-pecl-http-4.2.6/debian/changelog	2024-12-03 21:21:39.000000000 +0200
+++ php-pecl-http-4.2.6/debian/changelog	2025-10-23 16:37:57.000000000 +0300
@@ -1,3 +1,10 @@
+php-pecl-http (4.2.6-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with GCC 15. (Closes: #1097581)
+
+ -- Adrian Bunk <[email protected]>  Thu, 23 Oct 2025 16:37:57 +0300
+
 php-pecl-http (4.2.6-3) unstable; urgency=medium
 
   * Move the raphf from packages to extensions (Closes: #1072169)
diff -Nru php-pecl-http-4.2.6/debian/patches/0001-fix-incompatible-pointer-type.patch php-pecl-http-4.2.6/debian/patches/0001-fix-incompatible-pointer-type.patch
--- php-pecl-http-4.2.6/debian/patches/0001-fix-incompatible-pointer-type.patch	1970-01-01 02:00:00.000000000 +0200
+++ php-pecl-http-4.2.6/debian/patches/0001-fix-incompatible-pointer-type.patch	2025-10-23 16:37:57.000000000 +0300
@@ -0,0 +1,35 @@
+From 7292b01d80479335a14571614d43ff2750e6c7a2 Mon Sep 17 00:00:00 2001
+From: Remi Collet <[email protected]>
+Date: Thu, 23 Jan 2025 07:41:55 +0100
+Subject: fix incompatible pointer type
+
+---
+ pecl_http-4.2.6/src/php_http_client_curl.h       | 2 +-
+ pecl_http-4.2.6/src/php_http_client_curl_event.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/pecl_http-4.2.6/src/php_http_client_curl.h
++++ b/pecl_http-4.2.6/src/php_http_client_curl.h
+@@ -25,7 +25,7 @@ typedef struct php_http_client_curl_handle {
+ } php_http_client_curl_handle_t;
+ 
+ typedef struct php_http_client_curl_ops {
+-	void *(*init)();
++	void *(*init)(php_http_client_t *client, void *user_data);
+ 	void (*dtor)(void **ctx_ptr);
+ 	ZEND_RESULT_CODE (*once)(void *ctx);
+ 	ZEND_RESULT_CODE (*wait)(void *ctx, struct timeval *custom_timeout);
+--- a/pecl_http-4.2.6/src/php_http_client_curl_event.c
++++ b/pecl_http-4.2.6/src/php_http_client_curl_event.c
+@@ -242,7 +242,7 @@ static ZEND_RESULT_CODE php_http_client_curl_event_exec(void *context)
+ 	return SUCCESS;
+ }
+ 
+-static void *php_http_client_curl_event_init(php_http_client_t *client)
++static void *php_http_client_curl_event_init(php_http_client_t *client, void *user_data)
+ {
+ 	php_http_client_curl_t *curl = client->ctx;
+ 	php_http_client_curl_event_context_t *ctx;
+-- 
+2.30.2
+
diff -Nru php-pecl-http-4.2.6/debian/patches/series php-pecl-http-4.2.6/debian/patches/series
--- php-pecl-http-4.2.6/debian/patches/series	2024-12-03 21:21:39.000000000 +0200
+++ php-pecl-http-4.2.6/debian/patches/series	2025-10-23 16:37:55.000000000 +0300
@@ -1,2 +1,3 @@
 0001-package.xml-refer-to-2.0.0-not-2.0.0dev.patch
 0002-Move-the-raphf-from-packages-to-extensions-Closes-10.patch
+0001-fix-incompatible-pointer-type.patch

Reply via email to