Hello community,
here is the log from the commit of package php5
checked in at Tue Jun 26 11:12:05 CEST 2007.
--------
--- php5/php5.changes 2007-05-28 10:15:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/php5/php5.changes 2007-06-25 13:53:02.000000000 +0200
@@ -1,0 +2,32 @@
+Mon Jun 25 12:07:56 CEST 2007 - mmarek@suse.cz
+
+- provide /srv/www/cgi-bin/php5 compat symlink instead of patching
+ config files
+
+-------------------------------------------------------------------
+Sat Jun 23 11:03:50 UTC 2007 - judas_iscariote@shorewall.net
+
+- fixed a mess with update-alternatives PreReq uncovered by newer build versions.
+ actually every subpackage that uses update-alternatives should PreReq it.
+- fix some ZE2 bugs.
+
+-------------------------------------------------------------------
+Tue Jun 12 14:33:57 CEST 2007 - mmarek@suse.cz
+
+- drop php5.xpm and the Icon: line from the specfile (the icon is
+ not used at all and it breaks rpm -q --specfile php5.spec)
+
+-------------------------------------------------------------------
+Fri Jun 1 03:23:28 UTC 2007 - judas_iscariote@shorewall.net
+
+- PHP version 5.2.3 see http://www.php.net/releases/5_2_3.php
+- important: PHP-cgi now lives in /usr, package attempts to fix both
+ lighttpd and apache2 fastcgi config files.
+-------------------------------------------------------------------
+Wed May 30 01:36:58 UTC 2007 - judas_iscariote@shorewall.net
+
+- use system re2c in factory.
+- enable support for qbdm in the dba extension (build service only)
+- enable the ming extension (build service only)
+
+-------------------------------------------------------------------
Old:
----
get_ini_settings.php
php-5.2.2.tar.bz2
php5-avoid-libdb-dependency.patch
php5-MOPB-41-betterfix.patch
php5-phpbug-41293.patch
php5-PMOPB-45-2007.patch
php5-test-fixes.patch
php5.xpm
suhosin-patch-5.2.2-0.9.6.2.patch.gz
New:
----
php-5.2.3.tar.bz2
php5-cgi-missing-openbasedir.patch
php5-corrected-CVE-2007-2872.patch
php5-phpbug39330.patch
php5-ze2-fixes.patch
suhosin-patch-5.2.3-0.9.6.2.patch.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5.spec ++++++
++++ 754 lines (skipped)
++++ between php5/php5.spec
++++ and /mounts/work_src_done/STABLE/php5/php5.spec
++++++ php-5.2.2.tar.bz2 -> php-5.2.3.tar.bz2 ++++++
php5/php-5.2.2.tar.bz2 /mounts/work_src_done/STABLE/php5/php-5.2.3.tar.bz2 differ: byte 11, line 1
++++++ php5-cgi-missing-openbasedir.patch ++++++
Index: sapi/cgi/cgi_main.c
===================================================================
RCS file: /repository/php-src/sapi/cgi/cgi_main.c,v
retrieving revision 1.267.2.15.2.40
diff -u -r1.267.2.15.2.40 cgi_main.c
--- sapi/cgi/cgi_main.c 28 May 2007 08:11:59 -0000 1.267.2.15.2.40
+++ sapi/cgi/cgi_main.c 4 Jun 2007 23:43:24 -0000
@@ -1682,7 +1690,9 @@
*/
retval = FAILURE;
if (cgi || SG(request_info).path_translated) {
- retval = php_fopen_primary_script(&file_handle TSRMLS_CC);
+ if (!php_check_open_basedir(SG(request_info).path_translated TSRMLS_CC)) {
+ retval = php_fopen_primary_script(&file_handle TSRMLS_CC);
+ }
}
/*
if we are unable to open path_translated and we are not
@@ -1704,9 +1714,21 @@
goto fastcgi_request_done;
}
#endif
+
+ STR_FREE(SG(request_info).path_translated);
+
+ if (free_query_string && SG(request_info).query_string) {
+ free(SG(request_info).query_string);
+ SG(request_info).query_string = NULL;
+ }
+
php_request_shutdown((void *) 0);
SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
+ sapi_shutdown();
+#ifdef ZTS
+ tsrm_shutdown();
+#endif
return FAILURE;
}
Index: sapi/cgi/tests/009.phpt
===================================================================
RCS file: /repository/php-src/sapi/cgi/tests/009.phpt,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- sapi/cgi/tests/009.phpt 20 May 2007 15:56:10 -0000 1.1.2.1
+++ sapi/cgi/tests/009.phpt 3 Jun 2007 22:50:19 -0000 1.1.2.2
@@ -14,11 +14,13 @@
putenv("TRANSLATED_PATH=".$f."/x");
putenv("SCRIPT_FILENAME=".$f."/x");
-file_put_contents($f, '<?php var_dump($_SERVER["TRANSLATED_PATH"]); ');
+file_put_contents($f, '<?php var_dump($_SERVER["TRANSLATED_PATH"]); ?>');
-echo (`$php $f`);
+echo (`$php -n $f`);
echo "Done\n";
+
+@unlink($f);
?>
--EXPECTF--
X-Powered-By: PHP/%s
++++++ php5-corrected-CVE-2007-2872.patch ++++++
Index: ext/standard/string.c
===================================================================
RCS file: /repository/php-src/ext/standard/string.c,v
retrieving revision 1.445.2.14.2.58
retrieving revision 1.445.2.14.2.59
diff -u -r1.445.2.14.2.58 -r1.445.2.14.2.59
--- ext/standard/string.c 30 May 2007 00:33:13 -0000 1.445.2.14.2.58
+++ ext/standard/string.c 3 Jun 2007 18:47:10 -0000 1.445.2.14.2.59
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.58 2007/05/30 00:33:13 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.59 2007/06/03 18:47:10 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1956,18 +1956,20 @@
char *p, *q;
int chunks; /* complete chunks! */
int restlen;
- int out_len;
+ float out_len;
chunks = srclen / chunklen;
restlen = srclen - chunks * chunklen; /* srclen % chunklen */
- out_len = (srclen + (chunks + 1) * endlen + 1);
+ out_len = chunks + 1;
+ out_len *= endlen;
+ out_len += srclen + 1;
if (out_len > INT_MAX || out_len <= 0) {
return NULL;
}
- dest = safe_emalloc(out_len, sizeof(char), 0);
+ dest = safe_emalloc((int)out_len, sizeof(char), 0);
for (p = src, q = dest; p < (src + srclen - chunklen + 1); ) {
memcpy(q, p, chunklen);
++++++ php5-phpbug-41293.patch -> php5-phpbug39330.patch ++++++
--- php5/php5-phpbug-41293.patch 2007-05-28 10:07:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/php5/php5-phpbug39330.patch 2007-06-25 13:55:33.000000000 +0200
@@ -1,61 +1,26 @@
-Index: main/php_content_types.c
+Old problem, recently fixed see http://bugs.php.net/bug.php?id=39330
+Index: sapi/apache2handler/sapi_apache2.c
===================================================================
-RCS file: /repository/php-src/main/php_content_types.c,v
-retrieving revision 1.32.2.1.2.2
-retrieving revision 1.32.2.1.2.4
-diff -u -r1.32.2.1.2.2 -r1.32.2.1.2.4
---- main/php_content_types.c 1 Apr 2007 19:09:36 -0000 1.32.2.1.2.2
-+++ main/php_content_types.c 7 May 2007 23:27:59 -0000 1.32.2.1.2.4
-@@ -16,7 +16,7 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id: php_content_types.c,v 1.32.2.1.2.2 2007/04/01 19:09:36 iliaa Exp $ */
-+/* $Id: php_content_types.c,v 1.32.2.1.2.4 2007/05/07 23:27:59 iliaa Exp $ */
-
- #include "php.h"
- #include "SAPI.h"
-@@ -37,21 +37,21 @@
- */
- SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader)
- {
-- char *data = NULL;
-- int length = 0;
-+ char *data;
-+ int length;
+RCS file: /repository/php-src/sapi/apache2handler/sapi_apache2.c,v
+retrieving revision 1.57.2.10.2.13
+diff -u -r1.57.2.10.2.13 sapi_apache2.c
+--- sapi/apache2handler/sapi_apache2.c 1 Jan 2007 09:36:12 -0000 1.57.2.10.2.13
++++ sapi/apache2handler/sapi_apache2.c 1 Jun 2007 11:54:09 -0000
+@@ -651,11 +655,17 @@
+ return OK;
+ }
- /* $HTTP_RAW_POST_DATA registration */
-- if(!strcmp(SG(request_info).request_method, "POST")) {
-- if(NULL == SG(request_info).post_entry && SG(request_info).post_data) {
-+ if (!strcmp(SG(request_info).request_method, "POST")) {
-+ if (NULL == SG(request_info).post_entry) {
- /* no post handler registered, so we just swallow the data */
- sapi_read_standard_form_data(TSRMLS_C);
-+ }
++static void php_apache_child_init(apr_pool_t *pchild, server_rec *s)
++{
++ apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, apr_pool_cleanup_null);
++}
+
-+ /* For unknown content types we create HTTP_RAW_POST_DATA even if always_populate_raw_post_data off,
-+ * this is in-effecient, but we need to keep doing it for BC reasons (for now) */
-+ if ((PG(always_populate_raw_post_data) || NULL == SG(request_info).post_entry) && SG(request_info).post_data) {
- length = SG(request_info).post_data_length;
- data = estrndup(SG(request_info).post_data, length);
-- } else if(PG(always_populate_raw_post_data) && SG(request_info).post_data) {
-- length = SG(request_info).post_data_length;
-- data = estrndup(SG(request_info).post_data, length);
-- }
-- if(data) {
- SET_VAR_STRINGL("HTTP_RAW_POST_DATA", data, length);
- }
- }
-@@ -62,11 +62,10 @@
- in the long run post handlers should be changed to not touch
- request_info.post_data for memory preservation reasons
- */
-- if(SG(request_info).post_data) {
-+ if (SG(request_info).post_data) {
- SG(request_info).raw_post_data = estrndup(SG(request_info).post_data, SG(request_info).post_data_length);
- SG(request_info).raw_post_data_length = SG(request_info).post_data_length;
- }
--
+ void php_ap2_register_hook(apr_pool_t *p)
+ {
+ ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_post_config(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE);
++ ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE);
}
- /* }}} */
+ /*
++++++ php5-ze2-fixes.patch ++++++
Index: Zend/zend_operators.c
===================================================================
RCS file: /repository/ZendEngine2/zend_operators.c,v
retrieving revision 1.208.2.4.2.21
retrieving revision 1.208.2.4.2.22
diff -u -r1.208.2.4.2.21 -r1.208.2.4.2.22
--- Zend/zend_operators.c 23 Apr 2007 09:56:30 -0000 1.208.2.4.2.21
+++ Zend/zend_operators.c 6 Jun 2007 11:57:36 -0000 1.208.2.4.2.22
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.c,v 1.208.2.4.2.21 2007/04/23 09:56:30 dmitry Exp $ */
+/* $Id: zend_operators.c,v 1.208.2.4.2.22 2007/06/06 11:57:36 tony2001 Exp $ */
#include
participants (1)
-
root@Hilbert.suse.de