Author: arekm Date: Wed Aug 19 10:30:47 2009 GMT
Module: packages Tag: PHP_5_2
---- Log message:
- rel 12; build fixed
---- Files affected:
packages/php:
php-bug-48619.patch (1.1.2.1 -> 1.1.2.2) , php.spec (1.805.2.6 -> 1.805.2.7)
---- Diffs:
================================================================
Index: packages/php/php-bug-48619.patch
diff -u packages/php/php-bug-48619.patch:1.1.2.1
packages/php/php-bug-48619.patch:1.1.2.2
--- packages/php/php-bug-48619.patch:1.1.2.1 Wed Aug 19 11:41:51 2009
+++ packages/php/php-bug-48619.patch Wed Aug 19 12:30:41 2009
@@ -38,3 +38,25 @@
mail_free_searchpgm(&pgm);
}
+commit 069ddaf37eaf2e8f4864b9bbff4cab9174961ffc
+Author: iliaa <il...@c90b9560-bf6c-de11-be94-00142212c4b1>
+Date: Tue Jun 23 12:43:10 2009 +0000
+
+ Fixed build
+
+
+ git-svn-id:
http://svn.php.net/repository/php/php-src/branches/php_...@282642
c90b9560-bf6c-de11-be94-00142212c4b1
+
+diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
+index 24111e1..a5b2dc9 100644
+--- a/ext/imap/php_imap.c
++++ b/ext/imap/php_imap.c
+@@ -2670,7 +2670,7 @@ PHP_FUNCTION(imap_sort)
+
+ slst = mail_sort(imap_le_struct->imap_stream, (myargc == 6 ?
Z_STRVAL_PP(charset) : NIL), spg, mypgm, (myargc >= 4 ? Z_LVAL_PP(flags) :
NIL));
+
+- if (spg && !(flags & SE_FREE)) {
++ if (spg && myargc >= 4 && !(Z_LVAL_PP(flags) & SE_FREE)) {
+ mail_free_searchpgm(&spg);
+ }
+
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.6 packages/php/php.spec:1.805.2.7
--- packages/php/php.spec:1.805.2.6 Wed Aug 19 11:41:51 2009
+++ packages/php/php.spec Wed Aug 19 12:30:41 2009
@@ -95,7 +95,7 @@
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: php
Version: 5.2.10
-Release: 11
+Release: 12
Epoch: 4
License: PHP
Group: Libraries
@@ -2887,6 +2887,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.805.2.7 2009/08/19 10:30:41 arekm
+- rel 12; build fixed
+
Revision 1.805.2.6 2009/08/19 09:41:51 arekm
- rel 11; fix for bug 48619 (imap segfaults)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-bug-48619.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.6&r2=1.805.2.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
