From e461b8e9fe41329308c5fb6f2955db892defc7ae Mon Sep 17 00:00:00 2001 From: MCApollo <34170230+MCApollo@users.noreply.github.com> Date: Wed, 1 May 2019 20:49:30 +0000 Subject: Updated PHP. --- data/php/_metadata/_libxslt.dep | 1 + data/php/_metadata/curl.dep | 1 - data/php/_metadata/name | 2 +- data/php/_metadata/ncurses.dep | 1 + data/php/_metadata/pcre2.dep | 1 + data/php/_metadata/readline.dep | 1 + data/php/_metadata/section | 2 +- data/php/_metadata/version | 2 +- data/php/all.diff | 43 ++++++++ data/php/m4.diff | 217 ++++++++++++++++++++++++++++++++++++++++ data/php/mach-o.diff | 11 -- data/php/make.sh | 23 ++++- data/php/offsetof.diff | 24 ----- data/php/pear.diff | 12 --- data/php/php-5.2.8.tar.bz2 | Bin 9827180 -> 0 bytes data/php/php-7.3.4.tar.xz | Bin 0 -> 11977004 bytes 16 files changed, 286 insertions(+), 55 deletions(-) create mode 120000 data/php/_metadata/_libxslt.dep delete mode 120000 data/php/_metadata/curl.dep create mode 120000 data/php/_metadata/ncurses.dep create mode 120000 data/php/_metadata/pcre2.dep create mode 120000 data/php/_metadata/readline.dep create mode 100644 data/php/all.diff create mode 100644 data/php/m4.diff delete mode 100644 data/php/mach-o.diff delete mode 100644 data/php/offsetof.diff delete mode 100644 data/php/pear.diff delete mode 100644 data/php/php-5.2.8.tar.bz2 create mode 100644 data/php/php-7.3.4.tar.xz diff --git a/data/php/_metadata/_libxslt.dep b/data/php/_metadata/_libxslt.dep new file mode 120000 index 000000000..b4990221e --- /dev/null +++ b/data/php/_metadata/_libxslt.dep @@ -0,0 +1 @@ +../../_libxslt \ No newline at end of file diff --git a/data/php/_metadata/curl.dep b/data/php/_metadata/curl.dep deleted file mode 120000 index 9c4438112..000000000 --- a/data/php/_metadata/curl.dep +++ /dev/null @@ -1 +0,0 @@ -../../curl \ No newline at end of file diff --git a/data/php/_metadata/name b/data/php/_metadata/name index 2522a6f49..0d5d1871b 100644 --- a/data/php/_metadata/name +++ b/data/php/_metadata/name @@ -1 +1 @@ -PHP: Hypertext Preprocessor +PHP diff --git a/data/php/_metadata/ncurses.dep b/data/php/_metadata/ncurses.dep new file mode 120000 index 000000000..a395fad08 --- /dev/null +++ b/data/php/_metadata/ncurses.dep @@ -0,0 +1 @@ +../../ncurses \ No newline at end of file diff --git a/data/php/_metadata/pcre2.dep b/data/php/_metadata/pcre2.dep new file mode 120000 index 000000000..8b5b22a2a --- /dev/null +++ b/data/php/_metadata/pcre2.dep @@ -0,0 +1 @@ +../../pcre2 \ No newline at end of file diff --git a/data/php/_metadata/readline.dep b/data/php/_metadata/readline.dep new file mode 120000 index 000000000..f35c9185b --- /dev/null +++ b/data/php/_metadata/readline.dep @@ -0,0 +1 @@ +../../readline \ No newline at end of file diff --git a/data/php/_metadata/section b/data/php/_metadata/section index e0eb96881..ddc7f1fd8 100644 --- a/data/php/_metadata/section +++ b/data/php/_metadata/section @@ -1 +1 @@ -Development +Scripting diff --git a/data/php/_metadata/version b/data/php/_metadata/version index 614a37bb3..c968a5762 100644 --- a/data/php/_metadata/version +++ b/data/php/_metadata/version @@ -1 +1 @@ -5.2.8 +7.3.4 diff --git a/data/php/all.diff b/data/php/all.diff new file mode 100644 index 000000000..b5851b40b --- /dev/null +++ b/data/php/all.diff @@ -0,0 +1,43 @@ +diff -ur php-7.3.4/ext/phar/Makefile.frag php-7.3.4+iPhone/ext/phar/Makefile.frag +--- php-7.3.4/ext/phar/Makefile.frag 2019-04-02 13:48:53.000000000 +0000 ++++ php-7.3.4+iPhone/ext/phar/Makefile.frag 2019-04-30 18:56:02.627135807 +0000 +@@ -31,13 +31,13 @@ + + $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH) + -@echo "Generating phar.php" +- @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php ++ @php $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php + + $(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH) + -@echo "Generating phar.phar" + -@rm -f $(builddir)/phar.phar + -@rm -f $(srcdir)/phar.phar +- @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" $(srcdir)/phar/ ++ @php $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" $(srcdir)/phar/ + -@chmod +x $(builddir)/phar.phar + + install-pharcmd: pharcmd +diff -ur php-7.3.4/main/php.h php-7.3.4+iPhone/main/php.h +--- php-7.3.4/main/php.h 2019-04-02 13:48:51.000000000 +0000 ++++ php-7.3.4+iPhone/main/php.h 2019-04-30 18:51:45.927014989 +0000 +@@ -479,7 +479,7 @@ + */ + + #ifndef XtOffset +-#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__riscos__))) ++#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__riscos__) || defined(__APPLE__))) + #ifdef __STDC__ + #define XtOffset(p_type, field) _Offsetof(p_type, field) + #else +diff -ur php-7.3.4/pear/Makefile.frag php-7.3.4+iPhone/pear/Makefile.frag +--- php-7.3.4/pear/Makefile.frag 2019-04-02 13:48:51.000000000 +0000 ++++ php-7.3.4+iPhone/pear/Makefile.frag 2019-04-30 18:56:15.431142281 +0000 +@@ -12,7 +12,7 @@ + PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} ++ @php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/data/php/m4.diff b/data/php/m4.diff new file mode 100644 index 000000000..788a196ac --- /dev/null +++ b/data/php/m4.diff @@ -0,0 +1,217 @@ +diff -ur php-7.3.4/aclocal.m4 php-7.3.4+iPhone/aclocal.m4 +--- php-7.3.4/aclocal.m4 2019-04-02 13:48:51.000000000 +0000 ++++ php-7.3.4+iPhone/aclocal.m4 2019-05-01 14:53:45.935424715 +0000 +@@ -2534,54 +2534,10 @@ + dnl Common setup macro for libxml + dnl + AC_DEFUN([PHP_SETUP_LIBXML], [ +- found_libxml=no +- +- dnl First try to find xml2-config +- AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, +- [ +- for i in $PHP_LIBXML_DIR /usr/local /usr; do +- if test -x "$i/bin/xml2-config"; then +- ac_cv_php_xml2_config_path="$i/bin/xml2-config" +- break +- fi +- done +- ]) +- +- if test -x "$ac_cv_php_xml2_config_path"; then +- XML2_CONFIG="$ac_cv_php_xml2_config_path" +- libxml_full_version=`$XML2_CONFIG --version` +- ac_IFS=$IFS +- IFS="." +- set $libxml_full_version +- IFS=$ac_IFS +- LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` +- if test "$LIBXML_VERSION" -ge "2006011"; then +- found_libxml=yes +- LIBXML_LIBS=`$XML2_CONFIG --libs` +- LIBXML_INCS=`$XML2_CONFIG --cflags` +- else +- AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) +- fi +- fi +- +- dnl If xml2-config fails, try pkg-config +- if test "$found_libxml" = "no"; then +- if test -z "$PKG_CONFIG"; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- fi +- +- dnl If pkg-config is found try using it +- if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libxml-2.0; then +- if $PKG_CONFIG --atleast-version=2.6.11 libxml-2.0; then +- found_libxml=yes +- LIBXML_LIBS=`$PKG_CONFIG --libs libxml-2.0` +- LIBXML_INCS=`$PKG_CONFIG --cflags-only-I libxml-2.0` +- else +- AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) +- fi +- fi +- fi ++ found_libxml=yes + ++ LIBXML_LIBS="-lxml2" ++ LIBXML_INCS="-I${PKG_ROOT:-/nonexist}/usr/include/libxml2" + if test "$found_libxml" = "yes"; then + PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) + PHP_EVAL_INCLINE($LIBXML_INCS) +diff -ur php-7.3.4/ext/fileinfo/config.m4 php-7.3.4+iPhone/ext/fileinfo/config.m4 +--- php-7.3.4/ext/fileinfo/config.m4 2019-04-02 13:48:51.000000000 +0000 ++++ php-7.3.4+iPhone/ext/fileinfo/config.m4 2019-05-01 13:34:15.528408824 +0000 +@@ -14,39 +14,9 @@ + libmagic/buffer.c" + + AC_MSG_CHECKING([for strcasestr]) +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#include +-#include +-#include +- +-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); +-} +- ]])],[ +- dnl using the platform implementation +- AC_MSG_RESULT(yes) +- ],[ + AC_MSG_RESULT(no) + AC_MSG_NOTICE(using libmagic strcasestr implementation) + libmagic_sources="$libmagic_sources libmagic/strcasestr.c" +- ],[AC_MSG_RESULT([skipped, cross-compiling])]) + + PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) + PHP_ADD_BUILD_DIR($ext_builddir/libmagic) +diff -ur php-7.3.4/ext/iconv/config.m4 php-7.3.4+iPhone/ext/iconv/config.m4 +--- php-7.3.4/ext/iconv/config.m4 2019-04-02 13:48:54.000000000 +0000 ++++ php-7.3.4+iPhone/ext/iconv/config.m4 2019-05-01 13:34:15.528408824 +0000 +@@ -13,7 +13,7 @@ + + if test "$iconv_avail" != "no"; then + if test -z "$ICONV_DIR"; then +- for i in /usr/local /usr; do ++ for i in "${PKG_ROOT}/usr"; do + if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then + PHP_ICONV_PREFIX="$i" + break +diff -ur php-7.3.4/ext/readline/config.m4 php-7.3.4+iPhone/ext/readline/config.m4 +--- php-7.3.4/ext/readline/config.m4 2019-04-02 13:48:52.000000000 +0000 ++++ php-7.3.4+iPhone/ext/readline/config.m4 2019-05-01 13:40:52.160420030 +0000 +@@ -12,7 +12,7 @@ + fi + + if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then +- for i in $PHP_READLINE /usr/local /usr; do ++ for i in $PHP_READLINE; do + test -f $i/include/readline/readline.h && READLINE_DIR=$i && break + done + +@@ -76,7 +76,7 @@ + + elif test "$PHP_LIBEDIT" != "no"; then + +- for i in $PHP_LIBEDIT /usr/local /usr; do ++ for i in $PHP_LIBEDIT; do + test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break + done + +diff -ur php-7.3.4/ext/xml/config.m4 php-7.3.4+iPhone/ext/xml/config.m4 +--- php-7.3.4/ext/xml/config.m4 2019-04-02 13:48:59.000000000 +0000 ++++ php-7.3.4+iPhone/ext/xml/config.m4 2019-05-01 13:37:46.820400693 +0000 +@@ -34,7 +34,7 @@ + dnl Check for expat only if --with-libexpat-dir is used. + dnl + if test "$PHP_LIBEXPAT_DIR" != "no"; then +- for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do ++ for i in $PHP_XML $PHP_LIBEXPAT_DIR; do + if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then + EXPAT_DIR=$i + break +diff -ur php-7.3.4/ext/xsl/config.m4 php-7.3.4+iPhone/ext/xsl/config.m4 +--- php-7.3.4/ext/xsl/config.m4 2019-04-02 13:48:57.000000000 +0000 ++++ php-7.3.4+iPhone/ext/xsl/config.m4 2019-05-01 13:34:15.532408824 +0000 +@@ -14,49 +14,16 @@ + AC_MSG_ERROR([XSL extension requires DOM extension, add --enable-dom]) + fi + +- for i in $PHP_XSL /usr/local /usr; do +- if test -x "$i/bin/xslt-config"; then +- XSLT_CONFIG=$i/bin/xslt-config +- break +- fi +- done +- +- if test -z "$XSLT_CONFIG"; then +- AC_MSG_ERROR([xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution]) +- else +- libxslt_full_version=`$XSLT_CONFIG --version` +- ac_IFS=$IFS +- IFS="." +- set $libxslt_full_version +- IFS=$ac_IFS +- LIBXSLT_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` +- if test "$LIBXSLT_VERSION" -ge "1001000"; then +- XSL_LIBS=`$XSLT_CONFIG --libs` +- XSL_INCS=`$XSLT_CONFIG --cflags` +- PHP_EVAL_LIBLINE($XSL_LIBS, XSL_SHARED_LIBADD) +- PHP_EVAL_INCLINE($XSL_INCS) +- +- AC_MSG_CHECKING([for EXSLT support]) +- for i in $PHP_XSL /usr/local /usr; do +- if test -r "$i/include/libexslt/exslt.h"; then ++ XSL_LIBS=-lxslt ++ XSL_INCS="${PKG_ROOT}"/usr/include/libxslt ++ if test -r "${PKG_ROOT}/usr/include/libexslt/exslt.h" || test -r "$PHP_XSL/usr/include/libexslt/exslt.h"; then + PHP_XSL_EXSL_DIR=$i + break + fi +- done +- if test -z "$PHP_XSL_EXSL_DIR"; then +- AC_MSG_RESULT(not found) +- else + AC_MSG_RESULT(found) + PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/$PHP_LIBDIR, XSL_SHARED_LIBADD) + PHP_ADD_INCLUDE($PHP_XSL_EXSL_DIR/include) + AC_DEFINE(HAVE_XSL_EXSLT,1,[ ]) +- fi +- else +- AC_MSG_ERROR([libxslt version 1.1.0 or greater required.]) +- fi +- +- +- fi + + AC_DEFINE(HAVE_XSL,1,[ ]) + PHP_NEW_EXTENSION(xsl, php_xsl.c xsltprocessor.c, $ext_shared) +diff -ur php-7.3.4/ext/zlib/config0.m4 php-7.3.4+iPhone/ext/zlib/config0.m4 +--- php-7.3.4/ext/zlib/config0.m4 2019-04-02 13:48:52.000000000 +0000 ++++ php-7.3.4+iPhone/ext/zlib/config0.m4 2019-05-01 13:39:49.992411350 +0000 +@@ -19,7 +19,7 @@ + ZLIB_INCDIR=$ZLIB_DIR/include + fi + else +- for i in /usr/local /usr $PHP_ZLIB_DIR; do ++ for i in $PHP_ZLIB_DIR; do + if test -f $i/include/zlib/zlib.h; then + ZLIB_DIR=$i + ZLIB_INCDIR=$i/include/zlib diff --git a/data/php/mach-o.diff b/data/php/mach-o.diff deleted file mode 100644 index 6a7a35a35..000000000 --- a/data/php/mach-o.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru php-5.2.8/Zend/Zend.m4 php-5.2.8+iPhone/Zend/Zend.m4 ---- php-5.2.8/Zend/Zend.m4 2006-12-20 10:49:32.000000000 +0000 -+++ php-5.2.8+iPhone/Zend/Zend.m4 2009-01-17 23:34:44.000000000 +0000 -@@ -61,7 +61,6 @@ - signal.h \ - unix.h \ - stdlib.h \ --mach-o/dyld.h \ - dlfcn.h) - - AC_TYPE_SIZE_T diff --git a/data/php/make.sh b/data/php/make.sh index a46655ddb..96bf37bd5 100644 --- a/data/php/make.sh +++ b/data/php/make.sh @@ -1,5 +1,20 @@ -pkg:setup +pkg:extract +cd */ +# Build for host +./configure --prefix=${PWD}/host +make install +make distclean +export PATH="${PWD}/host/bin:${PATH}" +# Target +pkg:patch autoconf -CC="${PKG_TARG}"-gcc pkg:configure --with-iconv="${PKG_ROOT}"/usr --with-curl="$(PKG_DEST_ curl)"/usr --enable-fastcgi -make -make install prefix="${PKG_DEST}"/usr datarootdir="${PKG_DEST}"/usr +pkg:configure --enable-fastcgi --enable-opcache=yes \ + --with-readline="$(PKG_DEST_ readline)/${PKG_TAPF}" \ + --with-libxml-dir="${PKG_ROOT}/usr" \ + --with-iconv-dir="${PKG_ROOT}/usr" \ + --with-pcre-regex="$(PKG_DEST_ pcre2)/${PKG_TAPF}" \ + --with-pcre-jit \ + --with-bz2="${PKG_ROOT}/usr" \ + LDFLAGS="-liconv -lresolv" EXTRA_LIBS="-liconv -lresolv" +pkg:make +pkg:install INSTALL_ROOT="${PKG_DEST}" diff --git a/data/php/offsetof.diff b/data/php/offsetof.diff deleted file mode 100644 index 9929dcba4..000000000 --- a/data/php/offsetof.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru php-5.2.8/main/php.h php-5.2.8+iPhone/main/php.h ---- php-5.2.8/main/php.h 2007-12-31 07:20:15.000000000 +0000 -+++ php-5.2.8+iPhone/main/php.h 2009-01-18 09:43:06.000000000 +0000 -@@ -418,7 +418,7 @@ - */ - - #ifndef XtOffset --#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__riscos__))) -+#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__riscos__) || defined(__APPLE__))) - #ifdef __STDC__ - #define XtOffset(p_type, field) _Offsetof(p_type, field) - #else -diff -ru php-5.2.8/Zend/zend_ini.h php-5.2.8+iPhone/Zend/zend_ini.h ---- php-5.2.8/Zend/zend_ini.h 2007-12-31 07:20:03.000000000 +0000 -+++ php-5.2.8+iPhone/Zend/zend_ini.h 2009-01-18 09:43:16.000000000 +0000 -@@ -28,7 +28,7 @@ - #define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM) - - #ifndef XtOffsetOf --# if defined(CRAY) || (defined(__arm) && !defined(LINUX)) -+# if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__riscos__) || defined(__APPLE__))) - # ifdef __STDC__ - # define XtOffset(p_type, field) _Offsetof(p_type, field) - # else diff --git a/data/php/pear.diff b/data/php/pear.diff deleted file mode 100644 index bb34c2cce..000000000 --- a/data/php/pear.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru php-5.2.8/pear/Makefile.frag php-5.2.8+iPhone/pear/Makefile.frag ---- php-5.2.8/pear/Makefile.frag 2006-11-08 19:05:41.000000000 +0000 -+++ php-5.2.8+iPhone/pear/Makefile.frag 2009-01-18 10:27:12.000000000 +0000 -@@ -8,7 +8,7 @@ - FETCH = `which fetch 2>/dev/null` - - install-pear-installer: $(SAPI_CLI_PATH) -- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" -+ @php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" - - install-pear: - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/data/php/php-5.2.8.tar.bz2 b/data/php/php-5.2.8.tar.bz2 deleted file mode 100644 index 1ef1f7132..000000000 Binary files a/data/php/php-5.2.8.tar.bz2 and /dev/null differ diff --git a/data/php/php-7.3.4.tar.xz b/data/php/php-7.3.4.tar.xz new file mode 100644 index 000000000..2a8df2e60 Binary files /dev/null and b/data/php/php-7.3.4.tar.xz differ -- cgit v1.2.3