diff options
author | Rene Ladan <rene@FreeBSD.org> | 2014-03-01 00:06:29 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2014-03-01 00:06:29 +0000 |
commit | ef50dbb213487797f1a2d9f4d0d5636f98bb3894 (patch) | |
tree | a82aa9cd34a90c5daecd9ec479f5a85b36141796 /lang/php52/files | |
parent | - Fix build with clang (diff) |
PHP 5.2 has reached it end-of-life in the FreeBSD Ports Tree, time
to say goodbye. Upstream unsupported it since 2011-01-06 (see
http://php.net/eol.php )
Strip PHP 5.2 out of Mk/bsd.php.mk
Diffstat (limited to 'lang/php52/files')
19 files changed, 0 insertions, 668 deletions
diff --git a/lang/php52/files/patch-TSRM_threads.m4 b/lang/php52/files/patch-TSRM_threads.m4 deleted file mode 100644 index 227f6d26c9d5..000000000000 --- a/lang/php52/files/patch-TSRM_threads.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- TSRM/threads.m4.orig 2005-04-27 15:22:18.000000000 +0200 -+++ TSRM/threads.m4 2009-09-22 10:01:37.000000000 +0200 -@@ -79,7 +79,7 @@ - pthread_mutexattr_t mattr; - int data = 1; - pthread_mutexattr_init(&mattr); -- return pthread_create(&thd, NULL, thread_routine, &data); -+ return 0; - } ], [ - pthreads_working=yes - ], [ diff --git a/lang/php52/files/patch-Zend::zend.h b/lang/php52/files/patch-Zend::zend.h deleted file mode 100644 index 49d678719636..000000000000 --- a/lang/php52/files/patch-Zend::zend.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 @@ - #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 diff --git a/lang/php52/files/patch-Zend_zend_list.c b/lang/php52/files/patch-Zend_zend_list.c deleted file mode 100644 index efa8862d1ce8..000000000000 --- a/lang/php52/files/patch-Zend_zend_list.c +++ /dev/null @@ -1,38 +0,0 @@ ---- Zend/zend_list.c.orig 2007-01-01 10:35:46.000000000 +0100 -+++ Zend/zend_list.c 2008-01-29 11:05:14.000000000 +0100 -@@ -48,7 +48,7 @@ - return index; - } - --ZEND_API int _zend_list_delete(int id TSRMLS_DC) -+ZEND_API int _zend_list_delete(ulong id TSRMLS_DC) - { - zend_rsrc_list_entry *le; - -@@ -65,7 +65,7 @@ - } - - --ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC) -+ZEND_API void *_zend_list_find(ulong id, int *type TSRMLS_DC) - { - zend_rsrc_list_entry *le; - -@@ -78,7 +78,7 @@ - } - } - --ZEND_API int _zend_list_addref(int id TSRMLS_DC) -+ZEND_API int _zend_list_addref(ulong id TSRMLS_DC) - { - zend_rsrc_list_entry *le; - -@@ -350,7 +350,7 @@ - } - - --char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC) -+char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC) - { - zend_rsrc_list_dtors_entry *lde; - int rsrc_type; diff --git a/lang/php52/files/patch-Zend_zend_list.h b/lang/php52/files/patch-Zend_zend_list.h deleted file mode 100644 index 308ac56b33b2..000000000000 --- a/lang/php52/files/patch-Zend_zend_list.h +++ /dev/null @@ -1,24 +0,0 @@ ---- Zend/zend_list.h.orig 2007-01-01 10:35:46.000000000 +0100 -+++ Zend/zend_list.h 2008-01-29 11:05:12.000000000 +0100 -@@ -71,9 +71,9 @@ - void zend_destroy_rsrc_list_dtors(void); - - ZEND_API int zend_list_insert(void *ptr, int type); --ZEND_API int _zend_list_addref(int id TSRMLS_DC); --ZEND_API int _zend_list_delete(int id TSRMLS_DC); --ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC); -+ZEND_API int _zend_list_addref(ulong id TSRMLS_DC); -+ZEND_API int _zend_list_delete(ulong id TSRMLS_DC); -+ZEND_API void *_zend_list_find(ulong id, int *type TSRMLS_DC); - - #define zend_list_addref(id) _zend_list_addref(id TSRMLS_CC) - #define zend_list_delete(id) _zend_list_delete(id TSRMLS_CC) -@@ -82,7 +82,7 @@ - ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type); - ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...); - --ZEND_API char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC); -+ZEND_API char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC); - ZEND_API int zend_fetch_list_dtor_id(char *type_name); - - extern ZEND_API int le_index_ptr; /* list entry type for index pointers */ diff --git a/lang/php52/files/patch-acinclude.m4 b/lang/php52/files/patch-acinclude.m4 deleted file mode 100644 index 4f9a9462f947..000000000000 --- a/lang/php52/files/patch-acinclude.m4 +++ /dev/null @@ -1,53 +0,0 @@ ---- acinclude.m4.orig 2009-05-09 22:28:02.000000000 +0200 -+++ acinclude.m4 2009-06-25 08:08:05.000000000 +0200 -@@ -194,7 +194,7 @@ - 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 -@@ -968,15 +968,8 @@ - if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then - dnl ---------------------------------------------- CLI static module - [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no -- case "$PHP_SAPI" in -- cgi|embed[)] -- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) -- EXT_STATIC="$EXT_STATIC $1" -- ;; -- *[)] - PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) -- ;; -- esac -+ 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) -@@ -1026,12 +1019,6 @@ - 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 - ]) - -@@ -2303,9 +2290,9 @@ - test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no - - dnl Fallbacks for different configure options -- if test "$PHP_OPENSSL" != "no"; then -+ if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_OPENSSL -- elif test "$PHP_IMAP_SSL" != "no"; then -+ elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_IMAP_SSL - fi - diff --git a/lang/php52/files/patch-configure.in b/lang/php52/files/patch-configure.in deleted file mode 100644 index f5f5c5a113c9..000000000000 --- a/lang/php52/files/patch-configure.in +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 ------------------------------------------------------------------------- - --PTHREADS_CHECK - PHP_HELP_SEPARATOR([SAPI modules:]) - PHP_SHLIB_SUFFIX_NAMES - PHP_SAPI=default -@@ -295,7 +294,6 @@ - - if test "$enable_maintainer_zts" = "yes"; then - PTHREADS_ASSIGN_VARS -- PTHREADS_FLAGS - fi - - divert(3) -@@ -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"` --INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR -+INCLUDE_PATH=.:${prefix}/share/pear - - 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" - - case $PHP_SAPI in -- cli) -- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" -- ;; -- *) -- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" -+ apache|apache2handler) -+ install_targets="install-sapi $install_targets" - ;; - esac - - 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_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c) - diff --git a/lang/php52/files/patch-ext_standard_array.c b/lang/php52/files/patch-ext_standard_array.c deleted file mode 100644 index bd6d4d0c95d4..000000000000 --- a/lang/php52/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/php52/files/patch-ext_standard_basic_functions.c b/lang/php52/files/patch-ext_standard_basic_functions.c deleted file mode 100644 index 9ef6dd343cbf..000000000000 --- a/lang/php52/files/patch-ext_standard_basic_functions.c +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 - putenv(pe->previous_value); --# if defined(PHP_WIN32) -+# if defined(PHP_WIN32) || __FreeBSD_version < 700050 - efree(pe->previous_value); - # endif - } else { -@@ -4461,7 +4462,7 @@ - pe.previous_value = NULL; - for (env = environ; env != NULL && *env != NULL; env++) { - if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') { /* found it */ --#if defined(PHP_WIN32) -+#if defined(PHP_WIN32) || __FreeBSD_version < 700050 - /* must copy previous value because MSVCRT's putenv can free the string without notice */ - pe.previous_value = estrdup(*env); - #else diff --git a/lang/php52/files/patch-ext_standard_image.c b/lang/php52/files/patch-ext_standard_image.c deleted file mode 100644 index be29b54b2650..000000000000 --- a/lang/php52/files/patch-ext_standard_image.c +++ /dev/null @@ -1,50 +0,0 @@ ---- ext/standard/image.c.orig 2007-10-04 15:31:11.000000000 +0200 -+++ ext/standard/image.c 2007-11-13 22:47:04.000000000 +0100 -@@ -31,9 +31,7 @@ - #endif - #include "php_image.h" - --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - #include "zlib.h" --#endif - - /* file type markers */ - PHPAPI const char php_sig_gif[3] = {'G', 'I', 'F'}; -@@ -80,9 +78,7 @@ - REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT); --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); --#endif - REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_WBMP", IMAGE_FILETYPE_WBMP, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG2000",IMAGE_FILETYPE_JPC, CONST_CS | CONST_PERSISTENT); /* keep alias */ -@@ -184,7 +180,6 @@ - } - /* }}} */ - --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - /* {{{ php_handle_swc - */ - static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC) -@@ -255,7 +250,6 @@ - return result; - } - /* }}} */ --#endif - - /* {{{ php_handle_swf - */ -@@ -1314,11 +1308,7 @@ - result = php_handle_swf(stream TSRMLS_CC); - break; - case IMAGE_FILETYPE_SWC: --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - result = php_handle_swc(stream TSRMLS_CC); --#else -- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled"); --#endif - break; - case IMAGE_FILETYPE_PSD: - result = php_handle_psd(stream TSRMLS_CC); diff --git a/lang/php52/files/patch-ext_standard_php_dns.h b/lang/php52/files/patch-ext_standard_php_dns.h deleted file mode 100644 index 8ab9e9c01d38..000000000000 --- a/lang/php52/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/php52/files/patch-main::php_config.h.in b/lang/php52/files/patch-main::php_config.h.in deleted file mode 100644 index 8e9938876421..000000000000 --- a/lang/php52/files/patch-main::php_config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- main/php_config.h.in.orig Wed Jan 11 15:25:52 2006 -+++ main/php_config.h.in Wed May 3 09:38:09 2006 -@@ -2760,6 +2760,9 @@ - /* Define if uint32_t type is present. */ - #undef HAVE_UINT32_T - -+/* Include external shared modules configurations */ -+#include "ext/php_config.h" -+ - /* Whether sprintf is broken */ - #undef ZEND_BROKEN_SPRINTF - diff --git a/lang/php52/files/patch-php.ini-dist b/lang/php52/files/patch-php.ini-dist deleted file mode 100644 index 6d84f3a80891..000000000000 --- a/lang/php52/files/patch-php.ini-dist +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 @@ - - ; 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 always recommend to install the Suhosin -+; extension. -+; - safe_mode = Off - - ; By default, Safe Mode does a UID compare check when diff --git a/lang/php52/files/patch-php.ini-recommended b/lang/php52/files/patch-php.ini-recommended deleted file mode 100644 index 7b648b1ea0b5..000000000000 --- a/lang/php52/files/patch-php.ini-recommended +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 @@ - ; - ; 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 -+; extension. -+; - safe_mode = Off - - ; By default, Safe Mode does a UID compare check when diff --git a/lang/php52/files/patch-sapi-apache2handler_config.m4 b/lang/php52/files/patch-sapi-apache2handler_config.m4 deleted file mode 100644 index 70d9c7b73149..000000000000 --- a/lang/php52/files/patch-sapi-apache2handler_config.m4 +++ /dev/null @@ -1,15 +0,0 @@ - ---- sapi/apache2handler/config.m4.old 2010-03-18 14:52:27.000000000 +0000 -+++ sapi/apache2handler/config.m4 2010-03-18 14:52:56.000000000 +0000 -@@ -117,7 +117,7 @@ - ;; - esac - -- if test "$APXS_MPM" != "prefork"; then -+ if test "$APXS_MPM" != "itk" -a "$APXS_MPM" != "prefork"; then - PHP_BUILD_THREAD_SAFE - fi - AC_MSG_RESULT(yes) -~ - - diff --git a/lang/php52/files/patch-sapi_cgi_Makefile.frag b/lang/php52/files/patch-sapi_cgi_Makefile.frag deleted file mode 100644 index 26a0e4b1a3ba..000000000000 --- a/lang/php52/files/patch-sapi_cgi_Makefile.frag +++ /dev/null @@ -1,9 +0,0 @@ ---- sapi/cgi/Makefile.frag.orig Wed May 3 10:09:02 2006 -+++ sapi/cgi/Makefile.frag Wed May 3 10:08:54 2006 -@@ -1,2 +1,5 @@ --$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS) - $(BUILD_CGI) -+ -+install-cgi: $(SAPI_CGI_PATH) -+ @$(INSTALL_CGI) diff --git a/lang/php52/files/patch-sapi_cgi_config9.m4 b/lang/php52/files/patch-sapi_cgi_config9.m4 deleted file mode 100644 index c40894155cc8..000000000000 --- a/lang/php52/files/patch-sapi_cgi_config9.m4 +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 @@ - dnl - dnl CGI setup - dnl --if test "$PHP_SAPI" = "default"; then - 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) - - 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)') -+ 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(/main, internal_functions.c,,cgi) - - case $host_alias in - *aix*) -@@ -96,17 +96,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)" - ;; - *) -- 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_INSTALL_CGI_TARGET="install-cgi" - PHP_SUBST(BUILD_CGI) -+ 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 -+ else -+ AC_MSG_RESULT(no) -+ if test "$PHP_SAPI" = "default" ; then -+ if test "$PHP_CLI" != "no" ; then - OVERALL_TARGET= - PHP_SAPI=cli - else - AC_MSG_ERROR([No SAPIs selected.]) - fi -+ fi - fi diff --git a/lang/php52/files/patch-scripts::phpize.in b/lang/php52/files/patch-scripts::phpize.in deleted file mode 100644 index 532c098674ae..000000000000 --- a/lang/php52/files/patch-scripts::phpize.in +++ /dev/null @@ -1,13 +0,0 @@ ---- scripts/phpize.in.orig Mon Dec 12 12:51:45 2005 -+++ scripts/phpize.in Wed May 3 09:38:09 2006 -@@ -99,8 +99,8 @@ - - phpize_check_autotools() - { -- test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf -- test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader -+ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=%%AUTOCONF%% -+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=%%AUTOHEADER%% - - if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then - cat <<EOF diff --git a/lang/php52/files/php-fpm.conf.sample.in b/lang/php52/files/php-fpm.conf.sample.in deleted file mode 100644 index 48186ba5b7bf..000000000000 --- a/lang/php52/files/php-fpm.conf.sample.in +++ /dev/null @@ -1,157 +0,0 @@ -<?xml version="1.0" ?> -<!-- $FreeBSD$ --> -<configuration> - - All relative paths in this config are relative to php's install prefix - - <section name="global_options"> - - Pid file - <value name="pid_file">%%PHP_FPM_PID%%</value> - - Error log file - <value name="error_log">%%PHP_FPM_LOG%%</value> - - Log level - <value name="log_level">notice</value> - - When this amount of php processes exited with SIGSEGV or SIGBUS ... - <value name="emergency_restart_threshold">10</value> - - ... in a less than this interval of time, a graceful restart will be initiated. - Useful to work around accidental curruptions in accelerator's shared memory. - <value name="emergency_restart_interval">1m</value> - - Time limit on waiting child's reaction on signals from master - <value name="process_control_timeout">5s</value> - - Set to 'no' to debug fpm - <value name="daemonize">yes</value> - - </section> - - <workers> - - <section name="pool"> - - Name of pool. Used in logs and stats. - <value name="name">default</value> - - Address to accept fastcgi requests on. - Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket' - <value name="listen_address">127.0.0.1:9000</value> - - <value name="listen_options"> - - Set listen(2) backlog - <value name="backlog">-1</value> - - Set permissions for unix socket, if one used. - In Linux read/write permissions must be set in order to allow connections from web server. - Many BSD-derrived systems allow connections regardless of permissions. - <value name="owner">%%PHP_FPM_UID%%</value> - <value name="group">%%PHP_FPM_GID%%</value> - <value name="mode">0666</value> - </value> - - Additional php.ini defines, specific to this pool of workers. - <value name="php_defines"> - <!-- <value name="sendmail_path">/usr/sbin/sendmail -t -i</value> --> - <!-- <value name="display_errors">0</value> --> - </value> - - Unix user of processes - <value name="user">%%PHP_FPM_UID%%</value> - - Unix group of processes - <value name="group">%%PHP_FPM_GID%%</value> - - Process manager settings - <value name="pm"> - - Sets style of controling worker process count. - Valid values are 'static' and 'apache-like' - <value name="style">static</value> - - Sets the limit on the number of simultaneous requests that will be served. - Equivalent to Apache MaxClients directive. - Equivalent to PHP_FCGI_CHILDREN environment in original php.fcgi - Used with any pm_style. - <value name="max_children">5</value> - - Settings group for 'apache-like' pm style - <value name="apache_like"> - - Sets the number of server processes created on startup. - Used only when 'apache-like' pm_style is selected - <value name="StartServers">20</value> - - Sets the desired minimum number of idle server processes. - Used only when 'apache-like' pm_style is selected - <value name="MinSpareServers">5</value> - - Sets the desired maximum number of idle server processes. - Used only when 'apache-like' pm_style is selected - <value name="MaxSpareServers">35</value> - - </value> - - </value> - - The timeout (in seconds) for serving a single request after which the worker process will be terminated - Should be used when 'max_execution_time' ini option does not stop script execution for some reason - '0s' means 'off' - <value name="request_terminate_timeout">0s</value> - - The timeout (in seconds) for serving of single request after which a php backtrace will be dumped to slow.log file - '0s' means 'off' - <value name="request_slowlog_timeout">0s</value> - - The log file for slow requests - <value name="slowlog">logs/slow.log</value> - - Set open file desc rlimit - <value name="rlimit_files">1024</value> - - Set max core size rlimit - <value name="rlimit_core">0</value> - - Chroot to this directory at the start, absolute path - <value name="chroot"></value> - - Chdir to this directory at the start, absolute path - <value name="chdir"></value> - - Redirect workers' stdout and stderr into main error log. - If not set, they will be redirected to /dev/null, according to FastCGI specs - <value name="catch_workers_output">yes</value> - - How much requests each process should execute before respawn. - Useful to work around memory leaks in 3rd party libraries. - For endless request processing please specify 0 - Equivalent to PHP_FCGI_MAX_REQUESTS - <value name="max_requests">500</value> - - Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect. - Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+) - Makes sense only with AF_INET listening socket. - <value name="allowed_clients">127.0.0.1</value> - - Pass environment variables like LD_LIBRARY_PATH - All $VARIABLEs are taken from current environment - <value name="environment"> - <value name="HOSTNAME">$HOSTNAME</value> - <value name="PATH">/usr/local/bin:/usr/bin:/bin</value> - <value name="TMP">/tmp</value> - <value name="TMPDIR">/tmp</value> - <value name="TEMP">/tmp</value> - <value name="OSTYPE">$OSTYPE</value> - <value name="MACHTYPE">$MACHTYPE</value> - <value name="MALLOC_CHECK_">2</value> - </value> - - </section> - - </workers> - -</configuration> diff --git a/lang/php52/files/php-fpm.in b/lang/php52/files/php-fpm.in deleted file mode 100644 index ffa3234405ec..000000000000 --- a/lang/php52/files/php-fpm.in +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: php-fpm -# REQUIRE: LOGIN -# BEFORE: securelevel -# KEYWORD: shutdown - -# Add the following lines to /etc/rc.conf to enable php-fpm: -# -# php_fpm_enable="YES" -# php_fpm_config="" -# - -. /etc/rc.subr - -name="php_fpm" -rcvar=php_fpm_enable - -extra_commands="reload logrotate" - -command="%%PREFIX%%/bin/php-cgi" -pidfile="%%PHP_FPM_PID%%" -reload_cmd="php_fpm_reload_cmd" -logrotate_cmd="php_fpm_logrotate_cmd" - -# read configuration and set defaults -load_rc_config "$name" -: ${php_fpm_enable="NO"} -: ${php_fpm_config="%%PREFIX%%/etc/php-fpm.conf"} - -required_files="${php_fpm_config}" -command_args="--fpm --fpm-config ${php_fpm_config}" - -php_fpm_reload_cmd () { - if [ -z "$rc_pid" ]; then - _run_rc_notrunning - return 1 - fi - echo "Reloading $name." - kill -USR2 $rc_pid -} - -php_fpm_logrotate_cmd () { - if [ -z "$rc_pid" ]; then - _run_rc_notrunning - return 1 - fi - echo "Rotating logs $name." - kill -USR1 $rc_pid -} - -run_rc_command "$1" |