ports/148956: [PATCH] lang/php5: update to 5.3.3

[Martin Matuska]

>Number:         148956
>Category:       ports
>Synopsis:       [PATCH] lang/php5: update to 5.3.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 26 11:30:08 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 8.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD neo.vx.sk 8.1-RELEASE FreeBSD 8.1-RELEASE #0 r210200M: Fri Jul 23 21:43:12 CEST 2010 root at neo.vx.sk:/usr/obj/usr/src/sys/NEO amd64
>Description:
Update php52 to 5.3.3

Add FPM support to Makefile and php-fpm startup script
Remove math/php52-gmp portrevision
Fix databases/php52-dba patch (now supports BDB 5.0)
Remove databases/php52-sybase_ct patch (already solved upstream)

Tested building all extensions and using all flags.
>How-To-Repeat:
>Fix:
Index: ports/databases/php5-dba/files/patch-config.m4
===================================================================
RCS file: /home/pcvs/ports/databases/php5-dba/files/patch-config.m4,v
retrieving revision 1.8
diff -u -r1.8 patch-config.m4
--- ports/databases/php5-dba/files/patch-config.m4	11 Dec 2008 12:03:09 -0000	1.8
+++ ports/databases/php5-dba/files/patch-config.m4	26 Jul 2010 11:15:49 -0000
@@ -1,9 +1,17 @@
---- config.m4.orig	2007-12-06 15:17:43.000000000 +0100
-+++ config.m4	2008-12-11 12:50:27.000000000 +0100
-@@ -280,6 +280,34 @@
+--- config.m4.orig	2010-07-26 12:36:14.131663932 +0200
++++ config.m4	2010-07-26 12:38:04.732886873 +0200
+@@ -285,6 +285,42 @@
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/db4/db.h
        break
++    elif test -f "$i/include/db50/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db50/db.h
++      break
++    elif test -f "$i/include/db48/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db48/db.h
++      break
 +    elif test -f "$i/include/db47/db.h"; then
 +      THIS_PREFIX=$i
 +      THIS_INCLUDE=$i/include/db47/db.h
@@ -32,15 +40,6 @@
 +      THIS_PREFIX=$i
 +      THIS_INCLUDE=$i/include/db41/db.h
 +      break
-     elif test -f "$i/include/db4.6/db.h"; then
+     elif test -f "$i/include/db5.0/db.h"; then
        THIS_PREFIX=$i
