diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2019-02-09 18:25:19 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2019-02-10 10:48:51 +0100 |
| commit | e5e40c94b3ff1881f2296fdcf8f1d85e48c788c8 (patch) | |
| tree | bc56c06d554a31436f1b3bc9f59150fba97cd6f9 /package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch | |
| parent | c35f157486431eafdb8d3583fc52d8ce4c784cf3 (diff) | |
| download | buildroot-e5e40c94b3ff1881f2296fdcf8f1d85e48c788c8.tar.gz buildroot-e5e40c94b3ff1881f2296fdcf8f1d85e48c788c8.zip | |
package/php: security bump to version 7.3.2
Rebased patch 0004.
This bump fixes https://bugs.php.net/bug.php?id=77369,
status of CVE-ID: needed
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch')
| -rw-r--r-- | package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch b/package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch index 280d5ee47b..5c3814f619 100644 --- a/package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch +++ b/package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch @@ -5,7 +5,7 @@ Subject: [PATCH] OPcache: flock mechanism is obviously linux so force it. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> -[Bernd: update for 7.2.12] +[Bernd: update for 7.2.12 & 7.3.2] Signed-off-by: Adam Duskett <aduskett@gmail.com> [aduskett@gmail.com: Update for 7.3.0] --- @@ -16,12 +16,30 @@ diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index fbb9b21..ffddc8e 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -341,38 +341,8 @@ int main() { +@@ -334,58 +334,8 @@ int main() { msg=yes],[msg=no],[msg=no]) AC_MSG_RESULT([$msg]) -flock_type=unknown --AC_MSG_CHECKING("whether flock struct is linux ordered") +-AC_MSG_CHECKING(for struct flock layout) +- +-if test "$flock_type" = "unknown"; then +-AC_RUN_IFELSE([AC_LANG_SOURCE([[ +- #include <fcntl.h> +- struct flock lock = { 1, 2, 3, 4, 5, 6, 7 }; +- int main() { +- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 6 && lock.l_len== 7) { +- return 0; +- } +- return 1; +- } +-]])], [ +- flock_type=aix64 +- AC_DEFINE([HAVE_FLOCK_AIX64], [], [Struct flock is 64-bit AIX-type]) +-], []) +-fi +- +-if test "$flock_type" = "unknown"; then -AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <fcntl.h> - struct flock lock = { 1, 2, 3, 4, 5 }; @@ -34,10 +52,10 @@ index fbb9b21..ffddc8e 100644 -]])], [ - flock_type=linux - AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) -- AC_MSG_RESULT("yes") --], [AC_MSG_RESULT("no")], [AC_MSG_RESULT([no])]) +-], []) +-fi - --AC_MSG_CHECKING("whether flock struct is BSD ordered") +-if test "$flock_type" = "unknown"; then -AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <fcntl.h> - struct flock lock = { 1, 2, 3, 4, 5 }; @@ -50,8 +68,10 @@ index fbb9b21..ffddc8e 100644 -]])], [ - flock_type=bsd - AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) -- AC_MSG_RESULT("yes") --], [AC_MSG_RESULT("no")], [AC_MSG_RESULT([no])]) +-], []) +-fi +- +-AC_MSG_RESULT([$flock_type]) +flock_type=linux +AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) |
