sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 5.2.6 release.

Browse source
This commit is contained in:
Alex Dupre 2008-05-02 08:52:07 +00:00
parent 9f45d20192
commit b23a136b2c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=212460
9 changed files with 79 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
databases/php5-dba/files/patch-config.m4
View file

@ -1,6 +1,6 @@
--- 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 @@
--- config.m4.orig 2007-12-06 15:17:43.000000000 +0100
+++ config.m4 2008-05-02 10:05:06.000000000 +0200
@@ -280,6 +280,30 @@
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h
break
@ -28,15 +28,6 @@
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db41/db.h
+ break
elif test -f "$i/include/db4.5/db.h"; then
elif test -f "$i/include/db4.6/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)
THIS_INCLUDE=$i/include/db4.6/db.h

7
lang/php5/Makefile
View file

@ -6,8 +6,8 @@
#
PORTNAME= php5
PORTVERSION= 5.2.5
PORTREVISION?= 1
PORTVERSION= 5.2.6
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions
@ -63,7 +63,8 @@ PLIST_SUB+= SUHOSIN="@comment "
.endif
.if defined(WITH_MAILHEAD)
PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
#PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
PATCHFILES+= php-5.2.5-mail-header.patch:mail
PATCH_SITES+= http://choon.net/opensource/php/:mail
.endif

12
lang/php5/distinfo
View file

@ -1,9 +1,9 @@
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.6.tar.bz2) = 7380ffecebd95c6edb317ef861229ebd
SHA256 (php-5.2.6.tar.bz2) = 1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81
SIZE (php-5.2.6.tar.bz2) = 9571312
MD5 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = f2ec986341a314c271259dbe4d940858
SHA256 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = dfdae803778e6ed6854ea3ad2948bbfedbfffc5a32dbc75a657b99092a9cc5e4
SIZE (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 22986
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

31
lang/php5/files/patch-ext_standard_basic_functions.c
View file

@ -1,10 +1,33 @@
--- ext/standard/basic_functions.c.orig Mon Jan 30 16:58:56 2006
+++ ext/standard/basic_functions.c Mon Jan 30 16:59:13 2006
@@ -78,6 +78,7 @@
# include <sys/mman.h>
--- ext/standard/basic_functions.c.orig 2008-05-02 08:44:06.000000000 +0200
+++ ext/standard/basic_functions.c 2008-05-02 08:54:00.000000000 +0200
@@ -87,6 +87,7 @@
# include <sys/loadavg.h>
#endif
+#define HARTMUT_0
#ifdef HARTMUT_0
#include <getopt.h>
#endif
@@ -3861,9 +3862,7 @@
SetEnvironmentVariable(pe->key, "bugbug");
#endif
putenv(pe->previous_value);
-# if defined(PHP_WIN32)
efree(pe->previous_value);
-# endif
} else {
# if HAVE_UNSETENV
unsetenv(pe->key);
@@ -4463,12 +4462,8 @@
pe.previous_value = NULL;
for (env = environ; env != NULL && *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') { /* found it */
-#if defined(PHP_WIN32)
/* must copy previous value because MSVCRT's putenv can free the string without notice */
pe.previous_value = estrdup(*env);
-#else
- pe.previous_value = *env;
-#endif
break;
}
}

16
lang/php5/files/patch-main_SAPI.c
View file

@ -1,21 +1,5 @@
--- main/SAPI.c.orig 2007-05-25 11:20:01.000000000 +0200
+++ main/SAPI.c 2008-02-01 23:48:51.000000000 +0100
@@ -301,6 +301,7 @@
/* 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 @@
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;
@@ -604,7 +606,7 @@
ptr++;
len--;

7
lang/php53/Makefile
View file

@ -6,8 +6,8 @@
#
PORTNAME= php5
PORTVERSION= 5.2.5
PORTREVISION?= 1
PORTVERSION= 5.2.6
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions
@ -63,7 +63,8 @@ PLIST_SUB+= SUHOSIN="@comment "
.endif
.if defined(WITH_MAILHEAD)
PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
#PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
PATCHFILES+= php-5.2.5-mail-header.patch:mail
PATCH_SITES+= http://choon.net/opensource/php/:mail
.endif

12
lang/php53/distinfo
View file

@ -1,9 +1,9 @@
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.6.tar.bz2) = 7380ffecebd95c6edb317ef861229ebd
SHA256 (php-5.2.6.tar.bz2) = 1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81
SIZE (php-5.2.6.tar.bz2) = 9571312
MD5 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = f2ec986341a314c271259dbe4d940858
SHA256 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = dfdae803778e6ed6854ea3ad2948bbfedbfffc5a32dbc75a657b99092a9cc5e4
SIZE (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 22986
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

31
lang/php53/files/patch-ext_standard_basic_functions.c
View file

@ -1,10 +1,33 @@
--- ext/standard/basic_functions.c.orig Mon Jan 30 16:58:56 2006
+++ ext/standard/basic_functions.c Mon Jan 30 16:59:13 2006
@@ -78,6 +78,7 @@
# include <sys/mman.h>
--- ext/standard/basic_functions.c.orig 2008-05-02 08:44:06.000000000 +0200
+++ ext/standard/basic_functions.c 2008-05-02 08:54:00.000000000 +0200
@@ -87,6 +87,7 @@
# include <sys/loadavg.h>
#endif
+#define HARTMUT_0
#ifdef HARTMUT_0
#include <getopt.h>
#endif
@@ -3861,9 +3862,7 @@
SetEnvironmentVariable(pe->key, "bugbug");
#endif
putenv(pe->previous_value);
-# if defined(PHP_WIN32)
efree(pe->previous_value);
-# endif
} else {
# if HAVE_UNSETENV
unsetenv(pe->key);
@@ -4463,12 +4462,8 @@
pe.previous_value = NULL;
for (env = environ; env != NULL && *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') { /* found it */
-#if defined(PHP_WIN32)
/* must copy previous value because MSVCRT's putenv can free the string without notice */
pe.previous_value = estrdup(*env);
-#else
- pe.previous_value = *env;
-#endif
break;
}
}

16
lang/php53/files/patch-main_SAPI.c
View file

@ -1,21 +1,5 @@
--- main/SAPI.c.orig 2007-05-25 11:20:01.000000000 +0200
+++ main/SAPI.c 2008-02-01 23:48:51.000000000 +0100
@@ -301,6 +301,7 @@
/* 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 @@
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;
@@ -604,7 +606,7 @@
ptr++;
len--;