diff options
author | martti <martti@pkgsrc.org> | 2006-02-06 06:39:59 +0000 |
---|---|---|
committer | martti <martti@pkgsrc.org> | 2006-02-06 06:39:59 +0000 |
commit | d5484cd27d7cf3fcf441d9f0fc32580a03076619 (patch) | |
tree | f43f9941a6ffaff6bfbe7124c952151c7555558b /lang | |
parent | ff932ea4164b1f84bcf739e574cc782a41129548 (diff) | |
download | pkgsrc-d5484cd27d7cf3fcf441d9f0fc32580a03076619.tar.gz |
Updated lang/php5 to 5.1.2
* HTTP Response Splitting has been addressed in ext/session and in
the header() function.
* Fixed format string vulnerability in ext/mysqli.
* Fixed possible cross-site scripting problems in certain error conditions.
* Hash & XMLWriter extensions added and enabled by default.
* Upgraded OCI8 extension.
* Over 85 various bug fixes.
(I haven't heard anything from the MAINTAINER but since this works fine
on my servers and as this fixes security issues I checked in this)
Diffstat (limited to 'lang')
-rw-r--r-- | lang/php5/Makefile | 4 | ||||
-rw-r--r-- | lang/php5/Makefile.common | 4 | ||||
-rw-r--r-- | lang/php5/PLIST | 19 | ||||
-rw-r--r-- | lang/php5/buildlink3.mk | 6 | ||||
-rw-r--r-- | lang/php5/distinfo | 16 | ||||
-rw-r--r-- | lang/php5/patches/patch-ag | 11 | ||||
-rw-r--r-- | lang/php5/patches/patch-aj | 10 | ||||
-rw-r--r-- | lang/php5/patches/patch-ak | 10 | ||||
-rw-r--r-- | lang/php5/patches/patch-ao | 12 |
9 files changed, 55 insertions, 37 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index eabba22cc6b..c76854bc932 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2006/02/05 23:09:47 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2006/02/06 06:39:59 martti Exp $ # PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 4 +#PKGREVISION= 1 CATEGORIES= lang HOMEPAGE= http://www.php.net/ diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common index 777cedf9ce1..5f22e02fa93 100644 --- a/lang/php5/Makefile.common +++ b/lang/php5/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2005/12/05 20:50:26 rillig Exp $ +# $NetBSD: Makefile.common,v 1.14 2006/02/06 06:39:59 martti Exp $ # DISTNAME?= php-${PHP_BASE_VERS} @@ -14,7 +14,7 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= jdolecek@NetBSD.org HOMEPAGE?= http://www.php.net/ -PHP_BASE_VERS= 5.1.1 +PHP_BASE_VERS= 5.1.2 PHP_EXTENSION_DIR= lib/php/20040412 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} diff --git a/lang/php5/PLIST b/lang/php5/PLIST index 0638b17be44..3a55e3d709f 100644 --- a/lang/php5/PLIST +++ b/lang/php5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2006/02/02 20:31:17 rillig Exp $ +@comment $NetBSD: PLIST,v 1.10 2006/02/06 06:39:59 martti Exp $ bin/pear bin/peardev bin/pecl @@ -58,7 +58,6 @@ include/php/Zend/zend_objects_API.h include/php/Zend/zend_operators.h include/php/Zend/zend_ptr_stack.h include/php/Zend/zend_qsort.h -include/php/Zend/zend_reflection_api.h include/php/Zend/zend_stack.h include/php/Zend/zend_static_allocator.h include/php/Zend/zend_stream.h @@ -74,6 +73,18 @@ include/php/ext/date/lib/timelib.h include/php/ext/date/lib/timelib_config.h include/php/ext/date/lib/timelib_structs.h include/php/ext/date/php_date.h +include/php/ext/hash/php_hash.h +include/php/ext/hash/php_hash_adler32.h +include/php/ext/hash/php_hash_crc32.h +include/php/ext/hash/php_hash_gost.h +include/php/ext/hash/php_hash_haval.h +include/php/ext/hash/php_hash_md.h +include/php/ext/hash/php_hash_ripemd.h +include/php/ext/hash/php_hash_sha.h +include/php/ext/hash/php_hash_snefru.h +include/php/ext/hash/php_hash_tiger.h +include/php/ext/hash/php_hash_types.h +include/php/ext/hash/php_hash_whirlpool.h include/php/ext/libxml/php_libxml.h include/php/ext/pcre/pcrelib/internal.h include/php/ext/pcre/pcrelib/pcre.h @@ -133,7 +144,6 @@ include/php/ext/standard/php_smart_str.h include/php/ext/standard/php_smart_str_public.h include/php/ext/standard/php_standard.h include/php/ext/standard/php_string.h -include/php/ext/standard/php_sunfuncs.h include/php/ext/standard/php_type.h include/php/ext/standard/php_uuencode.h include/php/ext/standard/php_var.h @@ -350,6 +360,8 @@ share/php/php.gif @dirrm lib/php/.registry/.channel.pecl.php.net @dirrm lib/php/.registry/.channel.__uri @dirrm lib/php/.registry +@dirrm lib/php/.channels/.alias +@dirrm lib/php/.channels @unexec ${RM} -rf %D/lib/php/Net @dirrm include/php/regex @dirrm include/php/main/streams @@ -361,6 +373,7 @@ share/php/php.gif @dirrm include/php/ext/pcre/pcrelib @dirrm include/php/ext/pcre @dirrm include/php/ext/libxml +@dirrm include/php/ext/hash @dirrm include/php/ext/date/lib @dirrm include/php/ext/date @dirrm include/php/ext diff --git a/lang/php5/buildlink3.mk b/lang/php5/buildlink3.mk index be192d881e6..2ea3baaaadb 100644 --- a/lang/php5/buildlink3.mk +++ b/lang/php5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2006/02/06 06:39:59 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PHP_BUILDLINK3_MK:= ${PHP_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphp} BUILDLINK_PACKAGES+= php .if !empty(PHP_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.php+= php-5.1.* -BUILDLINK_RECOMMENDED.php+= php>=5.1.1nb4 +BUILDLINK_DEPENDS.php+= php>=5.1.2 +BUILDLINK_RECOMMENDED.php+= php>=5.1.2 BUILDLINK_PKGSRCDIR.php?= ../../lang/php5 .endif # PHP_BUILDLINK3_MK diff --git a/lang/php5/distinfo b/lang/php5/distinfo index e319f0f2918..3a7b87070d5 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.13 2005/12/06 08:32:22 jdolecek Exp $ +$NetBSD: distinfo,v 1.14 2006/02/06 06:39:59 martti Exp $ -SHA1 (php-5.1.1.tar.bz2) = 38c59909091c788cab21abb7562f90901da797b9 -RMD160 (php-5.1.1.tar.bz2) = 7578bca79f48b83176c1dfe4c71165de88453744 -Size (php-5.1.1.tar.bz2) = 6149470 bytes -SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4 +SHA1 (php-5.1.2.tar.bz2) = f6acc67c293345ad22065768f3049834cb8a912e +RMD160 (php-5.1.2.tar.bz2) = 1e21b5ba280b7efc8197802c673bb5d4e9dc9f8e +Size (php-5.1.2.tar.bz2) = 6319905 bytes +SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587 -SHA1 (patch-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3 -SHA1 (patch-ak) = 0faa523103e0a9a3c01c78c2fe9a64c0a9b2fc43 -SHA1 (patch-ao) = bbd5aba2e45bb236eafac351f382633ef76b51f0 +SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc +SHA1 (patch-ak) = 2d5264d33ebef631d4a2d0cdf8a2ed365bdbeb7e +SHA1 (patch-ao) = 60fec83647ca5924a38bf4d5e8abb51feba1620e diff --git a/lang/php5/patches/patch-ag b/lang/php5/patches/patch-ag index 81d16856b8d..a2304bc5e11 100644 --- a/lang/php5/patches/patch-ag +++ b/lang/php5/patches/patch-ag @@ -1,7 +1,8 @@ -$NetBSD: patch-ag,v 1.1 2005/12/06 08:32:22 jdolecek Exp $ ---- php.ini-dist.orig 2003-07-10 00:38:36.000000000 +0200 -+++ php.ini-dist 2003-08-30 21:59:51.000000000 +0200 -@@ -424,8 +424,9 @@ +$NetBSD: patch-ag,v 1.2 2006/02/06 06:39:59 martti Exp $ + +--- php.ini-dist.orig 2005-12-30 19:15:55.000000000 +0200 ++++ php.ini-dist 2006-02-05 15:36:13.000000000 +0200 +@@ -457,8 +457,9 @@ ; if nonempty. user_dir = @@ -13,7 +14,7 @@ $NetBSD: patch-ag,v 1.1 2005/12/06 08:32:22 jdolecek Exp $ ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -@@ -476,7 +477,7 @@ +@@ -508,7 +509,7 @@ ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). diff --git a/lang/php5/patches/patch-aj b/lang/php5/patches/patch-aj index 934b90c1b3d..6a4c14fb425 100644 --- a/lang/php5/patches/patch-aj +++ b/lang/php5/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.2 2005/04/11 20:16:02 jdolecek Exp $ +$NetBSD: patch-aj,v 1.3 2006/02/06 06:39:59 martti Exp $ ---- ext/imap/config.m4.orig 2005-04-08 20:55:11.000000000 +0200 -+++ ext/imap/config.m4 2005-04-08 20:55:01.000000000 +0200 -@@ -54,6 +54,14 @@ +--- ext/imap/config.m4.orig 2005-05-30 02:16:41.000000000 +0300 ++++ ext/imap/config.m4 2006-02-05 15:36:56.000000000 +0200 +@@ -42,6 +42,14 @@ ]) ]) @@ -17,7 +17,7 @@ $NetBSD: patch-aj,v 1.2 2005/04/11 20:16:02 jdolecek Exp $ AC_DEFUN([PHP_IMAP_KRB_CHK], [ if test "$PHP_KERBEROS" != "no"; then PHP_SETUP_KERBEROS(IMAP_SHARED_LIBADD, -@@ -65,7 +73,7 @@ +@@ -53,7 +61,7 @@ Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr ) ]) ]) diff --git a/lang/php5/patches/patch-ak b/lang/php5/patches/patch-ak index 01c17dee377..33684428a2c 100644 --- a/lang/php5/patches/patch-ak +++ b/lang/php5/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1 2004/10/31 21:14:54 jdolecek Exp $ +$NetBSD: patch-ak,v 1.2 2006/02/06 06:39:59 martti Exp $ ---- ext/imap/php_imap.c.orig 2004-08-12 21:32:18.000000000 +0200 -+++ ext/imap/php_imap.c 2004-10-31 21:11:57.000000000 +0100 -@@ -428,6 +428,11 @@ +--- ext/imap/php_imap.c.orig 2006-01-05 02:47:16.000000000 +0200 ++++ ext/imap/php_imap.c 2006-02-05 15:37:19.000000000 +0200 +@@ -429,6 +429,11 @@ ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL) @@ -14,7 +14,7 @@ $NetBSD: patch-ak,v 1.1 2004/10/31 21:14:54 jdolecek Exp $ #ifndef PHP_WIN32 mail_link(&unixdriver); /* link in the unix driver */ mail_link(&mhdriver); /* link in the mh driver */ -@@ -443,6 +448,10 @@ +@@ -444,6 +449,10 @@ mail_link(&tenexdriver); /* link in the tenex driver */ mail_link(&mtxdriver); /* link in the mtx driver */ mail_link(&dummydriver); /* link in the dummy driver */ diff --git a/lang/php5/patches/patch-ao b/lang/php5/patches/patch-ao index dfee582dbac..b415cb1f98b 100644 --- a/lang/php5/patches/patch-ao +++ b/lang/php5/patches/patch-ao @@ -1,11 +1,15 @@ -$NetBSD: patch-ao,v 1.2 2005/12/04 12:02:08 jdolecek Exp $ +$NetBSD: patch-ao,v 1.3 2006/02/06 06:39:59 martti Exp $ ---- ext/bz2/bz2_filter.c.orig 2005-08-03 16:06:39.000000000 +0200 -+++ ext/bz2/bz2_filter.c -@@ -20,2 +20,6 @@ +--- ext/bz2/bz2_filter.c.orig 2006-01-01 14:50:00.000000000 +0200 ++++ ext/bz2/bz2_filter.c 2006-02-05 15:37:44.000000000 +0200 +@@ -22,6 +22,10 @@ + #include "config.h" + #endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "php.h" + #include "php_bz2.h" + |