--- rpms/smeserver-php/sme10/smeserver-php.spec	2020/11/09 02:36:48	1.17
+++ rpms/smeserver-php/sme10/smeserver-php.spec	2020/12/13 22:24:43	1.21
@@ -1,5 +1,5 @@
 %define version 3.0.0
-%define release 15
+%define release 19
 %define name smeserver-php
 
 
@@ -22,6 +22,8 @@ Patch8: smeserver-php-3.0.0-bz10904-pass
 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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: x86_64
@@ -218,6 +220,8 @@ Manage PHP FPM pools, and switch between
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 perl createlinks
@@ -231,6 +235,7 @@ perl createlinks
 %{__mkdir_p} root/%{_presetdir}
 echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
 
+%{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
 for phpver in "55" "56" "70" "71" "72" "73" "74"; do
 #needed folder
 %{__mkdir_p} root/var/log/php/php$phpver/
@@ -248,6 +253,10 @@ echo 'service'> root/etc/e-smith/db/conf
 #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
+
 done
 
 #to add a new php version
@@ -304,6 +313,20 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 
 %changelog
+* Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 3.0.0-18.sme
+- fix logrotate error because parent directory has insecure permissions [SME: 11173]
+
+* Wed Nov 18 2020 Jean-Philipe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 3.0.0-16.sme
+- fix typo for upload_tmp_dir [SME: 11092]
+
 * Sun Nov 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-15.sme
 - improve integration of webapps : virtualhost and event [SME: 11087]