From 94bac0eb30a8f6cbe904a333852cb564b14fc2c7 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Sat, 3 Dec 2005 18:53:57 +0000 Subject: Update PHP5 to version 5.1.1. Some of the key features include: * A complete rewrite of date handling code, with improved timezone support. * Significant performance improvements compared to PHP 5.0.X. * PDO extension is now enabled by default (separate pkg for pkgsrc) * Over 30 new functions in various extensions and built-in functionality. * Bundled libraries, PCRE and SQLite upgraded to latest versions. * Over 400 various bug fixes. * PEAR upgraded to version 1.4.5 This release also fixes various security problems discovered in 5.0.X. --- archivers/php-bz2/Makefile | 4 +- doc/CHANGES | 3 +- lang/php5/Makefile | 4 +- lang/php5/Makefile.common | 4 +- lang/php5/Makefile.php | 8 +- lang/php5/PLIST | 190 ++++++++++++++++++++++++++------------------- lang/php5/buildlink3.mk | 6 +- lang/php5/distinfo | 12 ++- lang/php5/patches/patch-am | 12 --- lang/php5/patches/patch-an | 13 ---- lang/php5/patches/patch-ao | 15 ++++ net/php-xmlrpc/Makefile | 17 +++- net/php5-soap/MESSAGE | 7 ++ 13 files changed, 166 insertions(+), 129 deletions(-) delete mode 100644 lang/php5/patches/patch-am delete mode 100644 lang/php5/patches/patch-an create mode 100644 lang/php5/patches/patch-ao create mode 100644 net/php5-soap/MESSAGE diff --git a/archivers/php-bz2/Makefile b/archivers/php-bz2/Makefile index 0abea04c99c..df0d881c5a7 100644 --- a/archivers/php-bz2/Makefile +++ b/archivers/php-bz2/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.7 2005/11/04 09:18:30 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/03 18:53:57 jdolecek Exp $ MODNAME= bz2 CATEGORIES= archivers COMMENT= PHP extension for bzip2 compression +USE_PHP_EXT_PATCHES= yes + CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.bzip2} .include "../../lang/php/ext.mk" diff --git a/doc/CHANGES b/doc/CHANGES index f8856506498..dd31510054e 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.12099 2005/12/03 18:00:50 jdolecek Exp $ +$NetBSD: CHANGES,v 1.12100 2005/12/03 18:55:05 jdolecek Exp $ Changes to the packages collection and infrastructure in 2005: @@ -5478,3 +5478,4 @@ Changes to the packages collection and infrastructure in 2005: Updated databases/php-pdo_odbc to 1.0 [jdolecek 2005-12-03] Updated databases/php-pdo_pgsql to 1.0.1 [jdolecek 2005-12-03] Updated databases/php-pdo_sqlite to 1.0 [jdolecek 2005-12-03] + Updated lang/php5 to 5.1.1 [jdolecek 2005-12-03] diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 7aebc91537c..30253e2adcd 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2005/11/21 09:13:28 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/03 18:53:57 jdolecek Exp $ # PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 2 +PKGREVISION= # empty CATEGORIES= lang HOMEPAGE= http://www.php.net/ diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common index 1333ec429c9..094cbc1e583 100644 --- a/lang/php5/Makefile.common +++ b/lang/php5/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2005/09/08 18:49:01 jdolecek Exp $ +# $NetBSD: Makefile.common,v 1.12 2005/12/03 18:53:57 jdolecek Exp $ # DISTNAME?= php-${PHP_BASE_VERS} @@ -14,7 +14,7 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= jdolecek@NetBSD.org HOMEPAGE?= http://www.php.net/ -PHP_BASE_VERS= 5.0.5 +PHP_BASE_VERS= 5.1.1 PHP_EXTENSION_DIR= lib/php/20040412 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index 5ad83dcf2c8..919dd5bb53c 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.14 2005/11/11 07:10:06 rillig Exp $ +# $NetBSD: Makefile.php,v 1.15 2005/12/03 18:53:57 jdolecek Exp $ # .include "../../lang/php5/Makefile.common" @@ -19,12 +19,7 @@ PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} -# The Solaris system regex structures miss re_magic used by PHP build -.if (${OPSYS} != "SunOS") && (${OPSYS} != "Linux") CONFIGURE_ARGS+= --with-regex=system -.else -CONFIGURE_ARGS+= --with-regex=php -.endif CONFIGURE_ARGS+= --without-mysql CONFIGURE_ARGS+= --without-sqlite @@ -35,6 +30,7 @@ CONFIGURE_ARGS+= --enable-track-vars CONFIGURE_ARGS+= --disable-posix CONFIGURE_ARGS+= --disable-dom +CONFIGURE_ARGS+= --disable-pdo CONFIGURE_ARGS+= --enable-xml CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} diff --git a/lang/php5/PLIST b/lang/php5/PLIST index be90f9d8120..accec339e5f 100644 --- a/lang/php5/PLIST +++ b/lang/php5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2005/09/08 18:49:01 jdolecek Exp $ +@comment $NetBSD: PLIST,v 1.8 2005/12/03 18:53:57 jdolecek Exp $ bin/pear bin/php bin/php-config @@ -8,7 +8,6 @@ include/php/TSRM/TSRM.h include/php/TSRM/acconfig.h include/php/TSRM/readdir.h include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.nw.h include/php/TSRM/tsrm_config.w32.h include/php/TSRM/tsrm_config_common.h include/php/TSRM/tsrm_nw.h @@ -65,32 +64,26 @@ include/php/Zend/zend_strtod.h include/php/Zend/zend_ts_hash.h include/php/Zend/zend_types.h include/php/Zend/zend_variables.h -include/php/acconfig.h -include/php/ext/dom/xml_common.h -include/php/ext/iconv/php_iconv.h +include/php/Zend/zend_vm.h +include/php/Zend/zend_vm_def.h +include/php/Zend/zend_vm_execute.h +include/php/Zend/zend_vm_opcodes.h +include/php/ext/date/lib/timelib.h +include/php/ext/date/lib/timelib_config.h +include/php/ext/date/lib/timelib_structs.h +include/php/ext/date/php_date.h include/php/ext/libxml/php_libxml.h -include/php/ext/mbstring/mb_gpc.h -include/php/ext/mbstring/mbstring.h -include/php/ext/mbstring/php_mbregex.h -include/php/ext/mbstring/php_unicode.h -include/php/ext/mbstring/unicode_data.h -include/php/ext/mbstring/libmbfl/mbfl/eaw_table.h -include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h -include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h -include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h -include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h -include/php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h -include/php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h -include/php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h -include/php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h -include/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h -include/php/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h -include/php/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h -include/php/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h -include/php/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h -include/php/ext/mbstring/libmbfl/mbfl/mbfilter.h +include/php/ext/pcre/pcrelib/internal.h +include/php/ext/pcre/pcrelib/pcre.h +include/php/ext/pcre/pcrelib/pcre_internal.h +include/php/ext/pcre/pcrelib/pcre_scanner.h +include/php/ext/pcre/pcrelib/pcre_stringpiece.h +include/php/ext/pcre/pcrelib/pcrecpp.h +include/php/ext/pcre/pcrelib/pcreposix.h +include/php/ext/pcre/pcrelib/ucp.h +include/php/ext/pcre/pcrelib/ucpinternal.h +include/php/ext/pcre/php_pcre.h include/php/ext/session/mod_files.h -include/php/ext/session/mod_mm.h include/php/ext/session/mod_user.h include/php/ext/session/php_session.h include/php/ext/standard/base64.h @@ -115,7 +108,6 @@ include/php/ext/standard/md5.h include/php/ext/standard/microtime.h include/php/ext/standard/pack.h include/php/ext/standard/pageinfo.h -include/php/ext/standard/parsedate.h include/php/ext/standard/php_array.h include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h @@ -134,7 +126,6 @@ include/php/ext/standard/php_link.h include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_parsedate.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_smart_str.h include/php/ext/standard/php_smart_str_public.h @@ -161,14 +152,12 @@ include/php/main/SAPI.h include/php/main/build-defs.h include/php/main/config.w32.h include/php/main/fopen_wrappers.h -include/php/main/internal_functions_registry.h include/php/main/logos.h include/php/main/php.h include/php/main/php3_compat.h include/php/main/php_compat.h include/php/main/php_config.h include/php/main/php_content_types.h -include/php/main/php_embed.h include/php/main/php_globals.h include/php/main/php_ini.h include/php/main/php_logos.h @@ -203,50 +192,107 @@ include/php/regex/regex.h include/php/regex/regex2.h include/php/regex/regex_extra.h include/php/regex/utils.h +lib/php/.channels/.alias/pear.txt +lib/php/.channels/.alias/pecl.txt +lib/php/.channels/__uri.reg +lib/php/.channels/pear.php.net.reg +lib/php/.channels/pecl.php.net.reg +lib/php/.depdb +lib/php/.depdblock lib/php/.filemap lib/php/.lock lib/php/.registry/archive_tar.reg lib/php/.registry/console_getopt.reg -lib/php/.registry/html_template_it.reg -lib/php/.registry/net_useragent_detect.reg lib/php/.registry/pear.reg -lib/php/.registry/xml_rpc.reg lib/php/Archive/Tar.php lib/php/Console/Getopt.php -lib/php/HTML/Template/IT.php -lib/php/HTML/Template/ITX.php -lib/php/HTML/Template/IT_Error.php -lib/php/Net/UserAgent/Detect.php lib/php/OS/Guess.php lib/php/PEAR.php lib/php/PEAR/Autoloader.php lib/php/PEAR/Builder.php +lib/php/PEAR/ChannelFile.php +lib/php/PEAR/ChannelFile/Parser.php lib/php/PEAR/Command.php lib/php/PEAR/Command/Auth.php +lib/php/PEAR/Command/Auth.xml lib/php/PEAR/Command/Build.php +lib/php/PEAR/Command/Build.xml +lib/php/PEAR/Command/Channels.php +lib/php/PEAR/Command/Channels.xml lib/php/PEAR/Command/Common.php lib/php/PEAR/Command/Config.php +lib/php/PEAR/Command/Config.xml lib/php/PEAR/Command/Install.php +lib/php/PEAR/Command/Install.xml lib/php/PEAR/Command/Mirror.php +lib/php/PEAR/Command/Mirror.xml lib/php/PEAR/Command/Package.php +lib/php/PEAR/Command/Package.xml +lib/php/PEAR/Command/Pickle.php +lib/php/PEAR/Command/Pickle.xml lib/php/PEAR/Command/Registry.php +lib/php/PEAR/Command/Registry.xml lib/php/PEAR/Command/Remote.php +lib/php/PEAR/Command/Remote.xml +lib/php/PEAR/Command/Test.php +lib/php/PEAR/Command/Test.xml lib/php/PEAR/Common.php lib/php/PEAR/Config.php lib/php/PEAR/Dependency.php +lib/php/PEAR/Dependency2.php +lib/php/PEAR/DependencyDB.php lib/php/PEAR/Downloader.php +lib/php/PEAR/Downloader/Package.php lib/php/PEAR/ErrorStack.php lib/php/PEAR/Exception.php +lib/php/PEAR/Frontend.php lib/php/PEAR/Frontend/CLI.php lib/php/PEAR/Installer.php +lib/php/PEAR/Installer/Role.php +lib/php/PEAR/Installer/Role/Common.php +lib/php/PEAR/Installer/Role/Data.php +lib/php/PEAR/Installer/Role/Data.xml +lib/php/PEAR/Installer/Role/Doc.php +lib/php/PEAR/Installer/Role/Doc.xml +lib/php/PEAR/Installer/Role/Ext.php +lib/php/PEAR/Installer/Role/Ext.xml +lib/php/PEAR/Installer/Role/Php.php +lib/php/PEAR/Installer/Role/Php.xml +lib/php/PEAR/Installer/Role/Script.php +lib/php/PEAR/Installer/Role/Script.xml +lib/php/PEAR/Installer/Role/Src.php +lib/php/PEAR/Installer/Role/Src.xml +lib/php/PEAR/Installer/Role/Test.php +lib/php/PEAR/Installer/Role/Test.xml +lib/php/PEAR/PackageFile.php +lib/php/PEAR/PackageFile/Generator/v1.php +lib/php/PEAR/PackageFile/Generator/v2.php +lib/php/PEAR/PackageFile/Parser/v1.php +lib/php/PEAR/PackageFile/Parser/v2.php +lib/php/PEAR/PackageFile/v1.php +lib/php/PEAR/PackageFile/v2.php +lib/php/PEAR/PackageFile/v2/Validator.php +lib/php/PEAR/PackageFile/v2/rw.php lib/php/PEAR/Packager.php +lib/php/PEAR/REST.php +lib/php/PEAR/REST/10.php +lib/php/PEAR/REST/11.php lib/php/PEAR/Registry.php lib/php/PEAR/Remote.php lib/php/PEAR/RunTest.php +lib/php/PEAR/Task/Common.php +lib/php/PEAR/Task/Postinstallscript.php +lib/php/PEAR/Task/Postinstallscript/rw.php +lib/php/PEAR/Task/Replace.php +lib/php/PEAR/Task/Replace/rw.php +lib/php/PEAR/Task/Unixeol.php +lib/php/PEAR/Task/Unixeol/rw.php +lib/php/PEAR/Task/Windowseol.php +lib/php/PEAR/Task/Windowseol/rw.php +lib/php/PEAR/Validate.php +lib/php/PEAR/Validator/PECL.php +lib/php/PEAR/XMLParser.php lib/php/System.php -lib/php/XML/RPC.php -lib/php/XML/RPC/Dump.php -lib/php/XML/RPC/Server.php lib/php/build/Makefile.global lib/php/build/acinclude.m4 lib/php/build/config.guess @@ -255,30 +301,14 @@ lib/php/build/libtool.m4 lib/php/build/ltmain.sh lib/php/build/mkdep.awk lib/php/build/phpize.m4 +lib/php/build/run-tests.php lib/php/build/scan_makefile_in.awk lib/php/build/shtool lib/php/data/PEAR/package.dtd lib/php/data/PEAR/template.spec lib/php/doc/Archive_Tar/docs/Archive_Tar.txt -lib/php/doc/HTML_Template_IT/examples/templates/main.tpl.htm -lib/php/doc/HTML_Template_IT/examples/sample_it.php lib/php/pearcmd.php -lib/php/test/HTML_Template_IT/tests/Console_TestListener.php -lib/php/test/HTML_Template_IT/tests/ITX_api_testcase.php -lib/php/test/HTML_Template_IT/tests/ITX_usage_testcase.php -lib/php/test/HTML_Template_IT/tests/IT_api_testcase.php -lib/php/test/HTML_Template_IT/tests/IT_usage_testcase.php -lib/php/test/HTML_Template_IT/tests/templates/__include.html -lib/php/test/HTML_Template_IT/tests/templates/addblock.html -lib/php/test/HTML_Template_IT/tests/templates/blockiteration.html -lib/php/test/HTML_Template_IT/tests/templates/blocks.html -lib/php/test/HTML_Template_IT/tests/templates/globals.html -lib/php/test/HTML_Template_IT/tests/templates/include.html -lib/php/test/HTML_Template_IT/tests/templates/loadtemplatefile.html -lib/php/test/HTML_Template_IT/tests/templates/replaceblock.html -lib/php/test/HTML_Template_IT/tests/test.php -lib/php/test/XML_RPC/tests/protoport.php -lib/php/test/XML_RPC/tests/test_Dump.php +lib/php/peclcmd.php libexec/cgi-bin/php man/man1/php-config.1 man/man1/php.1 @@ -288,51 +318,49 @@ share/examples/php/php.ini-recommended share/php/php.gif @dirrm share/php @dirrm share/examples/php -@dirrm lib/php/test/XML_RPC/tests -@dirrm lib/php/test/XML_RPC -@dirrm lib/php/test/HTML_Template_IT/tests/templates -@dirrm lib/php/test/HTML_Template_IT/tests -@dirrm lib/php/test/HTML_Template_IT -@dirrm lib/php/test -@dirrm lib/php/doc/HTML_Template_IT/examples/templates -@dirrm lib/php/doc/HTML_Template_IT/examples -@dirrm lib/php/doc/HTML_Template_IT @dirrm lib/php/doc/Archive_Tar/docs @dirrm lib/php/doc/Archive_Tar @dirrm lib/php/doc @dirrm lib/php/data/PEAR @dirrm lib/php/data @dirrm lib/php/build -@dirrm lib/php/XML/RPC -@dirrm lib/php/XML +@dirrm lib/php/PEAR/Validator +@dirrm lib/php/PEAR/Task/Windowseol +@dirrm lib/php/PEAR/Task/Unixeol +@dirrm lib/php/PEAR/Task/Replace +@dirrm lib/php/PEAR/Task/Postinstallscript +@dirrm lib/php/PEAR/Task +@dirrm lib/php/PEAR/REST +@dirrm lib/php/PEAR/PackageFile/v2 +@dirrm lib/php/PEAR/PackageFile/Parser +@dirrm lib/php/PEAR/PackageFile/Generator +@dirrm lib/php/PEAR/PackageFile +@dirrm lib/php/PEAR/Installer/Role +@dirrm lib/php/PEAR/Installer @dirrm lib/php/PEAR/Frontend +@dirrm lib/php/PEAR/Downloader @dirrm lib/php/PEAR/Command +@dirrm lib/php/PEAR/ChannelFile @dirrm lib/php/PEAR @dirrm lib/php/OS -@dirrm lib/php/HTML/Template -@dirrm lib/php/HTML @dirrm lib/php/Console @dirrm lib/php/Archive +@dirrm lib/php/.registry/.channel.pecl.php.net +@dirrm lib/php/.registry/.channel.__uri @dirrm lib/php/.registry @unexec ${RM} -rf %D/lib/php/Net @dirrm include/php/regex @dirrm include/php/main/streams @dirrm include/php/main @dirrm include/php/include -@exec ${MKDIR} %D/include/php/ext/xml/expat -@dirrm include/php/ext/xml/expat @dirrm include/php/ext/xml @dirrm include/php/ext/standard @dirrm include/php/ext/session -@dirrm include/php/ext/sqlite/libsqlite/src -@dirrm include/php/ext/sqlite/libsqlite -@dirrm include/php/ext/sqlite -@dirrm include/php/ext/mbstring/libmbfl/mbfl -@dirrm include/php/ext/mbstring/libmbfl -@dirrm include/php/ext/mbstring +@dirrm include/php/ext/pcre/pcrelib +@dirrm include/php/ext/pcre @dirrm include/php/ext/libxml -@dirrm include/php/ext/iconv -@dirrm include/php/ext/dom +@dirrm include/php/ext/date/lib +@dirrm include/php/ext/date @dirrm include/php/ext @dirrm include/php/Zend @dirrm include/php/TSRM diff --git a/lang/php5/buildlink3.mk b/lang/php5/buildlink3.mk index 17b07cd911e..aa52d071555 100644 --- a/lang/php5/buildlink3.mk +++ b/lang/php5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2005/09/09 05:49:00 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/12/03 18:53:57 jdolecek Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PHP_BUILDLINK3_MK:= ${PHP_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphp} BUILDLINK_PACKAGES+= php .if !empty(PHP_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.php+= php-5.0.* -BUILDLINK_RECOMMENDED.php+= php>=5.0.4nb1 +BUILDLINK_DEPENDS.php+= php-5.1.* +BUILDLINK_RECOMMENDED.php+= php>=5.1.0 BUILDLINK_PKGSRCDIR.php?= ../../lang/php5 .endif # PHP_BUILDLINK3_MK diff --git a/lang/php5/distinfo b/lang/php5/distinfo index 4cb6dff6ecc..974cd0b9891 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.10 2005/10/16 12:17:47 jdolecek Exp $ +$NetBSD: distinfo,v 1.11 2005/12/03 18:53:57 jdolecek Exp $ -SHA1 (php-5.0.5.tar.bz2) = ffcc050f879265eb96f2c8dc79fa895047da9d4a -RMD160 (php-5.0.5.tar.bz2) = 6a9a892affba229770154407860cd1c2a098eaf9 -Size (php-5.0.5.tar.bz2) = 4895556 bytes +SHA1 (php-5.1.1.tar.bz2) = 38c59909091c788cab21abb7562f90901da797b9 +RMD160 (php-5.1.1.tar.bz2) = 7578bca79f48b83176c1dfe4c71165de88453744 +Size (php-5.1.1.tar.bz2) = 6149470 bytes SHA1 (patch-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3 SHA1 (patch-ak) = 0faa523103e0a9a3c01c78c2fe9a64c0a9b2fc43 -SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46 -SHA1 (patch-am) = 0de0be745262c1e986062c7a50261dbe58f97ac9 -SHA1 (patch-an) = dfe696f416ab5deffd38150441a65246a4816cf4 +SHA1 (patch-ao) = 66de18a3a64f5d65402ab455a097c0635bb03324 diff --git a/lang/php5/patches/patch-am b/lang/php5/patches/patch-am deleted file mode 100644 index 2debaa29ec5..00000000000 --- a/lang/php5/patches/patch-am +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-am,v 1.1 2005/10/07 21:09:28 jdolecek Exp $ - ---- ext/ldap/config.m4.orig 2005-05-08 16:06:24.000000000 +0000 -+++ ext/ldap/config.m4 -@@ -114,6 +114,7 @@ if test "$PHP_LDAP" != "no"; then - _SAVE_CPPFLAGS=$CPPFLAGS - _SAVE_LDFLAGS=$LDFLAGS - CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR" -+ LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD" - AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc, - [AC_TRY_COMPILE([#include ], [ldap_set_rebind_proc(0,0,0)], - ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)]) diff --git a/lang/php5/patches/patch-an b/lang/php5/patches/patch-an deleted file mode 100644 index e708f67cab6..00000000000 --- a/lang/php5/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.1 2005/10/16 12:17:47 jdolecek Exp $ - ---- ext/mbstring/libmbfl/mbfl/mbfilter.c.orig 2005-10-16 14:09:17.000000000 +0200 -+++ ext/mbstring/libmbfl/mbfl/mbfilter.c 2005-10-16 14:09:21.000000000 +0200 -@@ -1990,7 +1990,7 @@ - break; - - default: /* ASCII */ -- if (!qp_table[(c & 0xff)]) { /* ordinary characters */ -+ if (c >= 0 && c < 0x100 && !qp_table[(c & 0xff)]) { /* ordinary characters */ - mbfl_memory_device_output(c, &pe->tmpdev); - pe->status1 = 1; - } else if (pe->status1 == 0 && c == 0x20) { /* repeat SPACE */ diff --git a/lang/php5/patches/patch-ao b/lang/php5/patches/patch-ao new file mode 100644 index 00000000000..4c99931fbc2 --- /dev/null +++ b/lang/php5/patches/patch-ao @@ -0,0 +1,15 @@ +$NetBSD: patch-ao,v 1.1 2005/12/03 18:53:57 jdolecek Exp $ + +--- ext/bz2/bz2_filter.c.orig 2005-11-25 08:40:07.000000000 +0100 ++++ ext/bz2/bz2_filter.c 2005-11-25 00:07:50.000000000 +0100 +@@ -18,6 +18,10 @@ + + /* $Id: patch-ao,v 1.1 2005/12/03 18:53:57 jdolecek Exp $ */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "php.h" + #include "php_bz2.h" + diff --git a/net/php-xmlrpc/Makefile b/net/php-xmlrpc/Makefile index ae0d0cce546..e945b183b19 100644 --- a/net/php-xmlrpc/Makefile +++ b/net/php-xmlrpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/10/08 15:59:48 jdolecek Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/03 18:53:57 jdolecek Exp $ MODNAME= xmlrpc CATEGORIES+= net @@ -8,7 +8,17 @@ COMMENT= PHP extension for XML-RPC support HOMEPAGE= http://xmlrpc-epi.sourceforge.net/ CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} + +.include "../../lang/php/phpversion.mk" + +.if ${PKG_PHP_VERSION} == 5 +# the extension has been changed in PHP 5.1 to require libxml2; while +# there is some "compatibility" expat configure setting, it doesn't build +# with that +CONFIGURE_ARGS+= --with-libxml-dir=${BUILDLINK_PREFIX.libxml2} +.else CONFIGURE_ARGS+= --with-expat-dir=${BUILDLINK_PREFIX.expat} +.endif .include "../../converters/libiconv/buildlink3.mk" @@ -27,6 +37,11 @@ CONFIGURE_ARGS+= --with-iconv-dir=shared,${BUILDLINK_PREFIX.iconv} CONFIGURE_ARGS+= --with-iconv-dir .endif +.if ${PKG_PHP_VERSION} == 5 +.include "../../textproc/libxml2/buildlink3.mk" +.else .include "../../textproc/expat/buildlink3.mk" +.endif + .include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/php5-soap/MESSAGE b/net/php5-soap/MESSAGE new file mode 100644 index 00000000000..90629178436 --- /dev/null +++ b/net/php5-soap/MESSAGE @@ -0,0 +1,7 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2005/12/03 18:53:57 jdolecek Exp $ + +PHP 5.1.0 introduced some changes in SOAP extension in WSDL mode: +* XML base64Binary values transparently base64 encoded/decoded +* NULL values with maxOccurs="0" nillable="yes" not included in XML output +=========================================================================== -- cgit v1.2.3