6 files changed, 48 insertions, 54 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 046e429e1800..b61a60f09e68 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.3.3
-PORTREVISION?=	2
+PORTVERSION=	5.3.4
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
@@ -59,7 +59,8 @@ MAN1=		php-config.1 phpize.1
 PATCH_DIST_STRIP=	-p1
 
 .if !defined(WITHOUT_SUHOSIN)
-PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin
+#PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin
+PATCHFILES+=	suhosin-patch-5.3.3-0.9.10.patch.gz:suhosin
 PATCH_SITES+=	http://download.suhosin.org/:suhosin
 PLIST_SUB+=	SUHOSIN=""
 .else
@@ -90,13 +91,11 @@ CONFIGURE_ARGS+=--disable-cgi
 
 .if defined(WITH_FPM)
 PHP_SAPI+=	fpm
-LIB_DEPENDS+=	event-1.4:${PORTSDIR}/devel/libevent
 MAN1+=		php-fpm.1
 USE_RC_SUBR+=	php-fpm
 CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
-		--with-fpm-group=${WWWGRP} \
-		--with-libevent-dir=${LOCALBASE}
+		--with-fpm-group=${WWWGRP}
 PLIST_SUB+=	FPM=""
 .else
 PLIST_SUB+=	FPM="@comment "
@@ -159,6 +158,13 @@ CONFIGURE_ARGS+=--enable-zend-multibyte
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
+pre-patch:
+# To be removed after suhosin update
+.if !defined(WITHOUT_SUHOSIN)
+	@${REINPLACE_CMD} -E 's|REPORT_ERRORS TSRMLS_CC, "%s", error|REPORT_ERRORS TSRMLS_CC, error|' \
+		${WRKSRC}/ext/phar/stream.c
+.endif
+
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 05694f045b2a..f2bedddcb80e 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,9 +1,6 @@
-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 (php-5.3.4.tar.bz2) = a832831185b1652d1adf7ff92864b2a65153853ee5999dafcd6c1ee657f4218d
+SIZE (php-5.3.4.tar.bz2) = 10804376
 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.3-mail-header.patch) = 6d33b0c9d1ab3b07fcd2ebeeb97495a9
-SHA256 (php-5.3.3-mail-header.patch) = 4057b0246246763ca41fd04c6f2cd8396c2aaa396d08ea3c95027df43045c2e8
-SIZE (php-5.3.3-mail-header.patch) = 3350
+SHA256 (php-5.3.4-mail-header.patch) = b360a9719151d43a34e46ac8e0c7631fef7f24647d22b186ddc89bf050beaa02
+SIZE (php-5.3.4-mail-header.patch) = 3350
diff --git a/lang/php5/files/patch-sapi_fpm_config.m4 b/lang/php5/files/patch-sapi_fpm_config.m4
index 91c8744adede..66e5c74fe0c1 100644
--- a/lang/php5/files/patch-sapi_fpm_config.m4
+++ b/lang/php5/files/patch-sapi_fpm_config.m4
@@ -1,23 +1,17 @@
---- 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 @@
+--- sapi/fpm/config.m4.orig	2010-11-26 14:46:15.000000000 +0100
++++ sapi/fpm/config.m4	2010-12-17 15:22:19.000000000 +0100
+@@ -394,7 +394,9 @@
    
-   PHP_FPM_CFLAGS="$LIBEVENT_CFLAGS -I$abs_srcdir/sapi/fpm"
- 
--  SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
--  PHP_SUBST(SAPI_EXTRA_LIBS)
-- 
+   PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
+  
 -  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 @@
+@@ -419,7 +421,8 @@
      fpm/zlog.c \
    "
  
@@ -27,12 +21,12 @@
  
    case $host_alias in
        *aix*)
-@@ -600,11 +603,19 @@
+@@ -429,11 +432,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)"
++        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) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
        ;;
    esac
  
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 046e429e1800..b61a60f09e68 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.3.3
-PORTREVISION?=	2
+PORTVERSION=	5.3.4
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
@@ -59,7 +59,8 @@ MAN1=		php-config.1 phpize.1
 PATCH_DIST_STRIP=	-p1
 
 .if !defined(WITHOUT_SUHOSIN)
-PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin
+#PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin
+PATCHFILES+=	suhosin-patch-5.3.3-0.9.10.patch.gz:suhosin
 PATCH_SITES+=	http://download.suhosin.org/:suhosin
 PLIST_SUB+=	SUHOSIN=""
 .else
@@ -90,13 +91,11 @@ CONFIGURE_ARGS+=--disable-cgi
 
 .if defined(WITH_FPM)
 PHP_SAPI+=	fpm
-LIB_DEPENDS+=	event-1.4:${PORTSDIR}/devel/libevent
 MAN1+=		php-fpm.1
 USE_RC_SUBR+=	php-fpm
 CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
-		--with-fpm-group=${WWWGRP} \
-		--with-libevent-dir=${LOCALBASE}
+		--with-fpm-group=${WWWGRP}
 PLIST_SUB+=	FPM=""
 .else
 PLIST_SUB+=	FPM="@comment "
@@ -159,6 +158,13 @@ CONFIGURE_ARGS+=--enable-zend-multibyte
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
+pre-patch:
+# To be removed after suhosin update
+.if !defined(WITHOUT_SUHOSIN)
+	@${REINPLACE_CMD} -E 's|REPORT_ERRORS TSRMLS_CC, "%s", error|REPORT_ERRORS TSRMLS_CC, error|' \
+		${WRKSRC}/ext/phar/stream.c
+.endif
+
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 05694f045b2a..f2bedddcb80e 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,9 +1,6 @@
-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 (php-5.3.4.tar.bz2) = a832831185b1652d1adf7ff92864b2a65153853ee5999dafcd6c1ee657f4218d
+SIZE (php-5.3.4.tar.bz2) = 10804376
 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.3-mail-header.patch) = 6d33b0c9d1ab3b07fcd2ebeeb97495a9
-SHA256 (php-5.3.3-mail-header.patch) = 4057b0246246763ca41fd04c6f2cd8396c2aaa396d08ea3c95027df43045c2e8
-SIZE (php-5.3.3-mail-header.patch) = 3350
+SHA256 (php-5.3.4-mail-header.patch) = b360a9719151d43a34e46ac8e0c7631fef7f24647d22b186ddc89bf050beaa02
+SIZE (php-5.3.4-mail-header.patch) = 3350
diff --git a/lang/php53/files/patch-sapi_fpm_config.m4 b/lang/php53/files/patch-sapi_fpm_config.m4
index 91c8744adede..66e5c74fe0c1 100644
--- a/lang/php53/files/patch-sapi_fpm_config.m4
+++ b/lang/php53/files/patch-sapi_fpm_config.m4
@@ -1,23 +1,17 @@
---- 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 @@
+--- sapi/fpm/config.m4.orig	2010-11-26 14:46:15.000000000 +0100
++++ sapi/fpm/config.m4	2010-12-17 15:22:19.000000000 +0100
+@@ -394,7 +394,9 @@
    
-   PHP_FPM_CFLAGS="$LIBEVENT_CFLAGS -I$abs_srcdir/sapi/fpm"
- 
--  SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
--  PHP_SUBST(SAPI_EXTRA_LIBS)
-- 
+   PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
+  
 -  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 @@
+@@ -419,7 +421,8 @@
      fpm/zlog.c \
    "
  
@@ -27,12 +21,12 @@
  
    case $host_alias in
        *aix*)
-@@ -600,11 +603,19 @@
+@@ -429,11 +432,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)"
++        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) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
        ;;
    esac