/[smeserver]/rpms/smeserver-php/sme10/smeserver-php.spec

Diff of /rpms/smeserver-php/sme10/smeserver-php.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.22 by jcrisp,
Thu Dec 17 23:00:34 2020 UTC
+Revision 1.53 by jpp,
Mon Dec 20 14:49:42 2021 UTC
 Line 1
  %define version 3.0.0
- %define release 20
+ %define release 42
  %define name smeserver-php
 Line 25 
 Patch11: smeserver-php-3.0.0-bz11087-web
  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
+ 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
+ Patch31: smeserver-php-3.0.0-bz11666-error_reporting.patch
+ Patch32: smeserver-php-3.0.0-bz11717-addphp81.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildArch: x86_64
-Line 34 
 Requires: e-smith-base >= 5.6.0
+Line 52 
 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
-Line 195 
 Requires: php74-php-soap
+Line 218 
 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
-Line 204 
 Requires: php74-php-process
+Line 226 
 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
+ # PHP 8.1
+ Requires: php81-php-cli
+ Requires: php81-php-ldap
+ Requires: php81-php-imap
+ Requires: php81-php-gd
+ Requires: php81-php-xml
+ Requires: php81-php-xmlrpc
+ Requires: php81-php-soap
+ Requires: php81-php-opcache
+ Requires: php81-php-fpm
+ Requires: php81-php-mbstring
+ Requires: php81-php-json
+ Requires: php81-php-bcmath
+ Requires: php81-php-intl
+ Requires: php81-php-pear
+ Requires: php81-php-process
+ Requires: php81-php-snmp
+ Requires: php81-php, php81-php-enchant , php81-php-pdo php81-php-tidy ,  php81-php-mysqlnd php81-php-pecl-zip
  %description
  Manage PHP FPM pools, and switch between PHP versions easily
-Line 224 
 Manage PHP FPM pools, and switch between
+Line 284 
 Manage PHP FPM pools, and switch between
  %patch12 -p1
  %patch13 -p1
  %patch14 -p1
+ %patch15 -p1
+ %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
+ %patch31 -p1
+ %patch32 -p1
  %build
  perl createlinks
-Line 234 
 perl createlinks
+Line 312 
 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}
+ #%{__mkdir_p} root/%{_presetdir}
- echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
+ #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
  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
- for phpver in "55" "56" "70" "71" "72" "73" "74"; do
+ for phpver in "55" "56" "70" "71" "72" "73" "74" "80" "81"; do
  #needed folder
  %{__mkdir_p} root/var/log/php/php$phpver/
  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}
  #db configuration
  %{__mkdir_p} root/etc/e-smith/db/configuration/defaults/php$phpver-php-fpm
+ %{__mkdir_p} root/etc/e-smith/db/configuration/defaults/php$phpver
  echo 'enabled' > root/etc/e-smith/db/configuration/defaults/php$phpver-php-fpm/status
  echo 'service'> root/etc/e-smith/db/configuration/defaults/php$phpver-php-fpm/type
- #create service configuration for SME Seerver
+ echo 'configuration'> root/etc/e-smith/db/configuration/defaults/php$phpver/type
- #%{__mkdir_p} root/%{_unitdir}/php$phpver-php-fpm.service.d/
+ echo 'Off'> root/etc/e-smith/db/configuration/defaults/php$phpver/AllowUrlFopen
- #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
  #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
-Line 272 
 find root/etc/e-smith/templates.metadata
+Line 357 
 find root/etc/e-smith/templates.metadata
  done
  # php7*
- for phpver in  "72" "73" "74"; do
+ for phpver in  "72" "73" "74" "80" "81"; 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/
-Line 281 
 find root/etc/e-smith/templates.metadata
+Line 366 
 find root/etc/e-smith/templates.metadata
  done
  # then patch the following files
- #./templates/etc/logrotate.d/php-fpm/php-fpm:      /sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true
+ ### TODO
- #./templates/etc/httpd/conf/httpd.conf/68FastCGIConfig:  foreach my $ver ('', '56', '70', '71'){
+ ### fix those files so we do not have to patch them, but generate them or sed them to change a known WORDTODOGENERIC
- #./templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults:for VER in php php56 php70 php71; do
+ #smeserver-php-3.0.0/createlinks
+ #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults
+ #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm
+ #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php # this one could be cut in fragments per version
+ #smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php.ini
  %install
  /bin/rm -rf $RPM_BUILD_ROOT
-Line 296 
 done
+Line 384 
 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" "81"; 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
-Line 315 
 rm -rf $RPM_BUILD_ROOT
+Line 403 
 rm -rf $RPM_BUILD_ROOT
  %preun
  %changelog
+ * Mon Dec 20 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-42.sme
+ - fix missing section in php-fpm dropin file [SME: 11814]
+ * Sun Oct 24 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-41.sme
+ - add php81 support [SME: 11717]
+ * Fri Sep 24 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0-40.sme
+ - Fix incorrect commenting for error reporting
+ * Fri Sep 17 2021 Jean-Philippe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 3.0.0-37.sme
+ - fix typo in 25SSLDirectives fragment for WebAppVirtualHost [SME: 11641]
+ * Thu Jun 03 2021 Terry Fage <tfage@yahoo.com.au> 3.0.0-35.sme
+ - fix syntax error "> - >>" in spec file for systemd drop in [SME: 11612]
+ * Wed Apr 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-34.sme
+ - fix open_basedir for pool missing /var/lib/php/$ibay/ [SME: 11573]
+ * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-33.sme
+ - clean rsyslog syntax for php [SME: 11422]
+ * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 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 <tests@pialasse.com> 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 <tests@pialasse.com> 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 <tests@pialasse.com> 3.0.0-27.sme
+ - String not honoured as php-fpm but as default [SME: 11401]
+ * Sat Mar 06 2021 Jean-Philipe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 3.0.0-25.sme
+ - add missing default db configuration for php80* [SME: 11378]
+ * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 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 <tests@pialasse.com> 3.0.0-22.sme
+ - add WantedBy=sme-server.target for all php-fpm service files [SME: 11294]
+ * Mon Dec 21 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.21.sme
+ - Fix createlinks typo missing event links [SME: 11287]
+ - Fix typo
  * Thu Dec 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.20.sme
  - Fix individual PHP version for ibay [SME: 11267]

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1