/[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.25 by jpp, Fri Dec 25 20:51:08 2020 UTC Revision 1.50 by jcrisp, Fri Sep 24 12:58:18 2021 UTC
# Line 1  Line 1 
1  %define version 3.0.0  %define version 3.0.0
2  %define release 22  %define release 40
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    
46  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
47  BuildArch: x86_64  BuildArch: x86_64
# Line 35  Requires: e-smith-base >= 5.6.0 Line 51  Requires: e-smith-base >= 5.6.0
51  Provides: e-smith-php = %{version}-%{release}  Provides: e-smith-php = %{version}-%{release}
52  Obsoletes: e-smith-php < %{version}  Obsoletes: e-smith-php < %{version}
53  Provides: smeserver-webapps-common  Provides: smeserver-webapps-common
54    Provides: php(language) = 8.0
55    Provides: php(language) = 7.4
56    Provides: php(language) = 7.3
57    Provides: php(language) = 7.2
58    Provides: php(language) = 7.1
59    Provides: php(language) = 7.0
60  Requires: tmpwatch  Requires: tmpwatch
61  Requires: logrotate  Requires: logrotate
62    
# Line 196  Requires: php74-php-soap Line 217  Requires: php74-php-soap
217  Requires: php74-php-opcache  Requires: php74-php-opcache
218  Requires: php74-php-fpm  Requires: php74-php-fpm
219  Requires: php74-php-mbstring  Requires: php74-php-mbstring
 Requires: php74-php-mysql  
220  Requires: php74-php-json  Requires: php74-php-json
221  Requires: php74-php-bcmath  Requires: php74-php-bcmath
222  Requires: php74-php-intl  Requires: php74-php-intl
# Line 205  Requires: php74-php-process Line 225  Requires: php74-php-process
225  Requires: php74-php-snmp  Requires: php74-php-snmp
226  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
227    
228    # PHP 8.0
229    Requires: php80-php-cli
230    Requires: php80-php-ldap
231    Requires: php80-php-imap
232    Requires: php80-php-gd
233    Requires: php80-php-xml
234    Requires: php80-php-xmlrpc
235    Requires: php80-php-soap
236    Requires: php80-php-opcache
237    Requires: php80-php-fpm
238    Requires: php80-php-mbstring
239    Requires: php80-php-json
240    Requires: php80-php-bcmath
241    Requires: php80-php-intl
242    Requires: php80-php-pear
243    Requires: php80-php-process
244    Requires: php80-php-snmp
245    Requires: php80-php, php80-php-enchant , php80-php-pdo php80-php-tidy ,  php80-php-mysqlnd php80-php-pecl-zip
246    
247  %description  %description
248  Manage PHP FPM pools, and switch between PHP versions easily  Manage PHP FPM pools, and switch between PHP versions easily
249    
# Line 226  Manage PHP FPM pools, and switch between Line 265  Manage PHP FPM pools, and switch between
265  %patch13 -p1  %patch13 -p1
266  %patch14 -p1  %patch14 -p1
267  %patch15 -p1  %patch15 -p1
268    %patch16 -p1
269    %patch17 -p1
270    %patch18 -p1
271    %patch19 -p1
272    %patch20 -p1
273    %patch21 -p1
274    %patch22 -p1
275    %patch23 -p1
276    %patch24 -p1
277    %patch25 -p1 -F4
278    %patch26 -p1
279    %patch27 -p1
280    %patch28 -p1
281    %patch29 -p1
282    %patch30 -p1
283    %patch31 -p1
284    
285  %build  %build
286  perl createlinks  perl createlinks
# Line 236  perl createlinks Line 291  perl createlinks
291  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/
292  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf
293  #enable by default  #enable by default
294  %{__mkdir_p} root/%{_presetdir}  #%{__mkdir_p} root/%{_presetdir}
295  echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset  #echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
296    
297  #drop in systemd file  #drop in systemd file
298  %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d  %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d
# Line 245  echo "[Install]" > root/usr/lib/systemd/ Line 300  echo "[Install]" > root/usr/lib/systemd/
300  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
301    
302  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
303  for phpver in "55" "56" "70" "71" "72" "73" "74"; do  for phpver in "55" "56" "70" "71" "72" "73" "74" "80"; do
304  #needed folder  #needed folder
305  %{__mkdir_p} root/var/log/php/php$phpver/  %{__mkdir_p} root/var/log/php/php$phpver/
306  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}  %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}
# Line 259  echo 'service'> root/etc/e-smith/db/conf Line 314  echo 'service'> root/etc/e-smith/db/conf
314  #%{__mkdir_p} root/%{_unitdir}/php$phpver-php-fpm.service.d/  #%{__mkdir_p} root/%{_unitdir}/php$phpver-php-fpm.service.d/
315  #echo '' >  root/%{_unitdir}/php$phpver-php-fpm.service.d/php$phpver-php-fpm.conf  #echo '' >  root/%{_unitdir}/php$phpver-php-fpm.service.d/php$phpver-php-fpm.conf
316    
317  #enable by default php fpm  ##enable by default php fpm
318  echo 'enable php'$phpver'-php-fpm.service' >>root/%{_presetdir}/80-koozali-php.preset  #echo 'enable php'$phpver'-php-fpm.service' >>root/%{_presetdir}/80-koozali-php.preset
319    
320  #logrotate templates  #logrotate templates
321  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"
# Line 269  MORE_DATA={ PHP_VERSION => '$phpver'}' > Line 324  MORE_DATA={ PHP_VERSION => '$phpver'}' >
324  #drop in systemd file  #drop in systemd file
325  %{__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
326  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
327  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
328    
329  done  done
330    
# Line 284  find root/etc/e-smith/templates.metadata Line 339  find root/etc/e-smith/templates.metadata
339  done  done
340    
341  # php7*  # php7*
342  for phpver in  "72" "73" "74"; do  for phpver in  "72" "73" "74" "80"; do
343  #cp ph70 metada  #cp ph70 metada
344  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/
345  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 308  done Line 363  done
363    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \
364    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \
365    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \
366  `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"; 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 `      \
367    > %{name}-%{version}-filelist    > %{name}-%{version}-filelist
368    
369    
# Line 327  rm -rf $RPM_BUILD_ROOT Line 382  rm -rf $RPM_BUILD_ROOT
382  %preun  %preun
383    
384  %changelog  %changelog
385    * Fri Sep 24 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0-40.sme
386    - Fix incorrect commenting for error reporting
387    
388    * Fri Sep 17 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-39.sme
389    - add ErrorReporting and DisplayErrors properties [SME: 8077]
390      only per ibays (php defaults still hardcoded)
391    - fix typo in AllowUrlFopen, was using AllowUrlfOpen for ibays in httpd [SME: 11666]
392    
393    * Wed Jun 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-37.sme
394    - fix typo in 25SSLDirectives fragment for WebAppVirtualHost [SME: 11641]
395    
396    * Thu Jun 03 2021 Terry Fage <tfage@yahoo.com.au> 3.0.0-35.sme
397    - fix syntax error "> - >>" in spec file for systemd drop in [SME: 11612]
398    
399    * Wed Apr 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-34.sme
400    - fix open_basedir for pool missing /var/lib/php/$ibay/ [SME: 11573]
401    
402    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-33.sme
403    - clean rsyslog syntax for php [SME: 11422]
404    
405    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-32.sme
406    - add /usr/share/pear and /usr/share/php to basedir [SME: 5759]
407    - fix last big differences between module setting and fpm [SME: 11452]
408    
409    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-31.sme
410    - move from e-smith-ibays handling of temps dirs [SME: 11412]
411    - improve httpd fragment [SME: 11401]
412    
413    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-30.sme
414    -  uniformize php related properties between ibays and php [SME: 11411]
415       tidy fragments for php-fpm and ibays
416    -  revert patch for timeouts [SME: 11427]
417    
418    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-28.sme
419    - filter non existing php script [SME: 10907]
420    - allow php embded files per ibay using AllowPHTML [SME: 10890]
421    - add timeout property in case of need for long running script [SME: 11427]
422      e.g. upgrade of a wiki
423    
424    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-27.sme
425    - String not honoured as php-fpm but as default [SME: 11401]
426    
427    * Sat Mar 06 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-26.sme
428    - improve sendmail parameter, force sender  [SME: 11410]
429      MailForceSender as property for php versions, ibays and pools
430    - add perl module to help handling fpm version available [SME: 11413]
431    
432    * Mon Feb 22 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-25.sme
433    - add missing default db configuration for php80* [SME: 11378]
434    
435    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-24.sme
436    - allow php-pool-dirs to run from generik event [SME: 11287]
437    - add php80 support [SME: 11295]
438    
439    * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-23.sme
440    - fix php55 logrotate [SME: 11325]
441    - cleanup remove services in sme-server.target.wants [SME: 10956]
442    - remove usr/lib preset file from rpm [SME: 10958]
443    
444  * Fri Dec 25 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-22.sme  * Fri Dec 25 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-22.sme
445  - add WantedBy=sme-server.target for all php-fpm service files [SME: 11294]  - add WantedBy=sme-server.target for all php-fpm service files [SME: 11294]
446    

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