Date: Tue, 12 Mar 2013 10:33:05 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313958 - head/lang/php5 Message-ID: <201303121033.r2CAX5Is037359@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Tue Mar 12 10:33:04 2013 New Revision: 313958 URL: http://svnweb.freebsd.org/changeset/ports/313958 Log: Suhosin will never reappear, remove commented out code. Fix plist when CLI is not selected [1]. Submitted by: Gergely CZUCZY <gergely.czuczy@harmless.hu> [1] Modified: head/lang/php5/Makefile head/lang/php5/pkg-plist Modified: head/lang/php5/Makefile ============================================================================== --- head/lang/php5/Makefile Tue Mar 12 10:27:15 2013 (r313957) +++ head/lang/php5/Makefile Tue Mar 12 10:33:04 2013 (r313958) @@ -38,7 +38,7 @@ CONFIGURE_ARGS= \ USE_GNOME= libxml2 -OPTIONS_DEFINE= CLI CGI FPM APACHE AP2FILTER EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR # SUHOSIN +OPTIONS_DEFINE= CLI CGI FPM APACHE AP2FILTER EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR OPTIONS_DEFAULT=CLI CGI IPV6 LINKTHR CLI_DESC= Build CLI version @@ -47,7 +47,6 @@ FPM_DESC= Build FPM version APACHE_DESC= Build Apache module AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) EMBED_DESC= Build embedded library -SUHOSIN_DESC= Enable Suhosin protection system DEBUG_DESC= Enable debug DTRACE_DESC= Enable DTrace support IPV6_DESC= Enable ipv6 support @@ -65,14 +64,6 @@ PATCH_DIST_STRIP= -p1 PATCH_SITES+= ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR= ale -#.if ${PORT_OPTIONS:MSUHOSIN} -#PATCHFILES+= suhosin-patch-5.3.x-0.9.10.patch.gz -#PATCH_SITES+= http://download.suhosin.org/:suhosin -#PLIST_SUB+= SUHOSIN="" -#.else -PLIST_SUB+= SUHOSIN="@comment " -#.endif - .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-5.4.x-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail Modified: head/lang/php5/pkg-plist ============================================================================== --- head/lang/php5/pkg-plist Tue Mar 12 10:27:15 2013 (r313957) +++ head/lang/php5/pkg-plist Tue Mar 12 10:33:04 2013 (r313958) @@ -219,11 +219,8 @@ include/php/main/streams/php_streams_int include/php/main/streams/php_stream_transport.h include/php/main/streams/php_stream_userspace.h include/php/main/streams/php_stream_plain_wrapper.h -include/php/sapi/cli/cli.h +%%CLI%%include/php/sapi/cli/cli.h %%EMBED%%include/php/sapi/embed/php_embed.h -%%SUHOSIN%%include/php/main/suhosin_globals.h -%%SUHOSIN%%include/php/main/suhosin_logo.h -%%SUHOSIN%%include/php/main/suhosin_patch.h include/php/main/win32_internal_function_disabled.h include/php/main/win95nt.h %%EMBED%%lib/libphp5.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303121033.r2CAX5Is037359>