-       THIS_INCLUDE=$i/include/db4.6/db.h
-@@ -306,7 +334,7 @@
-       break
-     fi
-   done
--  PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+  PHP_DBA_DB_CHECK(4, db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
- fi
- PHP_DBA_STD_RESULT(db4,Berkeley DB4)
- 
+       THIS_INCLUDE=$i/include/db5.0/db.h
Index: ports/databases/php5-mysqli/Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/php5-mysqli/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- ports/databases/php5-mysqli/Makefile	19 Jul 2004 08:54:21 -0000	1.1
+++ ports/databases/php5-mysqli/Makefile	26 Jul 2010 11:15:49 -0000
@@ -11,4 +11,6 @@
 
 PKGNAMESUFFIX=	-mysqli
 
+CFLAGS+=	-DHAVE_ULONG
+
 .include "${MASTERDIR}/Makefile"
Index: ports/databases/php5-sybase_ct/files/patch-config.m4
===================================================================
RCS file: ports/databases/php5-sybase_ct/files/patch-config.m4
diff -N ports/databases/php5-sybase_ct/files/patch-config.m4
--- ports/databases/php5-sybase_ct/files/patch-config.m4	26 Mar 2009 09:40:22 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- config.m4.orig	2009-03-26 09:53:49.000000000 +0100
-+++ config.m4	2009-03-26 09:55:35.000000000 +0100
-@@ -31,7 +31,7 @@
-   fi
-   
-   PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
--  if test -f $SYBASE_CT_INCDIR/tds.h; then
-+  if test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
-     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
-     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-   else
Index: ports/lang/php5/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/php5/Makefile,v
retrieving revision 1.148
diff -u -r1.148 Makefile
--- ports/lang/php5/Makefile	25 Jun 2010 07:44:18 -0000	1.148
+++ ports/lang/php5/Makefile	26 Jul 2010 11:15:49 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.3.2
-PORTREVISION?=	1
+PORTVERSION=	5.3.3
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
@@ -32,12 +31,14 @@
 		--enable-libxml \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-pcre-regex=${LOCALBASE} \
-		--program-prefix=""
+		--program-prefix="" \
+		--localstatedir=/var
 
 USE_GNOME=	libxml2
 
 OPTIONS=	CLI "Build CLI version" on \
 		CGI "Build CGI version" on \
+		FPM "Enable fastcgi process manager" on \
 		APACHE "Build Apache module" off \
 		DEBUG "Enable debug" off \
 		SUHOSIN "Enable Suhosin protection system" on \
@@ -54,8 +55,29 @@
 
 PATCH_DIST_STRIP=	-p1
 
+.if !defined(WITHOUT_FPM)
+LIB_DEPENDS+=	event-1.4:${PORTSDIR}/devel/libevent
+MAN1+=		php-fpm.1
+PHP_FPM_USER?=	www
+PHP_FPM_GROUP?=	www
+PHP_FPM_PID?=	/var/run/php-fpm.pid
+PHP_FPM_LOG?=	/var/log/php-fpm.log
+USE_RC_SUBR+=	php-fpm
+SUB_LIST+=	PHP_FPM_PID=${PHP_FPM_PID}
+PLIST_SUB+=	FPM="" \
+		PHP_FPM_PID=${PHP_FPM_PID} \
+		PHP_FPM_LOG=${PHP_FPM_LOG}
+
+CONFIGURE_ARGS+=	--enable-fpm \
+			--with-fpm-user=${PHP_FPM_USER} \
+			--with-fpm-group=${PHP_FPM_GROUP} \
+			--with-libevent-dir=${LOCALBASE}
+.else
+PLIST_SUB+=     FPM="@comment "
+.endif
+
 .if !defined(WITHOUT_SUHOSIN)
-PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.9.1.patch.gz:suhosin
+PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin
 PATCH_SITES+=	http://download.suhosin.org/:suhosin
 PLIST_SUB+=	SUHOSIN=""
 .else
@@ -63,7 +85,7 @@
 .endif
 
 .if defined(WITH_MAILHEAD)
-PATCHFILES+=	php-${PORTVERSION}-mail-header.patch:mail
+PATCHFILES+=	php-5.3.2-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
@@ -139,6 +161,11 @@
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
+.if !defined(WITHOUT_FPM)
+	@${REINPLACE_CMD} -e 's|;pid =.*|pid = ${PHP_FPM_PID}|g' \
+		-e 's|;error_log =.*|error_log = ${PHP_FPM_LOG}|g' \
+		${WRKSRC}/sapi/fpm/php-fpm.conf.in
+.endif
 
 pre-configure:
 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
@@ -157,6 +184,9 @@
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-production ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
+.if !defined(WITHOUT_FPM)
+	@cd ${PREFIX}/etc && ${CP} -n php-fpm.conf.default php-fpm.conf
+.endif
 .if defined(WITH_APACHE)
 	@${CAT} ${PKGMESSAGE}
 .endif
Index: ports/lang/php5/distinfo
===================================================================
RCS file: /home/pcvs/ports/lang/php5/distinfo,v
retrieving revision 1.47
diff -u -r1.47 distinfo
--- ports/lang/php5/distinfo	9 Apr 2010 09:34:41 -0000	1.47
+++ ports/lang/php5/distinfo	26 Jul 2010 11:15:49 -0000
@@ -1,9 +1,9 @@
-MD5 (php-5.3.2.tar.bz2) = 46f500816125202c48a458d0133254a4
-SHA256 (php-5.3.2.tar.bz2) = 9a380a574adcb3a9abe3226e7c3a9bae619e8a1b90842ec2a7edf0ad92afdeda
-SIZE (php-5.3.2.tar.bz2) = 10477662
-MD5 (suhosin-patch-5.3.2-0.9.9.1.patch.gz) = 4647b05330862d6a1fc4469245cc6ade
-SHA256 (suhosin-patch-5.3.2-0.9.9.1.patch.gz) = a61f081022888bf78997e434744d6c0604194c73a00e70c1165524a0a6329de2
-SIZE (suhosin-patch-5.3.2-0.9.9.1.patch.gz) = 40847
+MD5 (php-5.3.3.tar.bz2) = 21ceeeb232813c10283a5ca1b4c87b48
+SHA256 (php-5.3.3.tar.bz2) = f2876750f3c54854a20e26a03ca229f2fbf89b8ee6176b9c0586cb9b2f0b3f9a
+SIZE (php-5.3.3.tar.bz2) = 10662227
+MD5 (suhosin-patch-5.3.3-0.9.10.patch.gz) = b66b27c43b1332400ef8982944c3b95b
+SHA256 (suhosin-patch-5.3.3-0.9.10.patch.gz) = f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c
+SIZE (suhosin-patch-5.3.3-0.9.10.patch.gz) = 41298
 MD5 (php-5.3.2-mail-header.patch) = 012d8c4637422e724d5559513fcaaacb
 SHA256 (php-5.3.2-mail-header.patch) = 3c9faeef9080330a23286f787efec8489587c619d8910d70926359f1a9306d6c
 SIZE (php-5.3.2-mail-header.patch) = 3350
Index: ports/lang/php5/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/lang/php5/pkg-plist,v
retrieving revision 1.31
diff -u -r1.31 pkg-plist
--- ports/lang/php5/pkg-plist	10 May 2010 06:03:31 -0000	1.31
+++ ports/lang/php5/pkg-plist	26 Jul 2010 11:15:49 -0000
@@ -1,7 +1,11 @@
 %%CLI%%bin/php
 %%CGI%%bin/php-cgi
+%%FPM%%sbin/php-fpm
 bin/php-config
 bin/phpize
+%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi
+%%FPM%%etc/php-fpm.conf.default
+%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
 etc/php.conf
 etc/php.ini-development
 etc/php.ini-production
Index: ports/lang/php5/files/php-fpm.in
===================================================================
RCS file: ports/lang/php5/files/php-fpm.in
diff -N ports/lang/php5/files/php-fpm.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ports/lang/php5/files/php-fpm.in	26 Jul 2010 11:15:49 -0000
@@ -0,0 +1,59 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/lang/php52/files/php-fpm.in,v 1.1 2010/06/16 10:12:36 mm Exp $
+#
+
+# 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=`set_rcvar`
+
+extra_commands="reload logrotate"
+
+command="%%PREFIX%%/sbin/php-fpm"
+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=""}
+
+if [ -n "${php_fpm_config}" ]; then
+	required_files="${php_fpm_config}"
+	command_args="--fpm-config ${php_fpm_config}"
+else
+	required_files="%%PREFIX%%/etc/php-fpm.conf"
+fi
+
+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"
Index: ports/math/php5-gmp/Makefile
===================================================================
RCS file: /home/pcvs/ports/math/php5-gmp/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ports/math/php5-gmp/Makefile	19 Apr 2010 10:43:35 -0000	1.4
+++ ports/math/php5-gmp/Makefile	26 Jul 2010 11:15:49 -0000
@@ -5,7 +5,6 @@
 # $FreeBSD: ports/math/php5-gmp/Makefile,v 1.4 2010/04/19 10:43:35 ale Exp $
 #
 
-PORTREVISION=	1
 CATEGORIES=	math
 
 MASTERDIR=	${.CURDIR}/../../lang/php5
>Release-Note:
>Audit-Trail:
>Unformatted: