pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q4]: pkgsrc/www/php4 Pullup ticket 2041 - requested by adr...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a7583735b3b3
branches: pkgsrc-2006Q4
changeset: 523052:a7583735b3b3
user: salo <salo%pkgsrc.org@localhost>
date: Wed Mar 07 00:22:53 2007 +0000
description:
Pullup ticket 2041 - requested by adrianp
security update for php4
Revisions pulled up:
- pkgsrc/www/php4/Makefile 1.75
- pkgsrc/www/php4/Makefile.common 1.55
- pkgsrc/www/php4/PLIST 1.16
- pkgsrc/www/php4/distinfo 1.61
- pkgsrc/www/php4/patches/patch-au removed
- pkgsrc/www/php4/patches/patch-av removed
Module Name: pkgsrc
Committed By: adrianp
Date: Sat Mar 3 13:19:53 UTC 2007
Modified Files:
pkgsrc/www/php4: Makefile Makefile.common PLIST distinfo
Removed Files:
pkgsrc/www/php4/patches: patch-au patch-av
Log Message:
Update to 4.4.6
* Updated PCRE to version 7.0.
* Fixed segfault in ext/session when register_globals=On.
* Fixed (segfault in cURL extension).
* Fixed (possible cURL memory error).
* Fixed (imagettftext() multithreading issue).
* Fixed (ext/interbase compile failure).
* Fixed (PHP fastcgi with PHP_FCGI_CHILDREN don't kill children when
parent is killed).
4.4.5
# Upgraded PEAR to 1.5.0.
# Updated PCRE to version 6.7.
# Moved extensions to PECL: ext/ovrimos
# Added a meta tag to phpinfo() output to prevent search engines from
indexing the page.
# Backported a fix in the configure tests to detect the "rounding fuzz".
# Backported fix for ext/imap compilation failure with recent c-client
versions.
# Fixed missing open_basedir check inside chdir() function.
# Fixed (Compile fails when using GCC 4.1.1/binutils 2.17).
# Fixed (pg_insert/pg_update do not allow now() to be used for timestamp
fields).
# Fixed (using autoconf 2.6x and --with-layout=GNU breaks PEAR install
path).
# Fixed (Using $this not in object context can cause segfaults).
# Fixed (ext/dba doesn't check for db-4.5 and db-4.4 when db4 support is
enabled).
# Fixed (ftp_put() does not change transfer mode to ASCII).
# Fixed (ftp_nlist() returns false on empty dirs).
# Fixed (Allow building of curl extension against libcurl 7.16.0).
# Fixed (curl_exec() with return transfer returns TRUE on empty files).
# Fixed (Fixed a possible open_basedir bypass in tempnam()).
# Fixed (ldap_connect causes segfault with newer versions of OpenLDAP).
# Fixed (parse_url() fails if passing '@' in passwd).
# Fixed (Calling undefined method prints insufficient error message).
# Fixed (segfault when calling setlocale() in userspace session handler).
# Fixed (constructor is not called for classes used in userspace stream
wrappers).
# Fixed (wddx_serialize_value() generates no wellformed xml).
# Fixed (aggregate_methods_by_list fails to take certain methods).
# Fixed (natcasesort() causes array_pop() to misbehave).
# Fixed (CURLOPT_HEADERFUNCTION, couldn't set the function in the class).
# Fixed (recursive array_walk causes segfault).
diffstat:
www/php4/Makefile | 3 +-
www/php4/Makefile.common | 4 +-
www/php4/PLIST | 58 +++++++++++++++++++++++++++++++++++++++++++---
www/php4/distinfo | 10 +++----
www/php4/patches/patch-au | 16 ------------
www/php4/patches/patch-av | 32 -------------------------
6 files changed, 61 insertions(+), 62 deletions(-)
diffs (219 lines):
diff -r 86cd4e7f7b40 -r a7583735b3b3 www/php4/Makefile
--- a/www/php4/Makefile Tue Mar 06 15:19:47 2007 +0000
+++ b/www/php4/Makefile Wed Mar 07 00:22:53 2007 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2006/11/04 11:19:41 adrianp Exp $
+# $NetBSD: Makefile,v 1.73.2.1 2007/03/07 00:22:53 salo Exp $
PKGNAME= php-${PHP_BASE_VERS}
-PKGREVISION= 3
CATEGORIES+= lang
COMMENT= HTML-embedded scripting language
diff -r 86cd4e7f7b40 -r a7583735b3b3 www/php4/Makefile.common
--- a/www/php4/Makefile.common Tue Mar 06 15:19:47 2007 +0000
+++ b/www/php4/Makefile.common Wed Mar 07 00:22:53 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2006/08/20 09:44:59 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.54.4.1 2007/03/07 00:22:53 salo Exp $
DISTNAME?= php-${PHP_DIST_VERS}
CATEGORIES+= www php4
@@ -18,7 +18,7 @@
# PHP_DIST_VERS version number on the php distfile
# PHP_BASE_VERS pkgsrc-mangled version number (convert pl -> .)
#
-PHP_DIST_VERS= 4.4.4
+PHP_DIST_VERS= 4.4.6
PHP_BASE_VERS= ${PHP_DIST_VERS}
DISTFILES?= ${PHP_DISTFILE}
diff -r 86cd4e7f7b40 -r a7583735b3b3 www/php4/PLIST
--- a/www/php4/PLIST Tue Mar 06 15:19:47 2007 +0000
+++ b/www/php4/PLIST Wed Mar 07 00:22:53 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/03/03 07:11:34 cube Exp $
+@comment $NetBSD: PLIST,v 1.15.8.1 2007/03/07 00:22:53 salo Exp $
bin/pear
bin/peardev
bin/pecl
@@ -211,6 +211,7 @@
lib/php/.registry/html_template_it.reg
lib/php/.registry/net_useragent_detect.reg
lib/php/.registry/pear.reg
+lib/php/.registry/structures_graph.reg
@exec ${MKDIR} %D/lib/php/20020429
lib/php/Archive/Tar.php
lib/php/Console/Getopt.php
@@ -317,9 +318,36 @@
lib/php/build/shtool
lib/php/data/PEAR/package.dtd
lib/php/data/PEAR/template.spec
+lib/php/data/Structures_Graph/LICENSE
+lib/php/data/Structures_Graph/package.sh
+lib/php/data/Structures_Graph/publish.sh
+lib/php/data/Structures_Graph/genpackage.xml.pl
lib/php/doc/Archive_Tar/docs/Archive_Tar.txt
lib/php/doc/HTML_Template_IT/examples/sample_it.php
lib/php/doc/HTML_Template_IT/examples/templates/main.tpl.htm
+lib/php/doc/PEAR/README
+lib/php/doc/PEAR/INSTALL
+lib/php/doc/Structures_Graph/docs/html/media/stylesheet.css
+lib/php/doc/Structures_Graph/docs/html/media/banner.css
+lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_TopologicalSorter.html
+lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Node.html
+lib/php/doc/Structures_Graph/docs/html/Structures_Graph/tutorial_Structures_Graph.pkg.html
+lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_AcyclicTest_php.html
+lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_TopologicalSorter_php.html
+lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Node_php.html
+lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_php.html
+lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph.html
+lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_AcyclicTest.html
+lib/php/doc/Structures_Graph/docs/html/elementindex.html
+lib/php/doc/Structures_Graph/docs/html/elementindex_Structures_Graph.html
+lib/php/doc/Structures_Graph/docs/html/errors.html
+lib/php/doc/Structures_Graph/docs/html/index.html
+lib/php/doc/Structures_Graph/docs/html/li_Structures_Graph.html
+lib/php/doc/Structures_Graph/docs/html/packages.html
+lib/php/doc/Structures_Graph/docs/html/todolist.html
+lib/php/doc/Structures_Graph/docs/html/classtrees_Structures_Graph.html
+lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
+lib/php/doc/Structures_Graph/docs/generate.sh
lib/php/pearcmd.php
lib/php/peclcmd.php
lib/php/test/HTML_Template_IT/tests/Console_TestListener.php
@@ -336,6 +364,13 @@
lib/php/test/HTML_Template_IT/tests/templates/loadtemplatefile.html
lib/php/test/HTML_Template_IT/tests/templates/replaceblock.html
lib/php/test/HTML_Template_IT/tests/test.php
+lib/php/test/Structures_Graph/tests/testCase/BasicGraph.php
+lib/php/test/Structures_Graph/tests/README
+lib/php/test/Structures_Graph/tests/all-tests.php
+lib/php/Structures/Graph/Manipulator/AcyclicTest.php
+lib/php/Structures/Graph/Manipulator/TopologicalSorter.php
+lib/php/Structures/Graph/Node.php
+lib/php/Structures/Graph.php
libexec/cgi-bin/php
man/man1/php-config.1
man/man1/php.1
@@ -345,17 +380,29 @@
share/php/php.gif
@dirrm share/php
@dirrm share/examples/php
+@dirrm lib/php/data/Structures_Graph
@dirrm lib/php/data/PEAR
@dirrm lib/php/data
-@dirrm lib/php/test/HTML_Template_IT/tests/templates
-@dirrm lib/php/test/HTML_Template_IT/tests
-@dirrm lib/php/test/HTML_Template_IT
+@dirrm lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph
+@dirrm lib/php/doc/Structures_Graph/docs/tutorials
+@dirrm lib/php/doc/Structures_Graph/docs/html/media
+@dirrm lib/php/doc/Structures_Graph/docs/html/Structures_Graph
+@dirrm lib/php/doc/Structures_Graph/docs/html
+@dirrm lib/php/doc/Structures_Graph/docs
+@dirrm lib/php/doc/Structures_Graph
@dirrm lib/php/doc/HTML_Template_IT/examples/templates
@dirrm lib/php/doc/HTML_Template_IT/examples
@dirrm lib/php/doc/HTML_Template_IT
@dirrm lib/php/doc/Archive_Tar/docs
@dirrm lib/php/doc/Archive_Tar
+@dirrm lib/php/doc/PEAR
@dirrm lib/php/doc
+@dirrm lib/php/test/HTML_Template_IT/tests/templates
+@dirrm lib/php/test/HTML_Template_IT/tests
+@dirrm lib/php/test/HTML_Template_IT
+@dirrm lib/php/test/Structures_Graph/tests/testCase
+@dirrm lib/php/test/Structures_Graph/tests
+@dirrm lib/php/test/Structures_Graph
@dirrm lib/php/test
@dirrm lib/php/build
@dirrm lib/php/PEAR/Validator
@@ -379,6 +426,9 @@
@dirrm lib/php/OS
@dirrm lib/php/Net/UserAgent
@dirrm lib/php/Net
+@dirrm lib/php/Structures/Graph/Manipulator
+@dirrm lib/php/Structures/Graph
+@dirrm lib/php/Structures
@dirrm lib/php/.channels/.alias
@dirrm lib/php/.channels
@dirrm lib/php/.registry/.channel.pecl.php.net
diff -r 86cd4e7f7b40 -r a7583735b3b3 www/php4/distinfo
--- a/www/php4/distinfo Tue Mar 06 15:19:47 2007 +0000
+++ b/www/php4/distinfo Wed Mar 07 00:22:53 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.60 2006/11/04 11:19:41 adrianp Exp $
+$NetBSD: distinfo,v 1.60.2.1 2007/03/07 00:22:54 salo Exp $
-SHA1 (php-4.4.4.tar.bz2) = 05d62910fb5734344db87f0a17b1e8e001b26b05
-RMD160 (php-4.4.4.tar.bz2) = 02fd7d5135a9e5ce11d905a4a474a5d42b8441f3
-Size (php-4.4.4.tar.bz2) = 4478698 bytes
+SHA1 (php-4.4.6.tar.bz2) = e9c11ae084e2d505568d672afd06d4e6fc431621
+RMD160 (php-4.4.6.tar.bz2) = 16a81ee94d1f8f56adf3e76dde32c62597130674
+Size (php-4.4.6.tar.bz2) = 4559282 bytes
SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
SHA1 (patch-ab) = 38a4bcd0d65b26c5d8e54e22b552f60831188469
SHA1 (patch-ac) = 28288b1e79c14fb2b40eaefed0d6d2bff4775607
@@ -16,5 +16,3 @@
SHA1 (patch-ao) = 0fd4becf023451ac8cb185df354830efc86c1344
SHA1 (patch-ap) = 2f852abd1e9d0f089add18b2eade2831253ad00e
SHA1 (patch-at) = f8b3aebd61fe2d5b5a994e1d973424a1ed397f63
-SHA1 (patch-au) = 8b8e317dbb9cfc265bf29ebe0827d9b734a1a3b7
-SHA1 (patch-av) = d2e828caa542288d5444cf9d39f3aa0fa7a6f438
diff -r 86cd4e7f7b40 -r a7583735b3b3 www/php4/patches/patch-au
--- a/www/php4/patches/patch-au Tue Mar 06 15:19:47 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-au,v 1.3 2006/10/22 13:16:41 adrianp Exp $
-
-# CVE-2006-4625
-
---- Zend/zend_ini.c.orig 2005-09-02 22:09:03.000000000 +0100
-+++ Zend/zend_ini.c
-@@ -256,7 +256,8 @@ ZEND_API int zend_restore_ini_entry(char
- zend_ini_entry *ini_entry;
- TSRMLS_FETCH();
-
-- if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry)==FAILURE) {
-+ if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry)==FAILURE ||
-+ (stage == ZEND_INI_STAGE_RUNTIME && (ini_entry->modifyable & ZEND_INI_USER) == 0)) { return FAILURE;
- return FAILURE;
- }
-
diff -r 86cd4e7f7b40 -r a7583735b3b3 www/php4/patches/patch-av
--- a/www/php4/patches/patch-av Tue Mar 06 15:19:47 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-av,v 1.3 2006/11/04 11:19:41 adrianp Exp $
-
-# CVE-2006-5465
-
---- ext/standard/html.c.orig 2006-02-25 21:33:06.000000000 +0000
-+++ ext/standard/html.c
-@@ -878,7 +878,7 @@ PHPAPI char *php_escape_html_entities(un
-
- matches_map = 0;
-
-- if (len + 9 > maxlen)
-+ if (len + 16 > maxlen)
- replaced = erealloc (replaced, maxlen += 128);
-
- if (all) {
-@@ -903,9 +903,15 @@ PHPAPI char *php_escape_html_entities(un
- }
-
- if (matches_map) {
-+ int l = strlen(rep);
-+ /* increase the buffer size */
-+ if (len + 2 + l >= maxlen) {
-+ replaced = erealloc(replaced, maxlen += 128);
-+ }
-+
- replaced[len++] = '&';
- strcpy(replaced + len, rep);
-- len += strlen(rep);
-+ len += l;
- replaced[len++] = ';';
- }
- }
Home |
Main Index |
Thread Index |
Old Index