committing changes in /etc made by "-bash"

Package changes:

.etckeeper

@@ -929,6 +929,7 @@ maybe chmod 0644 'httpd/conf.d/perl.conf.rpmnew'
 maybe chmod 0644 'httpd/conf.d/php.conf'
 maybe chmod 0644 'httpd/conf.d/phpmyadmin.conf'
 maybe chmod 0644 'httpd/conf.d/squid.conf'
+maybe chmod 0644 'httpd/conf.d/ssl.conf'
 maybe chmod 0644 'httpd/conf.d/ssl.conf_disabled'
 maybe chmod 0644 'httpd/conf.d/userdir.conf'
 maybe chmod 0644 'httpd/conf.d/welcome.conf'
@@ -3949,8 +3950,6 @@ maybe chmod 0644 'nginx/conf.d/mail.club3d.ro.conf'
 maybe chown 'nginx' 'nginx/conf.d/padmin.club3d.ro.conf'
 maybe chgrp 'nginx' 'nginx/conf.d/padmin.club3d.ro.conf'
 maybe chmod 0640 'nginx/conf.d/padmin.club3d.ro.conf'
-maybe chown 'nginx' 'nginx/conf.d/php-fpm.conf'
-maybe chgrp 'nginx' 'nginx/conf.d/php-fpm.conf'
 maybe chmod 0644 'nginx/conf.d/php-fpm.conf'
 maybe chown 'nginx' 'nginx/conf.d/rspamd.club3d.ro.conf'
 maybe chgrp 'nginx' 'nginx/conf.d/rspamd.club3d.ro.conf'
@@ -4542,7 +4541,6 @@ maybe chmod 0644 'ppp/peers/vpn_gazduire.ro'
 maybe chmod 0644 'pptpd.conf'
 maybe chmod 0755 'prelink.conf.d'
 maybe chmod 0644 'prelink.conf.d/golang.conf'
-maybe chmod 0644 'prelink.conf.d/grub2.conf'
 maybe chmod 0644 'printcap'
 maybe chmod 0644 'profile'
 maybe chmod 0755 'profile.d'

httpd/conf.d/ssl.conf

@@ -0,0 +1,203 @@
+#
+# When we also provide SSL we have to listen to the 
+# standard HTTPS port in addition.
+#
+Listen 443 https
+
+##
+##  SSL Global Context
+##
+##  All SSL configuration in this context applies both to
+##  the main server and all SSL-enabled virtual hosts.
+##
+
+#   Pass Phrase Dialog:
+#   Configure the pass phrase gathering process.
+#   The filtering dialog program (`builtin' is a internal
+#   terminal dialog) has to provide the pass phrase on stdout.
+SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog
+
+#   Inter-Process Session Cache:
+#   Configure the SSL Session Cache: First the mechanism 
+#   to use and second the expiring timeout (in seconds).
+SSLSessionCache         shmcb:/run/httpd/sslcache(512000)
+SSLSessionCacheTimeout  300
+
+#
+# Use "SSLCryptoDevice" to enable any supported hardware
+# accelerators. Use "openssl engine -v" to list supported
+# engine names.  NOTE: If you enable an accelerator and the
+# server does not start, consult the error logs and ensure
+# your accelerator is functioning properly. 
+#
+SSLCryptoDevice builtin
+#SSLCryptoDevice ubsec
+
+##
+## SSL Virtual Host Context
+##
+
+<VirtualHost _default_:443>
+
+# General setup for the virtual host, inherited from global configuration
+#DocumentRoot "/var/www/html"
+#ServerName www.example.com:443
+
+# Use separate log files for the SSL virtual host; note that LogLevel
+# is not inherited from httpd.conf.
+ErrorLog logs/ssl_error_log
+TransferLog logs/ssl_access_log
+LogLevel warn
+
+#   SSL Engine Switch:
+#   Enable/Disable SSL for this virtual host.
+SSLEngine on
+
+#   List the protocol versions which clients are allowed to connect with.
+#   The OpenSSL system profile is used by default.  See
+#   update-crypto-policies(8) for more details.
+#SSLProtocol all -SSLv3
+#SSLProxyProtocol all -SSLv3
+
+#   User agents such as web browsers are not configured for the user's
+#   own preference of either security or performance, therefore this
+#   must be the prerogative of the web server administrator who manages
+#   cpu load versus confidentiality, so enforce the server's cipher order.
+SSLHonorCipherOrder on
+
+#   SSL Cipher Suite:
+#   List the ciphers that the client is permitted to negotiate.
+#   See the mod_ssl documentation for a complete list.
+#   The OpenSSL system profile is configured by default.  See
+#   update-crypto-policies(8) for more details.
+SSLCipherSuite PROFILE=SYSTEM
+SSLProxyCipherSuite PROFILE=SYSTEM
+
+#   Point SSLCertificateFile at a PEM encoded certificate.  If
+#   the certificate is encrypted, then you will be prompted for a
+#   pass phrase.  Note that restarting httpd will prompt again.  Keep
+#   in mind that if you have both an RSA and a DSA certificate you
+#   can configure both in parallel (to also allow the use of DSA
+#   ciphers, etc.)
+#   Some ECC cipher suites (http://www.ietf.org/rfc/rfc4492.txt)
+#   require an ECC certificate which can also be configured in
+#   parallel.
+SSLCertificateFile /etc/pki/tls/certs/localhost.crt
+
+#   Server Private Key:
+#   If the key is not combined with the certificate, use this
+#   directive to point at the key file.  Keep in mind that if
+#   you've both a RSA and a DSA private key you can configure
+#   both in parallel (to also allow the use of DSA ciphers, etc.)
+#   ECC keys, when in use, can also be configured in parallel
+SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
+
+#   Server Certificate Chain:
+#   Point SSLCertificateChainFile at a file containing the
+#   concatenation of PEM encoded CA certificates which form the
+#   certificate chain for the server certificate. Alternatively
+#   the referenced file can be the same as SSLCertificateFile
+#   when the CA certificates are directly appended to the server
+#   certificate for convenience.
+#SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt
+
+#   Certificate Authority (CA):
+#   Set the CA certificate verification path where to find CA
+#   certificates for client authentication or alternatively one
+#   huge file containing all of them (file must be PEM encoded)
+#SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt
+
+#   Client Authentication (Type):
+#   Client certificate verification type and depth.  Types are
+#   none, optional, require and optional_no_ca.  Depth is a
+#   number which specifies how deeply to verify the certificate
+#   issuer chain before deciding the certificate is not valid.
+#SSLVerifyClient require
+#SSLVerifyDepth  10
+
+#   Access Control:
+#   With SSLRequire you can do per-directory access control based
+#   on arbitrary complex boolean expressions containing server
+#   variable checks and other lookup directives.  The syntax is a
+#   mixture between C and Perl.  See the mod_ssl documentation
+#   for more details.
+#<Location />
+#SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
+#            and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
+#            and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
+#            and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
+#            and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20       ) \
+#           or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
+#</Location>
+
+#   SSL Engine Options:
+#   Set various options for the SSL engine.
+#   o FakeBasicAuth:
+#     Translate the client X.509 into a Basic Authorisation.  This means that
+#     the standard Auth/DBMAuth methods can be used for access control.  The
+#     user name is the `one line' version of the client's X.509 certificate.
+#     Note that no password is obtained from the user. Every entry in the user
+#     file needs this password: `xxj31ZMTZzkVA'.
+#   o ExportCertData:
+#     This exports two additional environment variables: SSL_CLIENT_CERT and
+#     SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+#     server (always existing) and the client (only existing when client
+#     authentication is used). This can be used to import the certificates
+#     into CGI scripts.
+#   o StdEnvVars:
+#     This exports the standard SSL/TLS related `SSL_*' environment variables.
+#     Per default this exportation is switched off for performance reasons,
+#     because the extraction step is an expensive operation and is usually
+#     useless for serving static content. So one usually enables the
+#     exportation for CGI and SSI requests only.
+#   o StrictRequire:
+#     This denies access when "SSLRequireSSL" or "SSLRequire" applied even
+#     under a "Satisfy any" situation, i.e. when it applies access is denied
+#     and no other module can change it.
+#   o OptRenegotiate:
+#     This enables optimized SSL connection renegotiation handling when SSL
+#     directives are used in per-directory context. 
+#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+<FilesMatch "\.(cgi|shtml|phtml|php)$">
+    SSLOptions +StdEnvVars
+</FilesMatch>
+<Directory "/var/www/cgi-bin">
+    SSLOptions +StdEnvVars
+</Directory>
+
+#   SSL Protocol Adjustments:
+#   The safe and default but still SSL/TLS standard compliant shutdown
+#   approach is that mod_ssl sends the close notify alert but doesn't wait for
+#   the close notify alert from client. When you need a different shutdown
+#   approach you can use one of the following variables:
+#   o ssl-unclean-shutdown:
+#     This forces an unclean shutdown when the connection is closed, i.e. no
+#     SSL close notify alert is sent or allowed to be received.  This violates
+#     the SSL/TLS standard but is needed for some brain-dead browsers. Use
+#     this when you receive I/O errors because of the standard approach where
+#     mod_ssl sends the close notify alert.
+#   o ssl-accurate-shutdown:
+#     This forces an accurate shutdown when the connection is closed, i.e. a
+#     SSL close notify alert is sent and mod_ssl waits for the close notify
+#     alert of the client. This is 100% SSL/TLS standard compliant, but in
+#     practice often causes hanging connections with brain-dead browsers. Use
+#     this only for browsers where you know that their SSL implementation
+#     works correctly. 
+#   Notice: Most problems of broken clients are also related to the HTTP
+#   keep-alive facility, so you usually additionally want to disable
+#   keep-alive for those clients, too. Use variable "nokeepalive" for this.
+#   Similarly, one has to force some clients to use HTTP/1.0 to workaround
+#   their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
+#   "force-response-1.0" for this.
+BrowserMatch "MSIE [2-5]" \
+         nokeepalive ssl-unclean-shutdown \
+         downgrade-1.0 force-response-1.0
+
+#   Per-Server Logging:
+#   The home of a custom SSL log file. Use this when you want a
+#   compact non-error SSL logfile on a virtual host basis.
+CustomLog logs/ssl_request_log \
+          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+
+</VirtualHost>
+

mock/alma+epel-8-aarch64.cfg

@@ -2,5 +2,6 @@ include('templates/almalinux-8.tpl')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = 'alma+epel-8-aarch64'
+config_opts['description'] = 'AlmaLinux 8 + EPEL'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)

mock/alma+epel-8-ppc64le.cfg

@@ -2,5 +2,6 @@ include('templates/almalinux-8.tpl')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = 'alma+epel-8-ppc64le'
+config_opts['description'] = 'AlmaLinux 8 + EPEL'
 config_opts['target_arch'] = 'ppc64le'
 config_opts['legal_host_arches'] = ('ppc64le',)

mock/alma+epel-8-x86_64.cfg

@@ -2,5 +2,6 @@ include('templates/almalinux-8.tpl')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = 'alma+epel-8-x86_64'
+config_opts['description'] = 'AlmaLinux 8 + EPEL'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)

mock/almalinux-8-aarch64.cfg

@@ -1,5 +1,6 @@
 include('templates/almalinux-8.tpl')
 
 config_opts['root'] = 'almalinux-8-aarch64'
+config_opts['description'] = 'AlmaLinux 8'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)

mock/almalinux-8-ppc64le.cfg

@@ -1,5 +1,6 @@
 include('templates/almalinux-8.tpl')
 
 config_opts['root'] = 'almalinux-8-ppc64le'
+config_opts['description'] = 'AlmaLinux 8'
 config_opts['target_arch'] = 'ppc64le'
 config_opts['legal_host_arches'] = ('ppc64le',)

mock/almalinux-8-x86_64.cfg

@@ -1,5 +1,6 @@
 include('templates/almalinux-8.tpl')
 
 config_opts['root'] = 'almalinux-8-x86_64'
+config_opts['description'] = 'AlmaLinux 8 + EPEL'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)

mock/centos+epel-7-ppc64le.cfg

@@ -2,5 +2,6 @@ include('templates/centos-7.tpl')
 include('templates/epel-7.tpl')
 
 config_opts['root'] = 'centos+epel-7-ppc64le'
+config_opts['description'] = 'CentOS 7 + EPEL'
 config_opts['target_arch'] = 'ppc64le'
 config_opts['legal_host_arches'] = ('ppc64le',)

mock/centos+epel-7-x86_64.cfg

@@ -2,5 +2,6 @@ include('templates/centos-7.tpl')
 include('templates/epel-7.tpl')
 
 config_opts['root'] = 'centos+epel-7-x86_64'
+config_opts['description'] = 'CentOS 7 + EPEL'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)

mock/centos-stream+epel-8-aarch64.cfg

@@ -3,5 +3,6 @@ include('templates/centos-stream-8.tpl')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = 'centos-stream+epel-8-aarch64'
+config_opts['description'] = 'CentOS Stream 8 + EPEL'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)

mock/centos-stream+epel-8-ppc64le.cfg

@@ -3,5 +3,6 @@ include('templates/centos-stream-8.tpl')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = 'centos-stream+epel-8-ppc64le'
+config_opts['description'] = 'CentOS Stream 8 + EPEL'
 config_opts['target_arch'] = 'ppc64le'
 config_opts['legal_host_arches'] = ('ppc64le',)

mock/centos-stream+epel-8-x86_64.cfg

@@ -3,5 +3,6 @@ include('templates/centos-stream-8.tpl')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = 'centos-stream+epel-8-x86_64'
+config_opts['description'] = 'CentOS Stream 8 + EPEL'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)

mock/centos-stream+epel-9-aarch64.cfg

@@ -3,5 +3,6 @@ include('templates/centos-stream-9.tpl')
 include('templates/epel-9.tpl')
 
 config_opts['root'] = 'centos-stream+epel-9-aarch64'
+config_opts['description'] = 'CentOS Stream 9 + EPEL'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)

mock/centos-stream+epel-9-ppc64le.cfg

@@ -3,5 +3,6 @@ include('templates/centos-stream-9.tpl')
 include('templates/epel-9.tpl')
 
 config_opts['root'] = 'centos-stream+epel-9-ppc64le'
+config_opts['description'] = 'CentOS Stream 9 + EPEL'
 config_opts['target_arch'] = 'ppc64le'
 config_opts['legal_host_arches'] = ('ppc64le',)

mock/centos-stream+epel-9-s390x.cfg

@@ -3,5 +3,6 @@ include('templates/centos-stream-9.tpl')
 include('templates/epel-9.tpl')
 
 config_opts['root'] = 'centos-stream+epel-9-s390x'
+config_opts['description'] = 'CentOS Stream 9 + EPEL'
 config_opts['target_arch'] = 's390x'
 config_opts['legal_host_arches'] = ('s390x',)

mock/centos-stream+epel-9-x86_64.cfg

@@ -3,5 +3,6 @@ include('templates/centos-stream-9.tpl')
 include('templates/epel-9.tpl')
 
 config_opts['root'] = 'centos-stream+epel-9-x86_64'
+config_opts['description'] = 'CentOS Stream 9 + EPEL'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)

mock/centos-stream+epel-next-8-aarch64.cfg

@@ -5,5 +5,6 @@ include('templates/epel-8.tpl')
 include('templates/epel-next-8.tpl')
 
 config_opts['root'] = 'centos-stream+epel-next-8-aarch64'
+config_opts['description'] = 'CentOS Stream 8 + EPEL Next'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)

mock/centos-stream+epel-next-8-ppc64le.cfg

@@ -5,5 +5,6 @@ include('templates/epel-8.tpl')
 include('templates/epel-next-8.tpl')
 
 config_opts['root'] = 'centos-stream+epel-next-8-ppc64le'
+config_opts['description'] = 'CentOS Stream 8 + EPEL Next'
 config_opts['target_arch'] = 'ppc64le'
 config_opts['legal_host_arches'] = ('ppc64le',)

mock/centos-stream+epel-next-8-x86_64.cfg

@@ -5,5 +5,6 @@ include('templates/epel-8.tpl')
 include('templates/epel-next-8.tpl')
 
 config_opts['root'] = 'centos-stream+epel-next-8-x86_64'
+config_opts['description'] = 'CentOS Stream 8 + EPEL Next'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)

mock/centos-stream+epel-next-9-aarch64.cfg

@@ -4,5 +4,6 @@ include('templates/epel-9.tpl')
 include('templates/epel-next-9.tpl')
 
 config_opts['root'] = 'centos-stream+epel-next-9-aarch64'
+config_opts['description'] = 'CentOS Stream 9 + EPEL Next'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)

mock/centos-stream+epel-next-9-ppc64le.cfg

@@ -4,5 +4,6 @@ include('templates/epel-9.tpl')
 include('templates/epel-next-9.tpl')
 
 config_opts['root'] = 'centos-stream+epel-next-9-ppc64le'
+config_opts['description'] = 'CentOS Stream 9 + EPEL Next'
 config_opts['target_arch'] = 'ppc64le'
 config_opts['legal_host_arches'] = ('ppc64le',)

mock/centos-stream+epel-next-9-s390x.cfg

@@ -4,5 +4,6 @@ include('templates/epel-9.tpl')
 include('templates/epel-next-9.tpl')
 
 config_opts['root'] = 'centos-stream+epel-next-9-s390x'
+config_opts['description'] = 'CentOS Stream 9 + EPEL Next'
 config_opts['target_arch'] = 's390x'
 config_opts['legal_host_arches'] = ('s390x',)

mock/centos-stream+epel-next-9-x86_64.cfg

@@ -4,5 +4,6 @@ include('templates/epel-9.tpl')
 include('templates/epel-next-9.tpl')
 
 config_opts['root'] = 'centos-stream+epel-next-9-x86_64'
+config_opts['description'] = 'CentOS Stream 9 + EPEL Next'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)

mock/centos-stream-8-aarch64.cfg

@@ -1,5 +1,6 @@
 include('templates/centos-stream-8.tpl')
 
 config_opts['root'] = 'centos-stream-8-aarch64'
+config_opts['description'] = 'CentOS Stream 8'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)

mock/centos-stream-8-ppc64le.cfg

@@ -1,5 +1,6 @@
 include('templates/centos-stream-8.tpl')
 
 config_opts['root'] = 'centos-stream-8-ppc64le'
+config_opts['description'] = 'CentOS Stream 8'
 config_opts['target_arch'] = 'ppc64le'
 config_opts['legal_host_arches'] = ('ppc64le',)

mock/centos-stream-8-x86_64.cfg

@@ -1,5 +1,6 @@
 include('templates/centos-stream-8.tpl')
 
 config_opts['root'] = 'centos-stream-8-x86_64'
+config_opts['description'] = 'CentOS Stream 8'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)

mock/epel-9-aarch64.cfg

@@ -0,0 +1 @@
+centos-stream+epel-9-aarch64.cfg

mock/epel-9-ppc64le.cfg

@@ -0,0 +1 @@
+centos-stream+epel-9-ppc64le.cfg

mock/epel-9-s390x.cfg

@@ -0,0 +1 @@
+centos-stream+epel-9-s390x.cfg

mock/epel-9-x86_64.cfg

@@ -0,0 +1 @@
+centos-stream+epel-9-x86_64.cfg

mock/fedora-eln-aarch64.cfg

@@ -2,3 +2,4 @@ config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)
 
 include('templates/fedora-eln.tpl')
+config_opts['description'] = 'Fedora ELN'

mock/fedora-eln-i386.cfg

@@ -2,3 +2,4 @@ config_opts['target_arch'] = 'i686'
 config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
 
 include('templates/fedora-eln.tpl')
+config_opts['description'] = 'Fedora ELN'

mock/fedora-eln-ppc64le.cfg

@@ -2,3 +2,4 @@ config_opts['target_arch'] = 'ppc64le'
 config_opts['legal_host_arches'] = ('ppc64le',)
 
 include('templates/fedora-eln.tpl')
+config_opts['description'] = 'Fedora ELN'

mock/fedora-eln-s390x.cfg

@@ -2,3 +2,4 @@ config_opts['target_arch'] = 's390x'
 config_opts['legal_host_arches'] = ('s390x',)
 
 include('templates/fedora-eln.tpl')
+config_opts['description'] = 'Fedora ELN'

mock/fedora-eln-x86_64.cfg

@@ -2,3 +2,4 @@ config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
 
 include('templates/fedora-eln.tpl')
+config_opts['description'] = 'Fedora ELN'

mock/opensuse-leap-15.2-aarch64.cfg

@@ -9,6 +9,7 @@ config_opts['releasever'] = '15.2'
 config_opts['macros']['%dist'] = '.suse.lp152'
 config_opts['package_manager'] = 'dnf'
 config_opts['ssl_ca_bundle_path'] = '/var/lib/ca-certificates/ca-bundle.pem'
+config_opts['description'] = 'openSUSE Leap {{ releasever }}'
 
 # Due to the nature of the OpenSUSE mirroring system, we can not use
 # metalinks easily and also we can not rely on the fact that baseurl's

mock/opensuse-leap-15.2-x86_64.cfg

@@ -9,6 +9,7 @@ config_opts['releasever'] = '15.2'
 config_opts['macros']['%dist'] = '.suse.lp152'
 config_opts['package_manager'] = 'dnf'
 config_opts['ssl_ca_bundle_path'] = '/var/lib/ca-certificates/ca-bundle.pem'
+config_opts['description'] = 'openSUSE Leap {{ releasever }}'
 
 # Due to the nature of the OpenSUSE mirroring system, we can not use
 # metalinks easily and also we can not rely on the fact that baseurl's

mock/oraclelinux+epel-7-aarch64.cfg

@@ -4,3 +4,4 @@ include('templates/epel-7.tpl')
 config_opts['root'] = 'oraclelinux+epel-7-aarch64'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)
+config_opts['description'] = 'Oracle Linux 7 + EPEL'

mock/oraclelinux+epel-7-x86_64.cfg

@@ -4,3 +4,4 @@ include('templates/epel-7.tpl')
 config_opts['root'] = 'oraclelinux+epel-7-x86_64'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
+config_opts['description'] = 'Oracle Linux 7 + EPEL'

mock/oraclelinux+epel-8-aarch64.cfg

@@ -4,3 +4,4 @@ include('templates/epel-8.tpl')
 config_opts['root'] = 'oraclelinux+epel-8-aarch64'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)
+config_opts['description'] = 'Oracle Linux 8 + EPEL'

mock/oraclelinux+epel-8-x86_64.cfg

@@ -4,3 +4,4 @@ include('templates/epel-8.tpl')
 config_opts['root'] = 'oraclelinux+epel-8-x86_64'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
+config_opts['description'] = 'Oracle Linux 8 + EPEL'

mock/rhel+epel-8-aarch64.cfg

@@ -2,3 +2,4 @@ include('rhel-8-aarch64.cfg')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = "rhel+epel-8-{{ target_arch }}"
+config_opts['description'] = 'RHEL 8 + EPEL'

mock/rhel+epel-8-ppc64le.cfg

@@ -2,3 +2,4 @@ include('rhel-8-ppc64le.cfg')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = "rhel+epel-8-{{ target_arch }}"
+config_opts['description'] = 'RHEL 8 + EPEL'

mock/rhel+epel-8-s390x.cfg

@@ -2,3 +2,4 @@ include('rhel-8-s390x.cfg')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = "rhel+epel-8-{{ target_arch }}"
+config_opts['description'] = 'RHEL 8 + EPEL'

mock/rhel+epel-8-x86_64.cfg

@@ -2,3 +2,4 @@ include('rhel-8-x86_64.cfg')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = "rhel+epel-8-{{ target_arch }}"
+config_opts['description'] = 'RHEL 8 + EPEL'

mock/rocky+epel-8-aarch64.cfg

@@ -2,5 +2,6 @@ include('templates/rocky-8.tpl')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = 'rocky+epel-8-aarch64'
+config_opts['description'] = 'Rocky Linux 8 + EPEL'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)

mock/rocky+epel-8-x86_64.cfg

@@ -2,5 +2,6 @@ include('templates/rocky-8.tpl')
 include('templates/epel-8.tpl')
 
 config_opts['root'] = 'rocky+epel-8-x86_64'
+config_opts['description'] = 'Rocky Linux 8 + EPEL'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)

mock/templates/amazonlinux-2.tpl

@@ -3,6 +3,7 @@ config_opts['dist'] = 'amzn2' # only useful for --resultdir variable subst
 config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['package_manager'] = 'yum'
 config_opts['releasever'] = '2'
+config_opts['description'] = 'Amazon Linux 2'
 
 config_opts['bootstrap_image'] = 'docker.io/library/amazonlinux:2'
 

mock/templates/centos-7.tpl

@@ -6,6 +6,7 @@ config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 config_opts['releasever'] = '7'
 config_opts['bootstrap_image'] = 'quay.io/centos/centos:7'
 config_opts['package_manager'] = 'yum'
+config_opts['description'] = 'CentOS 7'
 
 config_opts['yum_install_command'] += "{% if target_arch in ['x86_64', 'ppc64le', 'aarch64'] %} --disablerepo=centos-sclo*{% endif %}"
 

mock/templates/centos-stream-9.tpl

@@ -3,6 +3,7 @@ config_opts['dist'] = 'el9'  # only useful for --resultdir variable subst
 config_opts['releasever'] = '9'
 config_opts['package_manager'] = 'dnf'
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['description'] = 'CentOS Stream 9'
 
 config_opts['bootstrap_image'] = 'quay.io/centos/centos:stream9'
 

mock/templates/custom-1.tpl

@@ -4,6 +4,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['package_manager'] = 'dnf'
 config_opts['module_enable'] = []
 config_opts['module_install'] = []
+config_opts['description'] = 'Custom (no repository)'
 # DNF may not be available in this chroot
 config_opts['use_bootstrap'] = False
 

mock/templates/eurolinux-8.tpl

@@ -6,7 +6,7 @@ config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
 config_opts['releasever'] = '8'
 config_opts['package_manager'] = 'dnf'
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-
+config_opts['description'] = 'EuroLinux 8'
 
 config_opts['dnf.conf'] = """
 [main]

mock/templates/fedora-branched.tpl

@@ -2,6 +2,7 @@ config_opts['root'] = 'fedora-{{ releasever }}-{{ target_arch }}'
 # config_opts['module_enable'] = ['list', 'of', 'modules']
 # config_opts['module_install'] = ['module1/profile', 'module2/profile']
 
+config_opts['description'] = 'Fedora {{ releasever }}'
 # fedora 31+ isn't mirrored, we need to run from koji
 config_opts['mirrored'] = config_opts['target_arch'] != 'i686'
 

mock/templates/fedora-eln.tpl

@@ -33,7 +33,7 @@ protected_packages=
 
 {%- macro rawhide_gpg_keys() -%}
 file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-rawhide-primary
-{%- for version in [eln_rawhide_releasever|int, eln_rawhide_releasever|int - 1]
+{%- for version in [eln_rawhide_releasever|int, eln_rawhide_releasever|int - 1, eln_rawhide_releasever|int - 2]
 %} file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ version }}-primary
 {%- endfor %}
 {%- endmacro %}

mock/templates/fedora-rawhide.tpl

@@ -12,6 +12,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '37'
 config_opts['package_manager'] = 'dnf'
 config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:rawhide'
+config_opts['description'] = 'Fedora Rawhide'
 
 config_opts['dnf.conf'] = """
 [main]

mock/templates/mageia-7.tpl

@@ -6,6 +6,7 @@ config_opts['releasever'] = '7'
 config_opts['macros']['%distro_section'] = 'core'
 config_opts['package_manager'] = 'dnf'
 config_opts['bootstrap_image'] = 'docker.io/library/mageia:7'
+config_opts['description'] = 'Mageia 7'
 
 config_opts['dnf.conf'] = """
 [main]

mock/templates/mageia-branched.tpl

@@ -6,6 +6,7 @@ config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgi
 config_opts['macros']['%distro_section'] = 'core'
 config_opts['package_manager'] = 'dnf'
 config_opts['bootstrap_image'] = 'docker.io/library/mageia:{{ releasever }}'
+config_opts['description'] = 'Mageia {{ releasever }}'
 
 config_opts['dnf.conf'] = """
 [main]

mock/templates/mageia-cauldron.tpl

@@ -7,6 +7,7 @@ config_opts['releasever'] = '9'
 config_opts['macros']['%distro_section'] = 'core'
 config_opts['package_manager'] = 'dnf'
 config_opts['bootstrap_image'] = 'mageia:cauldron'
+config_opts['description'] = 'Mageia Cauldron'
 
 config_opts['dnf.conf'] = """
 [main]

mock/templates/navy-8.tpl

@@ -3,6 +3,7 @@ config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
 config_opts['releasever'] = '8'
 config_opts['package_manager'] = 'dnf'
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['description'] = 'Navy Linux {{ releasever }}'
 
 config_opts['dnf.conf'] = """
 [main]

mock/templates/openmandriva-branched.tpl

@@ -4,6 +4,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}'
 config_opts['macros']['%cross_compiling'] = '0' # Mock should generally be considered native builds
 config_opts['package_manager'] = 'dnf'
+config_opts['description'] = 'OpenMandriva {{ releasever }}'
 
 config_opts['dnf.conf'] = """
 [main]

mock/templates/openmandriva-cooker.tpl

@@ -5,6 +5,7 @@ config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgi
 config_opts['releasever'] = '5.0'
 config_opts['macros']['%cross_compiling'] = '0' # Mock should generally be considered native builds
 config_opts['package_manager'] = 'dnf'
+config_opts['description'] = 'OpenMandriva Cooker {{ releasever }}'
 
 config_opts['dnf.conf'] = """
 [main]

mock/templates/openmandriva-rolling.tpl

@@ -5,6 +5,7 @@ config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgi
 config_opts['releasever'] = '5.0'
 config_opts['macros']['%cross_compiling'] = '0' # Mock should generally be considered native builds
 config_opts['package_manager'] = 'dnf'
