X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php.spec;h=5ac19d5ca5513b353dbf64547cd850ddae7db408;hp=d01296b3635a87de66c19f1cb561bb00472e9086;hb=95aa0e1;hpb=b89470a9eba3dc02ca74620e09441ba6bba66ece diff --git a/php.spec b/php.spec index d01296b..5ac19d5 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 7 +%define rel 12 %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 @@ -136,8 +139,6 @@ Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-cgi.ini Source5: %{orgname}-apache.ini Source6: %{orgname}-cli.ini -# Taken from: http://browsers.garykeith.com/downloads.asp -Source8: %{orgname}_browscap.ini # lynx -dump ftp://distfiles.gentoo.org/pub/gentoo/distfiles/|grep -o ftp://.*php-patchset.*tar.bz2 #Source9: ftp://distfiles.gentoo.org/pub/gentoo/distfiles/%{orgname}-patchset-%{version}-r1.tar.bz2 ## Source9-md5: d67f23f5e69664e06fce89b064d5bbab @@ -218,6 +219,9 @@ Patch71: php-apache24.patch Patch72: exif-crash-bug-36.patch Patch73: CVE-2013-6420.patch Patch74: CVE-2013-4073.patch +Patch75: php-secbug-67498.patch +Patch76: CVE-2015-0232.patch +Patch77: x32.patch # CENTALT patches # Backport from 5.3.6 Patch311: php-5.3.6-bug-47435.patch @@ -538,6 +542,7 @@ Requires: %{name}-spl = %{epoch}:%{version}-%{release} %endif %{!?with_mysqlnd:Obsoletes: php-mysqlnd} %{?with_pcre:%requires_ge_to pcre pcre-devel} +Suggests: browscap Obsoletes: php-pecl-domxml Conflicts: php-pecl-memcache < 3.0.4-2 Conflicts: php4-common < 3:4.4.4-8 @@ -579,6 +584,9 @@ Obsoletes: php-pear-devel Obsoletes: php4-devel Obsoletes: php53-devel Obsoletes: php54-devel +Obsoletes: php55-devel +Obsoletes: php56-devel +Obsoletes: php70-devel %description devel The php-devel package lets you compile dynamic extensions to PHP. @@ -1936,6 +1944,9 @@ done %patch72 -p1 %patch73 -p1 %patch74 -p1 +%patch75 -p1 +%patch76 -p1 +%patch77 -p1 # Bugfix backport from 5.3.6 %patch311 -p1 -b .bug-47435 @@ -2368,7 +2379,6 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini %endif install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini -install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini %if %{with apache1} install %{SOURCE2} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf @@ -2399,17 +2409,19 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi,cli,cgi-fcgi,apache,apache2handler mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/{ncurses,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 # as a result of ext/pcre/pcrelib removal in %%prep, ext/pcre/php_pcre.h @@ -2489,6 +2501,14 @@ fi [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart [ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart +%triggerpostun common -- %{name}-common < 4:5.2.17-20130717.9, php-common < 4:5.2.17-20130717.9 +# 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 \ @@ -2639,7 +2659,6 @@ fi %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 %dir %{php_extensiondir}