X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=f7f8bcbcda5d9810587107ff4dd35d8448886c9f;hb=b12c324fc065c0605c66b27bb039bf2f729a21a9;hp=7929418eecf9e94b595c5b8a2eeb0b5799094999;hpb=b7b0e363252dcb1fc2b8fcfc7436459c28009259;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 7929418..f7f8bcb 100644
--- a/php.spec
+++ b/php.spec
@@ -77,7 +77,7 @@
 %undefine	with_mm
 %endif
 
-%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
+%ifnarch %{ix86} %{x8664} x32 sparc sparcv9 alpha ppc
 %undefine	with_interbase
 %endif
 %if "%{pld_release}" == "th"
@@ -87,7 +87,7 @@
 %endif
 %endif
 
-%ifnarch %{ix86} %{x8664}
+%ifnarch %{ix86} %{x8664} x32
 # unsupported, see sapi/cgi/fpm/fpm_atomic.h
 %undefine	with_fpm
 %endif
@@ -104,15 +104,15 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %if "%{pld_release}" == "ac"
 %define		magic_mime	/usr/share/file/magic.mime
 %define		_noautoreqdep libphp_common.*
-# if commandline --without was given. respect that
-%if 0%{!?_without_default_php:1}
-%define		with_default_php	1
+# if commandline --with was given. respect that
+%if 0%{!?_with_default_php:1}
+%undefine	with_default_php
 %endif
 %else
 %define		magic_mime	/usr/share/misc/magic.mime
 %endif
 
-%define		rel		10
+%define		rel	40
 %define		orgname	php
 %define		ver_suffix 52
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -127,7 +127,10 @@ Name:		%{orgname}%{php_suffix}
 Version:	5.2.17
 Release:	%{backport_date}.%{rel}
 Epoch:		4
-License:	PHP
+# 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.bz2
 # Source0-md5:	b27947f3045220faf16e4d9158cbfe13
@@ -194,6 +197,7 @@ Patch44:	%{orgname}-include_path.patch
 Patch45:	%{orgname}-imap-annotations.patch
 Patch46:	%{orgname}-imap-myrights.patch
 Patch47:	suhosin.patch
+Patch48:	no-sslv2.patch
 Patch49:	%{orgname}-m4-divert.patch
 Patch50:	extension-shared-optional-dep.patch
 Patch51:	spl-shared.patch
@@ -206,6 +210,7 @@ Patch57:	php-php_dl.patch
 Patch58:	php-svn-281516.patch
 Patch59:	%{orgname}-systzdata.patch
 Patch60:	bug-60986.patch
+Patch61:	php-bug-71475.patch
 # http://spot.fedorapeople.org/php-5.3.6-libzip.patch
 Patch65:	system-libzip.patch
 Patch66:	bug-47930.patch
@@ -218,6 +223,11 @@ Patch73:	CVE-2013-6420.patch
 Patch74:	CVE-2013-4073.patch
 Patch75:	php-secbug-67498.patch
 Patch76:	CVE-2015-0232.patch
+Patch77:	x32.patch
+Patch78:	php-bug-68486.patch
+Patch79:	libevent-2.1.patch
+Patch80:	mysqli-err.patch
+Patch81:	openssl.patch
 # CENTALT patches
 # Backport from 5.3.6
 Patch311:	php-5.3.6-bug-47435.patch
@@ -227,7 +237,7 @@ Patch314:	php-5.3.6-39199.patch
 Patch355:	php-5.3.7-bug-55323.patch
 # Bug-323016 CVE-2012-0831
 Patch402:	php-5.2.17-bug-323016.patch
-URL:		https://code.google.com/p/php52-backports/
+URL:		https://code.google.com/archive/p/php52-backports/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
 BuildRequires:	autoconf >= 2.53
@@ -385,7 +395,6 @@ PHP - це мова написання скриптів, що вбудовуют
 Summary:	PHP DSO module for Apache 1.3.x
 Summary(pl.UTF-8):	Moduł DSO (Dynamic Shared Object) PHP dla Apache 1.3.x
 Group:		Development/Languages/PHP
-Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	apache1(EAPI) >= 1.3.33-2
 Requires:	apache1-mod_mime
@@ -400,19 +409,32 @@ PHP as DSO module for Apache 1.3.x.
 PHP jako moduł DSO (Dynamic Shared Object) dla Apache 1.3.x.
 
 %package -n apache-mod_%{name}
+Summary:	PHP support for Apache 2.x
+Summary(pl.UTF-8):	Wsparcie PHP dla Apache 2.x
+Group:		Development/Languages/PHP
+Requires:	apache-mod_%{name}-core = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Provides:	webserver(php) = %{version}
+Obsoletes:	phpfi
+
+%description -n apache-mod_%{name}
+PHP support for Apache 2.x.
+
+%description -n apache-mod_%{name} -l pl.UTF-8
+Wsparcie PHP dla Apache 2.x.
+
+%package -n apache-mod_%{name}-core
 Summary:	PHP DSO module for Apache 2.x
 Summary(pl.UTF-8):	Moduł DSO (Dynamic Shared Object) PHP dla Apache 2.x
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	apache(modules-api) = %{apache_modules_api}
 Requires:	apache-mod_mime
-Provides:	webserver(php) = %{version}
-Obsoletes:	phpfi
 
-%description -n apache-mod_%{name}
+%description -n apache-mod_%{name}-core
 PHP as DSO module for Apache 2.x.
 
-%description -n apache-mod_%{name} -l pl.UTF-8
+%description -n apache-mod_%{name}-core -l pl.UTF-8
 PHP jako moduł DSO (Dynamic Shared Object) dla Apache 2.x.
 
 %package fcgi
@@ -463,7 +485,20 @@ Summary:	/usr/bin/php symlink
 Summary(pl.UTF-8):	Dowiązanie symboliczne /usr/bin/php
 Group:		Development/Languages/PHP
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
-Obsoletes:	/usr/bin/php
+Obsoletes:	php-program < 4:5.3.28-7
+Obsoletes:	php4-program < 3:5
+Obsoletes:	php53-program < 4:5.4
+Obsoletes:	php54-program < 4:5.5
+Obsoletes:	php55-program < 4:5.6
+Obsoletes:	php56-program < 4:7
+Obsoletes:	php70-program < 4:7.1
+Obsoletes:	php71-program < 4:7.2
+Obsoletes:	php72-program < 4:7.3
+Obsoletes:	php73-program < 4:7.4
+Obsoletes:	php74-program < 4:8
+Obsoletes:	php80-program < 4:8.1
+Obsoletes:	php81-program < 4:8.2
+Obsoletes:	php82-program < 4:8.3
 
 %description program
 Package providing /usr/bin/php symlink to PHP CLI.
@@ -576,10 +611,20 @@ Requires:	libtool
 %{?with_pcre:Requires:	pcre-devel >= 6.6}
 Requires:	shtool
 Obsoletes:	php-devel
-Obsoletes:	php-pear-devel
-Obsoletes:	php4-devel
-Obsoletes:	php53-devel
-Obsoletes:	php54-devel
+Obsoletes:	php-pear-devel < 3:4.3.0-1
+Obsoletes:	php4-devel < 3:5
+Obsoletes:	php53-devel < 4:5.4
+Obsoletes:	php54-devel < 4:5.5
+Obsoletes:	php55-devel < 4:5.6
+Obsoletes:	php56-devel < 4:7
+Obsoletes:	php70-devel < 4:7.1
+Obsoletes:	php71-devel < 4:7.2
+Obsoletes:	php72-devel < 4:7.3
+Obsoletes:	php73-devel < 4:7.4
+Obsoletes:	php74-devel < 4:8
+Obsoletes:	php80-devel < 4:8.1
+Obsoletes:	php81-devel < 4:8.2
+Obsoletes:	php82-devel < 4:8.3
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -639,7 +684,7 @@ Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	%{name}-bzip2 = %{epoch}:%{version}-%{release}
 Provides:	php(bz2)
 Provides:	php(bzip2)
