[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SECURITY FIX: php-4.3.8 for 3.4
- To: ports@openbsd.org
- Subject: SECURITY FIX: php-4.3.8 for 3.4
- From: Robert Nagy <robert@openbsd.org>
- Date: Sun, 18 Jul 2004 12:26:15 +0200
- Content-Disposition: inline
- User-Agent: Mutt/1.4.2i
Hi. The attached diff takes the php port to 4.3.8 in 3.4.
Please test it on your 3.4 box, if you have one. Thanks.
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/php4/Makefile.inc,v
retrieving revision 1.15
diff -u -r1.15 Makefile.inc
--- Makefile.inc 28 Aug 2003 22:30:38 -0000 1.15
+++ Makefile.inc 18 Jul 2004 10:20:52 -0000
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile.inc,v 1.15 2003/08/28 22:30:38 avsm Exp $
+# $OpenBSD: Makefile.inc,v 1.18.2.2 2004/07/17 00:52:33 robert Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
-V= 4.3.3
+V= 4.3.8
DISTNAME= php-${V}
CATEGORIES= www lang
-MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
+MAINTAINER= Robert Nagy <robert@openbsd.org>
HOMEPAGE= http://www.php.net/
MASTER_SITES= http://us2.php.net/distributions/ \
@@ -37,10 +37,16 @@
MODULES_SUBDIR= lib/php/modules
MODULES_DIR= ${CHROOT_DIR}/${MODULES_SUBDIR}
+.if defined(USE_GCC3)
+PHP_LDFLAGS= -lstdc++ -lm
+.else
+PHP_LDFLAGS= # nothing for now
+.endif
+
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.52
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PHP_LDFLAGS}" \
EXTENSION_DIR=${MODULES_DIR}
MAKE_ENV= ${CONFIGURE_ENV}
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/www/php4/core/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- core/Makefile 28 Aug 2003 22:30:38 -0000 1.16
+++ core/Makefile 18 Jul 2004 10:20:52 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2003/08/28 22:30:38 avsm Exp $
+# $OpenBSD: Makefile,v 1.17 2004/01/05 17:51:29 avsm Exp $
MULTI_PACKAGES= -pear
SUBPACKAGE?=
@@ -28,7 +28,8 @@
--enable-sockets \
--enable-sysvsem \
--enable-sysvshm \
- --enable-yp
+ --enable-yp \
+ --enable-exif
MODULES= gettext iconv
Index: core/distinfo
===================================================================
RCS file: /cvs/ports/www/php4/core/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- core/distinfo 28 Aug 2003 22:30:38 -0000 1.7
+++ core/distinfo 18 Jul 2004 10:20:52 -0000
@@ -1,3 +1,3 @@
-MD5 (php-4.3.3.tar.gz) = fe3fede4115354155fc6185522f7c6b2
-RMD160 (php-4.3.3.tar.gz) = 03ac1565271284c2f6a862e220b9f6487e1d8813
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
+MD5 (php-4.3.8.tar.gz) = dd69f8c89281f088eadf4ade3dbd39ee
+RMD160 (php-4.3.8.tar.gz) = ce58295b885b447db1d80c6aaf3e0f517682c58c
+SHA1 (php-4.3.8.tar.gz) = 0e2339bb70164e08bacb5ecf2b147233caad9dc8
Index: core/files/phpxs
===================================================================
RCS file: /cvs/ports/www/php4/core/files/phpxs,v
retrieving revision 1.3
diff -u -r1.3 phpxs
--- core/files/phpxs 2 May 2003 19:49:01 -0000 1.3
+++ core/files/phpxs 18 Jul 2004 10:20:52 -0000
@@ -1,29 +1,21 @@
#!/bin/sh
#
-# $OpenBSD: phpxs,v 1.3 2003/05/02 19:49:01 avsm Exp $
+# $OpenBSD: phpxs,v 1.4 2004/01/05 17:47:55 avsm Exp $
#
-# Copyright (c) 2002,2003 Anil Madhavapeddy.
+# Copyright (c) 2002-2004 Anil Madhavapeddy <anil@recoil.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# THIS SOFTWARE IS PROVIDED BY THE OPENBSD PROJECT AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBSD
-# PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
Index: core/pkg/PLIST-pear
===================================================================
RCS file: /cvs/ports/www/php4/core/pkg/PLIST-pear,v
retrieving revision 1.2
diff -u -r1.2 PLIST-pear
--- core/pkg/PLIST-pear 28 Aug 2003 22:30:38 -0000 1.2
+++ core/pkg/PLIST-pear 18 Jul 2004 10:20:53 -0000
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST-pear,v 1.5.2.2 2004/07/17 00:52:34 robert Exp $
pear/lib/.registry/archive_tar.reg
pear/lib/.registry/console_getopt.reg
pear/lib/.registry/pear.reg
@@ -8,8 +9,6 @@
pear/lib/.registry/net_socket.reg
pear/lib/.registry/xml_parser.reg
pear/lib/.registry/xml_rpc.reg
-pear/lib/.lock
-pear/lib/.filemap
pear/lib/Archive/Tar.php
pear/lib/Console/Getopt.php
pear/lib/System.php
@@ -27,7 +26,9 @@
pear/lib/PEAR/Command/Auth.php
pear/lib/PEAR/Config.php
pear/lib/PEAR/Dependency.php
+pear/lib/PEAR/Downloader.php
pear/lib/PEAR/Builder.php
+pear/lib/PEAR/ErrorStack.php
pear/lib/PEAR/Frontend/CLI.php
pear/lib/PEAR/Installer.php
pear/lib/PEAR/Packager.php
@@ -48,6 +49,7 @@
pear/lib/DB/msql.php
pear/lib/DB/mssql.php
pear/lib/DB/mysql.php
+pear/lib/DB/mysqli.php
pear/lib/DB/oci8.php
pear/lib/DB/odbc.php
pear/lib/DB/pgsql.php
@@ -57,6 +59,7 @@
pear/lib/DB/common.php
pear/lib/DB.php
pear/lib/HTTP.php
+pear/lib/Mail/null.php
pear/lib/Mail/sendmail.php
pear/lib/Mail/smtp.php
pear/lib/Mail/RFC822.php
@@ -76,16 +79,16 @@
pear/tests/DB/tests/errors.inc
pear/tests/DB/tests/fetchmode_object.inc
pear/tests/DB/tests/fetchmodes.inc
-pear/tests/DB/tests/fetchrow.inc
pear/tests/DB/tests/include.inc
pear/tests/DB/tests/limit.inc
pear/tests/DB/tests/numcols.inc
pear/tests/DB/tests/numrows.inc
pear/tests/DB/tests/prepexe.inc
+pear/tests/DB/tests/run.cvs
pear/tests/DB/tests/sequences.inc
pear/tests/DB/tests/simplequery.inc
-pear/tests/DB/tests/tableinfo.inc
pear/tests/DB/tests/transactions.inc
+pear/tests/DB/tests/skipif.inc
pear/tests/DB/tests/driver/02fetch.phpt
pear/tests/DB/tests/driver/03simplequery.phpt
pear/tests/DB/tests/driver/04numcols.phpt
@@ -94,13 +97,18 @@
pear/tests/DB/tests/driver/08affectedrows.phpt
pear/tests/DB/tests/driver/09numrows.phpt
pear/tests/DB/tests/driver/10errormap.phpt
+pear/tests/DB/tests/driver/11transactions.phpt
pear/tests/DB/tests/driver/13limit.phpt
pear/tests/DB/tests/driver/14fetchmode_object.phpt
pear/tests/DB/tests/driver/15quote.phpt
+pear/tests/DB/tests/driver/16tableinfo.phpt
+pear/tests/DB/tests/driver/17query.phpt
+pear/tests/DB/tests/driver/18get.phpt
pear/tests/DB/tests/driver/bug22328.phpt
pear/tests/DB/tests/driver/connect.inc
pear/tests/DB/tests/driver/mktable.inc
-pear/tests/DB/tests/driver/setup.inc
+pear/tests/DB/tests/driver/run.cvs
+pear/tests/DB/tests/driver/setup.inc.cvs
pear/tests/DB/tests/driver/skipif.inc
pear/tests/DB/tests/driver/01connect.phpt
pear/tests/DB/tests/db_error.phpt
@@ -112,234 +120,236 @@
pear/tests/XML_Parser/tests/test3.xml
pear/tests/XML_Parser/tests/001.phpt
pear/include/Zend/FlexLexer.h
-pear/include/Zend/zend_types.h
-pear/include/Zend/zend_static_allocator.h
-pear/include/Zend/zend_stack.h
-pear/include/Zend/zend_qsort.h
-pear/include/Zend/zend_ptr_stack.h
-pear/include/Zend/zend_operators.h
-pear/include/Zend/zend_multiply.h
-pear/include/Zend/zend_multibyte.h
-pear/include/Zend/zend_modules.h
-pear/include/Zend/zend_llist.h
-pear/include/Zend/zend_list.h
-pear/include/Zend/zend_language_scanner.h
-pear/include/Zend/zend_language_parser.h
-pear/include/Zend/zend_istdiostream.h
-pear/include/Zend/zend_ini_scanner.h
-pear/include/Zend/zend_ini_parser.h
-pear/include/Zend/zend_ini.h
+pear/include/Zend/acconfig.h
+pear/include/Zend/zend.h
+pear/include/Zend/zend_API.h
+pear/include/Zend/zend_alloc.h
+pear/include/Zend/zend_builtin_functions.h
+pear/include/Zend/zend_compile.h
+pear/include/Zend/zend_config.h
+pear/include/Zend/zend_config.w32.h
+pear/include/Zend/zend_constants.h
+pear/include/Zend/zend_dynamic_array.h
+pear/include/Zend/zend_errors.h
+pear/include/Zend/zend_execute.h
+pear/include/Zend/zend_execute_globals.h
+pear/include/Zend/zend_execute_locks.h
+pear/include/Zend/zend_extensions.h
+pear/include/Zend/zend_fast_cache.h
+pear/include/Zend/zend_globals.h
+pear/include/Zend/zend_globals_macros.h
pear/include/Zend/zend_hash.h
-pear/include/Zend/zend_indent.h
pear/include/Zend/zend_highlight.h
-pear/include/Zend/zend_globals_macros.h
-pear/include/Zend/zend_globals.h
-pear/include/Zend/zend_fast_cache.h
-pear/include/Zend/zend_extensions.h
-pear/include/Zend/zend_execute_locks.h
-pear/include/Zend/zend_execute_globals.h
-pear/include/Zend/zend_execute.h
-pear/include/Zend/zend_errors.h
-pear/include/Zend/zend_dynamic_array.h
-pear/include/Zend/zend_constants.h
-pear/include/Zend/zend_config.w32.h
-pear/include/Zend/zend_config.h
-pear/include/Zend/zend_compile.h
-pear/include/Zend/zend_builtin_functions.h
-pear/include/Zend/zend_alloc.h
-pear/include/Zend/zend_API.h
-pear/include/Zend/zend.h
-pear/include/Zend/acconfig.h
+pear/include/Zend/zend_indent.h
+pear/include/Zend/zend_ini.h
+pear/include/Zend/zend_ini_parser.h
+pear/include/Zend/zend_ini_scanner.h
+pear/include/Zend/zend_istdiostream.h
+pear/include/Zend/zend_language_parser.h
+pear/include/Zend/zend_language_scanner.h
+pear/include/Zend/zend_list.h
+pear/include/Zend/zend_llist.h
+pear/include/Zend/zend_modules.h
+pear/include/Zend/zend_multibyte.h
+pear/include/Zend/zend_multiply.h
+pear/include/Zend/zend_operators.h
+pear/include/Zend/zend_ptr_stack.h
+pear/include/Zend/zend_qsort.h
+pear/include/Zend/zend_stack.h
+pear/include/Zend/zend_static_allocator.h
+pear/include/Zend/zend_types.h
pear/include/Zend/zend_variables.h
pear/include/TSRM/TSRM.h
-pear/include/TSRM/tsrm_virtual_cwd.h
-pear/include/TSRM/tsrm_strtok_r.h
-pear/include/TSRM/tsrm_nw.h
-pear/include/TSRM/tsrm_config_common.h
-pear/include/TSRM/tsrm_config.w32.h
-pear/include/TSRM/tsrm_config.nw.h
-pear/include/TSRM/tsrm_config.h
-pear/include/TSRM/readdir.h
pear/include/TSRM/acconfig.h
+pear/include/TSRM/readdir.h
+pear/include/TSRM/tsrm_config.h
+pear/include/TSRM/tsrm_config.nw.h
+pear/include/TSRM/tsrm_config.w32.h
+pear/include/TSRM/tsrm_config_common.h
+pear/include/TSRM/tsrm_nw.h
+pear/include/TSRM/tsrm_strtok_r.h
+pear/include/TSRM/tsrm_virtual_cwd.h
pear/include/TSRM/tsrm_win32.h
pear/include/ext/standard/aggregation.h
-pear/include/ext/standard/url_scanner.h
-pear/include/ext/standard/url.h
-pear/include/ext/standard/uniqid.h
-pear/include/ext/standard/sha1.h
-pear/include/ext/standard/scanf.h
-pear/include/ext/standard/reg.h
-pear/include/ext/standard/quot_print.h
-pear/include/ext/standard/php_versioning.h
-pear/include/ext/standard/php_var.h
-pear/include/ext/standard/php_type.h
-pear/include/ext/standard/php_string.h
-pear/include/ext/standard/php_standard.h
-pear/include/ext/standard/php_smart_str_public.h
-pear/include/ext/standard/php_smart_str.h
-pear/include/ext/standard/php_rand.h
-pear/include/ext/standard/php_parsedate.h
-pear/include/ext/standard/php_metaphone.h
-pear/include/ext/standard/php_math.h
-pear/include/ext/standard/php_mail.h
-pear/include/ext/standard/php_link.h
-pear/include/ext/standard/php_lcg.h
-pear/include/ext/standard/php_iptc.h
-pear/include/ext/standard/php_incomplete_class.h
-pear/include/ext/standard/php_image.h
-pear/include/ext/standard/php_ftok.h
-pear/include/ext/standard/php_fopen_wrappers.h
-pear/include/ext/standard/php_filestat.h
-pear/include/ext/standard/php_ext_syslog.h
-pear/include/ext/standard/php_dir.h
-pear/include/ext/standard/php_crypt.h
-pear/include/ext/standard/php_browscap.h
-pear/include/ext/standard/php_assert.h
-pear/include/ext/standard/php_array.h
-pear/include/ext/standard/parsedate.h
-pear/include/ext/standard/pageinfo.h
-pear/include/ext/standard/pack.h
-pear/include/ext/standard/microtime.h
-pear/include/ext/standard/md5.h
-pear/include/ext/standard/info.h
-pear/include/ext/standard/html.h
-pear/include/ext/standard/head.h
-pear/include/ext/standard/fsock.h
-pear/include/ext/standard/flock_compat.h
-pear/include/ext/standard/file.h
-pear/include/ext/standard/exec.h
-pear/include/ext/standard/dns.h
-pear/include/ext/standard/dl.h
-pear/include/ext/standard/datetime.h
-pear/include/ext/standard/cyr_convert.h
-pear/include/ext/standard/css.h
-pear/include/ext/standard/credits_sapi.h
-pear/include/ext/standard/credits_ext.h
-pear/include/ext/standard/credits.h
-pear/include/ext/standard/crc32.h
-pear/include/ext/standard/basic_functions.h
pear/include/ext/standard/base64.h
+pear/include/ext/standard/basic_functions.h
+pear/include/ext/standard/crc32.h
+pear/include/ext/standard/credits.h
+pear/include/ext/standard/credits_ext.h
+pear/include/ext/standard/credits_sapi.h
+pear/include/ext/standard/css.h
+pear/include/ext/standard/cyr_convert.h
+pear/include/ext/standard/datetime.h
+pear/include/ext/standard/dl.h
+pear/include/ext/standard/dns.h
+pear/include/ext/standard/exec.h
+pear/include/ext/standard/file.h
+pear/include/ext/standard/flock_compat.h
+pear/include/ext/standard/fsock.h
+pear/include/ext/standard/head.h
+pear/include/ext/standard/html.h
+pear/include/ext/standard/info.h
+pear/include/ext/standard/md5.h
+pear/include/ext/standard/microtime.h
+pear/include/ext/standard/pack.h
+pear/include/ext/standard/pageinfo.h
+pear/include/ext/standard/parsedate.h
+pear/include/ext/standard/php_array.h
+pear/include/ext/standard/php_assert.h
+pear/include/ext/standard/php_browscap.h
+pear/include/ext/standard/php_crypt.h
+pear/include/ext/standard/php_dir.h
+pear/include/ext/standard/php_ext_syslog.h
+pear/include/ext/standard/php_filestat.h
+pear/include/ext/standard/php_fopen_wrappers.h
+pear/include/ext/standard/php_ftok.h
+pear/include/ext/standard/php_image.h
+pear/include/ext/standard/php_incomplete_class.h
+pear/include/ext/standard/php_iptc.h
+pear/include/ext/standard/php_lcg.h
+pear/include/ext/standard/php_link.h
+pear/include/ext/standard/php_mail.h
+pear/include/ext/standard/php_math.h
+pear/include/ext/standard/php_metaphone.h
+pear/include/ext/standard/php_parsedate.h
+pear/include/ext/standard/php_rand.h
+pear/include/ext/standard/php_smart_str.h
+pear/include/ext/standard/php_smart_str_public.h
+pear/include/ext/standard/php_standard.h
+pear/include/ext/standard/php_string.h
+pear/include/ext/standard/php_type.h
+pear/include/ext/standard/php_var.h
+pear/include/ext/standard/php_versioning.h
+pear/include/ext/standard/quot_print.h
+pear/include/ext/standard/reg.h
+pear/include/ext/standard/scanf.h
+pear/include/ext/standard/sha1.h
+pear/include/ext/standard/uniqid.h
+pear/include/ext/standard/url.h
+pear/include/ext/standard/url_scanner.h
pear/include/ext/standard/url_scanner_ex.h
-pear/include/ext/session/php_session.h
-pear/include/ext/session/mod_user.h
-pear/include/ext/session/mod_mm.h
pear/include/ext/session/mod_files.h
+pear/include/ext/session/mod_mm.h
+pear/include/ext/session/mod_user.h
+pear/include/ext/session/php_session.h
pear/include/ext/xml/expat/ascii.h
-pear/include/ext/xml/expat/xmltok.h
-pear/include/ext/xml/expat/xmlrole.h
-pear/include/ext/xml/expat/winconfig.h
-pear/include/ext/xml/expat/utf8tab.h
-pear/include/ext/xml/expat/nametab.h
-pear/include/ext/xml/expat/latin1tab.h
-pear/include/ext/xml/expat/internal.h
-pear/include/ext/xml/expat/iasciitab.h
-pear/include/ext/xml/expat/expat.h
pear/include/ext/xml/expat/asciitab.h
+pear/include/ext/xml/expat/expat.h
+pear/include/ext/xml/expat/iasciitab.h
+pear/include/ext/xml/expat/internal.h
+pear/include/ext/xml/expat/latin1tab.h
+pear/include/ext/xml/expat/nametab.h
+pear/include/ext/xml/expat/utf8tab.h
+pear/include/ext/xml/expat/winconfig.h
+pear/include/ext/xml/expat/xmlrole.h
+pear/include/ext/xml/expat/xmltok.h
pear/include/ext/xml/expat/xmltok_impl.h
pear/include/ext/xml/php_xml.h
-pear/include/ext/mbstring/cp932_table.h
-pear/include/ext/mbstring/unicode_table_ru.h
-pear/include/ext/mbstring/unicode_table_kr.h
-pear/include/ext/mbstring/unicode_table_ja.h
-pear/include/ext/mbstring/unicode_table_cn.h
-pear/include/ext/mbstring/unicode_table.h
-pear/include/ext/mbstring/unicode_data.h
-pear/include/ext/mbstring/php_unicode.h
-pear/include/ext/mbstring/php_mbregex.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfilter.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfl_language.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
+pear/include/ext/mbstring/libmbfl/mbfl/mbfl_string.h
pear/include/ext/mbstring/mbstring.h
-pear/include/ext/mbstring/mbregex.h
-pear/include/ext/mbstring/mbfilter_tw.h
-pear/include/ext/mbstring/mbfilter_ru.h
-pear/include/ext/mbstring/mbfilter_kr.h
-pear/include/ext/mbstring/mbfilter_ja.h
-pear/include/ext/mbstring/mbfilter_cn.h
-pear/include/ext/mbstring/mbfilter.h
-pear/include/ext/mbstring/unicode_table_tw.h
+pear/include/ext/mbstring/php_mbregex.h
+pear/include/ext/mbstring/php_unicode.h
+pear/include/ext/mbstring/unicode_data.h
pear/include/ext/pgsql/php_pgsql.h
+pear/include/main/php_embed.h
pear/include/main/SAPI.h
-pear/include/main/spprintf.h
-pear/include/main/snprintf.h
-pear/include/main/safe_mode.h
-pear/include/main/rfc1867.h
-pear/include/main/php_version.h
-pear/include/main/php_variables.h
-pear/include/main/php_ticks.h
-pear/include/main/php_syslog.h
-pear/include/main/php_streams.h
-pear/include/main/php_scandir.h
-pear/include/main/php_regex.h
-pear/include/main/php_reentrancy.h
-pear/include/main/php_output.h
-pear/include/main/php_open_temporary_file.h
-pear/include/main/php_network.h
-pear/include/main/php_memory_streams.h
-pear/include/main/php_main.h
-pear/include/main/php_logos.h
-pear/include/main/php_ini.h
-pear/include/main/php_globals.h
-pear/include/main/php_content_types.h
-pear/include/main/php_config.h
-pear/include/main/php_compat.h
-pear/include/main/php3_compat.h
-pear/include/main/php.h
-pear/include/main/logos.h
-pear/include/main/internal_functions_registry.h
-pear/include/main/fopen_wrappers.h
-pear/include/main/config.w32.h
-pear/include/main/config.nw.h
pear/include/main/build-defs.h
+pear/include/main/config.nw.h
+pear/include/main/config.w32.h
+pear/include/main/fopen_wrappers.h
+pear/include/main/internal_functions_registry.h
+pear/include/main/logos.h
+pear/include/main/php.h
+pear/include/main/php3_compat.h
+pear/include/main/php_compat.h
+pear/include/main/php_config.h
+pear/include/main/php_content_types.h
+pear/include/main/php_globals.h
+pear/include/main/php_ini.h
+pear/include/main/php_logos.h
+pear/include/main/php_main.h
+pear/include/main/php_memory_streams.h
+pear/include/main/php_network.h
+pear/include/main/php_open_temporary_file.h
+pear/include/main/php_output.h
+pear/include/main/php_reentrancy.h
+pear/include/main/php_regex.h
+pear/include/main/php_scandir.h
+pear/include/main/php_streams.h
+pear/include/main/php_syslog.h
+pear/include/main/php_ticks.h
+pear/include/main/php_variables.h
+pear/include/main/php_version.h
+pear/include/main/rfc1867.h
+pear/include/main/safe_mode.h
+pear/include/main/snprintf.h
+pear/include/main/spprintf.h
pear/include/main/win95nt.h
-pear/include/main/php_embed.h
-pear/include/regex/utils.h
-pear/include/regex/regex_extra.h
-pear/include/regex/regex2.h
-pear/include/regex/regex.h
-pear/include/regex/cname.h
pear/include/regex/cclass.h
+pear/include/regex/cname.h
+pear/include/regex/regex.h
+pear/include/regex/regex2.h
+pear/include/regex/regex_extra.h
+pear/include/regex/utils.h
pear/include/acconfig.h
-pear/build/acinclude.m4
+pear/build/phpize.m4
+pear/build/mkdep.awk
+pear/build/shtool
pear/build/scan_makefile_in.awk
pear/build/Makefile.global
-pear/build/shtool
-pear/build/mkdep.awk
-pear/build/phpize.m4
-@dirrm pear/build
-@dirrm pear/include/regex
-@dirrm pear/include/main
-@dirrm pear/include/ext/pgsql
-@dirrm pear/include/ext/mbstring
-@dirrm pear/include/ext/xml/expat
-@dirrm pear/include/ext/xml
-@dirrm pear/include/ext/session
-@dirrm pear/include/ext/standard
-@dirrm pear/include/ext
-@dirrm pear/include/TSRM
-@dirrm pear/include/Zend
-@dirrm pear/include
+pear/build/acinclude.m4
@dirrm pear/tests/XML_Parser/tests
@dirrm pear/tests/XML_Parser
@dirrm pear/tests/DB/tests/driver
@dirrm pear/tests/DB/tests
@dirrm pear/tests/DB
@dirrm pear/tests
-@dirrm pear/data/PEAR
-@dirrm pear/data
-@dirrm pear/doc/DB/doc
-@dirrm pear/doc/DB
-@dirrm pear/doc/Archive_Tar/docs
-@dirrm pear/doc/Archive_Tar
-@dirrm pear/doc
-@dirrm pear/lib/Mail
-@dirrm pear/lib/DB
@dirrm pear/lib/XML/RPC
@dirrm pear/lib/XML
-@dirrm pear/lib/Net
-@dirrm pear/lib/OS
@dirrm pear/lib/PEAR/Frontend
@dirrm pear/lib/PEAR/Command
@dirrm pear/lib/PEAR
+@dirrm pear/lib/OS
+@dirrm pear/lib/Net
+@dirrm pear/lib/Mail
+@dirrm pear/lib/DB
@dirrm pear/lib/Console
@dirrm pear/lib/Archive
@dirrm pear/lib/.registry
@dirrm pear/lib
+@dirrm pear/include/regex
+@dirrm pear/include/main
+@dirrm pear/include/ext/xml/expat
+@dirrm pear/include/ext/xml
+@dirrm pear/include/ext/standard
+@dirrm pear/include/ext/session
+@dirrm pear/include/ext/pgsql
+@dirrm pear/include/ext/mbstring/libmbfl/mbfl
+@dirrm pear/include/ext/mbstring/libmbfl
+@dirrm pear/include/ext/mbstring
+@dirrm pear/include/ext
+@dirrm pear/include/Zend
+@dirrm pear/include/TSRM
+@dirrm pear/include
+@dirrm pear/doc/DB/doc
+@dirrm pear/doc/DB
+@dirrm pear/doc/Archive_Tar/docs
+@dirrm pear/doc/Archive_Tar
+@dirrm pear/doc
+@dirrm pear/data/PEAR
+@dirrm pear/data
+@dirrm pear/build
@dirrm pear
Index: extensions/Makefile
===================================================================
RCS file: /cvs/ports/www/php4/extensions/Makefile,v
retrieving revision 1.24.2.1
diff -u -r1.24.2.1 Makefile
--- extensions/Makefile 14 Nov 2003 15:22:23 -0000 1.24.2.1
+++ extensions/Makefile 18 Jul 2004 10:20:53 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24.2.1 2003/11/14 15:22:23 avsm Exp $
+# $OpenBSD: Makefile,v 1.29.2.2 2004/07/17 00:52:34 robert Exp $
FULLPKGNAME= php4-extensions-${V}
COMMENT= "informational package about PHP4 extensions"
@@ -25,7 +25,8 @@
GRAPHIC_CONFIG= --with-jpeg-dir=${LOCALBASE} \
--with-png-dir=${LOCALBASE} \
- --with-tiff-dir=${LOCALBASE}
+ --with-tiff-dir=${LOCALBASE} \
+ --with-zlib-dir=/usr
# bz2
PSEUDO_FLAVORS+= no_bz2
@@ -185,7 +186,7 @@
MULTI_PACKAGES+= -mysql
COMMENT-mysql= "mysql database access extensions for php4"
CONFIGURE_ARGS+= --with-mysql=shared,${LOCALBASE}
-MYSQL_DEPENDS= lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
+MYSQL_DEPENDS= lib/mysql/mysqlclient.10::databases/mysql
.endif
# ncurses
@@ -252,17 +253,6 @@
SNMP_DEPENDS= snmp.42::net/ucd-snmp
.endif
-# pspell
-PSEUDO_FLAVORS+= no_pspell
-.if ${FLAVOR:L:Mno_pspell}
-CONFIGURE_ARGS+= --without-pspell
-.else
-MULTI_PACKAGES+= -pspell
-COMMENT-pspell= "spell checking extensions for php4"
-CONFIGURE_ARGS+= --with-pspell=shared,${LOCALBASE}
-LIB_DEPENDS+= aspell.15::textproc/aspell
-.endif
-
# sybase-ct
PSEUDO_FLAVORS+= no_sybase_ct
.if ${FLAVOR:L:Mno_sybase_ct}
@@ -272,6 +262,17 @@
COMMENT-sybase_ct= "sybase database access extensions for php4"
CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
SYBASE_CT_DEPENDS= tds.0,ct.0::databases/freetds
+.endif
+
+# xml-rpc
+PSEUDO_FLAVORS+= no_xmlrpc
+.if ${FLAVOR:L:Mno_xmlrpc}
+CONFIGURE_ARGS+= --without-xmlrpc
+.else
+MULTI_PACKAGES+= -xmlrpc
+COMMENT-xmlrpc= "XML RPC functions for php4"
+CONFIGURE_ARGS+= --with-xmlrpc=shared
+XMLRPC_DEPENDS= expat.2::textproc/expat
.endif
# xslt
Index: extensions/distinfo
===================================================================
RCS file: /cvs/ports/www/php4/extensions/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- extensions/distinfo 28 Aug 2003 22:30:38 -0000 1.7
+++ extensions/distinfo 18 Jul 2004 10:20:53 -0000
@@ -1,3 +1,3 @@
-MD5 (php-4.3.3.tar.gz) = fe3fede4115354155fc6185522f7c6b2
-RMD160 (php-4.3.3.tar.gz) = 03ac1565271284c2f6a862e220b9f6487e1d8813
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
+MD5 (php-4.3.8.tar.gz) = dd69f8c89281f088eadf4ade3dbd39ee
+RMD160 (php-4.3.8.tar.gz) = ce58295b885b447db1d80c6aaf3e0f517682c58c
+SHA1 (php-4.3.8.tar.gz) = 0e2339bb70164e08bacb5ecf2b147233caad9dc8
Index: extensions/patches/patch-ext_imap_config_m4
===================================================================
RCS file: /cvs/ports/www/php4/extensions/patches/patch-ext_imap_config_m4,v
retrieving revision 1.7
diff -u -r1.7 patch-ext_imap_config_m4
--- extensions/patches/patch-ext_imap_config_m4 28 May 2003 19:27:34 -0000 1.7
+++ extensions/patches/patch-ext_imap_config_m4 18 Jul 2004 10:20:53 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ext_imap_config_m4,v 1.7 2003/05/28 19:27:34 avsm Exp $
---- ext/imap/config.m4.orig Sat May 10 18:11:33 2003
-+++ ext/imap/config.m4 Tue May 27 19:41:19 2003
-@@ -86,10 +86,11 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
+$OpenBSD: patch-ext_imap_config_m4,v 1.8.2.2 2004/07/17 00:52:34 robert Exp $
+--- ext/imap/config.m4.orig 2004-01-16 19:01:06.000000000 -0500
++++ ext/imap/config.m4 2004-04-06 03:11:44.000000000 -0400
+@@ -85,10 +85,9 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
fi
AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD)
@@ -11,8 +11,6 @@
- PHP_ADD_LIBRARY(com_err, 1, IMAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(crypto, 1, IMAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(gssapi, 1, IMAP_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY(asn1, 1, IMAP_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY(com_err, 1, IMAP_SHARED_LIBADD)
PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
else
AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
Index: extensions/patches/patch-ext_pdf_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_pdf_config_m4
diff -N extensions/patches/patch-ext_pdf_config_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ extensions/patches/patch-ext_pdf_config_m4 18 Jul 2004 10:20:53 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-ext_pdf_config_m4,v 1.4 2004/01/05 17:02:33 avsm Exp $
+--- ext/pdf/config.m4.orig 2004-01-05 09:30:28.000000000 +0000
++++ ext/pdf/config.m4 2004-01-05 09:32:53.000000000 +0000
+@@ -72,7 +72,7 @@ if test "$PHP_PDFLIB" != "no"; then
+ ],[
+ AC_MSG_ERROR([libtiff not found!])
+ ],[
+- -L$PHP_TIFF_DIR/lib
++ -L$PHP_TIFF_DIR/lib -ljpeg -lz
+ ])
+ else
+ AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>])
Index: extensions/patches/patch-ext_snmp_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_snmp_config_m4
diff -N extensions/patches/patch-ext_snmp_config_m4
--- extensions/patches/patch-ext_snmp_config_m4 23 May 2003 20:07:18 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_snmp_config_m4,v 1.4 2003/05/23 20:07:18 avsm Exp $
---- ext/snmp/config.m4.orig Mon Feb 17 22:44:47 2003
-+++ ext/snmp/config.m4 Fri May 23 14:47:52 2003
-@@ -80,6 +80,7 @@ if test "$PHP_SNMP" != "no"; then
- if test "$PHP_OPENSSL" != "no"; then
- PHP_ADD_LIBRARY(ssl, 1, SNMP_SHARED_LIBADD)
- PHP_ADD_LIBRARY(crypto,1, SNMP_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY(des ,1, SNMP_SHARED_LIBADD)
- else
- AC_MSG_ERROR(The UCD-SNMP in this system is built with SSL support.
-
Index: extensions/pkg/DESCR-pspell
===================================================================
RCS file: extensions/pkg/DESCR-pspell
diff -N extensions/pkg/DESCR-pspell
--- extensions/pkg/DESCR-pspell 21 Jul 2003 20:34:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-This PHP extensions provides an interface to the aspell spell-checking
-library, and can also offer suggestions for corrections.
-
-WWW: ${HOMEPAGE}
Index: extensions/pkg/DESCR-xmlrpc
===================================================================
RCS file: extensions/pkg/DESCR-xmlrpc
diff -N extensions/pkg/DESCR-xmlrpc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ extensions/pkg/DESCR-xmlrpc 18 Jul 2004 10:20:55 -0000
@@ -0,0 +1,4 @@
+These functions can be used to write XML-RPC servers and clients.
+You can find more information about XML-RPC at http://www.xmlrpc.com/,
+and more documentation on this extension and its functions at
+http://xmlrpc-epi.sourceforge.net/.
Index: extensions/pkg/PLIST-pspell
===================================================================
RCS file: extensions/pkg/PLIST-pspell
diff -N extensions/pkg/PLIST-pspell
--- extensions/pkg/PLIST-pspell 21 Jul 2003 20:34:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-pspell,v 1.1 2003/07/21 20:34:52 avsm Exp $
-lib/php/modules/pspell.so
Index: extensions/pkg/PLIST-xmlrpc
===================================================================
RCS file: extensions/pkg/PLIST-xmlrpc
diff -N extensions/pkg/PLIST-xmlrpc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ extensions/pkg/PLIST-xmlrpc 18 Jul 2004 10:20:55 -0000
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST-xmlrpc,v 1.1 2004/02/29 00:25:42 avsm Exp $
+lib/php/modules/xmlrpc.so
Index: patches/patch-aclocal_m4
===================================================================
RCS file: /cvs/ports/www/php4/patches/patch-aclocal_m4,v
retrieving revision 1.4
diff -u -r1.4 patch-aclocal_m4
--- patches/patch-aclocal_m4 23 May 2003 20:08:33 -0000 1.4
+++ patches/patch-aclocal_m4 18 Jul 2004 10:20:55 -0000
@@ -1,7 +1,15 @@
-$OpenBSD: patch-aclocal_m4,v 1.4 2003/05/23 20:08:33 avsm Exp $
---- aclocal.m4.orig Thu May 22 01:25:35 2003
-+++ aclocal.m4 Thu May 22 16:20:29 2003
-@@ -3968,7 +3968,7 @@ openbsd*)
+$OpenBSD: patch-aclocal_m4,v 1.6 2004/02/29 00:08:08 avsm Exp $
+--- aclocal.m4.orig 2004-02-16 15:30:25.000000000 +0000
++++ aclocal.m4 2004-02-28 17:54:33.000000000 +0000
+@@ -1659,6 +1659,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+
+ PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
+ PHP_ADD_LIBRARY(crypto,,$1)
++ PHP_ADD_LIBRARY(des,,$1)
+ ],[
+ AC_MSG_ERROR([libcrypto not found!])
+ ],[
+@@ -4074,7 +4075,7 @@ openbsd*)
shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/www/php4/patches/patch-configure_in,v
retrieving revision 1.8
diff -u -r1.8 patch-configure_in
--- patches/patch-configure_in 23 May 2003 20:08:33 -0000 1.8
+++ patches/patch-configure_in 18 Jul 2004 10:20:55 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_in,v 1.8 2003/05/23 20:08:33 avsm Exp $
---- configure.in.orig Thu May 22 00:22:00 2003
-+++ configure.in Thu May 22 16:20:29 2003
+$OpenBSD: patch-configure_in,v 1.10.2.2 2004/07/17 00:52:34 robert Exp $
+--- configure.in.orig 2004-06-02 14:25:44.000000000 +0100
++++ configure.in 2004-06-06 19:11:28.000000000 +0100
@@ -31,9 +31,7 @@ AC_PREREQ(2.13)
AC_INIT(README.CVS-RULES)
@@ -12,7 +12,7 @@
AC_CANONICAL_HOST
AC_CONFIG_HEADER(main/php_config.h)
-@@ -811,14 +809,14 @@ unset with_pic
+@@ -813,14 +811,14 @@ unset with_pic
case $php_build_target in
program|static)
@@ -29,7 +29,7 @@
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;;
esac
-@@ -938,7 +936,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+@@ -1002,7 +1000,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
Index: patches/patch-ext_bcmath_libbcmath_src_output_c
===================================================================
RCS file: patches/patch-ext_bcmath_libbcmath_src_output_c
diff -N patches/patch-ext_bcmath_libbcmath_src_output_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ext_bcmath_libbcmath_src_output_c 18 Jul 2004 10:20:55 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-ext_bcmath_libbcmath_src_output_c,v 1.1 2003/11/15 18:11:35 avsm Exp $
+--- ext/bcmath/libbcmath/src/output.c.orig 2003-11-14 08:15:42.000000000 +0000
++++ ext/bcmath/libbcmath/src/output.c 2003-11-14 08:16:22.000000000 +0000
+@@ -71,7 +71,7 @@ bc_out_long (val, size, space, out_char)
+ int len, ix;
+
+ if (space) (*out_char) (' ');
+- sprintf (digits, "%ld", val);
++ snprintf (digits, sizeof digits, "%ld", val);
+ len = strlen (digits);
+ while (size > len)
+ {
Index: patches/patch-ext_bcmath_libbcmath_src_rt_c
===================================================================
RCS file: patches/patch-ext_bcmath_libbcmath_src_rt_c
diff -N patches/patch-ext_bcmath_libbcmath_src_rt_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ext_bcmath_libbcmath_src_rt_c 18 Jul 2004 10:20:55 -0000
@@ -0,0 +1,21 @@
+$OpenBSD: patch-ext_bcmath_libbcmath_src_rt_c,v 1.1 2003/11/15 18:11:35 avsm Exp $
+--- ext/bcmath/libbcmath/src/rt.c.orig 2000-11-22 20:20:02.000000000 +0000
++++ ext/bcmath/libbcmath/src/rt.c 2003-11-14 08:30:51.000000000 +0000
+@@ -45,7 +45,7 @@ void bc_rt_warn (char *mesg ,...)
+ char error_mesg [255];
+
+ va_start (args, mesg);
+- vsprintf (error_mesg, mesg, args);
++ vsnprintf (error_mesg, sizeof error_mesg, mesg, args);
+ va_end (args);
+
+ fprintf (stderr, "bc math warning: %s\n", error_mesg);
+@@ -58,7 +58,7 @@ void bc_rt_error (char *mesg ,...)
+ char error_mesg [255];
+
+ va_start (args, mesg);
+- vsprintf (error_mesg, mesg, args);
++ vsnprintf (error_mesg, sizeof error_mesg, mesg, args);
+ va_end (args);
+
+ fprintf (stderr, "bc math error: %s\n", error_mesg);
Index: patches/patch-ext_calendar_calendar_c
===================================================================
RCS file: patches/patch-ext_calendar_calendar_c
diff -N patches/patch-ext_calendar_calendar_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ext_calendar_calendar_c 18 Jul 2004 10:20:55 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-ext_calendar_calendar_c,v 1.1 2003/11/15 18:11:35 avsm Exp $
+--- ext/calendar/calendar.c.orig 2003-11-14 08:29:51.000000000 +0000
++++ ext/calendar/calendar.c 2003-11-14 08:30:16.000000000 +0000
+@@ -276,7 +276,7 @@ PHP_FUNCTION(cal_from_jd)
+ Z_LVAL_PP(jd),
+ &year, &month, &day);
+
+- sprintf(date, "%i/%i/%i", month, day, year);
++ snprintf(date, sizeof date, "%i/%i/%i", month, day, year);
+ add_assoc_string(return_value, "date", date, 1);
+
+ add_assoc_long(return_value, "month", month);
Index: patches/patch-ext_standard_exec_c
===================================================================
RCS file: patches/patch-ext_standard_exec_c
diff -N patches/patch-ext_standard_exec_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ext_standard_exec_c 18 Jul 2004 10:20:55 -0000
@@ -0,0 +1,12 @@
+$OpenBSD: patch-ext_standard_exec_c,v 1.2.2.3 2004/07/17 01:33:53 robert Exp $
+--- ext/standard/exec.c.orig 2004-05-18 14:43:33.000000000 +0100
++++ ext/standard/exec.c 2004-06-06 19:11:28.000000000 +0100
+@@ -952,7 +952,7 @@ PHP_FUNCTION(proc_open)
+ close(descriptors[i].childend);
+ }
+
+- execl("/bin/sh", "sh", "-c", command, NULL);
++ execl("/bin/sh", "sh", "-c", command, (void *)NULL);
+ _exit(127);
+
+ } else if (child < 0) {
Index: patches/patch-php_ini-dist
===================================================================
RCS file: /cvs/ports/www/php4/patches/patch-php_ini-dist,v
retrieving revision 1.10
diff -u -r1.10 patch-php_ini-dist
--- patches/patch-php_ini-dist 28 Aug 2003 22:30:38 -0000 1.10
+++ patches/patch-php_ini-dist 18 Jul 2004 10:20:55 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-php_ini-dist,v 1.10 2003/08/28 22:30:38 avsm Exp $
---- php.ini-dist.orig 2003-07-09 15:38:36.000000000 -0700
-+++ php.ini-dist 2003-08-25 18:44:52.000000000 -0700
-@@ -408,10 +408,7 @@ default_mimetype = "text/html"
+$OpenBSD: patch-php_ini-dist,v 1.12.2.2 2004/07/17 00:52:34 robert Exp $
+--- php.ini-dist.orig Mon May 17 18:31:13 2004
++++ php.ini-dist Mon Jul 5 01:56:38 2004
+@@ -408,10 +408,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -13,7 +13,7 @@
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-@@ -425,7 +422,7 @@ doc_root =
+@@ -425,7 +422,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
@@ -22,7 +22,7 @@
; 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
-@@ -487,7 +484,7 @@ upload_max_filesize = 2M
+@@ -491,7 +488,7 @@
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@@ -31,7 +31,7 @@
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
-@@ -506,77 +503,6 @@ default_socket_timeout = 60
+@@ -510,77 +507,6 @@
; auto_detect_line_endings = Off
@@ -109,22 +109,21 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -588,13 +514,8 @@ default_socket_timeout = 60
+@@ -592,13 +518,6 @@
define_syslog_variables = Off
[mail function]
-; For Win32 only.
-SMTP = localhost
+-smtp_port = 25
-
-; For Win32 only.
--sendmail_from = me@localhost.com
-
--; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
-+;You may supply arguments as well (default: "sendmail -t -i").
+-;sendmail_from = me@example.com
+-
+ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
- [Java]
-@@ -1111,3 +1032,57 @@ sockets.use_system_read = On
+@@ -1116,3 +1035,56 @@
; Local Variables:
; tab-width: 4
; End:
@@ -174,7 +173,6 @@
+;extension=pdf.so
+;extension=pgsql.so
+;extension=printer.so
-+;extension=pspell.so
+;extension=shmop.so
+;extension=snmp.so
+;extension=sockets.so
Index: patches/patch-php_ini-recommended
===================================================================
RCS file: /cvs/ports/www/php4/patches/patch-php_ini-recommended,v
retrieving revision 1.8
diff -u -r1.8 patch-php_ini-recommended
--- patches/patch-php_ini-recommended 28 Aug 2003 22:30:38 -0000 1.8
+++ patches/patch-php_ini-recommended 18 Jul 2004 10:20:55 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-php_ini-recommended,v 1.8 2003/08/28 22:30:38 avsm Exp $
---- php.ini-recommended.orig 2003-07-09 15:38:36.000000000 -0700
-+++ php.ini-recommended 2003-08-25 18:44:52.000000000 -0700
-@@ -423,11 +423,8 @@ default_mimetype = "text/html"
+$OpenBSD: patch-php_ini-recommended,v 1.10.2.2 2004/07/17 00:52:34 robert Exp $
+--- php.ini-recommended.orig Mon May 17 18:31:14 2004
++++ php.ini-recommended Mon Jul 5 01:56:46 2004
+@@ -423,11 +423,8 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -14,7 +14,7 @@
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
; if you are running php as a CGI under any web server (other than IIS)
-@@ -440,7 +437,7 @@ doc_root =
+@@ -440,7 +437,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
@@ -23,7 +23,7 @@
; 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
-@@ -502,7 +499,7 @@ upload_max_filesize = 2M
+@@ -506,7 +503,7 @@
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@@ -32,7 +32,7 @@
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
-@@ -521,77 +518,6 @@ default_socket_timeout = 60
+@@ -525,77 +522,6 @@
; auto_detect_line_endings = Off
@@ -110,19 +110,21 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -603,11 +529,6 @@ default_socket_timeout = 60
+@@ -607,13 +533,7 @@
define_syslog_variables = Off
[mail function]
-; For Win32 only.
-SMTP = localhost
--
--; For Win32 only.
--sendmail_from = me@localhost.com
+-smtp_port = 25
+-; For Win32 only.
+-;sendmail_from = me@example.com
+-
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
-@@ -1106,6 +1027,56 @@ sockets.use_system_read = On
+
+@@ -1111,6 +1031,55 @@
;exif.decode_jis_motorola = JIS
;exif.decode_jis_intel = JIS
@@ -174,7 +176,6 @@
+;extension=pdf.so
+;extension=pgsql.so
+;extension=printer.so
-+;extension=pspell.so
+;extension=shmop.so
+;extension=snmp.so
+;extension=sockets.so