Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2013-05-16 11:23:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2013-04-23 17:27:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2013-05-16 11:23:28.000000000 +0200 @@ -1,0 +2,34 @@ +Fri May 10 06:58:11 UTC 2013 - [email protected] + +- updated to 5.4.15: + Core: + Fixed bug #64578 (debug_backtrace in set_error_handler + corrupts zend heap: segfault). + Fixed bug #64458 (dns_get_record result with string of + length -1). + Fixed bug #64433 (follow_location parameter of context + is ignored for most response codes). + Fixed bug #47675 (fd leak on Solaris). + Fixed bug #64577 (fd leak on Solaris). + Fileinfo: + Upgraded libmagic to 5.14. + Streams: + Fixed Windows x64 version of stream_socket_pair() and + improved error handling. + Zip: + Fixed bug #64342 (ZipArchive::addFile() has to check + for file existence). + +------------------------------------------------------------------- +Fri Apr 26 19:45:03 UTC 2013 - [email protected] + +- Conflict with php53 packages so zypper doesn't suggest installing a + mix of php53-* (from SLES 11) and php5-* (these 5.4 packages). + +------------------------------------------------------------------- +Fri Apr 26 19:20:28 UTC 2013 - [email protected] + +- Fix build on SLES 11 (no firebird) and openSUSE <= 12.1 (no separate + libfbclient2-devel pkg). + +------------------------------------------------------------------- Old: ---- php-5.4.14.tar.bz2 New: ---- php-5.4.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.RO1OxQ/_old 2013-05-16 11:23:30.000000000 +0200 +++ /var/tmp/diff_new_pack.RO1OxQ/_new 2013-05-16 11:23:30.000000000 +0200 @@ -29,7 +29,17 @@ BuildRequires: curl-devel BuildRequires: db-devel BuildRequires: enchant-devel +%if 0%{suse_version} > 1110 +# firebird first added in 11.2; libfbclient2-devel pkg split in 12.2 +%define with_firebird 1 BuildRequires: firebird-devel +%if 0%{suse_version} > 1210 +BuildRequires: libfbclient2-devel +%endif +%else +# <= 11.1 or SLES 11 +%define with_firebird 0 +%endif BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: gmp-devel @@ -37,7 +47,6 @@ BuildRequires: krb5-devel BuildRequires: libbz2-devel BuildRequires: libevent-devel -BuildRequires: libfbclient2-devel BuildRequires: libicu-devel BuildRequires: libmcrypt-devel BuildRequires: libopenssl-devel @@ -90,7 +99,7 @@ %define apache2_includedir %(%{apxs2} -q INCLUDEDIR) %define apache2_serverroot %(%{apxs2} -q PREFIX) %define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h;then echo 1; else echo 0; fi; else echo 0; fi) -Version: 5.4.14 +Version: 5.4.15 Release: 0 Provides: php Provides: php-api = %{apiver} @@ -120,6 +129,8 @@ Provides: php5-hash = %{version} #Old extension, nowdays provided as a "wrapper" in in the hash extension for backward compat. Obsoletes: php5-mhash +#Don't mix these packages with php53-* from SLES 11 SP2 +Conflicts: php53 Source0: php-%{version}.tar.bz2 Source1: php-suse-addons.tar.bz2 Source2: suhosin-%{suhosin_version}.tgz @@ -733,6 +744,7 @@ The PHP Group See http://www.php.net/credits.php for more details +%if %{with_firebird} %package firebird Provides: php5-interbase Provides: php5-pdo_firebird = %{version} @@ -752,7 +764,7 @@ -------- The PHP Group See http://www.php.net/credits.php for more details - +%endif %package odbc Provides: php-odbc @@ -1327,8 +1339,12 @@ %{__rm} configure ./buildconf --force # export flags -CFLAGS="$RPM_OPT_FLAGS -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing -I/usr/include/firebird" -CXXFLAGS="$RPM_OPT_FLAGS -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing -I/usr/include/firebird" +CFLAGS="$RPM_OPT_FLAGS -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing" +CXXFLAGS="$RPM_OPT_FLAGS -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing" +%if %{with_firebird} +CFLAGS="$CFLAGS -I/usr/include/firebird" +CXXFLAGS="$CXXFLAGS -I/usr/include/firebird" +%endif export CFLAGS export CXXFLAGS export LDFLAGS="-pie" @@ -1462,7 +1478,9 @@ --with-libedit=shared,%{_usr} \ --with-mcrypt=shared \ --with-mysql=shared,mysqlnd \ +%if %{with_firebird} --with-interbase=shared \ +%endif %if 0%{?suse_version} > 1110 --with-mysql-sock=/var/run/mysql/mysql.sock \ %else @@ -1494,7 +1512,9 @@ --with-sqlite3=shared,%{_usr} \ --enable-sqlite-utf8 \ --with-pdo-mysql=shared,mysqlnd \ +%if %{with_firebird} --with-pdo-firebird=shared \ +%endif --with-pdo-pgsql=shared,%{_usr} \ --with-pdo-odbc=shared,unixODBC,%{_usr} \ --enable-zip=shared \ @@ -1813,12 +1833,14 @@ %{extension_dir}/pdo_mysql.so %config(noreplace) %{php_sysconf}/conf.d/pdo_mysql.ini +%if %{with_firebird} %files firebird %defattr(644,root,root,755) %{extension_dir}/interbase.so %config(noreplace) %{php_sysconf}/conf.d/interbase.ini %{extension_dir}/pdo_firebird.so %config(noreplace) %{php_sysconf}/conf.d/pdo_firebird.ini +%endif %files odbc %defattr(644,root,root,755) ++++++ php-5.4.14.tar.bz2 -> php-5.4.15.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/php5/php-5.4.14.tar.bz2 /work/SRC/openSUSE:Factory/.php5.new/php-5.4.15.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
