[packages/php4] - rel 47; make some warnings silent (mime_magic doesn't understand few newer mime db constructs and

[arekm]

commit 125c3e352c9785f433702142a4a40c2dd56a5cc3
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date:   Wed Feb 20 09:12:03 2013 +0100

    - rel 47; make some warnings silent (mime_magic doesn't understand few 
newer mime db constructs and it's obsolete anyway in future php versions). This 
change avoids useless warnings.

 php4-mime_magic.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 php4.spec             |  2 +-
 2 files changed, 47 insertions(+), 1 deletion(-)
---
diff --git a/php4.spec b/php4.spec
index af4371a..720a629 100644
--- a/php4.spec
+++ b/php4.spec
@@ -73,7 +73,7 @@
 %undefine      with_msession
 %endif
 
-%define                rel 46
+%define                rel 47
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
diff --git a/php4-mime_magic.patch b/php4-mime_magic.patch
index c5128c6..14e6f09 100644
--- a/php4-mime_magic.patch
+++ b/php4-mime_magic.patch
@@ -9,3 +9,49 @@
      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-4.4.9/ext/mime_magic/mime_magic.c~     2007-12-31 08:22:49.000000000 
+0100
++++ php-4.4.9/ext/mime_magic/mime_magic.c      2013-02-20 09:07:01.388809868 
+0100
+@@ -478,8 +478,8 @@
+     /* get offset, then skip over it */
+     m->offset = (int) strtol(l, &t, 0);
+     if (l == t) {
+-              php_error(E_WARNING,
+-                                       MODNAME ": (line %d) offset `%s' 
invalid", lineno, l);
++              //php_error(E_WARNING,
++              //                       MODNAME ": (line %d) offset `%s' 
invalid", lineno, l);
+     }
+     l = t;
+ 
+@@ -501,8 +501,8 @@
+                               m->in.type = BYTE;
+                               break;
+                       default:
+-                              php_error(E_WARNING,
+-                                                       MODNAME ": indirect 
offset type %c invalid", *l);
++                              //php_error(E_WARNING,
++                              //                       MODNAME ": indirect 
offset type %c invalid", *l);
+                               break;
+                       }
+                       l++;
+@@ -518,8 +518,8 @@
+               else
+                       t = l;
+               if (*t++ != ')') {
+-                      php_error(E_WARNING,
+-                                               MODNAME ": missing ')' in 
indirect offset");
++                      //php_error(E_WARNING,
++                      //                       MODNAME ": missing ')' in 
indirect offset");
+               }
+               l = t;
+     }
+@@ -592,8 +592,8 @@
+               l += NLEDATE;
+     }
+     else {
+-              php_error(E_WARNING,
+-                                       MODNAME ": type %s invalid", l);
++              //php_error(E_WARNING,
++              //                       MODNAME ": type %s invalid", l);
+               return -1;
+     }
+     /* New-style anding: "0 byte&0x80 =0x80 dynamically linked" */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/125c3e352c9785f433702142a4a40c2dd56a5cc3

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit