Attachment #111913 for bug #153250

View | Details | Raw Unified | Return to bug 153250
Collapse All | Expand All




#

PORTNAME=	php5
PORTVERSION=	5.3.4
PORTREVISION?=	2
CATEGORIES?=	lang devel www
MASTER_SITES=	${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR=	distributions

PATCH_DIST_STRIP=	-p1

.if !defined(WITHOUT_SUHOSIN)
PATCHFILES+=	suhosin-patch-5.3.3-0.9.10.patch.gz:suhosin
PATCH_SITES+=	http://download.suhosin.org/:suhosin
PLIST_SUB+=	SUHOSIN=""
.else


.if defined(WITH_FPM)
PHP_SAPI+=	fpm
MAN8+=		php-fpm.8
MAN1+=		php-fpm.1
USE_RC_SUBR+=	php-fpm
CONFIGURE_ARGS+=--enable-fpm \
		--with-fpm-user=${WWWOWN} \
		--with-fpm-group=${WWWGRP}
		--with-libevent-dir=${LOCALBASE}
PLIST_SUB+=	FPM=""
.else
PLIST_SUB+=	FPM="@comment "

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-*

Lines 1-9 Link Here

(-)distinfo (-7 / +4 lines)
1	MD5 (php-5.3.3.tar.bz2) = 21ceeeb232813c10283a5ca1b4c87b48	1	SHA256 (php-5.3.4.tar.bz2) = a832831185b1652d1adf7ff92864b2a65153853ee5999dafcd6c1ee657f4218d
2	SHA256 (php-5.3.3.tar.bz2) = f2876750f3c54854a20e26a03ca229f2fbf89b8ee6176b9c0586cb9b2f0b3f9a	2	SIZE (php-5.3.4.tar.bz2) = 10804376
3	SIZE (php-5.3.3.tar.bz2) = 10662227
4	MD5 (suhosin-patch-5.3.3-0.9.10.patch.gz) = b66b27c43b1332400ef8982944c3b95b
5	SHA256 (suhosin-patch-5.3.3-0.9.10.patch.gz) = f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c	3	SHA256 (suhosin-patch-5.3.3-0.9.10.patch.gz) = f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c
6	SIZE (suhosin-patch-5.3.3-0.9.10.patch.gz) = 41298	4	SIZE (suhosin-patch-5.3.3-0.9.10.patch.gz) = 41298
7	MD5 (php-5.3.3-mail-header.patch) = 6d33b0c9d1ab3b07fcd2ebeeb97495a9	5	SHA256 (php-5.3.4-mail-header.patch) = b360a9719151d43a34e46ac8e0c7631fef7f24647d22b186ddc89bf050beaa02
8	SHA256 (php-5.3.3-mail-header.patch) = 4057b0246246763ca41fd04c6f2cd8396c2aaa396d08ea3c95027df43045c2e8	6	SIZE (php-5.3.4-mail-header.patch) = 3350
9	SIZE (php-5.3.3-mail-header.patch) = 3350




--- 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="-I$abs_srcdir/sapi/fpm"
 
-  SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
-  PHP_SUBST(SAPI_EXTRA_LIBS)
- 
-  INSTALL_IT=":"
+  FPM_EXTRA_LIBS="$LIBEVENT_LIBS"
+  PHP_SUBST(FPM_EXTRA_LIBS)
+
+  if test "$PHP_SAPI" = "default"; then
+    PHP_SAPI="fpm"

   PHP_FPM_FILES="fpm/fastcgi.c \
     fpm/fpm.c \
     fpm/fpm_children.c \
@@ -419,7 +421,8 @@
     fpm/zlog.c \
   "
 

 
   case $host_alias in
       *aix*)
@@ -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)"
       ;;
       *)

Return to bug 153250

Lines 6-13 Link Here

