/[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.27 by jpp, Sun Feb 21 05:26:31 2021 UTC Revision 1.55 by jpp, Wed Dec 14 07:13:36 2022 UTC
# Line 1  Line 1 
1  %define version 3.0.0  %define version 3.0.0
2  %define release 24  %define release 44
3  %define name smeserver-php  %define name smeserver-php
4    
5    
# Line 28  Patch14: smeserver-php-3.0.0-bz11267-iba Line 28  Patch14: smeserver-php-3.0.0-bz11267-iba
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  Patch16: smeserver-php-3.0.0-bz11325-logging.patch
30  Patch17: smeserver-php-3.0.0-bz11287-pooldir.patch  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    
49  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
50  BuildArch: x86_64  BuildArch: x86_64
# Line 37  Requires: e-smith-base >= 5.6.0 Line 54  Requires: e-smith-base >= 5.6.0
54  Provides: e-smith-php = %{version}-%{release}  Provides: e-smith-php = %{version}-%{release}
55  Obsoletes: e-smith-php < %{version}  Obsoletes: e-smith-php < %{version}
56  Provides: smeserver-webapps-common  Provides: smeserver-webapps-common
57    Provides: php(language) = 8.0
58    Provides: php(language) = 7.4
59    Provides: php(language) = 7.3
60    Provides: php(language) = 7.2
61    Provides: php(language) = 7.1
62    Provides: php(language) = 7.0
63  Requires: tmpwatch  Requires: tmpwatch
64  Requires: logrotate  Requires: logrotate
65    
# Line 198  Requires: php74-php-soap Line 220  Requires: php74-php-soap
220  Requires: php74-php-opcache  Requires: php74-php-opcache
221  Requires: php74-php-fpm  Requires: php74-php-fpm
222  Requires: php74-php-mbstring  Requires: php74-php-mbstring
 Requires: php74-php-mysql  
223  Requires: php74-php-json  Requires: php74-php-json
224  Requires: php74-php-bcmath  Requires: php74-php-bcmath
225  Requires: php74-php-intl  Requires: php74-php-intl
# Line 207  Requires: php74-php-process Line 228  Requires: php74-php-process
228  Requires: php74-php-snmp  Requires: php74-php-snmp
229  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
230    
231    # PHP 8.0
232    Requires: php80-php-cli
233    Requires: php80-php-ldap
234    Requires: php80-php-imap
235    Requires: php80-php-gd
236    Requires: php80-php-xml
237    Requires: php80-php-xmlrpc
238    Requires: php80-php-soap
239    Requires: php80-php-opcache
240    Requires: php80-php-fpm
241    Requires: php80-php-mbstring
242    Requires: php80-php-json
243    Requires: php80-php-bcmath
244    Requires: php80-php-intl
245    Requires: php80-php-pear
246    Requires: php80-php-process
247    Requires: php80-php-snmp
248    Requires: php80-php, php80-php-enchant , php80-php-pdo php80-php-tidy ,  php80-php-mysqlnd php80-php-pecl-zip
249    
250    # PHP 8.1
251    Requires: php81-php-cli
252    Requires: php81-php-ldap
253    Requires: php81-php-imap
254    Requires: php81-php-gd
255    Requires: php81-php-xml
256    Requires: php81-php-xmlrpc
257    Requires: php81-php-soap
258    Requires: php81-php-opcache
259    Requires: php81-php-fpm
260    Requires: php81-php-mbstring
261    Requires: php81-php-json
262    Requires: php81-php-bcmath
263    Requires: php81-php-intl
264    Requires: php81-php-pear
265    Requires: php81-php-process
266    Requires: php81-php-snmp
267    Requires: php81-php, php81-php-enchant , php81-php-pdo php81-php-tidy ,  php81-php-mysqlnd php81-php-pecl-zip
268    
269  %description  %description
270  Manage PHP FPM pools, and switch between PHP versions easily  Manage PHP FPM pools, and switch between PHP versions easily
271    
# Line 230  Manage PHP FPM pools, and switch between Line 289  Manage PHP FPM pools, and switch between
289  %patch15 -p1  %patch15 -p1
290  %patch16 -p1  %patch16 -p1
291  %patch17 -p1  %patch17 -p1
292    %patch18 -p1
293    %patch19 -p1
294    %patch20 -p1
295    %patch21 -p1
296    %patch22 -p1
297    %patch23 -p1
298    %patch24 -p1
299    %patch25 -p1 -F4
300    %patch26 -p1
301    %patch27 -p1
302    %patch28 -p1
303    %patch29 -p1
304    %patch30 -p1
305    %patch31 -p1
306    %patch32 -p1
307    %patch33 -p1
308    %patch34 -p1
309    
310  %build  %build
311  perl createlinks  perl createlinks
# Line 246  perl createlinks Line 322  perl createlinks
322  #drop in systemd file  #drop in systemd file
323  %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d  %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d
324  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
325  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
326    
327  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
328  for phpver in "55" "56" "70" "71" "72" "73" "74"; do  for phpver in "55" "56" "70" "71" "72" "73" "74" "80" "81"; do
329  #needed folder  #needed folder
330  %{__mkdir_p} root/var/log/php/php$phpver/  %{__mkdir_p} root/var/log/php/php$phpver/
331  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}
332    
333  #db configuration  #db configuration
334  %{__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
335    %{__mkdir_p} root/etc/e-smith/db/configuration/defaults/php$phpver
336  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
337  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
338    
339  #create service configuration for SME Seerver  echo 'configuration'> root/etc/e-smith/db/configuration/defaults/php$phpver/type
340  #%{__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  
341    
342  #logrotate templates  #logrotate templates
343  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"
# Line 273  MORE_DATA={ PHP_VERSION => '$phpver'}' > Line 346  MORE_DATA={ PHP_VERSION => '$phpver'}' >
346  #drop in systemd file  #drop in systemd file
347  %{__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
348  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
349  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
350    
351  done  done
352    
# Line 288  find root/etc/e-smith/templates.metadata Line 361  find root/etc/e-smith/templates.metadata
361  done  done
362    
363  # php7*  # php7*
364  for phpver in  "72" "73" "74"; do  for phpver in  "72" "73" "74" "80" "81"; do
365  #cp ph70 metada  #cp ph70 metada
366  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/
367  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 297  find root/etc/e-smith/templates.metadata Line 370  find root/etc/e-smith/templates.metadata
370  done  done
371    
372  # then patch the following files  # then patch the following files
373  #./templates/etc/logrotate.d/php-fpm/php-fpm:      /sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true  ### TODO
374  #./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
375  #./templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults:for VER in php php56 php70 php71; do  #smeserver-php-3.0.0/createlinks
376    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults
377    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm
378    #smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php # this one could be cut in fragments per version
379    #smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php.ini
380    
381  %install  %install
382  /bin/rm -rf $RPM_BUILD_ROOT  /bin/rm -rf $RPM_BUILD_ROOT
# Line 312  done Line 388  done
388    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \
389    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \
390    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \
391  `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 ` \
392    > %{name}-%{version}-filelist    > %{name}-%{version}-filelist
393    
394    
# Line 331  rm -rf $RPM_BUILD_ROOT Line 407  rm -rf $RPM_BUILD_ROOT
407  %preun  %preun
408    
409  %changelog  %changelog
410    * Wed Dec 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-44.sme
411    - fix tkt auth not propagated to php pool [SME: 12269]
412    
413    * Sun Apr 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-43.sme
414    - update to httpd 2.4 Require usage [SME: 11943]
415    
416    * Mon Dec 20 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-42.sme
417    - fix missing section in php-fpm dropin file [SME: 11814]
418    
419    * Sun Oct 24 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-41.sme
420    - add php81 support [SME: 11717]
421    
422    * Fri Sep 24 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0-40.sme
423    - Fix incorrect commenting for error reporting
424    
425    * Fri Sep 17 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-39.sme
426    - add ErrorReporting and DisplayErrors properties [SME: 8077]
427      only per ibays (php defaults still hardcoded)
428    - fix typo in AllowUrlFopen, was using AllowUrlfOpen for ibays in httpd [SME: 11666]
429    
430    * Wed Jun 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-37.sme
431    - fix typo in 25SSLDirectives fragment for WebAppVirtualHost [SME: 11641]
432    
433    * Thu Jun 03 2021 Terry Fage <tfage@yahoo.com.au> 3.0.0-35.sme
434    - fix syntax error "> - >>" in spec file for systemd drop in [SME: 11612]
435    
436    * Wed Apr 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-34.sme
437    - fix open_basedir for pool missing /var/lib/php/$ibay/ [SME: 11573]
438    
439    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-33.sme
440    - clean rsyslog syntax for php [SME: 11422]
441    
442    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-32.sme
443    - add /usr/share/pear and /usr/share/php to basedir [SME: 5759]
444    - fix last big differences between module setting and fpm [SME: 11452]
445    
446    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-31.sme
447    - move from e-smith-ibays handling of temps dirs [SME: 11412]
448    - improve httpd fragment [SME: 11401]
449    
450    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-30.sme
451    -  uniformize php related properties between ibays and php [SME: 11411]
452       tidy fragments for php-fpm and ibays
453    -  revert patch for timeouts [SME: 11427]
454    
455    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-28.sme
456    - filter non existing php script [SME: 10907]
457    - allow php embded files per ibay using AllowPHTML [SME: 10890]
458    - add timeout property in case of need for long running script [SME: 11427]
459      e.g. upgrade of a wiki
460    
461    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-27.sme
462    - String not honoured as php-fpm but as default [SME: 11401]
463    
464    * Sat Mar 06 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-26.sme
465    - improve sendmail parameter, force sender  [SME: 11410]
466      MailForceSender as property for php versions, ibays and pools
467    - add perl module to help handling fpm version available [SME: 11413]
468    
469    * Mon Feb 22 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-25.sme
470    - add missing default db configuration for php80* [SME: 11378]
471    
472  * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-24.sme  * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-24.sme
473  - allow php-pool-dirs to run from generik event [SME: 11287]  - allow php-pool-dirs to run from generik event [SME: 11287]
474    - add php80 support [SME: 11295]
475    
476  * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-23.sme  * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-23.sme
477  - fix php55 logrotate [SME: 11325]  - fix php55 logrotate [SME: 11325]

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