So I regenerated the suhosin patch against PHP 5.3.19; here's a port update, also including the change to not build ap2 flavours of the extension modules.
Just running it locally with roundcube on amd64 so far, more tests definitely wanted... Index: Makefile.inc =================================================================== RCS file: /cvs/ports/lang/php/Makefile.inc,v retrieving revision 1.33 diff -u -p -r1.33 Makefile.inc --- Makefile.inc 27 Sep 2012 16:45:51 -0000 1.33 +++ Makefile.inc 26 Nov 2012 22:22:43 -0000 @@ -25,7 +25,8 @@ MASTER_SITES= http://se.php.net/distrib http://us.php.net/distributions/ \ http://no.php.net/distributions/ \ http://uk.php.net/distributions/ -MASTER_SITES0= http://download.suhosin.org/ \ +MASTER_SITES0= http://spacehopper.org/mirrors/ \ + http://download.suhosin.org/ \ http://blade2k.humppa.hu/ \ ${_MASTER_SITE_FREEBSD} @@ -346,6 +347,9 @@ DESCR-${i}= ${.CURDIR}/../files/DESCR-$ MESSAGE-${i}= ${.CURDIR}/../files/MESSAGE-ext UNMESSAGE-${i}= ${.CURDIR}/../files/UNMESSAGE-ext PKGNAME-${i}= php-${i}-${V} +# don't build separate plugins for -ap2 +FULLPKGNAME-${i}= php-${i}-${V}${FLAVOR_EXT:S/-ap2//} +FULLPKGPATH-${i}= ${PKGPATH},-${i}${FLAVOR_EXT:S/-ap2//:S/-/,/g} .if ${V:M5.2*} PKGSPEC-${i}= php-${i}->=5.2,<5.3 .else if ${V:M5.3*} Index: 5.2/Makefile =================================================================== RCS file: /cvs/ports/lang/php/5.2/Makefile,v retrieving revision 1.31 diff -u -p -r1.31 Makefile --- 5.2/Makefile 27 Sep 2012 16:45:51 -0000 1.31 +++ 5.2/Makefile 26 Nov 2012 22:22:43 -0000 @@ -41,4 +41,9 @@ CONFIGURE_ARGS+= --with-sybase-ct LIB_DEPENDS-sybase_ct= databases/freetds WANTLIB-sybase_ct= c ct pthread +.include <bsd.port.arch.mk> +.if ${FLAVOR:L:Map2} +BUILD_PACKAGES := ${BUILD_PACKAGES:N-fastcgi} +.endif + .include <bsd.port.mk> Index: 5.3/Makefile =================================================================== RCS file: /cvs/ports/lang/php/5.3/Makefile,v retrieving revision 1.42 diff -u -p -r1.42 Makefile --- 5.3/Makefile 24 Oct 2012 07:58:48 -0000 1.42 +++ 5.3/Makefile 26 Nov 2012 22:22:43 -0000 @@ -3,12 +3,9 @@ BROKEN-hppa = no __sync_bool_compare_and_swap support nor asm fallback PV= 5.3 -V= ${PV}.17 -SUHOSIN_PHPV= 5.3.9 -SUHOSIN_P_V= 0.9.10 - -REVISION-main= 0 -REVISION-imap= 0 +V= ${PV}.19 +SUHOSIN_PHPV= 5.3.19 +SUHOSIN_P_V= 0.9.10unofficial INI_TEMPLATES= development production @@ -31,5 +28,10 @@ COMMENT-pcntl= PCNTL extensions for php CONFIGURE_ARGS+= --enable-pcntl=shared LIB_DEPENDS-pcntl= WANTLIB-pcntl= c pthread + +.include <bsd.port.arch.mk> +.if ${FLAVOR:L:Map2} +BUILD_PACKAGES := ${BUILD_PACKAGES:N-fpm:N-fastcgi} +.endif .include <bsd.port.mk> Index: 5.3/distinfo =================================================================== RCS file: /cvs/ports/lang/php/5.3/distinfo,v retrieving revision 1.16 diff -u -p -r1.16 distinfo --- 5.3/distinfo 25 Sep 2012 20:16:08 -0000 1.16 +++ 5.3/distinfo 26 Nov 2012 22:22:43 -0000 @@ -1,6 +1,6 @@ -SHA256 (php-5.3.17.tar.gz) = JiIRaU0DtApN3rgmaZlJvyLX7oL1ziH6tjGZNG6imv4= +SHA256 (php-5.3.19.tar.gz) = hE6yRwFvWp52m+R9T3Fn7Pb2wPtVIHBMfotl/wGc6oc= SHA256 (suhosin-0.9.33.tgz) = hlsccrrppacQ/gsHoGNVVs5sg4ZT7DZNKipub1lFKcU= -SHA256 (suhosin-patch-5.3.9-0.9.10.patch.gz) = RDjK6rChDGyUrun36qcD9Xmfl9TgV59DqUe7cxTjgxc= -SIZE (php-5.3.17.tar.gz) = 14819748 +SHA256 (suhosin-patch-5.3.19-0.9.10unofficial.patch.gz) = Bt2K+0TloFGvm+P5I5SuSNpNgohXhPr10OoX4N1tQWY= +SIZE (php-5.3.19.tar.gz) = 14894346 SIZE (suhosin-0.9.33.tgz) = 104488 -SIZE (suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 +SIZE (suhosin-patch-5.3.19-0.9.10unofficial.patch.gz) = 41638 Index: 5.3/patches/patch-sapi_fpm_fpm_fpm_atomic_h =================================================================== RCS file: /cvs/ports/lang/php/5.3/patches/patch-sapi_fpm_fpm_fpm_atomic_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-sapi_fpm_fpm_fpm_atomic_h --- 5.3/patches/patch-sapi_fpm_fpm_fpm_atomic_h 24 Oct 2012 07:58:48 -0000 1.1 +++ 5.3/patches/patch-sapi_fpm_fpm_fpm_atomic_h 26 Nov 2012 22:22:43 -0000 @@ -3,8 +3,8 @@ $OpenBSD: patch-sapi_fpm_fpm_fpm_atomic_ Add support for mips Fix types for sparc64 ---- sapi/fpm/fpm/fpm_atomic.h.orig Fri Oct 19 11:28:28 2012 -+++ sapi/fpm/fpm/fpm_atomic.h Fri Oct 19 11:28:31 2012 +--- sapi/fpm/fpm/fpm_atomic.h.orig.port Wed Nov 21 20:07:23 2012 ++++ sapi/fpm/fpm/fpm_atomic.h Fri Nov 23 15:40:43 2012 @@ -77,10 +77,10 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l } /* }}} */
