diff --git a/www/php5/core/Makefile b/www/php5/core/Makefile index f9bf208e091..5c68ef48116 100644 --- a/www/php5/core/Makefile +++ b/www/php5/core/Makefile @@ -1,9 +1,16 @@ -# $OpenBSD: Makefile,v 1.20 2007/03/22 22:43:20 robert Exp $ +# $OpenBSD: Makefile,v 1.21 2007/04/01 21:37:27 robert Exp $ + +COMMENT-main= "server-side HTML-embedded scripting language" +COMMENT-fastcgi="stand-alone FastCGI version of PHP" + +PKGNAME= php5-core-${V}p0 +PKGNAME-main= php5-core-${V}p0 +PKGNAME-fastcgi=php5-fastcgi-${V} -COMMENT= "server-side HTML-embedded scripting language" -PKGNAME= php5-core-${V} DISTFILES= php-${V}.tar.gz +MULTI_PACKAGES= -main -fastcgi + CONFIGURE_ARGS+=--with-apxs=/usr/sbin/apxs \ --without-mysql \ --enable-xml \ @@ -26,7 +33,10 @@ CONFIGURE_ARGS+=--with-apxs=/usr/sbin/apxs \ --enable-yp \ --enable-exif \ --without-sqlite \ - --with-pear=${LOCALBASE}/share/php5 + --without-pdo-sqlite \ + --with-pear=${LOCALBASE}/share/php5 \ + --enable-fastcgi \ + --enable-force-cgi-redirect MODULES= devel/gettext @@ -56,6 +66,7 @@ post-install: ${PREFIX}/${APACHE_MODULE_SUBDIR} ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php5 ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cli/php ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cgi/php ${PREFIX}/bin/php-fastcgi .for i in dist recommended @sed -e 's,MODULES_DIR,${MODULES_DIR},' \ diff --git a/www/php5/core/patches/patch-sapi_cgi_Makefile_frag b/www/php5/core/patches/patch-sapi_cgi_Makefile_frag new file mode 100644 index 00000000000..0ff01eab2d9 --- /dev/null +++ b/www/php5/core/patches/patch-sapi_cgi_Makefile_frag @@ -0,0 +1,7 @@ +$OpenBSD: patch-sapi_cgi_Makefile_frag,v 1.1 2007/04/01 21:37:27 robert Exp $ +--- sapi/cgi/Makefile.frag.orig Wed Jul 2 03:08:26 2003 ++++ sapi/cgi/Makefile.frag Sun Apr 1 15:18:21 2007 +@@ -1,2 +1,2 @@ +-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) ++$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS) + $(BUILD_CGI) diff --git a/www/php5/core/patches/patch-sapi_cgi_config9_m4 b/www/php5/core/patches/patch-sapi_cgi_config9_m4 new file mode 100644 index 00000000000..22bb7ade3cf --- /dev/null +++ b/www/php5/core/patches/patch-sapi_cgi_config9_m4 @@ -0,0 +1,50 @@ +--- sapi/cgi/config9.m4.orig Thu Sep 28 11:37:52 2006 ++++ sapi/cgi/config9.m4 Sun Apr 1 15:23:31 2007 +@@ -80,7 +80,6 @@ main() + ]) + + +-if test "$PHP_SAPI" = "default"; then + AC_MSG_CHECKING(for CGI build) + if test "$PHP_SAPI_CGI" != "no"; then + AC_MSG_RESULT(yes) +@@ -141,7 +140,8 @@ if test "$PHP_SAPI" = "default"; then + AC_MSG_RESULT($PHP_ENABLE_FASTCGI) + + INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" +- PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)') ++ PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi) ++ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi) + + case $host_alias in + *aix*) +@@ -151,17 +151,26 @@ if test "$PHP_SAPI" = "default"; then + BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + ;; + *) +- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ++ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + ;; + esac + ++ PHP_CGI_TARGET="\$(SAPI_CGI_PATH)" + PHP_SUBST(BUILD_CGI) ++ PHP_SUBST(PHP_CGI_OBJS) ++ PHP_SUBST(PHP_CGI_TARGET) + +- elif test "$PHP_SAPI_CLI" != "no"; then +- AC_MSG_RESULT(no) ++ if test "$PHP_SAPI" = "default" ; then ++ PHP_BUILD_PROGRAM($SAPI_CGI_PATH) ++ fi ++ else ++ AC_MSG_RESULT(no) ++ if test "$PHP_SAPI" = "default" ; then ++ if test "$PHP_SAPI_CLI" != "no" ; then + OVERALL_TARGET= + PHP_SAPI=cli + else + AC_MSG_ERROR([No SAPIs selected.]) + fi ++ fi + fi diff --git a/www/php5/core/pkg/DESCR-fastcgi b/www/php5/core/pkg/DESCR-fastcgi new file mode 100644 index 00000000000..1f78ab9cdfc --- /dev/null +++ b/www/php5/core/pkg/DESCR-fastcgi @@ -0,0 +1,4 @@ +This is the core PHP binary compiled with FastCGI support +(www.fastcgi.org). FastCGI deployments are generally faster than +using PHP as a CGI, since the processes stay resident in memory +between requests. diff --git a/www/php5/core/pkg/DESCR b/www/php5/core/pkg/DESCR-main similarity index 100% rename from www/php5/core/pkg/DESCR rename to www/php5/core/pkg/DESCR-main diff --git a/www/php5/core/pkg/MESSAGE b/www/php5/core/pkg/MESSAGE-main similarity index 100% rename from www/php5/core/pkg/MESSAGE rename to www/php5/core/pkg/MESSAGE-main diff --git a/www/php5/core/pkg/PFRAG.shared b/www/php5/core/pkg/PFRAG.shared deleted file mode 100644 index eec482755b9..00000000000 --- a/www/php5/core/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2007/03/22 22:43:20 robert Exp $ -lib/php/libphp5.so diff --git a/www/php5/core/pkg/PFRAG.shared-main b/www/php5/core/pkg/PFRAG.shared-main new file mode 100644 index 00000000000..982c059eee8 --- /dev/null +++ b/www/php5/core/pkg/PFRAG.shared-main @@ -0,0 +1,2 @@ +@comment $OpenBSD: PFRAG.shared-main,v 1.3 2007/04/01 21:37:27 robert Exp $ +lib/php/libphp5.so diff --git a/www/php5/core/pkg/PLIST-fastcgi b/www/php5/core/pkg/PLIST-fastcgi new file mode 100644 index 00000000000..89ecb171a7f --- /dev/null +++ b/www/php5/core/pkg/PLIST-fastcgi @@ -0,0 +1,2 @@ +@comment $OpenBSD: PLIST-fastcgi,v 1.1 2007/04/01 21:37:27 robert Exp $ +bin/php-fastcgi diff --git a/www/php5/core/pkg/PLIST b/www/php5/core/pkg/PLIST-main similarity index 99% rename from www/php5/core/pkg/PLIST rename to www/php5/core/pkg/PLIST-main index 59105d6da76..8243cbf4d34 100644 --- a/www/php5/core/pkg/PLIST +++ b/www/php5/core/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.11 2007/03/22 22:43:20 robert Exp $ +@comment $OpenBSD: PLIST-main,v 1.3 2007/04/01 21:37:27 robert Exp $ @conflict php4-core-* @pkgpath www/php5/core @pkgpath www/php5/core,hardened diff --git a/www/php5/core/pkg/UNMESSAGE b/www/php5/core/pkg/UNMESSAGE-main similarity index 100% rename from www/php5/core/pkg/UNMESSAGE rename to www/php5/core/pkg/UNMESSAGE-main diff --git a/www/php5/extensions/Makefile b/www/php5/extensions/Makefile index 928b0568b03..c7225a6f59d 100644 --- a/www/php5/extensions/Makefile +++ b/www/php5/extensions/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.33 2007/03/22 22:43:20 robert Exp $ +# $OpenBSD: Makefile,v 1.34 2007/04/01 21:37:27 robert Exp $ -FULLPKGNAME-main= php5-extensions-${V} +FULLPKGNAME-main= php5-extensions-${V}p0 COMMENT-main= "informational package about PHP5 extensions" MULTI_PACKAGES= -main @@ -18,7 +18,8 @@ MODULES= devel/gettext CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \ --with-iconv-dir=${LOCALBASE} \ --with-iconv=${LOCALBASE} \ - --disable-dom + --disable-dom \ + --disable-cgi GRAPHIC_DEPENDS= jpeg.>=62::graphics/jpeg \ png.>=3::graphics/png @@ -48,7 +49,6 @@ COMMENT-curl= "curl URL library extensions for php5" CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE} LIB_DEPENDS-curl= curl.>=2::net/curl WANTLIB-curl= ${WANTLIB} crypto ssl z -FULLPKGNAME-curl= php5-curl-${V} .endif # dba @@ -213,6 +213,40 @@ CONFIGURE_ARGS+= --with-iodbc=shared LIB_DEPENDS-odbc= iodbc.>=2::databases/iodbc .endif +# pdo-mysql +PSEUDO_FLAVORS+= no_pdo_mysql +.if ${FLAVOR:L:Mno_pdo_mysql} +CONFIGURE_ARGS+= --without-pdo-mysql +.else +MULTI_PACKAGES+= -pdo_mysql +COMMENT-pdo_mysql= "PDO mysql database access extensions for php5" +CONFIGURE_ARGS+= --with-pdo-mysql=shared,${LOCALBASE} +LIB_DEPENDS-pdo_mysql= lib/mysql/mysqlclient.>=10::databases/mysql +WANTLIB-pdo_mysql= ${WANTLIB} crypto ssl z +.endif + +# pdo-pgsql +PSEUDO_FLAVORS+= no_pdo_pgsql +.if ${FLAVOR:L:Mno_pdo_pgsql} +CONFIGURE_ARGS+= --without-pdo-pgsql +.else +MULTI_PACKAGES+= -pdo_pgsql +COMMENT-pdo_pgsql= "PDO database access extensions for php5" +CONFIGURE_ARGS+= --with-pdo-pgsql=shared,${LOCALBASE} +LIB_DEPENDS-pdo_pgsql= pq.>=2:postgresql-client-*:databases/postgresql +.endif + +# pdo-sqlite +PSEUDO_FLAVORS+= no_pdo_sqlite +.if ${FLAVOR:L:Mno_pdo_sqlite} +CONFIGURE_ARGS+= --without-pdo-sqlite +.else +MULTI_PACKAGES+= -pdo_sqlite +COMMENT-pdo_sqlite= "PDO sqlite database access extensions for php5" +CONFIGURE_ARGS+= --with-pdo-sqlite=shared,${LOCALBASE} --enable-sqlite-utf8 +LIB_DEPENDS-pdo_sqlite= sqlite3.>=8::databases/sqlite3 +.endif + # pgsql PSEUDO_FLAVORS+= no_pgsql .if ${FLAVOR:L:Mno_pgsql} @@ -279,7 +313,6 @@ MULTI_PACKAGES+= -sybase_ct COMMENT-sybase_ct= "sybase database access extensions for php5" CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE} LIB_DEPENDS-sybase_ct= ct::databases/freetds -FULLPKGNAME-sybase_ct= php5-sybase_ct-${V} .endif # xml-rpc diff --git a/www/php5/extensions/pkg/DESCR-pdo_mysql b/www/php5/extensions/pkg/DESCR-pdo_mysql new file mode 100644 index 00000000000..adff8578824 --- /dev/null +++ b/www/php5/extensions/pkg/DESCR-pdo_mysql @@ -0,0 +1,7 @@ +The PHP Data Objects (PDO) extension defines a lightweight, +consistent interface for accessing databases in PHP. +Each database driver that implements the PDO interface can +expose database-specific features as regular extension functions. + +pdo_mysql is a driver that implements the PHP Data Objects (PDO) +interface to enable access from PHP to MySQL 3.x, 4.x and 5.x databases. diff --git a/www/php5/extensions/pkg/DESCR-pdo_pgsql b/www/php5/extensions/pkg/DESCR-pdo_pgsql new file mode 100644 index 00000000000..b88b63122dd --- /dev/null +++ b/www/php5/extensions/pkg/DESCR-pdo_pgsql @@ -0,0 +1,7 @@ +The PHP Data Objects (PDO) extension defines a lightweight, +consistent interface for accessing databases in PHP. +Each database driver that implements the PDO interface can +expose database-specific features as regular extension functions. + +pdo_pgsql is a driver that implements the PHP Data Objects (PDO) +interface to enable access from PHP to PostgreSQL databases. diff --git a/www/php5/extensions/pkg/DESCR-pdo_sqlite b/www/php5/extensions/pkg/DESCR-pdo_sqlite new file mode 100644 index 00000000000..f3b27c6c4ac --- /dev/null +++ b/www/php5/extensions/pkg/DESCR-pdo_sqlite @@ -0,0 +1,7 @@ +The PHP Data Objects (PDO) extension defines a lightweight, +consistent interface for accessing databases in PHP. +Each database driver that implements the PDO interface can +expose database-specific features as regular extension functions. + +pdo_sqlite is a driver that implements the PHP Data Objects (PDO) +interface to enable access to SQLite 3 databases. diff --git a/www/php5/extensions/pkg/PLIST-pdo_mysql b/www/php5/extensions/pkg/PLIST-pdo_mysql new file mode 100644 index 00000000000..d4844bec351 --- /dev/null +++ b/www/php5/extensions/pkg/PLIST-pdo_mysql @@ -0,0 +1,2 @@ +@comment $OpenBSD: PLIST-pdo_mysql,v 1.1 2007/04/01 21:37:27 robert Exp $ +lib/php/modules/pdo_mysql.so diff --git a/www/php5/extensions/pkg/PLIST-pdo_pgsql b/www/php5/extensions/pkg/PLIST-pdo_pgsql new file mode 100644 index 00000000000..d7adcc588fb --- /dev/null +++ b/www/php5/extensions/pkg/PLIST-pdo_pgsql @@ -0,0 +1,2 @@ +@comment $OpenBSD: PLIST-pdo_pgsql,v 1.1 2007/04/01 21:37:27 robert Exp $ +lib/php/modules/pdo_pgsql.so diff --git a/www/php5/extensions/pkg/PLIST-pdo_sqlite b/www/php5/extensions/pkg/PLIST-pdo_sqlite new file mode 100644 index 00000000000..2dd3853c10c --- /dev/null +++ b/www/php5/extensions/pkg/PLIST-pdo_sqlite @@ -0,0 +1,2 @@ +@comment $OpenBSD: PLIST-pdo_sqlite,v 1.1 2007/04/01 21:37:27 robert Exp $ +lib/php/modules/pdo_sqlite.so diff --git a/www/php5/patches/patch-aclocal_m4 b/www/php5/patches/patch-aclocal_m4 index 096e5662aca..50d75dbc796 100644 --- a/www/php5/patches/patch-aclocal_m4 +++ b/www/php5/patches/patch-aclocal_m4 @@ -1,7 +1,49 @@ -$OpenBSD: patch-aclocal_m4,v 1.6 2006/05/09 14:15:40 robert Exp $ ---- aclocal.m4.orig Wed Nov 23 22:37:40 2005 -+++ aclocal.m4 Sat Nov 26 12:59:21 2005 -@@ -2100,10 +2100,9 @@ +$OpenBSD: patch-aclocal_m4,v 1.7 2007/04/01 21:37:27 robert Exp $ +--- aclocal.m4.orig Wed Feb 7 01:47:35 2007 ++++ aclocal.m4 Sun Apr 1 14:04:45 2007 +@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build- + dnl + dnl which array to append to? + AC_DEFUN([PHP_ADD_SOURCES],[ +- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))) ++ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS)))) + ]) + + dnl +@@ -966,12 +966,7 @@ dnl ---------------------------------------------- Sha + if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then + dnl ---------------------------------------------- CLI static module + [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no +- if test "$PHP_SAPI" = "cgi"; then +- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) +- EXT_STATIC="$EXT_STATIC $1" +- else +- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) +- fi ++ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi) + EXT_CLI_STATIC="$EXT_CLI_STATIC $1" + fi + PHP_ADD_BUILD_DIR($ext_builddir) +@@ -1021,17 +1016,12 @@ You either need to build $1 shared or build $2 statica + build to be successful. + ]) + fi +- if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then +- AC_MSG_ERROR([ +-You've configured extension $1, which depends on extension $2, +-but you've either not enabled $2, or have disabled it. +-]) +- fi + dnl Some systems require that we link $2 to $1 when building + ]) + + dnl ------------------------------------------------------------------------- + dnl Checks for structures, typedefs, broken functions, etc. ++B + dnl ------------------------------------------------------------------------- + + dnl +@@ -2129,10 +2119,9 @@ AC_DEFUN([PHP_SETUP_KERBEROS],[ if test "$PHP_KERBEROS_DIR"; then found_kerberos=yes PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1) @@ -14,7 +56,7 @@ $OpenBSD: patch-aclocal_m4,v 1.6 2006/05/09 14:15:40 robert Exp $ PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include) fi fi -@@ -4165,7 +4164,7 @@ +@@ -4290,7 +4279,7 @@ openbsd*) *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' diff --git a/www/php5/patches/patch-configure_in b/www/php5/patches/patch-configure_in index 41b7366482f..93756db7963 100644 --- a/www/php5/patches/patch-configure_in +++ b/www/php5/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.5 2006/05/09 14:15:40 robert Exp $ ---- configure.in.orig Tue Nov 29 16:01:38 2005 -+++ configure.in Tue Nov 29 16:02:41 2005 -@@ -816,7 +816,7 @@ +$OpenBSD: patch-configure_in,v 1.6 2007/04/01 21:37:27 robert Exp $ +--- configure.in.orig Sun Apr 1 15:15:11 2007 ++++ configure.in Sun Apr 1 15:18:07 2007 +@@ -919,7 +919,7 @@ enable_static=yes case $php_build_target in program|static) @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.5 2006/05/09 14:15:40 robert Exp $ if test -z "$PHP_MODULES"; then enable_shared=no fi -@@ -824,8 +824,8 @@ +@@ -927,8 +927,8 @@ program|static) shared) enable_static=no case $with_pic in @@ -21,7 +21,7 @@ $OpenBSD: patch-configure_in,v 1.5 2006/05/09 14:15:40 robert Exp $ esac EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" ;; -@@ -1009,7 +1009,7 @@ +@@ -1121,7 +1121,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` 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"` @@ -30,3 +30,12 @@ $OpenBSD: patch-configure_in,v 1.5 2006/05/09 14:15:40 robert Exp $ exec_prefix=$old_exec_prefix libdir=$old_libdir +@@ -1293,7 +1293,7 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" + INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" + CXXFLAGS="$CXXFLAGS $standard_libtool_flag" + +-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET)" ++all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)" + install_targets="$install_modules install-build install-headers install-programs $install_pear" + + case $PHP_SAPI in diff --git a/www/php5/patches/patch-ext_bcmath_libbcmath_src_output_c b/www/php5/patches/patch-ext_bcmath_libbcmath_src_output_c index 24901b6ad75..337dbea56a2 100644 --- a/www/php5/patches/patch-ext_bcmath_libbcmath_src_output_c +++ b/www/php5/patches/patch-ext_bcmath_libbcmath_src_output_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-ext_bcmath_libbcmath_src_output_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ ---- ext/bcmath/libbcmath/src/output.c.orig Mon Jul 26 23:09:43 2004 -+++ ext/bcmath/libbcmath/src/output.c Mon Jul 26 23:09:22 2004 -@@ -71,7 +71,7 @@ +$OpenBSD: patch-ext_bcmath_libbcmath_src_output_c,v 1.2 2007/04/01 21:37:27 robert Exp $ +--- ext/bcmath/libbcmath/src/output.c.orig Fri Nov 22 10:25:29 2002 ++++ ext/bcmath/libbcmath/src/output.c Sun Apr 1 13:42:42 2007 +@@ -71,7 +71,7 @@ bc_out_long (val, size, space, out_char) int len, ix; if (space) (*out_char) (' '); diff --git a/www/php5/patches/patch-ext_bcmath_libbcmath_src_rt_c b/www/php5/patches/patch-ext_bcmath_libbcmath_src_rt_c index a83829582e5..68b2bc46de6 100644 --- a/www/php5/patches/patch-ext_bcmath_libbcmath_src_rt_c +++ b/www/php5/patches/patch-ext_bcmath_libbcmath_src_rt_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-ext_bcmath_libbcmath_src_rt_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ ---- ext/bcmath/libbcmath/src/rt.c.orig Mon Jul 26 23:11:15 2004 -+++ ext/bcmath/libbcmath/src/rt.c Mon Jul 26 23:11:49 2004 -@@ -45,7 +45,7 @@ +$OpenBSD: patch-ext_bcmath_libbcmath_src_rt_c,v 1.2 2007/04/01 21:37:27 robert Exp $ +--- ext/bcmath/libbcmath/src/rt.c.orig Wed Nov 22 21:20:02 2000 ++++ ext/bcmath/libbcmath/src/rt.c Sun Apr 1 13:42:42 2007 +@@ -45,7 +45,7 @@ void bc_rt_warn (char *mesg ,...) char error_mesg [255]; va_start (args, mesg); @@ -10,7 +10,7 @@ $OpenBSD: patch-ext_bcmath_libbcmath_src_rt_c,v 1.1.1.1 2004/10/02 11:32:37 robe va_end (args); fprintf (stderr, "bc math warning: %s\n", error_mesg); -@@ -58,7 +58,7 @@ +@@ -58,7 +58,7 @@ void bc_rt_error (char *mesg ,...) char error_mesg [255]; va_start (args, mesg); diff --git a/www/php5/patches/patch-ext_calendar_calendar_c b/www/php5/patches/patch-ext_calendar_calendar_c index 2c3bc8b37c7..c62e13d963f 100644 --- a/www/php5/patches/patch-ext_calendar_calendar_c +++ b/www/php5/patches/patch-ext_calendar_calendar_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-ext_calendar_calendar_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ ---- ext/calendar/calendar.c.orig Mon Jul 26 23:12:25 2004 -+++ ext/calendar/calendar.c Mon Jul 26 23:12:43 2004 -@@ -277,7 +277,7 @@ +$OpenBSD: patch-ext_calendar_calendar_c,v 1.2 2007/04/01 21:37:27 robert Exp $ +--- ext/calendar/calendar.c.orig Mon Jan 1 10:35:48 2007 ++++ ext/calendar/calendar.c Sun Apr 1 13:42:42 2007 +@@ -416,7 +416,7 @@ PHP_FUNCTION(cal_from_jd) calendar->from_jd(jd, &year, &month, &day); diff --git a/www/php5/patches/patch-ext_iconv_iconv_c b/www/php5/patches/patch-ext_iconv_iconv_c index e572eacfd21..21710f163cd 100644 --- a/www/php5/patches/patch-ext_iconv_iconv_c +++ b/www/php5/patches/patch-ext_iconv_iconv_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-ext_iconv_iconv_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ ---- ext/iconv/iconv.c.orig Mon Jul 26 22:41:02 2004 -+++ ext/iconv/iconv.c Mon Jul 26 22:46:24 2004 -@@ -267,7 +267,7 @@ +$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2007/04/01 21:37:27 robert Exp $ +--- ext/iconv/iconv.c.orig Thu Feb 1 15:02:35 2007 ++++ ext/iconv/iconv.c Sun Apr 1 13:42:42 2007 +@@ -336,7 +336,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d out_p = (d)->c + (d)->len; @@ -10,7 +10,7 @@ $OpenBSD: patch-ext_iconv_iconv_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ #if ICONV_SUPPORTS_ERRNO switch (errno) { case EINVAL: -@@ -427,7 +427,7 @@ +@@ -500,7 +500,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c out_p = out_buf; while (in_left > 0) { @@ -19,7 +19,7 @@ $OpenBSD: patch-ext_iconv_iconv_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ out_size = bsz - out_left; if (result == (size_t)(-1)) { if (errno == E2BIG && in_left > 0) { -@@ -541,7 +541,7 @@ +@@ -614,7 +614,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int prev_in_left = in_left; @@ -28,7 +28,7 @@ $OpenBSD: patch-ext_iconv_iconv_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ if (prev_in_left == in_left) { break; } -@@ -641,7 +641,7 @@ +@@ -728,7 +728,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pr prev_in_left = in_left; @@ -37,7 +37,7 @@ $OpenBSD: patch-ext_iconv_iconv_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ if (prev_in_left == in_left) { break; } -@@ -772,7 +772,7 @@ +@@ -857,7 +857,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int prev_in_left = in_left; @@ -46,7 +46,7 @@ $OpenBSD: patch-ext_iconv_iconv_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ if (prev_in_left == in_left) { #if ICONV_SUPPORTS_ERRNO switch (errno) { -@@ -1025,7 +1025,7 @@ +@@ -1106,7 +1106,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st out_left = out_size - out_reserved; @@ -55,7 +55,7 @@ $OpenBSD: patch-ext_iconv_iconv_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ #if ICONV_SUPPORTS_ERRNO switch (errno) { case EINVAL: -@@ -1125,7 +1125,7 @@ +@@ -1206,7 +1206,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st out_p = buf; out_left = out_size; @@ -64,7 +64,7 @@ $OpenBSD: patch-ext_iconv_iconv_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ #if ICONV_SUPPORTS_ERRNO switch (errno) { case EINVAL: -@@ -2374,7 +2374,7 @@ +@@ -2472,7 +2472,7 @@ static int php_iconv_stream_filter_append_bucket( tcnt = self->stub_len; while (tcnt > 0) { diff --git a/www/php5/patches/patch-ext_posix_posix_c b/www/php5/patches/patch-ext_posix_posix_c index 8cdcb01cfdc..a60be4d4279 100644 --- a/www/php5/patches/patch-ext_posix_posix_c +++ b/www/php5/patches/patch-ext_posix_posix_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-ext_posix_posix_c,v 1.1 2007/03/22 22:43:20 robert Exp $ ---- ext/posix/posix.c.orig Tue Mar 20 00:38:18 2007 -+++ ext/posix/posix.c Tue Mar 20 00:39:48 2007 -@@ -884,7 +884,7 @@ +$OpenBSD: patch-ext_posix_posix_c,v 1.2 2007/04/01 21:37:27 robert Exp $ +--- ext/posix/posix.c.orig Fri Jan 12 02:46:11 2007 ++++ ext/posix/posix.c Sun Apr 1 13:42:42 2007 +@@ -884,7 +884,7 @@ PHP_FUNCTION(posix_getgrgid) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &gid) == FAILURE) { RETURN_FALSE; } @@ -10,7 +10,7 @@ $OpenBSD: patch-ext_posix_posix_c,v 1.1 2007/03/22 22:43:20 robert Exp $ grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); grbuf = emalloc(grbuflen); -@@ -909,7 +909,7 @@ +@@ -909,7 +909,7 @@ PHP_FUNCTION(posix_getgrgid) php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to convert posix group struct to array"); RETVAL_FALSE; } diff --git a/www/php5/patches/patch-main_php_h b/www/php5/patches/patch-main_php_h index 6ce593a190c..814db7a6cf8 100644 --- a/www/php5/patches/patch-main_php_h +++ b/www/php5/patches/patch-main_php_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-main_php_h,v 1.1 2004/11/24 17:27:22 robert Exp $ ---- main/php.h.orig Thu Nov 18 18:09:47 2004 -+++ main/php.h Thu Nov 18 18:29:09 2004 -@@ -149,7 +149,7 @@ +$OpenBSD: patch-main_php_h,v 1.2 2007/04/01 21:37:27 robert Exp $ +--- main/php.h.orig Sun Apr 1 13:42:41 2007 ++++ main/php.h Sun Apr 1 13:42:42 2007 +@@ -150,7 +150,7 @@ char *strtok_r(char *s, const char *delim, char **last END_EXTERN_C() #endif diff --git a/www/php5/patches/patch-main_php_open_temporary_file_c b/www/php5/patches/patch-main_php_open_temporary_file_c index ce1e0c284ae..81ba16ab5d1 100644 --- a/www/php5/patches/patch-main_php_open_temporary_file_c +++ b/www/php5/patches/patch-main_php_open_temporary_file_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-main_php_open_temporary_file_c,v 1.2 2006/10/21 11:44:10 robert Exp $ ---- main/php_open_temporary_file.c.orig Wed May 24 01:22:26 2006 -+++ main/php_open_temporary_file.c Fri Aug 18 21:15:57 2006 -@@ -120,7 +120,7 @@ +$OpenBSD: patch-main_php_open_temporary_file_c,v 1.3 2007/04/01 21:37:27 robert Exp $ +--- main/php_open_temporary_file.c.orig Mon Jan 1 10:36:11 2007 ++++ main/php_open_temporary_file.c Sun Apr 1 13:42:42 2007 +@@ -120,7 +120,7 @@ static int php_do_open_temporary_file(const char *path trailing_slash = "/"; } diff --git a/www/php5/patches/patch-php_ini-dist b/www/php5/patches/patch-php_ini-dist index ed54b5e0b96..65e9e867e8c 100644 --- a/www/php5/patches/patch-php_ini-dist +++ b/www/php5/patches/patch-php_ini-dist @@ -1,7 +1,7 @@ -$OpenBSD: patch-php_ini-dist,v 1.7 2007/03/22 22:43:20 robert Exp $ +$OpenBSD: patch-php_ini-dist,v 1.8 2007/04/01 21:37:27 robert Exp $ --- php.ini-dist.orig Thu Dec 21 14:05:27 2006 -+++ php.ini-dist Wed Feb 21 23:30:37 2007 -@@ -455,10 +455,7 @@ ++++ php.ini-dist Sun Apr 1 13:42:42 2007 +@@ -455,10 +455,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -13,7 +13,7 @@ $OpenBSD: patch-php_ini-dist,v 1.7 2007/03/22 22:43:20 robert Exp $ ; The root of the PHP pages, used only if nonempty. ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -@@ -472,7 +469,7 @@ +@@ -472,7 +469,7 @@ doc_root = user_dir = ; Directory in which the loadable extensions (modules) reside. @@ -22,7 +22,7 @@ $OpenBSD: patch-php_ini-dist,v 1.7 2007/03/22 22:43:20 robert Exp $ ; 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 -@@ -533,7 +530,7 @@ +@@ -533,7 +530,7 @@ upload_max_filesize = 2M ;;;;;;;;;;;;;;;;;; ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. @@ -31,7 +31,7 @@ $OpenBSD: patch-php_ini-dist,v 1.7 2007/03/22 22:43:20 robert Exp $ ; Whether to allow include/require to open URLs (like http:// or ftp://) as files. allow_url_include = Off -@@ -554,81 +551,6 @@ +@@ -554,81 +551,6 @@ default_socket_timeout = 60 ; fgets() and file() will work regardless of the source of the file. ; auto_detect_line_endings = Off @@ -113,7 +113,7 @@ $OpenBSD: patch-php_ini-dist,v 1.7 2007/03/22 22:43:20 robert Exp $ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -@@ -670,13 +592,6 @@ +@@ -670,13 +592,6 @@ default_socket_timeout = 60 define_syslog_variables = Off [mail function] @@ -127,7 +127,7 @@ $OpenBSD: patch-php_ini-dist,v 1.7 2007/03/22 22:43:20 robert Exp $ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -1252,6 +1167,53 @@ +@@ -1252,6 +1167,53 @@ soap.wsdl_cache_dir="/tmp" ; instead of original one. soap.wsdl_cache_ttl=86400 diff --git a/www/php5/patches/patch-php_ini-recommended b/www/php5/patches/patch-php_ini-recommended index f375bf52ef0..b4da77871fe 100644 --- a/www/php5/patches/patch-php_ini-recommended +++ b/www/php5/patches/patch-php_ini-recommended @@ -1,7 +1,7 @@ -$OpenBSD: patch-php_ini-recommended,v 1.7 2007/03/22 22:43:20 robert Exp $ +$OpenBSD: patch-php_ini-recommended,v 1.8 2007/04/01 21:37:27 robert Exp $ --- php.ini-recommended.orig Thu Dec 21 14:05:27 2006 -+++ php.ini-recommended Wed Feb 21 23:33:04 2007 -@@ -500,10 +500,7 @@ ++++ php.ini-recommended Sun Apr 1 13:42:42 2007 +@@ -500,10 +500,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -13,7 +13,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.7 2007/03/22 22:43:20 robert Exp $ ; The root of the PHP pages, used only if nonempty. ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -@@ -517,7 +514,7 @@ +@@ -517,7 +514,7 @@ doc_root = user_dir = ; Directory in which the loadable extensions (modules) reside. @@ -22,7 +22,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.7 2007/03/22 22:43:20 robert Exp $ ; 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 -@@ -578,7 +575,7 @@ +@@ -578,7 +575,7 @@ upload_max_filesize = 2M ;;;;;;;;;;;;;;;;;; ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. @@ -31,7 +31,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.7 2007/03/22 22:43:20 robert Exp $ ; Whether to allow include/require to open URLs (like http:// or ftp://) as files. allow_url_include = Off -@@ -599,81 +596,6 @@ +@@ -599,81 +596,6 @@ default_socket_timeout = 60 ; fgets() and file() will work regardless of the source of the file. ; auto_detect_line_endings = Off @@ -113,7 +113,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.7 2007/03/22 22:43:20 robert Exp $ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -@@ -715,13 +637,6 @@ +@@ -715,13 +637,6 @@ default_socket_timeout = 60 define_syslog_variables = Off [mail function] @@ -127,7 +127,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.7 2007/03/22 22:43:20 robert Exp $ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -1300,6 +1215,53 @@ +@@ -1300,6 +1215,53 @@ soap.wsdl_cache_dir="/tmp" ; instead of original one. soap.wsdl_cache_ttl=86400