From: Michael Tremer Date: Sat, 2 Feb 2013 22:05:53 +0000 (+0100) Subject: php: Update to 5.4.11. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fphp-update;p=people%2Fms%2Fipfire-2.x.git php: Update to 5.4.11. --- diff --git a/config/rootfiles/common/php b/config/rootfiles/common/php index 23031e96b4..fe8101c01f 100644 --- a/config/rootfiles/common/php +++ b/config/rootfiles/common/php @@ -1,3 +1,4 @@ +etc/httpd/conf/conf.d/php5.conf etc/pear.conf etc/php.ini #usr/bin/pear @@ -6,12 +7,12 @@ etc/php.ini usr/bin/phar usr/bin/phar.phar usr/bin/php +usr/bin/php-cgi #usr/bin/php-config #usr/bin/phpize #usr/include/php #usr/include/php/TSRM #usr/include/php/TSRM/TSRM.h -#usr/include/php/TSRM/acconfig.h #usr/include/php/TSRM/readdir.h #usr/include/php/TSRM/tsrm_config.h #usr/include/php/TSRM/tsrm_config.w32.h @@ -21,7 +22,6 @@ usr/bin/php #usr/include/php/TSRM/tsrm_virtual_cwd.h #usr/include/php/TSRM/tsrm_win32.h #usr/include/php/Zend -#usr/include/php/Zend/acconfig.h #usr/include/php/Zend/zend.h #usr/include/php/Zend/zend_API.h #usr/include/php/Zend/zend_alloc.h @@ -33,12 +33,12 @@ usr/bin/php #usr/include/php/Zend/zend_config.nw.h #usr/include/php/Zend/zend_config.w32.h #usr/include/php/Zend/zend_constants.h +#usr/include/php/Zend/zend_dtrace.h #usr/include/php/Zend/zend_dynamic_array.h #usr/include/php/Zend/zend_errors.h #usr/include/php/Zend/zend_exceptions.h #usr/include/php/Zend/zend_execute.h #usr/include/php/Zend/zend_extensions.h -#usr/include/php/Zend/zend_fast_cache.h #usr/include/php/Zend/zend_float.h #usr/include/php/Zend/zend_gc.h #usr/include/php/Zend/zend_globals.h @@ -67,9 +67,11 @@ usr/bin/php #usr/include/php/Zend/zend_operators.h #usr/include/php/Zend/zend_ptr_stack.h #usr/include/php/Zend/zend_qsort.h +#usr/include/php/Zend/zend_signal.h #usr/include/php/Zend/zend_stack.h #usr/include/php/Zend/zend_static_allocator.h #usr/include/php/Zend/zend_stream.h +#usr/include/php/Zend/zend_string.h #usr/include/php/Zend/zend_strtod.h #usr/include/php/Zend/zend_ts_hash.h #usr/include/php/Zend/zend_types.h @@ -100,16 +102,32 @@ usr/bin/php #usr/include/php/ext/filter/php_filter.h #usr/include/php/ext/gd #usr/include/php/ext/gd/gdcache.h +#usr/include/php/ext/gd/libgd +#usr/include/php/ext/gd/libgd/gd.h +#usr/include/php/ext/gd/libgd/gd_compat.h +#usr/include/php/ext/gd/libgd/gd_intern.h +#usr/include/php/ext/gd/libgd/gd_io.h +#usr/include/php/ext/gd/libgd/gdcache.h +#usr/include/php/ext/gd/libgd/gdfontg.h +#usr/include/php/ext/gd/libgd/gdfontl.h +#usr/include/php/ext/gd/libgd/gdfontmb.h +#usr/include/php/ext/gd/libgd/gdfonts.h +#usr/include/php/ext/gd/libgd/gdfontt.h +#usr/include/php/ext/gd/libgd/gdhelpers.h +#usr/include/php/ext/gd/libgd/jisx0208.h +#usr/include/php/ext/gd/libgd/wbmp.h +#usr/include/php/ext/gd/libgd/webpimg.h #usr/include/php/ext/gd/php_gd.h #usr/include/php/ext/hash #usr/include/php/ext/hash/php_hash.h #usr/include/php/ext/hash/php_hash_adler32.h #usr/include/php/ext/hash/php_hash_crc32.h +#usr/include/php/ext/hash/php_hash_fnv.h #usr/include/php/ext/hash/php_hash_gost.h #usr/include/php/ext/hash/php_hash_haval.h +#usr/include/php/ext/hash/php_hash_joaat.h #usr/include/php/ext/hash/php_hash_md.h #usr/include/php/ext/hash/php_hash_ripemd.h -#usr/include/php/ext/hash/php_hash_salsa.h #usr/include/php/ext/hash/php_hash_sha.h #usr/include/php/ext/hash/php_hash_snefru.h #usr/include/php/ext/hash/php_hash_tiger.h @@ -154,6 +172,27 @@ usr/bin/php #usr/include/php/ext/mbstring/oniguruma/oniguruma.h #usr/include/php/ext/mbstring/php_mbregex.h #usr/include/php/ext/mbstring/php_onig_compat.h +#usr/include/php/ext/mysqlnd +#usr/include/php/ext/mysqlnd/config-win.h +#usr/include/php/ext/mysqlnd/mysqlnd.h +#usr/include/php/ext/mysqlnd/mysqlnd_alloc.h +#usr/include/php/ext/mysqlnd/mysqlnd_block_alloc.h +#usr/include/php/ext/mysqlnd/mysqlnd_charset.h +#usr/include/php/ext/mysqlnd/mysqlnd_debug.h +#usr/include/php/ext/mysqlnd/mysqlnd_enum_n_def.h +#usr/include/php/ext/mysqlnd/mysqlnd_ext_plugin.h +#usr/include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h +#usr/include/php/ext/mysqlnd/mysqlnd_net.h +#usr/include/php/ext/mysqlnd/mysqlnd_portability.h +#usr/include/php/ext/mysqlnd/mysqlnd_priv.h +#usr/include/php/ext/mysqlnd/mysqlnd_result.h +#usr/include/php/ext/mysqlnd/mysqlnd_result_meta.h +#usr/include/php/ext/mysqlnd/mysqlnd_reverse_api.h +#usr/include/php/ext/mysqlnd/mysqlnd_statistics.h +#usr/include/php/ext/mysqlnd/mysqlnd_structs.h +#usr/include/php/ext/mysqlnd/mysqlnd_wireprotocol.h +#usr/include/php/ext/mysqlnd/php_mysqlnd.h +#usr/include/php/ext/mysqlnd/php_mysqlnd_config.h #usr/include/php/ext/pcre #usr/include/php/ext/pcre/pcrelib #usr/include/php/ext/pcre/pcrelib/config.h @@ -183,10 +222,6 @@ usr/bin/php #usr/include/php/ext/spl/spl_heap.h #usr/include/php/ext/spl/spl_iterators.h #usr/include/php/ext/spl/spl_observer.h -#usr/include/php/ext/sqlite -#usr/include/php/ext/sqlite/libsqlite -#usr/include/php/ext/sqlite/libsqlite/src -#usr/include/php/ext/sqlite/libsqlite/src/sqlite.h #usr/include/php/ext/sqlite3 #usr/include/php/ext/sqlite3/libsqlite #usr/include/php/ext/sqlite3/libsqlite/sqlite3.h @@ -209,6 +244,7 @@ usr/bin/php #usr/include/php/ext/standard/fsock.h #usr/include/php/ext/standard/head.h #usr/include/php/ext/standard/html.h +#usr/include/php/ext/standard/html_tables.h #usr/include/php/ext/standard/info.h #usr/include/php/ext/standard/md5.h #usr/include/php/ext/standard/microtime.h @@ -262,7 +298,6 @@ usr/bin/php #usr/include/php/main/fopen_wrappers.h #usr/include/php/main/logos.h #usr/include/php/main/php.h -#usr/include/php/main/php3_compat.h #usr/include/php/main/php_compat.h #usr/include/php/main/php_config.h #usr/include/php/main/php_content_types.h @@ -283,7 +318,6 @@ usr/bin/php #usr/include/php/main/php_variables.h #usr/include/php/main/php_version.h #usr/include/php/main/rfc1867.h -#usr/include/php/main/safe_mode.h #usr/include/php/main/snprintf.h #usr/include/php/main/spprintf.h #usr/include/php/main/streams @@ -297,6 +331,9 @@ usr/bin/php #usr/include/php/main/streams/php_streams_int.h #usr/include/php/main/win32_internal_function_disabled.h #usr/include/php/main/win95nt.h +#usr/include/php/sapi +#usr/include/php/sapi/cli +#usr/include/php/sapi/cli/cli.h usr/lib/apache/libphp5.so #usr/lib/php #usr/lib/php/.channels @@ -519,12 +556,12 @@ usr/lib/php/XML/Util.php #usr/lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg #usr/lib/php/doc/XML_Util #usr/lib/php/doc/XML_Util/examples -usr/lib/php/doc/XML_Util/examples/example.php -usr/lib/php/doc/XML_Util/examples/example2.php +#usr/lib/php/doc/XML_Util/examples/example.php +#usr/lib/php/doc/XML_Util/examples/example2.php #usr/lib/php/extensions -#usr/lib/php/extensions/no-debug-non-zts-20090626 -usr/lib/php/extensions/no-debug-non-zts-20090626/dba.so -usr/lib/php/extensions/no-debug-non-zts-20090626/idn.so +#usr/lib/php/extensions/no-debug-non-zts-20100525 +usr/lib/php/extensions/no-debug-non-zts-20100525/dba.so +usr/lib/php/extensions/no-debug-non-zts-20100525/idn.so #usr/lib/php/pearcmd.php #usr/lib/php/peclcmd.php #usr/lib/php/test @@ -554,7 +591,9 @@ usr/lib/php/extensions/no-debug-non-zts-20090626/idn.so #usr/lib/php/test/XML_Util/tests/testBasic_splitQualifiedName.phpt #usr/lib/php/test/XML_Util/tests/testBug_4950.phpt #usr/lib/php/test/XML_Util/tests/testBug_5392.phpt -#usr/man/man1/php-config.1 -#usr/man/man1/php.1 -#usr/man/man1/phpize.1 -etc/httpd/conf/conf.d/php5.conf +#usr/php +#usr/php/man +#usr/php/man/man1 +#usr/php/man/man1/php-config.1 +#usr/php/man/man1/php.1 +#usr/php/man/man1/phpize.1 diff --git a/lfs/cups b/lfs/cups index f182538fb8..89de8ef244 100644 --- a/lfs/cups +++ b/lfs/cups @@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && sed -e "s/function_entry/zend_&/g" -i scripting/php/phpcups.c cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire \ --enable-libusb=no cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/lfs/php b/lfs/php index 58f442ce4c..f4f768fe89 100644 --- a/lfs/php +++ b/lfs/php @@ -24,7 +24,7 @@ include Config -VER = 5.3.16 +VER = 5.4.11 THISAPP = php-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,14 +40,14 @@ endif # Top-level Rules ############################################################################### -objects = $(DL_FILE) idn-0.1.tgz Log-1.9.11.tgz +objects = $(DL_FILE) idn-0.2.0.tgz Log-1.9.11.tgz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz +idn-0.2.0.tgz = $(DL_FROM)/idn-0.2.0.tgz Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz -$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be -idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1 +$(DL_FILE)_MD5 = 9975e68c22b86b013b934743ad2d2276 +idn-0.2.0.tgz_MD5 = f42dadf9b15bfc897458ff8735f05f78 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513 install : $(TARGET) @@ -102,7 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-exif \ --enable-ftp \ --with-openssl-dir=/usr \ - --with-gd=/usr \ + --with-gd \ --with-jpeg-dir=/usr \ --with-png-dir=/usr \ --with-zlib-dir=/usr \ @@ -124,8 +124,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini -grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak mv -f /etc/httpd/conf/httpd.conf.bak /etc/httpd/conf/httpd.conf - cd $(DIR_SRC) && tar xfz $(DIR_DL)/idn-0.1.tgz + cd $(DIR_SRC) && tar xfz $(DIR_DL)/idn-0.2.0.tgz -rm -f $(DIR_SRC)/package.xml + cd $(DIR_SRC)/idn-* && sed -e "s/function_entry/zend_&/g" -i idn.c cd $(DIR_SRC)/idn-* && phpize cd $(DIR_SRC)/idn-* && ./configure --prefix=/usr --with-idn cd $(DIR_SRC)/idn-* && make $(MAKETUNING) $(EXTRA_MAKE)