[Frugalware-darcs] frugalware-current: php-5.2.0-1-i686

[crazy]

Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061108011655-f6986-d19f40a6f5fcfe49311780b244d262c14e0d597a.gz;

[php-5.2.0-1-i686
crazy <crazy at frugalware.org>**20061108011655
 * Version bump
 * this build is a 'normal' build almost nothing changed
  - the next one will have *all modules enabled as shared* and everything 
  - can be done as a subpkg ( eg: the extra modules ) will be split.
  - anyway I think I need get this zip one back in but I'll see
 * removed all patches in upstream now
 * NOTE: all php modules need be rebuild because API version , maybe other things too
] {
hunk ./source/devel/php/CVE-2006-4625.patch 1
-diff -Naur php-5.1.6/Zend/zend_ini.c php-5.1.6-p/Zend/zend_ini.c
---- php-5.1.6/Zend/zend_ini.c	2006-01-05 00:53:04.000000000 +0100
-+++ php-5.1.6-p/Zend/zend_ini.c	2006-10-12 18:28:33.000000000 +0200
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
- */
- 
--/* $Id: zend_ini.c,v 1.39.2.2 2006/01/04 23:53:04 andi Exp $ */
-+/* $Id: zend_ini.c,v 1.39.2.3 2006/09/06 08:54:23 dmitry Exp $ */
- 
- #include "zend.h"
- #include "zend_qsort.h"
-@@ -256,8 +256,8 @@
- 	zend_ini_entry *ini_entry;
- 	TSRMLS_FETCH();
- 
--	if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry)==FAILURE) {
--		return FAILURE;
-+	if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry)==FAILURE ||
-+	    (stage == ZEND_INI_STAGE_RUNTIME && (ini_entry->modifiable & ZEND_INI_USER) == 0)) {		return FAILURE;
- 	}
- 
- 	zend_restore_ini_entry_cb(ini_entry, stage TSRMLS_CC);
rmfile ./source/devel/php/CVE-2006-4625.patch
hunk ./source/devel/php/CVE-2006-4812-vendor-workaround.patch 1
-diff -Naur php-5.1.6/Zend/zend_alloc.c php-5.1.6-p/Zend/zend_alloc.c
---- php-5.1.6/Zend/zend_alloc.c	2006-08-10 19:16:24.000000000 +0200
-+++ php-5.1.6-p/Zend/zend_alloc.c	2006-10-08 15:19:29.000000000 +0200
-@@ -17,7 +17,7 @@
-    +----------------------------------------------------------------------+
- */
- 
--/* $Id: zend_alloc.c,v 1.144.2.4 2006/08/10 17:16:24 iliaa Exp $ */
-+/* $Id: zend_alloc.c,v 1.144.2.5 2006/09/30 17:15:23 iliaa Exp $ */
- 
- #include "zend.h"
- #include "zend_alloc.h"
-@@ -328,15 +328,14 @@
- ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
- {
- 	void *p;
--	int final_size = size*nmemb;
--	
-+
- 	HANDLE_BLOCK_INTERRUPTIONS();
--	p = _emalloc(final_size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
-+	p = _safe_emalloc(nmemb, size, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
- 	if (!p) {
- 		HANDLE_UNBLOCK_INTERRUPTIONS();
- 		return (void *) p;
- 	}
--	memset(p, 0, final_size);
-+	memset(p, 0, size * nmemb);
- 	HANDLE_UNBLOCK_INTERRUPTIONS();
- 	return p;
- }
rmfile ./source/devel/php/CVE-2006-4812-vendor-workaround.patch
hunk ./source/devel/php/CVE-2006-5465.patch 1
-diff -Nurp orig/ext/standard/html.c new/ext/standard/html.c
---- orig/ext/standard/html.c	2006-11-02 09:57:49.000000000 +0000
-+++ new/ext/standard/html.c	2006-11-02 10:00:40.000000000 +0000
-@@ -1096,7 +1096,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) {
-@@ -1121,9 +1121,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++] = ';';
- 			}
- 		}
rmfile ./source/devel/php/CVE-2006-5465.patch
hunk ./source/devel/php/FrugalBuild 6
-pkgver=5.1.6
-pkgrel=6
+pkgver=5.2.0
+pkgrel=1
hunk ./source/devel/php/FrugalBuild 19
-	CVE-2006-4812-vendor-workaround.patch \
-	CVE-2006-4625.patch \
-	CVE-2006-5465.patch \
hunk ./source/devel/php/FrugalBuild 110
-	Fpatchall
+	#Fpatchall
hunk ./source/devel/php/FrugalBuild 146
-	Fmv /man /usr/
hunk ./source/devel/php/FrugalBuild 171
-
-sha1sums=('e6f9df1db989e694dac6e1e190c5022f75c6a9cc' \
+sha1sums=('674e6b30cf08142ff9f7945a77e1185d9a6572c4' \
hunk ./source/devel/php/FrugalBuild 175
-          'd14697a2bf527e61f0827feb066547cb03e60a82' \
-          '21e182c2ef6190bb9b8e3ee15055b246882bd254' \
-          '4e88e1ecc4c5ea81b013b52337b0b906a9ec7404' \
-          '3883b1e7e0f911001f278a4b03f68ad1943f086c' \
+          'de30b95e2de2cc6d431c9ea7e2b3b7a750eb524a' \
hunk ./source/devel/php/FrugalBuild 177
-          'f6f3374dcea85618db86ecf6044bc239e71c1e76' \
+          '3912d5f07aee472886f1ac3492e57f860920331f' \
hunk ./source/devel/php/FrugalBuild 186
-          '6d9548a723251c4e10326494812931607eca9d93' \
+          '303a13129e4fec77bbeeedda60212e12fb45a279' \
hunk ./source/devel/php/FrugalBuild 188
-          '93c8914723aa5052932780b85e46f91f8fa59d7c' \
+          '68f90ee674d60bd3af9497d5a37f057afb7be332' \
hunk ./source/devel/php/FrugalBuild 190
-          'd7ec2257c56b236f29666ea3334fdd5a74fbb529' \
+          '9beb1e0c2e8c48163ce4b91fb9a154abd53a905b' \
}