From: Arne Fitzenreiter Date: Sun, 20 Feb 2011 14:51:15 +0000 (+0100) Subject: Updated php (5.3.5). X-Git-Tag: v2.9-core47~3 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=a408c745d77ed569da9066ca2c95cda587f327e7 Updated php (5.3.5). --- diff --git a/config/php/php.ini b/config/php/php.ini index ca675a46e9..6e82094966 100644 --- a/config/php/php.ini +++ b/config/php/php.ini @@ -533,7 +533,7 @@ doc_root = user_dir = ; Directory in which the loadable extensions (modules) reside. -extension_dir = "/usr/lib/php/extensions/no-debug-non-zts-20060613/" +extension_dir = "/usr/lib/php/extensions/no-debug-non-zts-20090626/" ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically @@ -808,7 +808,7 @@ mysql.default_port = ; Default socket name for local MySQL connects. If empty, uses the built-in ; MySQL defaults. -mysql.default_socket = +mysql.default_socket = /var/run/mysql/mysql.sock ; Default host for mysql_connect() (doesn't apply in safe mode). mysql.default_host = diff --git a/config/rootfiles/common/php b/config/rootfiles/common/php index 18499baa0b..693a4b2fb2 100644 --- a/config/rootfiles/common/php +++ b/config/rootfiles/common/php @@ -1,9 +1,10 @@ -etc/httpd/conf/conf.d/php5.conf etc/pear.conf etc/php.ini #usr/bin/pear #usr/bin/peardev #usr/bin/pecl +usr/bin/phar +usr/bin/phar.phar usr/bin/php #usr/bin/php-config #usr/bin/phpize @@ -20,12 +21,13 @@ 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/FlexLexer.h #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 +#usr/include/php/Zend/zend_build.h #usr/include/php/Zend/zend_builtin_functions.h +#usr/include/php/Zend/zend_closures.h #usr/include/php/Zend/zend_compile.h #usr/include/php/Zend/zend_config.h #usr/include/php/Zend/zend_config.nw.h @@ -37,6 +39,8 @@ usr/bin/php #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 #usr/include/php/Zend/zend_globals_macros.h #usr/include/php/Zend/zend_hash.h @@ -45,11 +49,13 @@ usr/bin/php #usr/include/php/Zend/zend_ini.h #usr/include/php/Zend/zend_ini_parser.h #usr/include/php/Zend/zend_ini_scanner.h +#usr/include/php/Zend/zend_ini_scanner_defs.h #usr/include/php/Zend/zend_interfaces.h #usr/include/php/Zend/zend_istdiostream.h #usr/include/php/Zend/zend_iterators.h #usr/include/php/Zend/zend_language_parser.h #usr/include/php/Zend/zend_language_scanner.h +#usr/include/php/Zend/zend_language_scanner_defs.h #usr/include/php/Zend/zend_list.h #usr/include/php/Zend/zend_llist.h #usr/include/php/Zend/zend_modules.h @@ -81,11 +87,19 @@ usr/bin/php #usr/include/php/ext/date/php_date.h #usr/include/php/ext/dom #usr/include/php/ext/dom/xml_common.h +#usr/include/php/ext/ereg +#usr/include/php/ext/ereg/php_ereg.h +#usr/include/php/ext/ereg/php_regex.h +#usr/include/php/ext/ereg/regex +#usr/include/php/ext/ereg/regex/cclass.h +#usr/include/php/ext/ereg/regex/cname.h +#usr/include/php/ext/ereg/regex/regex.h +#usr/include/php/ext/ereg/regex/regex2.h +#usr/include/php/ext/ereg/regex/utils.h #usr/include/php/ext/filter #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/gdttf.h #usr/include/php/ext/gd/php_gd.h #usr/include/php/ext/hash #usr/include/php/ext/hash/php_hash.h @@ -95,6 +109,7 @@ usr/bin/php #usr/include/php/ext/hash/php_hash_haval.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 @@ -103,12 +118,16 @@ usr/bin/php #usr/include/php/ext/iconv #usr/include/php/ext/iconv/php_have_bsd_iconv.h #usr/include/php/ext/iconv/php_have_glibc_iconv.h +#usr/include/php/ext/iconv/php_have_ibm_iconv.h #usr/include/php/ext/iconv/php_have_iconv.h #usr/include/php/ext/iconv/php_have_libiconv.h #usr/include/php/ext/iconv/php_iconv.h +#usr/include/php/ext/iconv/php_iconv_aliased_libiconv.h #usr/include/php/ext/iconv/php_iconv_supports_errno.h #usr/include/php/ext/iconv/php_php_iconv_h_path.h #usr/include/php/ext/iconv/php_php_iconv_impl.h +#usr/include/php/ext/json +#usr/include/php/ext/json/php_json.h #usr/include/php/ext/libxml #usr/include/php/ext/libxml/php_libxml.h #usr/include/php/ext/mbstring @@ -133,8 +152,8 @@ usr/bin/php #usr/include/php/ext/mbstring/mbstring.h #usr/include/php/ext/mbstring/oniguruma #usr/include/php/ext/mbstring/oniguruma/oniguruma.h -#usr/include/php/ext/mbstring/oniguruma/php_onig_compat.h #usr/include/php/ext/mbstring/php_mbregex.h +#usr/include/php/ext/mbstring/php_onig_compat.h #usr/include/php/ext/pcre #usr/include/php/ext/pcre/pcrelib #usr/include/php/ext/pcre/pcrelib/config.h @@ -142,8 +161,6 @@ usr/bin/php #usr/include/php/ext/pcre/pcrelib/pcre_internal.h #usr/include/php/ext/pcre/pcrelib/pcreposix.h #usr/include/php/ext/pcre/pcrelib/ucp.h -#usr/include/php/ext/pcre/pcrelib/ucpinternal.h -#usr/include/php/ext/pcre/pcrelib/ucptable.h #usr/include/php/ext/pcre/php_pcre.h #usr/include/php/ext/pdo #usr/include/php/ext/pdo/php_pdo.h @@ -152,20 +169,27 @@ usr/bin/php #usr/include/php/ext/session/mod_files.h #usr/include/php/ext/session/mod_user.h #usr/include/php/ext/session/php_session.h +#usr/include/php/ext/sockets +#usr/include/php/ext/sockets/php_sockets.h #usr/include/php/ext/spl #usr/include/php/ext/spl/php_spl.h #usr/include/php/ext/spl/spl_array.h #usr/include/php/ext/spl/spl_directory.h +#usr/include/php/ext/spl/spl_dllist.h #usr/include/php/ext/spl/spl_engine.h #usr/include/php/ext/spl/spl_exceptions.h +#usr/include/php/ext/spl/spl_fixedarray.h #usr/include/php/ext/spl/spl_functions.h +#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/spl/spl_sxe.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 #usr/include/php/ext/standard #usr/include/php/ext/standard/base64.h #usr/include/php/ext/standard/basic_functions.h @@ -173,11 +197,11 @@ usr/bin/php #usr/include/php/ext/standard/credits.h #usr/include/php/ext/standard/credits_ext.h #usr/include/php/ext/standard/credits_sapi.h +#usr/include/php/ext/standard/crypt_freesec.h #usr/include/php/ext/standard/css.h #usr/include/php/ext/standard/cyr_convert.h #usr/include/php/ext/standard/datetime.h #usr/include/php/ext/standard/dl.h -#usr/include/php/ext/standard/dns.h #usr/include/php/ext/standard/exec.h #usr/include/php/ext/standard/file.h #usr/include/php/ext/standard/flock_compat.h @@ -193,7 +217,9 @@ usr/bin/php #usr/include/php/ext/standard/php_assert.h #usr/include/php/ext/standard/php_browscap.h #usr/include/php/ext/standard/php_crypt.h +#usr/include/php/ext/standard/php_crypt_r.h #usr/include/php/ext/standard/php_dir.h +#usr/include/php/ext/standard/php_dns.h #usr/include/php/ext/standard/php_ext_syslog.h #usr/include/php/ext/standard/php_filestat.h #usr/include/php/ext/standard/php_fopen_wrappers.h @@ -218,14 +244,13 @@ usr/bin/php #usr/include/php/ext/standard/php_versioning.h #usr/include/php/ext/standard/proc_open.h #usr/include/php/ext/standard/quot_print.h -#usr/include/php/ext/standard/reg.h #usr/include/php/ext/standard/scanf.h #usr/include/php/ext/standard/sha1.h #usr/include/php/ext/standard/streamsfuncs.h #usr/include/php/ext/standard/uniqid.h #usr/include/php/ext/standard/url.h -#usr/include/php/ext/standard/url_scanner.h #usr/include/php/ext/standard/url_scanner_ex.h +#usr/include/php/ext/standard/winver.h #usr/include/php/ext/xml #usr/include/php/ext/xml/expat_compat.h #usr/include/php/ext/xml/php_xml.h @@ -233,7 +258,6 @@ usr/bin/php #usr/include/php/main #usr/include/php/main/SAPI.h #usr/include/php/main/build-defs.h -#usr/include/php/main/config.w32.h #usr/include/php/main/fopen_wrappers.h #usr/include/php/main/logos.h #usr/include/php/main/php.h @@ -241,6 +265,7 @@ usr/bin/php #usr/include/php/main/php_compat.h #usr/include/php/main/php_config.h #usr/include/php/main/php_content_types.h +#usr/include/php/main/php_getopt.h #usr/include/php/main/php_globals.h #usr/include/php/main/php_ini.h #usr/include/php/main/php_logos.h @@ -250,7 +275,6 @@ usr/bin/php #usr/include/php/main/php_open_temporary_file.h #usr/include/php/main/php_output.h #usr/include/php/main/php_reentrancy.h -#usr/include/php/main/php_regex.h #usr/include/php/main/php_scandir.h #usr/include/php/main/php_streams.h #usr/include/php/main/php_syslog.h @@ -264,26 +288,23 @@ usr/bin/php #usr/include/php/main/streams #usr/include/php/main/streams/php_stream_context.h #usr/include/php/main/streams/php_stream_filter_api.h +#usr/include/php/main/streams/php_stream_glob_wrapper.h #usr/include/php/main/streams/php_stream_mmap.h #usr/include/php/main/streams/php_stream_plain_wrapper.h #usr/include/php/main/streams/php_stream_transport.h #usr/include/php/main/streams/php_stream_userspace.h #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/regex -#usr/include/php/regex/cclass.h -#usr/include/php/regex/cname.h -#usr/include/php/regex/regex.h -#usr/include/php/regex/regex2.h -#usr/include/php/regex/regex_extra.h -#usr/include/php/regex/utils.h usr/lib/apache/libphp5.so #usr/lib/php #usr/lib/php/.channels #usr/lib/php/.channels/.alias #usr/lib/php/.channels/.alias/pear.txt #usr/lib/php/.channels/.alias/pecl.txt +#usr/lib/php/.channels/.alias/phpdocs.txt #usr/lib/php/.channels/__uri.reg +#usr/lib/php/.channels/doc.php.net.reg #usr/lib/php/.channels/pear.php.net.reg #usr/lib/php/.channels/pecl.php.net.reg #usr/lib/php/.depdb @@ -292,11 +313,13 @@ usr/lib/apache/libphp5.so #usr/lib/php/.lock #usr/lib/php/.registry #usr/lib/php/.registry/.channel.__uri +#usr/lib/php/.registry/.channel.doc.php.net #usr/lib/php/.registry/.channel.pecl.php.net #usr/lib/php/.registry/archive_tar.reg #usr/lib/php/.registry/console_getopt.reg #usr/lib/php/.registry/pear.reg #usr/lib/php/.registry/structures_graph.reg +#usr/lib/php/.registry/xml_util.reg #usr/lib/php/Archive usr/lib/php/Archive/Tar.php #usr/lib/php/Console @@ -355,7 +378,6 @@ usr/lib/php/PEAR/Command/Test.php usr/lib/php/PEAR/Command/Test.xml usr/lib/php/PEAR/Common.php usr/lib/php/PEAR/Config.php -usr/lib/php/PEAR/Dependency.php usr/lib/php/PEAR/Dependency2.php usr/lib/php/PEAR/DependencyDB.php #usr/lib/php/PEAR/Downloader @@ -363,6 +385,7 @@ usr/lib/php/PEAR/Downloader.php usr/lib/php/PEAR/Downloader/Package.php usr/lib/php/PEAR/ErrorStack.php usr/lib/php/PEAR/Exception.php +usr/lib/php/PEAR/FixPHP5PEARWarnings.php #usr/lib/php/PEAR/Frontend usr/lib/php/PEAR/Frontend.php usr/lib/php/PEAR/Frontend/CLI.php @@ -370,6 +393,8 @@ usr/lib/php/PEAR/Frontend/CLI.php usr/lib/php/PEAR/Installer.php #usr/lib/php/PEAR/Installer/Role usr/lib/php/PEAR/Installer/Role.php +usr/lib/php/PEAR/Installer/Role/Cfg.php +usr/lib/php/PEAR/Installer/Role/Cfg.xml usr/lib/php/PEAR/Installer/Role/Common.php usr/lib/php/PEAR/Installer/Role/Data.php usr/lib/php/PEAR/Installer/Role/Data.xml @@ -385,6 +410,8 @@ usr/lib/php/PEAR/Installer/Role/Src.php usr/lib/php/PEAR/Installer/Role/Src.xml usr/lib/php/PEAR/Installer/Role/Test.php usr/lib/php/PEAR/Installer/Role/Test.xml +usr/lib/php/PEAR/Installer/Role/Www.php +usr/lib/php/PEAR/Installer/Role/Www.xml #usr/lib/php/PEAR/PackageFile usr/lib/php/PEAR/PackageFile.php #usr/lib/php/PEAR/PackageFile/Generator @@ -405,7 +432,6 @@ usr/lib/php/PEAR/REST/10.php usr/lib/php/PEAR/REST/11.php usr/lib/php/PEAR/REST/13.php usr/lib/php/PEAR/Registry.php -usr/lib/php/PEAR/Remote.php usr/lib/php/PEAR/RunTest.php #usr/lib/php/PEAR/Task usr/lib/php/PEAR/Task/Common.php @@ -425,6 +451,7 @@ usr/lib/php/PEAR/Validate.php #usr/lib/php/PEAR/Validator usr/lib/php/PEAR/Validator/PECL.php usr/lib/php/PEAR/XMLParser.php +usr/lib/php/PEAR5.php #usr/lib/php/Structures #usr/lib/php/Structures/Graph usr/lib/php/Structures/Graph.php @@ -433,6 +460,8 @@ usr/lib/php/Structures/Graph/Manipulator/AcyclicTest.php usr/lib/php/Structures/Graph/Manipulator/TopologicalSorter.php usr/lib/php/Structures/Graph/Node.php usr/lib/php/System.php +#usr/lib/php/XML +usr/lib/php/XML/Util.php #usr/lib/php/build #usr/lib/php/build/Makefile.global #usr/lib/php/build/acinclude.m4 @@ -451,15 +480,13 @@ usr/lib/php/System.php #usr/lib/php/data/PEAR/template.spec #usr/lib/php/data/Structures_Graph #usr/lib/php/data/Structures_Graph/LICENSE -#usr/lib/php/data/Structures_Graph/genpackage.xml.pl -#usr/lib/php/data/Structures_Graph/package.sh -#usr/lib/php/data/Structures_Graph/publish.sh #usr/lib/php/doc #usr/lib/php/doc/Archive_Tar #usr/lib/php/doc/Archive_Tar/docs #usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt #usr/lib/php/doc/PEAR #usr/lib/php/doc/PEAR/INSTALL +#usr/lib/php/doc/PEAR/LICENSE #usr/lib/php/doc/PEAR/README #usr/lib/php/doc/Structures_Graph #usr/lib/php/doc/Structures_Graph/docs @@ -489,19 +516,44 @@ usr/lib/php/System.php #usr/lib/php/doc/Structures_Graph/docs/tutorials #usr/lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph #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/extensions -#usr/lib/php/extensions/no-debug-non-zts-20060613 -#usr/lib/php/extensions/no-debug-non-zts-20060613/dba.so -usr/lib/php/extensions/no-debug-non-zts-20060613/idn.so +#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/pearcmd.php #usr/lib/php/peclcmd.php #usr/lib/php/test #usr/lib/php/test/Structures_Graph #usr/lib/php/test/Structures_Graph/tests -#usr/lib/php/test/Structures_Graph/tests/README -#usr/lib/php/test/Structures_Graph/tests/all-tests.php +#usr/lib/php/test/Structures_Graph/tests/AllTests.php #usr/lib/php/test/Structures_Graph/tests/testCase #usr/lib/php/test/Structures_Graph/tests/testCase/BasicGraph.php +#usr/lib/php/test/XML_Util +#usr/lib/php/test/XML_Util/tests +#usr/lib/php/test/XML_Util/tests/AllTests.php +#usr/lib/php/test/XML_Util/tests/testBasic_apiVersion.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_attributesToString.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_collapseEmptyTags.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createCDataSection.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createComment.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createEndElement.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createStartElement.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createTag.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_createTagFromArray.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_getDocTypeDeclaration.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_getXmlDeclaration.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_isValidName.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_raiseError.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_replaceEntities.phpt +#usr/lib/php/test/XML_Util/tests/testBasic_reverseEntities.phpt +#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 diff --git a/config/rootfiles/core/47/filelists/php b/config/rootfiles/core/47/filelists/php new file mode 120000 index 0000000000..1ae48d7a71 --- /dev/null +++ b/config/rootfiles/core/47/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/lfs/php b/lfs/php index a679a071d5..e8073ff130 100644 --- a/lfs/php +++ b/lfs/php @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 5.2.4 +VER = 5.3.5 THISAPP = php-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz -$(DL_FILE)_MD5 = 55c97a671fdabf462cc7a82971a656d2 +$(DL_FILE)_MD5 = 8aaf20c95e91f25c5b6a591e5d6d61b9 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513 @@ -83,7 +83,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml && \ cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -i 's/const char \*errpfx,/const DB_ENV *dbenv, & const/' ext/dba/dba_db4.c cd $(DIR_APP) && ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-apxs2 \