* Sat Feb 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-18.sme

- fix deltarpm is now a bolean [SME: 12755]

.gitignore

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

README.md

@@ -6,7 +6,14 @@ SMEServer Koozali developed git repo for smeserver-update core
 <br />https://wiki.koozali.org/smeserver-update
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-update&product=SME%20Server%2011.X&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&cf_package=smeserver-update&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-update&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-update&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-update&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-update&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-update&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
+[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-update&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
 
 ## Description
 

contriborbase

@@ -1 +0,0 @@
-sme10

createlinks

@@ -17,13 +17,18 @@ for ( qw(install remove update) )
     event_link("dnf-action", "dnf-$_", "20");
 }
 
-safe_symlink("restart", "root/etc/e-smith/events/dnf-modify/services2adjust/yum");
+safe_symlink("restart", "root/etc/e-smith/events/dnf-modify/services2adjust/dnf");
 
 for ( qw(bootstrap-console-save dnf-update smeserver-update-update) )
 {
     event_link("rpm-import-keys", $_, "10");
 }
 
+for ( qw(post-install post-upgrade console-save))
+{
+   event_link("dnf_modules", $_, "70");
+}
+
 my $event= "smeserver-update-update";
 # systemd-specific action mandatory for this package-update event
 event_link("systemd-reload", $event, "89");

root/etc/e-smith/db/yum_repositories/defaults/appstream/Name

@@ -1 +1 @@
-Rocky Linux $releasever - AppStream
+Rocky Linux - AppStream

root/etc/e-smith/db/yum_repositories/defaults/baseos/Name

@@ -1 +1 @@
-Rocky Linux $releasever - BaseOS
+Rocky Linux - BaseOS

root/etc/e-smith/db/yum_repositories/defaults/extras/Name

@@ -1 +1 @@
-Rocky Linux $releasever - Extras 
+Rocky Linux - Extras 

root/etc/e-smith/db/yum_repositories/defaults/powertools/MirrorList

@@ -0,0 +1 @@
+https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever

root/etc/e-smith/db/yum_repositories/defaults/powertools/Name

@@ -0,0 +1 @@
+Rocky Linux - PowerTools

root/etc/e-smith/db/yum_repositories/defaults/smeaddons/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smeaddons-10
+https://mirrorlist.koozali.org/mirrorlist/smeaddons-11

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/EnableGroups

@@ -0,0 +1 @@
+yes

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/GPGCheck

@@ -0,0 +1 @@
+yes

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/MirrorList

@@ -0,0 +1 @@
+https://mirrorlist.koozali.org/mirrorlist/smecontribs-testing-11

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/Name

@@ -0,0 +1 @@
+SME Server - contribs-testing

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/Visible

@@ -0,0 +1 @@
+no

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/status

@@ -0,0 +1 @@
+disabled

root/etc/e-smith/db/yum_repositories/defaults/smecontribs-testing/type

@@ -0,0 +1 @@
+repository

root/etc/e-smith/db/yum_repositories/defaults/smecontribs/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smecontribs-10
+https://mirrorlist.koozali.org/mirrorlist/smecontribs-11

root/etc/e-smith/db/yum_repositories/defaults/smedev/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smedev-10
+https://mirrorlist.koozali.org/mirrorlist/smedev-11

root/etc/e-smith/db/yum_repositories/defaults/smeos/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smeos-10
+https://mirrorlist.koozali.org/mirrorlist/smeos-11

root/etc/e-smith/db/yum_repositories/defaults/smetest/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smetest-10
+https://mirrorlist.koozali.org/mirrorlist/smetest-11

root/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/MirrorList

@@ -1 +1 @@
-https://mirrorlist.koozali.org/mirrorlist/smeupdates-testing-10
+https://mirrorlist.koozali.org/mirrorlist/smeupdates-testing-11

root/etc/e-smith/db/yum_repositories/defaults/smeupdates/MirrorList

@@ -1 +0,0 @@
-https://mirrorlist.koozali.org/mirrorlist/smeupdates-10

root/etc/e-smith/db/yum_repositories/defaults/smeupdates/Name

@@ -1 +0,0 @@
-SME Server - updates

root/etc/e-smith/db/yum_repositories/migrate/20UpstreamRepos

@@ -1,5 +1,5 @@
 {
-    for my $name ( qw(appstream baseos extras remi-safe remi-modular) )
+    for my $name ( qw(appstream baseos powertools extras remi-safe remi-modular) )
     {
 	my $repo = $DB->get($name) or next;
 

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) )
+    for my $name ( qw(addons contrib dungog fws base centosplus fasttrack updates smeupdates) )
     {
     	my $repo = $DB->get($name);
     	$repo->delete if $repo;

root/etc/e-smith/db/yum_repositories/migrate/40GlobalMirrorList

@@ -1,6 +1,6 @@
 {
-    for my $name ( qw(smeaddons smecontribs smedev smeextras smeos smetest 
-                      smeupdates smeupdates-testing) )
+    for my $name ( qw(smeaddons smecontribs smecontribs-testing smedev smeextras smeos smetest 
+                      smeupdates-testing) )
     {
 	my $repo = $DB->get($name) or next;
 

root/etc/e-smith/db/yum_repositories/migrate/45RockyEOL

@@ -40,8 +40,8 @@
     my $curdate = strftime '%Y%m%d', localtime;
     # return unless EOL is reached
     return unless ( "$curdate"  >= "$curVersEOL");
-    my %equiv=(appstream=>'AppStream', baseos=> 'BaseOS', extras=>'extras' );
-    for my $name ( qw(appstream baseos extras) )
+    my %equiv=(appstream=>'AppStream', baseos=> 'BaseOS', extras=>'extras', powertools=>'PowerTools' );
+    for my $name ( qw(appstream baseos extras powertools) )
     {
         my $repo = $DB->get($name) or next;
         my $rname = $equiv{$name} || $name; 

root/etc/e-smith/events/actions/dnf_modules

@@ -0,0 +1,14 @@
+#!/usr/bin/python3
+import dnf
+
+base = dnf.Base()
+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(['perl:5.26'])
+module_base.switch_to(['python36:3.6'])
+module_base.switch_to(['mariadb:10.5'])
+
+base.do_transaction()

root/etc/e-smith/templates/etc/dnf/automatic.conf/50base

@@ -5,7 +5,7 @@
 # -4: critical
 # -3: critical+errors
 # -2: critical+errors+warnings (default)
-debuglevel = -{ $dnf{Debug} || '2' }
+debuglevel = { $dnf{Debug} || '2' }
 
 # Uncomment to auto-import new gpg keys (dangerous)
 # assumeyes = True

root/etc/e-smith/templates/etc/dnf/dnf.conf/10main_deltarpm

@@ -1,6 +1,6 @@
 {
 my $deltaRpm = $dnf{DeltaRpmProcess} || 'disabled';
 $deltaRpm = '0' if ($deltaRpm eq 'disabled');
-$deltaRpm = '2' if ($deltaRpm eq 'enabled');
+$deltaRpm = '1' if ($deltaRpm eq 'enabled');
 $OUT .= "deltarpm=$deltaRpm";
 }

root/etc/e-smith/templates/etc/rsyslog.conf/32smeserver-update

@@ -1,4 +1,5 @@
-#dnf Koozali SME Server updater
+#dnf Koozali SME Server updater, dnf automatic and dnf makecache
 if $programname startswith "dnf_update_dbs"   then      /var/log/dnf/dnf-update.log
 & stop
-
+if $programname startswith "dnf-automatic" then stop
+if $programname startswith "dnf-makecache" then stop

root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py

@@ -50,7 +50,7 @@ servicenames['freeradius']='radiusd',
 servicenames['httpd']='httpd-admin','httpd-e-smith',
 servicenames['iptables']='masq',
 servicenames['mariadb']='mariadb',
-servicenames['nut']='nut-server','nut-driver','nut-monitor',
+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',
@@ -437,7 +437,8 @@ class SMEServer(dnf.Plugin):
         for act in ('navigation-conf','systemd-reload','systemd-default'):
             global iter 
             iter = 0
-            for key in list(actionlist):
+            tmpactionlist = actionlist
+            for key in list(tmpactionlist):
                     if key.endswith(act):
                         iter += 1
                         if iter>1:

root/usr/lib/systemd/system/dnf-automatic-download.service.d/50koozali.conf

@@ -0,0 +1,2 @@
+[Service]
+SyslogIdentifier=dnf-automatic

root/usr/lib/systemd/system/dnf-automatic-install.service.d/50koozali.conf

@@ -0,0 +1,2 @@
+[Service]
+SyslogIdentifier=dnf-automatic

root/usr/lib/systemd/system/dnf-automatic-notifyonly.service.d/50koozali.conf

@@ -0,0 +1,2 @@
+[Service]
+SyslogIdentifier=dnf-automatic

root/usr/lib/systemd/system/dnf-automatic.service.d/50koozali.conf

@@ -0,0 +1,2 @@
+[Service]
+SyslogIdentifier=dnf-automatic

root/usr/lib/systemd/system/dnf-makecache.service.d/50koozali.conf

@@ -0,0 +1,3 @@
+[Service]
+SyslogIdentifier=dnf-makecache
+

root/usr/lib/systemd/system/dnf.service

@@ -4,6 +4,8 @@ After=network-pre.target networking.service
 
 [Service]
 Type=forking
+SyslogIdentifier=dnf_update_dbs
+ExecStartPre=-/etc/e-smith/events/actions/dnf_modules
 ExecStartPre=/sbin/e-smith/service-status dnf
 ExecStart=/sbin/e-smith/dnf_update_dbs
 TimeoutSec=0

root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm

@@ -180,7 +180,7 @@ sub get_status
 {
     my ($fm, $prop, $localise) = @_;
 
-    my $status = $db->get_prop("yum", $prop) || 'disabled';
+    my $status = $db->get_prop("dnf", $prop) || 'disabled';
 
     return $status unless $localise;
 
@@ -196,7 +196,7 @@ sub change_settings
 			PackageFunctions
             	) )
     {
-	$db->set_prop('yum', $param, $q->param("yum_$param"));
+	$db->set_prop('dnf', $param, $q->param("yum_$param"));
     }
 
     my $check4updates = $q->param("yum_check4updates");
@@ -204,21 +204,21 @@ sub change_settings
 
     if ($check4updates ne 'disabled') { $status = 'enabled'; }
 
-    $db->set_prop('yum', 'check4updates', $check4updates);
+    $db->set_prop('dnf', 'check4updates', $check4updates);
 
     my $deltarpm = $q->param("yum_DeltaRpmProcess");
-    $db->set_prop('yum', 'DeltaRpmProcess', $deltarpm);
+    $db->set_prop('dnf', 'DeltaRpmProcess', $deltarpm);
 
     my $downloadonly = $q->param("yum_DownloadOnly");
     if ($downloadonly ne 'disabled') { $status = 'enabled'; }
 
-    $db->set_prop('yum', 'DownloadOnly', $downloadonly);
+    $db->set_prop('dnf', 'DownloadOnly', $downloadonly);
 
     my $AutoInstallUpdates = $q->param("yum_AutoInstallUpdates");
     if ($AutoInstallUpdates ne 'disabled') { $status = 'enabled'; }
 
-    $db->set_prop('yum', 'AutoInstallUpdates', $AutoInstallUpdates);
-    $db->set_prop('yum', 'status', $status);
+    $db->set_prop('dnf', 'AutoInstallUpdates', $AutoInstallUpdates);
+    $db->set_prop('dnf', 'status', $status);
 
     my %selected = map {$_ => 1} $q->param('SelectedRepositories');
 

root/usr/share/rpm-gpg-keys/RPM-GPG-KEY-sme11

@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGaPPbUBCACrfh7C6hG/ZryuDpoK23V2mMHe37hHsMUKojsRulrvPKsICE0t
+QFqpppDp+dfJeOEbdA6gI5LZxlsIyAIZ6eYIpCPvjuEWRa9prVbb5y5HKRCq87NW
+gTCRwARMiOmAJZ7N+IreyUF8nEBy0JePL2vDt1UsF4OrV5wnJnwUnJELsb5J9fz4
+u3mpqGsSxMJp59RRpGVIMl8d1GF4gED5fgDYRZailsJyogE930nfAsPX98B3JHwM
+E9931K/unCmj4p9+9dmsVETFPl8ULpFLiyZn6GFz9XuycLiMvM6Fdn2KkoTPX4mS
+s9a1LYacZz/qhCeRZZBFtTCIlR9bvN5YdwahABEBAAG0FWtvamlhZG1pbkBrb296
+YWxpLm9yZ4kBVAQTAQgAPhYhBATzQ/ljyNxKs+iy5M4aI/dEkiooBQJmjz21AhsD
+BQkDwmcABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEM4aI/dEkioonV8H/jZk
+du0NDAmg9Vh1zBHCQiuAHL6O+ST1yzMTXDVhAwoQBNBPdmhxceRu7DGCyvF+QKQN
+L6j9ERlwc9zpBEWGxI3VW//Z9rw9fq1aFFATNjA9Huu4PNTzPdhvo5mmiw2VXMwe
+TPZd6rAR/zY9UVC/FnKbEmHmSVCH15FRAGFEu3yA8WB5hZi5wP+nOZn1GB+Lihjf
+C3RoLiAFLIVniCmZEDgyRuePeM7Yyiu5U9/NdfTdU+hGp8N2GBr5OdGXyDyOVgx5
+YMdIt72cQSvVQDPz1y2A8GNr3xgfrJi9OvZA422GVaj5Vfop9aXAlwn3488DmGzD
+3krKoWRmPCbR7yRMPi65AQ0EZo89tQEIAONb4Aj5JThzphwwbO30A7WlX4imGItU
+VNLbfhgeJj5/COhExJ0pl915VnR4FWOsTVpH/Jpbaeal9Al+RFnfbsJkJ/ErMSr2
+94h3j7WJiMtyoK5W1g/xdwtBZ1SMlQNtCa5uGAC+iAT+0vD74bqHYdHhA8X0D30d
+Xn8TjhNi8jdbODIsVPvwqEZb+xzdiIAmxpEfJopKUvEy8UpEKThZX8GSEWgKnVRP
+Q3nEoIhCApFWYYFriP/zFKelGFcaMs98fq22VAtwvPwwkd31nkWakR2k4AHZ8ICl
+Frs+JbHLP0zetkQ0jLBxRld5w8FUj/m0CdzpJK71kxx04N7WtFs0LLsAEQEAAYkB
+NgQYAQgAIBYhBATzQ/ljyNxKs+iy5M4aI/dEkiooBQJmjz21AhsMAAoJEM4aI/dE
+kiooLHIH/3T0jJCIaZW8qbcrlxccxjYJT6s1WkQgshg2NCOvih63kHe3szx7L2mE
+DMsKmopkRA8uGJOYRSAj2VKf2f+PFCRLi6vpEjIeB13/nBKyYyRsZCKtexlQyRpc
+elRiwcJ9C7bXCZn1ILoleonahnACfWnHh4gVBO85kDdKbrk+tMYqaQd7jGKW/zNB
+snDSb4ZzfXnKf4RYJSxfS2w3Jf0byO8AlqScunuxVjcOhOlNU8yCWxxVh5kyzmkr
+YTBb5TPc9ibtcTKOUMQRz6gKh+jhepKi1Didt1xreu2hLSEghW4NYEnOC4nkwb1g
+n+ECJ+ckVRagPFo6Ws4J5wWIRblF9aY=
+=c/Xf
+-----END PGP PUBLIC KEY BLOCK-----

smeserver-update.spec

@@ -2,7 +2,7 @@
 Summary: Koozali SME Server rpm updater
 Name: %{name}
 %define version 11.0.0
-%define release 9
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -68,7 +68,38 @@ mkdir -p root/etc/yum.smerepos.d
 
 
 %changelog
-* Wed Apr 17 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme
+* Sat Feb 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-18.sme
+- fix deltarpm is now a bolean [SME: 12755]
+
+* Sat Dec 21 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-17.sme
+- set our prefered modules on different events and dnf.service run [SME: 12618]
+- update old manager to use dnf key instead of yum for settings [SME: 12831]
+- clean rocky yum_repositories property Name content  [SME: 12806]
+
+* Sat Nov 30 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme
+-  remove smeupdates and add smecontribs-testing  [SME: 12804]
+
+* Fri Nov 15 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-15.sme
+- add PowerTools repo needed for openldap-server [SME: 12790]
+- add SME 11 gpg key
+
+* Mon Sep 02 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-14.sme
+- fix typo in rsyslog.conf [SME: 12668]
+
+* Wed Aug 21 2024 Brian Read <brianr@koozali.org> 11.0.0-13.sme
+- Fix error in createlinks - link to restart yum should be dnf [SME: 12723]
+
+* Sat May 11 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-12.sme
+- revert plugin changes to force modules [SME: 12618]
+- tag service to limit log noise in message [SME: 12668]
+- sort nut service to restart [SME: 12662]
+
+* Tue Apr 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-11.sme
+- fix debuglevel=-2 not allowed [SME: 12637]
+- force modules needed for core [SME: 12618]
+  php:remi-8.3 perl:5.26 python36:3.6 mariadb:10.5
+
+* Thu Apr 18 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-10.sme
 - fix RuntimeError: dictionary changed size during iteration [SME: 12633]
 
 * Tue Apr 16 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme