diff --git a/.etckeeper b/.etckeeper index 2a9275b..d634650 100755 --- a/.etckeeper +++ b/.etckeeper @@ -471,6 +471,8 @@ maybe chmod 0755 'dconf' maybe chmod 0755 'dconf/db' maybe chmod 0755 'dconf/db/distro.d' maybe chmod 0755 'dconf/db/distro.d/locks' +maybe chmod 0755 'debuginfod' +maybe chmod 0644 'debuginfod/elfutils.urls' maybe chmod 0755 'default' maybe chmod 0644 'default/grub' maybe chmod 0600 'default/useradd' @@ -2895,12 +2897,28 @@ maybe chgrp 'mock' 'mock/alma+epel-8-ppc64le.cfg' maybe chmod 0644 'mock/alma+epel-8-ppc64le.cfg' maybe chgrp 'mock' 'mock/alma+epel-8-x86_64.cfg' maybe chmod 0644 'mock/alma+epel-8-x86_64.cfg' +maybe chgrp 'mock' 'mock/alma+epel-9-aarch64.cfg' +maybe chmod 0644 'mock/alma+epel-9-aarch64.cfg' +maybe chgrp 'mock' 'mock/alma+epel-9-ppc64le.cfg' +maybe chmod 0644 'mock/alma+epel-9-ppc64le.cfg' +maybe chgrp 'mock' 'mock/alma+epel-9-s390x.cfg' +maybe chmod 0644 'mock/alma+epel-9-s390x.cfg' +maybe chgrp 'mock' 'mock/alma+epel-9-x86_64.cfg' +maybe chmod 0644 'mock/alma+epel-9-x86_64.cfg' maybe chgrp 'mock' 'mock/almalinux-8-aarch64.cfg' maybe chmod 0644 'mock/almalinux-8-aarch64.cfg' maybe chgrp 'mock' 'mock/almalinux-8-ppc64le.cfg' maybe chmod 0644 'mock/almalinux-8-ppc64le.cfg' maybe chgrp 'mock' 'mock/almalinux-8-x86_64.cfg' maybe chmod 0644 'mock/almalinux-8-x86_64.cfg' +maybe chgrp 'mock' 'mock/almalinux-9-aarch64.cfg' +maybe chmod 0644 'mock/almalinux-9-aarch64.cfg' +maybe chgrp 'mock' 'mock/almalinux-9-ppc64le.cfg' +maybe chmod 0644 'mock/almalinux-9-ppc64le.cfg' +maybe chgrp 'mock' 'mock/almalinux-9-s390x.cfg' +maybe chmod 0644 'mock/almalinux-9-s390x.cfg' +maybe chgrp 'mock' 'mock/almalinux-9-x86_64.cfg' +maybe chmod 0644 'mock/almalinux-9-x86_64.cfg' maybe chgrp 'mock' 'mock/amazonlinux-2-aarch64.cfg' maybe chmod 0644 'mock/amazonlinux-2-aarch64.cfg' maybe chgrp 'mock' 'mock/amazonlinux-2-x86_64.cfg' @@ -3334,6 +3352,14 @@ maybe chgrp 'mock' 'mock/rhel+epel-8-s390x.cfg' maybe chmod 0644 'mock/rhel+epel-8-s390x.cfg' maybe chgrp 'mock' 'mock/rhel+epel-8-x86_64.cfg' maybe chmod 0644 'mock/rhel+epel-8-x86_64.cfg' +maybe chgrp 'mock' 'mock/rhel+epel-9-aarch64.cfg' +maybe chmod 0644 'mock/rhel+epel-9-aarch64.cfg' +maybe chgrp 'mock' 'mock/rhel+epel-9-ppc64le.cfg' +maybe chmod 0644 'mock/rhel+epel-9-ppc64le.cfg' +maybe chgrp 'mock' 'mock/rhel+epel-9-s390x.cfg' +maybe chmod 0644 'mock/rhel+epel-9-s390x.cfg' +maybe chgrp 'mock' 'mock/rhel+epel-9-x86_64.cfg' +maybe chmod 0644 'mock/rhel+epel-9-x86_64.cfg' maybe chgrp 'mock' 'mock/rhel-7-aarch64.cfg' maybe chmod 0644 'mock/rhel-7-aarch64.cfg' maybe chgrp 'mock' 'mock/rhel-7-ppc64.cfg' @@ -3352,6 +3378,14 @@ maybe chgrp 'mock' 'mock/rhel-8-s390x.cfg' maybe chmod 0644 'mock/rhel-8-s390x.cfg' maybe chgrp 'mock' 'mock/rhel-8-x86_64.cfg' maybe chmod 0644 'mock/rhel-8-x86_64.cfg' +maybe chgrp 'mock' 'mock/rhel-9-aarch64.cfg' +maybe chmod 0644 'mock/rhel-9-aarch64.cfg' +maybe chgrp 'mock' 'mock/rhel-9-ppc64le.cfg' +maybe chmod 0644 'mock/rhel-9-ppc64le.cfg' +maybe chgrp 'mock' 'mock/rhel-9-s390x.cfg' +maybe chmod 0644 'mock/rhel-9-s390x.cfg' +maybe chgrp 'mock' 'mock/rhel-9-x86_64.cfg' +maybe chmod 0644 'mock/rhel-9-x86_64.cfg' maybe chgrp 'mock' 'mock/rocky+epel-8-aarch64.cfg' maybe chmod 0644 'mock/rocky+epel-8-aarch64.cfg' maybe chgrp 'mock' 'mock/rocky+epel-8-x86_64.cfg' @@ -3365,6 +3399,8 @@ maybe chmod 0644 'mock/site-defaults.cfg' maybe chmod 0755 'mock/templates' maybe chgrp 'mock' 'mock/templates/almalinux-8.tpl' maybe chmod 0644 'mock/templates/almalinux-8.tpl' +maybe chgrp 'mock' 'mock/templates/almalinux-9.tpl' +maybe chmod 0644 'mock/templates/almalinux-9.tpl' maybe chgrp 'mock' 'mock/templates/amazonlinux-2.tpl' maybe chmod 0644 'mock/templates/amazonlinux-2.tpl' maybe chgrp 'mock' 'mock/templates/centos-7.tpl' @@ -3423,6 +3459,8 @@ maybe chgrp 'mock' 'mock/templates/rhel-7.tpl' maybe chmod 0644 'mock/templates/rhel-7.tpl' maybe chgrp 'mock' 'mock/templates/rhel-8.tpl' maybe chmod 0644 'mock/templates/rhel-8.tpl' +maybe chgrp 'mock' 'mock/templates/rhel-9.tpl' +maybe chmod 0644 'mock/templates/rhel-9.tpl' maybe chgrp 'mock' 'mock/templates/rocky-8.tpl' maybe chmod 0644 'mock/templates/rocky-8.tpl' maybe chmod 0755 'modprobe.d' @@ -4557,6 +4595,8 @@ maybe chmod 0644 'profile.d/colorxzgrep.sh' maybe chmod 0644 'profile.d/colorzgrep.csh' maybe chmod 0644 'profile.d/colorzgrep.sh' maybe chmod 0644 'profile.d/csh.local' +maybe chmod 0644 'profile.d/debuginfod.csh' +maybe chmod 0644 'profile.d/debuginfod.sh' maybe chmod 0644 'profile.d/gawk.csh' maybe chmod 0644 'profile.d/gawk.sh' maybe chmod 0640 'profile.d/grc.sh' diff --git a/debuginfod/elfutils.urls b/debuginfod/elfutils.urls new file mode 100644 index 0000000..1f54c3c --- /dev/null +++ b/debuginfod/elfutils.urls @@ -0,0 +1 @@ +https://debuginfod.centos.org/ diff --git a/mock/alma+epel-9-aarch64.cfg b/mock/alma+epel-9-aarch64.cfg new file mode 100644 index 0000000..8c6f144 --- /dev/null +++ b/mock/alma+epel-9-aarch64.cfg @@ -0,0 +1,5 @@ +include('almalinux-9-aarch64.cfg') +include('templates/epel-9.tpl') + +config_opts['root'] = "alma+epel-9-{{ target_arch }}" +config_opts['description'] = 'AlmaLinux 9 + EPEL' diff --git a/mock/alma+epel-9-ppc64le.cfg b/mock/alma+epel-9-ppc64le.cfg new file mode 100644 index 0000000..d850af8 --- /dev/null +++ b/mock/alma+epel-9-ppc64le.cfg @@ -0,0 +1,5 @@ +include('almalinux-9-ppc64le.cfg') +include('templates/epel-9.tpl') + +config_opts['root'] = "alma+epel-9-{{ target_arch }}" +config_opts['description'] = 'AlmaLinux 9 + EPEL' diff --git a/mock/alma+epel-9-s390x.cfg b/mock/alma+epel-9-s390x.cfg new file mode 100644 index 0000000..8ef1693 --- /dev/null +++ b/mock/alma+epel-9-s390x.cfg @@ -0,0 +1,5 @@ +include('almalinux-9-s390x.cfg') +include('templates/epel-9.tpl') + +config_opts['root'] = "alma+epel-9-{{ target_arch }}" +config_opts['description'] = 'AlmaLinux 9 + EPEL' diff --git a/mock/alma+epel-9-x86_64.cfg b/mock/alma+epel-9-x86_64.cfg new file mode 100644 index 0000000..b897199 --- /dev/null +++ b/mock/alma+epel-9-x86_64.cfg @@ -0,0 +1,5 @@ +include('almalinux-9-x86_64.cfg') +include('templates/epel-9.tpl') + +config_opts['root'] = "alma+epel-9-{{ target_arch }}" +config_opts['description'] = 'AlmaLinux 9 + EPEL' diff --git a/mock/almalinux-8-x86_64.cfg b/mock/almalinux-8-x86_64.cfg index 7bc7d58..2e4b26d 100644 --- a/mock/almalinux-8-x86_64.cfg +++ b/mock/almalinux-8-x86_64.cfg @@ -1,6 +1,6 @@ include('templates/almalinux-8.tpl') config_opts['root'] = 'almalinux-8-x86_64' -config_opts['description'] = 'AlmaLinux 8 + EPEL' +config_opts['description'] = 'AlmaLinux 8' config_opts['target_arch'] = 'x86_64' config_opts['legal_host_arches'] = ('x86_64',) diff --git a/mock/almalinux-9-aarch64.cfg b/mock/almalinux-9-aarch64.cfg new file mode 100644 index 0000000..4781878 --- /dev/null +++ b/mock/almalinux-9-aarch64.cfg @@ -0,0 +1,6 @@ +include('templates/almalinux-9.tpl') + +config_opts['root'] = 'almalinux-9-aarch64' +config_opts['description'] = 'AlmaLinux 9' +config_opts['target_arch'] = 'aarch64' +config_opts['legal_host_arches'] = ('aarch64',) diff --git a/mock/almalinux-9-ppc64le.cfg b/mock/almalinux-9-ppc64le.cfg new file mode 100644 index 0000000..24e8afe --- /dev/null +++ b/mock/almalinux-9-ppc64le.cfg @@ -0,0 +1,6 @@ +include('templates/almalinux-9.tpl') + +config_opts['root'] = 'almalinux-9-ppc64le' +config_opts['description'] = 'AlmaLinux 9' +config_opts['target_arch'] = 'ppc64le' +config_opts['legal_host_arches'] = ('ppc64le',) diff --git a/mock/almalinux-9-s390x.cfg b/mock/almalinux-9-s390x.cfg new file mode 100644 index 0000000..c51b914 --- /dev/null +++ b/mock/almalinux-9-s390x.cfg @@ -0,0 +1,6 @@ +include('templates/almalinux-9.tpl') + +config_opts['root'] = 'almalinux-9-s390x' +config_opts['description'] = 'AlmaLinux 9' +config_opts['target_arch'] = 's390x' +config_opts['legal_host_arches'] = ('s390x',) diff --git a/mock/almalinux-9-x86_64.cfg b/mock/almalinux-9-x86_64.cfg new file mode 100644 index 0000000..438e76a --- /dev/null +++ b/mock/almalinux-9-x86_64.cfg @@ -0,0 +1,6 @@ +include('templates/almalinux-9.tpl') + +config_opts['root'] = 'almalinux-9-x86_64' +config_opts['description'] = 'AlmaLinux 9' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) diff --git a/mock/chroot-aliases.cfg b/mock/chroot-aliases.cfg index 5b66fce..1c0f785 100644 --- a/mock/chroot-aliases.cfg +++ b/mock/chroot-aliases.cfg @@ -36,3 +36,31 @@ config_opts["no-config"]["epel-8"]["alternatives"] = { ], }, } + +config_opts["no-config"]["epel-9"] = {} +config_opts["no-config"]["epel-9"]["alternatives"] = { + "alma+epel-9": { + "description": [ + "Builds against AlmaLinux 9 repositories, " + "together with the official EPEL repositories.", + "Project page: https://almalinux.org/" + ], + }, + "centos-stream+epel-9": { + "description": [ + "Builds against CentOS Stream 9 repositories (some packages " + "may be a bit ahead the Red Hat Enterprise Linux 9) together " + "with the official EPEL repositories.", + "Project page: https://www.centos.org/centos-stream/" + ], + }, + "rhel+epel-9": { + "description": [ + "Builds against Red Hat Enterprise Linux 9 repositories, " + "together with the official EPEL repositories.", + "This mimics what is done in the official EPEL build system, " + "but you need a Red Hat subscription:", + "https://rpm-software-management.github.io/mock/Feature-rhelchroots" + ], + }, +} diff --git a/mock/epel-9-aarch64.cfg b/mock/epel-9-aarch64.cfg deleted file mode 120000 index d424bce..0000000 --- a/mock/epel-9-aarch64.cfg +++ /dev/null @@ -1 +0,0 @@ -centos-stream+epel-9-aarch64.cfg \ No newline at end of file diff --git a/mock/epel-9-ppc64le.cfg b/mock/epel-9-ppc64le.cfg deleted file mode 120000 index 7b046eb..0000000 --- a/mock/epel-9-ppc64le.cfg +++ /dev/null @@ -1 +0,0 @@ -centos-stream+epel-9-ppc64le.cfg \ No newline at end of file diff --git a/mock/epel-9-s390x.cfg b/mock/epel-9-s390x.cfg deleted file mode 120000 index dacc0e3..0000000 --- a/mock/epel-9-s390x.cfg +++ /dev/null @@ -1 +0,0 @@ -centos-stream+epel-9-s390x.cfg \ No newline at end of file diff --git a/mock/epel-9-x86_64.cfg b/mock/epel-9-x86_64.cfg deleted file mode 120000 index 2e0a2f9..0000000 --- a/mock/epel-9-x86_64.cfg +++ /dev/null @@ -1 +0,0 @@ -centos-stream+epel-9-x86_64.cfg \ No newline at end of file diff --git a/mock/rhel+epel-9-aarch64.cfg b/mock/rhel+epel-9-aarch64.cfg new file mode 100644 index 0000000..b9d9007 --- /dev/null +++ b/mock/rhel+epel-9-aarch64.cfg @@ -0,0 +1,5 @@ +include('rhel-9-aarch64.cfg') +include('templates/epel-9.tpl') + +config_opts['root'] = "rhel+epel-9-{{ target_arch }}" +config_opts['description'] = 'RHEL 9 + EPEL' diff --git a/mock/rhel+epel-9-ppc64le.cfg b/mock/rhel+epel-9-ppc64le.cfg new file mode 100644 index 0000000..3eb7204 --- /dev/null +++ b/mock/rhel+epel-9-ppc64le.cfg @@ -0,0 +1,5 @@ +include('rhel-9-ppc64le.cfg') +include('templates/epel-9.tpl') + +config_opts['root'] = "rhel+epel-9-{{ target_arch }}" +config_opts['description'] = 'RHEL 9 + EPEL' diff --git a/mock/rhel+epel-9-s390x.cfg b/mock/rhel+epel-9-s390x.cfg new file mode 100644 index 0000000..fbe710e --- /dev/null +++ b/mock/rhel+epel-9-s390x.cfg @@ -0,0 +1,5 @@ +include('rhel-9-s390x.cfg') +include('templates/epel-9.tpl') + +config_opts['root'] = "rhel+epel-9-{{ target_arch }}" +config_opts['description'] = 'RHEL 9 + EPEL' diff --git a/mock/rhel+epel-9-x86_64.cfg b/mock/rhel+epel-9-x86_64.cfg new file mode 100644 index 0000000..4577353 --- /dev/null +++ b/mock/rhel+epel-9-x86_64.cfg @@ -0,0 +1,5 @@ +include('rhel-9-x86_64.cfg') +include('templates/epel-9.tpl') + +config_opts['root'] = "rhel+epel-9-{{ target_arch }}" +config_opts['description'] = 'RHEL 9 + EPEL' diff --git a/mock/rhel-9-aarch64.cfg b/mock/rhel-9-aarch64.cfg new file mode 100644 index 0000000..786f30a --- /dev/null +++ b/mock/rhel-9-aarch64.cfg @@ -0,0 +1,4 @@ +include('templates/rhel-9.tpl') + +config_opts['target_arch'] = 'aarch64' +config_opts['legal_host_arches'] = ('aarch64',) diff --git a/mock/rhel-9-ppc64le.cfg b/mock/rhel-9-ppc64le.cfg new file mode 100644 index 0000000..a5fb1a5 --- /dev/null +++ b/mock/rhel-9-ppc64le.cfg @@ -0,0 +1,4 @@ +include('templates/rhel-9.tpl') + +config_opts['target_arch'] = 'ppc64le' +config_opts['legal_host_arches'] = ('ppc64le',) diff --git a/mock/rhel-9-s390x.cfg b/mock/rhel-9-s390x.cfg new file mode 100644 index 0000000..c3f8362 --- /dev/null +++ b/mock/rhel-9-s390x.cfg @@ -0,0 +1,4 @@ +include('templates/rhel-9.tpl') + +config_opts['target_arch'] = 's390x' +config_opts['legal_host_arches'] = ('s390x',) diff --git a/mock/rhel-9-x86_64.cfg b/mock/rhel-9-x86_64.cfg new file mode 100644 index 0000000..477c1a3 --- /dev/null +++ b/mock/rhel-9-x86_64.cfg @@ -0,0 +1,4 @@ +include('templates/rhel-9.tpl') + +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) diff --git a/mock/templates/almalinux-8.tpl b/mock/templates/almalinux-8.tpl index a966b85..c5305da 100644 --- a/mock/templates/almalinux-8.tpl +++ b/mock/templates/almalinux-8.tpl @@ -33,7 +33,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos # baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/ enabled=1 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 skip_if_unavailable=False @@ -43,7 +43,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream # baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/ enabled=1 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [powertools] @@ -52,7 +52,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools # baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/$basearch/os/ enabled=1 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [extras] @@ -61,7 +61,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras # baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/ enabled=1 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [devel] @@ -70,7 +70,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel # baseurl=https://repo.almalinux.org/almalinux/$releasever/devel/$basearch/os/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [baseos-debuginfo] @@ -79,7 +79,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo # baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/debug/$basearch/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [appstream-debuginfo] @@ -88,7 +88,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debugi # baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/debug/$basearch/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [powertools-debuginfo] @@ -97,7 +97,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debug # baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/debug/$basearch/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [extras-debuginfo] @@ -106,7 +106,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo # baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/debug/$basearch/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [devel-debuginfo] @@ -115,7 +115,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel-debuginfo # baseurl=https://repo.almalinux.org/almalinux/$releasever/devel/debug/$basearch/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [baseos-source] @@ -124,7 +124,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source # baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/Source/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [appstream-source] @@ -133,7 +133,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source # baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/Source/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [powertools-source] @@ -142,7 +142,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-sourc # baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/Source/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [extras-source] @@ -151,7 +151,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source # baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/Source/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 [devel-source] @@ -160,7 +160,7 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel-source # baseurl=https://repo.almalinux.org/almalinux/$releasever/devel/Source/ enabled=0 gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-8 fastestmirror=1 """ diff --git a/mock/templates/almalinux-9.tpl b/mock/templates/almalinux-9.tpl new file mode 100644 index 0000000..6466b90 --- /dev/null +++ b/mock/templates/almalinux-9.tpl @@ -0,0 +1,166 @@ +config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk glibc-minimal-langpack grep gzip info patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz' +config_opts['dist'] = 'el9.alma' # only useful for --resultdir variable subst +config_opts['releasever'] = '9' +config_opts['package_manager'] = 'dnf' +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['bootstrap_image'] = 'quay.io/almalinux/almalinux:9' + + +config_opts['dnf.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +metadata_expire=0 +mdpolicy=group:primary +best=1 +install_weak_deps=0 +protected_packages= +module_platform_id=platform:el9 +user_agent={{ user_agent }} + + +[baseos] +name=AlmaLinux $releasever - BaseOS +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos +# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/ +enabled=1 +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9 +fastestmirror=1 +skip_if_unavailable=False + +[appstream] +name=AlmaLinux $releasever - AppStream +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream +# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/ +enabled=1 +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9 +fastestmirror=1 + +[crb] +name=AlmaLinux $releasever - CRB +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb +# baseurl=https://repo.almalinux.org/almalinux/$releasever/CRB/$basearch/os/ +enabled=1 +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9 +fastestmirror=1 + +[extras] +name=AlmaLinux $releasever - Extras +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras +# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/ +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!) +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel +# baseurl=https://repo.almalinux.org/almalinux/$releasever/devel/$basearch/os/ +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 +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/debug/$basearch/ +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 +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/debug/$basearch/ +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 +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/$releasever/CRB/debug/$basearch/ +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 +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/debug/$basearch/ +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 +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/$releasever/devel/debug/$basearch/ +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 +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source +# baseurl=https://repo.almalinux.org/almalinux/$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 +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source +# baseurl=https://repo.almalinux.org/almalinux/$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 +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb-source +# baseurl=https://repo.almalinux.org/almalinux/$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 +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source +# baseurl=https://repo.almalinux.org/almalinux/$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 +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/devel-source +# baseurl=https://repo.almalinux.org/almalinux/$releasever/devel/Source/ +enabled=0 +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9 +fastestmirror=1 + +""" diff --git a/mock/templates/rhel-9.tpl b/mock/templates/rhel-9.tpl new file mode 100644 index 0000000..b6d511e --- /dev/null +++ b/mock/templates/rhel-9.tpl @@ -0,0 +1,65 @@ +config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk glibc-minimal-langpack grep gzip info patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz' +config_opts['releasever'] = '9' +config_opts['dist'] = 'el{{ releasever }}' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['package_manager'] = 'dnf' +config_opts['bootstrap_image'] = 'registry.access.redhat.com/ubi{{ releasever }}/ubi' +config_opts['description'] = 'RHEL {{ releasever }}' + +config_opts['dnf_install_command'] += ' subscription-manager' +config_opts['yum_install_command'] += ' subscription-manager' + +config_opts['root'] = 'rhel-{{ releasever }}-{{ target_arch }}' + +config_opts['redhat_subscription_required'] = True + +config_opts['dnf.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=1 +assumeyes=1 +syslog_ident=mock +syslog_device= +install_weak_deps=0 +metadata_expire=0 +best=1 +module_platform_id=platform:el{{ releasever }} +protected_packages= +user_agent={{ user_agent }} + +# repos +[baseos] +name = Red Hat Enterprise Linux - BaseOS +baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/baseos/os/ +sslverify = 1 +sslcacert = /etc/rhsm/ca/redhat-uep.pem +sslclientkey = /etc/pki/entitlement/{{ redhat_subscription_key_id }}-key.pem +sslclientcert = /etc/pki/entitlement/{{ redhat_subscription_key_id }}.pem +gpgkey = file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat{{ releasever }}-release +skip_if_unavailable=False + +[appstream] +name = Red Hat Enterprise Linux - AppStream +baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/appstream/os/ +sslverify = 1 +sslcacert = /etc/rhsm/ca/redhat-uep.pem +sslclientkey = /etc/pki/entitlement/{{ redhat_subscription_key_id }}-key.pem +sslclientcert = /etc/pki/entitlement/{{ redhat_subscription_key_id }}.pem +gpgkey = file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat{{ releasever }}-release +skip_if_unavailable=False + +[codeready-builder] +name = Red Hat Enterprise Linux - CodeReady Linux Builder +baseurl = https://cdn.redhat.com/content/dist/rhel9/$releasever/$basearch/codeready-builder/os/ +sslverify = 1 +sslcacert = /etc/rhsm/ca/redhat-uep.pem +sslclientkey = /etc/pki/entitlement/{{ redhat_subscription_key_id }}-key.pem +sslclientcert = /etc/pki/entitlement/{{ redhat_subscription_key_id }}.pem +gpgkey = file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat{{ releasever }}-release +skip_if_unavailable=False +""" diff --git a/nginx/mime.types b/nginx/mime.types index 2961256..1c00d70 100644 --- a/nginx/mime.types +++ b/nginx/mime.types @@ -15,6 +15,7 @@ types { text/vnd.wap.wml wml; text/x-component htc; + image/avif avif; image/png png; image/svg+xml svg svgz; image/tiff tif tiff; @@ -51,6 +52,7 @@ types { application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; application/vnd.wap.wmlc wmlc; + application/wasm wasm; application/x-7z-compressed 7z; application/x-cocoa cco; application/x-java-archive-diff jardiff; diff --git a/profile.d/debuginfod.csh b/profile.d/debuginfod.csh new file mode 100644 index 0000000..c01f682 --- /dev/null +++ b/profile.d/debuginfod.csh @@ -0,0 +1,16 @@ +# $HOME/.login* or similar files may first set $DEBUGINFOD_URLS. +# If $DEBUGINFOD_URLS is not set there, we set it from system *.url files. +# $HOME/.*rc or similar files may then amend $DEBUGINFOD_URLS. +# See also [man debuginfod-client-config] for other environment variables +# such as $DEBUGINFOD_MAXSIZE, $DEBUGINFOD_MAXTIME, $DEBUGINFOD_PROGRESS. + +if (! $?DEBUGINFOD_URLS) then + set prefix="/usr" + set DEBUGINFOD_URLS=`sh -c 'cat "$0"/*.urls 2>/dev/null; :' "/etc/debuginfod" | tr '\n' ' '` + if ( "$DEBUGINFOD_URLS" != "" ) then + setenv DEBUGINFOD_URLS "$DEBUGINFOD_URLS" + else + unset DEBUGINFOD_URLS + endif + unset prefix +endif diff --git a/profile.d/debuginfod.sh b/profile.d/debuginfod.sh new file mode 100644 index 0000000..8f94ca4 --- /dev/null +++ b/profile.d/debuginfod.sh @@ -0,0 +1,12 @@ +# $HOME/.profile* or similar files may first set $DEBUGINFOD_URLS. +# If $DEBUGINFOD_URLS is not set there, we set it from system *.url files. +# $HOME/.*rc or similar files may then amend $DEBUGINFOD_URLS. +# See also [man debuginfod-client-config] for other environment variables +# such as $DEBUGINFOD_MAXSIZE, $DEBUGINFOD_MAXTIME, $DEBUGINFOD_PROGRESS. + +if [ -z "$DEBUGINFOD_URLS" ]; then + prefix="/usr" + DEBUGINFOD_URLS=$(cat "/etc/debuginfod"/*.urls 2>/dev/null | tr '\n' ' ') + [ -n "$DEBUGINFOD_URLS" ] && export DEBUGINFOD_URLS || unset DEBUGINFOD_URLS + unset prefix +fi diff --git a/vmware-tools/tools.conf.example b/vmware-tools/tools.conf.example index 1682c3c..5679887 100644 --- a/vmware-tools/tools.conf.example +++ b/vmware-tools/tools.conf.example @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2021 VMware, Inc. All rights reserved. +# Copyright (c) 2019-2022 VMware, Inc. All rights reserved. # "CAUTION: tools.conf is highly syntax sensitive file. Use extreme caution # while editing it. If modified, it is automatically re-loaded by @@ -245,6 +245,22 @@ # whether to include reserved space in diskInfo space metrics on Linux #diskinfo-include-reserved=false +[componentmgr] + +# This plugin manages the known and enabled components add/remove status. +# The plugin polls at regular interval and triggers action add/remove for +# all the known and enabled components in the componentMgr plugin. + +# Default and minimum polling interval in seconds (0 => polling disabled) +#poll-interval=180 + +# Comma separated list of components managed by the plugin. If not specified, +# default value is all, which means all components are enabled by default. +# A special value of none means no component, which is equivalent to disabling +# the plugin completely. Value is parsed left to right and parsing stops at +# first occurrence of all or none or end of line. +#included=all + [appinfo] # This plugin collects info about running applications in guest OS. @@ -259,6 +275,35 @@ # version info, otherwise native Win32 API is used. #useWMI=false +# Whether to remove the duplicate applications information in the +# guestinfo variable. +#remove-duplicates=true + +[containerinfo] + +# This plugin collects info about running containers in guest OS. + +# User-defined poll interval in seconds. Set to 0 to disable the plugin. +#poll-interval=21600 + +# Maximum number of containers to be retrieved per namespace. +#max-containers=256 + +# Whether to remove the duplicate containers information in the +# guestinfo variable. +#remove-duplicates=true + +# Unix socket to use to communicate with the docker daemon. +#docker-unix-socket=/var/run/docker.sock + +# The unix socket to connect to communicate with containerd grpc server +# for retrieving the list of running containers. +#containerd-unix-socket=/run/containerd/containerd.sock + +# List of namespaces to be queried for the running containers. +# The value for this key is a comman separated list. +#allowed-namespaces=moby,k8s.io,default + [servicediscovery] # This plugin provides admins with additional info for better VM management. diff --git a/vmware-tools/vgauth/schemas/saml-schema-assertion-2.0.xsd b/vmware-tools/vgauth/schemas/saml-schema-assertion-2.0.xsd index 6aa3b27..9bbfa26 100644 --- a/vmware-tools/vgauth/schemas/saml-schema-assertion-2.0.xsd +++ b/vmware-tools/vgauth/schemas/saml-schema-assertion-2.0.xsd @@ -1,283 +1,283 @@ - - - - - - - Document identifier: saml-schema-assertion-2.0 - Location: http://docs.oasis-open.org/security/saml/v2.0/ - Revision history: - V1.0 (November, 2002): - Initial Standard Schema. - V1.1 (September, 2003): - Updates within the same V1.0 namespace. - V2.0 (March, 2005): - New assertion schema for SAML V2.0 namespace. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + Document identifier: saml-schema-assertion-2.0 + Location: http://docs.oasis-open.org/security/saml/v2.0/ + Revision history: + V1.0 (November, 2002): + Initial Standard Schema. + V1.1 (September, 2003): + Updates within the same V1.0 namespace. + V2.0 (March, 2005): + New assertion schema for SAML V2.0 namespace. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +