-# 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:
-# - check php-sapi-ini-file.patch for safe mode removal
# - 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.
-# NOTE: mysqlnd does not support ssl or compression (see FAQ at http://dev.mysql.com/downloads/connector/php-mysqlnd/)
# UNPACKAGED EXTENSION NOTES:
# - com_dotnet is Win32-only
# TODO:
# - 13K fileinfo.so php-pecl-fileinfo-1.0.4-8.amd64
# - ttyname_r() misdetected http://bugs.php.net/bug.php?id=48820
# - wddx: restore session support (not compiled in due DL extension check)
-# - deal with modules removed from php and not moved to PECL, still not obsoleted anywhere
-# - removed from php 5.0 (currently in php4):
-# db [pecl-svn], hyperwave [pecl-svn], java [pecl-svn], mcal [pecl-svn], qtdom [pecl-svn]
-# - removed from php 5.1:
-# oracle [pecl-svn]
-# - removed from php 5.2:
-# filepro [pecl-svn], hwapi [pecl-svn]
-# - make additional headers and checking added by mail patch configurable
# - modularize standard (output from pure php -m)?
-# - lib64 patch obsolete by $PHP_LIBDIR ?
# - WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is
# built shared, also PHAR_HAVE_OPENSSL is false if openssl is built shared.
# make it runtime dep and add Suggests (or php warning messages)
# - some mods should be shared:
#$ php -m
# [PHP Modules]
-#+Core
+# Core
# date
-#+ereg
# libxml
+# phpdbg_webhelper
# Reflection
+# standard
#
# Conditional build:
-%bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs)
-%bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs)
+# - General options:
+%bcond_without embed # disable building Embedded API
+%bcond_with default_php # use this PHP as default PHP in distro
+%bcond_with gcov # Enable Code coverage reporting
%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_without kerberos5 # without Kerberos5 support
+%bcond_with mm # without mm support for session storage
+%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 system_gd # with system gd (imageantialias function is missing then)
%bcond_with system_libzip # with system libzip (reported broken currently)
-%bcond_with default_php # use this PHP as default PHP in distro
+%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_without webp # Without WebP support in GD extension (imagecreatefromwebp)
+%bcond_with zts # Zend Thread Safety
+# - SAPI
+%bcond_with apache1 # disable building Apache 1.3.x SAPI (sapi removed)
+%bcond_without apache2 # disable building Apache 2.x SAPI
+%bcond_without cgi # disable CGI/FCGI SAPI
+%bcond_without fpm # disable FPM SAPI
+%bcond_without litespeed # build litespeed SAPI
+%bcond_with milter # disable Milter SAPI
+%bcond_without phpdbg # disable phpdbg SAPI
+# - Extensions
%bcond_without curl # without CURL extension module
%bcond_without enchant # without Enchant extension module
+%bcond_without ereg # without ext/ereg support
%bcond_without filter # without filter extension module
%bcond_without imap # without IMAP extension module
%bcond_without interbase # without InterBase extension module
%bcond_without intl # without Intl extension module
-%bcond_without kerberos5 # without Kerberos5 support
-%bcond_without litespeed # build litespeed module
%bcond_without ldap # without LDAP extension module
%bcond_without mhash # without mhash extension (supported by hash extension)
-%bcond_without mm # without mm support for session storage
-%bcond_without mssql # without MS SQL extension module
-# don't turn it on by default; see TODO item for mysqlnd in this spec
-%bcond_with mysqlnd # with mysqlnd support in mysql related extensions
+%bcond_with mssql # without MS SQL extension module (ext removed)
+%bcond_with mysql # without ext/mysql support (ext removed)
%bcond_without mysqli # without mysqli support (Requires mysql > 4.1)
+%bcond_without mysqlnd # without mysqlnd support in mysql related extensions
+%bcond_with oci # with Oracle oci8 extension module (BR: proprietary libs)
%bcond_without odbc # without ODBC extension module
%bcond_without opcache # without Enable Zend OPcache extension support
%bcond_without openssl # without OpenSSL support and OpenSSL extension (module)
%bcond_without pcre # without PCRE extension module
+%bcond_without pdo_dblib # without PDO dblib extension module
%bcond_without pdo_sqlite # without PDO SQLite extension module
%bcond_without pgsql # without PostgreSQL extension module
%bcond_without phar # without phar extension module
%bcond_without snmp # without SNMP extension module
%bcond_without sqlite2 # without SQLite extension module
%bcond_without sqlite3 # without SQLite3 extension module
-%bcond_without sybase_ct # without Sybase-CT extension module
+%bcond_with sybase_ct # without Sybase-CT extension module (ext removed in 7.0.0)
%bcond_without tidy # without Tidy extension module
-%bcond_without webp # Without WebP support in GD extension (imagecreatefromwebp)
%bcond_without wddx # without WDDX extension module
%bcond_without xmlrpc # without XML-RPC extension module
-%bcond_without apache1 # disable building Apache 1.3.x SAPI
-%bcond_without apache2 # disable building Apache 2.x SAPI
-%bcond_with zts # Zend Thread Safety
-%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_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
%define apxs1 /usr/sbin/apxs1
%define apxs2 /usr/sbin/apxs
%undefine with_mm
%endif
-%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha
+# milter requires ZTS
+%if %{with milter} && %{without zts}
+%undefine with_milter
+%endif
+
+%ifnarch %{ix86} %{x8664} x32 sparc sparcv9 alpha
# ppc disabled (broken on th-ppc)
%undefine with_interbase
%endif
-%ifnarch %{ix86} %{x8664}
+%ifnarch %{ix86} %{x8664} x32
# unsupported, see sapi/cgi/fpm/fpm_atomic.h
%undefine with_fpm
%endif
%undefine with_filter
%endif
-%define rel 2
+%define rel 0.3
+%define subver RC3
%define orgname php
-%define ver_suffix 55
+%define ver_suffix 70
%define php_suffix %{!?with_default_php:%{ver_suffix}}
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 Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
-Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
+Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
+Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 5.5.12
-Release: %{rel}%{?with_type_hints:.th}
+Version: 7.0.0
+Release: %{rel}.%{subver}
Epoch: 4
-License: PHP
-Group: Libraries
-Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 3fb091987063135fd86b3b5ba5010479
+# 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: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
+Source0: https://downloads.php.net/~ab/php-%{version}%{subver}.tar.xz
+# Source0-md5: 8ee634c37dabd88562e2d3ff978cfbe1
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
Source5: %{orgname}-cli.ini
-# Taken from: http://browsers.garykeith.com/downloads.asp
-Source9: %{orgname}_browscap.ini
Source10: %{orgname}-fpm.init
Source11: %{orgname}-fpm.logrotate
Source12: %{orgname}-branch.sh
Patch1: %{orgname}-pldlogo.patch
Patch2: %{orgname}-mail.patch
Patch3: %{orgname}-link-libs.patch
-Patch4: %{orgname}-libpq_fs_h_path.patch
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}
-Patch12: http://ilia.ws/patch/type_hint_53_v2.txt
-%endif
Patch14: %{orgname}-no_pear_install.patch
Patch17: %{orgname}-readline.patch
Patch18: %{orgname}-nohttpd.patch
-Patch20: %{orgname}-uint32_t.patch
Patch21: %{orgname}-dba-link.patch
Patch22: %{orgname}-both-apxs.patch
Patch23: %{orgname}-builddir.patch
Patch31: %{orgname}-fcgi-error_log-no-newlines.patch
Patch34: %{orgname}-libtool.patch
Patch35: %{orgname}-tds.patch
-Patch36: %{orgname}-mysql-charsetphpini.patch
-Patch37: %{orgname}-mysqli-charsetphpini.patch
-Patch38: %{orgname}-pdo_mysql-charsetphpini.patch
+#Patch36: %{orgname}-mysql-charsetphpini.patch
+#Patch37: %{orgname}-mysqli-charsetphpini.patch
+#Patch38: %{orgname}-pdo_mysql-charsetphpini.patch
Patch39: %{orgname}-use-prog_sendmail.patch
Patch41: %{orgname}-fpm-config.patch
Patch42: %{orgname}-fpm-shared.patch
Patch59: %{orgname}-systzdata.patch
Patch60: %{orgname}-oracle-instantclient.patch
Patch62: mcrypt-libs.patch
-Patch63: %{orgname}-mysql-nowarning.patch
Patch65: system-libzip.patch
Patch66: php-db.patch
Patch67: mysql-lib-ver-mismatch.patch
-
Patch69: fpm-conf-split.patch
+Patch70: mysqlnd-ssl.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
%{!?with_mysqlnd:BuildRequires: mysql-devel}
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
-%if %{with mssql} || %{with sybase_ct}
+%if %{with mssql} || %{with sybase_ct} || %{with pdo_dblib}
BuildRequires: freetds-devel >= 0.82
%endif
-BuildRequires: freetype-devel >= 2.5.1
+BuildRequires: freetype-devel >= 1:2.5.1
%if %{with system_gd}
BuildRequires: gd-devel >= 2.1
%endif
%{?with_gcov:BuildRequires: lcov}
%{?with_snmp:%{?with_tests:BuildRequires: mibs-net-snmp}}
%{?with_snmp:BuildRequires: net-snmp-devel >= 5.0.7}
-%{?with_oci8:%{?with_instantclient:BuildRequires: oracle-instantclient-devel}}
+%{?with_oci:%{?with_instantclient:BuildRequires: oracle-instantclient-devel}}
BuildRequires: pam-devel
%{?with_pcre:BuildRequires: pcre-devel >= 8.10}
BuildRequires: pkgconfig
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-build >= 4.4.0
BuildRequires: rpmbuild(macros) >= 1.566
+%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
BuildRequires: tar >= 1:1.22
BuildRequires: xz
%if %{with sqlite3} || %{with pdo_sqlite}
%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 20131218
+%define zend_module_api 20141001
+%define zend_extension_api 320140815
+%define php_pdo_api_version 20150127
# Extension versions
%define bz2ver 1.0
%define fileinfover 1.0.5
%define hashver 1.0
%define intlver 1.1.0
-%define jsonver 1.2.1
-%define opcachever 7.0.4-dev
+%define jsonver 1.4.0
+%define opcachever 7.0.6-dev
%define pharver 2.0.2
%define sqlite3ver 0.7-dev
-%define zipver 1.11.0
+%define zipver 1.13.0dev
+%define phpdbgver 0.5.0
-%define zend_zts %{!?with_zts:0}%{?with_zts:1}
+%define _zend_zts %{!?with_zts:0}%{?with_zts:1}
%define php_debug %{!?debug:0}%{?debug:1}
%if %{with gcov}
%undefine with_ccache
%endif
-%if %{with oci8}
+%if %{with oci}
# ORACLE_HOME is required for oci8 ext to build
%define _preserve_env %_preserve_env_base ORACLE_HOME
%endif
%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
Requires: tzdata
Provides: %{name}(debug) = %{php_debug}
Provides: %{name}(modules_api) = %{php_api_version}
-Provides: %{name}(thread-safety) = %{zend_zts}
+Provides: %{name}(thread-safety) = %{_zend_zts}
Provides: %{name}(zend_extension_api) = %{zend_extension_api}
Provides: %{name}(zend_module_api) = %{zend_module_api}
Provides: %{name}-core
Provides: %{name}-date
-Provides: %{name}-ereg
+%{?with_ereg:Provides: %{name}-ereg}
Provides: %{name}-reflection
Provides: %{name}-standard
Provides: php(core) = %{version}
Provides: php(date)
-Provides: php(ereg)
+%{?with_ereg:Provides: php(ereg)}
Provides: php(libxml)
Provides: php(reflection)
Provides: php(standard)
-%{!?with_mysqlnd:Obsoletes: php-mysqlnd}
+%{!?with_mysqlnd:Obsoletes: %{name}-mysqlnd}
%{?with_pcre:%requires_ge_to pcre pcre-devel}
+Suggests: browscap
Obsoletes: php-common < 4:5.3.28-7
Obsoletes: php-pecl-domxml
Conflicts: php4-common < 3:4.4.4-8
%endif
%{?with_pcre:Requires: pcre-devel >= 8.10}
Requires: shtool
+Provides: php-devel = %{epoch}:%{version}-%{release}
Obsoletes: php-devel
Obsoletes: php-pear-devel
Obsoletes: php4-devel
Obsoletes: php52-devel
Obsoletes: php53-devel
Obsoletes: php54-devel
+Obsoletes: php55-devel
+Obsoletes: php56-devel
%description devel
The php-devel package lets you compile dynamic extensions to PHP.
Group: Libraries
URL: https://wiki.php.net/rfc/optimizerplus
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-pcre = %{epoch}:%{version}-%{release}
Provides: php(opcache) = %{opcachever}
%description opcache
URL: http://www.php.net/manual/en/book.pdo.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-spl = %{epoch}:%{version}-%{release}
+Provides: %{name}(PDO_API) = %{php_pdo_api_version}
Provides: php(pdo)
Obsoletes: php-pdo < 4:5.3.28-7
Obsoletes: php-pecl-PDO
Group: Libraries
URL: http://www.php.net/manual/en/book.xmlreader.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Suggests: %{name}-dom = %{epoch}:%{version}-%{release}
+Requires: %{name}-dom = %{epoch}:%{version}-%{release}
Provides: php(xmlreader)
Obsoletes: php-xmlreader < 4:5.3.28-7
Moduł PHP umożliwiający używanie kompresji zlib.
%prep
-%setup -q -n %{orgname}-%{version}
+%if 1
+%setup -q -n %{orgname}-%{version}%{?subver}
+%else
+%setup -qc -n %{orgname}-%{version}
+mv php-src-*/* .
+%endif
+cp -p php.ini-production php.ini
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1 NEEDS PORTING
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
-
-cp -p php.ini-production php.ini
+%{?with_milter:%patch8 -p1}
+%patch9 -p1
%patch10 -p1
-%if %{with type_hints}
-%patch12 -p0
-%endif
%patch14 -p1
%patch17 -p1
%patch18 -p1
-%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%if "%{pld_release}" != "ac"
%patch34 -p1
%endif
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
+%{?with_sybase_ct:%patch35 -p1}
+#%patch36 -p1
+#%patch37 -p1
+#%patch38 -p1
%patch39 -p1
%if %{with fpm}
+%if 0
+# create split php-fpm.conf patch. review (restore other diffs) and commit
+cp sapi/fpm/php-fpm.conf.in{,.orig}
+%{__sed} -n -e '/; Start a new pool named/,$p' sapi/fpm/php-fpm.conf.in > sapi/fpm/php-fpm.conf-d.in
+%{__sed} -i -e '/; Include one or more files/,/include=etc\/fpm\.d/d' sapi/fpm/php-fpm.conf.in
+%{__sed} -i -e '/; Start a new pool named/,$d' sapi/fpm/php-fpm.conf.in
+set +e
+cd ..
+diff -u %{orgname}-%{version}/sapi/fpm/php-fpm.conf.in{.orig,} > %{PATCH69}
+diff -u /dev/null %{orgname}-%{version}/sapi/fpm/php-fpm.conf-d.in >> %{PATCH69}
+exit 1
+%else
+#%patch69 -p1
+%endif
%patch41 -p1
%patch42 -p1
%endif
%patch59 -p1
%patch60 -p1
%patch62 -p1
-%patch63 -p1
%{?with_system_libzip:%patch65 -p1}
%patch66 -p1
%patch67 -p1
-
-%patch69 -p1
+%patch70 -p1
sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
%endif
%ifarch %{x8664}
ix86=: x8664= \
+%endif
+%ifarch x32
+ix86=: x8664=: \
%endif
sh -xe %{_sourcedir}/skip-tests.sh
exit 1
fi
+API=$(awk '/#define PDO_DRIVER_API/{print $3}' ext/pdo/php_pdo_driver.h)
+if [ $API != %{php_pdo_api_version} ]; then
+ echo "Set %%define php_pdo_api_version to $API and re-run."
+ exit 1
+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
: 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 jsonver macro and rebuild.
exit 1
fi
-ver=$(sed -n '/#define PHP_ZENDOPCACHE_VERSION /{s/.* "//;s/".*$//;p}' ext/opcache/ZendAccelerator.h)
+ver=$(awk '/#define PHP_ZENDOPCACHE_VERSION/ {print $3}' ext/opcache/ZendAccelerator.h | xargs)
if test "$ver" != "%{opcachever}"; then
: Error: Upstream Zend Opcache version is now ${ver}, expecting %{opcachever}.
: 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}.
: Update the enchantver macro and rebuild.
exit 1
fi
-ver=$(awk '/#define PHP_HASH_EXTVER/ {print $3}' ext/hash/php_hash.h | xargs)
+ver=$(awk '/#define PHP_HASH_VERSION/ {print $3}' ext/hash/php_hash.h | xargs)
if test "$ver" != "%{hashver}"; then
: Error: Upstream HASH version is now ${ver}, expecting %{hashver}.
: Update the hashver macro and rebuild.
# 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
--enable-ctype=shared \
--enable-dba=shared \
--enable-dom=shared \
+ %{?with_systemtap:--enable-dtrace} \
--enable-exif=shared \
--enable-fileinfo=shared \
--enable-ftp=shared \
--with-fpm-user=http \
--with-fpm-group=http \
%endif
-%if %{with mssql} || %{with sybase_ct}
+%if %{with pdo_dblib}
--with-pdo-dblib=shared \
%endif
%if %{with interbase} && %{without interbase_inst}
%{?with_mhash:--with-mhash=yes} \
--with-mysql-sock=/var/lib/mysql/mysql.sock \
--with-pdo-mysql=shared,%{!?with_mysqlnd:/usr}%{?with_mysqlnd:mysqlnd} \
- %{?with_oci8:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
+ %{?with_oci:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
%{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
%{?with_pgsql:--with-pdo-pgsql=shared} \
%{?with_pdo_sqlite:--with-pdo-sqlite=shared,/usr} \
%{?with_mm:--with-mm} \
%{?with_mssql:--with-mssql=shared} \
%{?with_mysqlnd:--enable-mysqlnd=shared} \
- --with-mysql=shared,%{!?with_mysqlnd:/usr}%{?with_mysqlnd:mysqlnd} \
+ %{__with_without mysql mysql shared,%{!?with_mysqlnd:/usr}%{?with_mysqlnd:mysqlnd}} \
%{?with_mysqli:--with-mysqli=shared,%{!?with_mysqlnd:/usr/bin/mysql_config}%{?with_mysqlnd:mysqlnd}} \
- %{?with_oci8:--with-oci8=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
- %{?with_opcache:--enable-opcache=shared} \
+ %{?with_oci:--with-oci8=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
+ %{__enable_disable opcache opcache shared} \
%{?with_openssl:--with-openssl=shared} \
%{?with_kerberos5:--with-kerberos} \
--with-tcadb=/usr \
%{?with_pspell:--with-pspell=shared} \
--with-readline=shared \
%{?with_recode:--with-recode=shared} \
- --with-regex=system \
+ %{__with_without ereg regex system} \
%{?with_snmp:--with-snmp=shared} \
%{?with_sybase_ct:--with-sybase-ct=shared,/usr} \
%{!?with_pdo_sqlite:--without-pdo-sqlite} \
cp -af php_config.h.cli main/php_config.h
cp -af Makefile.cli Makefile
%{__make} libphp_common.la
-%{__make} build-modules
+# hack: MYSQLND_SHARED_LIBADD not initialized
+%{__make} build-modules \
+ MYSQLND_SHARED_LIBADD="-lssl -lcrypto"
%if %{with apache1}
-%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp5.la -f Makefile.apxs1
+%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp7.la -f Makefile.apxs1
%endif
%if %{with apache2}
-%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp5.la -f Makefile.apxs2
+%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp7.la -f Makefile.apxs2
%endif
%if %{with litespeed}
%endif
%if %{with embed}
-%{__make} -f Makefile.embed libphp5.la
+%{__make} -f Makefile.embed libphp7.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
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
# install Apache1 DSO module
%if %{with apache1}
-libtool --mode=install install -p sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1
-mv $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5{,-$v}.so
-ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.so
+libtool --mode=install install -p sapi/apache/libphp7.la $RPM_BUILD_ROOT%{_libdir}/apache1
+mv $RPM_BUILD_ROOT%{_libdir}/apache1/libphp7{,-$v}.so
+ln -s libphp7-$v.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp7.so
%endif
# install Apache2 DSO module
%if %{with apache2}
-libtool --mode=install install -p sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache
-mv $RPM_BUILD_ROOT%{_libdir}/apache/libphp5{,-$v}.so
-ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.so
+libtool --mode=install install -p sapi/apache2handler/libphp7.la $RPM_BUILD_ROOT%{_libdir}/apache
+mv $RPM_BUILD_ROOT%{_libdir}/apache/libphp7{,-$v}.so
+ln -s libphp7-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp7.so
%endif
# install litespeed sapi
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
libtool --mode=install install -p sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir}/%{name}-fpm
cp -p sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}-fpm.8
cp -p sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}
-cp -p sapi/fpm/php-fpm.conf-d $RPM_BUILD_ROOT%{_sysconfdir}/fpm.d/www.conf
+cp -p sapi/fpm/www.conf $RPM_BUILD_ROOT%{_sysconfdir}/fpm.d
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm
install -d $RPM_BUILD_ROOT/etc/logrotate.d
# we could use install-headers from Makefile.embed, but that would reinstall all headers
# install-sapi installs to wrong dir, so just do it all manually
install -d $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed
-install -p libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}
+install -p libs/libphp7.so $RPM_BUILD_ROOT%{_libdir}
cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed
%endif
ln -sf php%{ver_suffix} $RPM_BUILD_ROOT%{_bindir}/php
cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-
cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini
%if %{with apache1}
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.la
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache1/libphp7.la
%endif
%if %{with apache2}
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/httpd/conf.d/70_mod_php.conf
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp7.la
%endif
# ensure that paths are correct for current php version and arch
mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d}
# use system automake and {lib,sh}tool
-%if "%{pld_release}" != "ac"
- ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/%{name}/build
- for i in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
- ln -snf %{_aclocaldir}/${i} $RPM_BUILD_ROOT%{_libdir}/%{name}/build
- done
- ln -snf %{_datadir}/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/%{name}/build
-%else
- ln -snf %{_aclocaldir}/libtool.m4 $RPM_BUILD_ROOT%{_libdir}/%{name}/build
- ln -snf %{_datadir}/libtool/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/%{name}/build
-%endif
+ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/%{name}/build
ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+for fn in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
+ f=%{_aclocaldir}/$fn
+ test -f $f || continue
+ ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+done
+for fn in ltmain.sh config/ltmain.sh build-aux/ltmain.sh; do
+ f=/usr/share/libtool/$fn
+ test -f $f || continue
+ ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+ break
+done
sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize
# for php-pecl-mailparse
' $nf
done
+%triggerpostun common -- %{name}-common < 4:5.6.4-2, php-common < 4:5.6.4-2
+# switch to browscap package if the ini file has original value
+%{__sed} -i -e 's#%{_sysconfdir}/browscap.ini#/usr/share/browscap/php_browscap.ini#' %{_sysconfdir}/php.ini
+# disable browscap, if optional package not present
+if [ ! -e /usr/share/browscap/php_browscap.ini ]; then
+ %{__sed} -i -e 's#^browscap = /usr/share/browscap/php_browscap.ini#;&#' %{_sysconfdir}/php.ini
+fi
+
# common macros called at extension post/postun scriptlet
%define extension_scripts() \
%post %1 \
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini
-%attr(755,root,root) %{_libdir}/apache1/libphp5.so
-%attr(755,root,root) %{_libdir}/apache1/libphp5-*.*.so
+%attr(755,root,root) %{_libdir}/apache1/libphp7.so
+%attr(755,root,root) %{_libdir}/apache1/libphp7-*.*.so
%endif
%if %{with apache2}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache2handler.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
-%attr(755,root,root) %{_libdir}/apache/libphp5.so
-%attr(755,root,root) %{_libdir}/apache/libphp5-*.*.so
+%attr(755,root,root) %{_libdir}/apache/libphp7.so
+%attr(755,root,root) %{_libdir}/apache/libphp7-*.*.so
%endif
%if %{with litespeed}
%if %{with embed}
%files embedded
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libphp5.so
+%attr(755,root,root) %{_libdir}/libphp7.so
%endif
%files cli
%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
+%{_mandir}/man1/phpdbg.1*
+%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
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/browscap.ini
-%attr(755,root,root) %{_libdir}/libphp_common-*.so
+#%attr(755,root,root) %{_libdir}/libphp_common-*.so
%dir %{php_extensiondir}
%doc ext/session/mod_files.sh
%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
+#%attr(755,root,root) %{_libdir}/libphp_common.so
%{_libdir}/libphp_common.la
%{_includedir}/php
%{_libdir}/%{name}/build
%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
%attr(755,root,root) %{php_extensiondir}/mssql.so
%endif
+%if %{with mysql}
%files mysql
%defattr(644,root,root,755)
%doc ext/mysql/CREDITS
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysql.ini
%attr(755,root,root) %{php_extensiondir}/mysql.so
+%endif
%if %{with mysqli}
%files mysqli
%attr(755,root,root) %{php_extensiondir}/mysqlnd.so
%endif
-%if %{with oci8}
+%if %{with oci}
%files oci8
%defattr(644,root,root,755)
%doc ext/oci8/{CREDITS,README}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo.ini
%attr(755,root,root) %{php_extensiondir}/pdo.so
-%if %{with mssql} || %{with sybase_ct}
+%if %{with pdo_dblib}
%files pdo-dblib
%defattr(644,root,root,755)
%doc ext/pdo_dblib/{CREDITS,README}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_mysql.ini
%attr(755,root,root) %{php_extensiondir}/pdo_mysql.so
-%if %{with oci8}
+%if %{with oci}
%files pdo-oci
%defattr(644,root,root,755)
%doc ext/pdo_oci/CREDITS
%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 / blobdiff