From fcaa6546997686bcd20d93be8a3e5b9dd0037e07 Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 13 Jan 2012 17:59:07 +0000 Subject: [PATCH] - set SHARED_ONLY and roll PFRAG.shared-main into PLIST-main - uncomment a couple of lines in the default php-fpm.conf so you don't have to make any changes before it will start up - add missing crypt_blowfish.h header to PLIST-main ok robert@ --- lang/php/5.2/Makefile | 4 ++-- lang/php/5.2/pkg/PFRAG.shared-main | 2 -- lang/php/5.2/pkg/PLIST-main | 4 ++-- lang/php/5.3/Makefile | 4 ++-- .../5.3/patches/patch-sapi_fpm_php-fpm_conf_in | 18 ++++++++++++++++++ lang/php/5.3/pkg/PFRAG.shared-main | 2 -- lang/php/5.3/pkg/PLIST-main | 5 +++-- lang/php/Makefile.inc | 4 +++- 8 files changed, 30 insertions(+), 13 deletions(-) delete mode 100644 lang/php/5.2/pkg/PFRAG.shared-main create mode 100644 lang/php/5.3/patches/patch-sapi_fpm_php-fpm_conf_in delete mode 100644 lang/php/5.3/pkg/PFRAG.shared-main diff --git a/lang/php/5.2/Makefile b/lang/php/5.2/Makefile index fd0e8f46379..96560f75d48 100644 --- a/lang/php/5.2/Makefile +++ b/lang/php/5.2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2011/09/16 10:31:21 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2012/01/13 17:59:07 sthen Exp $ # doesn't set USE_LIBTOOL but use the bundled one because it needs some # specific options we don't have. @@ -9,7 +9,7 @@ SUHOSIN_PHPV= 5.2.16 SUHOSIN_P_V= 0.9.7 REVISION= 4 -REVISION-main= 6 +REVISION-main= 7 REVISION-fastcgi= 7 REVISION-gd= 5 diff --git a/lang/php/5.2/pkg/PFRAG.shared-main b/lang/php/5.2/pkg/PFRAG.shared-main deleted file mode 100644 index 1cc47ac64a3..00000000000 --- a/lang/php/5.2/pkg/PFRAG.shared-main +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared-main,v 1.1.1.1 2010/06/27 20:28:44 robert Exp $ -lib/php-${PV}/libphp5.so diff --git a/lang/php/5.2/pkg/PLIST-main b/lang/php/5.2/pkg/PLIST-main index 00bace399aa..690e321ba51 100644 --- a/lang/php/5.2/pkg/PLIST-main +++ b/lang/php/5.2/pkg/PLIST-main @@ -1,11 +1,10 @@ -@comment $OpenBSD: PLIST-main,v 1.5 2011/07/14 12:40:48 robert Exp $ +@comment $OpenBSD: PLIST-main,v 1.6 2012/01/13 17:59:08 sthen Exp $ @option no-default-conflict @conflict php->=5.2,<5.3 @conflict php5-core->=5.2 @pkgpath lang/php/5.2 @pkgpath www/php5/core,-main @pkgpath www/php5/extensions,-mbstring -%%SHARED%% @exec install -d ${SYSCONFDIR}/php-${PV}/ @exec install -d ${SYSCONFDIR}/php-${PV}.sample/ !%%no_suhosin%% @@ -22,6 +21,7 @@ bin/php-config-${PV} bin/phpize-${PV} lib/php-${PV}/ +lib/php-${PV}/libphp5.so lib/php-${PV}/modules/ @man man/man1/php-${PV}.1 @man man/man1/php-config-${PV}.1 diff --git a/lang/php/5.3/Makefile b/lang/php/5.3/Makefile index cb801c86e70..1444ebb2c01 100644 --- a/lang/php/5.3/Makefile +++ b/lang/php/5.3/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.17 2011/11/17 12:52:27 robert Exp $ +# $OpenBSD: Makefile,v 1.18 2012/01/13 17:59:08 sthen Exp $ PV= 5.3 V= ${PV}.8 SUHOSIN_PHPV= ${V} SUHOSIN_P_V= 0.9.10 -REVISION = 0 +REVISION = 1 INI_TEMPLATES= development production diff --git a/lang/php/5.3/patches/patch-sapi_fpm_php-fpm_conf_in b/lang/php/5.3/patches/patch-sapi_fpm_php-fpm_conf_in new file mode 100644 index 00000000000..ec35b7f15b8 --- /dev/null +++ b/lang/php/5.3/patches/patch-sapi_fpm_php-fpm_conf_in @@ -0,0 +1,18 @@ +$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.1 2012/01/13 17:59:08 sthen Exp $ +--- sapi/fpm/php-fpm.conf.in.orig.port Mon Jul 4 22:22:56 2011 ++++ sapi/fpm/php-fpm.conf.in Fri Jan 13 00:28:10 2012 +@@ -168,12 +168,12 @@ pm.max_children = 50 + ; The desired minimum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.min_spare_servers = 5 ++pm.min_spare_servers = 5 + + ; The desired maximum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.max_spare_servers = 35 ++pm.max_spare_servers = 35 + + ; The number of requests each child process should execute before respawning. + ; This can be useful to work around memory leaks in 3rd party libraries. For diff --git a/lang/php/5.3/pkg/PFRAG.shared-main b/lang/php/5.3/pkg/PFRAG.shared-main deleted file mode 100644 index 120a5fb3d38..00000000000 --- a/lang/php/5.3/pkg/PFRAG.shared-main +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared-main,v 1.1.1.1 2010/06/27 20:28:45 robert Exp $ -lib/php-${PV}/libphp5.so diff --git a/lang/php/5.3/pkg/PLIST-main b/lang/php/5.3/pkg/PLIST-main index 2a1b777214a..49e4d93168d 100644 --- a/lang/php/5.3/pkg/PLIST-main +++ b/lang/php/5.3/pkg/PLIST-main @@ -1,10 +1,9 @@ -@comment $OpenBSD: PLIST-main,v 1.6 2011/07/14 12:40:48 robert Exp $ +@comment $OpenBSD: PLIST-main,v 1.7 2012/01/13 17:59:08 sthen Exp $ @option no-default-conflict @conflict php->=5.3,<5.4 @conflict php5-core->=5.2 @conflict php5-core-fastcgi->=5.2 @pkgpath lang/php/5.3 -%%SHARED%% @exec install -d ${SYSCONFDIR}/php-${PV}/ @exec install -d ${SYSCONFDIR}/php-${PV}.sample/ !%%no_suhosin%% @@ -21,6 +20,7 @@ bin/php-config-${PV} bin/phpize-${PV} lib/php-${PV}/ +lib/php-${PV}/libphp5.so lib/php-${PV}/modules/ @man man/man1/php-${PV}.1 @man man/man1/php-config-${PV}.1 @@ -266,6 +266,7 @@ share/php-${PV}/include/ext/standard/crc32.h share/php-${PV}/include/ext/standard/credits.h share/php-${PV}/include/ext/standard/credits_ext.h share/php-${PV}/include/ext/standard/credits_sapi.h +share/php-${PV}/include/ext/standard/crypt_blowfish.h share/php-${PV}/include/ext/standard/crypt_freesec.h share/php-${PV}/include/ext/standard/css.h share/php-${PV}/include/ext/standard/cyr_convert.h diff --git a/lang/php/Makefile.inc b/lang/php/Makefile.inc index 1278f1d50c5..0bec0ac0a63 100644 --- a/lang/php/Makefile.inc +++ b/lang/php/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.23 2011/11/17 12:52:27 robert Exp $ +# $OpenBSD: Makefile.inc,v 1.24 2012/01/13 17:59:07 sthen Exp $ # This port currently only works with archs supporting dynamic loading # and has Apache that supports DSO's. @@ -36,6 +36,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +SHARED_ONLY= Yes + MODPHP_CONFIG_PATH= /var/www/conf # where the main php module is stored (outside the chroot)