jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

php: bump version to 7.2.2

Browse Source 
Additional changes:
  - Fix ordering of patches.
  - Update patches to apply cleanly against 7.2.2
  - Updates License sha256sum

Signed-off-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Adam Duskett 2018-02-02 07:50:39 -05:00 committed by Peter Korsgaard
parent 5c7fd2ad10
commit 9a7eca9baa
8 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/php/0001-acinclude.m4-don-t-unset-variables.patch
View File

@ -7,6 +7,8 @@ Unsetting ac_cv_{func,lib}_* is bad, you can't feed the configure cache.
Terminate them with extreme prejudice. Terminate them with extreme prejudice.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Adam Duskett <aduskett@gmail.com>
[aduskett@gmail.com: Update for 7.2.2]
--- ---
acinclude.m4 | 4 ---- acinclude.m4 | 4 ----
1 file changed, 4 deletions(-) 1 file changed, 4 deletions(-)
@ -15,7 +17,7 @@ diff --git a/acinclude.m4 b/acinclude.m4
index 28506b6..af4aa06 100644 index 28506b6..af4aa06 100644
--- a/acinclude.m4 --- a/acinclude.m4
+++ b/acinclude.m4 +++ b/acinclude.m4
@@ -1898,8 +1898,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,])) @@ -1890,8 +1890,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,]))
dnl dnl
AC_DEFUN([PHP_CHECK_FUNC_LIB],[ AC_DEFUN([PHP_CHECK_FUNC_LIB],[
ifelse($2,,:,[ ifelse($2,,:,[
@ -24,7 +26,7 @@ index 28506b6..af4aa06 100644
unset found unset found
AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, $1, [found=yes], [
AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
@@ -1931,8 +1929,6 @@ dnl in the default libraries and as a fall back in the specified library. @@ -1923,8 +1921,6 @@ dnl in the default libraries and as a fall back in the specified library.
dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS. dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
dnl dnl
AC_DEFUN([PHP_CHECK_FUNC],[ AC_DEFUN([PHP_CHECK_FUNC],[

4
package/php/0002-iconv-tweak-iconv-detection.patch
View File

@ -13,6 +13,8 @@ PHP_ICONV_H_PATH which, again, uses test and absolute paths.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[Gustavo: convert to nice m4 instead of patching configure] [Gustavo: convert to nice m4 instead of patching configure]
[Gustavo: update for 5.6.10] [Gustavo: update for 5.6.10]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
[aduskett@gmail.com: Update for 7.2.2]
--- ---
acinclude.m4 | 2 +- acinclude.m4 | 2 +-
ext/iconv/config.m4 | 22 ---------------------- ext/iconv/config.m4 | 22 ----------------------
@ -22,7 +24,7 @@ diff --git a/acinclude.m4 b/acinclude.m4
index af4aa06..1bd2652 100644 index af4aa06..1bd2652 100644
--- a/acinclude.m4 --- a/acinclude.m4
+++ b/acinclude.m4 +++ b/acinclude.m4
@@ -2471,7 +2471,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ @@ -2463,7 +2463,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
dnl dnl
if test "$found_iconv" = "no"; then if test "$found_iconv" = "no"; then

4
package/php/0003-configure-disable-the-phar-tool.patch
View File

@ -11,7 +11,7 @@ on the target.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[Gustavo: update for autoreconf/configure.in] [Gustavo: update for autoreconf/configure.in]
Signed-off-by: Adam Duskett <Adamduskett@outlook.com> Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
[Aduskett: update for php7.2.1] [Aduskett: update for 7.2.2]
--- ---
configure.ac | 9 ++------- configure.ac | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-) 1 file changed, 2 insertions(+), 7 deletions(-)
@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
index d20af76..7f02f1a 100644 index d20af76..7f02f1a 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1419,13 +1419,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" @@ -1420,13 +1420,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"

6
package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
View File

@ -5,6 +5,8 @@ Subject: [PATCH] ext/fileinfo/config.m4: allow cache answer for strcasestr
discovery discovery
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[aduskett@gmail.com: Update for 7.2.2]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
--- ---
ext/fileinfo/config.m4 | 3 ++- ext/fileinfo/config.m4 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
@ -13,14 +15,14 @@ diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index 7e98d62..8561962 100644 index 7e98d62..8561962 100644
--- a/ext/fileinfo/config.m4 --- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4 +++ b/ext/fileinfo/config.m4
@@ -14,6 +14,7 @@ if test "$PHP_FILEINFO" != "no"; then @@ -15,6 +15,7 @@ libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c"
libmagic/readcdf.c libmagic/softmagic.c"
AC_MSG_CHECKING([for strcasestr]) AC_MSG_CHECKING([for strcasestr])
+ AC_CACHE_VAL(ac_cv_func_strcasestr, + AC_CACHE_VAL(ac_cv_func_strcasestr,
AC_TRY_RUN([ AC_TRY_RUN([
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include <stdlib.h>
@@ -46,7 +47,7 @@ int main(void) @@ -46,7 +47,7 @@ int main(void)
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_NOTICE(using libmagic strcasestr implementation) AC_MSG_NOTICE(using libmagic strcasestr implementation)

5
package/php/0007-avoid-bfin-gcc-segfault.patch → package/php/0006-avoid-bfin-gcc-segfault.patch
View File

@ -1,11 +1,12 @@
Avoid gcc segmentation fault Avoid gcc segmentation fault
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Adam Duskett <aduskett@gmail.com>
[aduskett@gmail.com: Update for 7.2.2]
diff -Nur php-7.0.12.orig/Zend/zend_portability.h php-7.0.12/Zend/zend_portability.h diff -Nur php-7.0.12.orig/Zend/zend_portability.h php-7.0.12/Zend/zend_portability.h
--- php-7.0.12.orig/Zend/zend_portability.h 2016-10-13 16:04:17.000000000 +0200 --- php-7.0.12.orig/Zend/zend_portability.h 2016-10-13 16:04:17.000000000 +0200
+++ php-7.0.12/Zend/zend_portability.h 2016-11-08 02:49:39.118388999 +0100 +++ php-7.0.12/Zend/zend_portability.h 2016-11-08 02:49:39.118388999 +0100
@@ -97,7 +97,7 @@ @@ -95,7 +95,7 @@
#if defined(ZEND_WIN32) && !defined(__clang__) #if defined(ZEND_WIN32) && !defined(__clang__)
# define ZEND_ASSUME(c) __assume(c) # define ZEND_ASSUME(c) __assume(c)

2
package/php/0008-Call-apxs-with-correct-prefix.patch → package/php/0007-Call-apxs-with-correct-prefix.patch
View File

@ -15,6 +15,8 @@ httpd.conf will only be correct in the staging directory.
To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure 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: Fabrice Fontaine <fabrice.fontaine@orange.com>
Signed-off-by: Adam Duskett <aduskett@gmail.com>
[aduskett@gmail.com: Update for 7.2.2]
--- ---
sapi/apache2handler/config.m4 | 3 +++ sapi/apache2handler/config.m4 | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)

4
package/php/php.hash
View File

@ -1,5 +1,5 @@
# From http://php.net/downloads.php # From http://php.net/downloads.php
sha256 6c6cf82fda6660ed963821eb0525214bb3547e8e29f447b9c15b2d8e6efd8822 php-7.2.1.tar.xz sha256 47d7607d38a1d565fc43ea942c92229a7cd165f156737f210937e375b243cb11 php-7.2.2.tar.xz
# License file # License file
sha256 a44951f93b10c87c3f7cd9f311d95999c57c95ed950eec32b14c1c7ea6baf25e LICENSE sha256 00e567a8d50359d93ee1f9afdd9511277660c1e70a0cbf3229f84403aa9aebb1 LICENSE

2
package/php/php.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
PHP_VERSION = 7.2.1 PHP_VERSION = 7.2.2
PHP_SITE = http://www.php.net/distributions PHP_SITE = http://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES PHP_INSTALL_STAGING = YES