commit c4b966583c3423cbb9ceaee5ae30e984e8b8671b
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Fri Feb 22 10:17:19 2013 +0100
Update to 5.3.22. Drop file-magic.patch. data_file.c php generation
script is very dump, doesn't do any validation and creates useless mime
database because magic.mgc from system file package is subtly different
than internal php magic database. Symptoms - finfo_file didn't recognize
bacic image types (jpeg) for example.
file-magic.patch | 11 -----------
php.spec | 14 ++------------
2 files changed, 2 insertions(+), 23 deletions(-)
---
diff --git a/php.spec b/php.spec
index 0d8f6b1..6b39e55 100644
--- a/php.spec
+++ b/php.spec
@@ -126,13 +126,13 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP
Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов,
выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 5.3.21
+Version: 5.3.22
Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 1b214fc19bb5f5c0902ba27c74d5f4a2
+# Source0-md5: bf351426fc7f97aa13914062958a6100
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
@@ -203,7 +203,6 @@ Patch64: %{orgname}-m4.patch
Patch65: system-libzip.patch
Patch66: %{orgname}-db.patch
Patch67: php-litespeed.patch
-Patch68: file-magic.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -1959,18 +1958,9 @@ cp -p php.ini-production php.ini
%{__rm} -r sapi/litespeed
gzip -dc %{SOURCE15} | tar xf - -C sapi/
%patch67 -p1
-%if "%{pld_release}" != "ac"
-%patch68 -p1
-%endif
sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#'
ext/xmlrpc/config.m4
-%if "%{pld_release}" != "ac"
-# somewhy php devs have embedded magic database into php extension. yuck!
-# rebuild data file for now
-mv ext/fileinfo/data_file.c{,.php-src}
-%endif
-
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
diff --git a/file-magic.patch b/file-magic.patch
deleted file mode 100644
index f942c42..0000000
--- a/file-magic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-somewhy php devs have embedded magic database into php extension. yuck!
-
-rebuild data file for now
---- php-5.3.20/ext/fileinfo/Makefile.frag 2012-12-19 08:55:19.000000000
+0200
-+++ php-5.3.20/ext/fileinfo/Makefile.frag 2013-01-16 11:11:51.444547648
+0200
-@@ -1,2 +1,5 @@
-
- $(builddir)/libmagic/apprentice.lo: $(srcdir)/data_file.c
-+MIME_MAGIC_DB ?= /usr/share/misc/magic.mgc
-+$(srcdir)/data_file.c: $(MIME_MAGIC_DB) $(SAPI_CLI_PATH)
-+ $(SAPI_CLI_PATH) -n -dsafe_mode=off $(srcdir)/create_data_file.php $< >
$@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/c4b966583c3423cbb9ceaee5ae30e984e8b8671b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
