Date: Wed, 24 May 2006 01:11:32 +0400 (MSD) From: Alexander Zhuravlev <zaa@zaa.pp.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ale@FreeBSD.org Subject: ports/97734: [PATCH] update of sysutils/pecl-fileinfo to 1.0.3 Message-ID: <20060523211132.940D4B81D@wave.zaa.local> Resent-Message-ID: <200605232120.k4NLKJlh080182@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97734 >Category: ports >Synopsis: [PATCH] update of sysutils/pecl-fileinfo to 1.0.3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue May 23 21:20:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alexander Zhuravlev >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD wave.zaa.local 6.1-STABLE FreeBSD 6.1-STABLE #24: Sat May 20 22:05:53 MSD 2006 root@wave.zaa.local:/usr/obj/usr/src/sys/WAVE i386 >Description: Attached patch file upgrades pecl-fileinfo port to version 1.0.3 and at the same time fixes magic file path determination on FreeBSD 5.x, 6.x systems (/usr/share/misc/file path was not detected correctly). >How-To-Repeat: >Fix: --- pecl-fileinfo.diff begins here --- diff -urbBNp pecl-fileinfo.orig/Makefile pecl-fileinfo/Makefile --- pecl-fileinfo.orig/Makefile Thu Dec 15 19:16:58 2005 +++ pecl-fileinfo/Makefile Wed May 24 00:05:23 2006 @@ -6,7 +6,7 @@ # PORTNAME= fileinfo -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= sysutils pear MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- diff -urbBNp pecl-fileinfo.orig/distinfo pecl-fileinfo/distinfo --- pecl-fileinfo.orig/distinfo Thu Dec 15 19:16:58 2005 +++ pecl-fileinfo/distinfo Wed May 24 00:05:43 2006 @@ -1,3 +1,3 @@ -MD5 (PECL/Fileinfo-1.0.2.tgz) = dd6c247f7003e0763fab92ef1018fb46 -SHA256 (PECL/Fileinfo-1.0.2.tgz) = 219f06631a97688229bbfd37bbaa19b9c55c7f3dd80998c99631b8b3768613df -SIZE (PECL/Fileinfo-1.0.2.tgz) = 5741 +MD5 (PECL/Fileinfo-1.0.3.tgz) = 799930038f76af23e391eef45789c607 +SHA256 (PECL/Fileinfo-1.0.3.tgz) = 560dc4f40f33ef929c3be558c9550f88e22a673fa6467499b6e77ee6cc52315e +SIZE (PECL/Fileinfo-1.0.3.tgz) = 5727 diff -urbBNp pecl-fileinfo.orig/files/patch-config.m4 pecl-fileinfo/files/patch-config.m4 --- pecl-fileinfo.orig/files/patch-config.m4 Thu Jan 1 03:00:00 1970 +++ pecl-fileinfo/files/patch-config.m4 Wed May 24 00:56:28 2006 @@ -0,0 +1,22 @@ +--- 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]) + diff -urbBNp pecl-fileinfo.orig/files/patch-fileinfo.c pecl-fileinfo/files/patch-fileinfo.c --- pecl-fileinfo.orig/files/patch-fileinfo.c Sat Dec 17 11:02:56 2005 +++ pecl-fileinfo/files/patch-fileinfo.c Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- fileinfo.c.orig Sat Dec 17 09:00:17 2005 -+++ fileinfo.c Sat Dec 17 09:00:39 2005 -@@ -103,7 +103,7 @@ - intern = ecalloc(1, sizeof(struct finfo_object)); - intern->zo.ce = class_type; - intern->zo.properties = NULL; --#if ZEND_EXTENSION_API_NO > 220050000 -+#if ZEND_MODULE_API_NO >= 20050922 - intern->zo.guards = NULL; - #else - intern->zo.in_get = 0; --- pecl-fileinfo.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060523211132.940D4B81D>