X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=cac2f0166dd3d747bcca9ee019f1a6748dbf091f;hb=80a85ca;hp=84df962b5d3995a1381e88dcedd0bc408911fc0e;hpb=c451ce4e858834733ee602108797419621c2df03;p=packages%2Fphp.git diff --git a/php.spec b/php.spec index 84df962..cac2f01 100644 --- a/php.spec +++ b/php.spec @@ -1,17 +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 -# - --with-password-argon2 https://wiki.php.net/rfc/argon2_password_hash -# - zip: read/write encrypted archive, relying on libzip 1.2.0, -# - Use of bundled libzip is deprecated, --with-libzip option is recommended. -# - configure: WARNING: unrecognized options: --enable-gd-native-ttf +# - 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() -# - build with system libgd 2.1, see 73c5128 # 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 @@ -40,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 @@ -100,11 +97,12 @@ %bcond_without xmlrpc # without XML-RPC extension module %bcond_without xsl # without xsl extension module # extensions options +%bcond_without argon2 # argon2 password hashing %bcond_without instantclient # build Oracle oci8 extension module against oracle-instantclient package %bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs) %bcond_with mm # without mm support for session storage -%bcond_with system_gd # with system gd (imageantialias function is missing then) -%bcond_with system_libzip # with system libzip (reported broken currently) +%bcond_without system_gd # system gd +%bcond_without system_libzip # system libzip %bcond_without webp # Without WebP support in GD extension (imagecreatefromwebp) %define apxs1 /usr/sbin/apxs1 @@ -146,9 +144,9 @@ %undefine with_filter %endif -%define subver beta3 +%define subver RC3 %define orgname php -%define ver_suffix 72 +%define ver_suffix 73 %define php_suffix %{!?with_default_php:%{ver_suffix}} Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP @@ -157,8 +155,8 @@ 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.12 +Version: 7.3.0 +Release: 1.%{subver}.1 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -166,8 +164,9 @@ Epoch: 4 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-md5: fb658ee432cff906bd16aabc682caf27 +Source0: https://downloads.php.net/~cmb/php-%{version}%{subver}.tar.xz +# Source0-md5: 28d28a4680ee2c2e780343807b0a0d95 +Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -183,7 +182,7 @@ Patch2: %{orgname}-mail.patch Patch3: %{orgname}-link-libs.patch Patch4: intl-stdc++.patch Patch5: %{orgname}-filter-shared.patch -Patch6: %{orgname}-build_modules.patch + Patch7: %{orgname}-sapi-ini-file.patch Patch8: milter.patch Patch9: libtool-tag.patch @@ -216,7 +215,6 @@ Patch53: fix-test-run.patch Patch55: bug-52078-fileinode.patch Patch59: %{orgname}-systzdata.patch Patch60: %{orgname}-oracle-instantclient.patch -Patch65: system-libzip.patch Patch66: php-db.patch Patch67: mysql-lib-ver-mismatch.patch # https://bugs.php.net/bug.php?id=68344 @@ -237,6 +235,7 @@ BuildRequires: db-devel >= 4.0 BuildRequires: elfutils-devel %{?with_enchant:BuildRequires: enchant-devel >= 1.1.3} %{?with_kerberos5:BuildRequires: heimdal-devel} +%{?with_argon2:BuildRequires: libargon2-devel >= 20161029} %{?with_sodium:BuildRequires: libsodium-devel >= 1.0.8} %if %{with pdo_dblib} BuildRequires: freetds-devel >= 0.82 @@ -263,19 +262,20 @@ 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 >= 0.10.1-2} +%{?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 %endif %{?with_oci:%{?with_instantclient:BuildRequires: oracle-instantclient-devel}} BuildRequires: pam-devel -%{?with_pcre:BuildRequires: pcre-devel >= 8.10} +%{?with_pcre:BuildRequires: pcre2-8-devel >= 10.30} BuildRequires: pkgconfig %{?with_pgsql:BuildRequires: postgresql-devel} BuildRequires: readline-devel @@ -307,26 +307,26 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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 20170718 -%define zend_module_api 20170718 -%define zend_extension_api 320170718 +%define php_api_version 20180731 +%define zend_module_api 20180731 +%define zend_extension_api 320180731 %define php_pdo_api_version 20170320 # Extension versions -%define bz2ver 1.0 -%define enchantver 1.1.0 -%define fileinfover 1.0.5 -%define hashver 1.0 -%define intlver 1.1.0 -%define jsonver 1.6.0 -%define pharver 2.0.2 +%define bz2ver %{version} +%define enchantver %{version} +%define fileinfover %{version} +%define hashver %{version} +%define intlver %{version} +%define jsonver 1.7.0 +%define pharver %{version} %define sqlite3ver %{version} -%define zipver 1.15.1 +%define zipver 1.15.4 %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 @@ -577,7 +577,7 @@ Provides: php(libxml) Provides: php(reflection) Provides: php(standard) %{!?with_mysqlnd:Obsoletes: %{name}-mysqlnd} -%{?with_pcre:%requires_ge_to pcre pcre-devel} +%{?with_pcre:%requires_ge_to pcre2-8 pcre2-8-devel} Suggests: browscap Obsoletes: php-common < 4:5.3.28-7 # withdrawn modules @@ -621,7 +621,7 @@ Requires: libtool >= 2:2.4.6 %else Requires: libtool %endif -%{?with_pcre:Requires: pcre-devel >= 8.10} +%{?with_pcre:Requires: pcre2-8-devel >= 10.30} Requires: shtool Provides: php-devel = %{epoch}:%{version}-%{release} Obsoletes: php-devel @@ -633,6 +633,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. @@ -1944,7 +1945,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 >= 0.10.1-2} +%{?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 @@ -1977,11 +1978,11 @@ 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 -%patch6 -p1 + %patch7 -p1 %{?with_milter:%patch8 -p1} %patch9 -p1 @@ -2009,20 +2010,21 @@ cp -p php.ini-production php.ini #%patch45 -p1 # imap annotations. fixme #%patch46 -p1 # imap myrights. fixme %patch50 -p1 -%patch51 -p1 +%patch51 -p1 -b .spl-shared %patch52 -p1 -b .pcre-shared %patch53 -p1 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt %patch55 -p1 -%patch59 -p1 -%patch60 -p1 -%{?with_system_libzip:%patch65 -p1} +%patch59 -p1 -b .systzdata +%if %{with instantclient} +%patch60 -p1 -b .instantclient +%endif %patch66 -p1 %patch67 -p1 #%patch68 -p1 DROP or update to 7.0 APIs %patch70 -p1 %patch71 -p1 -%patch72 -p1 +%patch72 -p1 -b .phar-shared %{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 @@ -2045,8 +2047,8 @@ 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/pcre/pcrelib +%{__rm} -r ext/mbstring/oniguruma +%{__rm} -r ext/pcre/pcre2lib #%{__rm} -r ext/soap/interop %{__rm} -r ext/xmlrpc/libxmlrpc #%{__rm} -r ext/zip/lib @@ -2126,6 +2128,11 @@ ix86=: x8664=: \ sh -xe %{_sourcedir}/skip-tests.sh %build +get_version() { + local define="$1" filename="$2" + awk -vdefine="$define" '/#define/ && $2 == define {print $3}' "$filename" | xargs +} + API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h) if [ $API != %{php_api_version} ]; then echo "Set %%define php_api_version to $API and re-run." @@ -2151,14 +2158,14 @@ if [ $API != %{php_pdo_api_version} ]; then fi # Check for some extension version -ver=$(sed -n '/#define PHP_FILEINFO_VERSION /{s/.* "//;s/".*$//;p}' ext/fileinfo/php_fileinfo.h) -if test "$ver" != "%{fileinfover}"; then +ver=$(awk '/#define PHP_FILEINFO_VERSION/ {print $3}' ext/fileinfo/php_fileinfo.h | xargs) +if test "$ver" != "PHP_VERSION"; then : Error: Upstream FILEINFO version is now ${ver}, expecting %{fileinfover}. : Update the fileinfover macro and rebuild. exit 1 fi -ver=$(sed -n '/#define PHP_PHAR_VERSION /{s/.* "//;s/".*$//;p}' ext/phar/php_phar.h) -if test "$ver" != "%{pharver}"; then +ver=$(get_version PHP_PHAR_VERSION ext/phar/php_phar.h) +if test "$ver" != "PHP_VERSION"; then : Error: Upstream PHAR version is now ${ver}, expecting %{pharver}. : Update the pharver macro and rebuild. exit 1 @@ -2191,26 +2198,24 @@ if test "$ver" != "%{phpdbgver}"; then : Update the phpdbgver macro and rebuild. exit 1 fi -ver=$(sed -rne 's,.*(.+),\1,p' ext/bz2/package.xml) -if test "$ver" != "%{bz2ver}"; then +ver=$(get_version PHP_BZ2_VERSION ext/bz2/php_bz2.h) +if test "$ver" != "PHP_VERSION"; then : Error: Upstream BZIP2 version is now ${ver}, expecting %{bz2ver}. : Update the bz2ver macro and rebuild. exit 1 fi -ver=$(sed -n '/#define PHP_ENCHANT_VERSION /{s/.* "//;s/".*$//;p}' ext/enchant/php_enchant.h) -if test "$ver" != "%{enchantver}"; then - : Error: Upstream Enchant version is now ${ver}, expecting %{enchantver}. - : Update the enchantver macro and rebuild. +ver=$(awk '/#define PHP_ENCHANT_VERSION/ {print $3}' ext/enchant/php_enchant.h | xargs) +if test "$ver" != "PHP_VERSION"; then exit 1 fi -ver=$(awk '/#define PHP_HASH_VERSION/ {print $3}' ext/hash/php_hash.h | xargs) -if test "$ver" != "%{hashver}"; then +ver=$(get_version PHP_HASH_VERSION ext/hash/php_hash.h) +if test "$ver" != "PHP_VERSION"; then : Error: Upstream HASH version is now ${ver}, expecting %{hashver}. : Update the hashver macro and rebuild. exit 1 fi -ver=$(sed -n '/#define PHP_INTL_VERSION /{s/.* "//;s/".*$//;p}' ext/intl/php_intl.h) -if test "$ver" != "%{intlver}"; then +ver=$(get_version PHP_INTL_VERSION ext/intl/php_intl.h) +if test "$ver" != "PHP_VERSION"; then : Error: Upstream Intl version is now ${ver}, expecting %{intlver}. : Update the intlver macro and rebuild. exit 1 @@ -2306,7 +2311,8 @@ for sapi in $sapis; do --with-config-file-path=%{_sysconfdir} \ --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-system-tzdata \ - --%{!?debug:dis}%{?debug:en}able-debug \ + %{?with_argon2:--with-password-argon2} \ + --%{!?with_debug:dis}%{?with_debug:en}able-debug \ %{?with_zts:--enable-maintainer-zts} \ --enable-inline-optimization \ %{__enable_disable bcmath bcmath shared} \ @@ -2318,10 +2324,10 @@ for sapi in $sapis; do %{__enable_disable exif exif shared} \ %{__enable_disable fileinfo fileinfo shared} \ %{__enable_disable ftp ftp shared} \ - --enable-gd-native-ttf \ %{?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} \ @@ -2495,6 +2501,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 @@ -2997,7 +3004,7 @@ fi %files devel %defattr(644,root,root,755) -%doc CODING_STANDARDS README.{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,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 @@ -3057,8 +3064,7 @@ fi %if %{with dom} %files dom %defattr(644,root,root,755) -%doc ext/dom/{CREDITS,TODO} -%doc ext/dom/examples +%doc ext/dom/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dom.ini %attr(755,root,root) %{php_extensiondir}/dom.so %endif @@ -3066,7 +3072,7 @@ fi %if %{with enchant} %files enchant %defattr(644,root,root,755) -%doc ext/enchant/{CREDITS,docs/examples} +%doc ext/enchant/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/enchant.ini %attr(755,root,root) %{php_extensiondir}/enchant.so %endif @@ -3090,7 +3096,7 @@ fi %if %{with filter} %files filter %defattr(644,root,root,755) -%doc ext/filter/{CREDITS,docs/*} +%doc ext/filter/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filter.ini %attr(755,root,root) %{php_extensiondir}/filter.so %endif @@ -3122,7 +3128,7 @@ fi %if %{with gmp} %files gmp %defattr(644,root,root,755) -%doc ext/gmp/{CREDITS,README,TODO} +%doc ext/gmp/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini %attr(755,root,root) %{php_extensiondir}/gmp.so %endif @@ -3162,7 +3168,7 @@ fi %if %{with intl} %files intl %defattr(644,root,root,755) -%doc ext/intl/{CREDITS,TODO} +%doc ext/intl/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/intl.ini %attr(755,root,root) %{php_extensiondir}/intl.so %endif @@ -3186,7 +3192,7 @@ fi %if %{with mbstring} %files mbstring %defattr(644,root,root,755) -%doc ext/mbstring/{CREDITS,README*} +%doc ext/mbstring/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mbstring.ini %attr(755,root,root) %{php_extensiondir}/mbstring.so %endif @@ -3194,7 +3200,7 @@ fi %if %{with mysqli} %files mysqli %defattr(644,root,root,755) -%doc ext/mysqli/{CREDITS,TODO} +%doc ext/mysqli/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysqli.ini %attr(755,root,root) %{php_extensiondir}/mysqli.so %endif @@ -3258,7 +3264,7 @@ fi %if %{with pdo} %files pdo %defattr(644,root,root,755) -%doc ext/pdo/{CREDITS,README,TODO} +%doc ext/pdo/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo.ini %attr(755,root,root) %{php_extensiondir}/pdo.so %endif @@ -3330,7 +3336,7 @@ fi %if %{with phar} %files phar %defattr(644,root,root,755) -%doc ext/phar/{CREDITS,TODO} +%doc ext/phar/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/phar.ini %attr(755,root,root) %{php_extensiondir}/phar.so %attr(755,root,root) %{_bindir}/phar%{php_suffix}.phar @@ -3394,7 +3400,6 @@ fi %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 @@ -3408,7 +3413,7 @@ fi %files soap %defattr(644,root,root,755) -%doc ext/soap/{CREDITS,TODO*} +%doc ext/soap/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/soap.ini %attr(755,root,root) %{php_extensiondir}/soap.so @@ -3428,7 +3433,7 @@ fi %files spl %defattr(644,root,root,755) -%doc ext/spl/{CREDITS,README,TODO} +%doc ext/spl/{CREDITS,README} %doc ext/spl/examples %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/SPL.ini %attr(755,root,root) %{php_extensiondir}/spl.so @@ -3477,8 +3482,7 @@ fi %if %{with tidy} %files tidy %defattr(644,root,root,755) -%doc ext/tidy/{CREDITS,README} -%doc ext/tidy/examples +%doc ext/tidy/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/tidy.ini %attr(755,root,root) %{php_extensiondir}/tidy.so %endif @@ -3505,8 +3509,7 @@ fi %files xmlreader %defattr(644,root,root,755) -%doc ext/xmlreader/{CREDITS,README,TODO} -%doc ext/xmlreader/examples +%doc ext/xmlreader/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlreader.ini %attr(755,root,root) %{php_extensiondir}/xmlreader.so @@ -3520,8 +3523,7 @@ fi %files xmlwriter %defattr(644,root,root,755) -%doc ext/xmlwriter/{CREDITS,TODO} -%doc ext/xmlwriter/examples +%doc ext/xmlwriter/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlwriter.ini %attr(755,root,root) %{php_extensiondir}/xmlwriter.so @@ -3535,7 +3537,7 @@ fi %files zip %defattr(644,root,root,755) -%doc ext/zip/{CREDITS,TODO} +%doc ext/zip/CREDITS %doc ext/zip/examples %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/zip.ini %attr(755,root,root) %{php_extensiondir}/zip.so