Commit Graph

127 Commits

Author SHA1 Message Date
Joe Slater
69dcf5bac8 php: move to version 7.4.21
Lots of bug fixes.

CVE: CVE-2021-21704 CVE-2021-21705

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 93045c3db7)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2021-08-01 09:26:19 -07:00
Mingli Yu
6289ad43f8 php: Upgrade to 7.4.16
License-Update: License updated (year updated)

Fix some security issues such as CVE-2021-21702 and remove two
cve patches which already included in the new version.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2021-04-23 19:09:51 -07:00
Changqing Li
9be6b4f5a2 php: allow php as empty
Since commit c4ffcaa2[php: split out phpdbg into a separate package],
package php is empty, we might met error:
nothing provides php needed by php-cli-7.4.9-r0.corei7_64

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-03-11 00:12:55 -08:00
Diego Santa Cruz
c4ffcaa2ab php: split out phpdbg into a separate package
Since PHP 7.0 the phpdbg debugger is built by default and gets shipped
in the main php package, increasing its size by several MB; split it
out into a php-phpdbg package, following Debian naming.

Signed-off-by: Diego Santa Cruz <Diego.SantaCruz@spinetix.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-02-25 19:44:48 -08:00
Zheng Ruoqin
fa80193468 php: CVE-2020-7069
Security Advisory

References
https://nvd.nist.gov/vuln/detail/CVE-2020-7069
https://bugs.php.net/patch-display.php?bug_id=79601&patch=openssl_aes_ccm_iv_fix&revision=latest

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-12-15 00:52:55 -08:00
Zheng Ruoqin
aff8a1fefb php: CVE-2020-7070
Security Advisory

References
https://nvd.nist.gov/vuln/detail/CVE-2020-7070
https://bugs.php.net/patch-display.php?bug=79699&patch=fix-urldecode&revision=1600650364
https://github.com/php/php-src/blob/master/main/php_variables.c

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-12-15 00:52:55 -08:00
Max Kellermann
5cd29d53b3 php: remove the failing ${D}/${TMPDIR} code
Appending ${TMPDIR} to ${D} doesn't make any sense, because both are
absolute paths.  And additionally, the code fails:

 rmdir: failed to remove '/usr/src/oe/tmp-musl/work/core2-64-oe-linux-musl/php/7.1.9-r0/image//usr': Directory not empty

Signed-off-by: Max Kellermann <max.kellermann@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-11-23 20:44:40 -08:00
Qi.Chen@windriver.com
75d7f48c66 php: use /run instead /var/run in systemd service file
/var/run has been deprecated by systemd, so use /run instead,
as suggested by systemd.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-10-16 09:21:54 -07:00
Leon Anavi
f46931abf0 php: Upgrade 7.4.4 -> 7.4.9
Upgrade to release 7.4.9:

- Fixed: Upgrade apache2handler's php_apache_sapi_get_request_time
  to return usec
- Fixed: BSTR to PHP string conversion not binary safe
- Fixed: DCOM does not work with Username, Password parameter
- Fixed: serialize() and unserialize() methods can not be called
  statically
- Fixed: Segfault in php_str_replace_common
- Fixed: Assertion failure if dumping closure with unresolved
  static variable
- Fixed: Assertion failure when assigning property of string
  offset by reference
- Fixed: HT iterators not removed if empty array is destroyed
- Fixed: Changing array during undef index RW error segfaults
- Fixed: Use after free if changing array during undef var during
  array write fetch
- Fixed: Use after free if string used in undefined index warning
  is changed
- Fixed: Public non-static property in child should take priority
  over private static
- Fixed: getimagesize function silently truncates after a null
  byte
- Fixed: finfo_file crash (FILEINFO_MIME)
- Fixed: ftp_size on large files
- Fixed: mb_strimwidth does not trim string
- Fixed: Use of freed hash key in the phar_parse_zipfile function
- Fixed: ::getStaticProperties() ignores property modifications
- Fixed: ::getStaticPropertyValue() throws on protected props
- Fixed: Use after free when type duplicated into
  ReflectionProperty gets resolved
- Fixed: Can't copy() large 'data://' with open_basedir
- Fixed: dns_check_record() always return true on Alpine
- Fixed: array_walk() does not respect property types

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-08-31 13:04:43 -07:00
Claude Bing
3cfd16be4e php: update fix for opcache link issue in 7.4.4
The source of the issue is the update for PHP 7.4 support in
0001-opcache-config.m4-enable-opcache.patch (commit 7cc7a9ec).  Instead
of working around the issue in the recipe file, update the patch to
restore the call to PHP_ADD_LIBRARY().

Signed-off-by: Claude Bing <cbing@cybernetics.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-05-08 19:56:06 -07:00
Claude Bing
0145cb4645 php: fix opcache link error in 7.4
Explicitly specifying -lrt is required for opcache to be linked against
the proper dependencies.  Additionally, PHP disables libdl when it
detects a cross-compilation environment for some reason.  In order to
load any type of extension, re-enabling libdl is required.

Signed-off-by: Claude Bing <cbing@cybernetics.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-05-07 23:01:29 -07:00
Claude Bing
7aeef522ff php: fix PACKAGECONFIG for soap
PHP 7.4 enables libxml by default and removed it as a configurable
option.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-05-06 23:20:29 -07:00
Konrad Weihmann
171b924a1f php: add multibyte string support config
Add mbstring to PACKAGECONFIG to enable
multibyte string support in php

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-05-04 12:15:50 -07:00
Konrad Weihmann
6690afa59e php: fix zip package config
--enable-zip and --with-libzip were removed in PHP 7.x.
These are replaced by --with-zip --with-zlib-dir.

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-05-04 12:15:50 -07:00
Changqing Li
7cc7a9ec88 php: upgrade 7.3.16 -> 7.4.4
License-Update: License updated (year updated)

note: for 7.4, pear is disabled by default,
and it will be deprecated in future.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-04-27 07:48:47 -07:00
Changqing Li
60c1d2eb9a php: upgrade 7.3.11 -> 7.3.16
* upgrade to 7.3.16
* remove unuseful patches

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-04-16 08:43:06 -07:00
Wang Mingyu
539119d170 php: CVE-2019-11045.patch CVE-2019-11046.patch CVE-2019-11047.patch CVE-2019-11050.patch
Security Advisory

References:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11045
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11046
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11047
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11050

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-03-18 19:29:01 -07:00
Li Zhou
664f8e1373 php: Security Advisory - php - CVE-2020-7059
Backport the patch <http://git.php.net/?p=php-src.git;a=commit;
h=0f79b1bf301f455967676b5129240140c5c45b09> to solve CVE-2020-7059.
Because of the version context, this porting mainly refers to the
version merging commit <http://git.php.net/?p=php-src.git;a=commit;
h=a8a6242db7c01bb2d87f29e9b8d5ff3f0f847645>

Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-02-21 08:50:36 -08:00
Khem Raj
5057746583 meta-oe: Remove using python2
This change makes the parsing go though, we still might have build
issues, which will be reported in world builds seprately

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-01-22 09:56:34 -08:00
Adrian Bunk
5826b0f1dd php: Upgrade 7.3.9 -> 7.3.11
Patch for issue fixed upstream removed.
Also merge the inc into the recipe.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-11-01 17:22:52 -07:00
Trevor Gamblin
ec48bd3bdf php: fix CVE-2019-6978
Patch for php to sync with the fix for the same issue in
libgd.

