--- rpms/smeserver-php/sme10/smeserver-php.spec 2021/03/16 06:01:40 1.42 +++ rpms/smeserver-php/sme10/smeserver-php.spec 2021/06/30 14:12:05 1.47 @@ -1,5 +1,5 @@ %define version 3.0.0 -%define release 32 +%define release 37 %define name smeserver-php @@ -38,6 +38,8 @@ Patch24: smeserver-php-3.0.0-bz11427-tim Patch25: smeserver-php-3.0.0-bz11411-uniformizePhpProperties.patch Patch26: smeserver-php-3.0.0-bz11412-phptempsdirs.patch Patch27: smeserver-php-3.0.0-bz11452-bz5759.patch +Patch28: smeserver-php-3.0.0-bz11422-logging.patch +Patch29: smeserver-php-3.0.0-bz11573.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: x86_64 @@ -273,6 +275,8 @@ Manage PHP FPM pools, and switch between %patch25 -p1 -F4 %patch26 -p1 %patch27 -p1 +%patch28 -p1 +%patch29 -p1 %build perl createlinks @@ -316,7 +320,7 @@ MORE_DATA={ PHP_VERSION => '$phpver'}' > #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 +echo "WantedBy=sme-server.target" >> root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf done @@ -374,6 +378,25 @@ rm -rf $RPM_BUILD_ROOT %preun %changelog +* Wed Jun 30 2021 Jean-Philippe Pialasse 3.0.0-37.sme +- fix typo in 25SSLDirectives fragment for WebAppVirtualHost [SME: 11641] + +* Thu Jun 03 2021 Terry Fage 3.0.0-35.sme +- fix syntax error "> - >>" in spec file for systemd drop in [SME: 11612] + +%changelog +* Wed Jun 30 2021 Jean-Philippe Pialasse 3.0.0-37.sme +- fix [SME: ] + +* Wed Jun 02 2021 Jean-Philippe Pialasse 3.0.0-35.sme +- fix missing Install section for systemd drop in [SME: 11612] + +* Wed Apr 21 2021 Jean-Philippe Pialasse 3.0.0-34.sme +- fix open_basedir for pool missing /var/lib/php/$ibay/ [SME: 11573] + +* Tue Mar 16 2021 Jean-Philippe Pialasse 3.0.0-33.sme +- clean rsyslog syntax for php [SME: 11422] + * Tue Mar 16 2021 Jean-Philippe Pialasse 3.0.0-32.sme - add /usr/share/pear and /usr/share/php to basedir [SME: 5759] - fix last big differences between module setting and fpm [SME: 11452]