- updated to 5.4.45

[packages/php.git] / php-fileinfo.patch

diff --git a/php-fileinfo.patch b/php-fileinfo.patch
index cc4dbe8b56b72abac875a49adfc4daf0a173c350..521ed4acf2859b78ab7862c57e852ca8e273d87c 100644 (file)
--- a/php-fileinfo.patch
+++ b/php-fileinfo.patch
@@ -1,27 +1,3 @@
-diff -urNp php-5.4.17.orig/ext/fileinfo/libmagic/print.c php-5.4.17/ext/fileinfo/libmagic/print.c
---- php-5.4.17.orig/ext/fileinfo/libmagic/print.c      2013-07-03 06:10:53.000000000 +0000
-+++ php-5.4.17/ext/fileinfo/libmagic/print.c   2013-07-18 14:37:33.000000000 +0000
-@@ -28,7 +28,6 @@
- /*
-  * print.c - debugging printout routines
-  */
--
- #define _GNU_SOURCE
- #include "php.h"
- 
-diff -urNp php-5.4.17.orig/ext/fileinfo/libmagic/softmagic.c php-5.4.17/ext/fileinfo/libmagic/softmagic.c
---- php-5.4.17.orig/ext/fileinfo/libmagic/softmagic.c  2013-07-03 06:10:53.000000000 +0000
-+++ php-5.4.17/ext/fileinfo/libmagic/softmagic.c       2013-07-18 14:37:33.000000000 +0000
-@@ -1630,7 +1630,7 @@ mget(struct magic_set *ms, const unsigne
-       /* Verify we have enough data to match magic type */
-       switch (m->type) {
-       case FILE_BYTE:
--              if (nbytes < (offset + 1)) /* should alway be true */
-+              if (nbytes < (offset + 1)) /* should always be true */
-                       return 0;
-               break;
- 
-diff -urNp php-5.4.17.orig/ext/fileinfo/php_fileinfo.h php-5.4.17/ext/fileinfo/php_fileinfo.h
 --- php-5.4.17.orig/ext/fileinfo/php_fileinfo.h        2013-07-03 06:10:53.000000000 +0000
 +++ php-5.4.17/ext/fileinfo/php_fileinfo.h     2013-07-18 14:37:33.000000000 +0000
 @@ -24,7 +24,7 @@
@@ -33,15 +9,3 @@ diff -urNp php-5.4.17.orig/ext/fileinfo/php_fileinfo.h php-5.4.17/ext/fileinfo/p
  
  #ifdef PHP_WIN32
  #define PHP_FILEINFO_API __declspec(dllexport)
-diff -urNp php-5.4.17.orig/ext/fileinfo/tests/magic php-5.4.17/ext/fileinfo/tests/magic
---- php-5.4.17.orig/ext/fileinfo/tests/magic   2013-07-03 06:10:53.000000000 +0000
-+++ php-5.4.17/ext/fileinfo/tests/magic        2013-07-18 14:37:33.000000000 +0000
-@@ -3303,7 +3303,7 @@
- >>>0x44               string  =GLOB           \b.
- >>>>0x60      beshort x               \b%.4d
- 
--# Scripts that run in the embeded Python interpreter
-+# Scripts that run in the embedded Python interpreter
- 0             string  #!BPY           Blender3D BPython script
- 
- #------------------------------------------------------------------------------