mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Update to 5.2.4 release.

Browse Source
This commit is contained in:
Alex Dupre 2007-09-14 06:29:31 +00:00
parent 2ce2c36df0
commit 3de4c7d799
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=199477
11 changed files with 243 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
databases/php5-dba/files/patch-config.m4
View File

@ -1,52 +1,42 @@
--- config.m4.orig Tue Dec 5 18:54:52 2006
+++ config.m4 Wed Feb 7 12:47:51 2007
@@ -244,6 +244,22 @@
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h
break
+ elif test -f "$i/include/db44/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db44/db.h
+ break
+ elif test -f "$i/include/db43/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db43/db.h
+ break
+ elif test -f "$i/include/db42/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db42/db.h
+ break
+ elif test -f "$i/include/db41/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db41/db.h
+ break
elif test -f "$i/include/db4/db.h"; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db4/db.h
@@ -493,7 +509,7 @@
PHP_DBA_STD_ATTACH
fi
],[
- if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
+ if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
PHP_DBA_BUILTIN_CDB
fi
])
@@ -511,7 +527,7 @@
PHP_DBA_BUILTIN_INI
fi
],[
- if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
+ if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
PHP_DBA_BUILTIN_INI
fi
])
@@ -532,7 +548,7 @@
PHP_DBA_BUILTIN_FLATFILE
fi
],[
- if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
+ if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
PHP_DBA_BUILTIN_FLATFILE
fi
])
--- config.m4.orig 2007-07-19 12:50:16.000000000 +0200
+++ config.m4 2007-09-13 17:24:16.000000000 +0200
@@ -279,6 +279,30 @@
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h
break
+ elif test -f "$i/include/db46/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db46/db.h
+ break
+ elif test -f "$i/include/db45/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db45/db.h
+ break
+ elif test -f "$i/include/db44/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db44/db.h
+ break
+ elif test -f "$i/include/db43/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db43/db.h
+ break
+ elif test -f "$i/include/db42/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db42/db.h
+ break
+ elif test -f "$i/include/db41/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db41/db.h
+ break
elif test -f "$i/include/db4.5/db.h"; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db4.5/db.h
@@ -301,7 +325,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(4, db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4)

32
databases/php5-mysqli/files/patch-mysqli_api.c
View File

