--- rpms/smeserver-php/sme10/smeserver-php.spec	2022/12/14 07:13:36	1.55
+++ rpms/smeserver-php/sme10/smeserver-php.spec	2023/08/26 10:17:59	1.57
@@ -1,5 +1,5 @@
 %define version 3.0.0
-%define release 44
+%define release 46
 %define name smeserver-php
 
 
@@ -45,6 +45,8 @@ Patch31: smeserver-php-3.0.0-bz11666-err
 Patch32: smeserver-php-3.0.0-bz11717-addphp81.patch
 Patch33: smeserver-php-3.0.0-bz11943-require.patch
 Patch34: smeserver-php-3.0.0-bz12269.patch
+Patch35: smeserver-php-3.0.0-bz12303-session.save_handler.patch
+Patch36: smeserver-php-3.0.0-bz12403-addphp82.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: x86_64
@@ -54,6 +56,8 @@ Requires: e-smith-base >= 5.6.0
 Provides: e-smith-php = %{version}-%{release}
 Obsoletes: e-smith-php < %{version}
 Provides: smeserver-webapps-common
+Provides: php(language) = 8.2
+Provides: php(language) = 8.1
 Provides: php(language) = 8.0
 Provides: php(language) = 7.4
 Provides: php(language) = 7.3
@@ -266,6 +270,26 @@ Requires: php81-php-process
 Requires: php81-php-snmp
 Requires: php81-php, php81-php-enchant , php81-php-pdo php81-php-tidy ,  php81-php-mysqlnd php81-php-pecl-zip
 
+# PHP 8.2
+Requires: php82-php-cli
+Requires: php82-php-ldap
+Requires: php82-php-imap
+Requires: php82-php-gd
+Requires: php82-php-xml
+Requires: php82-php-xmlrpc
+Requires: php82-php-soap
+Requires: php82-php-opcache
+Requires: php82-php-fpm
+Requires: php82-php-mbstring
+Requires: php82-php-json
+Requires: php82-php-bcmath
+Requires: php82-php-intl
+Requires: php82-php-pear
+Requires: php82-php-process
+Requires: php82-php-snmp
+Requires: php82-php, php82-php-enchant , php82-php-pdo php82-php-tidy ,  php82-php-mysqlnd php82-php-pecl-zip
+
+
 %description
 Manage PHP FPM pools, and switch between PHP versions easily
 
@@ -306,6 +330,8 @@ Manage PHP FPM pools, and switch between
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %build
 perl createlinks
@@ -325,7 +351,7 @@ echo "[Install]" > root/usr/lib/systemd/
 echo "WantedBy=sme-server.target" >> root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
 
 %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
-for phpver in "55" "56" "70" "71" "72" "73" "74" "80" "81"; do
+for phpver in "55" "56" "70" "71" "72" "73" "74" "80" "81" "82"; do
 #needed folder
 %{__mkdir_p} root/var/log/php/php$phpver/
 %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}
@@ -361,7 +387,7 @@ find root/etc/e-smith/templates.metadata
 done
 
 # php7*
-for phpver in  "72" "73" "74" "80" "81"; do
+for phpver in  "72" "73" "74" "80" "81" "82"; do
 #cp ph70 metada
 mkdir -p 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/
@@ -388,7 +414,7 @@ done
   --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \
   --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \
   --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \
-`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 `	\
+`for phpver in "54" "55" "56" "70" "71" "72" "73" "74" "80" "81" "82"; 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 `	\
   > %{name}-%{version}-filelist
 
 
@@ -407,6 +433,13 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 
 %changelog
+* Sat Aug 26 2023 John Crisp <jcrisp@safeandsoundit.co.uk>  3.0.0-46.sme
+- fix missing php 81 settings
+- Add php82 support [SME:12403]
+
+* Sat Feb 04 2023 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-45.sme
+- fix session.save_handler forced without any way to change it [SME: 12303]
+
 * Wed Dec 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-44.sme
 - fix tkt auth not propagated to php pool [SME: 12269]