X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php.spec;h=5eb388fc93c936e2b4077a6c96afc74ff2fbb71f;hp=5fe2ff35f73980e3bf64ef330d6a8c31fcc64024;hb=76496d3;hpb=0903df6e0419f92b2a1af986f297307f307df3b9 diff --git a/php.spec b/php.spec index 5fe2ff3..5eb388f 100644 --- a/php.spec +++ b/php.spec @@ -1,5 +1,7 @@ # NOTES # - mysqlnd driver doesn't support reconnect: https://bugs.php.net/bug.php?id=52561 +# TODO 8.0: +# - removed packages: xmlrpc # TODO 5.6: # - enable --with-fpm-systemd, but ensure it checks for sd_booted() # TODO: @@ -29,7 +31,7 @@ %bcond_without phpdbg # disable phpdbg SAPI # - Extensions %bcond_without bcmath # without bcmath extension module -%bcond_without bz2 # without bz2 extension module +%bcond_without bzip2 # without bz2 extension module %bcond_without calendar # without calendar extension module %bcond_without ctype # without ctype extension module %bcond_without curl # without CURL extension module @@ -47,7 +49,6 @@ %bcond_without iconv # without iconv extension module %bcond_without imap # without IMAP extension module %bcond_without intl # without Intl extension module -%bcond_without json # without json extension module %bcond_without ldap # without LDAP extension module %bcond_without mbstring # without mbstring extension module %bcond_without mhash # without mhash extension (supported by hash extension) @@ -78,7 +79,6 @@ %bcond_without sqlite2 # without SQLite extension module %bcond_without sqlite3 # without SQLite3 extension module %bcond_without tidy # without Tidy extension module -%bcond_without xmlrpc # without XML-RPC extension module %bcond_without xsl # without xsl extension module %bcond_without zip # without zip extension module # extensions options @@ -139,20 +139,19 @@ %undefine with_pdo_sqlite %endif -%define subver RC3 -%define rel 1 %define orgname php -%define ver_suffix 74 +%define ver_suffix 80 %define php_suffix %{!?with_default_php:%{ver_suffix}} +%define subver RC5 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP Summary(pt_BR.UTF-8): A linguagem de script PHP -Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере -Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері +Summary(ru.UTF-8): PHP - язык препроцессирования HTML-файлов, выполняемый на сервере +Summary(uk.UTF-8): PHP - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 7.4.0 -Release: 2.%{subver}.%{rel} +Version: 8.0.0 +Release: 1.%{subver}.1 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -160,8 +159,8 @@ 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/~derick/php-%{version}%{subver}.tar.xz -# Source0-md5: 16bab715ced5f8af92344c4400d7bed5 +Source0: https://downloads.php.net/~carusogabriel/php-%{version}%{subver}.tar.xz +# Source0-md5: 2809a29c4bb82640e4d0860f904d9d4f Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini @@ -183,7 +182,6 @@ Patch9: libtool-tag.patch Patch10: %{orgname}-ini.patch Patch11: embed.patch Patch14: %{orgname}-no_pear_install.patch -Patch17: %{orgname}-readline.patch Patch18: %{orgname}-nohttpd.patch Patch21: %{orgname}-dba-link.patch Patch22: %{orgname}-both-apxs.patch @@ -199,7 +197,6 @@ Patch43: %{orgname}-silent-session-cleanup.patch Patch44: %{orgname}-include_path.patch Patch50: extension-shared-optional-dep.patch Patch53: fix-test-run.patch -Patch55: bug-52078-fileinode.patch Patch59: %{orgname}-systzdata.patch Patch60: %{orgname}-oracle-instantclient.patch Patch66: php-db.patch @@ -219,10 +216,6 @@ BuildRequires: cyrus-sasl-devel >= 2 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_ffi:BuildRequires: libffi-devel} -%{?with_sodium:BuildRequires: libsodium-devel >= 1.0.8} %if %{with pdo_dblib} BuildRequires: freetds-devel >= 0.82 %endif @@ -232,13 +225,17 @@ BuildRequires: gd-devel >= 2.1 %endif BuildRequires: gdbm-devel BuildRequires: gmp-devel >= 4.2 +%{?with_kerberos5:BuildRequires: heimdal-devel} %{?with_imap:BuildRequires: imap-devel >= 1:2007e-2} %{?with_gcov:BuildRequires: lcov} %{?with_fpm:BuildRequires: libapparmor-devel} +%{?with_argon2:BuildRequires: libargon2-devel >= 20161029} +%{?with_ffi:BuildRequires: libffi-devel} %{?with_intl:BuildRequires: libicu-devel >= 50.1} BuildRequires: libjpeg-devel BuildRequires: libltdl-devel >= 1.4 BuildRequires: libpng-devel >= 1.0.8 +%{?with_sodium:BuildRequires: libsodium-devel >= 1.0.8} %{?with_intl:BuildRequires: libstdc++-devel} BuildRequires: libtool >= 2:2.4.6 %{?with_webp:BuildRequires: libwebp-devel} @@ -273,7 +270,6 @@ BuildRequires: tar >= 1:1.22 %{?with_tidy:BuildRequires: tidy-devel} BuildRequires: tokyocabinet-devel %{?with_odbc:BuildRequires: unixODBC-devel} -%{?with_xmlrpc:BuildRequires: xmlrpc-epi-devel >= 0.54.1} BuildRequires: xz BuildRequires: zlib-devel >= 1.2.0.4 %if %{with apache2} @@ -288,9 +284,9 @@ 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 20190902 +%define php_api_version 20200930 %define zend_module_api %{php_api_version} -%define zend_extension_api 3%{zend_module_api} +%define zend_extension_api 4%{zend_module_api} %define php_pdo_api_version 20170320 # Extension versions @@ -302,7 +298,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define jsonver %{version} %define pharver %{version} %define sqlite3ver %{version} -%define zipver 1.15.5 +%define zipver 1.19.1 %define phpdbgver %{version} %define sodiumver %{version} @@ -833,7 +829,8 @@ support in image files. Moduł PHP dodający obsługę znaczników EXIF w plikach obrazków. %package ffi -Summary: %{modname} - Foreign Function Interface +Summary: Foreign Function Interface module for PHP +Summary(pl.UTF-8): Moduł Foreign Function Interface (interfejsu do obcych języków) dla PHP Group: Libraries URL: https://www.php.net/manual/en/book.ffi.php Requires: %{name}-common = %{epoch}:%{version}-%{release} @@ -843,6 +840,10 @@ Provides: php(ffi) = %{version} FFI is a multi-platform extension for PHP that allows you to bind to functions from arbitrary shared libraries and call them. +%description ffi -l pl.UTF-8 +FFI to wieloplatformowe rozszerzenie dla PHP pozwalające dowiązywać +funkcje z dowolnych bibliotek współdzielonych i wywoływać je. + %package fileinfo Summary: libmagic bindings Summary(pl.UTF-8): Wiązania do libmagic @@ -1595,6 +1596,7 @@ Moduł PHP dodający obsługę gniazdek. %package sodium Summary: Wrapper for the Sodium cryptographic library +Summary(pl.UTF-8): Interfejs do biblioteki kryptograficznej Sodium Group: Libraries URL: https://paragonie.com/book/pecl-libsodium Requires: %{name}-common = %{epoch}:%{version}-%{release} @@ -1603,6 +1605,9 @@ Provides: php(sodium) = %{sodiumver} %description sodium A simple, low-level PHP extension for libsodium. +%description sodium -l pl.UTF-8 +Proste, niskopoziomowe rozszerzenie PHP wykorzystując libsodium. + %package sqlite3 Summary: SQLite3 extension module for PHP Summary(pl.UTF-8): Moduł SQLite3 dla PHP @@ -1769,23 +1774,6 @@ Moduł PHP umożliwiający analizę plików XML w trybie Pull. Czytnik działa jako kursor przechodzący przez strumień dokumentu i zatrzymujący się na każdym węźle po drodze. -%package xmlrpc -Summary: xmlrpc extension module for PHP -Summary(pl.UTF-8): Moduł xmlrpc dla PHP -Group: Libraries -URL: http://php.net/manual/en/book.xmlrpc.php -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-xml = %{epoch}:%{version}-%{release} -Provides: php(xmlrpc) -Obsoletes: php-xmlrpc < 4:5.3.28-7 - -%description xmlrpc -This is a dynamic shared object (DSO) for PHP that will add XMLRPC -support. - -%description xmlrpc -l pl.UTF-8 -Moduł PHP dodający obsługę XMLRPC. - %package xmlwriter Summary: Fast, non-cached, forward-only means to write XML data Summary(pl.UTF-8): Szybka, nie cachowana metoda zapisu danych w formacie XML @@ -1862,46 +1850,45 @@ Moduł PHP umożliwiający używanie kompresji zlib. %prep %setup -q -n %{orgname}-%{version}%{?subver} + cp -p php.ini-production php.ini %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 -b .mail %patch3 -p1 %patch4 -p1 -%patch7 -p1 +%patch7 -p1 -b .sapi-ini-file %patch9 -p1 -%patch10 -p1 +%patch10 -p1 -b .ini %patch14 -p1 -%patch17 -p1 %patch18 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 -%patch24 -p1 +%patch24 -p1 -b .zlib-for-getimagesize %patch25 -p1 %patch27 -p1 %patch29 -p1 %patch31 -p1 -%patch39 -p1 +%patch39 -p1 -b .use-prog_sendmail %patch41 -p1 %patch43 -p1 %patch44 -p1 %patch50 -p1 - %patch53 -p1 -%undos ext/spl/tests/SplFileInfo_getInode_basic.phpt -%patch55 -p1 %patch59 -p1 -b .systzdata %if %{with instantclient} %patch60 -p1 -b .instantclient %endif %patch66 -p1 -%patch67 -p1 +%patch67 -p1 -b .mysql-lib-ver-mismatch #%patch68 -p1 DROP or update to 7.0 APIs -%patch71 -p1 +%patch71 -p1 -b .libdb-info -%{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 +sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \ + ext/ext_skel.php \ + run-tests.php # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -1920,7 +1907,6 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f #%{__rm} -r ext/mbstring/libmbfl #%{__rm} -r ext/pcre/pcre2lib #%{__rm} -r ext/soap/interop -%{__rm} -r ext/xmlrpc/libxmlrpc #%{__rm} -r ext/zip/lib %{__rm} ext/date/lib/timezonedb.h @@ -2113,8 +2099,7 @@ if [ ! -f _built-conf ]; then touch _built-conf fi export PROG_SENDMAIL="/usr/lib/sendmail" -export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags} \ - -I%{_includedir}/xmlrpc-epi" +export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags}" # This should be detected by configure and set there, # but looks like the build system is hosed on 7.3 @@ -2194,7 +2179,7 @@ for sapi in $sapis; do %{?with_argon2:--with-password-argon2} \ --%{!?with_debug:dis}%{?with_debug:en}able-debug \ %{?with_zts:--enable-maintainer-zts} \ - --enable-inline-optimization \ + --enable-option-checking=fatal \ %{__enable_disable bcmath bcmath shared} \ %{__enable_disable calendar calendar shared} \ %{__enable_disable ctype ctype shared} \ @@ -2210,7 +2195,6 @@ for sapi in $sapis; do --enable-mbregex \ %{__enable_disable pcntl pcntl shared} \ %{__enable_disable pdo pdo shared} \ - %{__enable_disable json json shared} \ --enable-xmlwriter=shared \ %if %{with fpm} --with-fpm-user=http \ @@ -2244,7 +2228,7 @@ for sapi in $sapis; do --enable-tokenizer=shared \ --enable-xml=shared \ --enable-xmlreader=shared \ - %{__with_without bz2 bz2 shared} \ + %{__with_without bzip2 bz2 shared} \ %{__with_without curl curl shared} \ --with-db4 \ %{__with_without iconv iconv shared} \ @@ -2279,7 +2263,6 @@ for sapi in $sapis; do %{__with_without sqlite3 sqlite3 shared} \ %{?with_tidy:--with-tidy=shared} \ %{?with_odbc:--with-unixODBC=shared} \ - %{__with_without xmlrpc xmlrpc shared,/usr} \ %{?with_xsl:--with-xsl=shared} \ --with-zlib=shared \ %{?with_zip:--with-zip=shared} \ @@ -2712,7 +2695,6 @@ fi \ %extension_scripts tokenizer %extension_scripts xml %extension_scripts xmlreader -%extension_scripts xmlrpc %extension_scripts xmlwriter %extension_scripts xsl %extension_scripts zip @@ -2835,7 +2817,7 @@ fi %attr(755,root,root) %{php_extensiondir}/bcmath.so %endif -%if %{with bz2} +%if %{with bzip2} %files bz2 %defattr(644,root,root,755) %doc ext/bz2/CREDITS @@ -2979,13 +2961,9 @@ fi %attr(755,root,root) %{php_extensiondir}/intl.so %endif -%if %{with json} %files json %defattr(644,root,root,755) %doc ext/json/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_json.ini -%attr(755,root,root) %{php_extensiondir}/json.so -%endif %if %{with ldap} %files ldap @@ -3287,14 +3265,6 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_xmlreader.ini %attr(755,root,root) %{php_extensiondir}/xmlreader.so -%if %{with xmlrpc} -%files xmlrpc -%defattr(644,root,root,755) -%doc ext/xmlrpc/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_xmlrpc.ini -%attr(755,root,root) %{php_extensiondir}/xmlrpc.so -%endif - %files xmlwriter %defattr(644,root,root,755) %doc ext/xmlwriter/CREDITS