update to php-5.2.6; from Brad Walker <me@bradmwalker.com>

This commit is contained in:
robert 2008-05-20 14:01:45 +00:00
parent 264e28fd5d
commit d5f223b64a
5 changed files with 18 additions and 38 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.19 2007/11/14 10:53:50 robert Exp $
# $OpenBSD: Makefile.inc,v 1.20 2008/05/20 14:01:45 robert Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
V= 5.2.5
V= 5.2.6
SUHOSIN_V= 0.9.20
SUHOSIN_P_V= 0.9.6.2
@ -18,7 +18,7 @@ MASTER_SITES= http://us2.php.net/distributions/ \
http://se.php.net/distributions/ \
http://no.php.net/distributions/ \
http://uk.php.net/distributions/
MASTER_SITES0= http://www.hardened-php.net/suhosin/_media/
MASTER_SITES0= http://download.suhosin.org/
# UPGRADERS: please read BOTH the PHP and Zend licenses
# and make sure they are safe before an upgrade

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.36 2008/03/20 23:06:53 sthen Exp $
# $OpenBSD: Makefile,v 1.37 2008/05/20 14:01:45 robert Exp $
COMMENT-main= server-side HTML-embedded scripting language
COMMENT-fastcgi=stand-alone FastCGI version of PHP
PKGNAME= php5-core-${V}
PKGNAME-main= php5-core-${V}p3
PKGNAME-fastcgi=php5-fastcgi-${V}p0
PKGNAME-main= php5-core-${V}
PKGNAME-fastcgi=php5-fastcgi-${V}
DISTFILES= php-${V}.tar.gz

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-main_SAPI_c,v 1.1 2007/12/11 12:45:08 robert Exp $
--- main/SAPI.c.orig Tue Dec 11 13:34:05 2007
+++ main/SAPI.c Tue Dec 11 13:34:46 2007
@@ -301,6 +301,7 @@ SAPI_API void sapi_activate_headers_only(TSRMLS_D)
/* SG(sapi_headers).http_response_code = 200; */
SG(sapi_headers).http_status_line = NULL;
+ SG(sapi_headers).mimetype = NULL;
SG(read_post_bytes) = 0;
SG(request_info).post_data = NULL;
SG(request_info).raw_post_data = NULL;
@@ -340,6 +341,7 @@ SAPI_API void sapi_activate(TSRMLS_D)
SG(sapi_headers).http_response_code = 200;
*/
SG(sapi_headers).http_status_line = NULL;
+ SG(sapi_headers).mimetype = NULL;
SG(headers_sent) = 0;
SG(read_post_bytes) = 0;
SG(request_info).post_data = NULL;

View File

@ -1,15 +1,15 @@
MD5 (php-5.2.5.tar.gz) = YaDhZhtwdgrMd7xIQZALeg==
MD5 (php-5.2.6.tar.gz) = FyD5XybFBjOPDbo6UZBrvQ==
MD5 (suhosin-0.9.20.tgz) = lmAz5ZnBHZd/sokkx+8PoQ==
MD5 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = pD8aDunnxBxMtokBdPH52A==
RMD160 (php-5.2.5.tar.gz) = XXSQ1LL8mjpP0ohOfNfgHbuIfsM=
MD5 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 8uyYY0GjFMJxJZ2+TZQIWA==
RMD160 (php-5.2.6.tar.gz) = lKtjgfwIDLA56WsUIhQTSsL6dNg=
RMD160 (suhosin-0.9.20.tgz) = Hz9arHOEKj4ouXisiXX28kODfEE=
RMD160 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = JYY612vqSo5b9QvZFoNbXZMkRSw=
SHA1 (php-5.2.5.tar.gz) = NXmeJPHeKmm5RP/VIqmJyFKCmbo=
RMD160 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 9eXm2IuRUGpJmI47fzccimK2V6s=
SHA1 (php-5.2.6.tar.gz) = VAWMc+taMU6ysxklR38pjYmLUgo=
SHA1 (suhosin-0.9.20.tgz) = xVwLIF3nl0h10B5sEWqGw6n0WKk=
SHA1 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = EQLi4d6SK1GZRiEAp7u7fO9cP1g=
SHA256 (php-5.2.5.tar.gz) = 01RtyiwDhB3Tgjvlqg6dJPDNKpH9Lum0FGUEyCg5NbQ=
SHA1 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = sZ/Li6peMLRTPGYpUIg8KeGFwfU=
SHA256 (php-5.2.6.tar.gz) = jqbdMBCyYNgM9BYZNj0NNZPd2Xw6PgnyKYFmNfziMUk=
SHA256 (suhosin-0.9.20.tgz) = DIEgkU2LCfByVJ8kLiN6VUB4Ubf2P622RkGqR42AxwI=
SHA256 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = /XfM3rkMg690kodt2hdRjeld10pbb+7MWhvSyOMiq1M=
SIZE (php-5.2.5.tar.gz) = 9972372
SHA256 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 39roA3eObtaFTqOtKUi7/tv//Foy28daZXuZCSqcxeQ=
SIZE (php-5.2.6.tar.gz) = 12046184
SIZE (suhosin-0.9.20.tgz) = 112548
SIZE (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = 23157
SIZE (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 22986

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.42 2008/03/30 11:59:56 robert Exp $
# $OpenBSD: Makefile,v 1.43 2008/05/20 14:01:45 robert Exp $
FULLPKGNAME-main= php5-extensions-${V}
COMMENT-main= informational package about PHP5 extensions
@ -272,7 +272,7 @@ CONFIGURE_ARGS+= --without-pspell
MULTI_PACKAGES+= -pspell
COMMENT-pspell= pspell library extensions for php5
CONFIGURE_ARGS+= --with-pspell=shared,${LOCALBASE}
LIB_DEPENDS-pspell= aspell.>=16.0::textproc/aspell/core
LIB_DEPENDS-pspell= aspell.>=16.0,pspell.>=16.0::textproc/aspell/core
.endif
# shmop
@ -307,7 +307,6 @@ MULTI_PACKAGES+= -snmp
COMMENT-snmp= snmp protocol extensions for php5
CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE} --enable-ucd-snmp-hack
LIB_DEPENDS-snmp= netsnmp.>=6.2::net/net-snmp
WANTLIB-snmp= ${WANTLIB} crypto
.endif
# sqlite