[packages/php/PHP_7_3] fix readdir_r signature detection

atler atler at pld-linux.org
Thu Jan 23 13:56:40 CET 2025


commit dbee80b3b8314a41647b34bb589771cfb8b7e017
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Jan 23 12:55:49 2025 +0100

    fix readdir_r signature detection

 php.spec        |  2 ++
 readdir_r.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
---
diff --git a/php.spec b/php.spec
index a229269..e9300c2 100644
--- a/php.spec
+++ b/php.spec
@@ -225,6 +225,7 @@ Patch75:	missing-includes.patch
 Patch76:	libxml2-2.12.patch
 Patch77:	types.patch
 Patch78:	includes.patch
+Patch79:	readdir_r.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}
@@ -2052,6 +2053,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,' \
       ext/ext_skel.php \
diff --git a/readdir_r.patch b/readdir_r.patch
new file mode 100644
index 0000000..be0bacd
--- /dev/null
+++ b/readdir_r.patch
@@ -0,0 +1,15 @@
+--- php-7.3.33/acinclude.m4.orig	2025-01-23 12:02:30.409013262 +0100
++++ php-7.3.33/acinclude.m4	2025-01-23 12:02:54.179150479 +0100
+@@ -1361,10 +1361,10 @@
+   if (!dir)
+     return 1;
+   if (readdir_r(dir, (struct dirent *) entry, &pentry) == 0) {
+-    close(dir);
++    closedir(dir);
+     return 0;
+   }
+-  close(dir);
++  closedir(dir);
+   return 1;
+ }
+     ]])],[
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/40561f932b20c09b35d1ed680964935aa11ab36f



More information about the pld-cvs-commit mailing list