diff options
author | Alex Dupre <ale@FreeBSD.org> | 2005-04-04 09:20:21 +0000 |
---|---|---|
committer | Alex Dupre <ale@FreeBSD.org> | 2005-04-04 09:20:21 +0000 |
commit | 2cee0c25ff8d89399897cac7c1dcb1444b2f79d3 (patch) | |
tree | b8af981bc9d3d6808bfc8842257bfae900b60870 /lang/php5 | |
parent | - Update to 0.991, aka 1.0beta1 (diff) |
Update PHP ports to 4.3.11 and 5.0.4 releases:
- fix security issues
- unbreak PEAR packages [1]
PR: ports/78516 [1]
Submitted by: Yen-Ming Lee <leeym@utopia.leeym.com> [1]
Tested by: thierry
Notes
Notes:
svn path=/head/; revision=132440
Diffstat (limited to 'lang/php5')
-rw-r--r-- | lang/php5/Makefile | 8 | ||||
-rw-r--r-- | lang/php5/Makefile.ext | 19 | ||||
-rw-r--r-- | lang/php5/distinfo | 4 | ||||
-rw-r--r-- | lang/php5/files/patch-acinclude.m4 | 14 | ||||
-rw-r--r-- | lang/php5/files/patch-ext::standard::php_var.h | 20 | ||||
-rw-r--r-- | lang/php5/files/patch-ext::standard::var_unserializer.c | 87 | ||||
-rw-r--r-- | lang/php5/files/patch-pear::Makefile.frag | 2 | ||||
-rw-r--r-- | lang/php5/files/patch-scripts::Makefile.frag | 9 | ||||
-rw-r--r-- | lang/php5/files/patch-scripts::phpize.in | 16 | ||||
-rw-r--r-- | lang/php5/pkg-plist | 4 | ||||
-rw-r--r-- | lang/php5/pkg-plist.pear | 5 |
11 files changed, 45 insertions, 143 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 55dbe22c8f22..e795ec20aca9 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -6,8 +6,8 @@ # PORTNAME= php5 -PORTVERSION= 5.0.3 -PORTREVISION?= 2 +PORTVERSION= 5.0.4 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ http://downloads.php.net/ilia/:rc \ @@ -111,10 +111,6 @@ SAPI_FILE= bin/php .include <bsd.port.pre.mk> -.if ${ARCH} == "ia64" -BROKEN= "Does not compile on ia64" -.endif - CONFIGURE_ENV= ac_cv_pthreads_lib=${PTHREAD_LIBS} \ ac_cv_pthreads_cflags=${PTHREAD_CFLAGS} diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 20e4241ddf2d..a17595bec209 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -133,6 +133,12 @@ USE_ICONV= yes LIB_DEPENDS+= c-client4.8:${PORTSDIR}/mail/cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} +.if !defined(WITHOUT_SSL) +CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} + +LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl +USE_OPENSSL= yes +.endif .endif .if ${PHP_MODNAME} == "interbase" @@ -441,19 +447,6 @@ CONFIGURE_ARGS+=--enable-gd-jis-conv . endif .endif -.if ${PHP_MODNAME} == "imap" -. if !exists(${LOCALBASE}/lib/libc-client4.so) -. if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${LOCALBASE} -. endif -. else -WITH_IMAP_SSL!= /usr/bin/ldd ${LOCALBASE}/lib/libc-client4.so | ${GREP} libssl || ${TRUE} -. if !empty(WITH_IMAP_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${LOCALBASE} -. endif -. endif -.endif - .if ${PHP_MODNAME} == "mbstring" . if defined(WITHOUT_REGEX) CONFIGURE_ARGS+=--disable-mbregex diff --git a/lang/php5/distinfo b/lang/php5/distinfo index b7d5539c76c7..316a6b444a77 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,2 +1,2 @@ -MD5 (php-5.0.3.tar.bz2) = fd26455febdddee0977ce226b9108d9c -SIZE (php-5.0.3.tar.bz2) = 4607759 +MD5 (php-5.0.4.tar.bz2) = 47727afde39329d5cebda4cb5e5ecee0 +SIZE (php-5.0.4.tar.bz2) = 4728453 diff --git a/lang/php5/files/patch-acinclude.m4 b/lang/php5/files/patch-acinclude.m4 new file mode 100644 index 000000000000..32a0ca4c79c9 --- /dev/null +++ b/lang/php5/files/patch-acinclude.m4 @@ -0,0 +1,14 @@ +--- acinclude.m4.orig Tue Jan 25 14:02:45 2005 ++++ acinclude.m4 Mon Apr 4 11:09:25 2005 +@@ -1681,9 +1681,9 @@ + unset OPENSSL_LIBDIR + + dnl Fallbacks for different configure options +- if test "$PHP_OPENSSL" != "no"; then ++ if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then + PHP_OPENSSL_DIR=$PHP_OPENSSL +- elif test "$PHP_IMAP_SSL" != "no"; then ++ elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then + PHP_OPENSSL_DIR=$PHP_IMAP_SSL + fi + diff --git a/lang/php5/files/patch-ext::standard::php_var.h b/lang/php5/files/patch-ext::standard::php_var.h deleted file mode 100644 index c3b01c3a9fd7..000000000000 --- a/lang/php5/files/patch-ext::standard::php_var.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ext/standard/php_var.h.orig 2004/09/05 16:29:04 -+++ ext/standard/php_var.h 2005/01/15 18:18:08 -@@ -41,6 +41,7 @@ PHPAPI void php_debug_zval_dump(zval **s - - struct php_unserialize_data { - void *first; -+ void *first_dtor; - }; - - typedef struct php_unserialize_data php_unserialize_data_t; -@@ -54,7 +55,8 @@ PHPAPI int php_var_unserialize(zval **rv - zend_hash_destroy(&(var_hash)) - - #define PHP_VAR_UNSERIALIZE_INIT(var_hash) \ -- (var_hash).first = 0 -+ (var_hash).first = 0; \ -+ (var_hash).first_dtor = 0 - #define PHP_VAR_UNSERIALIZE_DESTROY(var_hash) \ - var_destroy(&(var_hash)) - diff --git a/lang/php5/files/patch-ext::standard::var_unserializer.c b/lang/php5/files/patch-ext::standard::var_unserializer.c deleted file mode 100644 index 930becda86ed..000000000000 --- a/lang/php5/files/patch-ext::standard::var_unserializer.c +++ /dev/null @@ -1,87 +0,0 @@ ---- ext/standard/var_unserializer.c.orig 2004/12/03 16:02:48 -+++ ext/standard/var_unserializer.c 2005/01/18 10:57:05 -@@ -56,6 +56,30 @@ static inline void var_push(php_unserial - var_hash->data[var_hash->used_slots++] = *rval; - } - -+static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) -+{ -+ var_entries *var_hash = var_hashx->first_dtor, *prev = NULL; -+ -+ while (var_hash && var_hash->used_slots == VAR_ENTRIES_MAX) { -+ prev = var_hash; -+ var_hash = var_hash->next; -+ } -+ -+ if (!var_hash) { -+ var_hash = emalloc(sizeof(var_entries)); -+ var_hash->used_slots = 0; -+ var_hash->next = 0; -+ -+ if (!var_hashx->first_dtor) -+ var_hashx->first_dtor = var_hash; -+ else -+ prev->next = var_hash; -+ } -+ -+ (*rval)->refcount++; -+ var_hash->data[var_hash->used_slots++] = *rval; -+} -+ - PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval **nzval) - { - int i; -@@ -93,6 +117,7 @@ static int var_access(php_unserialize_da - PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) - { - void *next; -+ int i; - var_entries *var_hash = var_hashx->first; - - while (var_hash) { -@@ -100,6 +125,17 @@ PHPAPI void var_destroy(php_unserialize_ - efree(var_hash); - var_hash = next; - } -+ -+ var_hash = var_hashx->first_dtor; -+ -+ while (var_hash) { -+ for (i = 0; i < var_hash->used_slots; i++) { -+ zval_ptr_dtor(&var_hash->data[i]); -+ } -+ next = var_hash->next; -+ efree(var_hash); -+ var_hash = next; -+ } - } - - /* }}} */ -@@ -177,7 +213,7 @@ static inline size_t parse_uiv(const uns - static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int elements) - { - while (elements-- > 0) { -- zval *key, *data, *old_data; -+ zval *key, *data, **old_data; - - ALLOC_INIT_ZVAL(key); - -@@ -205,14 +241,14 @@ static inline int process_nested_data(UN - - switch (Z_TYPE_P(key)) { - case IS_LONG: -- if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)) { -- var_replace(var_hash, old_data, rval); -+ if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) { -+ var_push_dtor(var_hash, old_data); - } - zend_hash_index_update(ht, Z_LVAL_P(key), &data, sizeof(data), NULL); - break; - case IS_STRING: -- if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)) { -- var_replace(var_hash, old_data, rval); -+ if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ var_push_dtor(var_hash, old_data); - } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL); - break; diff --git a/lang/php5/files/patch-pear::Makefile.frag b/lang/php5/files/patch-pear::Makefile.frag index ee24944b46c6..082aa5e74fb8 100644 --- a/lang/php5/files/patch-pear::Makefile.frag +++ b/lang/php5/files/patch-pear::Makefile.frag @@ -4,7 +4,7 @@ # -*- makefile -*- peardir=$(PEAR_INSTALLDIR) -+XML_RPC_ver=1.1.0 ++XML_RPC_ver=1.2.2 # Skip all php.ini files altogether PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 diff --git a/lang/php5/files/patch-scripts::Makefile.frag b/lang/php5/files/patch-scripts::Makefile.frag index 133dea408d39..7570701e6beb 100644 --- a/lang/php5/files/patch-scripts::Makefile.frag +++ b/lang/php5/files/patch-scripts::Makefile.frag @@ -1,6 +1,6 @@ ---- scripts/Makefile.frag.orig Tue Nov 23 14:06:16 2004 -+++ scripts/Makefile.frag Tue Jan 25 08:19:07 2005 -@@ -26,18 +26,12 @@ +--- scripts/Makefile.frag.orig Mon Feb 28 06:28:25 2005 ++++ scripts/Makefile.frag Fri Apr 1 15:42:21 2005 +@@ -34,21 +34,12 @@ / \ Zend/ \ TSRM/ \ @@ -12,9 +12,12 @@ ext/libxml/ \ ext/standard/ \ - ext/session/ \ +- ext/dom/xml_common.h \ - ext/xml/ \ - ext/xml/expat/ \ - ext/mbstring/ \ +- ext/mbstring/libmbfl/ \ +- ext/mbstring/libmbfl/mbfl/ \ - ext/sqlite/libsqlite/src/sqlite.h + ext/spl/ diff --git a/lang/php5/files/patch-scripts::phpize.in b/lang/php5/files/patch-scripts::phpize.in index b75de61d6abf..cab5309be743 100644 --- a/lang/php5/files/patch-scripts::phpize.in +++ b/lang/php5/files/patch-scripts::phpize.in @@ -1,21 +1,15 @@ ---- scripts/phpize.in.orig Mon Aug 23 14:25:48 2004 -+++ scripts/phpize.in Mon Aug 23 14:26:41 2004 -@@ -101,14 +101,14 @@ +--- scripts/phpize.in.orig Fri Apr 1 15:42:47 2005 ++++ scripts/phpize.in Fri Apr 1 15:43:04 2005 +@@ -102,9 +102,9 @@ phpize_autotools() { - aclocal || exit 1 - autoconf || exit 1 - autoheader || exit 1 -+ aclocal15 || exit 1 ++ aclocal15 || exit 1 + autoconf253 || exit 1 + autoheader253 || exit 1 } - phpize_libtoolize() - { -- libtoolize=`$builddir/build/shtool path glibtoolize libtoolize` -+ libtoolize=`$builddir/build/shtool path libtoolize13` - $libtoolize -f -c || exit 1 - } - + # Main script diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist index 4431cf9db72e..40e1af9f8bed 100644 --- a/lang/php5/pkg-plist +++ b/lang/php5/pkg-plist @@ -188,6 +188,10 @@ include/php/regex/regex_extra.h include/php/regex/utils.h lib/php/build/Makefile.global lib/php/build/acinclude.m4 +lib/php/build/config.guess +lib/php/build/config.sub +lib/php/build/libtool.m4 +lib/php/build/ltmain.sh lib/php/build/mkdep.awk lib/php/build/phpize.m4 lib/php/build/scan_makefile_in.awk diff --git a/lang/php5/pkg-plist.pear b/lang/php5/pkg-plist.pear index 122f6132cc0f..9e212b3666d5 100644 --- a/lang/php5/pkg-plist.pear +++ b/lang/php5/pkg-plist.pear @@ -1,4 +1,6 @@ bin/pear +@unexec rm %D/lib/php/pear/.filemap 2> /dev/null || true +@unexec rm %D/lib/php/pear/.lock 2> /dev/null || true share/pear/bootstrap/Archive/Tar.php share/pear/bootstrap/PEAR.php share/pear/bootstrap/System.php @@ -30,6 +32,9 @@ share/pear/bootstrap/PEAR/Registry.php share/pear/bootstrap/PEAR/Remote.php share/pear/bootstrap/XML/RPC.php share/pear/bootstrap/XML/RPC/Server.php +@unexec rmdir %D/lib/php/pear/.registry 2> /dev/null || true +@unexec rmdir %D/lib/php/pear 2> /dev/null || true +@unexec rmdir %D/lib/php 2> /dev/null || true @dirrm share/pear/bootstrap/Archive @dirrm share/pear/bootstrap/Console @dirrm share/pear/bootstrap/OS |