diff --git a/php.spec b/php.spec index 9a0706b..8089664 100644 --- a/php.spec +++ b/php.spec @@ -1,11 +1,12 @@ %define apache_ver %(echo `rpm -q --queryformat '%{VERSION}' apache`) +%define MAJver %(echo %version | cut -d. -f1) %define hardeningp_ver 0.4.15 %define hardeningp_phpver 5.1.6 %define with_hardening_patch 0 Name: php -Version: 5.6.28 +Version: 7.0.13 Release: 1mamba Summary: The PHP HTML-embedded scripting language Group: Applications/Development @@ -358,7 +359,7 @@ install -m 755 -d %{buildroot}%{_localstatedir}/lib/php install -m 700 -d %{buildroot}%{_localstatedir}/lib/php/session # generate files lists and stub .ini files for each subpackage -for mod in imap ldap mysql mysqli odbc openssl opcache \ +for mod in imap ldap mysqli odbc openssl opcache \ pdo pdo_mysql pdo_odbc pdo_pgsql pgsql pdo_sqlite sqlite3 xsl; do cat > %{buildroot}%{_sysconfdir}/php/php.d/${mod}.ini < /dev/null + # do not load the PHP 4 module any more + sed -i "/^LoadModule[ \t]*php4_module/d" /etc/httpd/httpd.conf + + service httpd condrestart +fi +exit 0 + +%preun -n apache-mod_php +if [ $1 -eq 0 ]; then +#erase + %{_bindir}/apxs -e -A -n php%{MAJver} %{_libdir}/apache/libphp%{MAJver}.so > /dev/null + sed -i "/AddType application\/x-httpd-php .php/d" /etc/httpd/httpd.conf + sed -i "s|\(DirectoryIndex .*\)index.php\(.*\)|\1\2|" /etc/httpd/httpd.conf + service httpd condrestart +fi +exit 0 + %files %defattr(-,root,root) %dir %{_sysconfdir}/php @@ -396,6 +421,7 @@ rm -f %{buildroot}/.lock %dir %{_sysconfdir}/php/php.d %{_bindir}/php %{_bindir}/php-cgi +%{_bindir}/phpdbg %{_bindir}/phar %{_bindir}/phar.phar %dir %{_libdir}/php @@ -406,6 +432,7 @@ rm -f %{buildroot}/.lock %{_mandir}/man1/phar.phar.1* %{_mandir}/man1/php.1* %{_mandir}/man1/php-cgi.1* +%{_mandir}/man1/phpdbg.1* %dir %{_localstatedir}/lib/php %dir %{_localstatedir}/lib/php/session %doc CREDITS @@ -423,33 +450,9 @@ rm -f %{buildroot}/.lock %doc CODING_STANDARDS EXTENSIONS README.* %doc NEWS gd_README -%post -n apache-mod_php -if [ $1 -ge 1 ]; then - # delete PHP type definition in httpd.conf, it is now in httpd.d/php.conf - sed -i "/AddType application\/x-httpd-php .php/d" /etc/httpd/httpd.conf - # same for DirectoryIndex directive - sed -i "s|\(DirectoryIndex .*\)index.php\(.*\)|\1\2|" /etc/httpd/httpd.conf - %{_bindir}/apxs -e -a -n php5 %{_libdir}/apache/libphp5.so > /dev/null - # do not load the PHP 4 module any more - sed -i "/^LoadModule[ \t]*php4_module/d" /etc/httpd/httpd.conf - - service httpd condrestart -fi -exit 0 - -%preun -n apache-mod_php -if [ $1 -eq 0 ]; then -#erase - %{_bindir}/apxs -e -A -n php5 %{_libdir}/apache/libphp5.so > /dev/null - sed -i "/AddType application\/x-httpd-php .php/d" /etc/httpd/httpd.conf - sed -i "s|\(DirectoryIndex .*\)index.php\(.*\)|\1\2|" /etc/httpd/httpd.conf - service httpd condrestart -fi -exit 0 - %files -n apache-mod_php %defattr(-,root,root) -%{_libdir}/apache/libphp5.so +%{_libdir}/apache/libphp7.so %config(noreplace) %{_sysconfdir}/httpd/httpd.d/php.conf %files -n php-imap -f files.imap @@ -486,8 +489,53 @@ exit 0 %defattr(-,root,root) %changelog -* Sun Nov 20 2016 Silvan Calarco 5.6.28-1mamba -- update to 5.6.28 +* Sat Nov 12 2016 Automatic Build System 7.0.13-1mamba +- automatic version update by autodist + +* Thu Oct 13 2016 Automatic Build System 7.0.12-1mamba +- automatic version update by autodist + +* Wed Sep 14 2016 Automatic Build System 7.0.11-1mamba +- automatic version update by autodist + +* Thu Aug 18 2016 Automatic Build System 7.0.10-1mamba +- automatic version update by autodist + +* Wed Jul 20 2016 Automatic Build System 7.0.9-1mamba +- automatic version update by autodist + +* Wed Jun 22 2016 Automatic Build System 7.0.8-1mamba +- automatic version update by autodist + +* Thu May 26 2016 Automatic Build System 7.0.7-1mamba +- automatic version update by autodist + +* Wed Apr 27 2016 Automatic Build System 7.0.6-1mamba +- automatic version update by autodist + +* Wed Mar 30 2016 Automatic Build System 7.0.5-1mamba +- automatic version update by autodist + +* Wed Mar 02 2016 Automatic Build System 7.0.4-1mamba +- automatic version update by autodist + +* Wed Feb 24 2016 Automatic Build System 7.0.3-1mamba +- automatic version update by autodist + +* Thu Feb 04 2016 Silvan Calarco 7.0.2-3mamba +- fix lost fix for php7 httpd.conf configuration + +* Wed Jan 06 2016 Automatic Build System 7.0.2-2mamba +- automatic version update by autodist + +* Wed Jan 06 2016 Automatic Build System 7.0.2-1mamba +- automatic version update by autodist + +* Wed Dec 16 2015 Automatic Build System 7.0.1-1mamba +- automatic version update by autodist + +* Thu Dec 03 2015 Automatic Build System 7.0.0-1mamba +- automatic version update by autodist * Fri Nov 27 2015 Automatic Build System 5.6.16-1mamba - automatic version update by autodist