Attachment #66050 for bug #97734

View | Details | Raw Unified | Return to bug 97734
Collapse All | Expand All

Lines 6-12 Link Here

(-)pecl-fileinfo/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= fileinfo	8	PORTNAME= fileinfo
9	PORTVERSION= 1.0.2	9	PORTVERSION= 1.0.3
10	CATEGORIES= sysutils pear	10	CATEGORIES= sysutils pear
11	MASTER_SITES= http://pecl.php.net/get/	11	MASTER_SITES= http://pecl.php.net/get/
12	PKGNAMEPREFIX= pecl-	12	PKGNAMEPREFIX= pecl-

Lines 1-3 Link Here

(-)pecl-fileinfo/distinfo (-3 / +3 lines)
1	MD5 (PECL/Fileinfo-1.0.2.tgz) = dd6c247f7003e0763fab92ef1018fb46	1	MD5 (PECL/Fileinfo-1.0.3.tgz) = 799930038f76af23e391eef45789c607
2	SHA256 (PECL/Fileinfo-1.0.2.tgz) = 219f06631a97688229bbfd37bbaa19b9c55c7f3dd80998c99631b8b3768613df	2	SHA256 (PECL/Fileinfo-1.0.3.tgz) = 560dc4f40f33ef929c3be558c9550f88e22a673fa6467499b6e77ee6cc52315e
3	SIZE (PECL/Fileinfo-1.0.2.tgz) = 5741	3	SIZE (PECL/Fileinfo-1.0.3.tgz) = 5727




--- config.m4.orig	Wed May 24 00:48:38 2006
+++ config.m4	Wed May 24 00:51:24 2006
@@ -47,12 +47,15 @@ if test "$PHP_FILEINFO" != "no"; then
     -L$FILEINFO_DIR/lib
   ])
 
-  MAGIC_MIME_LOCATIONS="/usr/local/share/file/magic /usr/share/file/magic /usr/share/misc/file/magic /etc/magic /usr/share/misc"
-  for i in $MAGIC_MIME_LOCATIONS; do
-    if test -f $i; then
-       PHP_DEFAULT_MAGIC_FILE=$i
+  MAGIC_MIME_DIRS="/usr/local/share/file /usr/share/file /usr/share/misc/file /etc /usr/share/misc"
+  MAGIC_MIME_FILENAMES="magic magic.mime"
+  for i in $MAGIC_MIME_DIRS; do
+	for j in $MAGIC_MIME_FILENAMES; do
+		if test -f "$i/$j"; then
+			PHP_DEFAULT_MAGIC_FILE="$i/$j"
        break
     fi
+	done
   done
   AC_DEFINE_UNQUOTED(PHP_DEFAULT_MAGIC_FILE,"$PHP_DEFAULT_MAGIC_FILE",[magic file path])
 

Lines 1-11 Link Here

(-)pecl-fileinfo/files/patch-fileinfo.c (-11 lines)
1	--- fileinfo.c.orig Sat Dec 17 09:00:17 2005
2	+++ fileinfo.c Sat Dec 17 09:00:39 2005
3	@@ -103,7 +103,7 @@
4	intern = ecalloc(1, sizeof(struct finfo_object));
5	intern->zo.ce = class_type;
6	intern->zo.properties = NULL;
7	-#if ZEND_EXTENSION_API_NO > 220050000
8	+#if ZEND_MODULE_API_NO >= 20050922
9	intern->zo.guards = NULL;
10	#else
11	intern->zo.in_get = 0;

Return to bug 97734

Line 0 Link Here

(-)pecl-fileinfo/files/patch-config.m4 (+22 lines)
	1	--- config.m4.orig Wed May 24 00:48:38 2006
	2	+++ config.m4 Wed May 24 00:51:24 2006
	3	@@ -47,12 +47,15 @@ if test "$PHP_FILEINFO" != "no"; then
	4	-L$FILEINFO_DIR/lib
	5	])
	6
	7	- MAGIC_MIME_LOCATIONS="/usr/local/share/file/magic /usr/share/file/magic /usr/share/misc/file/magic /etc/magic /usr/share/misc"
	8	- for i in $MAGIC_MIME_LOCATIONS; do
	9	- if test -f $i; then
	10	- PHP_DEFAULT_MAGIC_FILE=$i
	11	+ MAGIC_MIME_DIRS="/usr/local/share/file /usr/share/file /usr/share/misc/file /etc /usr/share/misc"
	12	+ MAGIC_MIME_FILENAMES="magic magic.mime"
	13	+ for i in $MAGIC_MIME_DIRS; do
	14	+ for j in $MAGIC_MIME_FILENAMES; do
	15	+ if test -f "$i/$j"; then
	16	+ PHP_DEFAULT_MAGIC_FILE="$i/$j"
	17	break
	18	fi
	19	+ done
	20	done
	21	AC_DEFINE_UNQUOTED(PHP_DEFAULT_MAGIC_FILE,"$PHP_DEFAULT_MAGIC_FILE",[magic file path])
	22