[Frugalware-darcs] frugalware-0.6: php-5.2.3-1terminus1-i686

voroskoi voroskoi at frugalware.org
Thu Jun 7 16:21:45 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070607140203-dd049-ed922d072933037fb9da0e96ed8a0cf08369b5da.gz;

[php-5.2.3-1terminus1-i686
voroskoi <voroskoi at frugalware.org>**20070607140203
 secfix bump, closes #2127
] {
hunk ./source/devel/php/120-MOPB-41.patch.diff 1
-diff -uNrp php5-5.2.1.orig/ext/sqlite/sess_sqlite.c php5-5.2.1/ext/sqlite/=
sess_sqlite.c
---- php5-5.2.1.orig/ext/sqlite/sess_sqlite.c	2007-01-01 01:36:07.000000000=
 -0800
-+++ php5-5.2.1/ext/sqlite/sess_sqlite.c	2007-04-23 15:45:35.000000000 -070=
0
-@@ -31,6 +31,11 @@
- extern int sqlite_encode_binary(const unsigned char *in, int n, unsigned =
char *out);
- extern int sqlite_decode_binary(const unsigned char *in, unsigned char *o=
ut);
- =

-+#define php_sqlite_decode_binary(in, out)    (	\
-+	(!in || !*in) ? 0 : \
-+		sqlite_decode_binary((const unsigned char *)in, (unsigned char *)out) \
-+)
-+
- PS_FUNCS(sqlite);
- =

- ps_module ps_mod_sqlite =3D {
-@@ -111,7 +116,7 @@ PS_READ_FUNC(sqlite) =

- 			if (rowdata[0] !=3D NULL) {
- 				*vallen =3D strlen(rowdata[0]);
- 				*val =3D emalloc(*vallen);
--				*vallen =3D sqlite_decode_binary(rowdata[0], *val);
-+				*vallen =3D php_sqlite_decode_binary(rowdata[0], *val);
- 				(*val)[*vallen] =3D '\0';
- 			}
- 			break;
-diff -uNrp php5-5.2.1.orig/ext/sqlite/sqlite.c php5-5.2.1/ext/sqlite/sqlit=
e.c
---- php5-5.2.1.orig/ext/sqlite/sqlite.c	2007-01-01 01:36:07.000000000 -080=
0
-+++ php5-5.2.1/ext/sqlite/sqlite.c	2007-04-23 15:45:35.000000000 -0700
-@@ -73,7 +73,10 @@ extern int sqlite_encode_binary(const un
- extern int sqlite_decode_binary(const unsigned char *in, unsigned char *o=
ut);
- =

- #define php_sqlite_encode_binary(in, n, out) sqlite_encode_binary((const =
unsigned char *)in, n, (unsigned char *)out)
--#define php_sqlite_decode_binary(in, out)    sqlite_decode_binary((const =
unsigned char *)in, (unsigned char *)out)
-+#define php_sqlite_decode_binary(in, out)    (	\
-+	(!in || !*in) ? 0 : \
-+		sqlite_decode_binary((const unsigned char *)in, (unsigned char *)out) \
-+)
- =

- static int sqlite_count_elements(zval *object, long *count TSRMLS_DC);
- =

rmfile ./source/devel/php/120-MOPB-41.patch.diff
hunk ./source/devel/php/120-MOPB-45.patch.diff 1
-diff -uNrp php5-5.2.1.orig/ext/filter/logical_filters.c php5-5.2.1/ext/fil=
ter/logical_filters.c
---- php5-5.2.1.orig/ext/filter/logical_filters.c	2007-01-01 01:36:00.00000=
0000 -0800
-+++ php5-5.2.1/ext/filter/logical_filters.c	2007-04-23 15:47:59.000000000 =
-0700
-@@ -469,7 +469,7 @@ void php_filter_validate_url(PHP_INPUT_F
- void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
- {
- 	/* From http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Ema=
il.php?r=3D1.4 */
--	const char regexp[] =3D "/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([\\w\\!\\=
#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\=
\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9=
]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0=
-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9=
])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4=
][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])=
)\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+=
[A-Za-z\\-]+))$/";
-+	const char regexp[] =3D "/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([\\w\\!\\=
#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\=
\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9=
]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0=
-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9=
])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4=
][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])=
)\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+=
[A-Za-z\\-]+))$/D";
- =

- 	pcre       *re =3D NULL;
- 	pcre_extra *pcre_extra =3D NULL;
rmfile ./source/devel/php/120-MOPB-45.patch.diff
hunk ./source/devel/php/FrugalBuild 6
-pkgver=3D5.2.2
-pkgrel=3D1terminus2
+pkgver=3D5.2.3
+pkgrel=3D1terminus1
hunk ./source/devel/php/FrugalBuild 20
-	http://www.php.net/distributions/manual/php_manual_{en,ar,pt_BR,zh,hk,tw,=
cs,da,nl,fi,fr,de,el,hu,it,ja,kr,pl,ro,ru,sk,es,sv}.tar.gz \
-	120-MOPB-{41,45}.patch.diff gd_png.c.diff)
+	http://www.php.net/distributions/manual/php_manual_{en,ar,pt_BR,zh,hk,tw,=
cs,da,nl,fi,fr,de,el,hu,it,ja,kr,pl,ro,ru,sk,es,sv}.tar.gz)
hunk ./source/devel/php/FrugalBuild 169
-sha1sums=3D('9addca2ae7b6bf2bea78023484212d9f32fd08d7'\
+sha1sums=3D('c2dfab484ce16ebac8f29544641b4690f4b8f034'\
hunk ./source/devel/php/FrugalBuild 173
-          '998cac2f087d59f00c858e4bce5e9e906a55aebc'\
+          '85f68d793e4ab93615783fe30fcac56c91d6f241'\
hunk ./source/devel/php/FrugalBuild 188
-          'fce0c91c42a1d046cb1f73ce65d282e39c6536ae'\
+          '70b90298116f3a139b43f760bfce4659362c234f'\
hunk ./source/devel/php/FrugalBuild 195
-          'f479e4943e14c3a442659c3af05e30d32156d1b1'\
-          '1cf6a6f2c639fa5ebcadb2d21f06827e529188ef'\
-          'b41f08590903e74ee6f727316e0ba9f840a7c35d'\
-          'b1d4dc8c8819b319e71feef49207d6491efdebcc')
+          'f479e4943e14c3a442659c3af05e30d32156d1b1')
hunk ./source/devel/php/gd_png.c.diff 1
---- php-5.2.2/ext/gd/libgd/gd_png.c.orig	2007-05-24 17:30:52.000000000 +02=
00
-+++ php-5.2.2/ext/gd/libgd/gd_png.c	2007-05-24 17:33:32.000000000 +0200
-@@ -71,7 +71,11 @@
- =

- static void gdPngReadData (png_structp png_ptr, png_bytep data, png_size_=
t length)
- {
--	gdGetBuf(data, length, (gdIOCtx *) png_get_io_ptr(png_ptr));
-+	int check;
-+	check =3D gdGetBuf (data, length, (gdIOCtx *) png_get_io_ptr (png_ptr));
-+	if (check !=3D length) {
-+		png_error(png_ptr, "Read Error: truncated data");
-+	}
- }
- =

- static void gdPngWriteData (png_structp png_ptr, png_bytep data, png_size=
_t length)
rmfile ./source/devel/php/gd_png.c.diff
}


More information about the Frugalware-darcs mailing list