- Update to 5.6.5 http://www.php.net/releases/5_6_5.php
- drop deprecated php-fpm EnvironmentFile
This commit is contained in:
parent
a8ae4d1be8
commit
d00ab811ca
1
.gitignore
vendored
1
.gitignore
vendored
@ -38,3 +38,4 @@ php-5.5.*.xz
|
|||||||
/php-5.6.4RC1-strip.tar.xz
|
/php-5.6.4RC1-strip.tar.xz
|
||||||
/php-5.6.4-strip.tar.xz
|
/php-5.6.4-strip.tar.xz
|
||||||
/php-5.6.5RC1-strip.tar.xz
|
/php-5.6.5RC1-strip.tar.xz
|
||||||
|
/php-5.6.5-strip.tar.xz
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
# It's not recommended to modify this file in-place, because it will be
|
# It's not recommended to modify this file in-place, because it will be
|
||||||
# overwritten during package upgrades. If you want to customize, the
|
# overwritten during package upgrades.
|
||||||
# best way is to create a file "/etc/systemd/system/php-fpm.service".
|
|
||||||
|
# To alter the FPM environment, drop a file with the suffix
|
||||||
|
# .conf in /etc/systemd/system/php-fpm.service.d, with
|
||||||
|
# [Service]
|
||||||
|
# Environment=FOO=bar
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=The PHP FastCGI Process Manager
|
Description=The PHP FastCGI Process Manager
|
||||||
@ -9,7 +13,6 @@ After=syslog.target network.target
|
|||||||
[Service]
|
[Service]
|
||||||
Type=notify
|
Type=notify
|
||||||
PIDFile=/run/php-fpm/php-fpm.pid
|
PIDFile=/run/php-fpm/php-fpm.pid
|
||||||
EnvironmentFile=/etc/sysconfig/php-fpm
|
|
||||||
ExecStart=/usr/sbin/php-fpm --nodaemonize
|
ExecStart=/usr/sbin/php-fpm --nodaemonize
|
||||||
ExecReload=/bin/kill -USR2 $MAINPID
|
ExecReload=/bin/kill -USR2 $MAINPID
|
||||||
PrivateTmp=true
|
PrivateTmp=true
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
# Additional environment file for php-fpm
|
|
||||||
|
|
||||||
# This file is deprecated and will be removed in the future
|
|
||||||
|
|
||||||
# To alter the FPM environment, drop a file with the suffix
|
|
||||||
# .conf in /etc/systemd/system/php-fpm.service.d, with
|
|
||||||
# [Service]
|
|
||||||
# Environment=FOO=bar
|
|
||||||
|
|
||||||
# See systemd documentation:
|
|
||||||
# man systemd.unit
|
|
||||||
# man systemd.exec
|
|
||||||
|
|
14
php.spec
14
php.spec
@ -57,12 +57,12 @@
|
|||||||
%global db_devel libdb-devel
|
%global db_devel libdb-devel
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global rcver RC1
|
#global rcver RC1
|
||||||
|
|
||||||
Summary: PHP scripting language for creating dynamic web sites
|
Summary: PHP scripting language for creating dynamic web sites
|
||||||
Name: php
|
Name: php
|
||||||
Version: 5.6.5
|
Version: 5.6.5
|
||||||
Release: 0.1.RC1%{?dist}
|
Release: 1%{?dist}
|
||||||
# All files licensed under PHP version 3.01, except
|
# All files licensed under PHP version 3.01, except
|
||||||
# Zend is licensed under Zend
|
# Zend is licensed under Zend
|
||||||
# TSRM is licensed under BSD
|
# TSRM is licensed under BSD
|
||||||
@ -81,7 +81,6 @@ Source4: php-fpm.conf
|
|||||||
Source5: php-fpm-www.conf
|
Source5: php-fpm-www.conf
|
||||||
Source6: php-fpm.service
|
Source6: php-fpm.service
|
||||||
Source7: php-fpm.logrotate
|
Source7: php-fpm.logrotate
|
||||||
Source8: php-fpm.sysconfig
|
|
||||||
Source9: php.modconf
|
Source9: php.modconf
|
||||||
Source10: php.ztsmodconf
|
Source10: php.ztsmodconf
|
||||||
Source11: strip.sh
|
Source11: strip.sh
|
||||||
@ -1208,9 +1207,6 @@ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/
|
|||||||
# LogRotate
|
# LogRotate
|
||||||
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
|
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
|
||||||
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm
|
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm
|
||||||
# Environment file
|
|
||||||
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
|
||||||
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm
|
|
||||||
# Nginx configuration
|
# Nginx configuration
|
||||||
install -D -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf
|
install -D -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf
|
||||||
install -D -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/default.d/php.conf
|
install -D -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/default.d/php.conf
|
||||||
@ -1406,7 +1402,6 @@ rm -f README.{Zeus,QNX,CVS-RULES}
|
|||||||
%config(noreplace) %{_sysconfdir}/php-fpm.conf
|
%config(noreplace) %{_sysconfdir}/php-fpm.conf
|
||||||
%config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
|
%config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
|
%config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/php-fpm
|
|
||||||
%config(noreplace) %{_sysconfdir}/nginx/conf.d/php-fpm.conf
|
%config(noreplace) %{_sysconfdir}/nginx/conf.d/php-fpm.conf
|
||||||
%config(noreplace) %{_sysconfdir}/nginx/default.d/php.conf
|
%config(noreplace) %{_sysconfdir}/nginx/default.d/php.conf
|
||||||
%{_prefix}/lib/tmpfiles.d/php-fpm.conf
|
%{_prefix}/lib/tmpfiles.d/php-fpm.conf
|
||||||
@ -1478,6 +1473,11 @@ rm -f README.{Zeus,QNX,CVS-RULES}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 22 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-1
|
||||||
|
- Update to 5.6.5
|
||||||
|
http://www.php.net/releases/5_6_5.php
|
||||||
|
- drop deprecated php-fpm EnvironmentFile
|
||||||
|
|
||||||
* Fri Jan 9 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-0.1.RC1
|
* Fri Jan 9 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-0.1.RC1
|
||||||
- update to 5.6.5RC1
|
- update to 5.6.5RC1
|
||||||
- FPM: enable ACL support for Unix Domain Socket
|
- FPM: enable ACL support for Unix Domain Socket
|
||||||
|
Loading…
Reference in New Issue
Block a user