Attachment #81115 for bug #116188

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




#

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


PATCH_DIST_STRIP=	-p1

# XXX There is currently no suhosin patch for php 5.2.4
#.if !defined(WITHOUT_SUHOSIN)
#PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.6.2.patch.gz:suhosin
#PATCH_SITES+=	http://www.hardened-php.net/suhosin/_media/:suhosin
#PLIST_SUB+=	SUHOSIN=""
#.else
PLIST_SUB+=	SUHOSIN="@comment "
#.endif

.if defined(WITH_MAILHEAD)
PATCHFILES+=	php-${PORTVERSION}-mail-header.patch:mail

Lines 1-9 Link Here

(-)php5/distinfo (-9 / +6 lines)
1	MD5 (php-5.2.3.tar.bz2) = eb50b751c8e1ced05bd012d5a0e4dec3	1	MD5 (php-5.2.4.tar.bz2) = 55c97a671fdabf462cc7a82971a656d2
2	SHA256 (php-5.2.3.tar.bz2) = eedffda5069caa801a7fec217c77619657416a5fcaefb79ba4620432f0befe29	2	SHA256 (php-5.2.4.tar.bz2) = 502f5259e4619ba3549cd9f9bdeb4152c7effa66672348f3b108fccc8e1ca1c0
3	SIZE (php-5.2.3.tar.bz2) = 7417635	3	SIZE (php-5.2.4.tar.bz2) = 7608429
4	MD5 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = f217d04f9513222e48cea6588ac65b89	4	MD5 (php-5.2.4-mail-header.patch) = d1b5bbfe95078a367821b74fbbd45e3f
5	SHA256 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 214c43e4808483f0700f36ffa57aba909a669cb335c179d46c1e8f765d70bd1f	5	SHA256 (php-5.2.4-mail-header.patch) = c84ecc5619c900d3ec0c98fd5c09dbfb78afe572f298c00d68f9254596e6e708
6	SIZE (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 22789	6	SIZE (php-5.2.4-mail-header.patch) = 3420
7	MD5 (php-5.2.3-mail-header.patch) = c48ef565c02a2aeb6aadd3d12cea7bb8
8	SHA256 (php-5.2.3-mail-header.patch) = dc80159705c2e2806fdab1632d573218383487dce3ad5aa700e92b909dcd03e5
9	SIZE (php-5.2.3-mail-header.patch) = 3420




--- sapi/cgi/config9.m4.orig	Wed Jul 11 16:20:36 2007
+++ sapi/cgi/config9.m4	Fri Sep  7 12:54:27 2007
@@ -25,7 +25,6 @@
 dnl
 dnl CGI setup
 dnl
-if test "$PHP_SAPI" = "default"; then
   AC_MSG_CHECKING(whether to build CGI binary)
   if test "$PHP_CGI" != "no"; then
     AC_MSG_RESULT(yes)
@@ -85,8 +84,9 @@
     AC_MSG_RESULT($PHP_PATH_INFO_CHECK)
     AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
 
     dnl Set install target and select SAPI
-    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
-    PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,, '$(SAPI_CGI_PATH)')
+    INSTALL_CGI="@echo \"Installing PHP CGI binary: $(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
+    PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi)
+    PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
 
     case $host_alias in
       *aix*)
@@ -96,17 +96,29 @@
         BUILD_CGI="\$(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) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
       ;;
       *)

+    PHP_SUBST(PHP_CGI_TARGET)
+    PHP_SUBST(PHP_INSTALL_CGI_TARGET)
 
-  elif test "$PHP_CLI" != "no"; then
-    AC_MSG_RESULT(no)
-    OVERALL_TARGET=
-    PHP_SAPI=cli   
-  else
-    AC_MSG_ERROR([No SAPIs selected.])  
+    if test "$PHP_SAPI" = "default" ; then
+      PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
+    fi

+  AC_MSG_RESULT(no)
+  if test "$PHP_SAPI" = "default" ; then
+    if test "$PHP_SAPI_CLI" != "no" ; then
+      OVERALL_TARGET=
+      PHP_SAPI=cli
+    else
+      AC_MSG_ERROR([No SAPIs selected.])
+    fi
   fi
+ fi
 fi

Return to bug 116188

Lines 6-13 Link Here

