[packages/php/PHP_5_4] more missing includes and type fixes
atler
atler at pld-linux.org
Thu Jan 30 12:42:06 CET 2025
commit cf6c71136eb4b5460c07b09b6ffe259d8af5e673
Author: Jan Palus <atler at pld-linux.org>
Date: Mon Jan 27 23:06:58 2025 +0100
more missing includes and type fixes
includes.patch | 11 ++++++
php.spec | 2 +
types.patch | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 129 insertions(+)
---
diff --git a/php.spec b/php.spec
index 98fdf90..cd94452 100644
--- a/php.spec
+++ b/php.spec
@@ -232,6 +232,7 @@ Patch75: icu69.patch
Patch76: libxml2.patch
Patch77: configure.patch
Patch78: types.patch
+Patch79: includes.patch
URL: https://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -2076,6 +2077,7 @@ cp -p php.ini-production php.ini
%patch -P76 -p1
%patch -P77 -p1
%patch -P78 -p1
+%patch -P79 -p1
sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
run-tests.php
diff --git a/includes.patch b/includes.patch
new file mode 100644
index 0000000..b26b8c5
--- /dev/null
+++ b/includes.patch
@@ -0,0 +1,11 @@
+--- php-5.6.40/sapi/litespeed/lsapi_main.c.orig 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/sapi/litespeed/lsapi_main.c 2025-01-27 22:38:03.269825030 +0100
+@@ -23,6 +23,8 @@
+ #include "php_variables.h"
+ #include "zend_highlight.h"
+ #include "zend.h"
++#include "ext/standard/basic_functions.h"
++#include "ext/standard/info.h"
+
+ #include "lsapilib.h"
+
diff --git a/types.patch b/types.patch
index 9718eb4..77b6721 100644
--- a/types.patch
+++ b/types.patch
@@ -39,3 +39,119 @@
tmCur - pStatus->m_tmReqBegin, tmCur - pStatus->m_tmLastCheckPoint, tmCur - pStatus->m_tmStart );
snprintf( achCmd, 1024, "gdb --batch -ex \"attach %d\" -ex \"set height 0\" -ex \"bt\" >&2;PATH=$PATH:/usr/sbin lsof -p %d >&2", pStatus->m_pid, pStatus->m_pid );
if ( system( achCmd ) == -1 )
+--- php-5.6.40/ext/zlib/zlib.c.orig 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/zlib/zlib.c 2025-01-27 19:29:40.045109498 +0100
+@@ -1032,7 +1032,7 @@
+ PHP_MINFO(zlib),
+ "2.0",
+ PHP_MODULE_GLOBALS(zlib),
+- ZEND_MODULE_GLOBALS_CTOR_N(zlib),
++ (void (*)(void*))ZEND_MODULE_GLOBALS_CTOR_N(zlib),
+ NULL,
+ NULL,
+ STANDARD_MODULE_PROPERTIES_EX
+--- php-5.6.40/ext/interbase/ibase_events.c.orig 2025-01-27 00:37:50.826064380 +0100
++++ php-5.6.40/ext/interbase/ibase_events.c 2025-01-27 19:50:58.362432043 +0100
+@@ -195,7 +195,7 @@
+ /* }}} */
+
+ static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */
+- unsigned short buffer_size, char *result_buf)
++ unsigned short buffer_size, const unsigned char *result_buf)
+ {
+ /* this function is called asynchronously by the Interbase client library. */
+ TSRMLS_FETCH_FROM_CTX(event->thread_ctx);
+@@ -246,7 +246,7 @@
+ case NEW:
+ /* re-register the event */
+ if (isc_que_events(IB_STATUS, &event->link->handle, &event->event_id, buffer_size,
+- event->event_buffer,(isc_callback)_php_ibase_callback, (void *)event)) {
++ event->event_buffer,(ISC_EVENT_CALLBACK)_php_ibase_callback, (void *)event)) {
+
+ _php_ibase_error(TSRMLS_C);
+ }
+@@ -356,7 +356,7 @@
+
+ /* now register the events with the Interbase API */
+ if (isc_que_events(IB_STATUS, &ib_link->handle, &event->event_id, buffer_size,
+- event->event_buffer,(isc_callback)_php_ibase_callback, (void *)event)) {
++ event->event_buffer,(ISC_EVENT_CALLBACK)_php_ibase_callback, (void *)event)) {
+
+ _php_ibase_error(TSRMLS_C);
+ efree(event);
+--- php-5.6.40/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c.orig 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c 2025-01-27 19:55:53.530789321 +0100
+@@ -48,7 +48,7 @@
+ mbfl_no_encoding_2022jp_kddi,
+ "ISO-2022-JP-MOBILE#KDDI",
+ "ISO-2022-JP",
+- mbfl_encoding_2022jp_kddi_aliases,
++ &mbfl_encoding_2022jp_kddi_aliases,
+ NULL,
+ MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE
+ };
+--- php-5.6.40/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c.orig 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c 2025-01-27 19:58:18.801621337 +0100
+@@ -38,6 +38,7 @@
+
+ extern int mbfl_filt_ident_utf8(int c, mbfl_identify_filter *filter);
+ extern int mbfl_filt_conv_utf8_wchar_flush(mbfl_convert_filter *filter);
++extern int mbfl_filt_put_invalid_char(int c, mbfl_convert_filter *filter);
+
+ extern const unsigned char mblen_table_utf8[];
+
+--- php-5.6.40/ext/mssql/php_mssql.c.orig 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/mssql/php_mssql.c 2025-01-27 19:59:45.608785170 +0100
+@@ -1122,7 +1122,7 @@
+ }
+
+ res_length = 19;
+- spprintf(&res_buf, 0, "%d-%02d-%02d %02d:%02d:%02d" , dateinfo.year, dateinfo.month, dateinfo.day, dateinfo.hour, dateinfo.minute, dateinfo.second);
++ spprintf((char**)&res_buf, 0, "%d-%02d-%02d %02d:%02d:%02d" , dateinfo.year, dateinfo.month, dateinfo.day, dateinfo.hour, dateinfo.minute, dateinfo.second);
+ }
+
+ ZVAL_STRINGL(result, res_buf, res_length, 0);
+--- php-5.6.40/ext/pdo_dblib/pdo_dblib.c.orig 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/pdo_dblib/pdo_dblib.c 2025-01-27 20:05:32.840773848 +0100
+@@ -138,7 +138,7 @@
+ }
+
+ int msg_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate,
+- int severity, char *msgtext, char *srvname, char *procname, DBUSMALLINT line)
++ int severity, char *msgtext, char *srvname, char *procname, DBINT line)
+ {
+ pdo_dblib_err *einfo;
+ TSRMLS_FETCH();
+--- php-5.6.40/ext/pdo_dblib/php_pdo_dblib_int.h.orig 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/pdo_dblib/php_pdo_dblib_int.h 2025-01-27 20:07:05.007968377 +0100
+@@ -93,7 +93,7 @@
+ int oserr, char *dberrstr, char *oserrstr);
+
+ int msg_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate,
+- int severity, char *msgtext, char *srvname, char *procname, DBUSMALLINT line);
++ int severity, char *msgtext, char *srvname, char *procname, DBINT line);
+
+ extern pdo_driver_t pdo_dblib_driver;
+ extern struct pdo_stmt_methods dblib_stmt_methods;
+--- php-5.6.40/ext/wddx/wddx.c.orig 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/wddx/wddx.c 2025-01-27 20:13:44.643590516 +0100
+@@ -535,7 +535,7 @@
+ continue;
+ }
+
+- if (zend_hash_get_current_key_ex(objhash, &key, &key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) {
++ if (zend_hash_get_current_key_ex(objhash, (char**)&key, &key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) {
+ const char *class_name, *prop_name;
+
+ zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name);
+--- php-5.6.40/sapi/litespeed/lsapi_main.c.orig 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/sapi/litespeed/lsapi_main.c 2025-01-27 22:38:03.269825030 +0100
+@@ -69,6 +71,8 @@
+
+ #define SAPI_LSAPI_MAX_HEADER_LENGTH 2048
+
++void LSAPI_No_Check_ppid();
++
+ static int lsapi_mode = 0;
+ static char *php_self = "";
+ static char *script_filename = "";
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3eb67af7ec196c2bcb3e4022f9109250626c7e13
More information about the pld-cvs-commit
mailing list