X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php.spec;h=d7bfaa1571955eb23a2976c1f8b77d09916f78b0;hp=7d757fe8e770e858d3746613a427784c1e41d0d8;hb=d0ff9d5;hpb=3e7ae526a1407179e8820517193a19db3d892d40 diff --git a/php.spec b/php.spec index 7d757fe..d7bfaa1 100644 --- a/php.spec +++ b/php.spec @@ -1,12 +1,13 @@ +# NOTES +# - mysqlnd driver doesn't support reconnect: https://bugs.php.net/bug.php?id=52561 # TODO 7.2: -# - https://github.com/php/php-src/blob/php-7.2.0alpha3/UPGRADING +# - https://github.com/php/php-src/blob/php-7.2.0/UPGRADING # TODO 5.6: # - enable --with-fpm-systemd, but ensure it checks for sd_booted() # TODO 5.4: # - update imap annotations patch (needs api porting) # - update imap myrights patch (needs api porting) # --with-libmbfl=DIR MBSTRING: Use external libmbfl. DIR is the libmbfl base install directory BUNDLED -# --with-onig=DIR MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. # TODO: # - fileinfo extension bundles magic db in library: data_file.c (dump of magic.mgc) is 14M # - 2.3M fileinfo.so php54-fileinfo-5.4.6-0.15.x86_64 @@ -35,6 +36,7 @@ %bcond_with systemtap # systemtap/DTrace support %bcond_with tests # default off; test process very often hangs on builders, approx run time 45m; perform "make test" %bcond_with zts # Zend Thread Safety +%bcond_with debug # Zend Debug Build # - SAPI %bcond_without apache2 # disable building Apache 2.x SAPI %bcond_without cgi # disable CGI/FCGI SAPI @@ -142,7 +144,6 @@ %undefine with_filter %endif -%define subver RC5 %define orgname php %define ver_suffix 72 %define php_suffix %{!?with_default_php:%{ver_suffix}} @@ -153,18 +154,17 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 7.2.0 -Release: 0.23 +Version: 7.2.9 +Release: 2 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD License: PHP 3.01 and Zend and BSD Group: Libraries -#Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz -#Source0: https://downloads.php.net/~remi/php-%{version}%{subver}.tar.xz -Source0: https://downloads.php.net/~pollita/php-%{version}%{subver}.tar.xz -# Source0-md5: 6f6167edc4b7c9d91c7c1cf702705fc0 +Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz +# Source0-md5: d529efc4017840e3db970b0bc25aef9c +Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -260,12 +260,13 @@ BuildRequires: libtool >= 1.4.3 %endif BuildRequires: libxml2-devel >= 1:2.7.6-4 %{?with_xsl:BuildRequires: libxslt-devel >= 1.1.0} -%{?with_system_libzip:BuildRequires: libzip-devel >= 1.2.0} +%{?with_system_libzip:BuildRequires: libzip-devel >= 1.3.1} %{?with_snmp:%{?with_tests:BuildRequires: mibs-net-snmp}} %{?with_mm:BuildRequires: mm-devel >= 1.3.0} %{!?with_mysqli:BuildRequires: mysql-devel >= 4.1.13} %{!?with_pdo_mysql:BuildRequires: mysql-devel} %{?with_snmp:BuildRequires: net-snmp-devel >= 5.3} +BuildRequires: oniguruma-devel %{?with_ldap:BuildRequires: openldap-devel >= 2.3.0} %if %{with openssl} || %{with ldap} BuildRequires: openssl-devel >= 1.0.1 @@ -318,12 +319,12 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define jsonver 1.6.0 %define pharver 2.0.2 %define sqlite3ver %{version} -%define zipver 1.15.1 +%define zipver 1.15.3 %define phpdbgver 0.5.0 %define sodiumver %{version} %define _zend_zts %{!?with_zts:0}%{?with_zts:1} -%define php_debug %{!?debug:0}%{?debug:1} +%define php_debug %{!?with_debug:0}%{?with_debug:1} %if %{with gcov} %undefine with_ccache @@ -630,6 +631,7 @@ Obsoletes: php54-devel Obsoletes: php55-devel Obsoletes: php56-devel Obsoletes: php70-devel +Obsoletes: php71-devel %description devel The php-devel package lets you compile dynamic extensions to PHP. @@ -1941,7 +1943,7 @@ Summary(pl.UTF-8): Zarządzanie archiwami zip Group: Libraries URL: http://php.net/manual/en/book.zip.php Requires: %{name}-common = %{epoch}:%{version}-%{release} -%{?with_system_libzip:Requires: libzip >= 1.2.0} +%{?with_system_libzip:Requires: libzip >= 1.3.1} Provides: php(zip) = %{zipver} Obsoletes: php-pecl-zip < %{zipver} Obsoletes: php-zip < 4:5.3.28-7 @@ -1974,7 +1976,7 @@ Moduł PHP umożliwiający używanie kompresji zlib. cp -p php.ini-production php.ini %patch0 -p1 %patch1 -p1 -#%patch2 -p1 NEEDS PORTING +%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -2043,7 +2045,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f #%{__rm} -r ext/dba/libinifile #%{__rm} -r ext/gd/libgd #%{__rm} -r ext/mbstring/libmbfl -#%{__rm} -r ext/mbstring/oniguruma +%{__rm} -r ext/mbstring/oniguruma %{__rm} -r ext/pcre/pcrelib #%{__rm} -r ext/soap/interop %{__rm} -r ext/xmlrpc/libxmlrpc @@ -2303,7 +2305,7 @@ for sapi in $sapis; do --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-system-tzdata \ %{?with_argon2:--with-password-argon2} \ - --%{!?debug:dis}%{?debug:en}able-debug \ + --%{!?with_debug:dis}%{?with_debug:en}able-debug \ %{?with_zts:--enable-maintainer-zts} \ --enable-inline-optimization \ %{__enable_disable bcmath bcmath shared} \ @@ -2318,6 +2320,7 @@ for sapi in $sapis; do %{?with_intl:--enable-intl=shared} \ --enable-libxml \ %{__enable_disable mbstring mbstring shared,all} \ + --with-onig=/usr \ --enable-mbregex \ %{__enable_disable pcntl pcntl shared} \ %{__enable_disable pdo pdo shared} \ @@ -2481,6 +2484,8 @@ generate_inifiles() { [ "$mod" = "spl" ] && conf="SPL.ini" # session needs to be loaded before php-pecl-http, php-pecl-memcache, php-pecl-session_mysql [ "$mod" = "session" ] && conf="Session.ini" + # hash needs to be loaded before mysqlnd + [ "$mod" = "hash" ] && conf="Hash.ini" # mysqlnd needs to be loaded before mysqli,pdo_mysqli [ "$mod" = "mysqlnd" ] && conf="MySQLND.ini" echo "+ $conf" @@ -2491,6 +2496,7 @@ generate_inifiles() { done } generate_inifiles +cp -p %{_sourcedir}/opcache.ini conf.d # Check that the module inner-dependencies are intact PHP=./sapi/cli/php EXTENSION_DIR=modules CONFIG_DIR=conf.d ./dep-tests.sh > dep-tests.log @@ -3127,7 +3133,7 @@ fi %files hash %defattr(644,root,root,755) %doc ext/hash/{CREDITS,README} -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/hash.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/Hash.ini %attr(755,root,root) %{php_extensiondir}/hash.so %endif