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

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

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

Revision 1.9 by jpp, Wed Mar 25 03:06:31 2020 UTC Revision 1.53 by jpp, Mon Dec 20 14:49:42 2021 UTC
# Line 1  Line 1 
1  %define version 3.0.0  %define version 3.0.0
2  %define release 8  %define release 42
3  %define name smeserver-php  %define name smeserver-php
4    
5    
# Line 19  Patch5: smeserver-php-fpm-0.1.1-bz0335-f Line 19  Patch5: smeserver-php-fpm-0.1.1-bz0335-f
19  Patch6: smeserver-php-fpm-0.1.1-bz10335-fix3-systemd-units.patch  Patch6: smeserver-php-fpm-0.1.1-bz10335-fix3-systemd-units.patch
20  Patch7: smeserver-php-3.0.0-bz10891-php.ini-allversions.patch  Patch7: smeserver-php-3.0.0-bz10891-php.ini-allversions.patch
21  Patch8: smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch  Patch8: smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch
22    Patch9: smeserver-php-3.0.0-bz8787-phpmail.patch
23    Patch10: smeserver-php-3.0.0-bz11014.sme-server.target.patch
24    Patch11: smeserver-php-3.0.0-bz11087-webapps.patch
25    Patch12: smeserver-php-3.0.0-bz11092.typo-upload.patch
26    Patch13: smeserver-php-3.0.0-bz11173-bz11015-logging.patch
27    Patch14: smeserver-php-3.0.0-bz11267-ibay-php-version.patch
28    Patch15: smeserver-php-3.0.0-bz11287-fix-event-links.patch
29    Patch16: smeserver-php-3.0.0-bz11325-logging.patch
30    Patch17: smeserver-php-3.0.0-bz11287-pooldir.patch
31    Patch18: smeserver-php-3.0.0-bz11295-addphp80.patch
32    Patch19: smeserver-php-3.0.0-bz11410-sendmail.patch
33    Patch20: smeserver-php-3.0.0-bz11413-php-perl-module.patch
34    Patch21: smeserver-php-3.0.0-bz11401-empty-property-not-honored.patch
35    Patch22: smeserver-php-3.0.0-bz10907-phpfile-exist.patch
36    Patch23: smeserver-php-3.0.0-bz10890-allowphpembdedcode.patch
37    Patch24: smeserver-php-3.0.0-bz11427-timeout.patch
38    Patch25: smeserver-php-3.0.0-bz11411-uniformizePhpProperties.patch
39    Patch26: smeserver-php-3.0.0-bz11412-phptempsdirs.patch
40    Patch27: smeserver-php-3.0.0-bz11452-bz5759.patch
41    Patch28: smeserver-php-3.0.0-bz11422-logging.patch
42    Patch29: smeserver-php-3.0.0-bz11573.patch
43    Patch30: smeserver-php-3.0.0-bz8077-bz11666.patch
44    Patch31: smeserver-php-3.0.0-bz11666-error_reporting.patch
45    Patch32: smeserver-php-3.0.0-bz11717-addphp81.patch
46    
47  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
48  BuildArch: x86_64  BuildArch: x86_64
# Line 27  BuildRequires: e-smith-devtools Line 51  BuildRequires: e-smith-devtools
51  Requires: e-smith-base >= 5.6.0  Requires: e-smith-base >= 5.6.0
52  Provides: e-smith-php = %{version}-%{release}  Provides: e-smith-php = %{version}-%{release}
53  Obsoletes: e-smith-php < %{version}  Obsoletes: e-smith-php < %{version}
54    Provides: smeserver-webapps-common
55    Provides: php(language) = 8.0
56    Provides: php(language) = 7.4
57    Provides: php(language) = 7.3
58    Provides: php(language) = 7.2
59    Provides: php(language) = 7.1
60    Provides: php(language) = 7.0
61  Requires: tmpwatch  Requires: tmpwatch
62  Requires: logrotate  Requires: logrotate
63    
# Line 188  Requires: php74-php-soap Line 218  Requires: php74-php-soap
218  Requires: php74-php-opcache  Requires: php74-php-opcache
219  Requires: php74-php-fpm  Requires: php74-php-fpm
220  Requires: php74-php-mbstring  Requires: php74-php-mbstring
 Requires: php74-php-mysql  
