Commit Graph

53 Commits

Author SHA1 Message Date
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
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
Michael Heimpold 9e24f18a5a php7: update to 7.1.12
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-11-25 13:08:50 +01:00
Michael Heimpold 0809a949f2
Merge pull request #5066 from lucize/php7imap
php7: add php7-mod-imap
2017-11-25 07:31:52 +01:00
Val Kulkov e5d785ca3b php7-mod-gd: add Freetype 2 support
Add Freetype 2 support to php7-mod-gd. Introduce a configuration
parameter to disable Freetype 2 support if the increased package
size is a concern.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
2017-11-19 10:30:31 -05:00
Michael Heimpold 84e5012e88 php7: re-enable system timezone data usage
This part of the Makefile was commented out during update from
PHP 5.x to 7.x and not re-enabled in the meanswhile, so fix this finally.

Reported-by: Val Kulkov <val.kulkov@gmail.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-11-15 21:01:30 +01:00
Val Kulkov 50308e4fd7 php7: add configuration files to conffiles
Two important configuration files, /etc/php7-fpm.conf and
/etc/php7-fpm.d/www.conf are silently overwritten on each php7-fpm
upgrade or lost on a sysupgrade.

This commit adds the conffiles section for php7-fpm and revises
the conffiles section for php7.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
2017-11-10 19:50:34 -05:00
Lucian Cristian dbaaedef99 php7: add php7-mod-imap
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
2017-11-08 21:44:38 +02:00
Michael Heimpold dddfd6c00a php7: update to 7.1.11
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-10-31 12:44:53 +01:00
Michael Heimpold 848ded4157 php7: upgrade to 7.1.10
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-10-03 12:55:07 +02:00
Michael Heimpold 6e706bb593 php7: add conditional dependency to libstdcpp for FPM
This should fix buildbot breakage introduced by last commit.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-09-27 20:45:50 +02:00
Michael Heimpold 7ba5a7f6d1 php7: drop dependency to cgi for fpm sapi (refs #4522)
The FPM SAPI works fine without the CGI SAPI installed. It seems that
this is a copy & paste error introduced a long time ago, when FPM support
was added - and nobody noticed.
So drop the dependency now to allow smaller footprints on installations
which only use FPM.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-09-26 23:19:40 +02:00
Michael Heimpold 71c34e55c7 php7: upgrade to 7.1.9
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-09-04 20:54:26 +02:00
Philip Prindeville f2641e9fb2 php7: backport upstream fix for multiline logging
See: https://github.com/php/php-src/pull/2674

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2017-08-19 11:31:42 -06:00
Michael Heimpold 5a6956347d php7: upgrade to 7.1.8
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-08-07 21:21:22 +02:00
Michael Heimpold 3e0f4efe51 php7: upgrade to 7.1.7
This fixes several CVEs:
 - in mbstring: CVE-2017-9224, CVE-2017-9226, CVE-2017-9227,
                CVE-2017-9228, CVE-2017-9229
 - in gd: CVE-2017-7890

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-07-29 15:37:07 +02:00
Philip Prindeville ec58befa8e php7: add SNMP module to bundle
Add native support for SNMP manager functions, so scripts don't
have to call system("snmpget -v2c ...") etc.  Cuts down on fork/exec
pairs and simplifies issues with parsing intermediate output.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2017-06-16 19:53:53 -06:00
Michael Heimpold d6c333b705 php7: update to 7.1.6
Removed patch 1008-fix-musl-sys-headers.patch which was integrated
upstream.

(Compile tested only so far)

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-06-10 15:06:53 +02:00
Michael Heimpold b7eb92aada php7: update to 7.1.5
Remove patch 1006-fix-gettext.patch which was integrated upstream.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-05-14 22:31:25 +02:00
Michael Heimpold 12e3019db7 php7: use TARGET_CXXFLAGS instead of TARGET_CPPFLAGS for C++ option
This fixes a stupid typo from last commit which lead to the following
compiler warning:

cc1: warning: command line option '-std=c++11' is valid for C++/ObjC++ but not for C

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-18 21:38:37 +02:00
Michael Heimpold 4dd144c1bd php7: fix build of php7-mod-intl
This fixes the following build error (shortened paths for readability):

-snip-
In file included from .../php-7.1.4/ext/intl/intl_convertcpp.h:26:0,
                 from .../php-7.1.4/ext/intl/intl_convertcpp.cpp:21:
.../staging_dir/target-arm_arm926ej-s_musl_eabi/usr/include/unicode/unistr.h:56:16: error: 'UChar' does not name a type
 u_strlen(const UChar *s);
                ^
.../staging_dir/target-arm_arm926ej-s_musl_eabi/usr/include/unicode/unistr.h:80:19: error: 'char16_t' has not been declared
                   char16_t *dest, int32_t destCapacity,
                   ^
.../staging_dir/target-arm_arm926ej-s_musl_eabi/usr/include/unicode/unistr.h:81:25: error: 'char16_t' does not name a type
                   const char16_t *src, int32_t srcLength,
                         ^
In file included from .../php-7.1.4/ext/intl/intl_convertcpp.h:26:0,
                 from .../php-7.1.4/ext/intl/intl_convertcpp.cpp:21:
.../staging_dir/target-arm_arm926ej-s_musl_eabi/usr/include/unicode/unistr.h:462:16: error: 'char16_t' does not name a type
          const char16_t *srcChars) const;
                ^
[...]
-snap-

This build error was introduced by update of icu to 59.1.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-18 00:12:28 +02:00
Philip Prindeville c401946b0e php7: fix php build issues with musl headers (fixes #4263)
MUSL is complaining about <sys/poll.h> instead of <poll.h>.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

[ Replaced the *-t1lib filtering stuff by simply removing the
left-over configure option ]

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-17 21:58:32 +02:00
Michael Heimpold 4100706817 php7: enable filter support by default (fixes #3831)
Filter support brings several useful features which many PHP applications
rely on. To make it easier for users who don't want to build own packages
enable this by default. This slightly increases the binary SAPI packages,
but since PHP is a huge monster anyway, I doubt this hurts anybody.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-13 23:04:22 +02:00
Michael Heimpold 11dbb67426 php7: update to 7.1.4
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-13 23:04:22 +02:00
Michael Heimpold cf75d8a0f9 php7: fix bind_textdomain_codeset detection (refs #4250)
The gettext extension is only useful when linked against libintl-full
package, however, the detection did not work sucessfully. This patch
by @Dimazhan fixes this.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-11 23:31:37 +02:00
Michael Heimpold 1fa7ca0f48 php7: update to 7.1.3
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-03-20 21:34:37 +01:00
Michael Heimpold 549d470b99 php7: update to 7.1.2
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-02-24 18:10:02 +01:00
Michael Heimpold 97df69951c php7: update to 7.1.1
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-01-24 21:39:59 +01:00
Matthias Schiffer 919c24c598
php7: fix xml2-config path to unbreak build
Partially reverts 4a984a8d6. Fixes #3907.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2017-01-24 12:45:03 +01:00
Matthias Schiffer 3823ef9bc4 Merge pull request #3813 from NeoRaider/hostpkg
Use STAGING_DIR_HOSTPKG where appropriate
2017-01-11 21:54:09 +01:00
Michael Heimpold 3fc9ae5071 php7: update to 7.1.0
Adjust patches for new upstream revision.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-01-10 23:07:41 +01:00
Matthias Schiffer 4a984a8d60
treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG)
As both LEDE and OpenWrt have STAGING_DIR_HOSTPKG now, we can start to rely
on it. See 73b7f55424 for more information on
STAGING_DIR_HOSTPKG.

STAGING_DIR_HOSTPKG won't actually be changed before the first LEDE release
(it is equivalent to $(STAGING_DIR)/host), so this simple search/replace
cleanup is safe to apply. Doing this cleanup now will be useful for the
Gluon project (an OpenWrt/LEDE based firmware framework) for experimenting
with modifying STAGING_DIR_HOSTPKG before doing this in the LEDE upstream.

Also fixes a typo in the dbus Makefile ("STAGIND_DIR").

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2017-01-10 18:25:54 +01:00
Michael Heimpold 583af8565e php7: update to 7.0.13
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-11-16 21:12:39 +01:00
Michael Heimpold 80f0ea5728 php7: update to 7.0.12
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-10-16 20:53:46 +02:00
Michael Heimpold 5d063301ac php7: update to 7.0.11
This fixes the following CVEs:
 - in intl: CVE-2016-7416
 - in mysqlnd: CVE-2016-7412
 - in phar: CVE-2016-7414
 - in spl: CVE-2016-7417
 - in wddx: CVE-2016-7413, CVE-2016-7418

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-21 21:55:44 +02:00
Michael Heimpold 6d2d5a6a19 php7: package phar extension
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-21 21:55:44 +02:00
Michael Heimpold 3d305a35e1 php7/php7-pecl-*: introduce load order
Some PECL modules (possibly also php modules) depend on
special load order, otherwise loading the module will fail
due to unresolvable symbols.

This changeset introduces a very simple compile-time defined
order by specifying a prefix for the ini file with the load
directive. If not given, it uses a default value.

It also updates all current pecl module packages to take
this new approach.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-06 21:58:34 +02:00