summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-devtools/php/php.inc4
-rw-r--r--meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch23
-rw-r--r--meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch17
-rw-r--r--meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch45
-rw-r--r--meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch140
-rw-r--r--meta-oe/recipes-devtools/php/php/0048-Use-pkg-config-for-FreeType2-detection.patch53
-rw-r--r--meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch111
-rw-r--r--meta-oe/recipes-devtools/php/php/CVE-2017-9120.patch21
-rw-r--r--meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch61
-rw-r--r--meta-oe/recipes-devtools/php/php/php5-0001-acinclude.m4-don-t-unset-cache-variables.patch42
-rw-r--r--meta-oe/recipes-devtools/php/php_5.6.40.bb (renamed from meta-oe/recipes-devtools/php/php_5.6.39.bb)5
-rw-r--r--meta-oe/recipes-devtools/php/php_7.3.2.bb (renamed from meta-oe/recipes-devtools/php/php_7.2.10.bb)14
12 files changed, 331 insertions, 205 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index ca7bd91b2b..6f893ad85c 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -20,7 +20,6 @@ SRC_URI_append_class-target = " \
20 file://php_exec_native.patch \ 20 file://php_exec_native.patch \
21 file://php-fpm.conf \ 21 file://php-fpm.conf \
22 file://php-fpm-apache.conf \ 22 file://php-fpm-apache.conf \
23 file://0001-acinclude.m4-don-t-unset-cache-variables.patch \
24 file://70_mod_php${PHP_MAJOR_VERSION}.conf \ 23 file://70_mod_php${PHP_MAJOR_VERSION}.conf \
25 file://php-fpm.service \ 24 file://php-fpm.service \
26 " 25 "
@@ -46,10 +45,9 @@ COMMON_EXTRA_OECONF = "--enable-sockets \
46EXTRA_OECONF = "--enable-mbstring \ 45EXTRA_OECONF = "--enable-mbstring \
47 --enable-wddx \ 46 --enable-wddx \
48 --enable-fpm \ 47 --enable-fpm \
49 --enable-zip \
50 --with-libdir=${baselib} \ 48 --with-libdir=${baselib} \
51 --with-gettext=${STAGING_LIBDIR}/.. \ 49 --with-gettext=${STAGING_LIBDIR}/.. \
52 --with-zlib=${STAGING_LIBDIR}/.. \ 50 --with-libzip=${STAGING_LIBDIR}/.. \
53 --with-iconv=${STAGING_LIBDIR}/.. \ 51 --with-iconv=${STAGING_LIBDIR}/.. \
54 --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ 52 --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
55 --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ 53 --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
diff --git a/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch
new file mode 100644
index 0000000000..ccc6d4ede1
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch
@@ -0,0 +1,23 @@
1Use pkg-config for libxml2 detection.
2
3xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS.
4
5Upstream-Status: Inappropriate [configuration]
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 configure.in | 15 ++-------------
10 1 file changed, 2 insertions(+), 13 deletions(-)
11--- a/acinclude.m4
12+++ b/acinclude.m4
13@@ -2481,8 +2481,8 @@ AC_DEFUN([PHP_SETUP_LIBXML], [
14 LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
15 if test "$LIBXML_VERSION" -ge "2006011"; then
16 found_libxml=yes
17- LIBXML_LIBS=`$XML2_CONFIG --libs`
18- LIBXML_INCS=`$XML2_CONFIG --cflags`
19+ LIBXML_LIBS=`pkg-config --libs libxml-2.0`
20+ LIBXML_INCS=`pkg-config --cflags libxml-2.0`
21 else
22 AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.])
23 fi
diff --git a/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch b/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
index a250cac83a..51dbe269cb 100644
--- a/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
+++ b/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
@@ -1,6 +1,6 @@
1From dfebe81f946a83fe2499fc84d4f3dbdc5612276c Mon Sep 17 00:00:00 2001 1From d2679c89c0b15b90e5360b4863258a7955e5f4e5 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 3 Apr 2018 11:35:03 +0800 3Date: Tue, 12 Feb 2019 15:59:19 +0800
4Subject: [PATCH] acinclude.m4: don't unset cache variables 4Subject: [PATCH] acinclude.m4: don't unset cache variables
5 5
6Unsetting prevents cache variable from being passed to configure. 6Unsetting prevents cache variable from being passed to configure.
@@ -8,15 +8,18 @@ Unsetting prevents cache variable from being passed to configure.
8Upstream-Status: Inappropriate [OE-specific] 8Upstream-Status: Inappropriate [OE-specific]
9 9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11
12update patch to version 7.3.2
13Signed-off-by: Changqing Li <changqing.li@windriver.com>
11--- 14---
12 acinclude.m4 | 4 ---- 15 acinclude.m4 | 4 ----
13 1 file changed, 4 deletions(-) 16 1 file changed, 4 deletions(-)
14 17
15diff --git a/acinclude.m4 b/acinclude.m4 18diff --git a/acinclude.m4 b/acinclude.m4
16index f6a55ec..d3346df 100644 19index 25f900d..2641969 100644
17--- a/acinclude.m4 20--- a/acinclude.m4
18+++ b/acinclude.m4 21+++ b/acinclude.m4
19@@ -1890,8 +1890,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,])) 22@@ -1921,8 +1921,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,]))
20 dnl 23 dnl
21 AC_DEFUN([PHP_CHECK_FUNC_LIB],[ 24 AC_DEFUN([PHP_CHECK_FUNC_LIB],[
22 ifelse($2,,:,[ 25 ifelse($2,,:,[
@@ -25,14 +28,14 @@ index f6a55ec..d3346df 100644
25 unset found 28 unset found
26 AC_CHECK_LIB($2, $1, [found=yes], [ 29 AC_CHECK_LIB($2, $1, [found=yes], [
27 AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) 30 AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
28@@ -1923,8 +1921,6 @@ dnl in the default libraries and as a fall back in the specified library. 31@@ -1954,8 +1952,6 @@ dnl in the default libraries and as a fall back in the specified library.
29 dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS. 32 dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
30 dnl 33 dnl
31 AC_DEFUN([PHP_CHECK_FUNC],[ 34 AC_DEFUN([PHP_CHECK_FUNC],[
32- unset ac_cv_func_$1 35- unset ac_cv_func_$1
33- unset ac_cv_func___$1 36- unset ac_cv_func___$1
34 unset found 37 unset found
35 38
36 AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) 39 AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
37-- 40--
382.7.4 412.7.4
diff --git a/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch b/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch
deleted file mode 100644
index 6ab101b410..0000000000
--- a/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 0d88d735887c6f2fa00a743c27124c7a52006a41 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sun, 15 Apr 2018 19:17:27 -0700
4Subject: [PATCH] fix error caused by a new variable is declared after the
5 label
6
7There is a build failure on mips:
8...
9|sljitNativeMIPS_common.c: In function 'sljit_has_cpu_feature':
10|sljitNativeMIPS_common.c:506:3: error: a label can only be part
11of a statement and a declaration is not a statement
12| sljit_sw fir;
13| ^~~~~~~~
14...
15
16Upstream-Status: Pending
17
18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19---
20 ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c | 4 +++-
21 1 file changed, 3 insertions(+), 1 deletion(-)
22
23diff --git a/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c b/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c
24index ee207fe..adfd342 100644
25--- a/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c
26+++ b/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c
27@@ -498,12 +498,14 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
28
29 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
30 {
31+#if defined(__GNUC__)
32+ sljit_sw fir;
33+#endif
34 switch (feature_type) {
35 case SLJIT_HAS_FPU:
36 #ifdef SLJIT_IS_FPU_AVAILABLE
37 return SLJIT_IS_FPU_AVAILABLE;
38 #elif defined(__GNUC__)
39- sljit_sw fir;
40 asm ("cfc1 %0, $0" : "=r"(fir));
41 return (fir >> 22) & 0x1;
42 #else
43--
442.10.2
45
diff --git a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
index 0d24d34f2b..9ffd0e4de1 100644
--- a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
+++ b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
@@ -1,6 +1,6 @@
1From b2fb725dc404d471371731b663234e87cb0fca84 Mon Sep 17 00:00:00 2001 1From fb139d9707dabe1684b472a08a6eb5761ede4a3a Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 2 Apr 2018 17:54:52 +0800 3Date: Tue, 12 Feb 2019 14:56:16 +0800
4Subject: [PATCH] opcache/config.m4: enable opcache 4Subject: [PATCH] opcache/config.m4: enable opcache
5 5
6We can't use AC_TRY_RUN to run programs in a cross compile environment. Set 6We can't use AC_TRY_RUN to run programs in a cross compile environment. Set
@@ -10,42 +10,41 @@ enough linux kernel.
10Upstream-Status: Inappropriate [Configuration] 10Upstream-Status: Inappropriate [Configuration]
11 11
12Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 12Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
13
14update patch to version 7.3.2
15Signed-off-by: Changqing Li <changqing.li@windriver.com>
13--- 16---
14 ext/opcache/config.m4 | 349 ++------------------------------------------------ 17 ext/opcache/config.m4 | 357 +-------------------------------------------------
15 1 file changed, 8 insertions(+), 341 deletions(-) 18 1 file changed, 6 insertions(+), 351 deletions(-)
16 19
17diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 20diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
18index 7b500f0..10bb99a 100644 21index 392f4c6..6617693 100644
19--- a/ext/opcache/config.m4 22--- a/ext/opcache/config.m4
20+++ b/ext/opcache/config.m4 23+++ b/ext/opcache/config.m4
21@@ -28,353 +28,20 @@ if test "$PHP_OPCACHE" != "no"; then 24@@ -27,374 +27,29 @@ if test "$PHP_OPCACHE" != "no"; then
22
23 AC_CHECK_HEADERS([unistd.h sys/uio.h]) 25 AC_CHECK_HEADERS([unistd.h sys/uio.h])
24 26
25- AC_MSG_CHECKING(for sysvipc shared memory support) 27 AC_MSG_CHECKING(for sysvipc shared memory support)
26- AC_TRY_RUN([ 28- AC_RUN_IFELSE([AC_LANG_SOURCE([[
27-#include <sys/types.h> 29-#include <sys/types.h>
28-#include <sys/wait.h> 30-#include <sys/wait.h>
29-#include <sys/ipc.h> 31-#include <sys/ipc.h>
30-#include <sys/shm.h> 32-#include <sys/shm.h>
31-#include <unistd.h> 33-#include <unistd.h>
32-#include <string.h> 34-#include <string.h>
33+ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) 35-
34
35-int main() { 36-int main() {
36- pid_t pid; 37- pid_t pid;
37- int status; 38- int status;
38- int ipc_id; 39- int ipc_id;
39- char *shm; 40- char *shm;
40- struct shmid_ds shmbuf; 41- struct shmid_ds shmbuf;
41+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) 42-
42
43- ipc_id = shmget(IPC_PRIVATE, 4096, (IPC_CREAT | SHM_R | SHM_W)); 43- ipc_id = shmget(IPC_PRIVATE, 4096, (IPC_CREAT | SHM_R | SHM_W));
44- if (ipc_id == -1) { 44- if (ipc_id == -1) {
45- return 1; 45- return 1;
46- } 46- }
47+ AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support]) 47-
48
49- shm = shmat(ipc_id, NULL, 0); 48- shm = shmat(ipc_id, NULL, 0);
50- if (shm == (void *)-1) { 49- if (shm == (void *)-1) {
51- shmctl(ipc_id, IPC_RMID, NULL); 50- shmctl(ipc_id, IPC_RMID, NULL);
@@ -90,13 +89,14 @@ index 7b500f0..10bb99a 100644
90- } 89- }
91- return 0; 90- return 0;
92-} 91-}
93-],dnl 92-]])],[dnl
94- AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) 93- AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
95- msg=yes,msg=no,msg=no) 94- msg=yes],[msg=no],[msg=no])
96- AC_MSG_RESULT([$msg]) 95- AC_MSG_RESULT([$msg])
97- 96+ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
98- AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support) 97
99- AC_TRY_RUN([ 98 AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support)
99- AC_RUN_IFELSE([AC_LANG_SOURCE([[
100-#include <sys/types.h> 100-#include <sys/types.h>
101-#include <sys/wait.h> 101-#include <sys/wait.h>
102-#include <sys/mman.h> 102-#include <sys/mman.h>
@@ -142,13 +142,14 @@ index 7b500f0..10bb99a 100644
142- } 142- }
143- return 0; 143- return 0;
144-} 144-}
145-],dnl 145-]])],[dnl
146- AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) 146- AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
147- msg=yes,msg=no,msg=no) 147- msg=yes],[msg=no],[msg=no])
148- AC_MSG_RESULT([$msg]) 148- AC_MSG_RESULT([$msg])
149- 149+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
150- AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support) 150
151- AC_TRY_RUN([ 151 AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support)
152- AC_RUN_IFELSE([AC_LANG_SOURCE([[
152-#include <sys/types.h> 153-#include <sys/types.h>
153-#include <sys/wait.h> 154-#include <sys/wait.h>
154-#include <sys/mman.h> 155-#include <sys/mman.h>
@@ -197,13 +198,14 @@ index 7b500f0..10bb99a 100644
197- } 198- }
198- return 0; 199- return 0;
199-} 200-}
200-],dnl 201-]])],[dnl
201- AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support]) 202- AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support])
202- msg=yes,msg=no,msg=no) 203- msg=yes],[msg=no],[msg=no])
203- AC_MSG_RESULT([$msg]) 204- AC_MSG_RESULT([$msg])
204- 205+ AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support])
205- AC_MSG_CHECKING(for mmap() using shm_open() shared memory support) 206
206- AC_TRY_RUN([ 207 AC_MSG_CHECKING(for mmap() using shm_open() shared memory support)
208- AC_RUN_IFELSE([AC_LANG_SOURCE([[
207-#include <sys/types.h> 209-#include <sys/types.h>
208-#include <sys/wait.h> 210-#include <sys/wait.h>
209-#include <sys/mman.h> 211-#include <sys/mman.h>
@@ -266,14 +268,14 @@ index 7b500f0..10bb99a 100644
266- } 268- }
267- return 0; 269- return 0;
268-} 270-}
269-],dnl 271-]])],[dnl
270- AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) 272- AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
271- msg=yes,msg=no,msg=no) 273- msg=yes],[msg=no],[msg=no])
272- AC_MSG_RESULT([$msg]) 274- AC_MSG_RESULT([$msg])
273+ AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) 275+ AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
274 276
275 AC_MSG_CHECKING(for mmap() using regular file shared memory support) 277 AC_MSG_CHECKING(for mmap() using regular file shared memory support)
276- AC_TRY_RUN([ 278- AC_RUN_IFELSE([AC_LANG_SOURCE([[
277-#include <sys/types.h> 279-#include <sys/types.h>
278-#include <sys/wait.h> 280-#include <sys/wait.h>
279-#include <sys/mman.h> 281-#include <sys/mman.h>
@@ -336,50 +338,70 @@ index 7b500f0..10bb99a 100644
336- } 338- }
337- return 0; 339- return 0;
338-} 340-}
339-],dnl 341-]])],[dnl
340- AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support]) 342- AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support])
341- msg=yes,msg=no,msg=no) 343- msg=yes],[msg=no],[msg=no])
342- AC_MSG_RESULT([$msg]) 344- AC_MSG_RESULT([$msg])
345+ AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support])
346
347 flock_type=unknown
348 AC_MSG_CHECKING(for struct flock layout)
349
350 if test "$flock_type" = "unknown"; then
351-AC_RUN_IFELSE([AC_LANG_SOURCE([[
352- #include <fcntl.h>
353- struct flock lock = { 1, 2, 3, 4, 5, 6, 7 };
354- int main() {
355- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 6 && lock.l_len== 7) {
356- return 0;
357- }
358- return 1;
359- }
360-]])], [
361- flock_type=aix64
362- AC_DEFINE([HAVE_FLOCK_AIX64], [], [Struct flock is 64-bit AIX-type])
363-], [])
364-fi
343- 365-
344-flock_type=unknown 366-if test "$flock_type" = "unknown"; then
345-AC_MSG_CHECKING("whether flock struct is linux ordered") 367-AC_RUN_IFELSE([AC_LANG_SOURCE([[
346-AC_TRY_RUN([
347- #include <fcntl.h> 368- #include <fcntl.h>
348- struct flock lock = { 1, 2, 3, 4, 5 }; 369- struct flock lock = { 1, 2, 3, 4, 5 };
349- int main() { 370- int main() {
350- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) { 371- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
351- return 0; 372- return 0;
352- } 373- }
353- return 1; 374- return 1;
354- } 375- }
355-], [ 376-]])], [
356- flock_type=linux 377- flock_type=linux
357- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) 378+ flock_type=linux
358- AC_MSG_RESULT("yes") 379 AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
359-], AC_MSG_RESULT("no") ) 380-], [])
360+ 381 fi
361+ AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support])
362 382
363-AC_MSG_CHECKING("whether flock struct is BSD ordered") 383 if test "$flock_type" = "unknown"; then
364-AC_TRY_RUN([ 384-AC_RUN_IFELSE([AC_LANG_SOURCE([[
365- #include <fcntl.h> 385- #include <fcntl.h>
366- struct flock lock = { 1, 2, 3, 4, 5 }; 386- struct flock lock = { 1, 2, 3, 4, 5 };
367- int main() { 387- int main() {
368- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) { 388- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
369- return 0; 389- return 0;
370- } 390- }
371- return 1; 391- return 1;
372- } 392- }
373-], [ 393-]])], [
374- flock_type=bsd 394- flock_type=bsd
375- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) 395- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
376- AC_MSG_RESULT("yes") 396-], [])
377-], AC_MSG_RESULT("no") ) 397-fi
378+ flock_type=linux 398-
379+ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) 399-AC_MSG_RESULT([$flock_type])
380 400-
381 if test "$flock_type" = "unknown"; then 401-if test "$flock_type" = "unknown"; then
382 AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) 402 AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
403 fi
404
383-- 405--
3842.7.4 4062.7.4
385 407
diff --git a/meta-oe/recipes-devtools/php/php/0048-Use-pkg-config-for-FreeType2-detection.patch b/meta-oe/recipes-devtools/php/php/0048-Use-pkg-config-for-FreeType2-detection.patch
new file mode 100644
index 0000000000..f36ddac262
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/0048-Use-pkg-config-for-FreeType2-detection.patch
@@ -0,0 +1,53 @@
1From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@sury.org>
2Date: Mon, 22 Oct 2018 06:54:31 +0000
3Subject: Use pkg-config for FreeType2 detection
4
5---
6 ext/gd/config.m4 | 30 +++++++++++++++++++-----------
7 1 file changed, 19 insertions(+), 11 deletions(-)
8
9diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
10index 498d870..d28c6ae 100644
11--- a/ext/gd/config.m4
12+++ b/ext/gd/config.m4
13@@ -184,21 +184,29 @@ AC_DEFUN([PHP_GD_XPM],[
14 AC_DEFUN([PHP_GD_FREETYPE2],[
15 if test "$PHP_FREETYPE_DIR" != "no"; then
16
17- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
18- if test -f "$i/bin/freetype-config"; then
19- FREETYPE2_DIR=$i
20- FREETYPE2_CONFIG="$i/bin/freetype-config"
21- break
22+ if test -z "$PKG_CONFIG"; then
23+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
24+ fi
25+ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
26+ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
27+ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
28+ else
29+ for i in $PHP_FREETYPE_DIR /usr/local /usr; do
30+ if test -f "$i/bin/freetype-config"; then
31+ FREETYPE2_DIR=$i
32+ FREETYPE2_CONFIG="$i/bin/freetype-config"
33+ break
34+ fi
35+ done
36+
37+ if test -z "$FREETYPE2_DIR"; then
38+ AC_MSG_ERROR([freetype-config not found.])
39 fi
40- done
41
42- if test -z "$FREETYPE2_DIR"; then
43- AC_MSG_ERROR([freetype-config not found.])
44+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
45+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
46 fi
47
48- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
49- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
50-
51 PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
52 PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
53 AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
diff --git a/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch b/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch
new file mode 100644
index 0000000000..deada1ff97
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch
@@ -0,0 +1,111 @@
1From: Hugh McMaster <hugh.mcmaster@outlook.com>
2Date: Wed, 5 Dec 2018 23:27:30 +1100
3Subject: ext/intl: Use pkg-config to detect icu
4
5The developers of icu recommend using pkg-config to detect icu,
6because icu-config is deprecated.
7---
8 acinclude.m4 | 56 +++++++-----------------------------------------------
9 ext/intl/config.m4 | 16 ++++++----------
10 2 files changed, 13 insertions(+), 59 deletions(-)
11
12--- php7.3.orig/acinclude.m4
13+++ php7.3/acinclude.m4
14@@ -2168,58 +2168,16 @@ dnl
15 dnl Common setup macro for ICU
16 dnl
17 AC_DEFUN([PHP_SETUP_ICU],[
18- PHP_ARG_WITH(icu-dir,,
19- [ --with-icu-dir=DIR Specify where ICU libraries and headers can be found], DEFAULT, no)
20+ PKG_CHECK_MODULES([ICU], [icu-io >= 50.1])
21
22- if test "$PHP_ICU_DIR" = "no"; then
23- PHP_ICU_DIR=DEFAULT
24- fi
25-
26- if test "$PHP_ICU_DIR" = "DEFAULT"; then
27- dnl Try to find icu-config
28- AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin])
29- else
30- ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
31- fi
32-
33- AC_MSG_CHECKING([for location of ICU headers and libraries])
34-
35- dnl Trust icu-config to know better what the install prefix is..
36- icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
37- if test "$?" != "0" || test -z "$icu_install_prefix"; then
38- AC_MSG_RESULT([not found])
39- AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.])
40- else
41- AC_MSG_RESULT([$icu_install_prefix])
42-
43- dnl Check ICU version
44- AC_MSG_CHECKING([for ICU 4.0 or greater])
45- icu_version_full=`$ICU_CONFIG --version`
46- ac_IFS=$IFS
47- IFS="."
48- set $icu_version_full
49- IFS=$ac_IFS
50- icu_version=`expr [$]1 \* 1000 + [$]2`
51- AC_MSG_RESULT([found $icu_version_full])
52-
53- if test "$icu_version" -lt "4000"; then
54- AC_MSG_ERROR([ICU version 4.0 or later is required])
55- fi
56+ PHP_EVAL_INCLINE($ICU_CFLAGS)
57+ PHP_EVAL_LIBLINE($ICU_LIBS, $1)
58
59- ICU_VERSION=$icu_version
60- ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
61- ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
62- PHP_EVAL_INCLINE($ICU_INCS)
63- PHP_EVAL_LIBLINE($ICU_LIBS, $1)
64+ ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
65+ ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
66
67- ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags`
68- if test "$icu_version" -ge "49000"; then
69- ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
70- ICU_CFLAGS="-DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
71- fi
72- if test "$icu_version" -ge "60000"; then
73- ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
74- fi
75+ if $PKG_CONFIG icu-io --atleast-version=60; then
76+ ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
77 fi
78 ])
79
80--- php7.3.orig/ext/intl/config.m4
81+++ php7.3/ext/intl/config.m4
82@@ -9,15 +9,7 @@ if test "$PHP_INTL" != "no"; then
83 PHP_SETUP_ICU(INTL_SHARED_LIBADD)
84 PHP_SUBST(INTL_SHARED_LIBADD)
85 PHP_REQUIRE_CXX()
86- INTL_COMMON_FLAGS="$ICU_INCS $ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
87- if test "$icu_version" -ge "4002"; then
88- icu_spoof_src=" spoofchecker/spoofchecker_class.c \
89- spoofchecker/spoofchecker.c\
90- spoofchecker/spoofchecker_create.c\
91- spoofchecker/spoofchecker_main.c"
92- else
93- icu_spoof_src=""
94- fi
95+ INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
96 PHP_NEW_EXTENSION(intl, php_intl.c \
97 intl_error.c \
98 intl_convert.c \
99@@ -68,7 +60,11 @@ if test "$PHP_INTL" != "no"; then
100 transliterator/transliterator_methods.c \
101 uchar/uchar.c \
102 idn/idn.c \
103- $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS,cxx)
104+ spoofchecker/spoofchecker_class.c \
105+ spoofchecker/spoofchecker.c\
106+ spoofchecker/spoofchecker_create.c\
107+ spoofchecker/spoofchecker_main.c \
108+ , $ext_shared,,$INTL_COMMON_FLAGS,cxx)
109
110 PHP_INTL_CXX_SOURCES="intl_convertcpp.cpp \
111 common/common_enum.cpp \
diff --git a/meta-oe/recipes-devtools/php/php/CVE-2017-9120.patch b/meta-oe/recipes-devtools/php/php/CVE-2017-9120.patch
deleted file mode 100644
index 728f25bb6e..0000000000
--- a/meta-oe/recipes-devtools/php/php/CVE-2017-9120.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1php: patch for CVE-2017-9120
2
3Upstream-Status: Backport [https://bugs.php.net/bug.php?id=74544]
4
5CVE: CVE-2017-9120
6
7Signed-off-by: Changqing Li <changqing.li@windriver.com>
8
9diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
10index 03a39d7..7b88731 100644
11--- a/ext/mysqli/mysqli_api.c
12+++ b/ext/mysqli/mysqli_api.c
13@@ -1965,7 +1965,7 @@ PHP_FUNCTION(mysqli_real_escape_string) {
14 }
15 MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
16
17- newstr = zend_string_alloc(2 * escapestr_len, 0);
18+ newstr = zend_string_safe_alloc(2, escapestr_len, 0, 0);
19 ZSTR_LEN(newstr) = mysql_real_escape_string(mysql->mysql, ZSTR_VAL(newstr), escapestr, escapestr_len);
20 newstr = zend_string_truncate(newstr, ZSTR_LEN(newstr), 0);
21
diff --git a/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
deleted file mode 100644
index 3e901841be..0000000000
--- a/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From 3bfcc7fdd22261eaed10949714de0a90d31e10ab Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
3Date: Thu, 20 Aug 2015 16:29:35 +0800
4Subject: [PATCH] [PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK
5
6Upstream-Status: Pending
7
8AC_TRY_RUN is not suitable for cross-compile
9
10Signed-off-by: Roy Li <rongqing.li@windriver.com>
11
12%% original patch: change-AC_TRY_RUN-to-AC_TRY_LINK.patch
13---
14 ext/fileinfo/config.m4 | 31 ++++++-------------------------
15 1 file changed, 6 insertions(+), 25 deletions(-)
16
17diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
18index 523b4fd..0aaa4c8 100644
19--- a/ext/fileinfo/config.m4
20+++ b/ext/fileinfo/config.m4
21@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then
22 libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c"
23
24 AC_MSG_CHECKING([for strcasestr])
25- AC_TRY_RUN([
26-#include <string.h>
27-#include <strings.h>
28-#include <stdlib.h>
29-
30-int main(void)
31-{
32- char *s0, *s1, *ret;
33-
34- s0 = (char *) malloc(42);
35- s1 = (char *) malloc(8);
36-
37- memset(s0, 'X', 42);
38- s0[24] = 'Y';
39- s0[26] = 'Z';
40- s0[41] = '\0';
41- memset(s1, 'x', 8);
42- s1[0] = 'y';
43- s1[2] = 'Z';
44- s1[7] = '\0';
45-
46- ret = strcasestr(s0, s1);
47-
48- return !(NULL != ret);
49-}
50+ AC_TRY_COMPILE([
51+ #include <string.h>
52+ #include <strings.h>
53+ #include <stdlib.h>
54+ ],[
55+ strcasestr(NULL, NULL);
56 ],[
57 dnl using the platform implementation
58 AC_MSG_RESULT(yes)
59--
602.7.4
61
diff --git a/meta-oe/recipes-devtools/php/php/php5-0001-acinclude.m4-don-t-unset-cache-variables.patch b/meta-oe/recipes-devtools/php/php/php5-0001-acinclude.m4-don-t-unset-cache-variables.patch
new file mode 100644
index 0000000000..72ad554a17
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/php5-0001-acinclude.m4-don-t-unset-cache-variables.patch
@@ -0,0 +1,42 @@
1From 1fb5a3b3e6c9cf0002ff76988de72f011b642005 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 12 Feb 2019 16:25:37 +0800
4Subject: [PATCH] acinclude.m4: don't unset cache variables
5
6Unsetting prevents cache variable from being passed to configure.
7
8Upstream-Status: Inappropriate [OE-specific]
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11
12update patch to version 5.6.40
13Signed-off-by: Changqing Li <changqing.li@windriver.com>
14---
15 acinclude.m4 | 4 ----
16 1 file changed, 4 deletions(-)
17
18diff --git a/acinclude.m4 b/acinclude.m4
19index b188eee..ed32fc5 100644
20--- a/acinclude.m4
21+++ b/acinclude.m4
22@@ -1897,8 +1897,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,]))
23 dnl
24 AC_DEFUN([PHP_CHECK_FUNC_LIB],[
25 ifelse($2,,:,[
26- unset ac_cv_lib_$2[]_$1
27- unset ac_cv_lib_$2[]___$1
28 unset found
29 AC_CHECK_LIB($2, $1, [found=yes], [
30 AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
31@@ -1930,8 +1928,6 @@ dnl in the default libraries and as a fall back in the specified library.
32 dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
33 dnl
34 AC_DEFUN([PHP_CHECK_FUNC],[
35- unset ac_cv_func_$1
36- unset ac_cv_func___$1
37 unset found
38
39 AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
40--
412.7.4
42
diff --git a/meta-oe/recipes-devtools/php/php_5.6.39.bb b/meta-oe/recipes-devtools/php/php_5.6.40.bb
index a1e7dcdec3..9f5bac7e21 100644
--- a/meta-oe/recipes-devtools/php/php_5.6.39.bb
+++ b/meta-oe/recipes-devtools/php/php_5.6.40.bb
@@ -8,6 +8,7 @@ SRC_URI += "file://php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
8 file://acinclude-xml2-config.patch \ 8 file://acinclude-xml2-config.patch \
9 file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \ 9 file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \
10 file://0001-PHP-5.6-LibSSL-1.1-compatibility.patch \ 10 file://0001-PHP-5.6-LibSSL-1.1-compatibility.patch \
11 file://php5-0001-acinclude.m4-don-t-unset-cache-variables.patch \
11 " 12 "
12 13
13SRC_URI_append_class-target = " \ 14SRC_URI_append_class-target = " \
@@ -16,8 +17,8 @@ SRC_URI_append_class-target = " \
16 file://php5-0001-opcache-config.m4-enable-opcache.patch \ 17 file://php5-0001-opcache-config.m4-enable-opcache.patch \
17 " 18 "
18 19
19SRC_URI[md5sum] = "6951d66bf07ce35beda3be0a66bd8e7c" 20SRC_URI[md5sum] = "44633604d2fece1f53f508bc16751b74"
20SRC_URI[sha256sum] = "b3db2345f50c010b01fe041b4e0f66c5aa28eb325135136f153e18da01583ad5" 21SRC_URI[sha256sum] = "ffd025d34623553ab2f7fd8fb21d0c9e6f9fa30dc565ca03a1d7b763023fba00"
21 22
22DEPENDS += "libmcrypt" 23DEPENDS += "libmcrypt"
23EXTRA_OECONF += "--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ 24EXTRA_OECONF += "--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
diff --git a/meta-oe/recipes-devtools/php/php_7.2.10.bb b/meta-oe/recipes-devtools/php/php_7.3.2.bb
index 8dc64bb89b..db04ce3756 100644
--- a/meta-oe/recipes-devtools/php/php_7.2.10.bb
+++ b/meta-oe/recipes-devtools/php/php_7.3.2.bb
@@ -1,11 +1,11 @@
1require php.inc 1require php.inc
2 2
3LIC_FILES_CHKSUM = "file://LICENSE;md5=67e369bc8d1f2e641236b8002039a6a2" 3LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e"
4 4
5SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ 5SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \
6 file://0001-acinclude.m4-skip-binconfig-check-for-libxml.patch \ 6 file://0048-Use-pkg-config-for-FreeType2-detection.patch \
7 file://0001-fix-error-caused-by-a-new-variable-is-declared-after.patch \ 7 file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \
8 file://CVE-2017-9120.patch \ 8 file://0001-Use-pkg-config-for-libxml2-detection.patch \
9 " 9 "
10SRC_URI_append_class-target = " \ 10SRC_URI_append_class-target = " \
11 file://pear-makefile.patch \ 11 file://pear-makefile.patch \
@@ -13,8 +13,8 @@ SRC_URI_append_class-target = " \
13 file://0001-opcache-config.m4-enable-opcache.patch \ 13 file://0001-opcache-config.m4-enable-opcache.patch \
14 " 14 "
15 15
16SRC_URI[md5sum] = "0ce8ff615bfb9de7a89bab8d742c11c0" 16SRC_URI[md5sum] = "c893ff828945c274d90e026528142439"
17SRC_URI[sha256sum] = "01b6129a0921a1636b07da9bc598a876669e45a462cef4b5844fc26862dbda9d" 17SRC_URI[sha256sum] = "946f50dacbd2f61e643bb737021cbe8b1816e780ee7ad3e0cd999a1892ab0add"
18 18
19PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ 19PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
20 --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ 20 --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-31 06:52:27 +0000