diff options
Diffstat (limited to 'lang/php5/files')
-rw-r--r-- | lang/php5/files/patch-TSRM_threads.m4 | 11 | ||||
-rw-r--r-- | lang/php5/files/patch-Zend__zend.h | 11 | ||||
-rw-r--r-- | lang/php5/files/patch-Zend_zend_list.c | 38 | ||||
-rw-r--r-- | lang/php5/files/patch-Zend_zend_list.h | 24 | ||||
-rw-r--r-- | lang/php5/files/patch-acinclude.m4 | 78 | ||||
-rw-r--r-- | lang/php5/files/patch-configure.in | 53 | ||||
-rw-r--r-- | lang/php5/files/patch-ext_standard_image.c | 50 | ||||
-rw-r--r-- | lang/php5/files/patch-ext_zlib_config0.m4 | 11 | ||||
-rw-r--r-- | lang/php5/files/patch-main__php_config.h.in | 12 | ||||
-rw-r--r-- | lang/php5/files/patch-sapi_apache2filter_config.m4 | 11 | ||||
-rw-r--r-- | lang/php5/files/patch-sapi_apache2handler_config.m4 | 11 | ||||
-rw-r--r-- | lang/php5/files/patch-sapi_fpm_Makefile.frag | 12 | ||||
-rw-r--r-- | lang/php5/files/patch-sapi_fpm_config.m4 | 20 | ||||
-rw-r--r-- | lang/php5/files/patch-sapi_fpm_php-fpm.conf.in | 11 | ||||
-rw-r--r-- | lang/php5/files/php-fpm.in | 43 |
15 files changed, 0 insertions, 396 deletions
diff --git a/lang/php5/files/patch-TSRM_threads.m4 b/lang/php5/files/patch-TSRM_threads.m4 deleted file mode 100644 index 31c0886a732c..000000000000 --- a/lang/php5/files/patch-TSRM_threads.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- TSRM/threads.m4.orig 2013-12-10 19:32:43.000000000 +0000 -+++ TSRM/threads.m4 2013-12-13 21:55:53.764235920 +0000 -@@ -79,7 +79,7 @@ int main() { - 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/php5/files/patch-Zend__zend.h b/lang/php5/files/patch-Zend__zend.h deleted file mode 100644 index 2b565146f7de..000000000000 --- a/lang/php5/files/patch-Zend__zend.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Zend/zend.h.orig 2013-12-10 19:32:43.000000000 +0000 -+++ Zend/zend.h 2013-12-13 21:55:53.836235768 +0000 -@@ -180,7 +180,7 @@ char *alloca (); - #endif - #define restrict __restrict__ - --#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 ZEND_ALLOCA_MAX_SIZE (32 * 1024) - # define ALLOCA_FLAG(name) \ - zend_bool name; diff --git a/lang/php5/files/patch-Zend_zend_list.c b/lang/php5/files/patch-Zend_zend_list.c deleted file mode 100644 index dfdaff6b8454..000000000000 --- a/lang/php5/files/patch-Zend_zend_list.c +++ /dev/null @@ -1,38 +0,0 @@ ---- Zend/zend_list.c.orig 2013-12-10 19:32:43.000000000 +0000 -+++ Zend/zend_list.c 2013-12-13 21:55:53.859235929 +0000 -@@ -47,7 +47,7 @@ ZEND_API int zend_list_insert(void *ptr, - 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; - -@@ -64,7 +64,7 @@ ZEND_API int _zend_list_delete(int id TS - } - - --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; - -@@ -77,7 +77,7 @@ ZEND_API void *_zend_list_find(int id, i - } - } - --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; - -@@ -348,7 +348,7 @@ void zend_destroy_rsrc_list_dtors(void) - } - - --const char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC) -+const char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC) - { - zend_rsrc_list_dtors_entry *lde; - int rsrc_type; diff --git a/lang/php5/files/patch-Zend_zend_list.h b/lang/php5/files/patch-Zend_zend_list.h deleted file mode 100644 index 0a1963fc6353..000000000000 --- a/lang/php5/files/patch-Zend_zend_list.h +++ /dev/null @@ -1,24 +0,0 @@ ---- Zend/zend_list.h.orig 2013-12-10 19:32:43.000000000 +0000 -+++ Zend/zend_list.h 2013-12-13 21:55:53.929236061 +0000 -@@ -71,9 +71,9 @@ int zend_init_rsrc_list_dtors(void); - void zend_destroy_rsrc_list_dtors(void); - - ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC); --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 void *_zend_list_find(int id, i - ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type TSRMLS_DC); - ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, const char *resource_type_name, int *found_resource_type, int num_resource_types, ...); - --ZEND_API const char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC); -+ZEND_API const 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/php5/files/patch-acinclude.m4 b/lang/php5/files/patch-acinclude.m4 deleted file mode 100644 index 190327d1087e..000000000000 --- a/lang/php5/files/patch-acinclude.m4 +++ /dev/null @@ -1,78 +0,0 @@ ---- acinclude.m4.orig 2014-11-12 00:29:14.000000000 +0000 -+++ acinclude.m4 2014-11-27 09:29:43.821181323 +0000 -@@ -984,15 +984,9 @@ - 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) -+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm) - EXT_CLI_STATIC="$EXT_CLI_STATIC $1" - fi - PHP_ADD_BUILD_DIR($ext_builddir) -@@ -1042,12 +1036,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 - ]) - -@@ -2320,9 +2308,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 - -@@ -2969,7 +2957,7 @@ - $abs_srcdir/$ac_provsrc:; - - $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc -- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ -+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ - - \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj - -@@ -2989,12 +2977,12 @@ - $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS) - echo "[#] Generated by Makefile for libtool" > \$[]@ - @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir -- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\] -+ if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\] - echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\] - else [\\] - echo "pic_object='none'" >> \$[]@ [;\\] - fi -- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\] -+ if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\] - echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\] - else [\\] - echo "non_pic_object='none'" >> \$[]@ [;\\] -@@ -3006,7 +2994,7 @@ - *) - cat>>Makefile.objects<<EOF - $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS) -- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs -+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs - - EOF - ;; diff --git a/lang/php5/files/patch-configure.in b/lang/php5/files/patch-configure.in deleted file mode 100644 index ac7c4605d639..000000000000 --- a/lang/php5/files/patch-configure.in +++ /dev/null @@ -1,53 +0,0 @@ ---- configure.in.orig 2014-04-02 05:43:49.000000000 +0000 -+++ configure.in 2014-04-09 07:55:06.042404378 +0000 -@@ -370,7 +370,6 @@ - dnl . - dnl ------------------------------------------------------------------------- - --PTHREADS_CHECK - PHP_HELP_SEPARATOR([SAPI modules:]) - PHP_SHLIB_SUFFIX_NAMES - PHP_BUILD_PROGRAM -@@ -401,15 +400,9 @@ - AC_MSG_RESULT([none]) - fi - --dnl Exit early --if test -z "$PHP_INSTALLED_SAPIS"; then -- AC_MSG_ERROR([Nothing to build.]) --fi -- - dnl force ZTS - if test "$enable_maintainer_zts" = "yes"; then - PTHREADS_ASSIGN_VARS -- PTHREADS_FLAGS - fi - - dnl Starting system checks. -@@ -688,7 +681,7 @@ - ) - - dnl Some systems (like OpenSolaris) do not have nanosleep in libc --PHP_CHECK_FUNC_LIB(nanosleep, rt) -+PHP_CHECK_FUNC(nanosleep, rt) - - dnl Check for getaddrinfo, should be a better way, but... - dnl Also check for working getaddrinfo -@@ -1225,7 +1218,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 -@@ -1435,7 +1428,7 @@ - PHP_SUBST(install_targets) - PHP_SUBST(install_binary_targets) - --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_image.c b/lang/php5/files/patch-ext_standard_image.c deleted file mode 100644 index e91ac7158831..000000000000 --- a/lang/php5/files/patch-ext_standard_image.c +++ /dev/null @@ -1,50 +0,0 @@ ---- ext/standard/image.c.orig 2013-12-10 19:32:43.000000000 +0000 -+++ ext/standard/image.c 2013-12-13 21:55:54.112235824 +0000 -@@ -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'}; -@@ -81,9 +79,7 @@ PHP_MINIT_FUNCTION(imagetypes) - 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 */ -@@ -188,7 +184,6 @@ static unsigned long int php_swf_get_bit - } - /* }}} */ - --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - /* {{{ php_handle_swc - */ - static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC) -@@ -259,7 +254,6 @@ static struct gfxinfo *php_handle_swc(ph - return result; - } - /* }}} */ --#endif - - /* {{{ php_handle_swf - */ -@@ -1318,11 +1312,7 @@ static void php_getimagesize_from_stream - 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/php5/files/patch-ext_zlib_config0.m4 b/lang/php5/files/patch-ext_zlib_config0.m4 deleted file mode 100644 index f5187e9f50b5..000000000000 --- a/lang/php5/files/patch-ext_zlib_config0.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/zlib/config0.m4.orig 2013-12-10 19:32:43.000000000 +0000 -+++ ext/zlib/config0.m4 2013-12-13 21:55:54.142235878 +0000 -@@ -8,7 +8,7 @@ PHP_ARG_WITH(zlib,for ZLIB support, - PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined, - [ --with-zlib-dir=<DIR> Define the location of zlib install directory], no, no) - --if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then -+if test "$PHP_ZLIB" != "no"; then - PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared) - PHP_SUBST(ZLIB_SHARED_LIBADD) - diff --git a/lang/php5/files/patch-main__php_config.h.in b/lang/php5/files/patch-main__php_config.h.in deleted file mode 100644 index 3ce79e95c55a..000000000000 --- a/lang/php5/files/patch-main__php_config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- main/php_config.h.in.orig 2013-12-10 20:12:52.000000000 +0000 -+++ main/php_config.h.in 2013-12-13 21:55:54.207235635 +0000 -@@ -2375,6 +2375,9 @@ - /* Define if processor uses big-endian word */ - #undef WORDS_BIGENDIAN - -+/* Include external shared modules configurations */ -+#include "ext/php_config.h" -+ - /* Whether sprintf is broken */ - #undef ZEND_BROKEN_SPRINTF - diff --git a/lang/php5/files/patch-sapi_apache2filter_config.m4 b/lang/php5/files/patch-sapi_apache2filter_config.m4 deleted file mode 100644 index ea5813e207a9..000000000000 --- a/lang/php5/files/patch-sapi_apache2filter_config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/apache2filter/config.m4.orig 2013-12-10 19:32:43.000000000 +0000 -+++ sapi/apache2filter/config.m4 2013-12-13 21:55:54.268235571 +0000 -@@ -68,7 +68,7 @@ if test "$PHP_APXS2FILTER" != "no"; then - fi - - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` -- if test -z `$APXS -q SYSCONFDIR`; then -+ if true; then - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php5" diff --git a/lang/php5/files/patch-sapi_apache2handler_config.m4 b/lang/php5/files/patch-sapi_apache2handler_config.m4 deleted file mode 100644 index c88bd1093956..000000000000 --- a/lang/php5/files/patch-sapi_apache2handler_config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/apache2handler/config.m4.orig 2013-12-10 19:32:43.000000000 +0000 -+++ sapi/apache2handler/config.m4 2013-12-13 21:55:54.331235888 +0000 -@@ -67,7 +67,7 @@ if test "$PHP_APXS2" != "no"; then - fi - - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` -- if test -z `$APXS -q SYSCONFDIR`; then -+ if true; then - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php5" diff --git a/lang/php5/files/patch-sapi_fpm_Makefile.frag b/lang/php5/files/patch-sapi_fpm_Makefile.frag deleted file mode 100644 index 4fa8d50bf4dc..000000000000 --- a/lang/php5/files/patch-sapi_fpm_Makefile.frag +++ /dev/null @@ -1,12 +0,0 @@ ---- sapi/fpm/Makefile.frag.orig 2013-12-10 19:32:43.000000000 +0000 -+++ sapi/fpm/Makefile.frag 2013-12-13 21:55:54.402236058 +0000 -@@ -18,6 +18,6 @@ install-fpm: $(SAPI_FPM_PATH) - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 - @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8 - -- @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/" -- @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm -- @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html -+ @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/php/fpm/" -+ @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/php/fpm -+ @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/php/fpm/status.html diff --git a/lang/php5/files/patch-sapi_fpm_config.m4 b/lang/php5/files/patch-sapi_fpm_config.m4 deleted file mode 100644 index a9319739d84c..000000000000 --- a/lang/php5/files/patch-sapi_fpm_config.m4 +++ /dev/null @@ -1,20 +0,0 @@ ---- sapi/fpm/config.m4.orig 2013-12-10 19:32:43.000000000 +0000 -+++ sapi/fpm/config.m4 2013-12-13 21:55:54.457235637 +0000 -@@ -317,7 +317,7 @@ AC_DEFUN([AC_FPM_LQ], - - AC_MSG_CHECKING([for TCP_INFO]) - -- AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; int x = TCP_INFO;], [ -+ AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; ti.tcpi_sacked = 0; int x = TCP_INFO;], [ - have_lq=tcp_info - AC_MSG_RESULT([yes]) - ], [ -@@ -338,7 +338,7 @@ AC_DEFUN([AC_FPM_LQ], - AC_MSG_RESULT([no]) - ]) - -- if test "$have_lq" = "tcp_info"; then -+ if test "$have_lq" = "so_listenq"; then - AC_DEFINE([HAVE_LQ_SO_LISTENQ], 1, [do we have SO_LISTENQxxx?]) - fi - fi diff --git a/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in b/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in deleted file mode 100644 index 1e485060371c..000000000000 --- a/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/fpm/php-fpm.conf.in.orig 2013-12-10 19:32:43.000000000 +0000 -+++ sapi/fpm/php-fpm.conf.in 2013-12-13 21:55:54.520235931 +0000 -@@ -341,7 +341,7 @@ pm.max_spare_servers = 3 - ; last request memory: 0 - ; - ; Note: There is a real-time FPM status monitoring sample web page available --; It's available in: @EXPANDED_DATADIR@/fpm/status.html -+; It's available in: @EXPANDED_DATADIR@/php/fpm/status.html - ; - ; Note: The value must start with a leading slash (/). The value can be - ; anything, but it may not be a good idea to use the .php extension or it diff --git a/lang/php5/files/php-fpm.in b/lang/php5/files/php-fpm.in deleted file mode 100644 index 55e2ac992408..000000000000 --- a/lang/php5/files/php-fpm.in +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: php-fpm -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable php-fpm: -# php_fpm_enable="YES" -# - -. /etc/rc.subr - -name="php_fpm" -rcvar=php_fpm_enable - -load_rc_config "$name" - -: ${php_fpm_enable="NO"} - -extra_commands="reload logrotate" - -command="%%PREFIX%%/sbin/php-fpm" -pidfile="/var/run/php-fpm.pid" -sig_stop="QUIT" -sig_reload="USR2" -logrotate_cmd="php_fpm_logrotate" - -required_files="%%PREFIX%%/etc/php-fpm.conf" - -php_fpm_logrotate() { - if [ -z "$rc_pid" ]; then - _run_rc_notrunning - return 1 - fi - echo "Rotating logs $name." - kill -USR1 $rc_pid -} - -run_rc_command "$1" |