--- rpms/smeserver-php/sme10/smeserver-php.spec 2020/03/09 16:57:16 1.4 +++ rpms/smeserver-php/sme10/smeserver-php.spec 2021/02/21 05:42:28 1.28 @@ -1,5 +1,5 @@ %define version 3.0.0 -%define release 3 +%define release 24 %define name smeserver-php @@ -14,6 +14,21 @@ Patch0: smeserver-php-fpm-0.1.1-bz10871- Patch1: smeserver-php-fpm-0.1.1-bz10871-bz10335-fix1.patch Patch2: smeserver-php-fpm-0.1.1-bz10879-php-fpm_syslog.patch Patch3: smeserver-php-fpm-0.1.1-bz10877-pool-logs.patch +Patch4: smeserver-php-3.0.0-bz10888-sys_temp_dir.patch +Patch5: smeserver-php-fpm-0.1.1-bz0335-fix2.patch +Patch6: smeserver-php-fpm-0.1.1-bz10335-fix3-systemd-units.patch +Patch7: smeserver-php-3.0.0-bz10891-php.ini-allversions.patch +Patch8: smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch +Patch9: smeserver-php-3.0.0-bz8787-phpmail.patch +Patch10: smeserver-php-3.0.0-bz11014.sme-server.target.patch +Patch11: smeserver-php-3.0.0-bz11087-webapps.patch +Patch12: smeserver-php-3.0.0-bz11092.typo-upload.patch +Patch13: smeserver-php-3.0.0-bz11173-bz11015-logging.patch +Patch14: smeserver-php-3.0.0-bz11267-ibay-php-version.patch +Patch15: smeserver-php-3.0.0-bz11287-fix-event-links.patch +Patch16: smeserver-php-3.0.0-bz11325-logging.patch +Patch17: smeserver-php-3.0.0-bz11287-pooldir.patch +Patch18: smeserver-php-3.0.0-bz11295-addphp80.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: x86_64 @@ -22,6 +37,7 @@ BuildRequires: e-smith-devtools Requires: e-smith-base >= 5.6.0 Provides: e-smith-php = %{version}-%{release} Obsoletes: e-smith-php < %{version} +Provides: smeserver-webapps-common Requires: tmpwatch Requires: logrotate @@ -192,6 +208,26 @@ Requires: php74-php-process Requires: php74-php-snmp Requires: php74-php, php74-php-enchant , php74-php-pdo php74-php-tidy , php74-php-mysqlnd php74-php-pecl-zip +# PHP 8.0 +Requires: php80-php-cli +Requires: php80-php-ldap +Requires: php80-php-imap +Requires: php80-php-gd +Requires: php80-php-xml +Requires: php80-php-xmlrpc +Requires: php80-php-soap +Requires: php80-php-opcache +Requires: php80-php-fpm +Requires: php80-php-mbstring +Requires: php80-php-mysql +Requires: php80-php-json +Requires: php80-php-bcmath +Requires: php80-php-intl +Requires: php80-php-pear +Requires: php80-php-process +Requires: php80-php-snmp +Requires: php80-php, php80-php-enchant , php80-php-pdo php80-php-tidy , php80-php-mysqlnd php80-php-pecl-zip + %description Manage PHP FPM pools, and switch between PHP versions easily @@ -201,6 +237,21 @@ Manage PHP FPM pools, and switch between %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 %build perl createlinks @@ -211,10 +262,16 @@ perl createlinks #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/ #echo '' > root/%{_unitdir}/php-fpm.service.d/php-fpm.conf #enable by default -%{__mkdir_p} root/%{_presetdir} -echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset +#%{__mkdir_p} root/%{_presetdir} +#echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset + +#drop in systemd file +%{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d +echo "[Install]" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf +echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf -for phpver in "55" "56" "70" "71" "72" "73" "74"; do +%{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/ +for phpver in "55" "56" "70" "71" "72" "73" "74" "80"; do #needed folder %{__mkdir_p} root/var/log/php/php$phpver/ %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache} @@ -228,24 +285,35 @@ echo 'service'> root/etc/e-smith/db/conf #%{__mkdir_p} root/%{_unitdir}/php$phpver-php-fpm.service.d/ #echo '' > root/%{_unitdir}/php$phpver-php-fpm.service.d/php$phpver-php-fpm.conf -#enable by default php fpm -echo 'enable php'$phpver'-php-fpm.service' >>root/%{_presetdir}/80-koozali-php.preset +##enable by default php fpm +#echo 'enable php'$phpver'-php-fpm.service' >>root/%{_presetdir}/80-koozali-php.preset +#logrotate templates +echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm" +MORE_DATA={ PHP_VERSION => '$phpver'}' > root/etc/e-smith/templates.metadata/etc/logrotate.d/php$phpver-php-fpm + +#drop in systemd file +%{__mkdir_p} root/usr/lib/systemd/system/php$phpver-php-fpm.service.d +echo "[Install]" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf +echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf + done #to add a new php version #php5* for phpver in "55" ; do #cp php56 metadata -cp -a root/etc/e-smith/templates.metadata/opt/remi/php56 root/etc/e-smith/templates.metadata/opt/remi/php$phpver +mkdir -p root/etc/e-smith/templates.metadata/opt/remi/php$phpver +cp -a root/etc/e-smith/templates.metadata/opt/remi/php56/* root/etc/e-smith/templates.metadata/opt/remi/php$phpver #sed inplace find root/etc/e-smith/templates.metadata/opt/remi/php$phpver -type f -print0 | xargs -0 sed -i 's/56/'$phpver'/g' done # php7* -for phpver in "72" "73" "74"; do +for phpver in "72" "73" "74" "80"; do #cp ph70 metada -cp -a root/etc/e-smith/templates.metadata/etc/opt/remi/php70 root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver +mkdir -p root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/ +cp -a root/etc/e-smith/templates.metadata/etc/opt/remi/php70/* root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/ #sed inplace find root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver -type f -print0 | xargs -0 sed -i 's/70/'$phpver'/g' done @@ -266,7 +334,7 @@ done --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \ --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \ --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \ -`for phpver in "54" "55" "56" "70" "71" "72" "73" "74"; do echo -n "--dir /var/log/php/php$phpver attr(0770,root,www) --dir /var/lib/php/php$phpver/session attr(0770,root,www) --dir /var/lib/php/php$phpver/tmp attr(0770,root,www) --dir /var/lib/php/php$phpver/opcache attr(0770,root,www) --dir /var/lib/php/php$phpver/wsdlcache attr(0770,root,www) ";done ` \ +`for phpver in "54" "55" "56" "70" "71" "72" "73" "74" "80"; do echo -n "--dir /var/log/php/php$phpver attr(0770,root,www) --dir /var/lib/php/php$phpver/session attr(0770,root,www) --dir /var/lib/php/php$phpver/tmp attr(0770,root,www) --dir /var/lib/php/php$phpver/opcache attr(0770,root,www) --dir /var/lib/php/php$phpver/wsdlcache attr(0770,root,www) ";done ` \ > %{name}-%{version}-filelist @@ -285,6 +353,77 @@ rm -rf $RPM_BUILD_ROOT %preun %changelog +* Sun Feb 21 2021 Jean-Philipe Pialasse 3.0.0-24.sme +- allow php-pool-dirs to run from generik event [SME: 11287] +- add php80 support [SME: 11295] + +* Wed Jan 27 2021 Jean-Philipe Pialasse 3.0.0-23.sme +- fix php55 logrotate [SME: 11325] +- cleanup remove services in sme-server.target.wants [SME: 10956] +- remove usr/lib preset file from rpm [SME: 10958] + +* Fri Dec 25 2020 Jean-Philipe Pialasse 3.0.0-22.sme +- add WantedBy=sme-server.target for all php-fpm service files [SME: 11294] + +* Mon Dec 21 2020 John Crisp 3.0.0.21.sme +- Fix createlinks typo missing event links [SME: 11287] +- Fix typo + +* Thu Dec 17 2020 John Crisp 3.0.0.20.sme +- Fix individual PHP version for ibay [SME: 11267] + +* Sun Dec 13 2020 Jean-Philipe Pialasse 3.0.0-19.sme +- fix wrong syntax = in place of eq [SME: 11173] + thanks to Terry Fage + +* Mon Dec 07 2020 Jean-Philipe Pialasse 3.0.0-18.sme +- fix logrotate error because parent directory has insecure permissions [SME: 11173] + +* Wed Nov 18 2020 Jean-Philipe Pialasse 3.0.0-17.sme +- fix warning: ~ action is deprecated with rsyslog [SME: 11015] +- fix logrotate error because parent directory has insecure permissions [SME: 11173] + +* Mon Nov 09 2020 Jean-Philipe Pialasse 3.0.0-16.sme +- fix typo for upload_tmp_dir [SME: 11092] + +* Sun Nov 08 2020 Jean-Philipe Pialasse 3.0.0-15.sme +- improve integration of webapps : virtualhost and event [SME: 11087] + +* Wed Sep 30 2020 Jean-Philipe Pialasse 3.0.0-14.sme +- enable php services for sme-server.target [SME: 11014] + +* Tue Jun 23 2020 Jean-Philipe Pialasse 3.0.0-13.sme +- move and fix link to start services units [SME: 10960] + +* Fri Mar 27 2020 Jean-Philipe Pialasse 3.0.0-12.sme +- fix typo in smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch [SME: 10904] + +* Thu Mar 26 2020 Jean-Philipe Pialasse 3.0.0-11.sme +- help monitoring email sent by php [SME: 8787] + +* Thu Mar 26 2020 Jean-Philipe Pialasse 3.0.0-9.sme +- move auto_prepend_file from php.ini to php-fpm.d [SME: 10904] + add /usr/share/php in open_basedir if dfined to allow execution of auto_prepend_file +- fix templates-metadata path fot php 55 72 73 74 + +* Tue Mar 24 2020 Jean-Philipe Pialasse 3.0.0-8.sme +- transfer SERVER auth variables from httpd server to php-fpm pool [SME: 10904] + this allow easy auth for php app using httpd auth as if using php module + +* Tue Mar 24 2020 Jean-Philipe Pialasse 3.0.0-7.sme +- templating all php.ini for all available version [SME: 10891] + expanded using webapps-update, smeserver-php-update, console-save and bootstrap-console-save + Values are those from php configuration key, unless defined for the php$VERSION key. + only one template for all, using templates.metadata and conditions vhen needed. + reworked the content of the php.ini to have it uptodate + +* Wed Mar 11 2020 Jean-Philipe Pialasse 3.0.0-6.sme +- enable units for php-fpm services [SME: 10335] + +* Tue Mar 10 2020 Jean-Philipe Pialasse 3.0.0-5.sme +- set sys_temp_dir for php-fpm and ibays [SME: 10888] +- set restart for php-fpm services in the smeserver-php-update event [SME: 10335] + * Mon Mar 09 2020 Jean-Philipe Pialasse 3.0.0-3.sme - fix typos and logic in scripts [SME: 10335] - only set php admin values if php module is enabled [SME: 10871]