--- rpms/smeserver-php/sme10/smeserver-php.spec 2020/11/10 04:07:46 1.18 +++ rpms/smeserver-php/sme10/smeserver-php.spec 2021/03/07 06:07:17 1.32 @@ -1,5 +1,5 @@ %define version 3.0.0 -%define release 16 +%define release 26 %define name smeserver-php @@ -23,6 +23,14 @@ Patch9: smeserver-php-3.0.0-bz8787-phpma 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 +Patch19: smeserver-php-3.0.0-bz11410-sendmail.patch +Patch20: smeserver-php-3.0.0-bz11413-php-perl-module.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: x86_64 @@ -32,7 +40,12 @@ Requires: e-smith-base >= 5.6.0 Provides: e-smith-php = %{version}-%{release} Obsoletes: e-smith-php < %{version} Provides: smeserver-webapps-common - +Provides: php(language) = 8.0 +Provides: php(language) = 7.4 +Provides: php(language) = 7.3 +Provides: php(language) = 7.2 +Provides: php(language) = 7.1 +Provides: php(language) = 7.0 Requires: tmpwatch Requires: logrotate @@ -193,7 +206,6 @@ Requires: php74-php-soap Requires: php74-php-opcache Requires: php74-php-fpm Requires: php74-php-mbstring -Requires: php74-php-mysql Requires: php74-php-json Requires: php74-php-bcmath Requires: php74-php-intl @@ -202,6 +214,25 @@ 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-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 @@ -220,7 +251,14 @@ Manage PHP FPM pools, and switch between %patch10 -p1 %patch11 -p1 %patch12 -p1 - +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 %build perl createlinks @@ -231,10 +269,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 -for phpver in "55" "56" "70" "71" "72" "73" "74"; do +#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 + +%{__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} @@ -248,9 +292,18 @@ 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 @@ -264,7 +317,7 @@ find root/etc/e-smith/templates.metadata done # php7* -for phpver in "72" "73" "74"; do +for phpver in "72" "73" "74" "80"; do #cp ph70 metada 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/ @@ -288,7 +341,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 @@ -307,6 +360,44 @@ rm -rf $RPM_BUILD_ROOT %preun %changelog +* Sat Mar 06 2021 Jean-Philipe Pialasse 3.0.0-26.sme +- improve sendmail parameter, force sender [SME: 11410] + MailForceSender as property for php versions, ibays and pools +- add perl module to help handling fpm version available [SME: 11413] + +* Mon Feb 22 2021 Jean-Philipe Pialasse 3.0.0-25.sme +- add missing default db configuration for php80* [SME: 11378] + +* 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]