CVE: CVE-2019-6978
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-10-04 19:11:55 -07:00
Adrian Bunk
c943bc5ea9 php: Move more into php.inc after php5 removal
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-09-10 06:54:01 -07:00
Adrian Bunk
7c9881e254 php: Remove no longer needed CFLAGS_append_aarch64
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-09-10 06:54:01 -07:00
Yi Zhao
54983c1351 php: fix module path in mod_php.conf
The apache2 module's path has been changed from ${libdir} to
${libexecdir} in commit 8d4d608b4e. Update
mod_php.conf to adapt it.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-09-10 06:54:01 -07:00
Khem Raj
c31468e37a php: Turn PCRE JIT off for riscv
Its not yet supported

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-09-10 00:45:48 -07:00
Kai Kang
99bb172561 php: sync with apache2's change
It redefines apache2's libexecdir. Update php to sync with that change.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-09-05 18:13:44 -07:00
Yuan Chao
8f91643496 php: upgrade 7.3.8 -> 7.3.9
Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-09-03 07:11:04 -07:00
Slater, Joseph
84bf94bfe9 php: zlib and zip support
Add back zlib support.  Define zip support but do not enable it.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-08-15 22:12:19 -07:00
Zang Ruochen
19661b9056 php: upgrade 7.3.7 -> 7.3.8
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-08-08 10:04:24 -07:00
Slater, Joseph
cfcbbdc48b php: remove host specific info from header file
Import patch from Debian.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-07-21 09:31:09 -07:00
Hongxu Jia
ef93dc3396 php: remove 5.6.40
Lets remove it directly, since October would be a year after
EOL so waiting until then would make it quite stale

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-07-16 09:11:02 -07:00
Zang Ruochen
7e39a2ba47 php: upgrade 7.3.6 -> 7.3.7
-Upgrade from php_7.3.6.bb to php_7.3.7.bb.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-07-10 09:24:33 -07:00
Changqing Li
30bdc92f11 php: upgrade 7.3.4 -> 7.3.6
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-15 16:45:33 -07:00
Changqing Li
f6706cec17 php-fpm-apache: fix module path
with configuration:
IMAGE_INSTALL_append = " apache2 php-fpm-apache2"

systemctl status apache2.service report error:
httpd: Syntax error on line 509 of /etc/apache2/httpd.conf: Syntax error on line 3 of /etc/apache2/conf.d/php-fpm.conf: Cannot load lib/apache

fix by correct the module path

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-15 16:45:32 -07:00
Slater, Joseph
3327944ba5 php-7: mark two tests as expected to fail
The output is reasonable, but not what is expected.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-21 17:52:23 -07:00
Changqing Li
e35c64220f php: correct httpd path
Configuration:
IMAGE_INSTALL_append = " modphp apache2 phpmyadmin xdebug"
PACKAGECONFIG_append_pn-php = " apache2"

Apache2 service start up with error:
[php7:crit] [pid 3943:tid 140477147074880] Apache is running a threaded MPM,
but your PHP Module is not compiled to be threadsafe.

Fix:
after apache2 is upgraded from 2.4.34 to 2.4.39, apache2-native
installs httpd into STAGING_SBINDIR_NATIVE, correct it so that
ZTS feature is open, and php is compiled to be threadsafe.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-05 23:22:39 -07:00
Changqing Li
ebfe36cdc9 php: upgrade 7.3.2 -> 7.3.4
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-04-30 12:18:30 -07:00
Khem Raj
8cbd403fce php_7.3.2.bb: Switch to mysqlnd
With mariadb 10.x it fails to find headers in right location during
builds

https://bugs.php.net/bug.php?id=75612

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-03-07 09:33:45 -08:00
Changqing Li
4c2c33de56 php: upgrade 7.2.10 -> 7.3.2 / 5.3.39 -> 5.6.40
License-Update: 7.x version trim trailing whitespace

7.x:
* drop CVE-2017-9120.patch since it cannot resolve the CVE
* use recommand option --with-libzip, bundled libzip is deprecated
* update patches

5.x:
* use recommand option --with-libzip, bundled libzip is deprecated
* update patches

* Fix php 7.x cross build on hosts which have libxml2 installed

libxml2 is not detected properly, it pokes at host and takes the
libraries and header files added to build which links in libraries like
libicu which may not be available in sysroot causing configure failures
like

checking for sqlite3 files in default path... found in TOPDIR/build/tmp/work/aarch64-yoe-linux/php/7.3.2-r0/recipe-sysroot/usr/lib/..
checking for SQLite 3.3.9+... checking for sqlite3_prepare_v2 in -lsqlite3... no
not found
configure: error: Please install SQLite 3.3.9 first or check libsqlite3 is present

the reason is configure test fails to find icu libraries since they were
added based on build host's libxml2.pc

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-15 06:58:55 -08:00
Hong Liu
055da2bcec php: upgrade to 5.6.39
1.Upgrade php from 5.6.38 to 5.6.39.

Signed-off-by: Hong Liu <hongl.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-01-30 13:34:49 -08:00
André Draszik
e219649594 meta-oe: remove True option to getVar calls (again)
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).

Search & replace made using the following command:
    sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
        -i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
             | cut -d':' -f1 \
             | sort -u)

Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-01-13 10:28:01 -08:00
Max Kellermann
797c1f11bb php: fix linker errors by setting ac_cv_func_dlopen=no
The autoconf variable `ac_cv_func_dlopen` controls whether `dlopen()`
is available without linking `libdl.so`.  But that doesn't work:

 tmp-glibc/work/aarch64-oe-linux/php/7.2.10-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../libexec/aarch64-oe-linux/gcc/aarch64-oe-linux/8.2.0/ld: ext/sqlite3/libsqlite/sqlite3.o: undefined reference to symbol 'dlsym@@GLIBC_2.17'
 tmp-glibc/work/aarch64-oe-linux/php/7.2.10-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../libexec/aarch64-oe-linux/gcc/aarch64-oe-linux/8.2.0/ld: tmp-glibc/work/aarch64-oe-linux/php/7.2.10-r0/recipe-sysroot/lib/libdl.so.2: error adding symbols: DSO missing from command line

Leave `ac_cv_lib_dl_dlopen=yes`, because that's the one which controls
whether `-ldl` is needed.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-27 08:58:18 -07:00
Max Kellermann
eaf93e8c67 php: add "--without-sqlite3 --without-pdo-sqlite"
Removing "sqlite3" from `PACKAGECONFIG` doesn't actually disable
SQLite, because those options default to "yes".  It just switches from
the system SQLite to PHP's internal SQLite copy.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-27 08:58:18 -07:00
Hongxu Jia
d26bf9ae0c php5: 5.6.36 -> 5.6.38
1. Support openssl 1.1.x

2. 5.6.38 ChangeLog (http://php.net/ChangeLog-5.php#5.6.38)
- Fixed bug #76582 (XSS due to the header Transfer-Encoding: chunked).

- Fixed bug #76423 (Int Overflow lead to Heap OverFlow in
  exif_thumbnail_extract of exif.c). (CVE-2018-14883)

- Fixed bug #76557 (heap-buffer-overflow (READ of size 48) while
  reading exif data). (CVE-2018-14851)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-26 09:46:42 -07:00
Changqing Li
c467c5d609 php: Upgrade 7.2.9 -< 7.2.10
1. Upgrade 7.2.9 -> 7.2.10
2. php 5.x not support valgrind config, so move it to php_7.x.bb

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-24 11:49:45 -07:00
Khem Raj
2e07aa7804 Revert "php: actually enable openssl"
This reverts commit ff33f477c7.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-05 13:59:15 -07:00
Slater, Joseph
840850e834 php: define PACKAGECONFIG[] for valgrind
configure will look by default for valgrind.h in some host directories.
We override this by setting --with-valgrind even if we do not want it.

The default value of PACKAGECONFIG does not enable valgrind support.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-08-28 18:35:11 -07:00
Hong Liu
d3619177fc php: 7.2.8 -> 7.2.9
Upgrade php from 7.2.8 to 7.2.9

Signed-off-by: Hong Liu <hongl.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-08-28 09:36:28 -07:00
Changqing Li
0d59551c95 php: fix CVE-2017-9120
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-08-21 00:22:12 -07:00
Changqing Li
422fbb7527 php: upgrade 7.2.7 -> 7.2.8
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-08-11 20:16:53 -07:00