SOURCES: php-libtool.patch (NEW), php-mime_magic.patch (NEW) - don't requir...

[arekm]

Author: arekm                        Date: Mon Jun 16 08:14:51 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- don't require mime magic file to be present at build time; libtool 2.2 support

---- Files affected:
SOURCES:
   php-libtool.patch (1.5 -> 1.6)  (NEW), php-mime_magic.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/php-libtool.patch
diff -u /dev/null SOURCES/php-libtool.patch:1.6
--- /dev/null	Mon Jun 16 10:14:52 2008
+++ SOURCES/php-libtool.patch	Mon Jun 16 10:14:46 2008
@@ -0,0 +1,20 @@
+--- php/scripts/phpize.in.org	2008-06-16 10:03:28.882568639 +0200
++++ php/scripts/phpize.in	2008-06-16 10:04:37.424018256 +0200
+@@ -8,7 +8,7 @@
+ builddir="`pwd`"
+ SED="@SED@"
+ 
+-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
++FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
+ FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
+ CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
+ 	mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
+@@ -127,7 +127,7 @@
+  
+   (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
+   (cd "$phpdir" && cp $FILES "$builddir")
+-  (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
++  (cd "$builddir" && cat acinclude.m4 ./build/{libtool,lt~obsolete,ltoptions,ltsugar,ltversion}.m4 > aclocal.m4)
+ }
+ 
+ phpize_replace_prefix()

================================================================
Index: SOURCES/php-mime_magic.patch
diff -u /dev/null SOURCES/php-mime_magic.patch:1.1
--- /dev/null	Mon Jun 16 10:14:52 2008
+++ SOURCES/php-mime_magic.patch	Mon Jun 16 10:14:46 2008
@@ -0,0 +1,11 @@
+--- php-5.2.6/ext/mime_magic/config.m4	2007-07-03 19:25:34.000000000 +0200
++++ php-5.2.6.new/ext/mime_magic/config.m4	2008-06-16 09:32:48.996084697 +0200
+@@ -18,8 +18,6 @@
+   if test "$PHP_MIME_MAGIC" != "yes"; then
+     if test -f $PHP_MIME_MAGIC; then
+       PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
+-    else
+-      AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
+     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"
================================================================