* Thu Mar 06 2025 Jean-Philippe Pialasse <jpp@koozali.org> 5.2.1-2.sme

- SME11 build [SME: 12736]
  fix csp,  templates cleanup
  upgrade to php 8.3 (8.4 not supported yet)
- Wrong Servers output [SME: 12516]

.gitignore

@@ -2,3 +2,4 @@
 *.log
 *spec-20*
 *.tar.gz
+*.xz

README.md

@@ -6,7 +6,14 @@ SMEServer Koozali developed git repo for smeserver-phpmyadmin smecontribs
 <br />https://wiki.koozali.org/PHPMyAdmin
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-phpmyadmin&product=SME%20Contribs&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
+Show list of outstanding bugs:
+[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&classification=Contribs&component=smeserver-phpmyadmin&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
+[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&classification=Contribs&component=smeserver-phpmyadmin&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
+[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&classification=Contribs&component=smeserver-phpmyadmin&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
+[Need Info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&classification=Contribs&component=smeserver-phpmyadmin&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
+[In Progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&classification=Contribs&component=smeserver-phpmyadmin&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
+[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&classification=Contribs&component=smeserver-phpmyadmin&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
+[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&classification=Contribs&component=smeserver-phpmyadmin&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
 
 ## Description
 

contriborbase

@@ -1 +0,0 @@
-contribs10

createlinks

@@ -19,10 +19,10 @@ for my $event (qw(
     templates2events("/etc/httpd/conf/httpd.conf", $event);
     templates2events("/etc/phpMyAdmin/config.inc.php", $event);
     templates2events("/etc/e-smith/sql/init/phpmyadmin", $event);
-    templates2events("/etc/opt/remi/php74/php-fpm.d/www.conf", $event);
+    templates2events("/etc/opt/remi/php83/php-fpm.d/www.conf", $event);
     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");;
     safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
-    safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/php74-php-fpm");
+    safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/php83-php-fpm");
 }
 # PHP header and footer
  safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/template-begin");

root/etc/e-smith/templates/etc/e-smith/sql/init/phpmyadmin

@@ -16,30 +16,9 @@ fi
 /usr/bin/mysql <<EOF
 USE mysql;
 
-REPLACE INTO user (  
-                     host,
-                     user,
-                     password)
-            VALUES ( 
-                     'localhost',
-                     '$user',
-                     PASSWORD ('$pass'));
+CREATE OR REPLACE USER '$user'\@'localhost' IDENTIFIED VIA mysql_native_password USING PASSWORD ('$pass');
 
-
-REPLACE INTO db (  
-                   host,
-                   db,
-                   user,
-                   select_priv, insert_priv, update_priv, delete_priv,
-                   create_priv, alter_priv, index_priv, drop_priv, create_tmp_table_priv,
-                   grant_priv, lock_tables_priv, references_priv)
-          VALUES ( 
-                   'localhost',
-                   '$db',
-                   '$user',
-                   'Y', 'Y', 'Y', 'Y',
-                   'Y', 'Y', 'Y', 'Y', 'Y',
-                   'N', 'Y', 'Y');
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES ON $db.* TO '$user'\@'localhost';
 
 GRANT ALL ON *.* TO 'sqladmin'\@'localhost' IDENTIFIED BY '$admpass'
     WITH GRANT OPTION;

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias

@@ -31,6 +31,7 @@
 
     # Location overrides Directory for access control and default is RequireAny
     # we need to repeat the Require ip section for both context to filter both admin and multiuser access.
+    if ("$adminaccess" eq "enabled"){
     $OUT .= qq(
 <Location /phpmyadmin>
     AuthName "phpmyadmin"
@@ -43,10 +44,12 @@
     $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ?  "      Require all granted": "      Require ip $localAccess $externalSSLAccess";
     $OUT .= qq(
     </RequireAll>
-</Location>) if "$adminaccess" eq "enabled";
+</Location>) ;
+    }
 
     $OUT .= qq(
 <Directory /usr/share/phpMyAdmin>
+    AddDefaultCharset UTF-8
     SSLRequireSSL
     Options -Indexes
     AllowOverride None
@@ -57,8 +60,10 @@
     </RequireAll>
     );
 
+    # we unset CSP from httpd to allow phpmyadmin to do its own 
+    $OUT .= "    Header unset Content-Security-Policy\n";
     # we do not want people to mess with this for the moment
-  my $version =  '74';
+    my $version =  '83';
 
     $OUT .= qq(
     AddType application/x-httpd-php .php 
@@ -87,7 +92,16 @@
 
 <Directory /usr/share/phpMyAdmin/setup/frames/>
     Require all denied
-</Directory>);
+</Directory>
+
+# This configuration prevents mod_security at phpMyAdmin directories from
+# filtering SQL etc.  This may break your mod_security implementation.
+<IfModule mod_security.c>
+    <Directory /usr/share/phpMyAdmin/>
+        SecRuleInheritance Off
+    </Directory>
+</IfModule>
+);
 
   }
     else 

root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin

@@ -1,6 +1,6 @@
 {
 
-if ($PHP_VERSION eq '74'){
+if ($PHP_VERSION eq '83'){
   if (($phpmyadmin{'status'} || 'disabled') eq 'enabled'){
     my $max_upload_size = ($phpmyadmin{MaxUploadSize} || '100M');# 104857600 bytes
     $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);
@@ -17,8 +17,8 @@ if ($PHP_VERSION eq '74'){
     my $start_servers = $phpmyadmin{'PHPstartServers'} || 6;
     my $max_spare_servers = $phpmyadmin{'PHPmaxServers'} || 8;
     my $max_requests = $phpmyadmin{'PHPmaxRequests'} || 1000;
-    $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? printf("%.0f",$max_spare_servers/2) : $min_spare_servers;
-    $start_servers = ( $start_servers > $max_spare_servers ) ? printf("%.0f", $max_spare_servers /2 +  $min_spare_servers/2  ) : $start_servers;
+    $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? sprintf("%.0f", $max_spare_servers/2) : $min_spare_servers;
+    $start_servers = ( $start_servers > $max_spare_servers ) ? sprintf("%.0f", $max_spare_servers/2 + $min_spare_servers/2 ) : $start_servers;
     my $id = 'phpmyadmin'; # Note the package is phpMyAdmin
     $OUT .=<<"_EOF";
 

smeserver-phpmyadmin.spec

@@ -5,8 +5,8 @@
 Summary: phpMyAdmin for SME Server 
 %define name smeserver-phpmyadmin
 Name: %{name}
-%define version 4.0.10.2
-%define release 15
+%define version 5.2.1
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,12 +15,12 @@ Source: %{name}-%{version}.tar.xz
 URL: http://www.phpmyadmin.net/ 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: e-smith-base
-Requires: phpMyAdmin >= 4.4.15.10
-Requires: e-smith-release >= 10.0
-Requires: e-smith-apache >= 2.6.0-19
+Requires: smeserver-base
+Requires: phpMyAdmin >= 5.2.1
+Requires: smeserver-release >= 11.0
+Requires: smeserver-apache 
 Obsoletes: phpmyadmin,phpMyAdmin3
-BuildRequires: e-smith-devtools
+BuildRequires: smeserver-devtools
 Obsoletes: e-smith-phpmyadmin
 Obsoletes: smeserver-phpmyadmin <= 3.5.2.2-1
 Obsoletes: smeserver-phpmyadmin-multiuser
@@ -31,6 +31,18 @@ Implementation of phpMyAdmin for SME Server.
 Access with admin username/password via: https://yourdomain/phpmyadmin.
 
 %changelog
+* Thu Mar 06 2025 Jean-Philippe Pialasse <jpp@koozali.org> 5.2.1-2.sme
+- SME11 build [SME: 12736]
+  fix csp,  templates cleanup
+  upgrade to php 8.3 (8.4 not supported yet)
+- Wrong Servers output [SME: 12516]
+
+* Fri Sep 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 5.2.1-1.sme
+- fix mysql user creation [SME: 12736]
+
+* Sun Sep 08 2024 fix-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 4.0.10.2-16.sme
+- Fix e-smith references in smeserver-phpmyadmin [SME: 12732]
+
 * Sat Sep 07 2024 cvs2git.sh aka Brian Read <brianr@koozali.org> 4.0.10.2-15.sme
 - Roll up patches and move to git repo [SME: 12338]