diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2018-04-03 17:50:12 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-08 17:00:06 -0700 |
commit | 08c5797ccb39ace8d53a43d3c706a0fb80415daa (patch) | |
tree | 6268b0a123436b803625c8e94cba41228238a33d /meta-oe/recipes-devtools/php | |
parent | 6d97746298a2189d0be0e2dfcb471c0242e5b90a (diff) | |
download | meta-openembedded-contrib-08c5797ccb39ace8d53a43d3c706a0fb80415daa.tar.gz |
php: move patches to a single directory
Having two directories with version numbers just leads to unnecessary
churn everytime there's a version update.
We can have all patches in one single directory and differentiate b/w
specific version by prefix php5-/php7-
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php')
-rw-r--r-- | meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 56 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch (renamed from meta-oe/recipes-devtools/php/php-5.6.33/0001-Add-lpthread-to-link.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch (renamed from meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch (renamed from meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch (renamed from meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch (renamed from meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch) | 0 |
6 files changed, 0 insertions, 56 deletions
diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch deleted file mode 100644 index 39c334f39d..0000000000 --- a/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK - -Upstream-Status: Pending - -AC_TRY_RUN is not suitable for cross-compile - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - ext/fileinfo/config.m4 | 31 ++++++------------------------- - 1 file changed, 6 insertions(+), 25 deletions(-) - -diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 -index 7e98d62..8a8ea0e 100644 ---- a/ext/fileinfo/config.m4 -+++ b/ext/fileinfo/config.m4 -@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then - libmagic/readcdf.c libmagic/softmagic.c" - - AC_MSG_CHECKING([for strcasestr]) -- AC_TRY_RUN([ --#include <string.h> --#include <strings.h> --#include <stdlib.h> -- --int main(void) --{ -- char *s0, *s1, *ret; -- -- s0 = (char *) malloc(42); -- s1 = (char *) malloc(8); -- -- memset(s0, 'X', 42); -- s0[24] = 'Y'; -- s0[26] = 'Z'; -- s0[41] = '\0'; -- memset(s1, 'x', 8); -- s1[0] = 'y'; -- s1[2] = 'Z'; -- s1[7] = '\0'; -- -- ret = strcasestr(s0, s1); -- -- return !(NULL != ret); --} -+ AC_TRY_COMPILE([ -+ #include <string.h> -+ #include <strings.h> -+ #include <stdlib.h> -+ ],[ -+ strcasestr(NULL, NULL); - ],[ - dnl using the platform implementation - AC_MSG_RESULT(yes) --- -1.9.1 - diff --git a/meta-oe/recipes-devtools/php/php-5.6.33/0001-Add-lpthread-to-link.patch b/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch index f70e550ff6..f70e550ff6 100644 --- a/meta-oe/recipes-devtools/php/php-5.6.33/0001-Add-lpthread-to-link.patch +++ b/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch b/meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch index 18b4937dbd..18b4937dbd 100644 --- a/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch +++ b/meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch b/meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch index 41d2a0f612..41d2a0f612 100644 --- a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch +++ b/meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch b/meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch index 596244d6ba..596244d6ba 100644 --- a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch +++ b/meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch diff --git a/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch index 39c334f39d..39c334f39d 100644 --- a/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch +++ b/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch |