Commit Graph

92 Commits

Author SHA1 Message Date
Josef Schlehofer
71969eb041 php7: Update to version 7.2.25
- Fixes CVE-2019-11043

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 9bc48abd2a)
2019-11-24 22:11:39 +01:00
W. Michael Petullo
3d409f615a php7: mark /etc/config/php7-fastcgi as conffile
Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry picked from commit 5bc9bb04c5)
2019-11-24 22:11:31 +01:00
Michael Heimpold
d77c32928d php7-mod-xmlreader: add conditional dependency to php7-mod-dom (fixes #10201)
PHP7 fails to load xmlreader.so (php7-mod-xmlreader) module without
dom.so (php7-mod-dom) module loaded:

-snip-
PHP Warning:  PHP Startup: Unable to load dynamic library 'xmlreader.so'
 (tried: /usr/lib/php/xmlreader.so (Error relocating /usr/lib/php/xmlreader.so:
 dom_node_class_entry: symbol not found), /usr/lib/php/xmlreader.so.so (Error
 loading shared library /usr/lib/php/xmlreader.so.so: No such file or
 directory)) in Unknown on line 0
^C
-snap-

However, this dependency only exists when during build also php7-mod-dom
is selected.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit b8c22fc1ec)
2019-11-24 22:11:24 +01:00
Stefaan Ghysels
8667e35c1e php7: bump to 7.2.23
Signed-off-by: Stefaan Ghysels <stefaang@gmail.com>
(cherry picked from commit dacda44755)
2019-11-24 22:11:04 +01:00
Michael Heimpold
8dc64ea145 php7: update to 7.2.22
While at, update the SPDX license id to most recent format.

Compile and run tested on mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 5805da860e)
2019-11-24 22:09:50 +01:00
Michael Heimpold
882e46916a php7: update to 7.2.21
This fixes CVE-2019-11042 and CVE-2019-11041.

Compile and run tested on mxs platform

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 8e419c6d4c)
2019-11-24 22:09:50 +01:00
Michael Heimpold
68461c4c54 php7: update to 7.2.19
Compile and run tested on mxs platform

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 134ebb7a9d)
2019-06-26 22:36:43 +02:00
Michael Heimpold
f9b20e9ddb php7: update to 7.2.18
Compile and run tested on mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 59e48a68ba)
2019-06-26 22:33:52 +02:00
Michael Heimpold
7879bbdb4b Revert "php7: Fix compilation without deprecated OpenSSL APIs"
This reverts commit a176ffa0a1.
I just noticed that I accidentally used wrong openwrt branch
to compile this, with 18.09 branch the compilation fails.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2019-06-21 10:29:21 +02:00
Michael Heimpold
115f72fc48 Revert "php7: update to 7.2.18"
This reverts commit 8e9429f3e9.
I just noticed that I accidentally used wrong openwrt branch
to compile this, with 18.09 branch the compilation fails.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2019-06-21 10:28:48 +02:00
Michael Heimpold
70e4af4416 Revert "php7: update to 7.2.19"
This reverts commit 8abaf8a308.
I just noticed that I accidentally used wrong openwrt branch
to compile this, with 18.09 branch the compilation fails.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2019-06-21 10:27:01 +02:00
Michael Heimpold
8abaf8a308 php7: update to 7.2.19
Compile and run tested on mxs platform

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 134ebb7a9d)
2019-06-21 06:54:05 +02:00
Michael Heimpold
8e9429f3e9 php7: update to 7.2.18
Compile and run tested on mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 59e48a68ba)
2019-06-21 06:53:48 +02:00
Rosen Penev
a176ffa0a1 php7: Fix compilation without deprecated OpenSSL APIs
Refreshed patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit b81a2bd384)
2019-06-21 06:53:27 +02:00
Michael Heimpold
53742f130c php7: update to 7.2.17
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 71d3f6aa8c)
2019-06-21 06:52:30 +02:00
Jan Pavlinec
1a23db5b23 php7: Add PKG_CPE_ID for proper CVE tracking
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 0465f6fb46)
2019-03-26 20:21:10 +01:00
Michael Heimpold
7aacf24236 php7: update to 7.2.16
Also refresh patch which does not apply cleanly anymore.

Run tested on Duckbill for mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 80cdd53134)
2019-03-26 20:21:04 +01:00
Michael Heimpold
27433fc3eb php7: fix cross compiling patch (fixes #8166)
Fixes: e148924a4 ("php7: update to 7.2.15")

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 1d4081dd4c)
2019-03-26 20:20:57 +01:00
Michael Heimpold
00f6119bd2 php7: update to 7.2.15
Also refresh patch which does not apply cleanly anymore.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit e148924a4c)
2019-03-26 20:20:51 +01:00
Michael Heimpold
ef57201aa9 php7: update to 7.2.14
While at, add --with-pic to configure arguments. This prevents the following
build errors spotted by the build bots for i386 targets:

-snip-
...
ext/openssl/.libs/openssl.o: direct GOT relocation R_386_GOT32X against
`X509_REQ_free' without base register can not be used when making a shared object
...
-snap-

This parameter seems to make no difference on other targets, nor
improve or make worse the package size.

Run tested for i386 in VirtualBox VM and on Duckbill for mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 963c841463)
2019-03-26 20:20:43 +01:00
Michael Heimpold
e9271cf276 php7: update to 7.2.13
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 794f8f8e94)
2019-03-26 20:20:36 +01:00
Michael Heimpold
1308ba92ce php7: update to 7.2.12
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 2186fe821d)
2019-03-26 20:20:31 +01:00
Michael Heimpold
9e330d6e9d php7: update to 7.2.11
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 797776a3b3)
2019-03-26 20:20:24 +01:00
Michael Heimpold
5e25be5353 php7: update to 7.2.10
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit c69af6717c)
2019-03-26 20:20:18 +01:00
Michael Heimpold
85c616557f php7: adjust load priority for openssl (fixes #6893)
This orders loading of openssl extension before extensions
which require openssl functions.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 5afeb3f9c8)
2019-03-26 20:20:05 +01:00
Michael Heimpold
88db40cd26 php7: update to 7.2.9
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-08-23 22:14:42 +02:00
Michael Heimpold
853f87a5f6 php7: add dependency to hash for mysqlnd
The following error shows that mysqlnd depends on functions
provided by hash:

root@OpenWrt:/etc/php7# php-cli -m
PHP Warning:  PHP Startup: Unable to load dynamic library
'mysqlnd.so' (tried: /usr/lib/php/mysqlnd.so (Error
relocating /usr/lib/php/mysqlnd.so: PHP_SHA256Final: symbol
not found), /usr/lib/php/mysqlnd.so.so (Error loading shared
library /usr/lib/php/mysqlnd.so.so: No such file or
directory)) in Unknown on line 0

So let's model this dep in package metadata.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-08-23 22:14:35 +02:00
Michael Heimpold
522800696d php7: update to 7.2.8
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-07-21 23:42:23 +02:00
Michael Heimpold
98edb6e210 php7: fix load order of mysqli extension
This problem was reported by Teun Lubberhuizen, thanks!

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-07-21 23:42:15 +02:00
Michael Heimpold
cdf150d0ca php7: update to 7.2.7
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-07-21 23:42:08 +02:00
Rafał Miłecki
81332c4765 php7: add package dependency on zoneinfo-core
Having "select PACKAGE_zoneinfo-core" wasn't enough for builds without
php7-cli=y or php7-cgi=y. It didn't result in installing zoneinfo-core
when using "opkg install" (during runtime or when building images with
CONFIG_TARGET_PER_DEVICE_ROOTFS).

Missing zoneinfo results in PHP fatal errors, e.g.:
Fatal error: DateTime::createFromFormat(): Timezone database is corrupt - this should *never* happen!

For years users were told to manually install zoneinfo-core package.
This problem was hidden for some time (including 17.01 release) due to
disabled support for CONFIG_PHP7_SYSTEMTZDATA. It's now back as support
for --with-system-tzdata was enabled again.

The proper solution is to simply make php7 package depend on
zoneinfo-core when PHP7_SYSTEMTZDATA is used.

Fixes: 84e5012e88 ("php7: re-enable system timezone data usage")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2018-07-21 23:41:56 +02:00
Sebastian Kemper
b65a759e80 php7: use mysqlnd
This is in anticipation of the MariaDB upgrade from mariadb 10.1.x to
10.2.x. With the latter the PHP MySQL plugins fail to compile, e.g.:

In file included from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/php_mysqli_structs.h:63:0,
                 from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/mysqli.c:34:
/home/equeiroz/src/openwrt-asus/staging_dir/target-mipsel_74kc_musl/usr/include/mysql/my_global.h:3:2: warning: #warning This file should not be included by clients, include only <mysql.h> [-Wcpp]
 #warning This file should not be included by clients, include only <mysql.h>
  ^~~~~~~
In file included from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/php_mysqli_structs.h:79:0,
                 from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/mysqli.c:34:
/home/equeiroz/src/openwrt-asus/staging_dir/target-mipsel_74kc_musl/usr/include/mysql/my_sys.h:3:2: warning: #warning This file should not be included by clients, include only <mysql.h> [-Wcpp]
 #warning This file should not be included by clients, include only <mysql.h>
  ^~~~~~~
In file included from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/mysqli.c:34:0:
/home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/php_mysqli_structs.h:82:10: fatal error: my_list.h: No such file or directory
 #include <my_list.h>

Upstream seems unlikely to fix this, see
https://bugs.php.net/bug.php?id=75612. In the bug report it is suggested
to not use libmysqlclient/libmariadbclient and instead utilize mysqlnd
(MySQL Native Driver) provided by PHP. This is the default anyway.

So add the mysqlnd module and remove the libmariadbclient depends.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-07-21 23:41:47 +02:00
Michael Heimpold
7e33126dc0 php7: update to 7.2.6
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-07-21 23:41:32 +02:00
Michael Heimpold
ac5ee1ffb1 php7: replace libmysqlclient dependencies with libmariadbclient
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-07-21 23:41:22 +02:00
Michael Heimpold
d0057d5eb4 php7: update to 7.2.5
Also drop obsolete patches.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-04-28 23:41:31 +02:00
Michael Heimpold
7c0dd7ae87 php7: fix compile issue with icu 61.1 (refs #5853)
Compile tested only at the moment.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-04-02 23:29:54 +02:00
Michael Heimpold
518e6745b2 php7: update to 7.2.4
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-03-31 08:58:42 +02:00
Michael Heimpold
7ffa1641d8 php7: update to 7.2.3
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-03-04 14:21:46 +01:00
Michael Heimpold
9ace92dd7a php7: fix linking to libpcre
PHP comes with a bundled version of libpcre which is then statically
linked. However, we already depend on the packaged library, so we
can reduce the footprint when linking to it dynamically.
This saves around 200-300 kB (this depends on other configuration).

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-02-14 01:13:54 +01:00
Michael Heimpold
379f4a9507 php7: update to 7.2.2
Also refresh patches to reflect new year.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-02-05 20:50:46 +01:00
Philip Prindeville
e1a4178de1 php7: redux of fix for issue #5488
Upstream was a little premature on asking for a change and not
vetting it.  Here is the currently proposed fix.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2018-01-25 15:19:30 -07:00
Philip Prindeville
6230ab4437 php7: fix issue 5488
Depending on which version of libiconv you're using, php_iconv_string()
doesn't always null out *out as part of its initialization.  This
patch makes that behavior invariant.

Submitted upstream as https://github.com/php/php-src/pull/3037 where
it's approved and waiting a merge.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2018-01-25 12:51:51 -07:00
Michael Heimpold
9f4b18c757 php7: update to 7.2.1
Remove a patch which was included upstream.

While at, also add openssl configuration parameters when modules are selected
which depend on openssl (reported by Philip Prindeville).

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-01-04 20:43:57 +01:00
Philip Prindeville
97efa62c22 php7: fix syntax issue in MIPS code for pcre
Copied from upstream (master).

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2017-12-29 17:41:12 -07:00
Michael Heimpold
97305e41b6 php7: disable valgrind support
The check to enable/disable this new feature of PHP 7.2 works
incorrectly when cross-compiling because it detects the host headers
only and there is no way to pass in a dedicated directory.

The wish to change this was reported upstream at:
https://bugs.php.net/bug.php?id=75722

For the meantime, use a self-cooked patch.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-12-28 22:00:07 +01:00
Philip Prindeville
1d1d67e0b9 php7: update to 7.2.0
Also drop mcrypt module as it's deprecated.

Dropped patches have been accepted upstream or something homologous.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2017-12-22 18:26:04 -07:00
Alexander Couzens
5dbbb1ba11 php7: remove build timestamp
Build timestamp prevents reproducible builds [0].

[0] https://reproducible-builds.org/docs/timestamps/

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
2017-12-14 19:00:11 +01:00
Michael Heimpold
2abc95402a php7-mod-imap: add missing dependency for libpam
When libpam is selected, then mod_imap pulls in a dep to libpam,
and there seems no way to disable it via configure arguments.
So add this dep here conditionally.

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-12-02 10:00:05 +01:00
Lucian Cristian
ab82aa0997 php7: try fix imap build-bot build
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
2017-12-01 01:28:27 +02:00
Michael Heimpold
9a901e05e9 php7: try to fix compilation on LEDE buildbots
Detection of U8T_DECOMPOSE seems to be broken when cross-compiling,
so needs to be preseeded.

-snip-
checking for utf8_mime2text signature... new
checking for U8T_DECOMPOSE...
configure: error: utf8_mime2text() has new signature, but U8T_CANONICAL
 is missing. This should not happen. Check config.log for additional information.
-snap-

This requires also a patch for PHP to make the preseeding working.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-11-26 22:07:45 +01:00