[Midnightbsd-cvs] mports [16819] php 5.4.31
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 6 11:26:36 EDT 2014
Revision: 16819
http://svnweb.midnightbsd.org/mports/?rev=16819
Author: laffer1
Date: 2014-09-06 11:26:35 -0400 (Sat, 06 Sep 2014)
Log Message:
-----------
php 5.4.31
Modified Paths:
--------------
trunk/lang/php5/Makefile
trunk/lang/php5/Makefile.ext
trunk/lang/php5/distinfo
trunk/lang/php5/files/patch-TSRM_threads.m4
trunk/lang/php5/files/patch-Zend_zend_list.c
trunk/lang/php5/files/patch-Zend_zend_list.h
trunk/lang/php5/files/patch-acinclude.m4
trunk/lang/php5/files/patch-configure.in
trunk/lang/php5/files/patch-ext_standard_image.c
trunk/lang/php5/files/patch-ext_zlib_config0.m4
trunk/lang/php5/files/patch-sapi_fpm_Makefile.frag
trunk/lang/php5/files/patch-sapi_fpm_config.m4
trunk/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in
trunk/lang/php5/files/php-fpm.in
trunk/lang/php5/pkg-plist
Added Paths:
-----------
trunk/lang/php5/files/extra-patch-php-fpm-ipv6
trunk/lang/php5/files/patch-Zend__zend.h
trunk/lang/php5/files/patch-main__php_config.h.in
trunk/lang/php5/files/patch-sapi_apache2filter_config.m4
trunk/lang/php5/files/patch-sapi_apache2handler_config.m4
Removed Paths:
-------------
trunk/lang/php5/files/patch-Zend::zend.h
trunk/lang/php5/files/patch-ext_standard_basic_functions.c
trunk/lang/php5/files/patch-main::php_config.h.in
Property Changed:
----------------
trunk/lang/php5/Makefile.ext
trunk/lang/php5/files/patch-TSRM_threads.m4
trunk/lang/php5/files/patch-Zend_zend_list.c
trunk/lang/php5/files/patch-Zend_zend_list.h
trunk/lang/php5/files/patch-acinclude.m4
trunk/lang/php5/files/patch-configure.in
trunk/lang/php5/files/patch-ext_standard_image.c
trunk/lang/php5/files/patch-ext_zlib_config0.m4
trunk/lang/php5/files/patch-sapi_fpm_Makefile.frag
trunk/lang/php5/files/patch-sapi_fpm_config.m4
trunk/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in
trunk/lang/php5/files/php-fpm.in
trunk/lang/php5/pkg-message.mod
Modified: trunk/lang/php5/Makefile
===================================================================
--- trunk/lang/php5/Makefile 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/Makefile 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= php5
-PORTVERSION= 5.4.25
+PORTVERSION= 5.4.31
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
@@ -15,7 +15,7 @@
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-USE_BZIP2= yes
+USES= tar:bzip2
NO_OPTIONS_SORT=yes
.if !defined(PKGNAMESUFFIX)
USE_AUTOTOOLS= autoconf
@@ -22,8 +22,7 @@
LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS= \
- --with-layout=GNU \
+CONFIGURE_ARGS= --with-layout=GNU \
--localstatedir=/var \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \
@@ -55,8 +54,6 @@
CONFLICTS= php53-5*
-MAN1= php-config.1 phpize.1
-
.include <bsd.mport.options.mk>
PATCH_DIST_STRIP= -p1
@@ -72,7 +69,6 @@
.if ${PORT_OPTIONS:MCLI}
PHP_SAPI+= cli
PLIST_SUB+= CLI=""
-MAN1+= php.1
.else
PLIST_SUB+= CLI="@comment "
CONFIGURE_ARGS+=--disable-cli
@@ -88,7 +84,6 @@
.if ${PORT_OPTIONS:MFPM}
PHP_SAPI+= fpm
-MAN8+= php-fpm.8
USE_RC_SUBR+= php-fpm
CONFIGURE_ARGS+=--enable-fpm \
--with-fpm-user=${WWWOWN} \
Modified: trunk/lang/php5/Makefile.ext
===================================================================
--- trunk/lang/php5/Makefile.ext 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/Makefile.ext 2014-09-06 15:26:35 UTC (rev 16819)
@@ -31,7 +31,7 @@
.endif
.if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
.endif
@@ -85,9 +85,9 @@
.endif
.if ${PHP_MODNAME} == "gd"
-LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \
- png15:${PORTSDIR}/graphics/png \
- jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
+ libpng15.so:${PORTSDIR}/graphics/png \
+ libjpeg.so:${PORTSDIR}/graphics/jpeg
CONFIGURE_ARGS+=--with-gd \
--with-freetype-dir=${LOCALBASE} \
@@ -114,7 +114,7 @@
.endif
.if ${PHP_MODNAME} == "gmp"
-LIB_DEPENDS+= gmp:${PORTSDIR}/math/gmp
+LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp
CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
.endif
@@ -127,11 +127,11 @@
.if ${PHP_MODNAME} == "iconv"
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
-USES+= iconv
+USES+= iconv:translit
.endif
.if ${PHP_MODNAME} == "imap"
-LIB_DEPENDS+= c-client4:${PORTSDIR}/mail/cclient
+LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient
CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
--with-pcre-dir=${LOCALBASE}
@@ -153,7 +153,7 @@
USE_OPENLDAP= yes
. ifdef(WANT_OPENLDAP_SASL)
-CONFIGURE_ARGS+=--with-ldap-sasl
+CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
. endif
.endif
@@ -171,7 +171,7 @@
.endif
.if ${PHP_MODNAME} == "mcrypt"
-LIB_DEPENDS+= mcrypt:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS+= libmcrypt.so:${PORTSDIR}/security/libmcrypt
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
@@ -179,7 +179,7 @@
.endif
.if ${PHP_MODNAME} == "mssql"
-LIB_DEPENDS+= sybdb:${PORTSDIR}/databases/freetds-msdblib
+LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib
CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
.endif
@@ -199,11 +199,10 @@
.endif
.if ${PHP_MODNAME} == "odbc"
-CONFIGURE_ARGS+=--enable-odbc
+LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC
-OPTIONS_DEFINE= IODBC
-
-IODBC_DESC= Use the iODBC driver instead of unixODBC
+CONFIGURE_ARGS+=--enable-odbc \
+ --with-unixODBC=${LOCALBASE}
.endif
.if ${PHP_MODNAME} == "openssl"
@@ -243,10 +242,9 @@
.endif
.if ${PHP_MODNAME} == "pdo_odbc"
-OPTIONS_DEFINE= IODBC
+LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
-IODBC_DESC= Use the iODBC driver instead of unixODBC
-
USE_PHP= pdo
USE_PHP_BUILD= yes
.endif
@@ -287,7 +285,7 @@
.endif
.if ${PHP_MODNAME} == "pspell"
-LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell
CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
@@ -298,10 +296,11 @@
.if ${PHP_MODNAME} == "readline"
CONFIGURE_ARGS+=--with-readline=/usr
+USES+= readline
.endif
.if ${PHP_MODNAME} == "recode"
-LIB_DEPENDS+= recode:${PORTSDIR}/converters/recode
+LIB_DEPENDS+= librecode.so:${PORTSDIR}/converters/recode
CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
.endif
@@ -316,8 +315,10 @@
.if ${PHP_MODNAME} == "simplexml"
CONFIGURE_ARGS+=--enable-simplexml \
+ --with-pcre-dir=${LOCALBASE} \
--with-libxml-dir=${LOCALBASE}
+USES+= pkgconfig
USE_GNOME= libxml2
.endif
@@ -327,7 +328,7 @@
CONFIGURE_ENV+= ac_cv_buggy_snprint_value="no"
-LIB_DEPENDS+= netsnmp:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
USE_OPENSSL= yes
.endif
@@ -352,7 +353,7 @@
.endif
.if ${PHP_MODNAME} == "sybase_ct"
-LIB_DEPENDS+= ct:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds
CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE}
.endif
@@ -372,7 +373,7 @@
.if ${PHP_MODNAME} == "tidy"
CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
-LIB_DEPENDS+= tidy-0.99:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS+= libtidy-0.99.so:${PORTSDIR}/www/tidy-lib
.endif
.if ${PHP_MODNAME} == "tokenizer"
@@ -411,7 +412,7 @@
--with-libxml-dir=${LOCALBASE} \
--with-iconv-dir=${LOCALBASE}
-USES+= iconv
+USES+= iconv:translit
USE_GNOME= libxml2
PHP_HEADER_DIRS=libxmlrpc
@@ -458,17 +459,17 @@
WITH_BDB_HIGHEST= yes
. endif
. if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm
CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
. endif
. if ${PORT_OPTIONS:MQDBM}
-LIB_DEPENDS+= qdbm:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm
CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
. endif
. if ${PORT_OPTIONS:MTOKYO}
-LIB_DEPENDS+= tokyocabinet:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+= libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
. endif
@@ -482,7 +483,7 @@
.if ${PHP_MODNAME} == "gd"
. if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+= t1:${PORTSDIR}/devel/t1lib
+LIB_DEPENDS+= libt1.so:${PORTSDIR}/devel/t1lib
CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE}
. endif
@@ -498,7 +499,7 @@
CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
. endif
. if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx
+LIB_DEPENDS+= libvpx.so:${PORTSDIR}/multimedia/libvpx
CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
. endif
@@ -506,7 +507,7 @@
.if ${PHP_MODNAME} == "mbstring"
. if ${PORT_OPTIONS:MREGEX}
-LIB_DEPENDS+= onig:${PORTSDIR}/devel/oniguruma4
+LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4
CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
. else
CONFIGURE_ARGS+=--disable-mbregex
@@ -539,38 +540,14 @@
@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
.endif
-.if ${PHP_MODNAME} == "odbc"
-. if ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc
-
-CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE}
-. else
-LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC
-
-CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
-. endif
-.endif
-
.if ${PHP_MODNAME} == "pdo_dblib"
. if ${PORT_OPTIONS:MMSSQL}
-LIB_DEPENDS+= sybdb:${PORTSDIR}/databases/freetds-msdblib
+LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib
. else
-LIB_DEPENDS+= ct:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds
. endif
.endif
-.if ${PHP_MODNAME} == "pdo_odbc"
-. if ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc
-
-CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE}
-. else
-LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC
-
-CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
-. endif
-.endif
-
.if ${PHP_MODNAME} == "pdo_mysql"
. if ${PORT_OPTIONS:MMYSQLND}
CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
Property changes on: trunk/lang/php5/Makefile.ext
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.32
\ No newline at end of property
Modified: trunk/lang/php5/distinfo
===================================================================
--- trunk/lang/php5/distinfo 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/distinfo 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,4 +1,4 @@
-SHA256 (php-5.4.25.tar.bz2) = b6c18c07c6bf34f75e601b28829d636e44c1c9f4267aac4ed013443c32a2245f
-SIZE (php-5.4.25.tar.bz2) = 11739877
+SHA256 (php-5.4.31.tar.bz2) = 5e8e491431fd1d99df925d762b05da05c80b02cb38c9b3db616e8894a307914d
+SIZE (php-5.4.31.tar.bz2) = 12273437
SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
SIZE (php-5.4.x-mail-header.patch) = 3379
Added: trunk/lang/php5/files/extra-patch-php-fpm-ipv6
===================================================================
--- trunk/lang/php5/files/extra-patch-php-fpm-ipv6 (rev 0)
+++ trunk/lang/php5/files/extra-patch-php-fpm-ipv6 2014-09-06 15:26:35 UTC (rev 16819)
@@ -0,0 +1,215 @@
+diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
+index e056565..da14d63 100644
+--- a/sapi/fpm/fpm/fpm_sockets.c
++++ b/sapi/fpm/fpm/fpm_sockets.c
+@@ -39,29 +39,6 @@ struct listening_socket_s {
+
+ static struct fpm_array_s sockets_list;
+
+-static int fpm_sockets_resolve_af_inet(char *node, char *service, struct sockaddr_in *addr) /* {{{ */
+-{
+- struct addrinfo *res;
+- struct addrinfo hints;
+- int ret;
+-
+- memset(&hints, 0, sizeof(hints));
+- hints.ai_family = AF_INET;
+- ret = getaddrinfo(node, service, &hints, &res);
+-
+- if (ret != 0) {
+- zlog(ZLOG_ERROR, "can't resolve hostname '%s%s%s': getaddrinfo said: %s%s%s\n",
+- node, service ? ":" : "", service ? service : "",
+- gai_strerror(ret), ret == EAI_SYSTEM ? ", system error: " : "", ret == EAI_SYSTEM ? strerror(errno) : "");
+- return -1;
+- }
+-
+- *addr = *(struct sockaddr_in *) res->ai_addr;
+- freeaddrinfo(res);
+- return 0;
+-}
+-/* }}} */
+-
+ enum { FPM_GET_USE_SOCKET = 1, FPM_STORE_SOCKET = 2, FPM_STORE_USE_SOCKET = 3 };
+
+ static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */
+@@ -98,14 +75,23 @@ static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */
+ }
+ /* }}} */
+
++static void *fpm_get_in_addr(struct sockaddr *sa) /* {{{ */
++{
++ if (sa->sa_family == AF_INET) {
++ return &(((struct sockaddr_in*)sa)->sin_addr);
++ }
++
++ return &(((struct sockaddr_in6*)sa)->sin6_addr);
++}
++/* }}} */
++
+ static int fpm_sockets_hash_op(int sock, struct sockaddr *sa, char *key, int type, int op) /* {{{ */
+ {
+ if (key == NULL) {
+ switch (type) {
+ case FPM_AF_INET : {
+- struct sockaddr_in *sa_in = (struct sockaddr_in *) sa;
+- key = alloca(sizeof("xxx.xxx.xxx.xxx:ppppp"));
+- sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
++ key = alloca(INET6_ADDRSTRLEN);
++ inet_ntop(sa->sa_family, fpm_get_in_addr(sa), key, sizeof key);
+ break;
+ }
+
+@@ -254,11 +240,14 @@ enum fpm_address_domain fpm_sockets_domain_from_address(char *address) /* {{{ */
+
+ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /* {{{ */
+ {
+- struct sockaddr_in sa_in;
++ struct addrinfo hints, *servinfo, *p;
+ char *dup_address = strdup(wp->config->listen_address);
+- char *port_str = strchr(dup_address, ':');
++ char *port_str = strrchr(dup_address, ':');
+ char *addr = NULL;
++ int addr_len;
+ int port = 0;
++ int sock;
++ int status;
+
+ if (port_str) { /* this is host:port pair */
+ *port_str++ = '\0';
+@@ -274,23 +263,35 @@ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /*
+ return -1;
+ }
+
+- memset(&sa_in, 0, sizeof(sa_in));
+-
+- if (addr) {
+- sa_in.sin_addr.s_addr = inet_addr(addr);
+- if (sa_in.sin_addr.s_addr == INADDR_NONE) { /* do resolve */
+- if (0 > fpm_sockets_resolve_af_inet(addr, NULL, &sa_in)) {
+- return -1;
+- }
+- zlog(ZLOG_NOTICE, "address '%s' resolved as %u.%u.%u.%u", addr, IPQUAD(&sa_in.sin_addr));
++ // strip brackets from address for getaddrinfo
++ if (addr != NULL) {
++ addr_len = strlen(addr);
++ if (addr[0] == '[' && addr[addr_len - 1] == ']') {
++ addr[addr_len - 1] = '\0';
++ addr++;
+ }
+- } else {
+- sa_in.sin_addr.s_addr = htonl(INADDR_ANY);
+ }
+- sa_in.sin_family = AF_INET;
+- sa_in.sin_port = htons(port);
++
++ memset(&hints, 0, sizeof hints);
++ hints.ai_family = AF_UNSPEC;
++ hints.ai_socktype = SOCK_STREAM;
++
++ if ((status = getaddrinfo(addr, port_str, &hints, &servinfo)) != 0) {
++ zlog(ZLOG_ERROR, "getaddrinfo: %s\n", gai_strerror(status));
++ return -1;
++ }
++
+ free(dup_address);
+- return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_in, sizeof(struct sockaddr_in));
++
++ for (p = servinfo; p != NULL; p = p->ai_next) {
++ if ((sock = fpm_sockets_get_listening_socket(wp, p->ai_addr, p->ai_addrlen)) != -1) {
++ break;
++ }
++ }
++
++ freeaddrinfo(servinfo);
++
++ return sock;
+ }
+ /* }}} */
+
+diff --git a/sapi/fpm/fpm/fpm_sockets.h b/sapi/fpm/fpm/fpm_sockets.h
+index 121c016..446c78e 100644
+--- a/sapi/fpm/fpm/fpm_sockets.h
++++ b/sapi/fpm/fpm/fpm_sockets.h
+@@ -45,10 +45,4 @@ static inline int fd_set_blocked(int fd, int blocked) /* {{{ */
+ }
+ /* }}} */
+
+-#define IPQUAD(sin_addr) \
+- (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[0], \
+- (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[1], \
+- (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[2], \
+- (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[3]
+-
+ #endif
+diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
+index ab03736..8e242aa 100644
+--- a/sapi/fpm/php-fpm.conf.in
++++ b/sapi/fpm/php-fpm.conf.in
+@@ -152,6 +152,8 @@ group = @php_fpm_group@
+ ; Valid syntaxes are:
+ ; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on
+ ; a specific port;
++; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
++; a specific port;
+ ; 'port' - to listen on a TCP socket to all addresses on a
+ ; specific port;
+ ; '/path/to/unix/socket' - to listen on a unix socket.
+diff --git a/sapi/fpm/tests/003.phpt b/sapi/fpm/tests/003.phpt
+new file mode 100644
+index 0000000..389cb24
+--- /dev/null
++++ b/sapi/fpm/tests/003.phpt
+@@ -0,0 +1,53 @@
++--TEST--
++FPM: Test IPv6 support
++--SKIPIF--
++<?php include "skipif.inc"; ?>
++--FILE--
++<?php
++
++include "include.inc";
++
++$logfile = dirname(__FILE__).'/php-fpm.log.tmp';
++
++$cfg = <<<EOT
++[global]
++error_log = $logfile
++[unconfined]
++listen = [::1]:9000
++pm = dynamic
++pm.max_children = 5
++pm.start_servers = 2
++pm.min_spare_servers = 1
++pm.max_spare_servers = 3
++EOT;
++
++$fpm = run_fpm($cfg, $tail);
++if (is_resource($fpm)) {
++ var_dump(fgets($tail));
++ var_dump(fgets($tail));
++ $i = 0;
++ while (($i++ < 30) && !($fp = fsockopen('[::1]', 9000))) {
++ usleep(10000);
++ }
++ if ($fp) {
++ echo "Done\n";
++ fclose($fp);
++ }
++ proc_terminate($fpm);
++ stream_get_contents($tail);
++ fclose($tail);
++ proc_close($fpm);
++}
++
++?>
++--EXPECTF--
++string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d
++"
++string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections
++"
++Done
++--CLEAN--
++<?php
++ $logfile = dirname(__FILE__).'/php-fpm.log.tmp';
++ @unlink($logfile);
++?>
Modified: trunk/lang/php5/files/patch-TSRM_threads.m4
===================================================================
--- trunk/lang/php5/files/patch-TSRM_threads.m4 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-TSRM_threads.m4 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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);
Property changes on: trunk/lang/php5/files/patch-TSRM_threads.m4
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: trunk/lang/php5/files/patch-Zend::zend.h
===================================================================
--- trunk/lang/php5/files/patch-Zend::zend.h 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-Zend::zend.h 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,11 +0,0 @@
---- 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 ZEND_ALLOCA_MAX_SIZE (32 * 1024)
- # define ALLOCA_FLAG(name) \
- zend_bool name;
Added: trunk/lang/php5/files/patch-Zend__zend.h
===================================================================
--- trunk/lang/php5/files/patch-Zend__zend.h (rev 0)
+++ trunk/lang/php5/files/patch-Zend__zend.h 2014-09-06 15:26:35 UTC (rev 16819)
@@ -0,0 +1,11 @@
+--- 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;
Modified: trunk/lang/php5/files/patch-Zend_zend_list.c
===================================================================
--- trunk/lang/php5/files/patch-Zend_zend_list.c 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-Zend_zend_list.c 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,6 +1,6 @@
---- Zend/zend_list.c.orig 2012-01-01 14:15:04.000000000 +0100
-+++ Zend/zend_list.c 2012-03-02 10:29:02.000000000 +0100
-@@ -47,7 +47,7 @@
+--- 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;
}
@@ -9,7 +9,7 @@
{
zend_rsrc_list_entry *le;
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ ZEND_API int _zend_list_delete(int id TS
}
@@ -18,7 +18,7 @@
{
zend_rsrc_list_entry *le;
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ ZEND_API void *_zend_list_find(int id, i
}
}
@@ -27,7 +27,7 @@
{
zend_rsrc_list_entry *le;
-@@ -348,7 +348,7 @@
+@@ -348,7 +348,7 @@ void zend_destroy_rsrc_list_dtors(void)
}
Property changes on: trunk/lang/php5/files/patch-Zend_zend_list.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/php5/files/patch-Zend_zend_list.h
===================================================================
--- trunk/lang/php5/files/patch-Zend_zend_list.h 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-Zend_zend_list.h 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,6 +1,6 @@
---- Zend/zend_list.h.orig 2012-01-01 14:15:04.000000000 +0100
-+++ Zend/zend_list.h 2012-03-02 10:36:42.000000000 +0100
-@@ -71,9 +71,9 @@
+--- 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);
@@ -13,7 +13,7 @@
#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 @@
+@@ -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, ...);
Property changes on: trunk/lang/php5/files/patch-Zend_zend_list.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/php5/files/patch-acinclude.m4
===================================================================
--- trunk/lang/php5/files/patch-acinclude.m4 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-acinclude.m4 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,6 +1,6 @@
---- acinclude.m4.orig 2009-05-09 22:28:02.000000000 +0200
-+++ acinclude.m4 2009-06-25 08:08:05.000000000 +0200
-@@ -968,15 +968,9 @@
+--- acinclude.m4.orig 2013-12-10 19:32:43.000000000 +0000
++++ acinclude.m4 2013-12-13 21:55:53.955235854 +0000
+@@ -984,15 +984,9 @@ dnl ------------------------------------
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
dnl ---------------------------------------------- CLI static module
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
@@ -18,7 +18,7 @@
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
fi
PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1026,12 +1020,6 @@
+@@ -1042,12 +1036,6 @@ You either need to build $1 shared or bu
build to be successful.
])
fi
@@ -31,7 +31,7 @@
dnl Some systems require that we link $2 to $1 when building
])
-@@ -2303,9 +2291,9 @@
+@@ -2320,9 +2308,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
dnl Fallbacks for different configure options
Property changes on: trunk/lang/php5/files/patch-acinclude.m4
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Modified: trunk/lang/php5/files/patch-configure.in
===================================================================
--- trunk/lang/php5/files/patch-configure.in 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-configure.in 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,6 +1,6 @@
---- configure.in.orig 2011-03-04 10:10:54.000000000 +0100
-+++ configure.in 2011-03-04 10:11:01.000000000 +0100
-@@ -302,7 +302,6 @@
+--- 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 -------------------------------------------------------------------------
@@ -7,16 +7,24 @@
-PTHREADS_CHECK
PHP_HELP_SEPARATOR([SAPI modules:])
PHP_SHLIB_SUFFIX_NAMES
- PHP_SAPI=default
-@@ -327,7 +326,6 @@
+ 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
- divert(3)
-@@ -612,7 +610,7 @@
+ dnl Starting system checks.
+@@ -688,7 +681,7 @@
)
dnl Some systems (like OpenSolaris) do not have nanosleep in libc
@@ -25,7 +33,7 @@
dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo
-@@ -1162,7 +1160,7 @@
+@@ -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"`
@@ -34,9 +42,9 @@
exec_prefix=$old_exec_prefix
libdir=$old_libdir
-@@ -1373,7 +1371,7 @@
- PHP_SUBST(all_targets)
+@@ -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/])
Property changes on: trunk/lang/php5/files/patch-configure.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Deleted: trunk/lang/php5/files/patch-ext_standard_basic_functions.c
===================================================================
--- trunk/lang/php5/files/patch-ext_standard_basic_functions.c 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-ext_standard_basic_functions.c 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,20 +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
-@@ -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
Modified: trunk/lang/php5/files/patch-ext_standard_image.c
===================================================================
--- trunk/lang/php5/files/patch-ext_standard_image.c 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-ext_standard_image.c 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,5 +1,5 @@
---- 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
+--- 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"
@@ -10,7 +10,7 @@
/* file type markers */
PHPAPI const char php_sig_gif[3] = {'G', 'I', 'F'};
-@@ -80,9 +78,7 @@
+@@ -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);
@@ -20,7 +20,7 @@
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 @@
+@@ -188,7 +184,6 @@ static unsigned long int php_swf_get_bit
}
/* }}} */
@@ -28,7 +28,7 @@
/* {{{ php_handle_swc
*/
static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
-@@ -255,7 +250,6 @@
+@@ -259,7 +254,6 @@ static struct gfxinfo *php_handle_swc(ph
return result;
}
/* }}} */
@@ -36,7 +36,7 @@
/* {{{ php_handle_swf
*/
-@@ -1314,11 +1308,7 @@
+@@ -1318,11 +1312,7 @@ static void php_getimagesize_from_stream
result = php_handle_swf(stream TSRMLS_CC);
break;
case IMAGE_FILETYPE_SWC:
Property changes on: trunk/lang/php5/files/patch-ext_standard_image.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/php5/files/patch-ext_zlib_config0.m4
===================================================================
--- trunk/lang/php5/files/patch-ext_zlib_config0.m4 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-ext_zlib_config0.m4 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,6 +1,6 @@
---- ext/zlib/config0.m4.orig 2010-08-26 13:19:52.000000000 +0200
-+++ ext/zlib/config0.m4 2010-08-26 13:20:11.000000000 +0200
-@@ -8,7 +8,7 @@
+--- 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)
Property changes on: trunk/lang/php5/files/patch-ext_zlib_config0.m4
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/lang/php5/files/patch-main::php_config.h.in
===================================================================
--- trunk/lang/php5/files/patch-main::php_config.h.in 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-main::php_config.h.in 2014-09-06 15:26:35 UTC (rev 16819)
@@ -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
-
Added: trunk/lang/php5/files/patch-main__php_config.h.in
===================================================================
--- trunk/lang/php5/files/patch-main__php_config.h.in (rev 0)
+++ trunk/lang/php5/files/patch-main__php_config.h.in 2014-09-06 15:26:35 UTC (rev 16819)
@@ -0,0 +1,12 @@
+--- 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
+
Added: trunk/lang/php5/files/patch-sapi_apache2filter_config.m4
===================================================================
--- trunk/lang/php5/files/patch-sapi_apache2filter_config.m4 (rev 0)
+++ trunk/lang/php5/files/patch-sapi_apache2filter_config.m4 2014-09-06 15:26:35 UTC (rev 16819)
@@ -0,0 +1,11 @@
+--- 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"
Added: trunk/lang/php5/files/patch-sapi_apache2handler_config.m4
===================================================================
--- trunk/lang/php5/files/patch-sapi_apache2handler_config.m4 (rev 0)
+++ trunk/lang/php5/files/patch-sapi_apache2handler_config.m4 2014-09-06 15:26:35 UTC (rev 16819)
@@ -0,0 +1,11 @@
+--- 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"
Modified: trunk/lang/php5/files/patch-sapi_fpm_Makefile.frag
===================================================================
--- trunk/lang/php5/files/patch-sapi_fpm_Makefile.frag 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-sapi_fpm_Makefile.frag 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,6 +1,6 @@
---- sapi/fpm/Makefile.frag.orig 2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/Makefile.frag 2012-02-09 16:43:25.000000000 +0100
-@@ -27,6 +27,6 @@
+--- 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
Property changes on: trunk/lang/php5/files/patch-sapi_fpm_Makefile.frag
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/lang/php5/files/patch-sapi_fpm_config.m4
===================================================================
--- trunk/lang/php5/files/patch-sapi_fpm_config.m4 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-sapi_fpm_config.m4 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,6 +1,6 @@
---- sapi/fpm/config.m4.orig 2011-06-26 17:48:11.000000000 +0200
-+++ sapi/fpm/config.m4 2011-11-18 11:05:21.000000000 +0100
-@@ -312,7 +312,7 @@
+--- 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])
@@ -9,7 +9,7 @@
have_lq=tcp_info
AC_MSG_RESULT([yes])
], [
-@@ -333,7 +333,7 @@
+@@ -338,7 +338,7 @@ AC_DEFUN([AC_FPM_LQ],
AC_MSG_RESULT([no])
])
Property changes on: trunk/lang/php5/files/patch-sapi_fpm_config.m4
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in
===================================================================
--- trunk/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,6 +1,6 @@
---- sapi/fpm/php-fpm.conf.in.orig 2012-02-08 15:50:42.000000000 +0100
-+++ sapi/fpm/php-fpm.conf.in 2012-02-08 15:50:54.000000000 +0100
-@@ -317,7 +317,7 @@
+--- 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
Property changes on: trunk/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/lang/php5/files/php-fpm.in
===================================================================
--- trunk/lang/php5/files/php-fpm.in 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/files/php-fpm.in 2014-09-06 15:26:35 UTC (rev 16819)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD$
+# $FreeBSD: head/lang/php5/files/php-fpm.in 340872 2014-01-24 00:14:07Z mat $
#
# PROVIDE: php-fpm
Property changes on: trunk/lang/php5/files/php-fpm.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/lang/php5/pkg-message.mod
===================================================================
--- trunk/lang/php5/pkg-message.mod 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/pkg-message.mod 2014-09-06 15:26:35 UTC (rev 16819)
Property changes on: trunk/lang/php5/pkg-message.mod
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/lang/php5/pkg-plist
===================================================================
--- trunk/lang/php5/pkg-plist 2014-09-05 23:21:55 UTC (rev 16818)
+++ trunk/lang/php5/pkg-plist 2014-09-06 15:26:35 UTC (rev 16819)
@@ -235,6 +235,11 @@
lib/php/build/run-tests.php
lib/php/build/scan_makefile_in.awk
lib/php/build/shtool
+%%CGI%%man/man1/php-cgi.1.gz
+man/man1/php-config.1.gz
+%%CLI%%man/man1/php.1.gz
+man/man1/phpize.1.gz
+%%FPM%%man/man8/php-fpm.8.gz
%%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%%
%%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
%%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
More information about the Midnightbsd-cvs
mailing list