--- rpms/smeserver-php/sme10/smeserver-php.spec 2021/02/23 03:32:48 1.30 +++ rpms/smeserver-php/sme10/smeserver-php.spec 2021/09/18 03:01:12 1.49 @@ -1,5 +1,5 @@ %define version 3.0.0 -%define release 25 +%define release 39 %define name smeserver-php @@ -29,6 +29,18 @@ Patch15: smeserver-php-3.0.0-bz11287-fix 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 +Patch21: smeserver-php-3.0.0-bz11401-empty-property-not-honored.patch +Patch22: smeserver-php-3.0.0-bz10907-phpfile-exist.patch +Patch23: smeserver-php-3.0.0-bz10890-allowphpembdedcode.patch +Patch24: smeserver-php-3.0.0-bz11427-timeout.patch +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 +Patch30: smeserver-php-3.0.0-bz8077-bz11666.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: x86_64 @@ -38,7 +50,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 @@ -250,6 +267,18 @@ Manage PHP FPM pools, and switch between %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 -F4 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 %build perl createlinks @@ -293,7 +322,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 @@ -351,6 +380,50 @@ rm -rf $RPM_BUILD_ROOT %preun %changelog +* Fri Sep 17 2021 Jean-Philippe Pialasse 3.0.0-39.sme +- add ErrorReporting and DisplayErrors properties [SME: 8077] + only per ibays (php defaults still hardcoded) +- fix typo in AllowUrlFopen, was using AllowUrlfOpen for ibays in httpd [SME: 11666] + +* 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] + +* 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] + +* Mon Mar 08 2021 Jean-Philipe Pialasse 3.0.0-31.sme +- move from e-smith-ibays handling of temps dirs [SME: 11412] +- improve httpd fragment [SME: 11401] + +* Mon Mar 08 2021 Jean-Philipe Pialasse 3.0.0-30.sme +- uniformize php related properties between ibays and php [SME: 11411] + tidy fragments for php-fpm and ibays +- revert patch for timeouts [SME: 11427] + +* Mon Mar 08 2021 Jean-Philipe Pialasse 3.0.0-28.sme +- filter non existing php script [SME: 10907] +- allow php embded files per ibay using AllowPHTML [SME: 10890] +- add timeout property in case of need for long running script [SME: 11427] + e.g. upgrade of a wiki + +* Mon Mar 08 2021 Jean-Philipe Pialasse 3.0.0-27.sme +- String not honoured as php-fpm but as default [SME: 11401] + +* 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]