-Obsoletes:	php-bzip2
+Obsoletes:	php-bzip2 < 4:5.2.14-3
 
 %description bz2
 This is a dynamic shared object (DSO) for PHP that will add bzip2
@@ -781,7 +826,7 @@ URL:		http://www.php.net/manual/en/book.filter.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pcre = %{epoch}:%{version}-%{release}
 Provides:	php(filter)
-Obsoletes:	php-pecl-filter
+Obsoletes:	php-pecl-filter < 0.12
 
 %description filter
 We all know that you should always check input variables, but PHP does
@@ -1206,7 +1251,7 @@ URL:		http://www.php.net/manual/en/book.pdo.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(pdo)
-Obsoletes:	php-pecl-PDO
+Obsoletes:	php-pecl-PDO < 1.1
 
 %description pdo
 This is a dynamic shared object (DSO) for PHP that will add PDO
@@ -1240,7 +1285,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-firebird.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-firebird)
-Obsoletes:	php-pecl-PDO_FIREBIRD
+Obsoletes:	php-pecl-PDO_FIREBIRD < 0.3
 
 %description pdo-firebird
 This is a dynamic shared object (DSO) for PHP that will add PDO
@@ -1258,7 +1303,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-mysql.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-mysql)
-Obsoletes:	php-pecl-PDO_MYSQL
+Obsoletes:	php-pecl-PDO_MYSQL < 1.1
 
 %description pdo-mysql
 This is a dynamic shared object (DSO) for PHP that will add PDO MySQL
@@ -1276,7 +1321,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-oci.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-oci)
-Obsoletes:	php-pecl-PDO_OCI
+Obsoletes:	php-pecl-PDO_OCI < 1.1
 
 %description pdo-oci
 This is a dynamic shared object (DSO) for PHP that will add PDO Oracle
@@ -1294,7 +1339,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-odbc.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-odbc)
-Obsoletes:	php-pecl-PDO_ODBC
+Obsoletes:	php-pecl-PDO_ODBC < 1.1
 
 %description pdo-odbc
 This is a dynamic shared object (DSO) for PHP that will add PDO ODBC
@@ -1312,8 +1357,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-pgsql.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-pgsql)
-Provides:	php-pecl-PDO_PGSQL
-Obsoletes:	php-pecl-PDO_PGSQL
+Obsoletes:	php-pecl-PDO_PGSQL < 4:5.2.17-1
 
 %description pdo-pgsql
 This is a dynamic shared object (DSO) for PHP that will add PDO
@@ -1331,7 +1375,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-sqlite.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-sqlite)
-Obsoletes:	php-pecl-PDO_SQLITE
+Obsoletes:	php-pecl-PDO_SQLITE < 1.1
 
 %description pdo-sqlite
 This is a dynamic shared object (DSO) for PHP that will add PDO SQLite
@@ -1771,7 +1815,7 @@ Group:		Libraries
 URL:		http://www.php.net/manual/en/book.xmlwriter.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(xmlwriter)
-Obsoletes:	php-pecl-xmlwriter
+Obsoletes:	php-pecl-xmlwriter < 2.1
 
 %description xmlwriter
 This extension wraps the libxml xmlWriter API. Represents a writer
@@ -1898,7 +1942,7 @@ done
 
 # mysql default charset for mysql/mysql/pdo-mysql extensions
 %patch36 -p1
-%patch37 -p0
+%patch37 -p1
 %patch38 -p0
 
 %patch39 -p1
@@ -1916,6 +1960,7 @@ done
 %if %{with suhosin}
 %patch47 -p1
 %endif
+%patch48 -p1
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
@@ -1927,9 +1972,10 @@ done
 %patch57 -p1
 %patch58 -p4
 %patch59 -p1
-%patch60 -p4
+%patch60 -p1
+%patch61 -p1
 %{?with_system_libzip:%patch65 -p1}
-%patch66 -p2
+%patch66 -p1
 %patch67 -p1
 %patch69 -p4
 %patch70 -p1
@@ -1939,6 +1985,11 @@ done
 %patch74 -p1
 %patch75 -p1
 %patch76 -p1