(-)Makefile (-7 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= php5	8	PORTNAME= php5
9	PORTVERSION= 5.3.3	9	PORTVERSION= 5.3.4
10	PORTREVISION?= 2
11	CATEGORIES?= lang devel www	10	CATEGORIES?= lang devel www
12	MASTER_SITES= ${MASTER_SITE_PHP}	11	MASTER_SITES= ${MASTER_SITE_PHP}
13	MASTER_SITE_SUBDIR= distributions	12	MASTER_SITE_SUBDIR= distributions
Lines 59-65 Link Here
59	PATCH_DIST_STRIP= -p1	58	PATCH_DIST_STRIP= -p1
60		59
61	.if !defined(WITHOUT_SUHOSIN)	60	.if !defined(WITHOUT_SUHOSIN)
62	PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin	61	PATCHFILES+= suhosin-patch-5.3.3-0.9.10.patch.gz:suhosin
63	PATCH_SITES+= http://download.suhosin.org/:suhosin	62	PATCH_SITES+= http://download.suhosin.org/:suhosin
64	PLIST_SUB+= SUHOSIN=""	63	PLIST_SUB+= SUHOSIN=""
65	.else	64	.else
Lines 90-102 Link Here
90		89
91	.if defined(WITH_FPM)	90	.if defined(WITH_FPM)
92	PHP_SAPI+= fpm	91	PHP_SAPI+= fpm
93	LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent	92	MAN8+= php-fpm.8
94	MAN1+= php-fpm.1
95	USE_RC_SUBR+= php-fpm	93	USE_RC_SUBR+= php-fpm
96	CONFIGURE_ARGS+=--enable-fpm \	94	CONFIGURE_ARGS+=--enable-fpm \
97	--with-fpm-user=${WWWOWN} \	95	--with-fpm-user=${WWWOWN} \
98	--with-fpm-group=${WWWGRP} \	96	--with-fpm-group=${WWWGRP}
99	--with-libevent-dir=${LOCALBASE}
100	PLIST_SUB+= FPM=""	97	PLIST_SUB+= FPM=""
101	.else	98	.else
102	PLIST_SUB+= FPM="@comment "	99	PLIST_SUB+= FPM="@comment "
Lines 159-164 Link Here
159	CONFIGURE_ARGS+=--disable-ipv6	156	CONFIGURE_ARGS+=--disable-ipv6
160	.endif	157	.endif
161		158
		159	pre-patch:
		160	# To be removed after suhosin update
		161	.if !defined(WITHOUT_SUHOSIN)
		162	@${REINPLACE_CMD} -E 's\|REPORT_ERRORS TSRMLS_CC, "%s", error\|REPORT_ERRORS TSRMLS_CC, error\|' \
		163	${WRKSRC}/ext/phar/stream.c
		164	.endif
		165
162	post-patch:	166	post-patch:
163	@${TOUCH} ${WRKSRC}/ext/php_config.h	167	@${TOUCH} ${WRKSRC}/ext/php_config.h
164	@${REINPLACE_CMD} "s\|^\(extension_dir\)\|; \1\|" ${WRKSRC}/php.ini-*	168	@${REINPLACE_CMD} "s\|^\(extension_dir\)\|; \1\|" ${WRKSRC}/php.ini-*

Lines 1-15 Link Here

(-)files/patch-sapi_fpm_config.m4 (-11 / +7 lines)
1	--- sapi/fpm/config.m4.orig 2010-06-16 10:58:42.000000000 +0200	1	--- sapi/fpm/config.m4.orig 2010-11-26 14:46:15.000000000 +0100
2	+++ sapi/fpm/config.m4 2010-07-27 13:26:02.000000000 +0200	2	+++ sapi/fpm/config.m4 2010-12-17 15:36:53.956678506 +0100
3	@@ -562,10 +562,12 @@	3	@@ -393,8 +393,10 @@
		4	fi
4		5
5	PHP_FPM_CFLAGS="$LIBEVENT_CFLAGS -I$abs_srcdir/sapi/fpm"	6	PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
6
7	- SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
8	- PHP_SUBST(SAPI_EXTRA_LIBS)
9	-	7	-
10	- INSTALL_IT=":"	8	- INSTALL_IT=":"
11	+ FPM_EXTRA_LIBS="$LIBEVENT_LIBS"
12	+ PHP_SUBST(FPM_EXTRA_LIBS)
13	+	9	+
14	+ if test "$PHP_SAPI" = "default"; then	10	+ if test "$PHP_SAPI" = "default"; then
15	+ PHP_SAPI="fpm"	11	+ PHP_SAPI="fpm"
Lines 17-23 Link Here
17	PHP_FPM_FILES="fpm/fastcgi.c \	13	PHP_FPM_FILES="fpm/fastcgi.c \
18	fpm/fpm.c \	14	fpm/fpm.c \
19	fpm/fpm_children.c \	15	fpm/fpm_children.c \
20	@@ -590,7 +592,8 @@	16	@@ -419,7 +421,8 @@
21	fpm/zlog.c \	17	fpm/zlog.c \
22	"	18	"
23		19
Lines 27-33 Link Here
27		23
28	case $host_alias in	24	case $host_alias in
29	aix)	25	aix)
30	@@ -600,11 +603,19 @@	26	@@ -429,11 +432,19 @@
31	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)"	27	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)"
32	;;	28	;;
33	*)	29	*)