[packages/php/PHP_5_2] More fixes

[arekm]

commit 516d75eb4d98dce33f19d190b726395f5da03079
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Jul 14 19:25:37 2025 +0200

    More fixes

 fopencookie.patch | 19 +++++++++++++++++++
 php.spec          |  2 ++
 suhosin.patch     | 16 ++++++++++++++++
 3 files changed, 37 insertions(+)
---
diff --git a/php.spec b/php.spec
index fe593a4..1c8887e 100644
--- a/php.spec
+++ b/php.spec
@@ -230,6 +230,7 @@ Patch80:	mysqli-err.patch
 Patch81:	openssl.patch
 Patch82:	libxml2.patch
 Patch83:	readdir.patch
+Patch84:	fopencookie.patch
 # CENTALT patches
 # Backport from 5.3.6
 Patch311:	php-5.3.6-bug-47435.patch
@@ -1994,6 +1995,7 @@ done
 %patch -P81 -p1
 %patch -P82 -p1
 %patch -P83 -p1
+%patch -P84 -p1
 
 # Bugfix backport from 5.3.6
 %patch -P311 -p1 -b .bug-47435
diff --git a/fopencookie.patch b/fopencookie.patch
new file mode 100644
index 0000000..9e1b1ec
--- /dev/null
+++ b/fopencookie.patch
@@ -0,0 +1,19 @@
+--- php-5.2.17.org/acinclude.m4	2025-07-14 18:21:57.202299884 +0200
++++ php-5.2.17/acinclude.m4	2025-07-14 18:51:21.089790420 +0200
+@@ -1757,6 +1757,7 @@
+ dnl even newer glibcs have a different seeker definition...
+ AC_TRY_RUN([
+ #define _GNU_SOURCE
++#include <stdlib.h>
+ #include <stdio.h>
+ 
+ struct cookiedata {
+@@ -1775,7 +1775,7 @@
+ 
+ cookie_io_functions_t funcs = {reader, writer, seeker, closer};
+ 
+-main() {
++int main() {
+   struct cookiedata g = { 0 };
+   FILE *fp = fopencookie(&g, "r", funcs);
+ 
diff --git a/suhosin.patch b/suhosin.patch
index cdb1379..a5e7cb2 100644
--- a/suhosin.patch
+++ b/suhosin.patch
@@ -2637,3 +2637,19 @@ diff -urNp -x '*.orig' php-5.2.17.org/win32/build/config.w32 php-5.2.17/win32/bu
  /* For snapshot builders, where can we find the additional
   * files that make up the snapshot template? */
  ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no");
+diff -ur php-5.2.17.org/Zend/zend_canary.c php-5.2.17/Zend/zend_canary.c
+--- php-5.2.17.org/Zend/zend_canary.c	2025-07-14 18:55:29.301312258 +0200
++++ php-5.2.17/Zend/zend_canary.c	2025-07-14 19:03:39.567640006 +0200
+@@ -21,7 +21,11 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <unistd.h>
++#include <time.h>
+ 
+ #if SUHOSIN_PATCH
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/516d75eb4d98dce33f19d190b726395f5da03079