+%patch77 -p1
+%patch78 -p1
+%patch79 -p1
+%patch80 -p1
+%patch81 -p1
 
 # Bugfix backport from 5.3.6
 %patch311 -p1 -b .bug-47435
@@ -1949,6 +2000,9 @@ done
 # causes regression -> magic_quotes_gpc setting cannot be changed
 #%%patch402 -p1 -b .bug-323016
 
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
 
@@ -1985,6 +2039,9 @@ mv sapi/cli/tests/022.phpt{,.broken}
 
 sh -xe %{_sourcedir}/skip-tests.sh
 
+# make colliding symbol static
+%{__sed} -i -e 's/^char \*yytext/static &/' Zend/zend_{ini,language}_scanner.c
+
 %build
 API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)
 if [ $API != %{php_api_version} ]; then
@@ -2059,7 +2116,9 @@ for sapi in $sapis; do
 	esac
 
 	%configure \
+	CFLAGS="%{rpmcflags} -DOPENSSL_NO_SSL2=1 -DOPENSSL_NO_SSL3=1" \
 	FORCE_APACHE_VERSION="${apache_ver}" \
+	EXTRA_LDFLAGS="%{rpmldflags}" \
 	$sapi_args \
 %if "%{!?configure_cache:0}%{?configure_cache}" == "0"
 	--cache-file=config.cache \
@@ -2071,7 +2130,6 @@ for sapi in $sapis; do
 	--with-system-tzdata \
 	--%{!?debug:dis}%{?debug:en}able-debug \
 	%{?with_zts:--enable-maintainer-zts} \
-	%{?with_suhosin:--enable-suhosin} \
 	%{?with_zend_multibyte:--enable-zend-multibyte} \
 	--enable-inline-optimization \
 	--enable-bcmath=shared \
@@ -2314,14 +2372,14 @@ v=$(echo %{version} | cut -d. -f1-2)
 %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
+ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache1/mod_php.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
+ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/mod_php.so
 %endif
 
 # install CGI
@@ -2416,7 +2474,7 @@ for fn in ltmain.sh config/ltmain.sh build-aux/ltmain.sh; do
 done
 sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize
 
-# as a result of ext/pcre/pcrelib removal in %%prep, ext/pcre/php_pcre.h
+# as a result of ext/pcre/pcrelib removal in prep, ext/pcre/php_pcre.h
 # isn't installed by install-headers make target, we do it manually here.
 # this header file is required by e.g. filter PECL extension
 install -D ext/pcre/php_pcre.h $RPM_BUILD_ROOT%{_includedir}/php/ext/pcre/php_pcre.h
@@ -2501,6 +2559,12 @@ if [ ! -e /usr/share/browscap/php_browscap.ini ]; then
 	%{__sed} -i -e 's#^browscap = /usr/share/browscap/php_browscap.ini#;&#' %{_sysconfdir}/php.ini
 fi
 
+%triggerpostun -n apache1-mod_%{name} -- apache1-mod_%{name} < 4:5.2.17-14
+sed -i -e 's#modules/libphp5.so#modules/mod_php.so#g' /etc/apache/conf.d/*_mod_php.conf
+
+%triggerpostun -n apache-mod_%{name} -- apache-mod_%{name} < 4:5.2.17-14
+sed -i -e 's#modules/libphp[57].so#modules/mod_php.so#g' /etc/httpd/conf.d/*_mod_php.conf
+
 # common macros called at extension post/postun scriptlet
 %define	extension_scripts() \
 %post %1 \
@@ -2591,7 +2655,7 @@ fi
 %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/mod_php.so
 %attr(755,root,root) %{_libdir}/apache1/libphp5-*.*.so
 %endif
 
@@ -2599,9 +2663,12 @@ fi
 %files -n apache-mod_%{name}
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/conf.d/*_mod_php.conf
+%attr(755,root,root) %{_libdir}/apache/mod_php.so
+
+%files -n apache-mod_%{name}-core
+%defattr(644,root,root,755)
 %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
 %endif