* Wed Mar 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-21.sme

- fix not all gpg keys are imported [SME: 12960]

.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");
@@ -34,4 +39,4 @@ safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog"
 #--------------------------------------------------
 # functions for manager panel
 #--------------------------------------------------
-panel_link("dnf", "manager");
+panel_link("yum", "manager");

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 openfusion) )
     {
     	my $repo = $DB->get($name);
     	$repo->delete if $repo;

root/etc/e-smith/db/yum_repositories/migrate/39VisibleSmeContribs

@@ -4,7 +4,7 @@
         my $repo = $DB->get($name) or next;
         #only migrate if restore from previous SME version, we do not want to override an admin setting for current version.
         return unless $repo->prop('MirrorList') =~ m{/$name-1?[0789]{1}$};
-	$repo->set_prop('status', 'enabled')
+	$repo->set_prop('status', 'enabled');
         $repo->set_prop('Visible', 'yes');
     }
 }

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.4'])
+module_base.switch_to(['perl:5.26'])
+module_base.switch_to(['python36:3.6'])
+module_base.disable(['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

@@ -0,0 +1,506 @@
+# vim: noexpandtab tabstop=4
+
+import os
+import shutil
+import subprocess
+import syslog
+
+from dnfpluginscore import _, logger
+import libdnf.conf
+import dnf
+import dnf.transaction
+
+
+events_path  = '/etc/e-smith/events'
+initialize_database = events_path + '/actions/initialize-default-databases'
+navigation_conf = events_path + '/actions/navigation-conf'
+systemctl = "/usr/bin/systemctl"
+signal_event = '/sbin/e-smith/signal-event'
+config_set = '/sbin/e-smith/config'
+status_file  = '/var/cache/dnf/dnf.status'
+
+eventlist = dict()
+actionlist = dict()
+templateslist = dict()
+serviceslist = dict()
+
+
+# list of packages that need a reboot
+# if a package name starts with one these names, a reboot is needed
+rebootpkgs = ['daemontools', 'dbus', 'glibc', 'gnutls', 'kernel', 'linux-firmware', 'lvm2', 'mdadm', 'openssl-libs', 'systemd']
+# exclusions : 
+rebootpkgsexclude = dict()
+rebootpkgsexclude['dbus']='-python','-tests','-devel','-doc', 
+rebootpkgsexclude['glibc']='-devel','-headers','-statics','-utils','-glib',
+rebootpkgsexclude['gnutls']='-devel',
+rebootpkgsexclude['kernel']='-doc','-debug','-devel','-abi-whitelists','tools',
+rebootpkgsexclude['lvm2']='-devel','-python',
+rebootpkgsexclude['systemd']='-devel','-python',
+
+
+# list of packages that need a service restart
+# if a package name starts with one of these values, a service restart is needed
+# since, for example, httpd means httpd-admin and httpd-e-smith, we won't use these names directly but via serviceslist (see below)
+restartpkgs = ['dovecot','bglibs','cvm','freeradius','httpd','iptables', 'mariadb', 'MariaDB',  'nut', 'openldap', 'openssh', 'php', 'pptpd', 'proftp', 'samba', 'spamassassin', 'squid', 'qmail', 'qpsmtpd']
+servicenames = dict()
+servicenames['bglibs']='cvm-unix',
+servicenames['cvm']='cvm-unix',
+servicenames['dovecot']='dovecot',
+servicenames['freeradius']='radiusd',
+servicenames['httpd']='httpd-admin','httpd-e-smith',
+servicenames['iptables']='masq',
+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', 'php84-php-fpm',
+servicenames['proftp']='ftp',
+servicenames['samba']='smb',
+servicenames['spamassassin']='spamassassin',
+servicenames['squid']='squid',
+servicenames['qmail']='qmail',
+servicenames['qpsmtpd']='qpsmtpd', 'sqpsmtpd',
+
+DEBUG = False
+smechange = False
+smechangelist = dict()
+ourfile = False
+# not used
+erasing = False
+# not used
+smeEventPretrans = False
+removenorebootok = dict()
+
+class SMEServer(dnf.Plugin):
+
+    name = "smeserver"
+
+    def __init__(self, base, cli):
+        super(SMEServer, self).__init__(base, cli)
+        self.base = base
+        self.logger = logger
+        self.report_yum_status('init')
+
+    def log(self,s):
+        if DEBUG :
+            print(s)
+
+    def createevent(self):
+        if os.path.isdir('/etc/e-smith/events/temp'):
+            shutil.rmtree('/etc/e-smith/events/temp')
+        os.makedirs('/etc/e-smith/events/temp/services2adjust', 0o777)
+        os.makedirs('/etc/e-smith/events/temp/templates2expand', 0o777)
+
+    def addtemplate2expand(self,template):
+        #check filename
+        head_tail = os.path.split(template)
+        head = head_tail[0];
+        filename = head_tail[1];
+        # create dir
+        if not os.path.isdir('/etc/e-smith/events/temp/templates2expand' + head):
+            os.makedirs('/etc/e-smith/events/temp/templates2expand' + head, 0o777)
+        #touch file
+        fname= '/etc/e-smith/events/temp/templates2expand'+ template
+        fhandle = open(fname, 'a')
+        try:
+            os.utime(fname, None)
+        finally:
+            fhandle.close()
+
+    def report_yum_status(self,status):
+        fileHandle = open(status_file, 'w')
+        fileHandle.write(status)
+        fileHandle.close()
+
+    def pre_config(self):
+        self.report_yum_status('pre_config') 
+
+    def config(self):
+        self.report_yum_status('config')
+
+    def sack(self):
+        global ourfile
+        ourfile = True
+        self.report_yum_status('sack')
+
+    def resolved(self):
+        self.report_yum_status('resolved')
+
+#2 PKG_DOWNGRADE = dnf.transaction.PKG_DOWNGRADE  # :api
+#1 PKG_INSTALL = dnf.transaction.PKG_INSTALL  # :api
+#4 PKG_OBSOLETE = dnf.transaction.PKG_OBSOLETE  # :api
+#9 PKG_REINSTALL = dnf.transaction.PKG_REINSTALL  # :api
+#8 PKG_REMOVE = dnf.transaction.PKG_ERASE  # :api
+#6 PKG_UPGRADE = dnf.transaction.PKG_UPGRADE  # :api
+#7 PKG_UPGRADED = libdnf.transaction.TransactionItemAction_UPGRADED
+#101 PKG_CLEANUP = dnf.transaction.PKG_CLEANUP  # :api
+#102 PKG_VERIFY = dnf.transaction.PKG_VERIFY  # :api
+#103 PKG_SCRIPTLET = dnf.transaction.PKG_SCRIPTLET  # :api
+
+    def pre_transaction(self):
+        self.report_yum_status('pretrans')
+        # Prefetch filelist for packages to be removed,
+        in_ts_items = []
+        out_ts_items = []
+        all_ts_items = []
+        for ts_item in self.base.transaction:
+            if ts_item.action in dnf.transaction.FORWARD_ACTIONS:
+                in_ts_items.append(ts_item)
+            elif ts_item.action in dnf.transaction.BACKWARD_ACTIONS:
+                out_ts_items.append(ts_item)
+            else:
+                #  The action is not rpm change. It can be a reason change, therefore we can skip that item
+                continue
+            all_ts_items.append(ts_item)
+
+        allpkgs = all_ts_items # [tsi.pkg for tsi in all_ts_items]
+        # also to see dnf.db.group.RPMTransaction.install_set
+        installs = in_ts_items #[tsi.pkg for tsi in in_ts_items]
+        installs_dict = {}
+        for item in installs:
+            nam = item.name
+            installs_dict[nam] = item
+        # one liner new_dict = {item['name']:item for item in data}
+        # also to see dnf.db.group.RPMTransaction.remove_set
+        removes = out_ts_items #[tsi.pkg for tsi in out_ts_items]
+        self.log('## allpkgs: ' + str([ str(tsi.pkg) for tsi in allpkgs]))
+        self.log('## installs: ' +str([ str(tsi.pkg) for tsi in installs]))
+        self.log('## Removes: ' + str([ str(tsi.pkg) for tsi in removes]))
+        ##allpkgs: ['smeserver-tinydns-11.0.0-4.el8.sme.noarch', 'smeserver-tinydns-11.0.0-3.el8.sme.noarch']
+        ## install: ['smeserver-tinydns-11.0.0-4.el8.sme.noarch']
+        ## Remove: ['smeserver-tinydns-11.0.0-3.el8.sme.noarch']
+
+        # list of all instaled rpm
+        base = dnf.Base()
+        base.fill_sack()
+        q = base.sack.query()
+        rpmdb = q.installed()
+
+        global smechange
+        global eventlist 
+        global actionlist
+        global templateslist 
+        global serviceslist 
+        global erasing    
+        global smeEventPretrans
+        global removenorebootok
+
+
+        # reinstall are not listed there so already skipped
+        # downgrade are going there 
+        # update are going there, we filter them out
+        # real removal are the real deal there ; downgrade are played like if they were removal  
+        for tsmem in removes:
+            erasing = True
+            n= str(tsmem.name)
+            # if the pkg.name is present on both IN and OUT, then we assume update/downgrade and continue to transaction
+            if n in installs_dict :
+                #self.log('updating ==> state ' + str(tsmem.pkg) + " to " + str(installs_dict[n].pkg) )
+                continue
+            self.log('**Package: ' + str(tsmem.pkg) + ' to be removed')
+            smeevent = n + '-update'
+            #check if /etc/e-smith/events/$smeevent exist, if yes add it to todo list
+            if os.path.isdir(events_path + os.sep + smeevent):
+                tmppath = events_path + os.sep + smeevent + os.sep
+                eventlist[n] = smeevent
+
+                # if templates to expand, add them 
+                if os.path.isdir(tmppath + "templates2expand" + os.sep):
+                    tmppathtmpl = tmppath + "templates2expand" + os.sep
+                    for subdir, dirs, files in os.walk(tmppathtmpl):
+                        for file in files:
+                            mytmptemplate = os.path.join(subdir, file).replace(tmppathtmpl,os.sep)
+                            if mytmptemplate not in templateslist :
+                                templateslist[mytmptemplate]=mytmptemplate
+                            self.log(" template " + mytmptemplate)
+
+                # we add the actions scripts
+                tmppathsrv = tmppath +  os.sep
+                files = [f for f in os.listdir(tmppathsrv)]
+                for f in files:
+                    if os.path.islink(tmppathsrv + f):
+                            mytmpaction = os.path.realpath(os.readlink(tmppath + f).replace("..",events_path))
+                            self.log(" link " + f + ": " + mytmpaction)
+                            actionlist[f]=mytmpaction
+
+                # if there are services to handle we had them
+                if os.path.isdir(tmppath + "services2adjust" + os.sep):
+                    tmppathsrv = tmppath + "services2adjust" + os.sep
+                    files = [f for f in os.listdir(tmppathsrv)]
+                    for f in files:
+                        if os.path.islink(tmppathsrv + f):
+                            self.log(" service link " + f + ": " + (os.readlink(tmppathsrv + f)))
+                            mytmpserv = os.readlink(tmppathsrv + f)
+                            # we had the service with its action, except if we need to force a restart
+                            # TODO as we have only pkgs to remove here, shouldn't we just stop the service NOW?
+                            if f not in serviceslist :
+                                serviceslist[f]=mytmpserv
+                            else:
+                                if mytmpserv == "restart":
+                                    self.log("overriding all signals, forcing restart " + f )
+                                    serviceslist[f]="restart"
+                removenorebootok[n]=1;
+            else:
+                # if we are here this is a smeserver pkg without an update event, needs reboot...
+                if (n.startswith('smeserver') or n.startswith('e-smith')) and not n.startswith('smeserver-locale'):
+                    smechange = True
+                    smechangelist[n]=str(tsmem.pkg)
+                    self.log("smechange set to True because of " + n + " without an update event " + str(tsmem.pkg) )
+            #end of if smeserver-*-update event exist
+            # do we need this for removal ?
+            if "/etc/e-smith/web/panels/manager/cgi-bin" in tsmem.files :
+                self.log(" ==> pannel detected : adding navigation-conf")
+                actionlist['S80navigation-conf']="/etc/e-smith/events/actions/navigation-conf"
+
+        #end of for list of packages
+        #only for debug
+        self.log('## smechange: '+str(smechange))
+        self.log('## eventlist: '+ str(eventlist))
+        self.log('## templateslist: '+str(templateslist.keys()))
+        self.log('## serviceslist: '+str(serviceslist.items()))
+        self.log('## actions ALL: '  + str(actionlist.keys()))
+        self.log('## smechangelist: ' + str(smechangelist.keys()))
+
+        if len(serviceslist)>0:
+            # would it be a good idea to do some action/event there to stop service being removed ?
+            # for the moment we do not, logic : if template still there at posttrans, we expand it after removal
+            # probably the actions in some situations could be done before...
+            # create an empty temp event
+            print("Creating temporary event 'temp' and populating it...")
+            self.createevent()
+            print(" Adding services to adjust")
+            for kservices in serviceslist:
+                self.log("  " + kservices + ": " + serviceslist[kservices])
+                os.symlink(serviceslist[kservices], '/etc/e-smith/events/temp/services2adjust/' + kservices)
+
+            # execute the event ; should we really wait ??
+            print("Executing signal-event temp before uninstalling ...........")
+            os.spawnl(os.P_WAIT,signal_event,signal_event, 'temp')
+            smeEventPretrans = True;
+
+    def transaction(self):
+        self.report_yum_status('transaction')
+
+        #ts = self.getTsInfo()
+        #rpmdb = self.getRpmDB()
+        # Prefetch filelist for packages to be removed,
+        in_ts_items = []
+        out_ts_items = []
+        all_ts_items = []
+        for ts_item in self.base.transaction:
+            if ts_item.action in dnf.transaction.FORWARD_ACTIONS:
+                in_ts_items.append(ts_item)
+            elif ts_item.action in dnf.transaction.BACKWARD_ACTIONS:
+                out_ts_items.append(ts_item)
+            else:
+                #  The action is not rpm change. It can be a reason change, therefore we can skip that item
+                continue
+            all_ts_items.append(ts_item)
+
+        allpkgs = all_ts_items # [tsi.pkg for tsi in all_ts_items]
+        # also to see dnf.db.group.RPMTransaction.install_set
+        installs = in_ts_items #[tsi.pkg for tsi in in_ts_items]
+        installs_dict = {}
+        for item in installs:
+            nam = item.name
+            installs_dict[nam] = item
+        # one liner new_dict = {item['name']:item for item in data}
+        # also to see dnf.db.group.RPMTransaction.remove_set
+        removes = out_ts_items #[tsi.pkg for tsi in out_ts_items]
+
+        global smechange
+        global eventlist 
+        global actionlist
+        global templateslist 
+        global serviceslist 
+        global erasing
+        global smeEventPretrans
+        global removenorebootok
+        global ourfile
+       
+        for tsmem in installs: 
+            # n: name ; a : arch; e: epoch ; v: version, r: release
+            n = tsmem.name
+            a = tsmem.arch
+            e = tsmem.epoch
+            v = tsmem.version
+            r = tsmem.release
+
+            # if we're upgrading/installing/removing a rebootpkgs package.. a reboot is required
+            for pkg in rebootpkgs:
+                if n.startswith(pkg):
+                    self.log('**Package: ' + n + ' triggers reboot')
+                    # we do some exclusions -devel -doc ...
+                    if  pkg in rebootpkgsexclude:
+                        cont=False
+                        for name in rebootpkgsexclude[pkg]:
+                            if n.startswith(pkg + name):
+                                cont=True
+                        if cont:
+                            # this is an exception we do not need reboot : -devel, -doc ...
+                            continue
+                    # either no exception or does not fit exceptions: we need reboot
+                    smechange = True
+                    smechangelist[n]=str(n) + "-" + str(v) + "-" + str(r)
+                    self.log("smechange set to True because of " + n + " with " + str(v) + "-" + str(r) )
+                    #self.log("smechange set to True because of " + pkg)
+
+            # check if we're upgrading a restartpkgs rpm
+            for pkg in restartpkgs:
+                if n.startswith(pkg):
+                    if pkg in servicenames:
+                        for name in servicenames[pkg]:
+                            if name not in serviceslist :
+                                serviceslist[name] = 'restart'
+                    else:
+                        if pkg not in serviceslist :
+                            serviceslist[pkg] = 'restart'
+
+
+            #if smechange is true we can ignore the following part
+            # wondering  if we reallly do want to ignore that : let's say we want to delay kernel reboot, 
+            # could we at least configure httpd cleanly until next week ?
+            # also when updating a package the erasing flag was on and prevented to do this ....
+            # if not smechange and not erasing:
+            #if True:
+
+            smeevent = n + '-update'
+            if os.path.isdir(events_path + os.sep + smeevent):
+                tmppath = events_path + os.sep + smeevent + os.sep
+                eventlist[n] = smeevent
+
+                files = [f for f in os.listdir(tmppath)]
+                for f in files:
+                    if os.path.islink(tmppath + f):
+
+                        mytmpaction = os.path.realpath(os.readlink(tmppath + f).replace("..",events_path))
+                        #self.log(" link " + f + ": " + mytmpaction)
+                        actionlist[f]=mytmpaction
+
+
+                if os.path.isdir(tmppath + "templates2expand" + os.sep):
+                    tmppathtmpl = tmppath + "templates2expand" + os.sep
+                    for subdir, dirs, files in os.walk(tmppathtmpl):
+                        for file in files:
+                            mytmptemplate = os.path.join(subdir, file).replace(tmppathtmpl,os.sep)
+                            if mytmptemplate not in templateslist :
+                                templateslist[mytmptemplate]=mytmptemplate
+                            self.log(" template " + mytmptemplate)
+
+                if os.path.isdir(tmppath + "services2adjust" + os.sep):
+                    tmppathsrv = tmppath + "services2adjust" + os.sep
+                    files = [f for f in os.listdir(tmppathsrv)]
+                    for f in files:
+                        if os.path.islink(tmppathsrv + f):
+                            self.log(" service link " + f + ": " + (os.readlink(tmppathsrv + f)))
+                            mytmpserv = os.readlink(tmppathsrv + f)
+                            if f not in serviceslist :
+                                serviceslist[f]=mytmpserv
+                            else:
+                                if mytmpserv == "restart":
+                                    #only for debug
+                                    self.log("overriding all signals, forcing restart " + f)
+                                    serviceslist[f]="restart"
+            else:
+                if (n.startswith('smeserver') or n.startswith('e-smith')) and not n.startswith('smeserver-locale') and not (n in removenorebootok):
+                    smechange = True
+                    smechangelist[n]=str(tsmem.name) + "-" + str(tsmem.version) + "-" + str(tsmem.release)
+                    self.log("smechange set to True because of " + n  )
+            
+            # as long as it is a sme pkg we need to rebuild panel
+            if "/etc/e-smith/web/panels/manager/cgi-bin" in tsmem.files :
+                self.log(" ==> pannel detected : adding navigation-conf")
+                actionlist['S80navigation-conf']="/etc/e-smith/events/actions/navigation-conf"
+        # end of for installed list
+
+        #only for debug
+        self.log('## smechange: '+str(smechange))
+        self.log('## eventlist: '+ str(eventlist))
+        self.log('## templateslist: '+str(templateslist.keys()))
+        self.log('## serviceslist: '+str(serviceslist.items()))
+        self.log('## actions ALL: '  + str(actionlist.keys()))
+        self.log('## smechangelist: ' + str(smechangelist.keys()))
+
+        # check if smechange is true or if eventlist has items.. in both cases we must initialize databases
+        if smechange == True or len(eventlist)>0:
+            print('Initializing databases')
+            os.spawnl(os.P_WAIT, initialize_database, initialize_database)
+
+        # just in case we add systemd-default and systemd-reload
+        if 'S88systemd-default' not in actionlist :
+            actionlist['S88systemd-default'] = '/etc/e-smith/events/actions/systemd-default'
+        if 'S89systemd-reload' not in actionlist :
+            actionlist['S89systemd-reload'] = '/etc/e-smith/events/actions/systemd-reload'
+
+        # here we would like to remove duplicates
+        # those are potential : S??navigation-conf S??systemd-reload S??systemd-default
+        for act in ('navigation-conf','systemd-reload','systemd-default'):
+            global iter 
+            iter = 0
+            tmpactionlist = actionlist
+            for key in list(tmpactionlist):
+                    if key.endswith(act):
+                        iter += 1
+                        if iter>1:
+                            del actionlist[key]
+                            self.log("removing duplicate action " + key + " iter " + str(iter))
+        
+        self.report_yum_status('transaction')
+        self.log("smeserver.py: transaction")
+
+        # now, if smechange is false (no reboot needed), we can execute actions, expand templates and adjust services
+
+        # create an empty temp event
+        print("Creating temporary event 'temp' and populating it...")
+        self.createevent()
+
+        # fill it with our list of actions
+        if len(actionlist)>0:
+            print(" Adding actions to execute")
+            for kactions in actionlist:
+                if os.path.isfile(actionlist[kactions]):
+                    self.log("  " + kactions)
+                    os.symlink(actionlist[kactions],'/etc/e-smith/events/temp/' + kactions)
+
+        # fill it with our list of templates to expand
+        if len(templateslist)>0:
+            print(" Adding templates to expand")
+            for ktemplates in templateslist:
+                mytemplatedir = '/etc/e-smith/templates/' + ktemplates
+                mytemplatemeta = '/etc/e-smith/templates.metadata/' + ktemplates
+                if os.path.exists(mytemplatedir) or  os.path.exists(mytemplatemeta):
+                    self.log("  " + ktemplates)
+                    self.addtemplate2expand(ktemplates)
+
+        if len(serviceslist)>0:
+            print(" Adding services to adjust")
+            for kservices in serviceslist:
+                self.log("  " + kservices + ": " + serviceslist[kservices])
+                os.symlink(serviceslist[kservices], '/etc/e-smith/events/temp/services2adjust/' + kservices)
+
+        # execute the event ; should we really wait ??
+        print("Executing signal-event temp ...........")
+        os.spawnl(os.P_WAIT,signal_event,signal_event, 'temp')
+
+        if smechange:
+            os.spawnl(os.P_WAIT, config_set, config_set, 'set', 'UnsavedChanges', 'yes')
+            os.spawnl(os.P_WAIT, navigation_conf, navigation_conf)
+            syslog.syslog('Needs signal-event post-upgrade; signal-event reboot because of: ' + str(smechangelist.keys()) )
+        print("Reload dnf db for server-manager")
+        os.spawnl(os.P_WAIT, systemctl, systemctl, 'restart', 'dnf')
+
+    #no more close hook
+    #def close_hook(conduit):
+        if ourfile and os.path.isfile(status_file):
+            os.unlink(status_file)
+
+        if smechange:
+            print("\nThe following updates require a server reboot:\n" + str(smechangelist.keys())) 
+            print("\n==============================================================\n")
+            print("WARNING: You now need to run BOTH of the following commands")
+            print("to ensure consistent system state:")
+            print("signal-event post-upgrade; signal-event reboot")
+            print("You should run these commands unless you are certain that")
+            print("dnf made no changes to your system.\n")
+            print("==============================================================")
+

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/lib/yum-plugins/smeserver.py

@@ -1,447 +0,0 @@
-# vim: noexpandtab tabstop=4
-
-import os
-import shutil
-import subprocess
-import syslog
-from yum.constants import *
-from yum.plugins import PluginYumExit
-from yum.plugins import TYPE_CORE
-from yum.packages import parsePackages
-from yum.packages import RpmBase
-
-requires_api_version = '2.1'
-plugin_type = (TYPE_CORE,)
-
-events_path  = '/etc/e-smith/events'
-initialize_database = events_path + '/actions/initialize-default-databases'
-navigation_conf = events_path + '/actions/navigation-conf'
-systemctl = "/usr/bin/systemctl"
-dnf_update_dbs = events_path + '/actions/yum-update-dbs'
-Conflicts=yum-cron.service dnf-automatic-notifyonly.service dnf-automatic.service
-signal_event = '/sbin/e-smith/signal-event'
-config_set = '/sbin/e-smith/config'
-status_file  = '/var/cache/dnf/dnf.status'
-expand_template = '/sbin/e-smith/expand-template'
-service = '/sbin/e-smith/service'
-
-eventlist = dict()
-actionlist = dict()
-templateslist = dict()
-serviceslist = dict()
-
-
-# list of packages that need a reboot
-# if a package name starts with one these names, a reboot is needed
-rebootpkgs = ['daemontools', 'dbus', 'glibc', 'gnutls', 'kernel', 'linux-firmware', 'lvm2', 'mdadm', 'openssl-libs', 'systemd']
-# exclusions : 
-rebootpkgsexclude = dict()
-rebootpkgsexclude['dbus']='-python','-tests','-devel','-doc', 
-rebootpkgsexclude['glibc']='-devel','-headers','-statics','-utils','-glib',
-rebootpkgsexclude['gnutls']='-devel',
-rebootpkgsexclude['kernel']='-doc','-debug','-devel','-abi-whitelists','tools',
-rebootpkgsexclude['lvm2']='-devel','-python',
-rebootpkgsexclude['systemd']='-devel','-python',
-
-
-# list of packages that need a service restart
-# if a package name starts with one of these values, a service restart is needed
-# since, for example, httpd means httpd-admin and httpd-e-smith, we won't use these names directly but via serviceslist (see below)
-restartpkgs = ['dovecot','bglibs','cvm','freeradius','httpd','iptables', 'mariadb' ,  'nut', 'openldap', 'openssh', 'php', 'pptpd', 'proftp', 'samba', 'spamassassin', 'squid', 'qmail', 'qpsmtpd']
-servicenames = dict()
-servicenames['bglibs']='cvm-unix',
-servicenames['cvm']='cvm-unix',
-servicenames['dovecot']='dovecot',
-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['openldap']='ldap',
-servicenames['openssh']='sshd',
-servicenames['php']='httpd-e-smith', 'php-fpm', 'php55-php-fpm', 'php56-php-fpm', 'php70-php-fpm', 'php71-php-fpm', 'php72-php-fpm', 'php73-php-fpm', 'php74-php-fpm', 'php80-php-fpm', 'php81-php-fpm',
-servicenames['proftp']='ftp',
-servicenames['samba']='smb',
-servicenames['spamassassin']='spamassassin',
-servicenames['squid']='squid',
-servicenames['qmail']='qmail',
-servicenames['qpsmtpd']='qpsmtpd',
-
-smechange = False
-smechangelist = dict()
-ourfile = False
-erasing = False
-DEBUG = False
-smeEventPretrans = False
-removenorebootok = dict()
-
-def log(s):
-    if DEBUG :
-        print s
-def createevent():
-    if os.path.isdir('/etc/e-smith/events/temp'):
-	shutil.rmtree('/etc/e-smith/events/temp')
-    os.makedirs('/etc/e-smith/events/temp/services2adjust', 0o777)
-    os.makedirs('/etc/e-smith/events/temp/templates2expand', 0o777)
-
-def addtemplate2expand(template):
-    #check filename
-    head_tail = os.path.split(template)
-    head = head_tail[0];
-    filename = head_tail[1];
-    # create dir
-    if not os.path.isdir('/etc/e-smith/events/temp/templates2expand' + head):
-        os.makedirs('/etc/e-smith/events/temp/templates2expand' + head, 0o777)
-    #touch file
-    fname= '/etc/e-smith/events/temp/templates2expand'+ template
-    fhandle = open(fname, 'a')
-    try:
-        os.utime(fname, None)
-    finally:
-        fhandle.close()
-
-def report_yum_status(status):
-    fileHandle = open(status_file, 'w')
-    fileHandle.write(status)
-    fileHandle.close()
-
-def predownload_hook(conduit):
-    report_yum_status('predownload')
-
-def postdownload_hook(conduit):
-    report_yum_status('postdownload')
-
-def prereposetup_hook(conduit):
-    global ourfile
-    
-    ourfile = True
-    report_yum_status('prereposetup')
-
-def postreposetup_hook(conduit):
-    report_yum_status('postreposetup')
-
-def exclude_hook(conduit):
-    report_yum_status('exclude')
-
-def preresolve_hook(conduit):
-    report_yum_status('preresolve')
-
-def postresolve_hook(conduit):
-    report_yum_status('postresolve')
-
-def pretrans_hook(conduit):
-# we might need to change the strategy here to make a difference between update and removal.
-#transaction set states
-#TS_UPDATE = 10
-#TS_INSTALL = 20
-#TS_TRUEINSTALL = 30
-#TS_ERASE = 40
-#TS_OBSOLETED = 50
-#TS_OBSOLETING = 60
-#TS_AVAILABLE = 70
-#TS_UPDATED = 90
-#TS_FAILED = 100
-#TS_INSTALL_STATES = [TS_INSTALL, TS_TRUEINSTALL, TS_UPDATE, TS_OBSOLETING]
-#TS_REMOVE_STATES = [TS_ERASE, TS_OBSOLETED, TS_UPDATED]
-
-    report_yum_status('pretrans')
-    log("*******Pretrans********")
-    # Prefetch filelist for packages to be removed,
-    # otherwise for updated packages headers will not be available
-    ts = conduit.getTsInfo()
-    removes = ts.getMembersWithState(output_states=TS_REMOVE_STATES)
-    rpmdb = conduit.getRpmDB()
-    global smechange
-    global eventlist 
-    global actionlist
-    global templateslist 
-    global serviceslist 
-    global erasing    
-    global smeEventPretrans
-    global removenorebootok
-
-
-    # reinstall are not listed there so already skipped
-    # downgrade are going there 
-    # update are going there, we filter them out
-    # real removal are the real deal there ; downgrade are played like if they were removal  
-    for tsmem in removes:
-        erasing = True
-        (n, a, e, v, r) = tsmem.po.pkgtup
-	if tsmem.output_state == TS_UPDATED :
-		# if we are actually updating then we are not removing, and new package will do better... skipping
-		log('skiping as updating ==> state ' + str(tsmem.po.state) + " RPM current state" + str(tsmem.current_state) + " RPM output state" + str(tsmem.output_state))
-		continue
-        log('**Package: ' + tsmem.name + ' to be removed')
-        smeevent = tsmem.name + '-update'
-        if os.path.isdir(events_path + os.sep + smeevent):
-            tmppath = events_path + os.sep + smeevent + os.sep
-            eventlist[tsmem.name] = smeevent
-
-            if os.path.isdir(tmppath + "templates2expand" + os.sep):
-                tmppathtmpl = tmppath + "templates2expand" + os.sep
-                for subdir, dirs, files in os.walk(tmppathtmpl):
-                    for file in files:
-                        mytmptemplate = os.path.join(subdir, file).replace(tmppathtmpl,os.sep)
-                        if not templateslist.has_key(mytmptemplate):
-                            templateslist[mytmptemplate]=mytmptemplate
-                        log(" template " + mytmptemplate)
-
-	    # nothing for actions ???
-	    tmppathsrv = tmppath +  os.sep
-	    files = [f for f in os.listdir(tmppathsrv)]
-            for f in files:
-		if os.path.islink(tmppathsrv + f):
-                        mytmpaction = os.path.realpath(os.readlink(tmppath + f).replace("..",events_path))
-                        log(" link " + f + ": " + mytmpaction)
-                        actionlist[f]=mytmpaction
-
-            # end debug print
-            if os.path.isdir(tmppath + "services2adjust" + os.sep):
-                tmppathsrv = tmppath + "services2adjust" + os.sep
-                files = [f for f in os.listdir(tmppathsrv)]
-                for f in files:
-                    if os.path.islink(tmppathsrv + f):
-                        log(" service link " + f + ": " + (os.readlink(tmppathsrv + f)))
-                        mytmpserv = os.readlink(tmppathsrv + f)
-                        if not serviceslist.has_key(f):
-                           	serviceslist[f]=mytmpserv
-                        else:
-                            if mytmpserv == "restart":
-                                log("overriding all signals, forcing restart " + f )
-                                serviceslist[f]="restart"
-	    removenorebootok[n]=1;
-            thispo = rpmdb.searchNevra(name=n, arch=a, epoch=e, ver=v, rel=r)[0]
-            # thispo.dirlist thispo.ghostlist thispo.filelist
-            if "/etc/e-smith/web/panels/manager/cgi-bin" in thispo.dirlist:
-                log(" ==> pannel detected : adding navigation-conf")
-                actionlist['S80navigation-conf']="/etc/e-smith/events/actions/navigation-conf"
-
-        else:
-            if (n.startswith('smeserver') or n.startswith('e-smith')) and not n.startswith('smeserver-locale'):
-                smechange = True
-		smechangelist[n]=str(tsmem.po.state) + " " + str(tsmem.current_state) + " " + str(tsmem.output_state)
-		log("smechange set to True because of " + n + " with " + str(tsmem.po.state) + " " + str(tsmem.current_state) + " " + str(tsmem.output_state) )
-
-    #only for debug
-    log('## smechange: '+str(smechange))
-    log('## eventlist: '+ str(eventlist))
-    log('## templateslist: '+str(templateslist.keys()))
-    log('## serviceslist: '+str(serviceslist.items()))
-    log('## actions ALL: '  + str(actionlist.keys()))
-    log('## smechangelist: ' + str(smechangelist.keys()))
-
-    if len(serviceslist)>0:
-    	# would it be a good idea to do some action/event there to stop service being removed ?
-	# for the moment we do not, logic : if template still there at posttrans, we expand it after removal
-	# probably the actions in some situations could be done before...
-    	# create an empty temp event
-    	print "Creating temporary event 'temp' and populating it..."
-    	createevent()
-        print " Adding services to adjust"
-        for kservices in serviceslist:
-            log("  " + kservices + ": " + serviceslist[kservices])
-            os.symlink(serviceslist[kservices], '/etc/e-smith/events/temp/services2adjust/' + kservices)
-
-    	# execute the event ; should we really wait ??
-    	print "Executing signal-event temp before uninstalling ..........."
-    	os.spawnl(os.P_WAIT,signal_event,signal_event, 'temp')
-	smeEventPretrans = True;
-
-def posttrans_hook(conduit):
-    report_yum_status('posttrans')
-    log("*******Postrans********")
-    ts = conduit.getTsInfo()
-    rpmdb = conduit.getRpmDB()
-
-    global smechange
-    global eventlist 
-    global actionlist
-    global templateslist 
-    global serviceslist 
-    global erasing
-    global smeEventPretrans
-    global removenorebootok
-
-   
-    for tsmem in ts.getMembers():
-        (n, a, e, v, r) = tsmem.po.pkgtup
-	# n: name ; a : arch; e: epoch ; v: version, r: release
-	#if tsmem.output_state in TS_INSTALL_STATES:	
-	#  thispo = rpmdb.searchNevra(name=n, arch=a, epoch=e, ver=v, rel=r)[0]
-
-        # we're upgrading/installing/removing a rebootpkgs package.. a reboot is required
-        for pkg in rebootpkgs:
-            if n.startswith(pkg):
-                log('**Package: ' + tsmem.name + ' triggers reboot')
-		# we do some exclusions -devel -doc ...
-                if  pkg in rebootpkgsexclude:
-		    cont=False
-                    for name in rebootpkgsexclude[pkg]:
-                        if n.startswith(pkg + name):
-			    cont=True
-		    if cont:
-			# this is an exception we do not need reboot : -devel, -doc ...
-			continue
-		# either no exception or does not fit exceptions: we need reboot
-		smechange = True
-                smechangelist[n]=str(tsmem.po.state) + " " + str(tsmem.current_state) + " " + str(tsmem.output_state)
-                log("smechange set to True because of " + n + " with " + str(tsmem.po.state) + " " + str(tsmem.current_state) + " " + str(tsmem.output_state))
-		#log("smechange set to True because of " + pkg)
-
-        # check if we're upgrading a restartpkgs rpm
-        for pkg in restartpkgs:
-            if n.startswith(pkg):
-                if pkg in servicenames:
-                    for name in servicenames[pkg]:
-                        if not serviceslist.has_key(name):
-                            serviceslist[name] = 'restart'
-                else:
-                    if not serviceslist.has_key(pkg):
-                        serviceslist[pkg] = 'restart'
-
-
-        #if smechange is true we can ignore the following part
-	# wondering  if we reallly do want to ignore that : let's say we want to delay kernel reboot, 
-	# could we at least configure httpd cleanly until next week ?
-	# also when updating a package the erasing flag was on and prevented to do this ....
-        # if not smechange and not erasing:
-        if True:
-
-            smeevent = tsmem.name + '-update'
-            if os.path.isdir(events_path + os.sep + smeevent):
-                tmppath = events_path + os.sep + smeevent + os.sep
-                eventlist[tsmem.name] = smeevent
-
-                files = [f for f in os.listdir(tmppath)]
-                for f in files:
-                    if os.path.islink(tmppath + f):
-
-                        mytmpaction = os.path.realpath(os.readlink(tmppath + f).replace("..",events_path))
-                        #log(" link " + f + ": " + mytmpaction)
-			actionlist[f]=mytmpaction
-
-
-                if os.path.isdir(tmppath + "templates2expand" + os.sep):
-                    tmppathtmpl = tmppath + "templates2expand" + os.sep
-                    for subdir, dirs, files in os.walk(tmppathtmpl):
-                        for file in files:
-                            mytmptemplate = os.path.join(subdir, file).replace(tmppathtmpl,os.sep)
-                            if not templateslist.has_key(mytmptemplate):
-                                templateslist[mytmptemplate]=mytmptemplate
-                            log(" template " + mytmptemplate)
-
-                if os.path.isdir(tmppath + "services2adjust" + os.sep):
-                    tmppathsrv = tmppath + "services2adjust" + os.sep
-                    files = [f for f in os.listdir(tmppathsrv)]
-                    for f in files:
-                        if os.path.islink(tmppathsrv + f):
-                            log(" service link " + f + ": " + (os.readlink(tmppathsrv + f)))
-                            mytmpserv = os.readlink(tmppathsrv + f)
-                            if not serviceslist.has_key(f):
-                                serviceslist[f]=mytmpserv
-                            else:
-                                if mytmpserv == "restart":
-                                    #only for debug
-                                    log("overriding all signals, forcing restart " + f)
-                                    serviceslist[f]="restart"
-		if tsmem.output_state in TS_INSTALL_STATES:
-          	    thispo = rpmdb.searchNevra(name=n, arch=a, epoch=e, ver=v, rel=r)[0]
-          	    # thispo.dirlist thispo.ghostlist thispo.filelist
-		    if "/etc/e-smith/web/panels/manager/cgi-bin" in thispo.dirlist:
-		        log(" ==> pannel detected : adding navigation-conf")
-			actionlist['S80navigation-conf']="/etc/e-smith/events/actions/navigation-conf"
-
-            else:
-                if (n.startswith('smeserver') or n.startswith('e-smith')) and not n.startswith('smeserver-locale') and not (n in removenorebootok):
-                    smechange = True
-		    smechangelist[n]=str(tsmem.po.state) + " " + str(tsmem.current_state) + " " + str(tsmem.output_state)
-		    log("smechange set to True because of " + n + " with " + str(tsmem.po.state) + " " + str(tsmem.current_state) + " " + str(tsmem.output_state) )
-    
-    #only for debug
-    log('## smechange: '+str(smechange))
-    log('## eventlist: '+ str(eventlist))
-    log('## templateslist: '+str(templateslist.keys()))
-    log('## serviceslist: '+str(serviceslist.items()))
-    log('## actions ALL: '  + str(actionlist.keys()))
-    log('## smechangelist: ' + str(smechangelist.keys()))
-
-    # check if smechange is true or if eventlist has items.. in both cases we must initialize databases
-    if smechange == True or len(eventlist)>0:
-        print 'Initializing databases'
-        os.spawnl(os.P_WAIT, initialize_database, initialize_database)
-
-    # just in case we add systemd-default and systemd-reload
-    if not actionlist.has_key('S88systemd-default'):
-        actionlist['S88systemd-default'] = '/etc/e-smith/events/actions/systemd-default'
-    if not actionlist.has_key('S89systemd-reload'):
-        actionlist['S89systemd-reload'] = '/etc/e-smith/events/actions/systemd-reload'
-
-    # here we would like to remove duplicates
-    # those are potential : S??navigation-conf S??systemd-reload S??systemd-default
-    for act in ('navigation-conf','systemd-reload','systemd-default'):
-    	global iter 
-	iter = 0
-    	for key in actionlist.keys():
-		if key.endswith(act):
-		    iter += 1
-		    if iter>1:
-		        del actionlist[key]
-		        log("removing duplicate action " + key + " iter " + str(iter))
-    
-
-    # now, if smechange is false (no reboot needed), we can execute actions, expand templates and adjust services
-
-    # create an empty temp event
-    print "Creating temporary event 'temp' and populating it..."
-    createevent()
-
-    # fill it with our list of actions
-    if len(actionlist)>0:
-	print " Adding actions to execute"
-	for kactions in actionlist:
-            if os.path.isfile(actionlist[kactions]):
-		log("  " + kactions)
-		os.symlink(actionlist[kactions],'/etc/e-smith/events/temp/' + kactions)
-
-    # fill it with our list of templates to expand
-    if len(templateslist)>0:
-        print " Adding templates to expand"
-        for ktemplates in templateslist:
-            mytemplatedir = '/etc/e-smith/templates/' + ktemplates
-            mytemplatemeta = '/etc/e-smith/templates.metadata/' + ktemplates
-            if os.path.exists(mytemplatedir) or  os.path.exists(mytemplatemeta):
-		log("  " + ktemplates)
-                addtemplate2expand(ktemplates)
-
-    if len(serviceslist)>0:
-        print " Adding services to adjust"
-        for kservices in serviceslist:
-            log("  " + kservices + ": " + serviceslist[kservices])
-	    os.symlink(serviceslist[kservices], '/etc/e-smith/events/temp/services2adjust/' + kservices)
-
-    # execute the event ; should we really wait ??
-    print "Executing signal-event temp ..........."
-    os.spawnl(os.P_WAIT,signal_event,signal_event, 'temp')
-
-    if smechange:
-        os.spawnl(os.P_WAIT, config_set, config_set, 'set', 'UnsavedChanges', 'yes')
-        os.spawnl(os.P_WAIT, navigation_conf, navigation_conf)
-	syslog.syslog('Needs signal-event post-upgrade; signal-event reboot because of: ' + str(smechangelist.keys()) )
-    print "Reload yum db for server-manager"
-    os.spawnl(os.P_WAIT, systemctl, systemctl, 'restart', 'yum')
-
-def close_hook(conduit):
-    if ourfile and os.path.isfile(status_file):
-        os.unlink(status_file)
-
-    if smechange:
-	print "\nThe following updates require a server reboot:\n" + str(smechangelist.keys()) 
-        print "\n=============================================================="
-        print "WARNING: You now need to run BOTH of the following commands"
-        print "to ensure consistent system state:\n"
-        print "signal-event post-upgrade; signal-event reboot\n"
-        print "You should run these commands unless you are certain that"
-        print "yum made no changes to your system."
-        print "=============================================================="
-

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-EPEL-7

@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBFKuaIQBEAC1UphXwMqCAarPUH/ZsOFslabeTVO2pDk5YnO96f+rgZB7xArB
-OSeQk7B90iqSJ85/c72OAn4OXYvT63gfCeXpJs5M7emXkPsNQWWSju99lW+AqSNm
-jYWhmRlLRGl0OO7gIwj776dIXvcMNFlzSPj00N2xAqjMbjlnV2n2abAE5gq6VpqP
-vFXVyfrVa/ualogDVmf6h2t4Rdpifq8qTHsHFU3xpCz+T6/dGWKGQ42ZQfTaLnDM
-jToAsmY0AyevkIbX6iZVtzGvanYpPcWW4X0RDPcpqfFNZk643xI4lsZ+Y2Er9Yu5
-S/8x0ly+tmmIokaE0wwbdUu740YTZjCesroYWiRg5zuQ2xfKxJoV5E+Eh+tYwGDJ
-n6HfWhRgnudRRwvuJ45ztYVtKulKw8QQpd2STWrcQQDJaRWmnMooX/PATTjCBExB
-9dkz38Druvk7IkHMtsIqlkAOQMdsX1d3Tov6BE2XDjIG0zFxLduJGbVwc/6rIc95
-T055j36Ez0HrjxdpTGOOHxRqMK5m9flFbaxxtDnS7w77WqzW7HjFrD0VeTx2vnjj
-GqchHEQpfDpFOzb8LTFhgYidyRNUflQY35WLOzLNV+pV3eQ3Jg11UFwelSNLqfQf
-uFRGc+zcwkNjHh5yPvm9odR1BIfqJ6sKGPGbtPNXo7ERMRypWyRz0zi0twARAQAB
-tChGZWRvcmEgRVBFTCAoNykgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB
-AgAiBQJSrmiEAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBqL66iNSxk
-5cfGD/4spqpsTjtDM7qpytKLHKruZtvuWiqt5RfvT9ww9GUUFMZ4ZZGX4nUXg49q
-ixDLayWR8ddG/s5kyOi3C0uX/6inzaYyRg+Bh70brqKUK14F1BrrPi29eaKfG+Gu
-MFtXdBG2a7OtPmw3yuKmq9Epv6B0mP6E5KSdvSRSqJWtGcA6wRS/wDzXJENHp5re
-9Ism3CYydpy0GLRA5wo4fPB5uLdUhLEUDvh2KK//fMjja3o0L+SNz8N0aDZyn5Ax
-CU9RB3EHcTecFgoy5umRj99BZrebR1NO+4gBrivIfdvD4fJNfNBHXwhSH9ACGCNv
-HnXVjHQF9iHWApKkRIeh8Fr2n5dtfJEF7SEX8GbX7FbsWo29kXMrVgNqHNyDnfAB
-VoPubgQdtJZJkVZAkaHrMu8AytwT62Q4eNqmJI1aWbZQNI5jWYqc6RKuCK6/F99q
-thFT9gJO17+yRuL6Uv2/vgzVR1RGdwVLKwlUjGPAjYflpCQwWMAASxiv9uPyYPHc
-ErSrbRG0wjIfAR3vus1OSOx3xZHZpXFfmQTsDP7zVROLzV98R3JwFAxJ4/xqeON4
-vCPFU6OsT3lWQ8w7il5ohY95wmujfr6lk89kEzJdOTzcn7DBbUru33CQMGKZ3Evt
-RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw==
-=hdPa
------END PGP PUBLIC KEY BLOCK-----

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

@@ -0,0 +1,104 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=mCOI
+-----END PGP PUBLIC KEY BLOCK-----

root/usr/share/rpm-gpg-keys/RPM-GPG-KEY-rpmfusion-free-el-7

@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFVE8DcBEACmsFjnapHXm5l0dXbyxXZU8sZVawRIQ/lG9Yc9tSICcY8QuSxu
-636wsVHiQHd0sIipk6vvgWfTTV+w0OxyovY8PFciEtOC4JZBJO1cT952sDxRTzcU
-Y+DArqPUwqyMqJo86BxwoQi9qdg4eNlp5RNamzbu2yKpPZUk4RWF0QnlEJ5bQ8xY
-Q2HyzR6YUsKBuCbNV/OevxxSjSFesWqmE2zIFVDsNvS+FGbH6SwDrKgBeDHCeg35
-KQgHyNkONoe7EjfCVdWwWsOdo9pqEKZKd4U6Sz234d9JqvF7y3+Lc85l/TxU+G/C
-uXxRki5XVx3sMH0UgK0nn0fBEv95Dtq5I7EWNYDOesFDbBRjhqo5dh51yOcfn1QO
-ATKGwo2WZTGc32kOXwu/zzZaT37HulyOpJ/8jAoOQ6qH5T7RDy2M1vlAvGcdy2dz
-GUyD2bNlPSp1exw6CWOXjty/9nOglJBBsr/YwTundSKpZSKPkn3z74ZAD4Pqviwx
-yRsk1UjHlCm8sPfahkpRheFKDJT/wIBUhI7tbzyfxMaNwryc1U+yOiAl92sMr8ra
-a0CGk48cFa6vulSq/ELdt/qF+I0TywacaTvU3ySSd3Juff54c8ELNBjTGY4MAomk
-y1P755q83yBdYaRDU6U1ljKP1GP8Kgilk6QCWu1izFPepPK4Bi7ZGTUEhQARAQAB
-tE5SUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRUwgKDcpIDxycG1mdXNp
-b24tYnVpbGRzeXNAbGlzdHMucnBtZnVzaW9uLm9yZz6JAjIEEwECABwFAlVE8DcC
-GwMECwkIBwMVCAoDFgIAAh4BAheAAAoJEHWLPRj1z2weGigQAKO+ULRBzztGDg3m
-ev8rDEOfv49x3T4+tTYlMOtvsg8Jvi5okGp+bXO0qZkw8463Ljrs5FAW1/oIGFYA
-D9RMDnlgpDAhP6Gho/tGIPc6yfSHOUm2uS5Ve1Q7j3eBHr8IlAvpg/1U9IIS7LDU
-WcVNjpsBzog8pGXRBSYx5yi7ddP5GcQPLwn0TT7jkawzrlmfnMz3un6gaxgFIxmS
-wzd+lr7CHP3Lptxt3Oe5pliEQ58kuBzt0gkxGkkbeRyolareanJBlIozYIM3TQum
-K4UbXIjPWlHr02z+qtrkpkDgM5aO+rEPGctd4W12zT5Gqp5Ij5fuFUHgFKvxf+0F
-t7RDWffAiKtk8HX0PoytIBY9fiQtZXjnbPq1rT65brz6bc85HR3sRx2+gn9IN+Cg
-OwdV7NoL8Dj7w3J5DMS1yT1KbmwRHHyKD0muL3NUw9RZXPmmUakbIvLZlERKhyca
-JZlkakLUOvesXcZg2Zqug36ET0AQO/Af7e6dw8jXBc4BN/R5U8LU0ENaB3apRcdF
-NEDqxPo98MGzIxqJUjWkwJfRvdqAPEM8JLeyhcuChsmwIGF0WbLsmVJ90LJxsoZQ
-G+iQKiFwF8HO6fBk4APSAtic+j+9uHoLMS9tWsLABmNQCvjtRe6hxz20yud672uo
-OEGWGYNPKeu56Dbc18pxBHez9m42
-=buWg
------END PGP PUBLIC KEY BLOCK-----

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-----

root/usr/share/rpm-gpg-keys/Readme

@@ -0,0 +1,4 @@
+Here you can place gpg signing key for rpm you want to install.
+All files need to :
+- start with RPM-GPG-KEY
+- contain only one signing key

smeserver-update.spec

@@ -2,7 +2,7 @@
 Summary: Koozali SME Server rpm updater
 Name: %{name}
 %define version 11.0.0
-%define release 3
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -11,7 +11,7 @@ Source: %{name}-%{version}.tar.xz
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Provides: smeserver-yum-%{version}-%{release}
+Provides: smeserver-yum
 Obsoletes: smeserver-yum < %{version}-%{release}
 Requires: smeserver-formmagick
 Requires: smeserver-base
@@ -23,9 +23,7 @@ Requires: dnf-automatic
 Requires: python3-dnf-plugins-core
 Requires: python3-dnf-plugin-post-transaction-actions
 Requires: python3-dnf-plugin-versionlock
-#Requires: yum-plugin-fastestmirror
-#Requires: yum-plugin-priorities
-#Requires: yum-plugin-post-transaction-actions
+Requires: perl(File::Slurp)
 Requires: mailx
 BuildRequires: smeserver-devtools 
 BuildRequires: python3
@@ -70,7 +68,66 @@ mkdir -p root/etc/yum.smerepos.d
 
 
 %changelog
-* Mon Mar 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-3.sme
+* Wed Mar 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-21.sme
+- fix not all gpg keys are imported [SME: 12960]
+
+* Sat Mar 08 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-20.sme
+- deactivate mariadb 10.5 module [SME: 12955]
+- add mariadb gpg key [SME: 12955]
+
+* Wed Mar 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-19.sme
+- set module php 84 [SME: 12952]
+- remove openfusion repo [SME: 12882]
+
+* 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
+- fix python error in dnf plugin [SME: 12631]
+
+* Mon Apr 08 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
+- fix python error in dnf plugin [SME: 12601]
+- fix server error in old manager [SME: 12602]
+
+* Thu Apr 04 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-6.sme
+- rewrite smeserver.py plugin [SME: 12113]
+- fix migrate template 39VisibleSmeContribs, 45RockyEOL [SME: 12549]
+
+* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-5.sme
+- Set license file to GPL2.0  [SME: 12577]
+
+* Mon Mar 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
 - initial release of smeserver-update based on smeserver-yum [SME: 12114]
   * tidy centos repos, add rocky repos, add support for metalinks
   * tidy most references to yum (except manager), tidy config and templates