summaryrefslogtreecommitdiffstats
path: root/package/php/0005-Call-apxs-with-correct-prefix.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2019-03-12 16:10:29 +0100
committerPeter Korsgaard <peter@korsgaard.com>2019-03-25 17:38:51 +0100
commit99d8c1a07c8ad96fea0ef1d72e5e786d89a56196 (patch)
treeded3d700ac4bad4315d06d977eab1e5a9acd291d /package/php/0005-Call-apxs-with-correct-prefix.patch
parentc19f815add28c5dbd6bbf944c42236679da4593f (diff)
downloadbuildroot-99d8c1a07c8ad96fea0ef1d72e5e786d89a56196.tar.gz
buildroot-99d8c1a07c8ad96fea0ef1d72e5e786d89a56196.zip
package/php: security bump to version 7.3.3
php-7.3.3 fixes a number of security issues (no CVE known, bugtracker issues not yet public): https://secure.php.net/ChangeLog-7.php#7.3.3 Drop 0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch as the flock detection has been removed since commit 9222702633 (Avoid dependency on "struct flock" fields order.) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit b821ae3d63440258808e413b1ace53639066046a) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/php/0005-Call-apxs-with-correct-prefix.patch')
-rw-r--r--package/php/0005-Call-apxs-with-correct-prefix.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/package/php/0005-Call-apxs-with-correct-prefix.patch b/package/php/0005-Call-apxs-with-correct-prefix.patch
deleted file mode 100644
index 60589b54fe..0000000000
--- a/package/php/0005-Call-apxs-with-correct-prefix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 4342bdea7a1a21430ce0d051fa4387441166c473 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fabrice.fontaine@orange.com>
-Date: Sun, 11 Dec 2016 23:12:46 +0100
-Subject: [PATCH] Call apxs with correct prefix
-
-php uses apache's apxs script from staging directory to install libphp
-dynamic library and update /etc/apache2/httpd.conf in the staging and target
-directories. Here is the full command line:
-"apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules'
- -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7"
-This does not work for target directory as apxs sets the full path of the
-library and not the relative one. Indeed, apxs is smart enough to substitute
-away the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so
-httpd.conf will only be correct in the staging directory.
-To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure
-
-Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
-[aduskett@gmail.com: Update for 7.3.0]
----
- sapi/apache2handler/config.m4 | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
-index 2e64b21..f5bf002 100644
---- a/sapi/apache2handler/config.m4
-+++ b/sapi/apache2handler/config.m4
-@@ -64,10 +64,12 @@ if test "$PHP_APXS2" != "no"; then
- AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
- fi
-
-+ APXS_PREFIX='$(INSTALL_ROOT)'/usr
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
- if test -z `$APXS -q SYSCONFDIR`; then
- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-+ -S PREFIX='$APXS_PREFIX' \
- -i -n php7"
- else
- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
-@@ -75,6 +77,7 @@ if test "$PHP_APXS2" != "no"; then
- \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
- -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-+ -S PREFIX='$APXS_PREFIX' \
- -i -a -n php7"
- fi
-
---
-2.5.0
-
OpenPOWER on IntegriCloud