/[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.35 by jpp, Mon Mar 8 07:20:02 2021 UTC Revision 1.57 by jcrisp, Sat Aug 26 10:17:59 2023 UTC
# Line 1  Line 1 
1  %define version 3.0.0  %define version 3.0.0
2  %define release 28  %define release 46
3  %define name smeserver-php  %define name smeserver-php
4    
5    
# Line 34  Patch20: smeserver-php-3.0.0-bz11413-php Line 34  Patch20: smeserver-php-3.0.0-bz11413-php
34  Patch21: smeserver-php-3.0.0-bz11401-empty-property-not-honored.patch  Patch21: smeserver-php-3.0.0-bz11401-empty-property-not-honored.patch
35  Patch22: smeserver-php-3.0.0-bz10907-phpfile-exist.patch  Patch22: smeserver-php-3.0.0-bz10907-phpfile-exist.patch
36  Patch23: smeserver-php-3.0.0-bz10890-allowphpembdedcode.patch  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    
51  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
52  BuildArch: x86_64  BuildArch: x86_64
# Line 43  Requires: e-smith-base >= 5.6.0 Line 56  Requires: e-smith-base >= 5.6.0
56  Provides: e-smith-php = %{version}-%{release}  Provides: e-smith-php = %{version}-%{release}
57  Obsoletes: e-smith-php < %{version}  Obsoletes: e-smith-php < %{version}
58  Provides: smeserver-webapps-common  Provides: smeserver-webapps-common
59    Provides: php(language) = 8.2
60    Provides: php(language) = 8.1
61  Provides: php(language) = 8.0  Provides: php(language) = 8.0
62  Provides: php(language) = 7.4  Provides: php(language) = 7.4
63  Provides: php(language) = 7.3  Provides: php(language) = 7.3
# Line 236  Requires: php80-php-process Line 251  Requires: php80-php-process
251  Requires: php80-php-snmp  Requires: php80-php-snmp
252  Requires: php80-php, php80-php-enchant , php80-php-pdo php80-php-tidy ,  php80-php-mysqlnd php80-php-pecl-zip  Requires: php80-php, php80-php-enchant , php80-php-pdo php80-php-tidy ,  php80-php-mysqlnd php80-php-pecl-zip
253    
254    # PHP 8.1
255    Requires: php81-php-cli
256    Requires: php81-php-ldap
257    Requires: php81-php-imap
258    Requires: php81-php-gd
259    Requires: php81-php-xml
260    Requires: php81-php-xmlrpc
261    Requires: php81-php-soap
262    Requires: php81-php-opcache
263    Requires: php81-php-fpm
264    Requires: php81-php-mbstring
265    Requires: php81-php-json
266    Requires: php81-php-bcmath
267    Requires: php81-php-intl
268    Requires: php81-php-pear
269    Requires: php81-php-process
270    Requires: php81-php-snmp
271    Requires: php81-php, php81-php-enchant , php81-php-pdo php81-php-tidy ,  php81-php-mysqlnd php81-php-pecl-zip
272    
273    # PHP 8.2
274    Requires: php82-php-cli
275    Requires: php82-php-ldap
276    Requires: php82-php-imap
277    Requires: php82-php-gd
278    Requires: php82-php-xml
279    Requires: php82-php-xmlrpc
280    Requires: php82-php-soap
281    Requires: php82-php-opcache
282    Requires: php82-php-fpm
283    Requires: php82-php-mbstring
284    Requires: php82-php-json
285    Requires: php82-php-bcmath
286    Requires: php82-php-intl
287    Requires: php82-php-pear
288    Requires: php82-php-process
289    Requires: php82-php-snmp
290    Requires: php82-php, php82-php-enchant , php82-php-pdo php82-php-tidy ,  php82-php-mysqlnd php82-php-pecl-zip
291    
292    
293  %description  %description
294  Manage PHP FPM pools, and switch between PHP versions easily  Manage PHP FPM pools, and switch between PHP versions easily
295    
# Line 265  Manage PHP FPM pools, and switch between Line 319  Manage PHP FPM pools, and switch between
319  %patch21 -p1  %patch21 -p1
320  %patch22 -p1  %patch22 -p1
321  %patch23 -p1  %patch23 -p1
322    %patch24 -p1
323    %patch25 -p1 -F4
324    %patch26 -p1
325    %patch27 -p1
326    %patch28 -p1
327    %patch29 -p1
328    %patch30 -p1
329    %patch31 -p1
330    %patch32 -p1
331    %patch33 -p1
332    %patch34 -p1
333    %patch35 -p1
334    %patch36 -p1
335    
336  %build  %build
337  perl createlinks  perl createlinks
# Line 281  perl createlinks Line 348  perl createlinks
348  #drop in systemd file  #drop in systemd file
349  %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d  %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d
350  echo "[Install]" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf  echo "[Install]" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
351  echo "WantedBy=sme-server.target" > 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
352    
353  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
354  for phpver in "55" "56" "70" "71" "72" "73" "74" "80"; do  for phpver in "55" "56" "70" "71" "72" "73" "74" "80" "81" "82"; do
355  #needed folder  #needed folder
356  %{__mkdir_p} root/var/log/php/php$phpver/  %{__mkdir_p} root/var/log/php/php$phpver/
357  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}
358    
359  #db configuration  #db configuration
360  %{__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
361    %{__mkdir_p} root/etc/e-smith/db/configuration/defaults/php$phpver
362  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
363  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
364    
365  #create service configuration for SME Seerver  echo 'configuration'> root/etc/e-smith/db/configuration/defaults/php$phpver/type
366  #%{__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  
367    
368  #logrotate templates  #logrotate templates
369  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"
# Line 308  MORE_DATA={ PHP_VERSION => '$phpver'}' > Line 372  MORE_DATA={ PHP_VERSION => '$phpver'}' >
372  #drop in systemd file  #drop in systemd file
373  %{__mkdir_p} root/usr/lib/systemd/system/php$phpver-php-fpm.service.d  %{__mkdir_p} root/usr/lib/systemd/system/php$phpver-php-fpm.service.d
374  echo "[Install]" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf  echo "[Install]" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
375  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
376    
377  done  done
378    
# Line 323  find root/etc/e-smith/templates.metadata Line 387  find root/etc/e-smith/templates.metadata
387  done  done
388    
389  # php7*  # php7*
390  for phpver in  "72" "73" "74" "80"; do  for phpver in  "72" "73" "74" "80" "81" "82"; do
391  #cp ph70 metada  #cp ph70 metada
392  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/
393  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 332  find root/etc/e-smith/templates.metadata Line 396  find root/etc/e-smith/templates.metadata
396  done  done
397    
398  # then patch the following files  # then patch the following files
399  #./templates/etc/logrotate.d/php-fpm/php-fpm:      /sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true  ### TODO
400  #./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
401  #./templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults:for VER in php php56 php70 php71; do  #smeserver-php-3.0.0/createlinks
402    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults
403    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm
404    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php # this one could be cut in fragments per version
405    #smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php.ini
406    
407  %install  %install
408  /bin/rm -rf $RPM_BUILD_ROOT  /bin/rm -rf $RPM_BUILD_ROOT
# Line 347  done Line 414  done
414    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \
415    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \
416    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \
417  `for phpver in "54" "55" "56" "70" "71" "72" "73" "74" "80"; 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"; 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 `    \
418    > %{name}-%{version}-filelist    > %{name}-%{version}-filelist
419    
420    
# Line 366  rm -rf $RPM_BUILD_ROOT Line 433  rm -rf $RPM_BUILD_ROOT
433  %preun  %preun
434    
435  %changelog  %changelog
436    * Sat Aug 26 2023 John Crisp <jcrisp@safeandsoundit.co.uk>  3.0.0-46.sme
437    - fix missing php 81 settings
438    - Add php82 support [SME:12403]
439    
440    * Sat Feb 04 2023 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-45.sme
441    - fix session.save_handler forced without any way to change it [SME: 12303]
442    
443    * Wed Dec 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-44.sme
444    - fix tkt auth not propagated to php pool [SME: 12269]
445    
446    * Sun Apr 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-43.sme
447    - update to httpd 2.4 Require usage [SME: 11943]
448    
449    * Mon Dec 20 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-42.sme
450    - fix missing section in php-fpm dropin file [SME: 11814]
451    
452    * Sun Oct 24 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-41.sme
453    - add php81 support [SME: 11717]
454    
455    * Fri Sep 24 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0-40.sme
456    - Fix incorrect commenting for error reporting
457    
458    * Fri Sep 17 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-39.sme
459    - add ErrorReporting and DisplayErrors properties [SME: 8077]
460      only per ibays (php defaults still hardcoded)
461    - fix typo in AllowUrlFopen, was using AllowUrlfOpen for ibays in httpd [SME: 11666]
462    
463    * Wed Jun 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-37.sme
464    - fix typo in 25SSLDirectives fragment for WebAppVirtualHost [SME: 11641]
465    
466    * Thu Jun 03 2021 Terry Fage <tfage@yahoo.com.au> 3.0.0-35.sme
467    - fix syntax error "> - >>" in spec file for systemd drop in [SME: 11612]
468    
469    * Wed Apr 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-34.sme
470    - fix open_basedir for pool missing /var/lib/php/$ibay/ [SME: 11573]
471    
472    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-33.sme
473    - clean rsyslog syntax for php [SME: 11422]
474    
475    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-32.sme
476    - add /usr/share/pear and /usr/share/php to basedir [SME: 5759]
477    - fix last big differences between module setting and fpm [SME: 11452]
478    
479    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-31.sme
480    - move from e-smith-ibays handling of temps dirs [SME: 11412]
481    - improve httpd fragment [SME: 11401]
482    
483    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-30.sme
484    -  uniformize php related properties between ibays and php [SME: 11411]
485       tidy fragments for php-fpm and ibays
486    -  revert patch for timeouts [SME: 11427]
487    
488  * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-28.sme  * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-28.sme
489  - filter non existing php script [SME: 10907]  - filter non existing php script [SME: 10907]
490  - allow php embded files per ibay using AllowPHTML [SME: 10890]  - allow php embded files per ibay using AllowPHTML [SME: 10890]
491    - add timeout property in case of need for long running script [SME: 11427]
492      e.g. upgrade of a wiki
493    
494  * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-27.sme  * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-27.sme
495  - String not honoured as php-fpm but as default [SME: 11401]  - String not honoured as php-fpm but as default [SME: 11401]

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