From 52d7e44832ed0b69a445954de17ea60ca88af5a5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Wed, 5 Mar 2025 23:15:27 -0500 Subject: [PATCH] * Wed Mar 05 2025 Jean-Philippe Pialasse 11.0.0-19.sme - set module php 84 [SME: 12952] - remove openfusion repo [SME: 12882] --- .../db/yum_repositories/migrate/30DeleteDeprecatedRepo | 2 +- root/etc/e-smith/events/actions/dnf_modules | 2 +- .../lib/python3.6/site-packages/dnf-plugins/smeserver.py | 2 +- smeserver-update.spec | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/root/etc/e-smith/db/yum_repositories/migrate/30DeleteDeprecatedRepo b/root/etc/e-smith/db/yum_repositories/migrate/30DeleteDeprecatedRepo index f6f3a1b..a20f61f 100644 --- a/root/etc/e-smith/db/yum_repositories/migrate/30DeleteDeprecatedRepo +++ b/root/etc/e-smith/db/yum_repositories/migrate/30DeleteDeprecatedRepo @@ -1,5 +1,5 @@ { - for my $name ( qw(addons contrib dungog fws base centosplus fasttrack updates smeupdates) ) + for my $name ( qw(addons contrib dungog fws base centosplus fasttrack updates smeupdates openfusion) ) { my $repo = $DB->get($name); $repo->delete if $repo; diff --git a/root/etc/e-smith/events/actions/dnf_modules b/root/etc/e-smith/events/actions/dnf_modules index eba20f7..990a0df 100644 --- a/root/etc/e-smith/events/actions/dnf_modules +++ b/root/etc/e-smith/events/actions/dnf_modules @@ -6,7 +6,7 @@ base.read_all_repos() base.fill_sack() module_base = dnf.module.module_base.ModuleBase(base) -module_base.switch_to(['php:remi-8.3']) +module_base.switch_to(['php:remi-8.4']) module_base.switch_to(['perl:5.26']) module_base.switch_to(['python36:3.6']) module_base.switch_to(['mariadb:10.5']) diff --git a/root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py b/root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py index 02ca4ef..e9df81c 100644 --- a/root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py +++ b/root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py @@ -53,7 +53,7 @@ servicenames['mariadb']='mariadb', servicenames['nut']='nut', servicenames['openldap']='ldap', servicenames['openssh']='sshd', -servicenames['php']='httpd-e-smith', 'php72-php-fpm', 'php73-php-fpm', 'php74-php-fpm', 'php80-php-fpm', 'php81-php-fpm', 'php82-php-fpm', 'php83-php-fpm', +servicenames['php']='httpd-e-smith', 'php72-php-fpm', 'php73-php-fpm', 'php74-php-fpm', 'php80-php-fpm', 'php81-php-fpm', 'php82-php-fpm', 'php83-php-fpm', 'php84-php-fpm', servicenames['proftp']='ftp', servicenames['samba']='smb', servicenames['spamassassin']='spamassassin', diff --git a/smeserver-update.spec b/smeserver-update.spec index 0819915..6595a8a 100644 --- a/smeserver-update.spec +++ b/smeserver-update.spec @@ -2,7 +2,7 @@ Summary: Koozali SME Server rpm updater Name: %{name} %define version 11.0.0 -%define release 18 +%define release 19 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -68,6 +68,10 @@ mkdir -p root/etc/yum.smerepos.d %changelog +* Wed Mar 05 2025 Jean-Philippe Pialasse 11.0.0-19.sme +- set module php 84 [SME: 12952] +- remove openfusion repo [SME: 12882] + * Sat Feb 15 2025 Jean-Philippe Pialasse 11.0.0-18.sme - fix deltarpm is now a bolean [SME: 12755]