Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at Tue Sep 13 12:30:34 CEST 2011.
-------- --- php5/php5.changes 2011-05-29 19:14:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2011-09-05 03:21:54.000000000 +0200 @@ -1,0 +2,149 @@ +Mon Sep 5 01:20:22 UTC 2011 - [email protected] + +- call openssl_config too in order to load user-provided + engine configuration. + +------------------------------------------------------------------- +Sat Sep 3 05:18:44 UTC 2011 - [email protected] + +- Cleanup patches for upcoming release. + +------------------------------------------------------------------- +Sun Aug 28 20:59:36 UTC 2011 - [email protected] + +- Fixed typos in php5.spec + +------------------------------------------------------------------- +Tue Aug 23 03:35:25 UTC 2011 - [email protected] + +- Fix very publicized critical bug in crypt() implementation + +------------------------------------------------------------------- +Fri Aug 12 02:27:08 UTC 2011 - [email protected] + +- Add mssql support with freetds +- Update PHP snapshot. + +------------------------------------------------------------------- +Tue Aug 9 22:11:30 UTC 2011 - [email protected] + +- Update snapshot, more static analyzer fixes. + +------------------------------------------------------------------- +Sun Aug 7 20:32:28 UTC 2011 - [email protected] + +- Update snapshot, fix converity warnings + +------------------------------------------------------------------- +Fri Aug 5 03:00:45 UTC 2011 - [email protected] + +- Update snapshot, several check if malloc() succeeded. + +------------------------------------------------------------------- +Wed Aug 3 17:51:56 UTC 2011 - [email protected] + +- Fix build in Factory +- Fix Segfault with allow_call_time_pass_reference = Off +- Using class constants in array definition fails + +------------------------------------------------------------------- +Mon Aug 1 16:38:57 UTC 2011 - [email protected] + +- Add sqlite3 session storage, this is no more than + a forward port of already existent sqlite2 backend + +------------------------------------------------------------------- +Sun Jul 31 16:06:16 UTC 2011 - [email protected] + +- Update snap, PHP 5.3.7-RC4 + +------------------------------------------------------------------- +Wed Jul 27 04:36:37 UTC 2011 - [email protected] + +- Update snapshot again. + +------------------------------------------------------------------- +Sat Jul 23 18:27:26 UTC 2011 - [email protected] + +- Update snapshot. + +------------------------------------------------------------------- +Thu Jul 14 04:42:23 UTC 2011 - [email protected] + +- is_a() function is throwing an annoying warning + "Unknown class passed as parameter" which is noticeable when + you use PEAR, fix it, if your code uses it you should be + using the instanceof operator anyway. +- Update bundled pear. + +------------------------------------------------------------------- +Mon Jul 11 18:25:52 UTC 2011 - [email protected] + +- Crash in gc_remove_zval_from_buffer CVE-NO-NAME +- Crash in zend_mm_check_ptr // Heap corruption + +------------------------------------------------------------------- +Wed Jul 6 18:55:15 UTC 2011 - [email protected] + +- Fixed missing Expires and Cache-Control headers for ping and status pages +- fix crypt() issue with overlong salt +- Fixed bug #52935 (call exit in user_error_handler cause stream relate core). + +------------------------------------------------------------------- +Mon Jun 27 04:12:25 UTC 2011 - [email protected] + +- Fix crash in error_log (strlen with NULL) +- Fixed exit at FPM startup on fpm_resources_prepare +- Added master rlimit_files and rlimit_core +- Removed pid in debug logs written by chrildren processes +- Replaced shm_slots with a real scoreboard + +------------------------------------------------------------------- +Wed Jun 22 21:05:07 UTC 2011 - [email protected] + +- Enable mysqlnd compression protocol. + +------------------------------------------------------------------- +Thu Jun 16 19:24:49 UTC 2011 - [email protected] + +- Update snapshot to 5.3.7 RC1 + +------------------------------------------------------------------- +Tue Jun 14 17:10:52 UTC 2011 - [email protected] + +- Allow bison 2.5 +-File path injection vulnerability in RFC1867 File upload CVE-2011-2202. + +------------------------------------------------------------------- +Fri Jun 10 21:25:59 UTC 2011 - [email protected] + +- Update 5.3 snap +- Fix compiler failure that happended after compile error. +- Stream not closed and error not returned when SSL CN_match fails. + +------------------------------------------------------------------- +Mon Jun 6 23:08:38 UTC 2011 - [email protected] + +- Update 5.3 snap +- Update bundled PEAR +- Case discrepancy in timezone names cause Uncaught exception and fatal error. +- SEEK_CUR with 0 value, returns a warning +- Restore fix: do not accept paths with NULL in them + +------------------------------------------------------------------- +Fri Jun 3 16:35:22 UTC 2011 - [email protected] + +- Update to version 5.3.6.201106031621 +- Crash when calling call_user_func with unknown function name +- Fixed double registering of browscap ini directive + +------------------------------------------------------------------- +Sun May 29 20:12:46 UTC 2011 - [email protected] + +- Drop Update alternatives usage, there are no alternatives + PHP4 is gone and PHP6 is not coming at any time soon. +- Remove "mm" support from session module, virtually nothing + uses it and it doesnt support proper locking, mount + /var/lib/php5 in tmpfs instead. + +------------------------------------------------------------------- @@ -62,0 +212,5 @@ +Mon Mar 28 20:46:25 UTC 2011 - [email protected] + +- Add tcpd-devel for building the SNMP extension on SLE_10 and apache_server_SLE_10. + +------------------------------------------------------------------- @@ -2250 +2404 @@ -- roxen/pike still doesn�t work +- roxen/pike still doesn�t work @@ -2361 +2515 @@ -- some fixes in DAV, still doesn�t work +- some fixes in DAV, still doesn�t work calling whatdependson for head-i586 Old: ---- php-5.3.6-intl.patch php-5.3.6.201105291701.tar.bz2 New: ---- php-5.3.6-gcc_builtins.patch php-5.3.8.tar.bz2 php5-missing-extdeps.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.Nb8kiE/_old 2011-09-13 12:30:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Nb8kiE/_new 2011-09-13 12:30:28.000000000 +0200 @@ -29,9 +29,12 @@ BuildRequires: apache2-devel bison curl-devel freetype2-devel gcc-c++ libpng-devel xorg-x11-devel BuildRequires: db-devel enchant-devel gmp-devel imap-devel libicu-devel libtidy-devel -BuildRequires: libtiff-devel libxslt-devel mm-devel net-snmp-devel openldap2-devel +BuildRequires: libtiff-devel libxslt-devel ncurses-devel net-snmp-devel openldap2-devel BuildRequires: pam-devel pkgconfig postfix postgresql-devel unixODBC-devel update-alternatives BuildRequires: krb5-devel libevent-devel libmcrypt-devel tcpd-devel +%if 0%{suse_version} > 1110 +BuildRequires: freetds-devel +%endif #BuildRequires: mysql-devel %if %{with_spell} BuildRequires: aspell-devel @@ -58,6 +61,10 @@ #10.3 does not install sendmail binary with the minimal system Requires: smtp_daemon %endif +%if 0%{?suse_version} < 1100 +#10 requires tcpd-devel to build +BuildRequires: tcpd-devel +%endif %define extension_dir %{_libdir}/%{pkg_name}/extensions %define peardir %{_datadir}/%{pkg_name}/PEAR %define php_sysconf %{_sysconfdir}/%{pkg_name} @@ -76,7 +83,7 @@ #define builtin_tz_ver 2007.9 ### ### -Version: 5.3.6.201105291701 +Version: 5.3.8 Release: 1 License: The PHP License, version 3.01 Group: Development/Languages/Other @@ -84,7 +91,6 @@ Provides: php-api = %{apiver}, php-zend-abi = %{zendver} Provides: php(api) = %{apiver}, php(zend-abi) = %{zendver} AutoReqProv: on -PreReq: update-alternatives #extensions that are no longer here Obsoletes: php5-dbx php5-dio php5-fam php5-filepro php5-yp php5-dbase php5-ncurses #builtin,nowdays required for everything that uses sha2 @@ -114,14 +120,20 @@ Patch19: php-5.3.0-bnc513080.patch Patch20: php-5.3.2-ini.patch # PATCH-FIX-UPSTREAM php5-autoconf-2.65.patch http://bugs.php.ney/bug.php?id=50291 [email protected] -- Build fails with autoconf > 2.63 +# Modified to work with PHP 5.3.7 release Patch22: php-5.3.2-aconf26x.patch Patch24: php-5.3.2-no-build-date.patch Patch25: php-cloexec.patch Patch26: php-5.3.4-pts.patch Patch27: php-5.3.4-format-string-issues.patch -Patch28: php-5.3.6-intl.patch Patch29: php5-openssl.patch Patch30: php-5.3.6-ini-date.timezone.patch +Patch31: php5-missing-extdeps.patch +%if 0%{suse_version} > 1120 +%ifarch x86_64 +Patch33: php-5.3.6-gcc_builtins.patch +%endif +%endif Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: PHP5 Core Files @@ -156,7 +168,6 @@ Requires: pcre-devel %endif Conflicts: php4-devel -PreReq: update-alternatives Provides: php-macros = 2.0 Obsoletes: php-macros < 2.0 @@ -180,7 +191,6 @@ Summary: PHP Extension and Application Repository Group: Development/Libraries/PHP Requires: %{name}-zlib = %{version} -PreReq: update-alternatives %if 0%{?suse_version} > 1110 BuildArch: noarch %endif @@ -190,7 +200,7 @@ similar to TeX's CTAN and Perl's CPAN. This package provides an access to the repository. -See http://pear.php.net/manual/ for more datails. +See http://pear.php.net/manual/ for more details. @@ -230,7 +240,6 @@ Summary: FastCGI PHP5 Module Group: Development/Libraries/PHP Requires: %{name} = %{version} -PreReq: update-alternatives Provides: php-xml php-fastcgi php-cgi php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter %description fastcgi @@ -255,7 +264,7 @@ Summary: FastCGI Process Manager PHP5 Module Group: Development/Libraries/PHP Requires: %{name} = %{version} -PreReq: update-alternatives %insserv_prereq +PreReq: %insserv_prereq Provides: php-fpm php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter %description fpm @@ -410,7 +419,7 @@ Requires: %{name} = %{version} %description enchant -Enchant is the PHP binding for the » Enchant library. Enchant steps in to provide uniformity and conformity on top of all spelling libraries, and implement certain features that may be lacking in any individual provider library. Everything should "just work" for any and every definition of "just working." +Enchant is the PHP binding for the Enchant library. Enchant steps in to provide uniformity and conformity on top of all spelling libraries, and implements certain features that may be lacking in any individual provider library. Everything should "just work" for any and every definition of "just working." Authors: @@ -571,7 +580,7 @@ Requires: %{name} = %{version} %description intl -Internationalization extension (further is referred as Intl) is a wrapper for » ICU library, enabling PHP programmers to perform UCA-conformant collation and date/time/number/currency formatting in their scripts. +Internationalization extension (further is referred as Intl) is a wrapper for ICU library, enabling PHP programmers to perform UCA-conformant collation and date/time/number/currency formatting in their scripts. Authors: @@ -651,6 +660,19 @@ The PHP Group See http://www.php.net/credits.php for more details + + +%package mssql +License: The PHP License, version 3.01 +Provides: php-mssql +Provides: php_any_db +Summary: PHP5 Extension Module +Group: Development/Libraries/PHP + +%description mssql +PHP functions for access to MSSQL database servers. + + %package mysql License: The PHP License, version 3.01 Provides: php-mysql php5-mysqli = %{version} php5-pdo_mysql = %{version} @@ -734,7 +756,7 @@ %description phar The phar extension provides a way to put entire PHP applications into a -single file called a "phar" (PHP Archive) for easy distribution and installation +single file called a "phar" (PHP Archive) for easy distribution and installation. Authors: -------- @@ -1030,7 +1052,7 @@ %description tidy Tidy is an extension based on Libtidy (http://tidy.sf.net/) and allows -a PHP dev eloper to clean, repair, and traverse HTML, XHTML, and XML +a PHP developer to clean, repair, and traverse HTML, XHTML, and XML documents -- including ones with embedded scripting languages such as PHP or ASP within them using OO constructs. @@ -1121,7 +1143,7 @@ %description xmlreader XMLReader represents a reader that provides non-cached, forward-only -access to XML data. It is based upon the xmlTextReader api from libxml. +access to XML data. It is based upon the xmlTextReader API from libxml. @@ -1210,9 +1232,31 @@ %patch25 %patch26 %patch27 -%patch28 %patch29 %patch30 +%patch31 +%if 0%{suse_version} > 1120 +%ifarch x86_64· +%patch33 +%endif +%endif + +# 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 + : Error: Upstream API version is now ${vapi}, expecting %{apiver}. + : Update the apiver macro and rebuild. + exit 1 +fi +vzend=`sed -n '/#define ZEND_MODULE_API_NO/{s/^[^0-9]*//;p;}' Zend/zend_modules.h` +if test "x${vzend}" != "x%{zendver}"; then + : Error: Upstream Zend ABI version is now ${vzend}, expecting %{zendver}. + : Update the zendver macro and rebuild. + exit 1 +fi + +%build + # we build three SAPI %{__mkdir_p} build-apache2 build-fpm %{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi @@ -1239,21 +1283,6 @@ done %endif -# 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 - : Error: Upstream API version is now ${vapi}, expecting %{apiver}. - : Update the apiver macro and rebuild. - exit 1 -fi -vzend=`sed -n '/#define ZEND_MODULE_API_NO/{s/^[^0-9]*//;p;}' Zend/zend_modules.h` -if test "x${vzend}" != "x%{zendver}"; then - : Error: Upstream Zend ABI version is now ${vzend}, expecting %{zendver}. - : Update the zendver macro and rebuild. - exit 1 -fi - -%build # Force use of system libtool(when newer than the included) #get rid of bundled libraries which are not used in 10.2 and later %if 0%{?suse_version} > 1010 @@ -1266,10 +1295,6 @@ # export flags CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing" -%if 0%{?suse_version} > 1000 -CFLAGS="$CFLAGS -fstack-protector" -CXXFLAGS="$CXXFLAGS -fstack-protector" -%endif export CFLAGS export CXXFLAGS export NO_INTERACTION=true @@ -1277,6 +1302,8 @@ EXTENSION_DIR=%{extension_dir} export EXTENSION_DIR export PHP_MYSQLND_ENABLED=yes +export PHP_MYSQLND_COMPRESSION_SUPPORT=yes + # build function Build() { @@ -1309,7 +1336,6 @@ --disable-rpath \ --disable-static \ --enable-shared \ - --program-suffix=5 \ --with-pic \ --with-gnu-ld \ --enable-re2c-cgoto \ @@ -1327,19 +1353,17 @@ #We have still have harcoded RPATH in some modules %{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool %{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=LIBTOOL_IS_BROKED|g' libtool - %{__make} %{?jobs:-j%jobs PHP_PEAR_PHP_BIN=%{_bindir}/%{pkg_name}} + %{__make} %{?jobs:-j%jobs PHP_PEAR_PHP_BIN=%{_bindir}/php} popd } # perform all builds # apache2 sapi Build apache2 \ - --with-mm \ --with-apxs2=%{apxs2} \ --disable-all \ --disable-cli \ # fast-cgi sapi Build fastcgi \ - --with-mm \ --enable-force-cgi-redirect \ --disable-discard-path \ --enable-fastcgi \ @@ -1348,7 +1372,6 @@ --disable-all \ Build fpm \ - --with-mm \ --enable-fpm \ --bindir=%{_bindir} \ --disable-cli \ @@ -1451,6 +1474,9 @@ --enable-zip=shared \ --enable-suhosin=shared \ --enable-intl=shared,%{_usr} \ +%if 0%{suse_version} > 1110 + --with-mssql=shared,%{_usr} \ +%endif --disable-cgi # things that currently do not compile: # extensions: @@ -1478,7 +1504,7 @@ Install() { pushd build-$1 - %{__make} install INSTALL_ROOT=%{buildroot} PHP_PEAR_PHP_BIN=%{_bindir}/%{pkg_name} + %{__make} install INSTALL_ROOT=%{buildroot} PHP_PEAR_PHP_BIN=%{_bindir}/php popd } # do the actual installation @@ -1525,14 +1551,6 @@ # apache configuration %{__mkdir_p} %{buildroot}%{apache2_sysconfdir}/conf.d %{__install} -m 644 php-suse-addons/sysconfig.apache2 %{buildroot}/%{apache2_sysconfdir}/conf.d/%{pkg_name}.conf -pushd %{buildroot}/%{_bindir} -#%{__mv} php php5 -%{__mv} pear pear5 -%{__mv} pecl pecl5 -popd -#pushd %{buildroot}/%{_mandir}/man1 -#%{__mv} php.1 php5.1 -#popd # directory for sessions %{__install} -d %{buildroot}/var/lib/%{pkg_name} # documentation @@ -1544,7 +1562,7 @@ %{__install} -d -m 0755 %{buildroot}/var/lib/pear # provide compat symlink %{__mkdir_p} %{buildroot}/srv/www/cgi-bin -%{__ln_s} /usr/bin/php-cgi5 %{buildroot}/srv/www/cgi-bin/php5 +%{__ln_s} /usr/bin/php-cgi %{buildroot}/srv/www/cgi-bin/php #fix symlink sed -i -e "s@$RPM_BUILD_DIR/php-%{version}/build-cli/sapi/cli/php@php@g" %{buildroot}%{_bindir}/phar.phar rm %{buildroot}%{_bindir}/phar @@ -1560,54 +1578,6 @@ install -d %{buildroot}%{_sysconfdir}/init.d install -m 755 -c %{S:8} %{buildroot}%{_sysconfdir}/init.d/php-fpm -%post -update-alternatives --install %{_bindir}/php php %{_bindir}/php5 5 \ - --slave %{_mandir}/man1/php.1.gz php.1 %{_mandir}/man1/php5.1.gz -update-alternatives --auto php - -%preun -if [ $1 -eq 0 ]; then - update-alternatives --remove php %{_bindir}/php5 -fi - -%post fastcgi -update-alternatives --install %{_bindir}/php-cgi php-cgi %{_bindir}/php-cgi5 5 -update-alternatives --auto php-cgi - -%preun fastcgi -if [ $1 -eq 0 ]; then - update-alternatives --remove php-cgi %{_bindir}/php-cgi5 -fi - -%post pear -update-alternatives --install %{_bindir}/pear pear %{_bindir}/pear5 5 -update-alternatives --auto pear - -%preun pear -if [ $1 -eq 0 ]; then - update-alternatives --remove pear %{_bindir}/pear5 -fi - -%post devel -#phpize -update-alternatives --install %{_bindir}/phpize phpize %{_bindir}/phpize5 5 \ - --slave %{_mandir}/man1/phpize.1.gz phpize.1 %{_mandir}/man1/phpize5.1.gz -update-alternatives --auto phpize -#php-config -update-alternatives --install %{_bindir}/php-config php-config %{_bindir}/php-config5 5 \ - --slave %{_mandir}/man1/php-config.1.gz php-config.1 %{_mandir}/man1/php-config5.1.gz -update-alternatives --auto php-config -#pecl -update-alternatives --install %{_bindir}/pecl pecl %{_bindir}/pecl5 5 -update-alternatives --auto pecl - -%preun devel -if [ $1 -eq 0 ]; then - update-alternatives --remove phpize %{_bindir}/phpize5 - update-alternatives --remove pecl %{_bindir}/pecl5 - update-alternatives --remove php-config %{_bindir}/php-config5 -fi - %post -n apache2-mod_php5 #some distro versions does not have this tool. if [ -x /usr/sbin/a2enmod ] @@ -1629,9 +1599,6 @@ fi fi -%postun -n apache2-mod_php5 -%restart_on_update apache2 - %postun fpm %restart_on_update php-fpm %insserv_cleanup @@ -1653,9 +1620,8 @@ %dir %{php_sysconf}/conf.d %dir %{php_sysconf}/cli %config(noreplace) %{php_sysconf}/cli/php.ini -%{_bindir}/%{pkg_name} +%{_bindir}/php %dir %{_libdir}/%{pkg_name} -#%dir %{safemode_dir} %dir %{extension_dir} %dir %{_datadir}/%{pkg_name} %attr(0755, wwwrun, root) %dir /var/lib/%{pkg_name} @@ -1664,33 +1630,33 @@ %defattr(-, root, root) %doc README.macros %{_includedir}/%{pkg_name} -%{_bindir}/phpize5 -%{_bindir}/php-config5 -%{_bindir}/pecl5 +%{_bindir}/phpize +%{_bindir}/php-config +%{_bindir}/pecl %{_datadir}/%{pkg_name}/build %config %{_sysconfdir}/rpm/macros.php %files pear %defattr(-, root, root) %doc pear/README.SUSE -%{_bindir}/pear5 +%{_bindir}/pear %config(noreplace) %{php_sysconf}/cli/pear.conf %{peardir} %dir /var/lib/pear %files fastcgi %defattr(-, root, root) -%{_bindir}/php-cgi5 -/srv/www/cgi-bin/php5 +%{_bindir}/php-cgi +/srv/www/cgi-bin/php %dir %{php_sysconf}/fastcgi %config(noreplace) %{php_sysconf}/fastcgi/php.ini %files fpm %defattr(-, root, root) -%{_sbindir}/php-fpm5 +%{_sbindir}/php-fpm %dir %{php_sysconf}/fpm %config %{php_sysconf}/fpm/php-fpm.conf.default -%{_mandir}/man8/php-fpm5.8.gz +%{_mandir}/man8/php-fpm.8.gz %config /etc/init.d/php-fpm %files -n apache2-mod_php5 @@ -1805,6 +1771,14 @@ %{extension_dir}/mcrypt.so %config(noreplace) %{php_sysconf}/conf.d/mcrypt.ini +%if 0%{suse_version} > 1110 + +%files mssql +%defattr(644,root,root,755) +%{extension_dir}/mssql.so +%config(noreplace) %{php_sysconf}/conf.d/mssql.ini +%endif + %files mysql %defattr(644,root,root,755) %{extension_dir}/mysql.so ++++++ install-pear-nozlib.phar ++++++ ++++ 4439 lines (skipped) ++++ between install-pear-nozlib.phar ++++ and /mounts/work_src_done/STABLE/php5/install-pear-nozlib.phar ++++++ php-5.3.2-aconf26x.patch ++++++ --- /var/tmp/diff_new_pack.Nb8kiE/_old 2011-09-13 12:30:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Nb8kiE/_new 2011-09-13 12:30:28.000000000 +0200 @@ -40,7 +40,7 @@ --- configure.in.orig +++ configure.in @@ -1,7 +1,7 @@ - ## $Id: configure.in 310307 2011-04-18 09:50:32Z bjori $ -*- autoconf -*- + ## $Id: configure.in 315343 2011-08-23 08:56:29Z johannes $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) ++++++ php-5.3.6-gcc_builtins.patch ++++++ --- Zend/zend_alloc.c.orig +++ Zend/zend_alloc.c @@ -36,7 +36,7 @@ # include <wincrypt.h> # include <process.h> #endif - +#include <x86intrin.h> #ifndef ZEND_MM_HEAP_PROTECTION # define ZEND_MM_HEAP_PROTECTION ZEND_DEBUG #endif @@ -665,10 +665,7 @@ static inline unsigned int zend_mm_high_ __asm__("bsrl %1,%0\n\t" : "=r" (n) : "rm" (_size)); return n; #elif defined(__GNUC__) && defined(__x86_64__) - unsigned long n; - - __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size)); - return (unsigned int)n; + return __bsrq(_size); #elif defined(_MSC_VER) && defined(_M_IX86) __asm { bsr eax, _size @@ -691,10 +688,7 @@ static inline unsigned int zend_mm_low_b __asm__("bsfl %1,%0\n\t" : "=r" (n) : "rm" (_size)); return n; #elif defined(__GNUC__) && defined(__x86_64__) - unsigned long n; - - __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size)); - return (unsigned int)n; + return __bsfq(_size); #elif defined(_MSC_VER) && defined(_M_IX86) __asm { bsf eax, _size ++++++ php-5.3.6.201105291701.tar.bz2 -> php-5.3.8.tar.bz2 ++++++ php5/php-5.3.6.201105291701.tar.bz2 /mounts/work_src_done/STABLE/php5/php-5.3.8.tar.bz2 differ: char 11, line 1 ++++++ php-fpm.init ++++++ --- /var/tmp/diff_new_pack.Nb8kiE/_old 2011-09-13 12:30:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Nb8kiE/_new 2011-09-13 12:30:28.000000000 +0200 @@ -119,7 +119,7 @@ # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance -PHPFPM_BIN=/usr/sbin/php-fpm5 +PHPFPM_BIN=/usr/sbin/php-fpm test -x $PHPFPM_BIN || { echo "$PHPFPM_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } ++++++ php5-missing-extdeps.patch ++++++ --- ext/soap/soap.c.orig +++ ext/soap/soap.c @@ -439,7 +439,7 @@ unsigned char arginfo_soapclient___soapc # define arginfo_soapserver_setobject NULL # define arginfo_soapserver_addfunction NULL # define arginfo_soapserver_getfunctions NULL -# defina arginfo_soapserver_handle NULL +# define arginfo_soapserver_handle NULL # define arginfo_soapserver_fault NULL # define arginfo_soapserver_addsoapheader NULL @@ -516,10 +516,18 @@ static const zend_function_entry soap_he PHP_FE_END }; -zend_module_entry soap_module_entry = { -#ifdef STANDARD_MODULE_HEADER - STANDARD_MODULE_HEADER, +/* {{{ soap dependencies */ +static const zend_module_dep soap_module_deps[] = { + ZEND_MOD_REQUIRED("standard") +#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) + ZEND_MOD_REQUIRED("session") #endif + {NULL, NULL, NULL} +}; + +zend_module_entry soap_module_entry = { + STANDARD_MODULE_HEADER_EX, NULL, + soap_module_deps, "soap", soap_functions, PHP_MINIT(soap), --- ext/wddx/wddx.c.orig +++ ext/wddx/wddx.c @@ -154,10 +154,21 @@ ZEND_GET_MODULE(wddx) #endif /* COMPILE_DL_WDDX */ /* }}} */ +/* {{{ wddx dependencies */ +static const zend_module_dep wddx_module_deps[] = { + ZEND_MOD_REQUIRED("standard") + ZEND_MOD_REQUIRED("xml") + ZEND_MOD_REQUIRED("date") +#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) + ZEND_MOD_REQUIRED("session") +#endif + {NULL, NULL, NULL} +}; /* {{{ wddx_module_entry */ zend_module_entry wddx_module_entry = { - STANDARD_MODULE_HEADER, + STANDARD_MODULE_HEADER_EX, NULL, + wddx_module_deps, "wddx", wddx_functions, PHP_MINIT(wddx), --- ext/filter/filter.c.orig +++ ext/filter/filter.c @@ -132,12 +132,17 @@ static const zend_function_entry filter_ }; /* }}} */ +/* {{{ filter dependencies */ +static const zend_module_dep filter_module_deps[] = { + ZEND_MOD_REQUIRED("standard") + ZEND_MOD_REQUIRED("pcre") + {NULL, NULL, NULL} +}; /* {{{ filter_module_entry */ zend_module_entry filter_module_entry = { -#if ZEND_MODULE_API_NO >= 20010901 - STANDARD_MODULE_HEADER, -#endif + STANDARD_MODULE_HEADER_EX, NULL, + filter_module_deps, "filter", filter_functions, PHP_MINIT(filter), --- ext/mbstring/mbstring.c.orig +++ ext/mbstring/mbstring.c @@ -561,9 +561,19 @@ const zend_function_entry mbstring_funct }; /* }}} */ +/* {{{ mbstring dependencies */ +static const zend_module_dep mbstring_module_deps[] = { + ZEND_MOD_REQUIRED("standard") +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !HAVE_ONIG + ZEND_MOD_REQUIRED("pcre") +#endif + {NULL, NULL, NULL} +}; + /* {{{ zend_module_entry mbstring_module_entry */ zend_module_entry mbstring_module_entry = { - STANDARD_MODULE_HEADER, + STANDARD_MODULE_HEADER_EX, NULL, + mbstring_module_deps, "mbstring", mbstring_functions, PHP_MINIT(mbstring), ++++++ php5-openssl.patch ++++++ --- /var/tmp/diff_new_pack.Nb8kiE/_old 2011-09-13 12:30:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Nb8kiE/_new 2011-09-13 12:30:28.000000000 +0200 @@ -1,7 +1,5 @@ -Index: ext/openssl/openssl.c -=================================================================== ---- ext/openssl/openssl.c (revisión: 310212) -+++ ext/openssl/openssl.c (copia de trabajo) +--- ext/openssl/openssl.c.orig ++++ ext/openssl/openssl.c @@ -47,6 +47,7 @@ #include <openssl/rand.h> #include <openssl/ssl.h> @@ -10,7 +8,12 @@ /* Common */ #include <time.h> -@@ -983,7 +984,12 @@ +@@ -979,10 +980,16 @@ PHP_MINIT_FUNCTION(openssl) + le_x509 = zend_register_list_destructors_ex(php_x509_free, NULL, "OpenSSL X.509", module_number); + le_csr = zend_register_list_destructors_ex(php_csr_free, NULL, "OpenSSL X.509 CSR", module_number); + ++ OPENSSL_config(NULL); + SSL_library_init(); OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); OpenSSL_add_all_algorithms(); @@ -18,8 +21,20 @@ + ENGINE_load_builtin_engines(); + /* Register all of them for every algorithm they collectively implement */ + ENGINE_register_all_complete(); - + + ERR_load_ERR_strings(); ERR_load_crypto_strings(); - ERR_load_EVP_strings(); +--- ext/openssl/xp_ssl.c.orig ++++ ext/openssl/xp_ssl.c +@@ -376,7 +376,9 @@ static inline int php_openssl_setup_cryp + php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create an SSL context"); + return -1; + } +- ++#ifdef SSL_MODE_RELEASE_BUFFERS ++ SSL_CTX_set_mode(sslsock->ctx, SSL_MODE_RELEASE_BUFFERS); ++#endif + SSL_CTX_set_options(sslsock->ctx, SSL_OP_ALL); + + #if OPENSSL_VERSION_NUMBER >= 0x0090806fL ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
