/[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.22 by jcrisp, Thu Dec 17 23:00:34 2020 UTC Revision 1.36 by jpp, Mon Mar 8 07:36:02 2021 UTC
# Line 1  Line 1 
1  %define version 3.0.0  %define version 3.0.0
2  %define release 20  %define release 28
3  %define name smeserver-php  %define name smeserver-php
4    
5    
# Line 25  Patch11: smeserver-php-3.0.0-bz11087-web Line 25  Patch11: smeserver-php-3.0.0-bz11087-web
25  Patch12: smeserver-php-3.0.0-bz11092.typo-upload.patch  Patch12: smeserver-php-3.0.0-bz11092.typo-upload.patch
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
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    
39  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
40  BuildArch: x86_64  BuildArch: x86_64
# Line 34  Requires: e-smith-base >= 5.6.0 Line 44  Requires: e-smith-base >= 5.6.0
44  Provides: e-smith-php = %{version}-%{release}  Provides: e-smith-php = %{version}-%{release}
45  Obsoletes: e-smith-php < %{version}  Obsoletes: e-smith-php < %{version}
46  Provides: smeserver-webapps-common  Provides: smeserver-webapps-common
47    Provides: php(language) = 8.0
48    Provides: php(language) = 7.4
49    Provides: php(language) = 7.3
50    Provides: php(language) = 7.2
51    Provides: php(language) = 7.1
52    Provides: php(language) = 7.0
53  Requires: tmpwatch  Requires: tmpwatch
54  Requires: logrotate  Requires: logrotate
55    
# Line 195  Requires: php74-php-soap Line 210  Requires: php74-php-soap
210  Requires: php74-php-opcache  Requires: php74-php-opcache
211  Requires: php74-php-fpm  Requires: php74-php-fpm
212  Requires: php74-php-mbstring  Requires: php74-php-mbstring
 Requires: php74-php-mysql  
213  Requires: php74-php-json  Requires: php74-php-json
214  Requires: php74-php-bcmath  Requires: php74-php-bcmath
215  Requires: php74-php-intl  Requires: php74-php-intl
# Line 204  Requires: php74-php-process Line 218  Requires: php74-php-process
218  Requires: php74-php-snmp  Requires: php74-php-snmp
219  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
220    
221    # PHP 8.0
222    Requires: php80-php-cli
223    Requires: php80-php-ldap
224    Requires: php80-php-imap
225    Requires: php80-php-gd
226    Requires: php80-php-xml
227    Requires: php80-php-xmlrpc
228    Requires: php80-php-soap
229    Requires: php80-php-opcache
230    Requires: php80-php-fpm
231    Requires: php80-php-mbstring
232    Requires: php80-php-json
233    Requires: php80-php-bcmath
234    Requires: php80-php-intl
235    Requires: php80-php-pear
236    Requires: php80-php-process
237    Requires: php80-php-snmp
238    Requires: php80-php, php80-php-enchant , php80-php-pdo php80-php-tidy ,  php80-php-mysqlnd php80-php-pecl-zip
239    
240  %description  %description
241  Manage PHP FPM pools, and switch between PHP versions easily  Manage PHP FPM pools, and switch between PHP versions easily
242    
# Line 224  Manage PHP FPM pools, and switch between Line 257  Manage PHP FPM pools, and switch between
257  %patch12 -p1  %patch12 -p1
258  %patch13 -p1  %patch13 -p1
259  %patch14 -p1  %patch14 -p1
260    %patch15 -p1
261    %patch16 -p1
262    %patch17 -p1
263    %patch18 -p1
264    %patch19 -p1
265    %patch20 -p1
266    %patch21 -p1
267    %patch22 -p1
268    %patch23 -p1
269    %patch24 -p1
270    
271  %build  %build
272  perl createlinks  perl createlinks
# Line 234  perl createlinks Line 277  perl createlinks
277  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/
278  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf
279  #enable by default  #enable by default
280  %{__mkdir_p} root/%{_presetdir}  #%{__mkdir_p} root/%{_presetdir}
281  echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset  #echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
282    
283    #drop in systemd file
284    %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d
285    echo "[Install]" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
286    echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
287    
288  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/  %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
289  for phpver in "55" "56" "70" "71" "72" "73" "74"; do  for phpver in "55" "56" "70" "71" "72" "73" "74" "80"; do
290  #needed folder  #needed folder
291  %{__mkdir_p} root/var/log/php/php$phpver/  %{__mkdir_p} root/var/log/php/php$phpver/
292  %{__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 252  echo 'service'> root/etc/e-smith/db/conf Line 300  echo 'service'> root/etc/e-smith/db/conf
300  #%{__mkdir_p} root/%{_unitdir}/php$phpver-php-fpm.service.d/  #%{__mkdir_p} root/%{_unitdir}/php$phpver-php-fpm.service.d/
301  #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
302    
303  #enable by default php fpm  ##enable by default php fpm
304  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
305    
306  #logrotate templates  #logrotate templates
307  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"  echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"
308  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
309    
310    #drop in systemd file
311    %{__mkdir_p} root/usr/lib/systemd/system/php$phpver-php-fpm.service.d
312    echo "[Install]" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
313    echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
314    
315  done  done
316    
317  #to add a new php version  #to add a new php version
# Line 272  find root/etc/e-smith/templates.metadata Line 325  find root/etc/e-smith/templates.metadata
325  done  done
326    
327  # php7*  # php7*
328  for phpver in  "72" "73" "74"; do  for phpver in  "72" "73" "74" "80"; do
329  #cp ph70 metada  #cp ph70 metada
330  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/
331  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 296  done Line 349  done
349    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \    --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \
350    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \
351    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \    --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \
352  `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 `      \
353    > %{name}-%{version}-filelist    > %{name}-%{version}-filelist
354    
355    
# Line 315  rm -rf $RPM_BUILD_ROOT Line 368  rm -rf $RPM_BUILD_ROOT
368  %preun  %preun
369    
370  %changelog  %changelog
371    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-28.sme
372    - filter non existing php script [SME: 10907]
373    - allow php embded files per ibay using AllowPHTML [SME: 10890]
374    - add timeout property in case of need for long running script [SME: 11427]
375      e.g. upgrade of a wiki
376    
377    * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-27.sme
378    - String not honoured as php-fpm but as default [SME: 11401]
379    
380    * Sat Mar 06 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-26.sme
381    - improve sendmail parameter, force sender  [SME: 11410]
382      MailForceSender as property for php versions, ibays and pools
383    - add perl module to help handling fpm version available [SME: 11413]
384    
385    * Mon Feb 22 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-25.sme
386    - add missing default db configuration for php80* [SME: 11378]
387    
388    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-24.sme
389    - allow php-pool-dirs to run from generik event [SME: 11287]
390    - add php80 support [SME: 11295]
391    
392    * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-23.sme
393    - fix php55 logrotate [SME: 11325]
394    - cleanup remove services in sme-server.target.wants [SME: 10956]
395    - remove usr/lib preset file from rpm [SME: 10958]
396    
397    * Fri Dec 25 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-22.sme
398    - add WantedBy=sme-server.target for all php-fpm service files [SME: 11294]
399    
400    * Mon Dec 21 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.21.sme
401    - Fix createlinks typo missing event links [SME: 11287]
402    - Fix typo
403    
404  * 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
405  - Fix individual PHP version for ibay [SME: 11267]  - Fix individual PHP version for ibay [SME: 11267]
406    


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