/[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.34 by jpp, Mon Mar 8 06:54:18 2021 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 28  %define release 42
3  %define name smeserver-php  %define name smeserver-php
4    
5    
# Line 33  Patch19: smeserver-php-3.0.0-bz11410-sen Line 33  Patch19: smeserver-php-3.0.0-bz11410-sen
33  Patch20: smeserver-php-3.0.0-bz11413-php-perl-module.patch  Patch20: smeserver-php-3.0.0-bz11413-php-perl-module.patch
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
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 235  Requires: php80-php-process Line 245  Requires: php80-php-process
245  Requires: php80-php-snmp  Requires: php80-php-snmp
246  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
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 263  Manage PHP FPM pools, and switch between Line 292  Manage PHP FPM pools, and switch between
292  %patch20 -p1  %patch20 -p1
293  %patch21 -p1  %patch21 -p1
294  %patch22 -p1  %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 279  perl createlinks Line 318  perl createlinks
318  #drop in systemd file  #drop in systemd file
319  %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d  %{__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  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  echo "WantedBy=sme-server.target" >> root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
322    
323  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
324  for phpver in "55" "56" "70" "71" "72" "73" "74" "80"; do  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  #logrotate templates
339  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"
# Line 306  MORE_DATA={ PHP_VERSION => '$phpver'}' > Line 342  MORE_DATA={ PHP_VERSION => '$phpver'}' >
342  #drop in systemd file  #drop in systemd file
343  %{__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
344  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
345  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
346    
347  done  done
348    
# Line 321  find root/etc/e-smith/templates.metadata Line 357  find root/etc/e-smith/templates.metadata
357  done  done
358    
359  # php7*  # php7*
360  for phpver in  "72" "73" "74" "80"; do  for phpver in  "72" "73" "74" "80" "81"; do
361  #cp ph70 metada  #cp ph70 metada
362  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/
363  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 330  find root/etc/e-smith/templates.metadata Line 366  find root/etc/e-smith/templates.metadata
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 345  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" "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"; 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 364  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  * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-28.sme
446  - filter non existing php script [SME: 10907]  - 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  * 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]  - 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