/[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.23 by jcrisp, Mon Dec 21 13:28:54 2020 UTC Revision 1.58 by jcrisp, Mon Sep 4 11:05:09 2023 UTC
# Line 1  Line 1 
1  %define version 3.0.0  %define version 3.0.0
2  %define release 21  %define release 47
3  %define name smeserver-php  %define name smeserver-php
4    
5    
# Line 26  Patch12: smeserver-php-3.0.0-bz11092.typ Line 26  Patch12: smeserver-php-3.0.0-bz11092.typ
26  Patch13: smeserver-php-3.0.0-bz11173-bz11015-logging.patch  Patch13: smeserver-php-3.0.0-bz11173-bz11015-logging.patch
27  Patch14: smeserver-php-3.0.0-bz11267-ibay-php-version.patch  Patch14: smeserver-php-3.0.0-bz11267-ibay-php-version.patch
28  Patch15: smeserver-php-3.0.0-bz11287-fix-event-links.patch  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    Patch33: smeserver-php-3.0.0-bz11943-require.patch
47    Patch34: smeserver-php-3.0.0-bz12269.patch
48    Patch35: smeserver-php-3.0.0-bz12303-session.save_handler.patch
49    Patch36: smeserver-php-3.0.0-bz12403-addphp82.patch
50    Patch37: smeserver-php-3.0.0-bz12405-addphp83.patch
51    
52  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
53  BuildArch: x86_64  BuildArch: x86_64
# Line 35  Requires: e-smith-base >= 5.6.0 Line 57  Requires: e-smith-base >= 5.6.0
57  Provides: e-smith-php = %{version}-%{release}  Provides: e-smith-php = %{version}-%{release}
58  Obsoletes: e-smith-php < %{version}  Obsoletes: e-smith-php < %{version}
59  Provides: smeserver-webapps-common  Provides: smeserver-webapps-common
60    Provides: php(language) = 7.0
61    Provides: php(language) = 7.1
62    Provides: php(language) = 7.2
63    Provides: php(language) = 7.3
64    Provides: php(language) = 7.4
65    Provides: php(language) = 8.0
66    Provides: php(language) = 8.1
67    Provides: php(language) = 8.2
68    Provides: php(language) = 8.3
69  Requires: tmpwatch  Requires: tmpwatch
70  Requires: logrotate  Requires: logrotate
71    
# Line 196  Requires: php74-php-soap Line 226  Requires: php74-php-soap
226  Requires: php74-php-opcache  Requires: php74-php-opcache
227  Requires: php74-php-fpm  Requires: php74-php-fpm
228  Requires: php74-php-mbstring  Requires: php74-php-mbstring
 Requires: php74-php-mysql  
229  Requires: php74-php-json  Requires: php74-php-json
230  Requires: php74-php-bcmath  Requires: php74-php-bcmath
231  Requires: php74-php-intl  Requires: php74-php-intl
# Line 205  Requires: php74-php-process Line 234  Requires: php74-php-process
234  Requires: php74-php-snmp  Requires: php74-php-snmp
235  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
236    
237    # PHP 8.0
238    Requires: php80-php-cli
239    Requires: php80-php-ldap
240    Requires: php80-php-imap
241    Requires: php80-php-gd
242    Requires: php80-php-xml
243    Requires: php80-php-xmlrpc
244    Requires: php80-php-soap
245    Requires: php80-php-opcache
246    Requires: php80-php-fpm
247    Requires: php80-php-mbstring
248    Requires: php80-php-json
249    Requires: php80-php-bcmath
250    Requires: php80-php-intl
251    Requires: php80-php-pear
252    Requires: php80-php-process
253    Requires: php80-php-snmp
254    Requires: php80-php, php80-php-enchant , php80-php-pdo php80-php-tidy ,  php80-php-mysqlnd php80-php-pecl-zip
255    
256    # PHP 8.1
257    Requires: php81-php-cli
258    Requires: php81-php-ldap
259    Requires: php81-php-imap
260    Requires: php81-php-gd
261    Requires: php81-php-xml
262    Requires: php81-php-xmlrpc
263    Requires: php81-php-soap
264    Requires: php81-php-opcache
265    Requires: php81-php-fpm
266    Requires: php81-php-mbstring
267    Requires: php81-php-json
268    Requires: php81-php-bcmath
269    Requires: php81-php-intl
270    Requires: php81-php-pear
271    Requires: php81-php-process
272    Requires: php81-php-snmp
273    Requires: php81-php, php81-php-enchant , php81-php-pdo php81-php-tidy ,  php81-php-mysqlnd php81-php-pecl-zip
274    
275    # PHP 8.2
276    Requires: php82-php-cli
277    Requires: php82-php-ldap
278    Requires: php82-php-imap
279    Requires: php82-php-gd
280    Requires: php82-php-xml
281    Requires: php82-php-xmlrpc
282    Requires: php82-php-soap
283    Requires: php82-php-opcache
284    Requires: php82-php-fpm
285    Requires: php82-php-mbstring
286    Requires: php82-php-json
287    Requires: php82-php-bcmath
288    Requires: php82-php-intl
289    Requires: php82-php-pear
290    Requires: php82-php-process
291    Requires: php82-php-snmp
292    Requires: php82-php, php82-php-enchant , php82-php-pdo php82-php-tidy ,  php82-php-mysqlnd php82-php-pecl-zip
293    
294    # PHP 8.3
295    Requires: php83-php-cli
296    Requires: php83-php-ldap
297    Requires: php83-php-imap
298    Requires: php83-php-gd
299    Requires: php83-php-xml
300    Requires: php83-php-xmlrpc
301    Requires: php83-php-soap
302    Requires: php83-php-opcache
303    Requires: php83-php-fpm
304    Requires: php83-php-mbstring
305    Requires: php83-php-json
306    Requires: php83-php-bcmath
307    Requires: php83-php-intl
308    Requires: php83-php-pear
309    Requires: php83-php-process
310    Requires: php83-php-snmp
311    Requires: php83-php, php83-php-enchant , php83-php-pdo php83-php-tidy ,  php83-php-mysqlnd php83-php-pecl-zip
312    
313  %description  %description
314  Manage PHP FPM pools, and switch between PHP versions easily  Manage PHP FPM pools, and switch between PHP versions easily
315    
# Line 226  Manage PHP FPM pools, and switch between Line 331  Manage PHP FPM pools, and switch between
331  %patch13 -p1  %patch13 -p1
332  %patch14 -p1  %patch14 -p1
333  %patch15 -p1  %patch15 -p1
334    %patch16 -p1
335    %patch17 -p1
336    %patch18 -p1
337    %patch19 -p1
338    %patch20 -p1
339    %patch21 -p1
340    %patch22 -p1
341    %patch23 -p1
342    %patch24 -p1
343    %patch25 -p1 -F4
344    %patch26 -p1
345    %patch27 -p1
346    %patch28 -p1
347    %patch29 -p1
348    %patch30 -p1
349    %patch31 -p1
350    %patch32 -p1
351    %patch33 -p1
352    %patch34 -p1
353    %patch35 -p1
354    %patch36 -p1
355    %patch37 -p1
356    
357  %build  %build
358  perl createlinks  perl createlinks
# Line 236  perl createlinks Line 363  perl createlinks
363  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/
364  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf
365  #enable by default  #enable by default
366  %{__mkdir_p} root/%{_presetdir}  #%{__mkdir_p} root/%{_presetdir}
367  echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset  #echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
368    
369    #drop in systemd file
370    %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d
371    echo "[Install]" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
372    echo "WantedBy=sme-server.target" >> root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
373    
374  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
375  for phpver in "55" "56" "70" "71" "72" "73" "74"; do  for phpver in "55" "56" "70" "71" "72" "73" "74" "80" "81" "82" "83"; do
376  #needed folder  #needed folder
377  %{__mkdir_p} root/var/log/php/php$phpver/  %{__mkdir_p} root/var/log/php/php$phpver/
378  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}
379    
380  #db configuration  #db configuration
381  %{__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
382    %{__mkdir_p} root/etc/e-smith/db/configuration/defaults/php$phpver
383  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
384  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
385    
386  #create service configuration for SME Seerver  echo 'configuration'> root/etc/e-smith/db/configuration/defaults/php$phpver/type
387  #%{__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  
388    
389  #logrotate templates  #logrotate templates
390  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"
391  MORE_DATA={ PHP_VERSION => '$phpver'}' > root/etc/e-smith/templates.metadata/etc/logrotate.d/php$phpver-php-fpm  MORE_DATA={ PHP_VERSION => '$phpver'}' > root/etc/e-smith/templates.metadata/etc/logrotate.d/php$phpver-php-fpm
392    
393    #drop in systemd file
394    %{__mkdir_p} root/usr/lib/systemd/system/php$phpver-php-fpm.service.d
395    echo "[Install]" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
396    echo "WantedBy=sme-server.target" >> root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
397    
398  done  done
399    
400  #to add a new php version  #to add a new php version
# Line 274  find root/etc/e-smith/templates.metadata Line 408  find root/etc/e-smith/templates.metadata
408  done  done
409    
410  # php7*  # php7*
411  for phpver in  "72" "73" "74"; do  for phpver in  "72" "73" "74" "80" "81" "82" "83"; do
412  #cp ph70 metada  #cp ph70 metada
413  mkdir -p root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/  mkdir -p root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/
414  cp -a  root/etc/e-smith/templates.metadata/etc/opt/remi/php70/* 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 283  find root/etc/e-smith/templates.metadata Line 417  find root/etc/e-smith/templates.metadata
417  done  done
418    
419  # then patch the following files  # then patch the following files
420  #./templates/etc/logrotate.d/php-fpm/php-fpm:      /sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true  ### TODO
421  #./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
422  #./templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults:for VER in php php56 php70 php71; do  #smeserver-php-3.0.0/createlinks
423    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults
424    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm
425    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php # this one could be cut in fragments per version
426    #smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php.ini
427    
428  %install  %install
429  /bin/rm -rf $RPM_BUILD_ROOT  /bin/rm -rf $RPM_BUILD_ROOT
# Line 298  done Line 435  done
435    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \
436    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \
437    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \
438  `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" "82" "83"; 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 `       \
439    > %{name}-%{version}-filelist    > %{name}-%{version}-filelist
440    
441    
# Line 317  rm -rf $RPM_BUILD_ROOT Line 454  rm -rf $RPM_BUILD_ROOT
454  %preun  %preun
455    
456  %changelog  %changelog
457    * Mon Sep 04 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0-47.sme
458    - Add php83 support [SME:12405]
459    
460    * Sat Aug 26 2023 John Crisp <jcrisp@safeandsoundit.co.uk>  3.0.0-46.sme
461    - fix missing php 81 settings
462    - Add php82 support [SME:12403]
463    
464    * Sat Feb 04 2023 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-45.sme
465    - fix session.save_handler forced without any way to change it [SME: 12303]
466    
467    * Wed Dec 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-44.sme
468    - fix tkt auth not propagated to php pool [SME: 12269]
469    
470    * Sun Apr 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-43.sme
471    - update to httpd 2.4 Require usage [SME: 11943]
472    
473    * Mon Dec 20 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-42.sme
474    - fix missing section in php-fpm dropin file [SME: 11814]
475    
476    * Sun Oct 24 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-41.sme
477    - add php81 support [SME: 11717]
478    
479    * Fri Sep 24 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0-40.sme
480    - Fix incorrect commenting for error reporting
481    
482    * Fri Sep 17 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-39.sme
483    - add ErrorReporting and DisplayErrors properties [SME: 8077]
484      only per ibays (php defaults still hardcoded)
485    - fix typo in AllowUrlFopen, was using AllowUrlfOpen for ibays in httpd [SME: 11666]
486    
487    * Wed Jun 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-37.sme
488    - fix typo in 25SSLDirectives fragment for WebAppVirtualHost [SME: 11641]
489    
490    * Thu Jun 03 2021 Terry Fage <tfage@yahoo.com.au> 3.0.0-35.sme
491    - fix syntax error "> - >>" in spec file for systemd drop in [SME: 11612]
492    
493    * Wed Apr 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-34.sme
494    - fix open_basedir for pool missing /var/lib/php/$ibay/ [SME: 11573]
495    
496    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-33.sme
497    - clean rsyslog syntax for php [SME: 11422]
498    
499    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-32.sme
500    - add /usr/share/pear and /usr/share/php to basedir [SME: 5759]
501    - fix last big differences between module setting and fpm [SME: 11452]
502    
503    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-31.sme
504    - move from e-smith-ibays handling of temps dirs [SME: 11412]
505    - improve httpd fragment [SME: 11401]
506    
507    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-30.sme
508    -  uniformize php related properties between ibays and php [SME: 11411]
509       tidy fragments for php-fpm and ibays
510    -  revert patch for timeouts [SME: 11427]
511    
512    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-28.sme
513    - filter non existing php script [SME: 10907]
514    - allow php embded files per ibay using AllowPHTML [SME: 10890]
515    - add timeout property in case of need for long running script [SME: 11427]
516      e.g. upgrade of a wiki
517    
518    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-27.sme
519    - String not honoured as php-fpm but as default [SME: 11401]
520    
521    * Sat Mar 06 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-26.sme
522    - improve sendmail parameter, force sender  [SME: 11410]
523      MailForceSender as property for php versions, ibays and pools
524    - add perl module to help handling fpm version available [SME: 11413]
525    
526    * Mon Feb 22 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-25.sme
527    - add missing default db configuration for php80* [SME: 11378]
528    
529    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-24.sme
530    - allow php-pool-dirs to run from generik event [SME: 11287]
531    - add php80 support [SME: 11295]
532    
533    * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-23.sme
534    - fix php55 logrotate [SME: 11325]
535    - cleanup remove services in sme-server.target.wants [SME: 10956]
536    - remove usr/lib preset file from rpm [SME: 10958]
537    
538    * Fri Dec 25 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-22.sme
539    - add WantedBy=sme-server.target for all php-fpm service files [SME: 11294]
540    
541  * Mon Dec 21 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.21.sme  * Mon Dec 21 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.21.sme
542  - Fix createlinks typo missing event links [SME: 11287]  - Fix createlinks typo missing event links [SME: 11287]
543  - Fix typo  - Fix typo
# Line 324  rm -rf $RPM_BUILD_ROOT Line 545  rm -rf $RPM_BUILD_ROOT
545  * Thu Dec 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.20.sme  * Thu Dec 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.20.sme
546  - Fix individual PHP version for ibay [SME: 11267]  - Fix individual PHP version for ibay [SME: 11267]
547    
548  * Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-19.sme  * Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com.0.0-19.sme
549  - fix wrong syntax = in place of eq [SME: 11173]  - fix wrong syntax = in place of eq [SME: 11173]
550    thanks to Terry Fage    thanks to Terry Fage
551    

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