summaryrefslogtreecommitdiff
path: root/lang/php5/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/php5/files')
-rw-r--r--lang/php5/files/patch-acinclude.m49
-rw-r--r--lang/php5/files/patch-configure.in4
-rw-r--r--lang/php5/files/patch-sapi_apache2filter_config.m411
-rw-r--r--lang/php5/files/patch-sapi_fpm_Makefile.frag19
-rw-r--r--lang/php5/files/patch-sapi_fpm_config.m450
-rw-r--r--lang/php5/files/php-fpm.in43
6 files changed, 130 insertions, 6 deletions
diff --git a/lang/php5/files/patch-acinclude.m4 b/lang/php5/files/patch-acinclude.m4
index 4f9a9462f947..d92738cdf776 100644
--- a/lang/php5/files/patch-acinclude.m4
+++ b/lang/php5/files/patch-acinclude.m4
@@ -5,11 +5,11 @@
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))))
++ 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,ifelse($4,fpm,PHP_FPM_OBJS,PHP_GLOBAL_OBJS)))))
])
dnl
-@@ -968,15 +968,8 @@
+@@ -968,15 +968,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
@@ -23,10 +23,11 @@
- ;;
- 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)
-@@ -1026,12 +1019,6 @@
+@@ -1026,12 +1020,6 @@
build to be successful.
])
fi
@@ -39,7 +40,7 @@
dnl Some systems require that we link $2 to $1 when building
])
-@@ -2303,9 +2290,9 @@
+@@ -2303,9 +2291,9 @@
test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
dnl Fallbacks for different configure options
diff --git a/lang/php5/files/patch-configure.in b/lang/php5/files/patch-configure.in
index 3cdb4241f6a2..a37ca5c6e327 100644
--- a/lang/php5/files/patch-configure.in
+++ b/lang/php5/files/patch-configure.in
@@ -31,7 +31,7 @@
-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"
++all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) \$(PHP_FPM_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
@@ -40,7 +40,7 @@
- ;;
- *)
- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
-+ apache|apache2handler)
++ apache|apache2handler|apache2filter)
+ install_targets="install-sapi $install_targets"
;;
esac
diff --git a/lang/php5/files/patch-sapi_apache2filter_config.m4 b/lang/php5/files/patch-sapi_apache2filter_config.m4
new file mode 100644
index 000000000000..48a46efa6796
--- /dev/null
+++ b/lang/php5/files/patch-sapi_apache2filter_config.m4
@@ -0,0 +1,11 @@
+--- sapi/apache2filter/config.m4.orig 2010-07-26 13:06:55.000000000 +0200
++++ sapi/apache2filter/config.m4 2010-07-26 13:07:19.000000000 +0200
+@@ -118,7 +118,7 @@
+ ;;
+ esac
+
+- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then
++ if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+ PHP_BUILD_THREAD_SAFE
+ fi
+ AC_MSG_RESULT(yes)
diff --git a/lang/php5/files/patch-sapi_fpm_Makefile.frag b/lang/php5/files/patch-sapi_fpm_Makefile.frag
new file mode 100644
index 000000000000..205537ef04e2
--- /dev/null
+++ b/lang/php5/files/patch-sapi_fpm_Makefile.frag
@@ -0,0 +1,19 @@
+--- sapi/fpm/Makefile.frag.orig 2010-07-27 15:57:32.000000000 +0200
++++ sapi/fpm/Makefile.frag 2010-07-27 15:57:06.000000000 +0200
+@@ -3,14 +3,14 @@
+ $(builddir)/fpm:
+ @mkdir -p $(builddir)/fpm
+
+-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
++$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_FPM_OBJS) $(FPM_EXTRA_DEPS)
+ $(BUILD_FPM)
+
+ $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
+
+ install-build: install-fpm
+
+-install-fpm: install-sapi
++install-fpm:
+ @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/"
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir)
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
diff --git a/lang/php5/files/patch-sapi_fpm_config.m4 b/lang/php5/files/patch-sapi_fpm_config.m4
new file mode 100644
index 000000000000..91c8744adede
--- /dev/null
+++ b/lang/php5/files/patch-sapi_fpm_config.m4
@@ -0,0 +1,50 @@
+--- sapi/fpm/config.m4.orig 2010-06-16 10:58:42.000000000 +0200
++++ sapi/fpm/config.m4 2010-07-27 13:26:02.000000000 +0200
+@@ -562,10 +562,12 @@
+
+ PHP_FPM_CFLAGS="$LIBEVENT_CFLAGS -I$abs_srcdir/sapi/fpm"
+
+- SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
+- PHP_SUBST(SAPI_EXTRA_LIBS)
+-
+- INSTALL_IT=":"
++ FPM_EXTRA_LIBS="$LIBEVENT_LIBS"
++ PHP_SUBST(FPM_EXTRA_LIBS)
++
++ if test "$PHP_SAPI" = "default"; then
++ PHP_SAPI="fpm"
++ fi
+ PHP_FPM_FILES="fpm/fastcgi.c \
+ fpm/fpm.c \
+ fpm/fpm_children.c \
+@@ -590,7 +592,8 @@
+ fpm/zlog.c \
+ "
+
+- PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
++ PHP_ADD_SOURCES(sapi/fpm, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, fpm)
++ PHP_ADD_SOURCES(/main, internal_functions.c,,fpm)
+
+ case $host_alias in
+ *aix*)
+@@ -600,11 +603,19 @@
+ BUILD_FPM="\$(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) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+ ;;
+ *)
+- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
++ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+ ;;
+ esac
+
++ PHP_FPM_TARGET="\$(SAPI_FPM_PATH)"
++ PHP_INSTALL_FPM_TARGET="install-fpm"
+ PHP_SUBST(BUILD_FPM)
++ PHP_SUBST(PHP_FPM_OBJS)
++ PHP_SUBST(PHP_FPM_TARGET)
++ PHP_SUBST(PHP_INSTALL_FPM_TARGET)
++ if test "$PHP_SAPI" = "fpm" ; then
++ PHP_BUILD_PROGRAM($SAPI_FPM_PATH)
++ fi
+ else
+ AC_MSG_RESULT(no)
+ fi
diff --git a/lang/php5/files/php-fpm.in b/lang/php5/files/php-fpm.in
new file mode 100644
index 000000000000..af61d9364ca0
--- /dev/null
+++ b/lang/php5/files/php-fpm.in
@@ -0,0 +1,43 @@
+#!/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=`set_rcvar`
+
+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"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 04:36:20 +0000