aboutsummaryrefslogtreecommitdiff
path: root/lang/php5
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2006-09-04 07:59:15 +0000
committerAlex Dupre <ale@FreeBSD.org>2006-09-04 07:59:15 +0000
commit22d7767b09faaf3c56940f3ec68360257a326124 (patch)
tree8ffabc73629a8566585c81e0821846faf555d8ff /lang/php5
parenta6f2efcf0dcba2fe38b6b8f8dd8e75eba00a7c21 (diff)
downloadports-22d7767b09faaf3c56940f3ec68360257a326124.tar.gz
ports-22d7767b09faaf3c56940f3ec68360257a326124.zip
Notes
Diffstat (limited to 'lang/php5')
-rw-r--r--lang/php5/Makefile19
-rw-r--r--lang/php5/distinfo3
-rw-r--r--lang/php5/pkg-plist2
3 files changed, 15 insertions, 9 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index c3d59ea89543..7463be61d695 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -43,6 +43,7 @@ OPTIONS= CLI "Build CLI version" on \
CGI "Build CGI version" on \
APACHE "Build Apache module" off \
DEBUG "Enable debug" off \
+ SUHOSIN "Enable Suhosin protection system" off \
MULTIBYTE "Enable zend multibyte support" off \
IPV6 "Enable ipv6 support" on \
REDIRECT "Enable force-cgi-redirect support (CGI only)" off \
@@ -56,17 +57,21 @@ MAN1= php-config.1 phpize.1
.include <bsd.port.pre.mk>
+.if defined(WITH_SUHOSIN)
+PATCHFILES= suhosin-patch-${PORTVERSION}-0.9.2.patch.gz
+PATCH_SITES= http://www.hardened-php.net/suhosin/_media/
+PATCH_DIST_STRIP= -p1
+PLIST_SUB+= SUHOSIN=""
+.else
+PLIST_SUB+= SUHOSIN="@comment "
+.endif
+
.if !defined(WITHOUT_CLI)
PHP_SAPI+= cli
PLIST_SUB+= CLI=""
MAN1+= php.1
.else
-# XXX Temporary hack
-.if !defined(WITHOUT_CGI)
-PLIST_SUB+= CLI=""
-.else
PLIST_SUB+= CLI="@comment "
-.endif
CONFIGURE_ARGS+=--disable-cli
.endif
@@ -158,10 +163,6 @@ post-install:
@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
-# XXX Temporary hack
-.if !defined(WITHOUT_CGI) && defined(WITHOUT_CLI)
- @${LN} -sf ${PREFIX}/bin/php-cgi ${PREFIX}/bin/php
-.endif
.if defined(WITH_APACHE)
@${CAT} ${PKGMESSAGE}
.endif
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 1c08ffcdcbc9..54d475e021a7 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,3 +1,6 @@
MD5 (php-5.1.6.tar.bz2) = 08e423aa314369d4392a36b3f7246afc
SHA256 (php-5.1.6.tar.bz2) = 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
SIZE (php-5.1.6.tar.bz2) = 6454408
+MD5 (suhosin-patch-5.1.6-0.9.2.patch.gz) = 24d216ed77c3c981b11b153af3edfa87
+SHA256 (suhosin-patch-5.1.6-0.9.2.patch.gz) = fee25c7a1060f9c35327757ff5bb2603ebc8ac18f4dfd3b845fecb5146bf289b
+SIZE (suhosin-patch-5.1.6-0.9.2.patch.gz) = 15239
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index b7d6a7f1d9c7..71581f46b63d 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -180,6 +180,8 @@ include/php/main/streams/php_streams_int.h
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
+%%SUHOSIN%%include/php/main/suhosin_globals.h
+%%SUHOSIN%%include/php/main/suhosin_patch.h
include/php/main/win95nt.h
include/php/regex/cclass.h
include/php/regex/cname.h