(-)php5/Makefile (-8 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= php5	8	PORTNAME= php5
9	PORTVERSION= 5.2.3	9	PORTVERSION= 5.2.4
10	PORTREVISION?= 1
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 55-67 Link Here
55		54
56	PATCH_DIST_STRIP= -p1	55	PATCH_DIST_STRIP= -p1
57		56
58	.if !defined(WITHOUT_SUHOSIN)	57	# XXX There is currently no suhosin patch for php 5.2.4
59	PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.6.2.patch.gz:suhosin	58	#.if !defined(WITHOUT_SUHOSIN)
60	PATCH_SITES+= http://www.hardened-php.net/suhosin/_media/:suhosin	59	#PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.6.2.patch.gz:suhosin
61	PLIST_SUB+= SUHOSIN=""	60	#PATCH_SITES+= http://www.hardened-php.net/suhosin/_media/:suhosin
62	.else	61	#PLIST_SUB+= SUHOSIN=""
		62	#.else
63	PLIST_SUB+= SUHOSIN="@comment "	63	PLIST_SUB+= SUHOSIN="@comment "
64	.endif	64	#.endif
65		65
66	.if defined(WITH_MAILHEAD)	66	.if defined(WITH_MAILHEAD)
67	PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail	67	PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail

Lines 1-26 Link Here

(-)php5/files/patch-sapi_cgi_config9.m4 (-19 / +23 lines)
1	--- sapi/cgi/config9.m4.orig Thu Feb 2 10:59:23 2006	1	--- sapi/cgi/config9.m4.orig Wed Jul 11 16:20:36 2007
2	+++ sapi/cgi/config9.m4 Thu May 4 11:19:41 2006	2	+++ sapi/cgi/config9.m4 Fri Sep 7 12:54:27 2007
3	@@ -80,7 +80,6 @@	3	@@ -25,7 +25,6 @@
4	])	4	dnl
5		5	dnl CGI setup
6		6	dnl
7	-if test "$PHP_SAPI" = "default"; then	7	-if test "$PHP_SAPI" = "default"; then
8	AC_MSG_CHECKING(for CGI build)	8	AC_MSG_CHECKING(whether to build CGI binary)
9	if test "$PHP_SAPI_CGI" != "no"; then	9	if test "$PHP_CGI" != "no"; then
10	AC_MSG_RESULT(yes)	10	AC_MSG_RESULT(yes)
11	@@ -145,8 +144,9 @@	11	@@ -85,8 +84,9 @@
12	AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])	12	AC_MSG_RESULT($PHP_PATH_INFO_CHECK)
13	AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
14		13
		14	dnl Set install target and select SAPI
15	- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"	15	- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
16	- PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)')	16	- PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,, '$(SAPI_CGI_PATH)')
17	+ INSTALL_CGI="@echo \"Installing PHP CGI binary: $(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"	17	+ INSTALL_CGI="@echo \"Installing PHP CGI binary: $(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
18	+ PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi)	18	+ PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi)
19	+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)	19	+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
20		20
21	case $host_alias in	21	case $host_alias in
22	aix)	22	aix)
23	@@ -156,17 +156,29 @@	23	@@ -96,17 +96,29 @@
24	BUILD_CGI="\$(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) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"	24	BUILD_CGI="\$(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) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
25	;;	25	;;
26	*)	26	*)
Lines 37-44 Link Here
37	+ PHP_SUBST(PHP_CGI_TARGET)	37	+ PHP_SUBST(PHP_CGI_TARGET)
38	+ PHP_SUBST(PHP_INSTALL_CGI_TARGET)	38	+ PHP_SUBST(PHP_INSTALL_CGI_TARGET)
39		39
40	- elif test "$PHP_SAPI_CLI" != "no"; then	40	- elif test "$PHP_CLI" != "no"; then
41	- AC_MSG_RESULT(no)	41	- AC_MSG_RESULT(no)
		42	- OVERALL_TARGET=
		43	- PHP_SAPI=cli
		44	- else
		45	- AC_MSG_ERROR([No SAPIs selected.])
42	+ if test "$PHP_SAPI" = "default" ; then	46	+ if test "$PHP_SAPI" = "default" ; then
43	+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH)	47	+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
44	+ fi	48	+ fi
Lines 46-55 Link Here
46	+ AC_MSG_RESULT(no)	50	+ AC_MSG_RESULT(no)
47	+ if test "$PHP_SAPI" = "default" ; then	51	+ if test "$PHP_SAPI" = "default" ; then
48	+ if test "$PHP_SAPI_CLI" != "no" ; then	52	+ if test "$PHP_SAPI_CLI" != "no" ; then
49	OVERALL_TARGET=	53	+ OVERALL_TARGET=
50	PHP_SAPI=cli	54	+ PHP_SAPI=cli
51	else	55	+ else
52	AC_MSG_ERROR([No SAPIs selected.])	56	+ AC_MSG_ERROR([No SAPIs selected.])
		57	+ fi
53	fi	58	fi
54	+ fi
55	fi	59	fi