From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 17 14:50:11 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B02E106566B for ; Fri, 17 Dec 2010 14:50:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2D53E8FC19 for ; Fri, 17 Dec 2010 14:50:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oBHEoBOe013590 for ; Fri, 17 Dec 2010 14:50:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oBHEoBKN013589; Fri, 17 Dec 2010 14:50:11 GMT (envelope-from gnats) Resent-Date: Fri, 17 Dec 2010 14:50:11 GMT Resent-Message-Id: <201012171450.oBHEoBKN013589@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3346A106566C; Fri, 17 Dec 2010 14:46:49 +0000 (UTC) (envelope-from mm@mail2.vx.sk) Received: from mail2.vx.sk (mail2.vx.sk [IPv6:2a01:4f8:100:84a3::3]) by mx1.freebsd.org (Postfix) with ESMTP id 6572C8FC13; Fri, 17 Dec 2010 14:46:48 +0000 (UTC) Received: from neo.vx.sk (localhost [127.0.0.1]) by mail2.vx.sk (Postfix) with ESMTP id 864AB92D7F; Fri, 17 Dec 2010 15:46:47 +0100 (CET) Received: from mail2.vx.sk ([127.0.0.1]) by neo.vx.sk (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id KoduUOKEQMn9; Fri, 17 Dec 2010 15:41:46 +0100 (CET) Received: by mail2.vx.sk (Postfix, from userid 1001) id 0520792D67; Fri, 17 Dec 2010 15:41:45 +0100 (CET) Message-Id: <20101217144146.0520792D67@mail2.vx.sk> Date: Fri, 17 Dec 2010 15:41:45 +0100 (CET) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: ale@FreeBSD.org Subject: ports/153250: [PATCH] lang/php5: update to 5.3.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Dec 2010 14:50:11 -0000 >Number: 153250 >Category: ports >Synopsis: [PATCH] lang/php5: update to 5.3.4 >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: Fri Dec 17 14:50:10 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.2-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #14 r216479M: Thu Dec 16 10:31:17 CET >Description: - Update to 5.3.4 - small pre-patch: knob to enable use of suhosin patch from 5.3.3 - php-fpm no longer uses libevent Port maintainer (ale@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- php5-5.3.4.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/lang/php5/Makefile,v retrieving revision 1.153 diff -u -r1.153 Makefile --- Makefile 4 Dec 2010 07:32:23 -0000 1.153 +++ Makefile 17 Dec 2010 14:39:44 -0000 @@ -6,8 +6,7 @@ # PORTNAME= php5 -PORTVERSION= 5.3.3 -PORTREVISION?= 2 +PORTVERSION= 5.3.4 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions @@ -59,7 +58,7 @@ PATCH_DIST_STRIP= -p1 .if !defined(WITHOUT_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 +89,11 @@ .if defined(WITH_FPM) PHP_SAPI+= fpm -LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent -MAN1+= php-fpm.1 +MAN8+= php-fpm.8 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 +156,13 @@ 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-* Index: distinfo =================================================================== RCS file: /home/pcvs/ports/lang/php5/distinfo,v retrieving revision 1.49 diff -u -r1.49 distinfo --- distinfo 25 Aug 2010 12:42:20 -0000 1.49 +++ distinfo 17 Dec 2010 14:39:44 -0000 @@ -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 Index: files/patch-sapi_fpm_config.m4 =================================================================== RCS file: /home/pcvs/ports/lang/php5/files/patch-sapi_fpm_config.m4,v retrieving revision 1.1 diff -u -r1.1 patch-sapi_fpm_config.m4 --- files/patch-sapi_fpm_config.m4 27 Jul 2010 15:13:53 -0000 1.1 +++ files/patch-sapi_fpm_config.m4 17 Dec 2010 14:39:44 -0000 @@ -1,15 +1,11 @@ ---- 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:36:53.956678506 +0100 +@@ -393,8 +393,10 @@ + fi - 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" @@ -17,7 +13,7 @@ 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,7 +23,7 @@ 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)" ;; *) --- php5-5.3.4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: