rpms/php/devel php-5.0.3-memset0.patch, NONE, 1.1 php-5.0.3-zendwarn.patch, NONE, 1.1 php.spec, 1.61, 1.62

Wed Mar 30 21:02:25 UTC 2005

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11468

Modified Files:
	php.spec 
Added Files:
	php-5.0.3-memset0.patch php-5.0.3-zendwarn.patch 
Log Message:
* Wed Mar 30 2005 Joe Orton <jorton at redhat.com> 5.0.3-5
- BuildRequire mysql-devel >= 4.1
- don't mark php.ini as noreplace to make upgrades work (#152171)
- fix subpackage descriptions (#152628)
- fix memset(,,0) in Zend (thanks to Dave Jones)
- fix various compiler warnings in Zend


php-5.0.3-memset0.patch:
 zend_execute.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE php-5.0.3-memset0.patch ---
--- php-5.0.3/Zend/zend_execute.c.memset0
+++ php-5.0.3/Zend/zend_execute.c
@@ -4293,7 +4293,7 @@
 
 void zend_init_opcodes_handlers()
 {
-	memset(zend_opcode_handlers, sizeof(zend_opcode_handlers), 0);
+	memset(zend_opcode_handlers, 0, sizeof(zend_opcode_handlers));
 	zend_opcode_handlers[ZEND_NOP] = zend_nop_handler;
 	zend_opcode_handlers[ZEND_ADD] = zend_add_handler;
 	zend_opcode_handlers[ZEND_SUB] = zend_sub_handler;

php-5.0.3-zendwarn.patch:
 zend_compile.c |    9 +--------
 zend_ini.c     |   39 ---------------------------------------
 zend_mm.c      |    4 ++--
 3 files changed, 3 insertions(+), 49 deletions(-)

--- NEW FILE php-5.0.3-zendwarn.patch ---

Fix various compiler warnings.

--- php-5.0.3/Zend/zend_ini.c.zendwarn
+++ php-5.0.3/Zend/zend_ini.c
@@ -325,45 +325,6 @@
 	return "";
 }
 
-
-static void zend_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
-{
-	if (ini_entry->displayer) {
-		ini_entry->displayer(ini_entry, type);
-	} else {
-		char *display_string;
-		uint display_string_length;
-
-		if (type==ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
-			if (ini_entry->orig_value) {
-				display_string = ini_entry->orig_value;
-				display_string_length = ini_entry->orig_value_length;
-			} else {
-				if (zend_uv.html_errors) {
-					display_string = NO_VALUE_HTML;
-					display_string_length = sizeof(NO_VALUE_HTML)-1;
-				} else {
-					display_string = NO_VALUE_PLAINTEXT;
-					display_string_length = sizeof(NO_VALUE_PLAINTEXT)-1;
-				}	
-			}
-		} else if (ini_entry->value && ini_entry->value[0]) {
-			display_string = ini_entry->value;
-			display_string_length = ini_entry->value_length;
-		} else {
-			if (zend_uv.html_errors) {
-				display_string = NO_VALUE_HTML;
-				display_string_length = sizeof(NO_VALUE_HTML)-1;
-			} else {
-				display_string = NO_VALUE_PLAINTEXT;
-				display_string_length = sizeof(NO_VALUE_PLAINTEXT)-1;
-			}	
-		}
-		ZEND_WRITE(display_string, display_string_length);
-	}
-}
-
-
 ZEND_INI_DISP(zend_ini_boolean_displayer_cb)
 {
 	int value;
--- php-5.0.3/Zend/zend_mm.c.zendwarn
+++ php-5.0.3/Zend/zend_mm.c
@@ -319,12 +319,12 @@
 		if (true_size > (heap->block_size - ZEND_MM_ALIGNED_SEGMENT_SIZE - ZEND_MM_ALIGNED_HEADER_SIZE)) {
 			/* Make sure we add a memory block which is big enough */
 			if (zend_mm_add_memory_block(heap, true_size + ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE)) {
-				zend_error(E_ERROR, "Out of memory: cannot allocate %d bytes!", true_size);
+				zend_error(E_ERROR, "Out of memory: cannot allocate %zd bytes!", true_size);
 				return NULL;
 			}
 		} else {
 			if (zend_mm_add_memory_block(heap, heap->block_size)) {
-				zend_error(E_ERROR, "Out of memory: cannot allocate %d bytes!", heap->block_size);
+				zend_error(E_ERROR, "Out of memory: cannot allocate %zd bytes!", heap->block_size);
 				return NULL;
 			}
 		}
--- php-5.0.3/Zend/zend_compile.c.zendwarn
+++ php-5.0.3/Zend/zend_compile.c
@@ -68,7 +68,7 @@
 	uint char_pos_len;
 	char *filename;
 
-	char_pos_len = zend_sprintf(char_pos_buf, "%x", (unsigned int) LANG_SCNG(_yy_last_accepting_cpos));
+	char_pos_len = zend_sprintf(char_pos_buf, "%lx", (unsigned long) LANG_SCNG(_yy_last_accepting_cpos));
 	if (CG(active_op_array)->filename) {
 		filename = CG(active_op_array)->filename;
 	} else {
@@ -864,13 +864,6 @@
 	*result = opline->result;
 }
 
-static void zend_lowercase_znode_if_const(znode *z)
-{
-	if (z->op_type == IS_CONST) {
-		zend_str_tolower(z->u.constant.value.str.val, z->u.constant.value.str.len);
-	}
-}
-
 void zend_do_free(znode *op1 TSRMLS_DC)
 {
 	if (op1->op_type==IS_TMP_VAR) {


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- php.spec	24 Mar 2005 10:37:03 -0000	1.61
+++ php.spec	30 Mar 2005 21:02:23 -0000	1.62
@@ -7,7 +7,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.0.3
-Release: 4
+Release: 5
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -31,6 +31,8 @@
 Patch15: php-5.0.3-zstrtod.patch
 Patch16: php-5.0.3-gdheaders.patch
 Patch17: php-5.0.3-gcc4.patch
+Patch18: php-5.0.3-memset0.patch
+Patch19: php-5.0.3-zendwarn.patch
 
 # Fixes for extension modules
 Patch21: php-4.3.1-odbc.patch
@@ -122,7 +124,7 @@
 Requires: php = %{version}-%{release}
 Provides: php_database, php-mysqli
 Obsoletes: mod_php3-mysql, stronghold-php-mysql
-BuildRequires: mysql-devel
+BuildRequires: mysql-devel >= 4.1.0
 
 %description mysql
 The php-mysql package contains a dynamic shared object that will add
@@ -283,7 +285,7 @@
 BuildRequires: ncurses-devel
 
 %description ncurses
-The php-mbstring package contains a dynamic shared object that will add
+The php-ncurses package contains a dynamic shared object that will add
 support for using the ncurses terminal output interfaces.
 
 %package gd
@@ -293,7 +295,7 @@
 BuildRequires: gd-devel, freetype-devel
 
 %description gd
-The php-mbstring package contains a dynamic shared object that will add
+The php-gd package contains a dynamic shared object that will add
 support for using the gd graphics library to PHP.
 
 %prep
@@ -313,6 +315,8 @@
 %patch15 -p1 -b .zstrtod
 %patch16 -p1 -b .gdheaders
 %patch17 -p1 -b .gcc4
+%patch18 -p1 -b .memset0
+%patch19 -p1 -b .zendwarn
 
 %patch21 -p1 -b .odbc
 %patch22 -p1 -b .libmbfl
@@ -599,6 +603,13 @@
 %endif
 
 %changelog
+* Wed Mar 30 2005 Joe Orton <jorton at redhat.com> 5.0.3-5
+- BuildRequire mysql-devel >= 4.1
+- don't mark php.ini as noreplace to make upgrades work (#152171)
+- fix subpackage descriptions (#152628)
+- fix memset(,,0) in Zend (thanks to Dave Jones)
+- fix various compiler warnings in Zend
+
 * Thu Mar 24 2005 Joe Orton <jorton at redhat.com> 5.0.3-4
 - package mysqli extension in php-mysql
 - really enable pcntl (#142903)


