commit 8bcebdc5ad61ccccb3d3ca03712a73d283b64de7
Author: Jan Palus <at...@pld-linux.org>
Date: Sat Jan 25 01:40:48 2025 +0100
more missing includes and type fixes
includes.patch | 10 ++++++++++
php.spec | 2 ++
types.patch | 14 ++++++++++++++
3 files changed, 26 insertions(+)
---
diff --git a/php.spec b/php.spec
index 6e0180d..e2261cf 100644
--- a/php.spec
+++ b/php.spec
@@ -250,6 +250,7 @@ Patch76: icu70.patch
Patch77: libxml2-2.12.patch
Patch78: configure.patch
Patch79: types.patch
+Patch80: 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}
@@ -2188,6 +2189,7 @@ exit 1
%patch -P77 -p1
%patch -P78 -p1
%patch -P79 -p1
+%patch -P80 -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..9d28324
--- /dev/null
+++ b/includes.patch
@@ -0,0 +1,10 @@
+--- php-7.1.33/ext/zip/lib/mkstemp.c.orig 2019-10-22 18:59:49.000000000
+0200
++++ php-7.1.33/ext/zip/lib/mkstemp.c 2025-01-25 00:53:13.113061891 +0100
+@@ -43,6 +43,7 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+
+ #ifndef O_BINARY
+ #define O_BINARY 0
diff --git a/types.patch b/types.patch
index 0b4a626..9718eb4 100644
--- a/types.patch
+++ b/types.patch
@@ -25,3 +25,17 @@
} else {
#ifdef HAVE_STRPTIME
char *format =
INI_STR("ibase.timestampformat");
+--- php-7.0.33/sapi/litespeed/lsapilib.c.orig 2025-01-25 12:05:15.151455149
+0100
++++ php-7.0.33/sapi/litespeed/lsapilib.c 2025-01-25 12:11:23.153577903
+0100
+@@ -2654,9 +2654,10 @@
+ return;
+ }
+ s_pid_dump_debug_info = fork();
++ time_t t = tmCur;
+
+ fprintf( stderr, "[%s] Possible runaway process, PPID: %d, PID: %d,
reqCount: %d, process time: %ld, checkpoint time: %ld, start time: %ld\n",
+- ctime(&tmCur), getpid(), pStatus->m_pid,
pStatus->m_iReqCounter,
++ ctime(&t), getpid(), pStatus->m_pid, pStatus->m_iReqCounter,
+ 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 )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/63190b085150bb79f9e681060b20f959d11f556d
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
