Author: arekm Date: Fri Nov 18 09:13:49 2011 GMT Module: packages Tag: PHP_5_2 ---- Log message: - rel 9; disable external libzip as it causes segfaults (follow php 5.3 from HEAD)
---- Files affected: packages/php: php.spec (1.805.2.96 -> 1.805.2.97) ---- Diffs: ================================================================ Index: packages/php/php.spec diff -u packages/php/php.spec:1.805.2.96 packages/php/php.spec:1.805.2.97 --- packages/php/php.spec:1.805.2.96 Tue Nov 8 14:26:06 2011 +++ packages/php/php.spec Fri Nov 18 10:13:43 2011 @@ -31,6 +31,7 @@ %bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs) %bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs) %bcond_with system_gd # with system gd (we prefer internal since it enables few more features) +%bcond_with system_libzip # with system libzip (reported broken: https://bugs.php.net/bug.php?id=60100) %bcond_with gd_jis_conv # causes imagettfbbox(): any2eucjp(): invalid code in input string when internal gd used %bcond_with zend_multibyte # enable zend multibyte, mbstring can't be shared then anymore %bcond_without curl # without CURL extension module @@ -113,7 +114,7 @@ Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері Name: php Version: 5.2.17 -Release: 8 +Release: 9 Epoch: 4 License: PHP Group: Libraries @@ -277,7 +278,7 @@ BuildRequires: flex %if %{with mssql} || %{with sybase} || %{with sybase_ct} BuildRequires: freetds-devel -BuildRequires: libzip-devel >= 0.10-3 +%{?with_system_libzip:BuildRequires: libzip-devel >= 0.10-3} %endif BuildRequires: freetype-devel >= 2.0 %if %{with system_gd} @@ -1823,7 +1824,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php(zip) Obsoletes: php-pecl-zip -Requires: libzip >= 0.10-3 +%{?with_system_libzip:Requires: libzip >= 0.10-3} %description zip Zip is an extension to create, modify and read zip files. @@ -1939,7 +1940,7 @@ %patch57 -p1 %patch58 -p4 %patch59 -p1 -%patch65 -p1 +%{?with_system_libzip:%patch65 -p1} %patch201 -p1 -b .CVE-2011-2202 %patch202 -p1 -b .CVE-2011-1938 @@ -2229,7 +2230,7 @@ --with-xsl=shared \ --with-zlib=shared \ --with-zlib-dir=shared,/usr \ - --with-libzip \ + %{?with_system_libzip:--with-libzip} \ --enable-zip=shared,/usr \ cp -f Makefile Makefile.$sapi @@ -3313,6 +3314,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.805.2.97 2011/11/18 09:13:43 arekm +- rel 9; disable external libzip as it causes segfaults (follow php 5.3 from HEAD) + Revision 1.805.2.96 2011/11/08 13:26:06 arekm - rel 8; disable zts; going to rebuild php 5.2 stuff on current th for th-obsolete ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.96&r2=1.805.2.97&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
