- rel 2; ignore errors when parsing magic file (magic file contains new, unsupported...

Changed files:
    php-mime_magic.patch -> 1.1.2.1
    php.spec -> 1.805.2.84

diff --git a/php-mime_magic.patch b/php-mime_magic.patch
index c5128c662b33ea0aed68492f86195d24be0e38d1..a6529a82915233ea6826db81474329a379c27c32 100644 (file)
--- a/php-mime_magic.patch
+++ b/php-mime_magic.patch
@@ -9,3 +9,17 @@
      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);

diff --git a/php.spec b/php.spec
index c7f02c6c4f895b3249ea8171cdd7a96838b17c11..ebb4dc42d351874db55932ee29e9e8bba087b81a 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ Summary(ru.UTF-8):  PHP Версии 5 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          php
 Version:       5.2.17
-Release:       1
+Release:       2
 Epoch:         4
 License:       PHP
 Group:         Libraries