---- php-5.5.2/php.ini~ 2013-08-18 15:03:23.000000000 +0300
-+++ php-5.5.2/php.ini 2013-08-18 15:04:12.055644364 +0300
+--- php-5.6.0beta1/php.ini~ 2014-04-21 21:38:01.000000000 +0300
++++ php-5.6.0beta1/php.ini 2014-04-21 21:51:47.379819417 +0300
@@ -82,6 +82,20 @@
; much more verbose when it comes to errors. We recommending using the
; development version only in development environments as errors shown to
; On windows:
; extension_dir = "ext"
-@@ -735,53 +735,6 @@
+@@ -760,53 +760,6 @@
; http://php.net/enable-dl
enable_dl = Off
-;fastcgi.logging = 0
-
-; cgi.rfc2616_headers configuration option tells PHP what type of headers to
--; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
--; is supported by Apache. When this option is set to 1 PHP will send
+-; use when sending HTTP response code. If set to 0, PHP sends Status: header that
+-; is supported by Apache. When this option is set to 1, PHP will send
-; RFC2616 compliant header.
-; Default is zero.
-; http://php.net/cgi.rfc2616-headers
;;;;;;;;;;;;;;;;
; File Uploads ;
;;;;;;;;;;;;;;;;
-@@ -830,51 +830,9 @@
+@@ -884,49 +837,8 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-; extension folders as well as the separate PECL DLL download (PHP 5).
-; Be sure to appropriately set the extension_dir directive.
-+; Ideally in PLD Linux you should install appropriate php-<extension> or
-+; php-pecl-<extension> package.
- ;
+-;
-;extension=php_bz2.dll
-;extension=php_curl.dll
-;extension=php_fileinfo.dll
-;extension=php_exif.dll ; Must be after mbstring as it depends on it
-;extension=php_mysql.dll
-;extension=php_mysqli.dll
--;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
+-;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client
-;extension=php_openssl.dll
-;extension=php_pdo_firebird.dll
-;extension=php_pdo_mysql.dll
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
--
++; Ideally in PLD Linux you should install appropriate php-<extension> or
++; php-pecl-<extension> package.
+
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
- ;;;;;;;;;;;;;;;;;;;
-@@ -938,9 +848,9 @@
- ;filter.default_flags =
-
- [iconv]
--;iconv.input_encoding = ISO-8859-1
--;iconv.internal_encoding = ISO-8859-1
--;iconv.output_encoding = ISO-8859-1
+@@ -964,19 +876,19 @@
+ ; Use of this INI entry is deprecated, use global input_encoding instead.
+ ; If empty, default_charset or input_encoding or iconv.input_encoding is used.
+ ; The precedence is: default_charset < intput_encoding < iconv.input_encoding
+-;iconv.input_encoding =
+iconv.input_encoding = UTF-8
+
+ ; Use of this INI entry is deprecated, use global internal_encoding instead.
+ ; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+ ; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
+-;iconv.internal_encoding =
+iconv.internal_encoding = UTF-8
+
+ ; Use of this INI entry is deprecated, use global output_encoding instead.
+ ; If empty, default_charset or output_encoding or iconv.output_encoding is used.
+ ; The precedence is: default_charset < output_encoding < iconv.output_encoding
+ ; To use an output encoding conversion, iconv's output handler must be set
+ ; otherwise output encoding conversion cannot be performed.
+-;iconv.output_encoding =
+iconv.output_encoding = UTF-8
[intl]
-# TODO 5.5:
+# TODO 5.6:
+# - phpdbg: link with libphp_common
# - enable --with-fpm-systemd, but ensure it checks for sd_booted()
# - build with system libgd 2.1, see 73c5128
# TODO 5.4:
#+ereg
# libxml
# Reflection
+# standard
#
# Conditional build:
%bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs)
%bcond_without cgi # disable CGI/FCGI SAPI
%bcond_without fpm # disable FPM
%bcond_without embed # disable Embedded API
-%bcond_without suhosin # with suhosin patch
+%bcond_without phpdbg # disable phpdbg SAPI
+%bcond_with milter # disable Milter SAPI
+%bcond_with suhosin # with suhosin patch, has little point in PHP>=5.3, see https://github.com/stefanesser/suhosin/issues/42#issuecomment-41728178
%bcond_with tests # default off; test process very often hangs on builders, approx run time 45m; perform "make test"
%bcond_with gcov # Enable Code coverage reporting
%bcond_with type_hints # experimental support for strict typing/casting
%undefine with_mm
%endif
+# milter requires ZTS
+%if %{with milter} && %{without zts}
+%undefine with_milter
+%endif
+
%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha
# ppc disabled (broken on th-ppc)
%undefine with_interbase
%undefine with_filter
%endif
-%define rel 1
+%define rel 0.8
%define orgname php
-%define ver_suffix 55
+%define ver_suffix 56
%define php_suffix %{!?with_default_php:%{ver_suffix}}
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 5.5.16
+Version: 5.6.0
Release: %{rel}%{?with_type_hints:.th}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 243f641c58b7d58b94b5431e0b730a5e
+# Source0-md5: 642825d75ce2634d9513d5b21dbee521
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
Patch5: %{orgname}-filter-shared.patch
Patch6: %{orgname}-build_modules.patch
Patch7: %{orgname}-sapi-ini-file.patch
-
+Patch8: milter.patch
+Patch9: libtool-tag.patch
Patch10: %{orgname}-ini.patch
Patch11: embed.patch
%if %{with type_hints}
Patch65: system-libzip.patch
Patch66: php-db.patch
Patch67: mysql-lib-ver-mismatch.patch
-
Patch69: fpm-conf-split.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%define _sysconfdir %{php_sysconfdir}
# must be in sync with source. extra check ensuring that it is so is done in %%build
-%define php_api_version 20121113
-%define zend_module_api 20121212
-%define zend_extension_api 220121212
+%define php_api_version 20131106
+%define zend_module_api 20131226
+%define zend_extension_api 220131226
%define php_pdo_api_version 20080721
# Extension versions
%define opcachever 7.0.4-dev
%define pharver 2.0.2
%define sqlite3ver 0.7-dev
-%define zipver 1.11.0
+%define zipver 1.12.4
+%define phpdbgver 0.4.0
%define _zend_zts %{!?with_zts:0}%{?with_zts:1}
%define php_debug %{!?debug:0}%{?debug:1}
%description fpm -l pl.UTF-8
PHP FastCGI Process Manager - zarządca procesów FastCGI.
+%package phpdbg
+Summary: The debugging platform for PHP 5.4+
+Group: Development/Languages/PHP
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Provides: php(phpdbg) = %{phpdbgver}
+
+%description phpdbg
+phpdbg - The interactive PHP debugger.
+
+Implemented as a SAPI module, phpdbg can excert complete control over
+the environment without impacting the functionality or performance of
+your code.
+
+phpdbg aims to be a lightweight, powerful, easy to use debugging
+platform for PHP 5.4+
+
%package common
Summary: Common files needed by both Apache modules and CGI/CLI SAPIs
Summary(pl.UTF-8): Wspólne pliki dla modułu Apache'a i programu CGI
Moduł PHP umożliwiający używanie kompresji zlib.
%prep
-%setup -q -n %{orgname}-%{version}
+%setup -q -n %{orgname}-%{version}%{?subver}
+cp -p php.ini-production php.ini
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
-
-cp -p php.ini-production php.ini
+%patch8 -p1
+%patch9 -p1
%patch10 -p1
%if %{with type_hints}
%patch12 -p0
%{?with_system_libzip:%patch65 -p1}
%patch66 -p1
%patch67 -p1
-
%patch69 -p1
sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
: Update the sqlite3ver macro and rebuild.
exit 1
fi
-ver=$(sed -n '/#define PHP_ZIP_VERSION_STRING /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h)
+ver=$(sed -n '/#define PHP_ZIP_VERSION /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h)
if test "$ver" != "%{zipver}"; then
: Error: Upstream ZIP version is now ${ver}, expecting %{zipver}.
: Update the zipver macro and rebuild.
: Update the opcachever macro and rebuild.
exit 1
fi
+ver=$(sed -n '/#define PHPDBG_VERSION /{s/.* "//;s/".*$//;p}' sapi/phpdbg/phpdbg.h)
+if test "$ver" != "%{phpdbgver}"; then
+ : Error: Upstream phpdbg version is now ${ver}, expecting %{phpdbgver}.
+ : Update the phpdbgver macro and rebuild.
+ exit 1
+fi
ver=$(sed -rne 's,.*<version>(.+)</version>,\1,p' ext/bz2/package.xml)
if test "$ver" != "%{bz2ver}"; then
: Error: Upstream BZIP2 version is now ${ver}, expecting %{bz2ver}.
# configure once (for faster debugging purposes)
if [ ! -f _built-conf ]; then
# now remove Makefile copies
- rm -f Makefile.{cgi-fcgi,fpm,cli,apxs1,apxs2,litespeed}
+ rm -f Makefile.{cgi-fcgi,fpm,cli,apxs1,apxs2,litespeed,phpdbg,milter}
%{__libtoolize}
%{__aclocal}
cp -f /usr/share/automake/config.* .
%if %{with apache2}
apxs2
%endif
+%if %{with phpdbg}
+phpdbg
+%endif
+%if %{with milter}
+milter
+%endif
"
for sapi in $sapis; do
: SAPI $sapi
sapi_args="--disable-cli --disable-cgi --with-apxs2=%{apxs2} --with-apache-version=$ver"
;;
litespeed)
- sapi_args='--disable-cli --disable-cgi --with-litespeed '
+ sapi_args='--disable-cli --disable-cgi --with-litespeed'
+ ;;
+ phpdbg)
+ sapi_args='--disable-cli --disable-cgi --enable-phpdbg %{?debug:--enable-phpdbg-debug}'
+ ;;
+ milter)
+ sapi_args='--disable-cli --disable-cgi --with-milter'
;;
esac
%{__make} -f Makefile.embed libphp5.la
%endif
+%if %{with phpdbg}
+# PHP_READLINE_LIBS is empty, so force readline here
+%{__make} -f Makefile.phpdbg phpdbg \
+ PHPDBG_EXTRA_LIBS=-lreadline
+%endif
+
+%if %{with milter}
+%{__make} -f Makefile.milter milter
+%endif
+
# CGI/FCGI
%if %{with cgi}
cp -pf php_config.h.cgi-fcgi main/php_config.h
cp -pf php_config.h.cli main/php_config.h
cp -pf Makefile.cli Makefile
-./run-tests.sh -w failed.log -s tests.log
+./run-tests.sh -w failed.log -s tests.log || {
+rc=$?
# collect failed tests into cleanup script used in prep.
sed -ne '/^FAILED TEST SUMMARY/,/^===/p' tests.log | sed -e '1,/^---/d;/^===/,$d' > tests-failed.log
tty -q || cat tests.log
test ! -s failed.log
+exit $rc
+}
%endif
%install
libtool --mode=install install -p sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/%{name}.litespeed
%endif
+%if %{with phpdbg}
+%{__make} -f Makefile.phpdbg install-phpdbg \
+ INSTALL_ROOT=$RPM_BUILD_ROOT
+%endif
+
+%if %{with milter}
+%{__make} -f Makefile.milter install-milter \
+ INSTALL_ROOT=$RPM_BUILD_ROOT
+%endif
+
libtool --mode=install install -p libphp_common.la $RPM_BUILD_ROOT%{_libdir}
# install CGI/FCGI
%attr(754,root,root) /etc/rc.d/init.d/%{name}-fpm
%endif
+%if %{with phpdbg}
+%files phpdbg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/phpdbg
+%endif
+
+%if %{with milter}
+%files milter
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/php-milter
+%endif
+
%files common
%defattr(644,root,root,755)
-%doc CREDITS EXTENSIONS LICENSE NEWS README.{PHP4-TO-PHP5-THIN-CHANGES,namespaces} UPGRADING* Zend/{LICENSE.Zend,ZEND_CHANGES} php.ini-*
+%doc CREDITS EXTENSIONS LICENSE NEWS README.namespaces UPGRADING* Zend/{LICENSE.Zend,ZEND_CHANGES} php.ini-*
%dir %{_sysconfdir}
%dir %{_sysconfdir}/conf.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
%files devel
%defattr(644,root,root,755)
-%doc CODING_STANDARDS README.{EXTENSIONS,EXT_SKEL,PARAMETER_PARSING_API,SELF-CONTAINED-EXTENSIONS,STREAMS,SUBMITTING_PATCH,TESTING,TESTING2,UNIX-BUILD-SYSTEM,input_filter}
+%doc CODING_STANDARDS README.{EXT_SKEL,PARAMETER_PARSING_API,SELF-CONTAINED-EXTENSIONS,STREAMS,SUBMITTING_PATCH,TESTING,TESTING2,UNIX-BUILD-SYSTEM,input_filter}
%attr(755,root,root) %{_bindir}/phpize
%attr(755,root,root) %{_bindir}/php-config
%attr(755,root,root) %{_libdir}/libphp_common.so
%files dom
%defattr(644,root,root,755)
%doc ext/dom/{CREDITS,TODO}
+%doc ext/dom/examples
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dom.ini
%attr(755,root,root) %{php_extensiondir}/dom.so
%files simplexml
%defattr(644,root,root,755)
%doc ext/simplexml/{CREDITS,README}
+%doc ext/simplexml/examples
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/simplexml.ini
%attr(755,root,root) %{php_extensiondir}/simplexml.so
%files spl
%defattr(644,root,root,755)
-%doc ext/spl/{CREDITS,README,TODO,examples}
+%doc ext/spl/{CREDITS,README,TODO}
+%doc ext/spl/examples
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/SPL.ini
%attr(755,root,root) %{php_extensiondir}/spl.so
%files tidy
%defattr(644,root,root,755)
%doc ext/tidy/{CREDITS,README}
+%doc ext/tidy/examples
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/tidy.ini
%attr(755,root,root) %{php_extensiondir}/tidy.so
%endif
%files xmlreader
%defattr(644,root,root,755)
-%doc ext/xmlreader/{CREDITS,README,TODO,examples}
+%doc ext/xmlreader/{CREDITS,README,TODO}
+%doc ext/xmlreader/examples
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlreader.ini
%attr(755,root,root) %{php_extensiondir}/xmlreader.so
%files xmlwriter
%defattr(644,root,root,755)
%doc ext/xmlwriter/{CREDITS,TODO}
+%doc ext/xmlwriter/examples
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlwriter.ini
%attr(755,root,root) %{php_extensiondir}/xmlwriter.so
%files zip
%defattr(644,root,root,755)
%doc ext/zip/{CREDITS,TODO}
+%doc ext/zip/examples
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/zip.ini
%attr(755,root,root) %{php_extensiondir}/zip.so
projects / packages / php.git / commitdiff