packages (PHP_5_2): php/php-mime_magic.patch, php/php.spec - rel 3; revert ...

[arekm]

Author: arekm                        Date: Wed Jan 19 21:31:30 2011 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- rel 3; revert (it still doesn't read correct entries)

---- Files affected:
packages/php:
   php-mime_magic.patch (1.1.2.1 -> 1.1.2.2) , php.spec (1.805.2.84 -> 1.805.2.85) 

---- Diffs:

================================================================
Index: packages/php/php-mime_magic.patch
diff -u packages/php/php-mime_magic.patch:1.1.2.1 packages/php/php-mime_magic.patch:1.1.2.2
--- packages/php/php-mime_magic.patch:1.1.2.1	Wed Jan 19 22:10:07 2011
+++ packages/php/php-mime_magic.patch	Wed Jan 19 22:31:21 2011
@@ -9,17 +9,4 @@
      fi
    else
      MAGIC_MIME_LOCATIONS="/usr/local/apache/conf/magic /usr/local/etc/apache/conf/magic /etc/apache/magic /etc/httpd/conf/magic /usr/share/magic.mime /usr/share/misc/magic.mime /etc/magic.mime"
---- php-5.2.17/ext/mime_magic/mime_magic.c~	2010-01-03 10:23:27.000000000 +0100
-+++ php-5.2.17/ext/mime_magic/mime_magic.c	2011-01-19 16:58:40.032694842 +0100
-@@ -441,8 +441,9 @@
- 			continue;
- 
- 		/* parse it */
--		if (parse(line + ws_offset, lineno) != 0)
--			++errs;
-+		if (parse(line + ws_offset, lineno) != 0) {
-+			//++errs;
-+		}
-     }
- 
-     (void) fclose(f);
+

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.84 packages/php/php.spec:1.805.2.85
--- packages/php/php.spec:1.805.2.84	Wed Jan 19 22:10:07 2011
+++ packages/php/php.spec	Wed Jan 19 22:31:21 2011
@@ -113,7 +113,7 @@
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
 Version:	5.2.17
-Release:	2
+Release:	3
 Epoch:		4
 License:	PHP
 Group:		Libraries
@@ -3170,6 +3170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805.2.85  2011/01/19 21:31:21  arekm
+- rel 3; revert (it still doesn't read correct entries)
+
 Revision 1.805.2.84  2011/01/19 21:10:07  arekm
 - rel 2; ignore errors when parsing magic file (magic file contains new, unsupported by php module commands and single error causes magic functionality to be turned off; magic is also obsolete, so there won't be a fix from upstream)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-mime_magic.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.84&r2=1.805.2.85&f=u