diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2008-12-07 11:54:36 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2008-12-07 11:54:36 +0000 |
| commit | 753392fe5cd038053f869e57ee5dd3c962c8470b (patch) | |
| tree | be338144d736511feddef339bca4a809bc074608 /lang/php5/files | |
| parent | - Fix symlink attack via insecure temporary files (diff) | |
Update to 5.2.7 release.
Notes
Notes:
svn path=/head/; revision=223932
Diffstat (limited to 'lang/php5/files')
| -rw-r--r-- | lang/php5/files/patch-configure.in | 16 | ||||
| -rw-r--r-- | lang/php5/files/patch-main_safe_mode.c | 17 |
2 files changed, 8 insertions, 25 deletions
diff --git a/lang/php5/files/patch-configure.in b/lang/php5/files/patch-configure.in index 98264d6155d2..f5f5c5a113c9 100644 --- a/lang/php5/files/patch-configure.in +++ b/lang/php5/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig Mon Jun 4 08:08:43 2007 -+++ configure.in Mon Jun 4 08:13:47 2007 -@@ -233,7 +233,6 @@ +--- configure.in.orig 2008-12-05 07:58:47.000000000 +0100 ++++ configure.in 2008-12-05 08:02:26.000000000 +0100 +@@ -270,7 +270,6 @@ dnl . dnl ------------------------------------------------------------------------- @@ -8,7 +8,7 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_SAPI=default -@@ -258,7 +257,6 @@ +@@ -295,7 +294,6 @@ if test "$enable_maintainer_zts" = "yes"; then PTHREADS_ASSIGN_VARS @@ -16,7 +16,7 @@ fi divert(3) -@@ -1123,7 +1121,7 @@ +@@ -1136,7 +1134,7 @@ 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"` @@ -25,13 +25,13 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1295,22 +1293,19 @@ +@@ -1344,22 +1342,19 @@ 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_ZEND_EX) \$(PHP_CLI_TARGET)" -install_targets="$install_modules install-build install-headers install-programs $install_pear" -+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)" ++all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)" +install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear" case $PHP_SAPI in diff --git a/lang/php5/files/patch-main_safe_mode.c b/lang/php5/files/patch-main_safe_mode.c deleted file mode 100644 index 4b0d4e1c531c..000000000000 --- a/lang/php5/files/patch-main_safe_mode.c +++ /dev/null @@ -1,17 +0,0 @@ ---- main/safe_mode.c.orig 2008-09-04 15:52:19.000000000 +0200 -+++ main/safe_mode.c 2008-09-04 15:52:35.000000000 +0200 -@@ -74,14 +74,6 @@ - } - } - -- /* -- * If given filepath is a URL, allow - safe mode stuff -- * related to URL's is checked in individual functions -- */ -- wrapper = php_stream_locate_url_wrapper(filename, NULL, STREAM_LOCATE_WRAPPERS_ONLY TSRMLS_CC); -- if (wrapper != NULL) -- return 1; -- - /* First we see if the file is owned by the same user... - * If that fails, passthrough and check directory... - */ |