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

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