X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php.spec;h=477c246df713b2a162c7ddca5840f0cc281a44b2;hp=9f607dea3127b0269eedd3344c36e988fc6f774f;hb=093ede6427785b4b62484a59b84c4b9d4579e897;hpb=5260c34043b795e1c88f09464d84c1ca1eabf47e diff --git a/php.spec b/php.spec index 9f607de..477c246 100644 --- a/php.spec +++ b/php.spec @@ -1,4 +1,4 @@ -# NOTES +# 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.0/UPGRADING @@ -138,7 +138,7 @@ %endif %define orgname php -%define php_suffix 72 +%define php_suffix 73 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -146,7 +146,7 @@ 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.3 +Version: 7.3.10 Release: 2 Epoch: 4 # All files licensed under PHP version 3.01, except @@ -155,7 +155,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: http://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: 9e462dd313e0fb79405cd4a56974565e +# Source0-md5: cce77c52ba74507807cf9d66be9ee7cd Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini @@ -171,7 +171,6 @@ Patch1: %{orgname}-tld.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 @@ -292,21 +291,21 @@ 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 bz2ver %{version} %define enchantver %{version} -%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 fileinfover %{version} +%define hashver %{version} +%define intlver %{version} +%define jsonver 1.7.0 +%define pharver %{version} %define sqlite3ver %{version} -%define zipver 1.15.2 +%define zipver 1.15.4 %define phpdbgver 0.5.0 %define sodiumver %{version} @@ -1926,7 +1925,6 @@ cp -p php.ini-production php.ini %patch1 -p1 %patch3 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %{?with_milter:%patch8 -p1} %patch9 -p1 @@ -1991,7 +1989,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f #%{__rm} -r ext/gd/libgd #%{__rm} -r ext/mbstring/libmbfl %{__rm} -r ext/mbstring/oniguruma -%{__rm} -r ext/pcre/pcrelib +%{__rm} -r ext/pcre/pcre2lib #%{__rm} -r ext/soap/interop %{__rm} -r ext/xmlrpc/libxmlrpc #%{__rm} -r ext/zip/lib @@ -2096,20 +2094,22 @@ 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=$(awk '/#define PHP_PHAR_VERSION/ {print $3}' ext/phar/php_phar.h | xargs) +if test "$ver" != "PHP_VERSION"; then : Error: Upstream PHAR version is now ${ver}, expecting %{pharver}. : Update the pharver macro and rebuild. exit 1 fi ver=$(awk '/#define PHP_SQLITE3_VERSION/ {print $3}' ext/sqlite3/php_sqlite3.h | xargs) if test "$ver" != "PHP_VERSION"; then + : Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}. + : Update the sqlite3ver macro and rebuild. exit 1 fi ver=$(awk '/#define PHP_SODIUM_VERSION/ {print $3}' ext/sodium/php_libsodium.h | xargs) @@ -2134,8 +2134,8 @@ 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=$(awk '/#define PHP_BZ2_VERSION/ {print $3}' ext/bz2/php_bz2.h | xargs) +if test "$ver" != "PHP_VERSION"; then : Error: Upstream BZIP2 version is now ${ver}, expecting %{bz2ver}. : Update the bz2ver macro and rebuild. exit 1 @@ -2145,13 +2145,13 @@ 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 +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=$(awk '/#define PHP_INTL_VERSION/ {print $3}' ext/intl/php_intl.h | xargs) +if test "$ver" != "PHP_VERSION"; then : Error: Upstream Intl version is now ${ver}, expecting %{intlver}. : Update the intlver macro and rebuild. exit 1 @@ -2172,6 +2172,11 @@ export PROG_SENDMAIL="/usr/lib/sendmail" export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags} \ -I%{_includedir}/xmlrpc-epi" +# This should be detected by configure and set there, +# but looks like the build system is hosed on 7.3 +export CXXFLAGS="%{rpmcxxflags} -fPIC -DPIC" +export CFLAGS="%{rpmcflags} -fPIC -DPIC" + sapis=" cli %if %{with cgi} @@ -2667,9 +2672,12 @@ update-alternatives \ %postun cli if [ $1 -eq 0 ]; then - update-alternatives --remove php %{_bindir}/php || : + update-alternatives --remove php %{_bindir}/php%{php_suffix} || : fi +%post common -p /sbin/ldconfig +%postun common -p /sbin/ldconfig + %post devel update-alternatives \ --install %{_bindir}/phpize phpize %{_bindir}/phpize%{php_suffix} %{php_suffix} \ @@ -2680,8 +2688,8 @@ update-alternatives \ %postun devel if [ $1 -eq 0 ]; then - update-alternatives --remove phpize %{_bindir}/phpize || : - update-alternatives --remove php-config %{_bindir}/php-config || : + update-alternatives --remove phpize %{_bindir}/phpize%{php_suffix} || : + update-alternatives --remove php-config %{_bindir}/php-config%{php_suffix} || : fi %pre fpm @@ -2696,7 +2704,7 @@ update-alternatives --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{php_s if [ "$1" = "0" ]; then %service %{name}-fpm stop /sbin/chkconfig --del %{name}-fpm - update-alternatives --remove php-fpm %{_sbindir}/php-fpm || : + update-alternatives --remove php-fpm %{_sbindir}/php%{php_suffix}-fpm || : fi %postun fpm @@ -2859,7 +2867,7 @@ update-alternatives \ %postun phar %ext_postun if [ $1 -eq 0 ]; then - update-alternatives --remove phar %{_bindir}/phar || : + update-alternatives --remove phar %{_bindir}/phar%{php_suffix}.phar || : fi %if %{with apache2} @@ -2943,7 +2951,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%{php_suffix} %attr(755,root,root) %{_bindir}/php-config%{php_suffix} %ghost %{_bindir}/phpize @@ -3007,8 +3015,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 @@ -3016,7 +3023,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 @@ -3040,7 +3047,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 @@ -3072,7 +3079,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 @@ -3112,7 +3119,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 @@ -3136,7 +3143,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 @@ -3144,7 +3151,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 @@ -3208,7 +3215,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 @@ -3280,7 +3287,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 @@ -3340,7 +3347,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 @@ -3354,7 +3360,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 @@ -3374,8 +3380,7 @@ fi %files spl %defattr(644,root,root,755) -%doc ext/spl/{CREDITS,README,TODO} -%doc ext/spl/examples +%doc ext/spl/{CREDITS,README,examples} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/SPL.ini %attr(755,root,root) %{php_extensiondir}/spl.so @@ -3423,8 +3428,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 @@ -3451,8 +3455,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 @@ -3466,8 +3469,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 @@ -3481,8 +3483,7 @@ fi %files zip %defattr(644,root,root,755) -%doc ext/zip/{CREDITS,TODO} -%doc ext/zip/examples +%doc ext/zip/{CREDITS,examples} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/zip.ini %attr(755,root,root) %{php_extensiondir}/zip.so