@ -1,32 +0,0 @@
--- mysqli_api.c.orig Thu Jul 12 09:52:10 2007
+++ mysqli_api.c Thu Jul 12 09:52:24 2007
@@ -141,13 +141,13 @@
switch (types[ofs]) {
case 'd': /* Double */
bind[ofs].buffer_type = MYSQL_TYPE_DOUBLE;
- bind[ofs].buffer = (gptr)&Z_DVAL_PP(args[i]);
+ bind[ofs].buffer = (void*)&Z_DVAL_PP(args[i]);
bind[ofs].is_null = &stmt->param.is_null[ofs];
break;
case 'i': /* Integer */
bind[ofs].buffer_type = MYSQL_TYPE_LONG;
- bind[ofs].buffer = (gptr)&Z_LVAL_PP(args[i]);
+ bind[ofs].buffer = (void*)&Z_LVAL_PP(args[i]);
bind[ofs].is_null = &stmt->param.is_null[ofs];
break;
@@ -600,11 +600,11 @@
break;
case MYSQL_TYPE_DOUBLE:
convert_to_double_ex(&stmt->param.vars[i]);
- stmt->stmt->params[i].buffer = (gptr)&Z_LVAL_PP(&stmt->param.vars[i]);
+ stmt->stmt->params[i].buffer = (void*)&Z_LVAL_PP(&stmt->param.vars[i]);
break;
case MYSQL_TYPE_LONG:
convert_to_long_ex(&stmt->param.vars[i]);
- stmt->stmt->params[i].buffer = (gptr)&Z_LVAL_PP(&stmt->param.vars[i]);
+ stmt->stmt->params[i].buffer = (void*)&Z_LVAL_PP(&stmt->param.vars[i]);
break;
default:
break;

119
databases/php5-odbc/files/patch-config.m4 Normal file
View File

@ -0,0 +1,119 @@
--- config.m4.orig 2007-09-14 08:03:08.000000000 +0200
+++ config.m4 2007-09-14 08:14:21.000000000 +0200
@@ -101,7 +101,7 @@
dnl
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(adabas,,
-[ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no)
if test "$PHP_ADABAS" != "no"; then
AC_MSG_CHECKING([for Adabas support])
@@ -128,7 +128,7 @@
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(sapdb,,
-[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]])
+[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no)
if test "$PHP_SAPDB" != "no"; then
AC_MSG_CHECKING([for SAP DB support])
@@ -146,7 +146,7 @@
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(solid,,
-[ --with-solid[=DIR] Include Solid support [/usr/local/solid]])
+[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no)
if test "$PHP_SOLID" != "no"; then
AC_MSG_CHECKING(for Solid support)
@@ -171,7 +171,7 @@
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(ibm-db2,,
-[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]])
+[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no)
if test "$PHP_IBM_DB2" != "no"; then
AC_MSG_CHECKING(for IBM DB2 support)
@@ -208,7 +208,7 @@
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(ODBCRouter,,
-[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]])
+[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]], no, no)
if test "$PHP_ODBCROUTER" != "no"; then
AC_MSG_CHECKING(for ODBCRouter.com support)
@@ -229,7 +229,7 @@
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(empress,,
[ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH]
- (Empress Version >= 8.60 required)])
+ (Empress Version >= 8.60 required)], no, no)
if test "$PHP_EMPRESS" != "no"; then
AC_MSG_CHECKING(for Empress support)
@@ -253,7 +253,7 @@
PHP_ARG_WITH(empress-bcs,,
[ --with-empress-bcs[=DIR]
Include Empress Local Access support [\$EMPRESSPATH]
- (Empress Version >= 8.60 required)])
+ (Empress Version >= 8.60 required)], no, no)
if test "$PHP_EMPRESS_BCS" != "no"; then
AC_MSG_CHECKING(for Empress local access support)
@@ -291,7 +291,7 @@
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(birdstep,,
-[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]])
+[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], no, no)
if test "$PHP_BIRDSTEP" != "no"; then
AC_MSG_CHECKING(for Birdstep support)
@@ -346,7 +346,7 @@
running this configure script:
CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
LDFLAGS=-lunix
- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
+ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no)
if test "$PHP_CUSTOM_ODBC" != "no"; then
AC_MSG_CHECKING(for a custom ODBC support)
@@ -366,7 +366,7 @@
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(iodbc,,
-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
+[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no)
if test "$PHP_IODBC" != "no"; then
AC_MSG_CHECKING(for iODBC support)
@@ -387,7 +387,7 @@
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(esoob,,
-[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
+[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no)
if test "$PHP_ESOOB" != "no"; then
AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
@@ -407,7 +407,7 @@
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(unixODBC,,
-[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
+[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no)
if test "$PHP_UNIXODBC" != "no"; then
AC_MSG_CHECKING(for unixODBC support)
@@ -428,7 +428,7 @@
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(dbmaker,,
-[ --with-dbmaker[=DIR] Include DBMaker support])
+[ --with-dbmaker[=DIR] Include DBMaker support], no, no)
if test "$PHP_DBMAKER" != "no"; then
AC_MSG_CHECKING(for DBMaker support)

10
lang/php5/Makefile
View File

@ -6,15 +6,15 @@
#
PORTNAME= php5
PORTVERSION= 5.2.3
PORTREVISION?= 1
PORTVERSION= 5.2.4
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions
DISTNAME= php-${PORTVERSION}
MAINTAINER?= ale@FreeBSD.org
COMMENT?= PHP Scripting Language (Apache Module and CLI)
MAINTAINER= ale@FreeBSD.org
COMMENT= PHP Scripting Language
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_AUTOTOOLS= autoconf:259
USE_GETOPT_LONG=yes
CONFIGURE_ARGS= --enable-versioning \
CONFIGURE_ARGS= \
--with-layout=GNU \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \

14
lang/php5/Makefile.ext
View File

@ -87,7 +87,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
. if !defined(WITHOUT_X11)
USE_XPM= yes
USE_XORG= xpm
. endif
CONFIGURE_ARGS+=--with-gd \
@ -502,7 +502,13 @@ CONFIGURE_ARGS+=--with-zlib=/usr
CONFIGURE_ARGS+=--without-cdb
. endif
. if defined(WITH_DB4)
WITH_DB4_VER?= 44
WITH_DB4_VER?= 46
. if ${WITH_DB4_VER} == 45
LIB_DEPENDS+= db-4.5.0:${PORTSDIR}/databases/db45
. else
. if ${WITH_DB4_VER} == 44
LIB_DEPENDS+= db-4.4.0:${PORTSDIR}/databases/db44
. else
. if ${WITH_DB4_VER} == 43
LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
. else
@ -515,7 +521,9 @@ LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
. if ${WITH_DB4_VER} == 4
LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4
. else
LIB_DEPENDS+= db-4.4.0:${PORTSDIR}/databases/db44
LIB_DEPENDS+= db-4.6.0:${PORTSDIR}/databases/db46
. endif
. endif
. endif
. endif
. endif

18
lang/php5/distinfo
View File

@ -1,9 +1,9 @@
MD5 (php-5.2.3.tar.bz2) = eb50b751c8e1ced05bd012d5a0e4dec3
SHA256 (php-5.2.3.tar.bz2) = eedffda5069caa801a7fec217c77619657416a5fcaefb79ba4620432f0befe29
SIZE (php-5.2.3.tar.bz2) = 7417635
MD5 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = f217d04f9513222e48cea6588ac65b89
SHA256 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 214c43e4808483f0700f36ffa57aba909a669cb335c179d46c1e8f765d70bd1f
SIZE (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 22789
MD5 (php-5.2.3-mail-header.patch) = c48ef565c02a2aeb6aadd3d12cea7bb8
SHA256 (php-5.2.3-mail-header.patch) = dc80159705c2e2806fdab1632d573218383487dce3ad5aa700e92b909dcd03e5
SIZE (php-5.2.3-mail-header.patch) = 3420
MD5 (php-5.2.4.tar.bz2) = 55c97a671fdabf462cc7a82971a656d2
SHA256 (php-5.2.4.tar.bz2) = 502f5259e4619ba3549cd9f9bdeb4152c7effa66672348f3b108fccc8e1ca1c0
SIZE (php-5.2.4.tar.bz2) = 7608429
MD5 (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 58b18d0db00bc52b004fc749190a958f
SHA256 (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 08dc68e53188dec7f851e2bc5392eba4c2ccc70cfba91eab1ddbd41dde6bcc14
SIZE (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 22736
MD5 (php-5.2.4-mail-header.patch) = d1b5bbfe95078a367821b74fbbd45e3f
SHA256 (php-5.2.4-mail-header.patch) = c84ecc5619c900d3ec0c98fd5c09dbfb78afe572f298c00d68f9254596e6e708
SIZE (php-5.2.4-mail-header.patch) = 3420

32
lang/php5/files/patch-sapi_cgi_config9.m4
View File

@ -1,26 +1,26 @@
--- sapi/cgi/config9.m4.orig Thu Feb 2 10:59:23 2006
+++ sapi/cgi/config9.m4 Thu May 4 11:19:41 2006
@@ -80,7 +80,6 @@
])
--- sapi/cgi/config9.m4.orig Thu Jul 12 01:20:36 2007
+++ sapi/cgi/config9.m4 Wed Sep 5 07:55:06 2007
@@ -25,7 +25,6 @@
dnl
dnl CGI setup
dnl
-if test "$PHP_SAPI" = "default"; then
AC_MSG_CHECKING(for CGI build)
if test "$PHP_SAPI_CGI" != "no"; then
AC_MSG_CHECKING(whether to build CGI binary)
if test "$PHP_CGI" != "no"; then
AC_MSG_RESULT(yes)
@@ -145,8 +144,9 @@
AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
@@ -85,8 +84,9 @@
AC_MSG_RESULT($PHP_PATH_INFO_CHECK)
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_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*)
@@ -156,17 +156,29 @@
@@ -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)"
;;
*)
@ -37,7 +37,7 @@
+ PHP_SUBST(PHP_CGI_TARGET)
+ PHP_SUBST(PHP_INSTALL_CGI_TARGET)
- elif test "$PHP_SAPI_CLI" != "no"; then
- elif test "$PHP_CLI" != "no"; then
- AC_MSG_RESULT(no)
+ if test "$PHP_SAPI" = "default" ; then
+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
@ -45,7 +45,7 @@
+ else
+ AC_MSG_RESULT(no)
+ if test "$PHP_SAPI" = "default" ; then
+ if test "$PHP_SAPI_CLI" != "no" ; then
+ if test "$PHP_CLI" != "no" ; then
OVERALL_TARGET=
PHP_SAPI=cli
else

10
lang/php53/Makefile
View File

@ -6,15 +6,15 @@
#
PORTNAME= php5
PORTVERSION= 5.2.3
PORTREVISION?= 1
PORTVERSION= 5.2.4
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions
DISTNAME= php-${PORTVERSION}
MAINTAINER?= ale@FreeBSD.org
COMMENT?= PHP Scripting Language (Apache Module and CLI)
MAINTAINER= ale@FreeBSD.org
COMMENT= PHP Scripting Language
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_AUTOTOOLS= autoconf:259
USE_GETOPT_LONG=yes
CONFIGURE_ARGS= --enable-versioning \
CONFIGURE_ARGS= \
--with-layout=GNU \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \

14
lang/php53/Makefile.ext
View File

@ -87,7 +87,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
. if !defined(WITHOUT_X11)
USE_XPM= yes
USE_XORG= xpm
. endif
CONFIGURE_ARGS+=--with-gd \
@ -502,7 +502,13 @@ CONFIGURE_ARGS+=--with-zlib=/usr
CONFIGURE_ARGS+=--without-cdb
. endif
. if defined(WITH_DB4)
WITH_DB4_VER?= 44
WITH_DB4_VER?= 46
. if ${WITH_DB4_VER} == 45
LIB_DEPENDS+= db-4.5.0:${PORTSDIR}/databases/db45
. else
. if ${WITH_DB4_VER} == 44
LIB_DEPENDS+= db-4.4.0:${PORTSDIR}/databases/db44
. else
. if ${WITH_DB4_VER} == 43
LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
. else
@ -515,7 +521,9 @@ LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
. if ${WITH_DB4_VER} == 4
LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4
. else
LIB_DEPENDS+= db-4.4.0:${PORTSDIR}/databases/db44
LIB_DEPENDS+= db-4.6.0:${PORTSDIR}/databases/db46
. endif
. endif
. endif
. endif
. endif

18
lang/php53/distinfo
View File

@ -1,9 +1,9 @@
MD5 (php-5.2.3.tar.bz2) = eb50b751c8e1ced05bd012d5a0e4dec3
SHA256 (php-5.2.3.tar.bz2) = eedffda5069caa801a7fec217c77619657416a5fcaefb79ba4620432f0befe29
SIZE (php-5.2.3.tar.bz2) = 7417635
MD5 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = f217d04f9513222e48cea6588ac65b89
SHA256 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 214c43e4808483f0700f36ffa57aba909a669cb335c179d46c1e8f765d70bd1f
SIZE (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 22789
MD5 (php-5.2.3-mail-header.patch) = c48ef565c02a2aeb6aadd3d12cea7bb8
SHA256 (php-5.2.3-mail-header.patch) = dc80159705c2e2806fdab1632d573218383487dce3ad5aa700e92b909dcd03e5
SIZE (php-5.2.3-mail-header.patch) = 3420
MD5 (php-5.2.4.tar.bz2) = 55c97a671fdabf462cc7a82971a656d2
SHA256 (php-5.2.4.tar.bz2) = 502f5259e4619ba3549cd9f9bdeb4152c7effa66672348f3b108fccc8e1ca1c0
SIZE (php-5.2.4.tar.bz2) = 7608429
MD5 (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 58b18d0db00bc52b004fc749190a958f
SHA256 (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 08dc68e53188dec7f851e2bc5392eba4c2ccc70cfba91eab1ddbd41dde6bcc14
SIZE (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 22736
MD5 (php-5.2.4-mail-header.patch) = d1b5bbfe95078a367821b74fbbd45e3f
SHA256 (php-5.2.4-mail-header.patch) = c84ecc5619c900d3ec0c98fd5c09dbfb78afe572f298c00d68f9254596e6e708
SIZE (php-5.2.4-mail-header.patch) = 3420

32
lang/php53/files/patch-sapi_cgi_config9.m4
View File

@ -1,26 +1,26 @@
--- sapi/cgi/config9.m4.orig Thu Feb 2 10:59:23 2006
+++ sapi/cgi/config9.m4 Thu May 4 11:19:41 2006
@@ -80,7 +80,6 @@
])
--- sapi/cgi/config9.m4.orig Thu Jul 12 01:20:36 2007
+++ sapi/cgi/config9.m4 Wed Sep 5 07:55:06 2007
@@ -25,7 +25,6 @@
dnl
dnl CGI setup
dnl
-if test "$PHP_SAPI" = "default"; then
AC_MSG_CHECKING(for CGI build)
if test "$PHP_SAPI_CGI" != "no"; then
AC_MSG_CHECKING(whether to build CGI binary)
if test "$PHP_CGI" != "no"; then
AC_MSG_RESULT(yes)
@@ -145,8 +144,9 @@
AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
@@ -85,8 +84,9 @@
AC_MSG_RESULT($PHP_PATH_INFO_CHECK)
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_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*)
@@ -156,17 +156,29 @@
@@ -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)"
;;
*)
@ -37,7 +37,7 @@
+ PHP_SUBST(PHP_CGI_TARGET)
+ PHP_SUBST(PHP_INSTALL_CGI_TARGET)
- elif test "$PHP_SAPI_CLI" != "no"; then
- elif test "$PHP_CLI" != "no"; then
- AC_MSG_RESULT(no)
+ if test "$PHP_SAPI" = "default" ; then
+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
@ -45,7 +45,7 @@
+ else
+ AC_MSG_RESULT(no)
+ if test "$PHP_SAPI" = "default" ; then
+ if test "$PHP_SAPI_CLI" != "no" ; then
+ if test "$PHP_CLI" != "no" ; then
OVERALL_TARGET=
PHP_SAPI=cli
else