Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2013-04-23 17:27:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5", Maintainer is "pgaj...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2013-03-26 07:01:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2013-04-23 17:27:14.000000000 +0200 @@ -1,0 +2,51 @@ +Mon Apr 22 13:33:25 UTC 2013 - pgaj...@suse.com + +- use current install-pear-nozlib.phar from + http://pear.php.net/install-pear-nozlib.phar +- php5-pear package provides/obsoletes php5-pear-Archive_Tar, + see explanation in the spec + +------------------------------------------------------------------- +Wed Apr 17 17:35:33 UTC 2013 - slav...@gmail.com + +- add php5-firebird providing php5-interbase and php5-pdo_firebird + +------------------------------------------------------------------- +Mon Apr 15 09:38:23 UTC 2013 - pgaj...@suse.com + +- updated to 5.4.14: + Core: + Fixed bug #64529 (Ran out of opcode space). + Fixed bug #64515 (Memoryleak when using the same variablename + two times in function declaration). + Fixed bug #64432 (more empty delimiter warning in strX methods). + Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes + fatal error). + Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']). + Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 + or 5.4.11). + Fixed bug #63976 (Parent class incorrectly using child constant + in class property). + Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not + handle exceptions properly). + Fixed bug #62343 (Show class_alias In get_declared_classes()). + PCRE: + Merged PCRE 8.32. + SNMP: + Fixed bug #61981 (OO API, walk: $suffix_as_key is not working correctly). + Zip: + Fixed bug #64452 (Zip crash intermittently). (Anatol) + +------------------------------------------------------------------- +Mon Apr 15 09:22:26 UTC 2013 - pgaj...@suse.com + +- libc-client.so needs -lssl + +------------------------------------------------------------------- +Fri Apr 5 13:34:28 UTC 2013 - pgaj...@suse.com + +- fixed 'http limits uploads to 2GB' [bnc#812800], see + https://bugs.php.net/bug.php?id=44522 + * 64bit-post-large-files.patch + +------------------------------------------------------------------- Old: ---- php-5.4.13.tar.bz2 New: ---- php-5.4.14.tar.bz2 php5-64-bit-post-large-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.Arkjdj/_old 2013-04-23 17:27:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Arkjdj/_new 2013-04-23 17:27:30.000000000 +0200 @@ -29,6 +29,7 @@ BuildRequires: curl-devel BuildRequires: db-devel BuildRequires: enchant-devel +BuildRequires: firebird-devel BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: gmp-devel @@ -36,8 +37,10 @@ BuildRequires: krb5-devel BuildRequires: libbz2-devel BuildRequires: libevent-devel +BuildRequires: libfbclient2-devel BuildRequires: libicu-devel BuildRequires: libmcrypt-devel +BuildRequires: libopenssl-devel BuildRequires: libpng-devel BuildRequires: libtidy-devel BuildRequires: libtiff-devel @@ -87,7 +90,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.13 +Version: 5.4.14 Release: 0 Provides: php Provides: php-api = %{apiver} @@ -154,6 +157,8 @@ # related to previous patch; !(defined(_REENTRANT) || defined(_THREAD_SAFE)) Patch17: php5-no-reentrant-crypt.patch Patch18: php5-format-string-issues.patch +# following patch connected fixes or workarounds https://bugs.php.net/bug.php?id=44522 +Patch19: php5-64-bit-post-large-files.patch Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: PHP5 Core Files @@ -213,6 +218,12 @@ Summary: PHP Extension and Application Repository Group: Development/Libraries/PHP Requires: %{name}-zlib = %{version} +# php5-pear-Archive_Tar provides Tar.php, which is provided +# by pear package itself; php5-pear-Archive_Tar was dropped +# on version 1.3.10, install-pear-nozlib.phar +# provides 1.3.11 currently +Provides: php5-pear-Archive_Tar = 1.3.11 +Obsoletes: php5-pear-Archive_Tar < 1.3.11 %if 0%{?suse_version} > 1110 BuildArch: noarch %endif @@ -722,6 +733,27 @@ The PHP Group See http://www.php.net/credits.php for more details +%package firebird +Provides: php5-interbase +Provides: php5-pdo_firebird = %{version} +Provides: php_any_db +Summary: PHP5 Extension Module +Group: Development/Libraries/PHP +Requires: %{name} = %{version} +Requires: %{name}-pdo = %{version} +Obsoletes: php5-pdo_firebird < %{version} + +%description firebird +PHP functions for access to firebird database servers. + + + +Authors: +-------- + The PHP Group + See http://www.php.net/credits.php for more details + + %package odbc Provides: php-odbc Provides: php-pdo_odbc @@ -1253,6 +1285,7 @@ %patch16 %patch17 %patch18 +%patch19 -p1 # Safety check for API version change. vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h` if test "x${vapi}" != "x%{apiver}"; then @@ -1294,8 +1327,8 @@ %{__rm} configure ./buildconf --force # export flags -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" +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" export CFLAGS export CXXFLAGS export LDFLAGS="-pie" @@ -1305,6 +1338,8 @@ export EXTENSION_DIR export PHP_MYSQLND_ENABLED=yes export PHP_MYSQLND_COMPRESSION_SUPPORT=yes +# fix build-cli: libc-client.so needs -lssl +export IMAP_SHARED_LIBADD='-lssl' # build function Build() @@ -1427,6 +1462,7 @@ --with-libedit=shared,%{_usr} \ --with-mcrypt=shared \ --with-mysql=shared,mysqlnd \ + --with-interbase=shared \ %if 0%{?suse_version} > 1110 --with-mysql-sock=/var/run/mysql/mysql.sock \ %else @@ -1458,6 +1494,7 @@ --with-sqlite3=shared,%{_usr} \ --enable-sqlite-utf8 \ --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-firebird=shared \ --with-pdo-pgsql=shared,%{_usr} \ --with-pdo-odbc=shared,unixODBC,%{_usr} \ --enable-zip=shared \ @@ -1776,6 +1813,13 @@ %{extension_dir}/pdo_mysql.so %config(noreplace) %{php_sysconf}/conf.d/pdo_mysql.ini +%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 + %files odbc %defattr(644,root,root,755) %{extension_dir}/odbc.so ++++++ install-pear-nozlib.phar ++++++ ++++ 68287 lines (skipped) ++++ between install-pear-nozlib.phar ++++ and /work/SRC/openSUSE:Factory/.php5.new/install-pear-nozlib.phar ++++++ php-5.4.13.tar.bz2 -> php-5.4.14.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/php5/php-5.4.13.tar.bz2 /work/SRC/openSUSE:Factory/.php5.new/php-5.4.14.tar.bz2 differ: char 11, line 1 ++++++ php5-64-bit-post-large-files.patch ++++++ https://bugs.php.net/bug.php?id=44522 Index: php-5.4.13/main/rfc1867.c =================================================================== --- php-5.4.13.orig/main/rfc1867.c +++ php-5.4.13/main/rfc1867.c @@ -676,7 +676,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_ { char *boundary, *s = NULL, *boundary_end = NULL, *start_arr = NULL, *array_index = NULL; char *temp_filename = NULL, *lbuf = NULL, *abuf = NULL; - int boundary_len = 0, total_bytes = 0, cancel_upload = 0, is_arr_upload = 0, array_len = 0; + long total_bytes = 0; int boundary_len = 0, cancel_upload = 0, is_arr_upload = 0, array_len = 0; int max_file_size = 0, skip_upload = 0, anonindex = 0, is_anonymous; zval *http_post_files = NULL; HashTable *uploaded_files = NULL; Index: php-5.4.13/main/SAPI.h =================================================================== --- php-5.4.13.orig/main/SAPI.h +++ php-5.4.13/main/SAPI.h @@ -82,7 +82,7 @@ typedef struct { char *post_data, *raw_post_data; char *cookie_data; long content_length; - uint post_data_length, raw_post_data_length; + uint IGNORE_post_data_length, IGNORE_raw_post_data_length; char *path_translated; char *request_uri; @@ -112,6 +112,7 @@ typedef struct { int argc; char **argv; int proto_num; + long post_data_length, raw_post_data_length; } sapi_request_info; @@ -119,7 +120,7 @@ typedef struct _sapi_globals_struct { void *server_context; sapi_request_info request_info; sapi_headers_struct sapi_headers; - int read_post_bytes; + long read_post_bytes; unsigned char headers_sent; struct stat global_stat; char *default_mimetype; Index: php-5.4.13/sapi/cgi/cgi_main.c =================================================================== --- php-5.4.13.orig/sapi/cgi/cgi_main.c +++ php-5.4.13/sapi/cgi/cgi_main.c @@ -508,7 +508,7 @@ static int sapi_cgi_read_post(char *buff uint read_bytes = 0; int tmp_read_bytes; - count_bytes = MIN(count_bytes, (uint) SG(request_info).content_length - SG(read_post_bytes)); + count_bytes = MIN(count_bytes, SG(request_info).content_length - SG(read_post_bytes)); while (read_bytes < count_bytes) { tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes, count_bytes - read_bytes); if (tmp_read_bytes <= 0) { Index: php-5.4.13/ext/suhosin/rfc1867.c =================================================================== --- php-5.4.13.orig/ext/suhosin/rfc1867.c +++ php-5.4.13/ext/suhosin/rfc1867.c @@ -779,7 +779,7 @@ SAPI_POST_HANDLER_FUNC(suhosin_rfc1867_p { char *boundary, *s=NULL, *boundary_end = NULL, *start_arr=NULL, *array_index=NULL; char *temp_filename=NULL, *lbuf=NULL, *abuf=NULL; - int boundary_len=0, total_bytes=0, cancel_upload=0, is_arr_upload=0, array_len=0; + long boundary_len=0, total_bytes=0, cancel_upload=0, is_arr_upload=0, array_len=0; int max_file_size=0, skip_upload=0, anonindex=0, is_anonymous; zval *http_post_files=NULL; HashTable *uploaded_files=NULL; #if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
