8 files changed, 41 insertions, 94 deletions

diff --git a/lang/php5/files/patch-Zend::zend.h b/lang/php5/files/patch-Zend::zend.h
index 49d678719636..0fb2398f171d 100644
--- a/lang/php5/files/patch-Zend::zend.h
+++ b/lang/php5/files/patch-Zend::zend.h
@@ -1,11 +1,11 @@
---- Zend/zend.h.orig	Tue Nov 15 14:35:22 2005
-+++ Zend/zend.h	Fri Nov 25 09:31:48 2005
-@@ -178,7 +178,7 @@
+--- Zend/zend.h.orig	2008-08-15 21:47:23.000000000 +0200
++++ Zend/zend.h	2008-09-25 22:52:50.000000000 +0200
+@@ -192,7 +192,7 @@
+ # define ZEND_FASTCALL
  #endif
  
- 
 -#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
 +#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__))
- # define do_alloca(p) alloca(p)
- # define free_alloca(p)
- #else
+ # define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
+ # define ALLOCA_FLAG(name) \
+ 	zend_bool name;
diff --git a/lang/php5/files/patch-configure.in b/lang/php5/files/patch-configure.in
index f5f5c5a113c9..3cdb4241f6a2 100644
--- a/lang/php5/files/patch-configure.in
+++ b/lang/php5/files/patch-configure.in
@@ -25,14 +25,14 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
-@@ -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_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_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"
+@@ -1388,22 +1386,19 @@
+   pharcmd_install=
+ fi;
+
+-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
+-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
++all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) $pharcmd"
++install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
  
  case $PHP_SAPI in
 -  cli)
@@ -48,8 +48,8 @@
  PHP_SUBST(all_targets)
  PHP_SUBST(install_targets)
  
--PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/])
-+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/ regex/])
+-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
++PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
  
  PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
  
diff --git a/lang/php5/files/patch-ext_standard_array.c b/lang/php5/files/patch-ext_standard_array.c
deleted file mode 100644
index bd6d4d0c95d4..000000000000
--- a/lang/php5/files/patch-ext_standard_array.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- ext/standard/array.c.orig	Mon Feb 12 20:20:48 2007
-+++ ext/standard/array.c	Mon Feb 12 20:22:14 2007
-@@ -295,6 +295,7 @@
- PHP_FUNCTION(count)
- {
- 	zval *array;
-+	zend_class_entry **ce_Countable;
- 	long mode = COUNT_NORMAL;
- 	
- 	if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &array, &mode) == FAILURE)
-@@ -308,11 +309,11 @@
- 			RETURN_LONG (php_count_recursive (array, mode TSRMLS_CC));
- 			break;
- 		case IS_OBJECT: {
--#ifdef HAVE_SPL
- 			/* it the object implements Countable we call its count() method */
- 			zval *retval;
- 
--			if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
-+			if (zend_lookup_class_ex("Countable", 9, 0, &ce_Countable TSRMLS_CC) != FAILURE) {
-+			if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), *ce_Countable TSRMLS_CC)) {
- 				zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval);
- 				if (retval) {
- 					convert_to_long(retval);
-@@ -321,7 +322,7 @@
- 				}
- 				return;
- 			}
--#endif
-+			}
- 			/* if not we return the number of properties (not taking visibility into account) */
- 			if (Z_OBJ_HT_P(array)->count_elements) {
- 				RETVAL_LONG(1);
diff --git a/lang/php5/files/patch-ext_standard_basic_functions.c b/lang/php5/files/patch-ext_standard_basic_functions.c
index 9ef6dd343cbf..1907338d0298 100644
--- a/lang/php5/files/patch-ext_standard_basic_functions.c
+++ b/lang/php5/files/patch-ext_standard_basic_functions.c
@@ -1,13 +1,5 @@
 --- ext/standard/basic_functions.c.orig	2008-06-09 14:06:40.000000000 +0200
 +++ ext/standard/basic_functions.c	2008-06-09 14:08:28.000000000 +0200
-@@ -87,6 +87,7 @@
- # include <sys/loadavg.h>
- #endif
- 
-+#define HARTMUT_0
- #ifdef HARTMUT_0
- #include <getopt.h>
- #endif
 @@ -3859,7 +3860,7 @@
  		SetEnvironmentVariable(pe->key, "bugbug");
  #endif
diff --git a/lang/php5/files/patch-ext_standard_php_dns.h b/lang/php5/files/patch-ext_standard_php_dns.h
deleted file mode 100644
index 8ab9e9c01d38..000000000000
--- a/lang/php5/files/patch-ext_standard_php_dns.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ext/standard/php_dns.h.orig	Sun Jun 19 11:57:31 2005
-+++ ext/standard/php_dns.h	Sun Jun 19 12:03:37 2005
-@@ -25,6 +25,10 @@
- 
- #if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
- #define HAVE_DNS_FUNCS 1
-+#define res_ninit 	__res_ninit
-+#define res_nmkquery	__res_nmkquery
-+#define res_nsend	__res_nsend
-+#define res_nclose	__res_nclose
- #endif
- 
- PHP_FUNCTION(gethostbyaddr);
diff --git a/lang/php5/files/patch-php.ini-recommended b/lang/php5/files/patch-php.ini-development
index 7b648b1ea0b5..dadeb4b838b1 100644
--- a/lang/php5/files/patch-php.ini-recommended
+++ b/lang/php5/files/patch-php.ini-development
@@ -1,18 +1,18 @@
---- php.ini-recommended.orig	Fri Dec 30 18:19:43 2005
-+++ php.ini-recommended	Mon Oct 16 08:13:05 2006
-@@ -223,6 +223,15 @@
- ;
+--- php.ini-development.orig	2009-06-28 19:56:18.000000000 +0200
++++ php.ini-development	2009-08-24 17:17:53.000000000 +0200
+@@ -335,6 +335,15 @@
+ 
  ; Safe Mode
- ;
+ ; http://php.net/safe-mode
++;
 +; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
 +; the PHP Safe Mode feature not be relied upon for security, since the
 +; issues Safe Mode tries to handle cannot properly be handled in PHP
 +; (primarily due to PHP's use of external libraries).  While many bugs
 +; in Safe Mode has been fixed it's very likely that more issues exist
 +; which allows a user to bypass Safe Mode restrictions.
-+; For increased security we recommend to always install the Suhosin
++; For increased security we always recommend to install the Suhosin
 +; extension.
-+;
  safe_mode = Off
  
  ; By default, Safe Mode does a UID compare check when
diff --git a/lang/php5/files/patch-php.ini-dist b/lang/php5/files/patch-php.ini-production
index 6d84f3a80891..67d3480ad4a6 100644
--- a/lang/php5/files/patch-php.ini-dist
+++ b/lang/php5/files/patch-php.ini-production
@@ -1,9 +1,10 @@
---- php.ini-dist.orig	Fri Dec 30 18:19:43 2005
-+++ php.ini-dist	Mon Oct 16 08:12:28 2006
-@@ -165,6 +165,15 @@
+--- php.ini-production.orig	2009-08-24 17:18:23.000000000 +0200
++++ php.ini-production	2009-08-24 17:18:33.000000000 +0200
+@@ -335,6 +335,15 @@
  
  ; Safe Mode
- ;
+ ; http://php.net/safe-mode
++;
 +; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
 +; the PHP Safe Mode feature not be relied upon for security, since the
 +; issues Safe Mode tries to handle cannot properly be handled in PHP
@@ -12,7 +13,6 @@
 +; which allows a user to bypass Safe Mode restrictions.
 +; For increased security we always recommend to install the Suhosin
 +; extension.
-+;
  safe_mode = Off
  
  ; By default, Safe Mode does a UID compare check when
diff --git a/lang/php5/files/patch-sapi_cgi_config9.m4 b/lang/php5/files/patch-sapi_cgi_config9.m4
index c40894155cc8..7682dad43110 100644
--- a/lang/php5/files/patch-sapi_cgi_config9.m4
+++ b/lang/php5/files/patch-sapi_cgi_config9.m4
@@ -1,6 +1,6 @@
---- sapi/cgi/config9.m4.orig	Thu Jul 12 01:20:36 2007
-+++ sapi/cgi/config9.m4	Wed Sep  5 07:55:06 2007
-@@ -25,7 +25,6 @@
+--- sapi/cgi/config9.m4.orig	2007-10-01 14:40:54.000000000 +0200
++++ sapi/cgi/config9.m4	2008-09-25 23:07:13.000000000 +0200
+@@ -8,7 +8,6 @@
  dnl
  dnl CGI setup
  dnl
@@ -8,19 +8,19 @@
    AC_MSG_CHECKING(whether to build CGI binary)
    if test "$PHP_CGI" != "no"; then
      AC_MSG_RESULT(yes)
-@@ -85,8 +84,9 @@
-     AC_MSG_RESULT($PHP_PATH_INFO_CHECK)
+@@ -53,8 +52,9 @@
+     PHP_SUBST(SAPI_CGI_PATH)
  
      dnl Set install target and select SAPI
 -    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
--    PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,, '$(SAPI_CGI_PATH)')
+-    PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
 +    INSTALL_CGI="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
-+    PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi)
++    PHP_ADD_SOURCES(sapi/cgi, cgi_main.c fastcgi.c,, cgi)
 +    PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
  
      case $host_alias in
        *aix*)
-@@ -96,17 +96,29 @@
+@@ -64,17 +64,29 @@
          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)"
        ;;
        *)
@@ -32,13 +32,14 @@
 +    PHP_CGI_TARGET="\$(SAPI_CGI_PATH)"
 +    PHP_INSTALL_CGI_TARGET="install-cgi"
      PHP_SUBST(BUILD_CGI)
+-
+-  elif test "$PHP_CLI" != "no"; then
+-    AC_MSG_RESULT(no)
 +    PHP_SUBST(INSTALL_CGI)
 +    PHP_SUBST(PHP_CGI_OBJS)
 +    PHP_SUBST(PHP_CGI_TARGET)
 +    PHP_SUBST(PHP_INSTALL_CGI_TARGET)
- 
--  elif test "$PHP_CLI" != "no"; then
--    AC_MSG_RESULT(no)
++
 +    if test "$PHP_SAPI" = "default" ; then
 +      PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
 +    fi