+config_opts['description'] = 'OpenMandriva Rolling'
 
 config_opts['dnf.conf'] = """
 [main]

mock/templates/opensuse-leap-15.3.tpl

@@ -7,6 +7,7 @@ config_opts['macros']['%dist'] = '.suse.lp153'
 config_opts['package_manager'] = 'dnf'
 config_opts['bootstrap_image'] = 'registry.opensuse.org/opensuse/leap-dnf:15.3'
 config_opts['ssl_ca_bundle_path'] = '/var/lib/ca-certificates/ca-bundle.pem'
+config_opts['description'] = 'openSUSE Leap {{ releasever }}'
 
 # Due to the nature of the OpenSUSE mirroring system, we can not use
 # metalinks easily and also we can not rely on the fact that baseurl's

mock/templates/opensuse-tumbleweed.tpl

@@ -7,6 +7,7 @@ config_opts['macros']['%dist'] = '.suse.tw%(sh -c ". /etc/os-release; echo \$VER
 config_opts['package_manager'] = 'dnf'
 config_opts['bootstrap_image'] = 'registry.opensuse.org/opensuse/tumbleweed-dnf'
 config_opts['ssl_ca_bundle_path'] = '/var/lib/ca-certificates/ca-bundle.pem'
+config_opts['description'] = 'openSUSE Tumbleweed'
 
 # Due to the nature of the OpenSUSE mirroring system, we can not use
 # metalinks easily and also we can not rely on the fact that baseurl's

mock/templates/oraclelinux-7.tpl

@@ -6,6 +6,7 @@ config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 config_opts['releasever'] = '7'
 config_opts['bootstrap_image'] = 'docker.io/library/oraclelinux:7'
 config_opts['package_manager'] = 'yum'
+config_opts['description'] = 'Oracle Linux 7'
 
 config_opts['yum_install_command'] += " --disablerepo=ol7_software_collections"
 

mock/templates/oraclelinux-8.tpl

@@ -4,7 +4,7 @@ config_opts['releasever'] = '8'
 config_opts['package_manager'] = 'dnf'
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['bootstrap_image'] = 'docker.io/library/oraclelinux:8'
-
+config_opts['description'] = 'Oracle Linux 8'
 
 config_opts['dnf.conf'] = """
 [main]

mock/templates/rhel-7.tpl

@@ -3,6 +3,7 @@ config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 config_opts['releasever'] = '7Server'
 config_opts['package_manager'] = 'yum'
 config_opts['bootstrap_image'] = 'registry.access.redhat.com/ubi7/ubi'
+config_opts['description'] = 'RHEL 7'
 
 config_opts['dnf_install_command'] += ' subscription-manager'
 config_opts['yum_install_command'] += ' subscription-manager'

mock/templates/rhel-8.tpl

@@ -4,6 +4,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '8'
 config_opts['package_manager'] = 'dnf'
 config_opts['bootstrap_image'] = 'registry.access.redhat.com/ubi8/ubi'
+config_opts['description'] = 'RHEL 8'
 
 config_opts['dnf_install_command'] += ' subscription-manager'
 config_opts['yum_install_command'] += ' subscription-manager'

mock/templates/rocky-8.tpl

@@ -4,7 +4,7 @@ config_opts['releasever'] = '8'
 config_opts['package_manager'] = 'dnf'
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['bootstrap_image'] = 'quay.io/rockylinux/rockylinux:8'
-
+config_opts['description'] = 'Rocky Linux 8'
 
 config_opts['dnf.conf'] = """
 [main]

prelink.conf.d/grub2.conf

@@ -1,7 +0,0 @@
-# these have execstack, and break under selinux
--b /usr/bin/grub2-script-check
--b /usr/bin/grub2-mkrelpath
--b /usr/bin/grub2-fstest
--b /usr/sbin/grub2-bios-setup
--b /usr/sbin/grub2-probe
--b /usr/sbin/grub2-sparc64-setup

selinux/targeted/.policy.sha512

@@ -1 +1 @@
-3529f6e114cca0bd7360d6774096502304ff52b0724a6a58a28bfaa1ffd7d9623f12eb993d8cb0cc0c8116eb3e6a460deb1ce019825989a52ba1769324433777
+19436b134dd04ff9a79126cc9b81607af76cea01207a21ff70c52f05f89bc2002be6545c82d1d10fed1eeebc8b5da846424bad9b9723709e47fbfb791a06f405