1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00

Update to 5.2.5 release and fix a few vulnerabilities.

Approved by:	portmgr (marcus), secteam (remko)
This commit is contained in:
Alex Dupre 2007-11-14 07:38:32 +00:00
parent c81bd82f43
commit 8dcdf7be0e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=202697
8 changed files with 43 additions and 34 deletions

View File

@ -0,0 +1,13 @@
--- php_pcre.c.orig 2007-11-14 08:11:40.000000000 +0100
+++ php_pcre.c 2007-11-14 08:11:50.000000000 +0100
@@ -18,6 +18,10 @@
/* $Id: php_pcre.c,v 1.168.2.9.2.21 2007/09/20 08:10:44 tony2001 Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "php.h"
#include "php_ini.h"
#include "php_globals.h"

View File

@ -6,8 +6,8 @@
#
PORTNAME= php5
PORTVERSION= 5.2.4
PORTREVISION?= 1
PORTVERSION= 5.2.5
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions

View File

@ -1,9 +1,9 @@
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
MD5 (php-5.2.5.tar.bz2) = 1fe14ca892460b09f06729941a1bb605
SHA256 (php-5.2.5.tar.bz2) = 5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
SIZE (php-5.2.5.tar.bz2) = 7773024
MD5 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = a43f1a0ee9e7c41c4cb6890174f1f9d8
SHA256 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = fd77ccdeb90c83af7492876dda17518de95dd74a5b6feecc5a1bd2c8e322ab53
SIZE (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = 23157
MD5 (php-5.2.5-mail-header.patch) = a3ce79a6aff5f6607d524d81382a31ca
SHA256 (php-5.2.5-mail-header.patch) = 9b8ab24505051c6edd66cf2c875d966638d18ec4d672599577b1b8d7d0115b8c
SIZE (php-5.2.5-mail-header.patch) = 3420

View File

@ -1,5 +1,5 @@
--- ext/standard/image.c.orig Sun Apr 2 09:34:50 2006
+++ ext/standard/image.c Sun Apr 2 09:35:27 2006
--- ext/standard/image.c.orig 2007-10-04 15:31:11.000000000 +0200
+++ ext/standard/image.c 2007-11-13 22:47:04.000000000 +0100
@@ -31,9 +31,7 @@
#endif
#include "php_image.h"
@ -36,15 +36,14 @@
/* {{{ php_handle_swf
*/
@@ -1310,12 +1304,7 @@
@@ -1314,11 +1308,7 @@
result = php_handle_swf(stream TSRMLS_CC);
break;
case IMAGE_FILETYPE_SWC:
-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
result = php_handle_swc(stream TSRMLS_CC);
-#else
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled.");
-
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled");
-#endif
break;
case IMAGE_FILETYPE_PSD:

View File

@ -6,8 +6,8 @@
#
PORTNAME= php5
PORTVERSION= 5.2.4
PORTREVISION?= 1
PORTVERSION= 5.2.5
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions

View File

@ -1,9 +1,9 @@
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
MD5 (php-5.2.5.tar.bz2) = 1fe14ca892460b09f06729941a1bb605
SHA256 (php-5.2.5.tar.bz2) = 5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
SIZE (php-5.2.5.tar.bz2) = 7773024
MD5 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = a43f1a0ee9e7c41c4cb6890174f1f9d8
SHA256 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = fd77ccdeb90c83af7492876dda17518de95dd74a5b6feecc5a1bd2c8e322ab53
SIZE (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = 23157
MD5 (php-5.2.5-mail-header.patch) = a3ce79a6aff5f6607d524d81382a31ca
SHA256 (php-5.2.5-mail-header.patch) = 9b8ab24505051c6edd66cf2c875d966638d18ec4d672599577b1b8d7d0115b8c
SIZE (php-5.2.5-mail-header.patch) = 3420

View File

@ -1,5 +1,5 @@
--- ext/standard/image.c.orig Sun Apr 2 09:34:50 2006
+++ ext/standard/image.c Sun Apr 2 09:35:27 2006
--- ext/standard/image.c.orig 2007-10-04 15:31:11.000000000 +0200
+++ ext/standard/image.c 2007-11-13 22:47:04.000000000 +0100
@@ -31,9 +31,7 @@
#endif
#include "php_image.h"
@ -36,15 +36,14 @@
/* {{{ php_handle_swf
*/
@@ -1310,12 +1304,7 @@
@@ -1314,11 +1308,7 @@
result = php_handle_swf(stream TSRMLS_CC);
break;
case IMAGE_FILETYPE_SWC:
-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
result = php_handle_swc(stream TSRMLS_CC);
-#else
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled.");
-
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled");
-#endif
break;
case IMAGE_FILETYPE_PSD:

View File

@ -5,8 +5,6 @@
# $FreeBSD$
#
PORTREVISION= 4
CATEGORIES= sysutils
MASTERDIR= ${.CURDIR}/../../lang/php5