221  Requires: php74-php-json  Requires: php74-php-json
222  Requires: php74-php-bcmath  Requires: php74-php-bcmath
223  Requires: php74-php-intl  Requires: php74-php-intl
# Line 197  Requires: php74-php-process Line 226  Requires: php74-php-process
226  Requires: php74-php-snmp  Requires: php74-php-snmp
227  Requires: php74-php, php74-php-enchant , php74-php-pdo php74-php-tidy ,  php74-php-mysqlnd php74-php-pecl-zip  Requires: php74-php, php74-php-enchant , php74-php-pdo php74-php-tidy ,  php74-php-mysqlnd php74-php-pecl-zip
228    
229    # PHP 8.0
230    Requires: php80-php-cli
231    Requires: php80-php-ldap
232    Requires: php80-php-imap
233    Requires: php80-php-gd
234    Requires: php80-php-xml
235    Requires: php80-php-xmlrpc
236    Requires: php80-php-soap
237    Requires: php80-php-opcache
238    Requires: php80-php-fpm
239    Requires: php80-php-mbstring
240    Requires: php80-php-json
241    Requires: php80-php-bcmath
242    Requires: php80-php-intl
243    Requires: php80-php-pear
244    Requires: php80-php-process
245    Requires: php80-php-snmp
246    Requires: php80-php, php80-php-enchant , php80-php-pdo php80-php-tidy ,  php80-php-mysqlnd php80-php-pecl-zip
247    
248    # PHP 8.1
249    Requires: php81-php-cli
250    Requires: php81-php-ldap
251    Requires: php81-php-imap
252    Requires: php81-php-gd
253    Requires: php81-php-xml
254    Requires: php81-php-xmlrpc
255    Requires: php81-php-soap
256    Requires: php81-php-opcache
257    Requires: php81-php-fpm
258    Requires: php81-php-mbstring
259    Requires: php81-php-json
260    Requires: php81-php-bcmath
261    Requires: php81-php-intl
262    Requires: php81-php-pear
263    Requires: php81-php-process
264    Requires: php81-php-snmp
265    Requires: php81-php, php81-php-enchant , php81-php-pdo php81-php-tidy ,  php81-php-mysqlnd php81-php-pecl-zip
266    
267  %description  %description
268  Manage PHP FPM pools, and switch between PHP versions easily  Manage PHP FPM pools, and switch between PHP versions easily
269    
# Line 211  Manage PHP FPM pools, and switch between Line 278  Manage PHP FPM pools, and switch between
278  %patch6 -p1  %patch6 -p1
279  %patch7 -p1  %patch7 -p1
280  %patch8 -p1  %patch8 -p1
281    %patch9 -p1
282    %patch10 -p1
283    %patch11 -p1
284    %patch12 -p1
285    %patch13 -p1
286    %patch14 -p1
287    %patch15 -p1
288    %patch16 -p1
289    %patch17 -p1
290    %patch18 -p1
291    %patch19 -p1
292    %patch20 -p1
293    %patch21 -p1
294    %patch22 -p1
295    %patch23 -p1
296    %patch24 -p1
297    %patch25 -p1 -F4
298    %patch26 -p1
299    %patch27 -p1
300    %patch28 -p1
301    %patch29 -p1
302    %patch30 -p1
303    %patch31 -p1
304    %patch32 -p1
305    
306  %build  %build
307  perl createlinks  perl createlinks
# Line 221  perl createlinks Line 312  perl createlinks
312  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/
313  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf
314  #enable by default  #enable by default
315  %{__mkdir_p} root/%{_presetdir}  #%{__mkdir_p} root/%{_presetdir}
316  echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset  #echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
317    
318    #drop in systemd file
319    %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d
320    echo "[Install]" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
321    echo "WantedBy=sme-server.target" >> root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
322    
323  for phpver in "55" "56" "70" "71" "72" "73" "74"; do  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
324    for phpver in "55" "56" "70" "71" "72" "73" "74" "80" "81"; do
325  #needed folder  #needed folder
326  %{__mkdir_p} root/var/log/php/php$phpver/  %{__mkdir_p} root/var/log/php/php$phpver/
327  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}
328    
329  #db configuration  #db configuration
330  %{__mkdir_p} root/etc/e-smith/db/configuration/defaults/php$phpver-php-fpm  %{__mkdir_p} root/etc/e-smith/db/configuration/defaults/php$phpver-php-fpm
331    %{__mkdir_p} root/etc/e-smith/db/configuration/defaults/php$phpver
332  echo 'enabled' > root/etc/e-smith/db/configuration/defaults/php$phpver-php-fpm/status  echo 'enabled' > root/etc/e-smith/db/configuration/defaults/php$phpver-php-fpm/status
333  echo 'service'> root/etc/e-smith/db/configuration/defaults/php$phpver-php-fpm/type  echo 'service'> root/etc/e-smith/db/configuration/defaults/php$phpver-php-fpm/type
334    
335  #create service configuration for SME Seerver  echo 'configuration'> root/etc/e-smith/db/configuration/defaults/php$phpver/type
336  #%{__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  
337    
338    #logrotate templates
339    echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"
340    MORE_DATA={ PHP_VERSION => '$phpver'}' > root/etc/e-smith/templates.metadata/etc/logrotate.d/php$phpver-php-fpm
341    
342    #drop in systemd file
343    %{__mkdir_p} root/usr/lib/systemd/system/php$phpver-php-fpm.service.d
344    echo "[Install]" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
345    echo "WantedBy=sme-server.target" >> root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
346    
347  done  done
348    
349  #to add a new php version  #to add a new php version
350  #php5*  #php5*
351  for phpver in  "55" ; do  for phpver in  "55" ; do
352  #cp php56 metadata  #cp php56 metadata
353  cp -a  root/etc/e-smith/templates.metadata/opt/remi/php56 root/etc/e-smith/templates.metadata/opt/remi/php$phpver  mkdir -p  root/etc/e-smith/templates.metadata/opt/remi/php$phpver
354    cp -a  root/etc/e-smith/templates.metadata/opt/remi/php56/* root/etc/e-smith/templates.metadata/opt/remi/php$phpver
355  #sed inplace  #sed inplace
356  find root/etc/e-smith/templates.metadata/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/56/'$phpver'/g'  find root/etc/e-smith/templates.metadata/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/56/'$phpver'/g'
357  done  done
358    
359  # php7*  # php7*
360  for phpver in  "72" "73" "74"; do  for phpver in  "72" "73" "74" "80" "81"; do
361  #cp ph70 metada  #cp ph70 metada
362  cp -a  root/etc/e-smith/templates.metadata/etc/opt/remi/php70 root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver  mkdir -p root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/
363    cp -a  root/etc/e-smith/templates.metadata/etc/opt/remi/php70/* root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/
364  #sed inplace  #sed inplace
365  find root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/70/'$phpver'/g'  find root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/70/'$phpver'/g'
366  done  done
367    
368  # then patch the following files  # then patch the following files
369  #./templates/etc/logrotate.d/php-fpm/php-fpm:      /sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true  ### TODO
370  #./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
371  #./templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults:for VER in php php56 php70 php71; do  #smeserver-php-3.0.0/createlinks
372    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults
373    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm
374    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php # this one could be cut in fragments per version
375    #smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php.ini
376    
377  %install  %install
378  /bin/rm -rf $RPM_BUILD_ROOT  /bin/rm -rf $RPM_BUILD_ROOT
# Line 276  done Line 384  done
384    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \
385    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \
386    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \
387  `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 ` \
388    > %{name}-%{version}-filelist    > %{name}-%{version}-filelist
389    
390    
# Line 295  rm -rf $RPM_BUILD_ROOT Line 403  rm -rf $RPM_BUILD_ROOT
403  %preun  %preun
404    
405  %changelog  %changelog
406    * Mon Dec 20 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-42.sme
407    - fix missing section in php-fpm dropin file [SME: 11814]
408    
409    * Sun Oct 24 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-41.sme
410    - add php81 support [SME: 11717]
411    
412    * Fri Sep 24 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0-40.sme
413    - Fix incorrect commenting for error reporting
414    
415    * Fri Sep 17 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-39.sme
416    - add ErrorReporting and DisplayErrors properties [SME: 8077]
417      only per ibays (php defaults still hardcoded)
418    - fix typo in AllowUrlFopen, was using AllowUrlfOpen for ibays in httpd [SME: 11666]
419    
420    * Wed Jun 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-37.sme
421    - fix typo in 25SSLDirectives fragment for WebAppVirtualHost [SME: 11641]
422    
423    * Thu Jun 03 2021 Terry Fage <tfage@yahoo.com.au> 3.0.0-35.sme
424    - fix syntax error "> - >>" in spec file for systemd drop in [SME: 11612]
425    
426    * Wed Apr 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-34.sme
427    - fix open_basedir for pool missing /var/lib/php/$ibay/ [SME: 11573]
428    
429    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-33.sme
430    - clean rsyslog syntax for php [SME: 11422]
431    
432    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-32.sme
433    - add /usr/share/pear and /usr/share/php to basedir [SME: 5759]
434    - fix last big differences between module setting and fpm [SME: 11452]
435    
436    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-31.sme
437    - move from e-smith-ibays handling of temps dirs [SME: 11412]
438    - improve httpd fragment [SME: 11401]
439    
440    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-30.sme
441    -  uniformize php related properties between ibays and php [SME: 11411]
442       tidy fragments for php-fpm and ibays
443    -  revert patch for timeouts [SME: 11427]
444    
445    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-28.sme
446    - filter non existing php script [SME: 10907]
447    - allow php embded files per ibay using AllowPHTML [SME: 10890]
448    - add timeout property in case of need for long running script [SME: 11427]
449      e.g. upgrade of a wiki
450    
451    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-27.sme
452    - String not honoured as php-fpm but as default [SME: 11401]
453    
454    * Sat Mar 06 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-26.sme
455    - improve sendmail parameter, force sender  [SME: 11410]
456      MailForceSender as property for php versions, ibays and pools
457    - add perl module to help handling fpm version available [SME: 11413]
458    
459    * Mon Feb 22 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-25.sme
460    - add missing default db configuration for php80* [SME: 11378]
461    
462    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-24.sme
463    - allow php-pool-dirs to run from generik event [SME: 11287]
464    - add php80 support [SME: 11295]
465    
466    * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-23.sme
467    - fix php55 logrotate [SME: 11325]
468    - cleanup remove services in sme-server.target.wants [SME: 10956]
469    - remove usr/lib preset file from rpm [SME: 10958]
470    
471    * Fri Dec 25 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-22.sme
472    - add WantedBy=sme-server.target for all php-fpm service files [SME: 11294]
473    
474    * Mon Dec 21 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.21.sme
475    - Fix createlinks typo missing event links [SME: 11287]
476    - Fix typo
477    
478    * Thu Dec 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.20.sme
479    - Fix individual PHP version for ibay [SME: 11267]
480    
481    * Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-19.sme
482    - fix wrong syntax = in place of eq [SME: 11173]
483      thanks to Terry Fage
484    
485    * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-18.sme
486    - fix logrotate error because parent directory has insecure permissions [SME: 11173]
487    
488    * Wed Nov 18 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-17.sme
489    - fix warning: ~ action is deprecated with rsyslog [SME: 11015]
490    - fix logrotate error because parent directory has insecure permissions [SME: 11173]
491    
492    * Mon Nov 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-16.sme
493    - fix typo for upload_tmp_dir [SME: 11092]
494    
495    * Sun Nov 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-15.sme
496    - improve integration of webapps : virtualhost and event [SME: 11087]
497    
498    * Wed Sep 30 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-14.sme
499    - enable php services for sme-server.target [SME: 11014]
500    
501    * Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-13.sme
502    - move and fix link to start services units [SME: 10960]
503    
504    * Fri Mar 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-12.sme
505    - fix typo in  smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch [SME: 10904]
506    
507    * Thu Mar 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-11.sme
508    - help monitoring email sent by php [SME: 8787]
509    
510    * Thu Mar 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-9.sme
511    - move auto_prepend_file from php.ini to php-fpm.d [SME: 10904]
512      add /usr/share/php in open_basedir if dfined to allow execution of auto_prepend_file
513    - fix templates-metadata path fot php 55 72 73 74
514    
515  * Tue Mar 24 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-8.sme  * Tue Mar 24 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-8.sme
516  - transfer SERVER auth variables from httpd server to php-fpm pool [SME: 10904]  - transfer SERVER auth variables from httpd server to php-fpm pool [SME: 10904]
517    this allow easy auth for php app using httpd auth as if using php module    this allow easy auth for php app using httpd auth as if using php module

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed