saving uncommitted changes in /etc prior to dnf run

.etckeeper

@@ -302,14 +302,10 @@ maybe chmod 0644 'clamd.conf.rpmnew'
 maybe chown 'amavis' 'clamd.conf.rpmsave'
 maybe chgrp 'amavis' 'clamd.conf.rpmsave'
 maybe chmod 0644 'clamd.conf.rpmsave'
-maybe chown 'amavis' 'clamd.d'
-maybe chgrp 'amavis' 'clamd.d'
 maybe chmod 0755 'clamd.d'
 maybe chown 'amavis' 'clamd.d/amavisd.conf'
 maybe chgrp 'amavis' 'clamd.d/amavisd.conf'
 maybe chmod 0644 'clamd.d/amavisd.conf'
-maybe chown 'amavis' 'clamd.d/scan.conf'
-maybe chgrp 'amavis' 'clamd.d/scan.conf'
 maybe chmod 0644 'clamd.d/scan.conf'
 maybe chown 'amavis' 'clamd.d/scan.conf.rpmnew'
 maybe chgrp 'amavis' 'clamd.d/scan.conf.rpmnew'
@@ -3766,6 +3762,16 @@ maybe chgrp 'mock' 'mock/fedora-37-s390x.cfg'
 maybe chmod 0644 'mock/fedora-37-s390x.cfg'
 maybe chgrp 'mock' 'mock/fedora-37-x86_64.cfg'
 maybe chmod 0644 'mock/fedora-37-x86_64.cfg'
+maybe chgrp 'mock' 'mock/fedora-38-aarch64.cfg'
+maybe chmod 0644 'mock/fedora-38-aarch64.cfg'
+maybe chgrp 'mock' 'mock/fedora-38-i386.cfg'
+maybe chmod 0644 'mock/fedora-38-i386.cfg'
+maybe chgrp 'mock' 'mock/fedora-38-ppc64le.cfg'
+maybe chmod 0644 'mock/fedora-38-ppc64le.cfg'
+maybe chgrp 'mock' 'mock/fedora-38-s390x.cfg'
+maybe chmod 0644 'mock/fedora-38-s390x.cfg'
+maybe chgrp 'mock' 'mock/fedora-38-x86_64.cfg'
+maybe chmod 0644 'mock/fedora-38-x86_64.cfg'
 maybe chgrp 'mock' 'mock/fedora-eln-aarch64.cfg'
 maybe chmod 0644 'mock/fedora-eln-aarch64.cfg'
 maybe chgrp 'mock' 'mock/fedora-eln-i386.cfg'

mock/fedora-38-aarch64.cfg

@@ -1 +0,0 @@
-fedora-rawhide-aarch64.cfg

mock/fedora-38-aarch64.cfg

@@ -0,0 +1,5 @@
+config_opts['releasever'] = '38'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
+
+include('templates/fedora-branched.tpl')

mock/fedora-38-i386.cfg

@@ -1 +0,0 @@
-fedora-rawhide-i386.cfg

mock/fedora-38-i386.cfg

@@ -0,0 +1,5 @@
+config_opts['releasever'] = '38'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
+
+include('templates/fedora-branched.tpl')

mock/fedora-38-ppc64le.cfg

@@ -1 +0,0 @@
-fedora-rawhide-ppc64le.cfg

mock/fedora-38-ppc64le.cfg

@@ -0,0 +1,5 @@
+config_opts['releasever'] = '38'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)
+
+include('templates/fedora-branched.tpl')

mock/fedora-38-s390x.cfg

@@ -1 +0,0 @@
-fedora-rawhide-s390x.cfg

mock/fedora-38-s390x.cfg

@@ -0,0 +1,5 @@
+config_opts['releasever'] = '38'
+config_opts['target_arch'] = 's390x'
+config_opts['legal_host_arches'] = ('s390x',)
+
+include('templates/fedora-branched.tpl')

mock/fedora-38-x86_64.cfg

@@ -1 +0,0 @@
-fedora-rawhide-x86_64.cfg

mock/fedora-38-x86_64.cfg

@@ -0,0 +1,5 @@
+config_opts['releasever'] = '38'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+
+include('templates/fedora-branched.tpl')

mock/fedora-39-aarch64.cfg

@@ -0,0 +1 @@
+fedora-rawhide-aarch64.cfg

mock/fedora-39-i386.cfg

@@ -0,0 +1 @@
+fedora-rawhide-i386.cfg

mock/fedora-39-ppc64le.cfg

@@ -0,0 +1 @@
+fedora-rawhide-ppc64le.cfg

mock/fedora-39-s390x.cfg

@@ -0,0 +1 @@
+fedora-rawhide-s390x.cfg

mock/fedora-39-x86_64.cfg

@@ -0,0 +1 @@
+fedora-rawhide-x86_64.cfg

mock/templates/almalinux-8.tpl

@@ -34,7 +34,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos
 enabled=1
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 skip_if_unavailable=False
 
 [appstream]
@@ -44,7 +43,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream
 enabled=1
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [powertools]
 name=AlmaLinux $releasever - PowerTools
@@ -53,7 +51,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools
 enabled=1
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [extras]
 name=AlmaLinux $releasever - Extras
@@ -62,7 +59,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras
 enabled=1
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [devel]
 name=AlmaLinux $releasever - Devel (WARNING: UNSUPPORTED - FOR BUILDROOT USE ONLY!)
@@ -71,7 +67,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [baseos-debuginfo]
 name=AlmaLinux $releasever - BaseOS debuginfo
@@ -80,7 +75,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [appstream-debuginfo]
 name=AlmaLinux $releasever - AppStream debuginfo
@@ -89,7 +83,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debugi
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [powertools-debuginfo]
 name=AlmaLinux $releasever - PowerTools debuginfo
@@ -98,7 +91,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debug
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [extras-debuginfo]
 name=AlmaLinux $releasever - Extras debuginfo
@@ -107,7 +99,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [devel-debuginfo]
 name=AlmaLinux $releasever - Devel debuginfo
@@ -116,7 +107,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel-debuginfo
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [baseos-source]
 name=AlmaLinux $releasever - BaseOS Source
@@ -125,7 +115,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [appstream-source]
 name=AlmaLinux $releasever - AppStream Source
@@ -134,7 +123,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [powertools-source]
 name=AlmaLinux $releasever - PowerTools Source
@@ -143,7 +131,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-sourc
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [extras-source]
 name=AlmaLinux $releasever - Extras Source
@@ -152,7 +139,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 [devel-source]
 name=AlmaLinux $releasever - Devel Source
@@ -161,6 +147,5 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel-source
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8
-fastestmirror=1
 
 """

mock/templates/almalinux-9.tpl

@@ -34,7 +34,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos
 enabled=1
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 skip_if_unavailable=False
 
 [appstream]
@@ -44,7 +43,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream
 enabled=1
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [crb]
 name=AlmaLinux $releasever - CRB
@@ -53,7 +51,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb
 enabled=1
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [extras]
 name=AlmaLinux $releasever - Extras
@@ -62,7 +59,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras
 enabled=1
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [devel]
 name=AlmaLinux $releasever - Devel (WARNING: UNSUPPORTED - FOR BUILDROOT USE ONLY!)
@@ -71,7 +67,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [baseos-debuginfo]
 name=AlmaLinux $releasever - BaseOS debuginfo
@@ -80,7 +75,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [appstream-debuginfo]
 name=AlmaLinux $releasever - AppStream debuginfo
@@ -89,7 +83,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debugi
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [crb-debuginfo]
 name=AlmaLinux $releasever - CRB debuginfo
@@ -98,7 +91,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb-debuginfo
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [extras-debuginfo]
 name=AlmaLinux $releasever - Extras debuginfo
@@ -107,7 +99,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [devel-debuginfo]
 name=AlmaLinux $releasever - Devel debuginfo
@@ -116,7 +107,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel-debuginfo
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [baseos-source]
 name=AlmaLinux $releasever - BaseOS Source
@@ -125,7 +115,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [appstream-source]
 name=AlmaLinux $releasever - AppStream Source
@@ -134,7 +123,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [crb-source]
 name=AlmaLinux $releasever - CRB Source
@@ -143,7 +131,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb-source
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [extras-source]
 name=AlmaLinux $releasever - Extras Source
@@ -152,7 +139,6 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 [devel-source]
 name=AlmaLinux $releasever - Devel Source
@@ -161,6 +147,5 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel-source
 enabled=0
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
-fastestmirror=1
 
 """

mock/templates/fedora-eln.tpl

@@ -1,5 +1,5 @@
 config_opts['releasever'] = 'eln'
-config_opts['eln_rawhide_releasever'] = '38'
+config_opts['eln_rawhide_releasever'] = '39'
 
 config_opts['root'] = 'fedora-eln-{{ target_arch }}'
 

mock/templates/fedora-rawhide.tpl

@@ -7,7 +7,7 @@ config_opts['chroot_setup_cmd'] = 'install @{% if mirrored %}buildsys-{% endif %
 
 config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '38'
+config_opts['releasever'] = '39'
 config_opts['package_manager'] = 'dnf'
 config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:rawhide'
 config_opts['description'] = 'Fedora Rawhide'

mock/templates/openeuler-22.03.tpl

@@ -27,45 +27,55 @@ protected_packages=
 module_platform_id=platform:oe2203
 user_agent={{ user_agent }}
 
+# all openEuler LTS release will continue developing and releasing SPx version
+# such as 22.03-LTS -> 22.03-LTS-SP1 -> 22.03-LTS-SP2 ...
+# all LTS-SPx is compatible with its LTS release
 [OS]
 name=OS
-baseurl=http://repo.openeuler.org/openEuler-22.03-LTS/OS/$basearch/
+baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/OS/$basearch/
 enabled=1
 gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
+gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
 
 [everything]
 name=everything
-baseurl=http://repo.openeuler.org/openEuler-22.03-LTS/everything/$basearch/
+baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/everything/$basearch/
 enabled=1
 gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
+gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
 
 [EPOL]
 name=EPOL
-baseurl=http://repo.openeuler.org/openEuler-22.03-LTS/EPOL/main/$basearch/
+baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/EPOL/main/$basearch/
 enabled=1
 gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
+gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
 
 [debuginfo]
 name=debuginfo
-baseurl=http://repo.openeuler.org/openEuler-22.03-LTS/debuginfo/$basearch/
+baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/debuginfo/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
+gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
 
 [source]
 name=source
-baseurl=http://repo.openeuler.org/openEuler-22.03-LTS/source/
+baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/source/
 enabled=0
 gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
+gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
 
 [update]
 name=update
-baseurl=http://repo.openeuler.org/openEuler-22.03-LTS/update/$basearch/
+baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/update/$basearch/
 enabled=1
 gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
+gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
+
+[update-source]
+name=update-source
+baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/update/source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
 """

rpm/macros.zzz-epel-override

@@ -25,35 +25,3 @@ else
 end
 print(bin)
 }
-
-
-# RHEL 8's %%pytest does not work properly on non-default Python versions.
-# Backported from https://src.fedoraproject.org/rpms/python-rpm-macros/c/02536540768555dde6d675935db45df81bcab7bf?branch=rawhide
-# https://bugzilla.redhat.com/show_bug.cgi?id=2091462
-%__pytest /usr/bin/pytest%(test %{python3_pkgversion} == 3 && echo -3 || echo -%{python3_version})
-
-# RHEL 8's %%py3_dist does not work properly on non-default Python versions.
-# This is copied here from https://git.centos.org/rpms/python-rpm-macros/pull-request/1
-# until that lands in RHEL.
-# https://bugzilla.redhat.com/show_bug.cgi?id=2090007
-
-# Creates Python 3 dist tag(s) after converting names to canonical format
-#   Needs to first put all arguments into a list, because invoking a different
-#   macro (%py_dist_name) overwrites them
-%py3_dist() %{lua:\
-        python3_pkgversion_with_dot = rpm.expand("%_python3_pkgversion_with_dot")\
-        args = {}\
-        arg = 1\
-        while (true) do\
-                name = rpm.expand("%{?" .. arg .. ":%{" .. arg .. "}}");\
-                if (name == nil or name == '') then\
-                        break\
-                end\
-                args[arg] = name\
-                arg = arg + 1\
-        end\
-        for arg, name in ipairs(args) do\
-                canonical = rpm.expand("%py_dist_name " .. name);\
-                print("python" .. python3_pkgversion_with_dot .. "dist(" .. canonical .. ") ");\
-        end\
-}