mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
Update to 5.2.2 release.
PR: ports/112527 Submitted by: Nick Barkas<snb@threerings.net> Approved by: portmgr (linimon)
This commit is contained in:
parent
01693688cc
commit
cc137a49e9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=191563
13 changed files with 37 additions and 10324 deletions
|
@ -25,8 +25,8 @@
|
||||||
# use bundled library
|
# use bundled library
|
||||||
PHP_PROG_LEMON
|
PHP_PROG_LEMON
|
||||||
SQLITE_MODULE_TYPE=builtin
|
SQLITE_MODULE_TYPE=builtin
|
||||||
- PHP_SQLITE_CFLAGS="-I@ext_builddir@/libsqlite/src $pdo_inc_path"
|
- PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path"
|
||||||
+ PHP_SQLITE_CFLAGS="-I@ext_builddir@/libsqlite/src"
|
+ PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src"
|
||||||
sqlite_extra_sources="libsqlite/src/opcodes.c \
|
sqlite_extra_sources="libsqlite/src/opcodes.c \
|
||||||
libsqlite/src/parse.c libsqlite/src/encode.c \
|
libsqlite/src/parse.c libsqlite/src/encode.c \
|
||||||
libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
|
libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
|
||||||
|
|
|
@ -11,6 +11,4 @@ MASTERDIR= ${.CURDIR}/../../lang/php5
|
||||||
|
|
||||||
PKGNAMESUFFIX= -sybase_ct
|
PKGNAMESUFFIX= -sybase_ct
|
||||||
|
|
||||||
PORTREVISION= 4
|
|
||||||
|
|
||||||
.include "${MASTERDIR}/Makefile"
|
.include "${MASTERDIR}/Makefile"
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTREVISION= 5
|
|
||||||
|
|
||||||
CATEGORIES= devel
|
CATEGORIES= devel
|
||||||
|
|
||||||
MASTERDIR= ${.CURDIR}/../../lang/php5
|
MASTERDIR= ${.CURDIR}/../../lang/php5
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -6,8 +6,8 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= php5
|
PORTNAME= php5
|
||||||
PORTVERSION= 5.2.1
|
PORTVERSION= 5.2.2
|
||||||
PORTREVISION?= 3
|
PORTREVISION?= 0
|
||||||
CATEGORIES?= lang devel www
|
CATEGORIES?= lang devel www
|
||||||
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
|
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
|
||||||
http://downloads.php.net/ilia/:rc \
|
http://downloads.php.net/ilia/:rc \
|
||||||
|
|
|
@ -267,7 +267,8 @@ USE_GCC= 3.4+
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${PHP_MODNAME} == "pdo_mysql"
|
.if ${PHP_MODNAME} == "pdo_mysql"
|
||||||
CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE}
|
CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
|
||||||
|
--with-zlib-dir=/usr
|
||||||
|
|
||||||
USE_MYSQL= yes
|
USE_MYSQL= yes
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
MD5 (php-5.2.1.tar.bz2) = 261218e3569a777dbd87c16a15f05c8d
|
MD5 (php-5.2.2.tar.bz2) = d084337867d70b50a10322577be0e44e
|
||||||
SHA256 (php-5.2.1.tar.bz2) = 4b60fa70969644d193d58dd7cb9f2765e304c6368e98b1551e92e8d4e14d35ed
|
SHA256 (php-5.2.2.tar.bz2) = cd69e73c46e1d171ac0cf27b7ee492c3bf8f6b45a763a77fd0cb79d5afa9f407
|
||||||
SIZE (php-5.2.1.tar.bz2) = 7163383
|
SIZE (php-5.2.2.tar.bz2) = 7310926
|
||||||
MD5 (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 98cae8ee994df74e3ea1b25c955310e8
|
MD5 (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 081fe08d584820a6ece1fe2e8629711f
|
||||||
SHA256 (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 78802a71c35ed2bed2e0e32cb8443f682451989ebe1ed5d5b384b7bb85b90c1b
|
SHA256 (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 932d8155028686b96d3ebf89215dab7cd9353ac72f9ea82c252d0999fb4bd864
|
||||||
SIZE (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 22679
|
SIZE (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 22850
|
||||||
MD5 (php-5.2.1-mail-header.patch) = be00d628a43e650e98c45185485100c1
|
MD5 (php-5.2.2-mail-header.patch) = 6b2562b5230b1f85a2ccb292e124a91a
|
||||||
SHA256 (php-5.2.1-mail-header.patch) = e72c3f0d8d905bf92513bbf858a450469b15ee3c7d4da33feb495100ac7b1cd2
|
SHA256 (php-5.2.2-mail-header.patch) = 5394732be1953c7eedc2de9529d10971d85959af6352c8a67b4561124ddc8df5
|
||||||
SIZE (php-5.2.1-mail-header.patch) = 3420
|
SIZE (php-5.2.2-mail-header.patch) = 3420
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- ext/standard/string.c.orig Thu Feb 15 07:50:09 2007
|
|
||||||
+++ ext/standard/string.c Thu Feb 15 07:50:33 2007
|
|
||||||
@@ -3148,7 +3148,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
Z_STRLEN_P(result) = len + (char_count * (to_len - 1));
|
|
||||||
- Z_STRVAL_P(result) = target = safe_emalloc(char_count, to_len, len);
|
|
||||||
+ Z_STRVAL_P(result) = target = safe_emalloc(char_count, to_len, len + 1);
|
|
||||||
Z_TYPE_P(result) = IS_STRING;
|
|
||||||
|
|
||||||
if (case_sensitivity) {
|
|
|
@ -6,8 +6,8 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= php5
|
PORTNAME= php5
|
||||||
PORTVERSION= 5.2.1
|
PORTVERSION= 5.2.2
|
||||||
PORTREVISION?= 3
|
PORTREVISION?= 0
|
||||||
CATEGORIES?= lang devel www
|
CATEGORIES?= lang devel www
|
||||||
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
|
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
|
||||||
http://downloads.php.net/ilia/:rc \
|
http://downloads.php.net/ilia/:rc \
|
||||||
|
|
|
@ -267,7 +267,8 @@ USE_GCC= 3.4+
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${PHP_MODNAME} == "pdo_mysql"
|
.if ${PHP_MODNAME} == "pdo_mysql"
|
||||||
CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE}
|
CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
|
||||||
|
--with-zlib-dir=/usr
|
||||||
|
|
||||||
USE_MYSQL= yes
|
USE_MYSQL= yes
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
MD5 (php-5.2.1.tar.bz2) = 261218e3569a777dbd87c16a15f05c8d
|
MD5 (php-5.2.2.tar.bz2) = d084337867d70b50a10322577be0e44e
|
||||||
SHA256 (php-5.2.1.tar.bz2) = 4b60fa70969644d193d58dd7cb9f2765e304c6368e98b1551e92e8d4e14d35ed
|
SHA256 (php-5.2.2.tar.bz2) = cd69e73c46e1d171ac0cf27b7ee492c3bf8f6b45a763a77fd0cb79d5afa9f407
|
||||||
SIZE (php-5.2.1.tar.bz2) = 7163383
|
SIZE (php-5.2.2.tar.bz2) = 7310926
|
||||||
MD5 (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 98cae8ee994df74e3ea1b25c955310e8
|
MD5 (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 081fe08d584820a6ece1fe2e8629711f
|
||||||
SHA256 (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 78802a71c35ed2bed2e0e32cb8443f682451989ebe1ed5d5b384b7bb85b90c1b
|
SHA256 (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 932d8155028686b96d3ebf89215dab7cd9353ac72f9ea82c252d0999fb4bd864
|
||||||
SIZE (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 22679
|
SIZE (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 22850
|
||||||
MD5 (php-5.2.1-mail-header.patch) = be00d628a43e650e98c45185485100c1
|
MD5 (php-5.2.2-mail-header.patch) = 6b2562b5230b1f85a2ccb292e124a91a
|
||||||
SHA256 (php-5.2.1-mail-header.patch) = e72c3f0d8d905bf92513bbf858a450469b15ee3c7d4da33feb495100ac7b1cd2
|
SHA256 (php-5.2.2-mail-header.patch) = 5394732be1953c7eedc2de9529d10971d85959af6352c8a67b4561124ddc8df5
|
||||||
SIZE (php-5.2.1-mail-header.patch) = 3420
|
SIZE (php-5.2.2-mail-header.patch) = 3420
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- ext/standard/string.c.orig Thu Feb 15 07:50:09 2007
|
|
||||||
+++ ext/standard/string.c Thu Feb 15 07:50:33 2007
|
|
||||||
@@ -3148,7 +3148,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
Z_STRLEN_P(result) = len + (char_count * (to_len - 1));
|
|
||||||
- Z_STRVAL_P(result) = target = safe_emalloc(char_count, to_len, len);
|
|
||||||
+ Z_STRVAL_P(result) = target = safe_emalloc(char_count, to_len, len + 1);
|
|
||||||
Z_TYPE_P(result) = IS_STRING;
|
|
||||||
|
|
||||||
if (case_sensitivity) {
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- posix.c.orig Fri Feb 23 08:23:14 2007
|
--- posix.c.orig Fri Feb 23 00:40:39 2007
|
||||||
+++ posix.c Fri Feb 23 08:27:53 2007
|
+++ posix.c Sun May 13 17:52:27 2007
|
||||||
@@ -838,7 +838,7 @@
|
@@ -838,7 +838,7 @@
|
||||||
#if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
|
#if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
|
||||||
buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
|
buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
|
||||||
|
@ -9,17 +9,16 @@
|
||||||
}
|
}
|
||||||
buf = emalloc(buflen);
|
buf = emalloc(buflen);
|
||||||
g = &gbuf;
|
g = &gbuf;
|
||||||
@@ -887,6 +887,9 @@
|
@@ -888,7 +888,7 @@
|
||||||
#ifdef HAVE_GETGRGID_R
|
|
||||||
|
|
||||||
grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
|
grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
|
||||||
+ if (grbuflen < 1) {
|
if (grbuflen < 1) {
|
||||||
|
- RETURN_FALSE;
|
||||||
+ grbuflen = 1024;
|
+ grbuflen = 1024;
|
||||||
+ }
|
}
|
||||||
grbuf = emalloc(grbuflen);
|
|
||||||
|
|
||||||
ret = getgrgid_r(gid, &_g, grbuf, grbuflen, &retgrptr);
|
grbuf = emalloc(grbuflen);
|
||||||
@@ -951,7 +954,7 @@
|
@@ -955,7 +955,7 @@
|
||||||
#if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
|
#if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
|
||||||
buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
|
buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
|
||||||
if (buflen < 1) {
|
if (buflen < 1) {
|
||||||
|
@ -28,7 +27,7 @@
|
||||||
}
|
}
|
||||||
buf = emalloc(buflen);
|
buf = emalloc(buflen);
|
||||||
pw = &pwbuf;
|
pw = &pwbuf;
|
||||||
@@ -1000,7 +1003,7 @@
|
@@ -1004,7 +1004,7 @@
|
||||||
#if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
|
#if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
|
||||||
pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
|
pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
|
||||||
if (pwbuflen < 1) {
|
if (pwbuflen < 1) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue