From 1658798e01b5510370cf2307db945369f810df4d Mon Sep 17 00:00:00 2001 From: bms8197 Date: Sun, 17 Apr 2022 12:57:39 +0300 Subject: [PATCH] committing changes in /etc made by "-bash" Package changes: --- .etckeeper | 4 +- httpd/conf.d/ssl.conf | 203 +++++++++++++++++++++ mock/alma+epel-8-aarch64.cfg | 1 + mock/alma+epel-8-ppc64le.cfg | 1 + mock/alma+epel-8-x86_64.cfg | 1 + mock/almalinux-8-aarch64.cfg | 1 + mock/almalinux-8-ppc64le.cfg | 1 + mock/almalinux-8-x86_64.cfg | 1 + mock/centos+epel-7-ppc64le.cfg | 1 + mock/centos+epel-7-x86_64.cfg | 1 + mock/centos-stream+epel-8-aarch64.cfg | 1 + mock/centos-stream+epel-8-ppc64le.cfg | 1 + mock/centos-stream+epel-8-x86_64.cfg | 1 + mock/centos-stream+epel-9-aarch64.cfg | 1 + mock/centos-stream+epel-9-ppc64le.cfg | 1 + mock/centos-stream+epel-9-s390x.cfg | 1 + mock/centos-stream+epel-9-x86_64.cfg | 1 + mock/centos-stream+epel-next-8-aarch64.cfg | 1 + mock/centos-stream+epel-next-8-ppc64le.cfg | 1 + mock/centos-stream+epel-next-8-x86_64.cfg | 1 + mock/centos-stream+epel-next-9-aarch64.cfg | 1 + mock/centos-stream+epel-next-9-ppc64le.cfg | 1 + mock/centos-stream+epel-next-9-s390x.cfg | 1 + mock/centos-stream+epel-next-9-x86_64.cfg | 1 + mock/centos-stream-8-aarch64.cfg | 1 + mock/centos-stream-8-ppc64le.cfg | 1 + mock/centos-stream-8-x86_64.cfg | 1 + mock/epel-9-aarch64.cfg | 1 + mock/epel-9-ppc64le.cfg | 1 + mock/epel-9-s390x.cfg | 1 + mock/epel-9-x86_64.cfg | 1 + mock/fedora-eln-aarch64.cfg | 1 + mock/fedora-eln-i386.cfg | 1 + mock/fedora-eln-ppc64le.cfg | 1 + mock/fedora-eln-s390x.cfg | 1 + mock/fedora-eln-x86_64.cfg | 1 + mock/opensuse-leap-15.2-aarch64.cfg | 1 + mock/opensuse-leap-15.2-x86_64.cfg | 1 + mock/oraclelinux+epel-7-aarch64.cfg | 1 + mock/oraclelinux+epel-7-x86_64.cfg | 1 + mock/oraclelinux+epel-8-aarch64.cfg | 1 + mock/oraclelinux+epel-8-x86_64.cfg | 1 + mock/rhel+epel-8-aarch64.cfg | 1 + mock/rhel+epel-8-ppc64le.cfg | 1 + mock/rhel+epel-8-s390x.cfg | 1 + mock/rhel+epel-8-x86_64.cfg | 1 + mock/rocky+epel-8-aarch64.cfg | 1 + mock/rocky+epel-8-x86_64.cfg | 1 + mock/templates/amazonlinux-2.tpl | 1 + mock/templates/centos-7.tpl | 1 + mock/templates/centos-stream-9.tpl | 1 + mock/templates/custom-1.tpl | 1 + mock/templates/eurolinux-8.tpl | 2 +- mock/templates/fedora-branched.tpl | 1 + mock/templates/fedora-eln.tpl | 2 +- mock/templates/fedora-rawhide.tpl | 1 + mock/templates/mageia-7.tpl | 1 + mock/templates/mageia-branched.tpl | 1 + mock/templates/mageia-cauldron.tpl | 1 + mock/templates/navy-8.tpl | 1 + mock/templates/openmandriva-branched.tpl | 1 + mock/templates/openmandriva-cooker.tpl | 1 + mock/templates/openmandriva-rolling.tpl | 1 + mock/templates/opensuse-leap-15.3.tpl | 1 + mock/templates/opensuse-tumbleweed.tpl | 1 + mock/templates/oraclelinux-7.tpl | 1 + mock/templates/oraclelinux-8.tpl | 2 +- mock/templates/rhel-7.tpl | 1 + mock/templates/rhel-8.tpl | 1 + mock/templates/rocky-8.tpl | 2 +- prelink.conf.d/grub2.conf | 7 - selinux/targeted/.policy.sha512 | 2 +- selinux/targeted/policy/policy.31 | Bin 8776926 -> 8776951 bytes 73 files changed, 273 insertions(+), 15 deletions(-) create mode 100644 httpd/conf.d/ssl.conf create mode 120000 mock/epel-9-aarch64.cfg create mode 120000 mock/epel-9-ppc64le.cfg create mode 120000 mock/epel-9-s390x.cfg create mode 120000 mock/epel-9-x86_64.cfg delete mode 100644 prelink.conf.d/grub2.conf diff --git a/.etckeeper b/.etckeeper index 1f97b4c..6e6dc93 100755 --- a/.etckeeper +++ b/.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' diff --git a/httpd/conf.d/ssl.conf b/httpd/conf.d/ssl.conf new file mode 100644 index 0000000..d28adf3 --- /dev/null +++ b/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 +## + + + +# 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. +# +#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]+$/ +# + +# 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 + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + +# 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" + + + diff --git a/mock/alma+epel-8-aarch64.cfg b/mock/alma+epel-8-aarch64.cfg index 0333d77..d9bb3e8 100644 --- a/mock/alma+epel-8-aarch64.cfg +++ b/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',) diff --git a/mock/alma+epel-8-ppc64le.cfg b/mock/alma+epel-8-ppc64le.cfg index 25b449a..62bf003 100644 --- a/mock/alma+epel-8-ppc64le.cfg +++ b/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',) diff --git a/mock/alma+epel-8-x86_64.cfg b/mock/alma+epel-8-x86_64.cfg index 22b4d90..f365426 100644 --- a/mock/alma+epel-8-x86_64.cfg +++ b/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',) diff --git a/mock/almalinux-8-aarch64.cfg b/mock/almalinux-8-aarch64.cfg index 09aa94f..b8a3780 100644 --- a/mock/almalinux-8-aarch64.cfg +++ b/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',) diff --git a/mock/almalinux-8-ppc64le.cfg b/mock/almalinux-8-ppc64le.cfg index d17ca86..2497341 100644 --- a/mock/almalinux-8-ppc64le.cfg +++ b/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',) diff --git a/mock/almalinux-8-x86_64.cfg b/mock/almalinux-8-x86_64.cfg index 212569d..7bc7d58 100644 --- a/mock/almalinux-8-x86_64.cfg +++ b/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',) diff --git a/mock/centos+epel-7-ppc64le.cfg b/mock/centos+epel-7-ppc64le.cfg index 05f8b9b..42c2d03 100644 --- a/mock/centos+epel-7-ppc64le.cfg +++ b/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',) diff --git a/mock/centos+epel-7-x86_64.cfg b/mock/centos+epel-7-x86_64.cfg index 0fded41..e9fea86 100644 --- a/mock/centos+epel-7-x86_64.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-8-aarch64.cfg b/mock/centos-stream+epel-8-aarch64.cfg index 58626e7..60ce660 100644 --- a/mock/centos-stream+epel-8-aarch64.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-8-ppc64le.cfg b/mock/centos-stream+epel-8-ppc64le.cfg index d7b518a..fa42a99 100644 --- a/mock/centos-stream+epel-8-ppc64le.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-8-x86_64.cfg b/mock/centos-stream+epel-8-x86_64.cfg index ff01ff3..a95fbeb 100644 --- a/mock/centos-stream+epel-8-x86_64.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-9-aarch64.cfg b/mock/centos-stream+epel-9-aarch64.cfg index 88dfc71..b94fb1c 100644 --- a/mock/centos-stream+epel-9-aarch64.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-9-ppc64le.cfg b/mock/centos-stream+epel-9-ppc64le.cfg index e8e65d9..dba043a 100644 --- a/mock/centos-stream+epel-9-ppc64le.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-9-s390x.cfg b/mock/centos-stream+epel-9-s390x.cfg index 313faa9..778ba12 100644 --- a/mock/centos-stream+epel-9-s390x.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-9-x86_64.cfg b/mock/centos-stream+epel-9-x86_64.cfg index b45a4be..540d8f0 100644 --- a/mock/centos-stream+epel-9-x86_64.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-next-8-aarch64.cfg b/mock/centos-stream+epel-next-8-aarch64.cfg index 1eeb0d5..0ae5698 100644 --- a/mock/centos-stream+epel-next-8-aarch64.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-next-8-ppc64le.cfg b/mock/centos-stream+epel-next-8-ppc64le.cfg index 5e2e3d0..941e89e 100644 --- a/mock/centos-stream+epel-next-8-ppc64le.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-next-8-x86_64.cfg b/mock/centos-stream+epel-next-8-x86_64.cfg index 9fee418..5a4b6de 100644 --- a/mock/centos-stream+epel-next-8-x86_64.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-next-9-aarch64.cfg b/mock/centos-stream+epel-next-9-aarch64.cfg index 04f923e..4f3e2e4 100644 --- a/mock/centos-stream+epel-next-9-aarch64.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-next-9-ppc64le.cfg b/mock/centos-stream+epel-next-9-ppc64le.cfg index b10169e..a6fcc98 100644 --- a/mock/centos-stream+epel-next-9-ppc64le.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-next-9-s390x.cfg b/mock/centos-stream+epel-next-9-s390x.cfg index 5af2afc..6a3f6f0 100644 --- a/mock/centos-stream+epel-next-9-s390x.cfg +++ b/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',) diff --git a/mock/centos-stream+epel-next-9-x86_64.cfg b/mock/centos-stream+epel-next-9-x86_64.cfg index 0bd850b..7f9ea11 100644 --- a/mock/centos-stream+epel-next-9-x86_64.cfg +++ b/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',) diff --git a/mock/centos-stream-8-aarch64.cfg b/mock/centos-stream-8-aarch64.cfg index 46d2290..b5edbe5 100644 --- a/mock/centos-stream-8-aarch64.cfg +++ b/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',) diff --git a/mock/centos-stream-8-ppc64le.cfg b/mock/centos-stream-8-ppc64le.cfg index adf8022..9c1dfe5 100644 --- a/mock/centos-stream-8-ppc64le.cfg +++ b/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',) diff --git a/mock/centos-stream-8-x86_64.cfg b/mock/centos-stream-8-x86_64.cfg index 73d4e26..cd659e7 100644 --- a/mock/centos-stream-8-x86_64.cfg +++ b/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',) diff --git a/mock/epel-9-aarch64.cfg b/mock/epel-9-aarch64.cfg new file mode 120000 index 0000000..d424bce --- /dev/null +++ b/mock/epel-9-aarch64.cfg @@ -0,0 +1 @@ +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 new file mode 120000 index 0000000..7b046eb --- /dev/null +++ b/mock/epel-9-ppc64le.cfg @@ -0,0 +1 @@ +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 new file mode 120000 index 0000000..dacc0e3 --- /dev/null +++ b/mock/epel-9-s390x.cfg @@ -0,0 +1 @@ +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 new file mode 120000 index 0000000..2e0a2f9 --- /dev/null +++ b/mock/epel-9-x86_64.cfg @@ -0,0 +1 @@ +centos-stream+epel-9-x86_64.cfg \ No newline at end of file diff --git a/mock/fedora-eln-aarch64.cfg b/mock/fedora-eln-aarch64.cfg index 9867fb1..e12efae 100644 --- a/mock/fedora-eln-aarch64.cfg +++ b/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' diff --git a/mock/fedora-eln-i386.cfg b/mock/fedora-eln-i386.cfg index 4aee2ac..9d67ec7 100644 --- a/mock/fedora-eln-i386.cfg +++ b/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' diff --git a/mock/fedora-eln-ppc64le.cfg b/mock/fedora-eln-ppc64le.cfg index fe0a713..65d434d 100644 --- a/mock/fedora-eln-ppc64le.cfg +++ b/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' diff --git a/mock/fedora-eln-s390x.cfg b/mock/fedora-eln-s390x.cfg index 96c05e3..20a87c3 100644 --- a/mock/fedora-eln-s390x.cfg +++ b/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' diff --git a/mock/fedora-eln-x86_64.cfg b/mock/fedora-eln-x86_64.cfg index b2c016b..7036ac6 100644 --- a/mock/fedora-eln-x86_64.cfg +++ b/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' diff --git a/mock/opensuse-leap-15.2-aarch64.cfg b/mock/opensuse-leap-15.2-aarch64.cfg index 1aded14..846cdaa 100644 --- a/mock/opensuse-leap-15.2-aarch64.cfg +++ b/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 diff --git a/mock/opensuse-leap-15.2-x86_64.cfg b/mock/opensuse-leap-15.2-x86_64.cfg index 3e15b93..ef0e624 100644 --- a/mock/opensuse-leap-15.2-x86_64.cfg +++ b/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 diff --git a/mock/oraclelinux+epel-7-aarch64.cfg b/mock/oraclelinux+epel-7-aarch64.cfg index ad5915b..637be8a 100644 --- a/mock/oraclelinux+epel-7-aarch64.cfg +++ b/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' diff --git a/mock/oraclelinux+epel-7-x86_64.cfg b/mock/oraclelinux+epel-7-x86_64.cfg index 334f9ae..554068d 100644 --- a/mock/oraclelinux+epel-7-x86_64.cfg +++ b/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' diff --git a/mock/oraclelinux+epel-8-aarch64.cfg b/mock/oraclelinux+epel-8-aarch64.cfg index 04898a6..a68e9ae 100644 --- a/mock/oraclelinux+epel-8-aarch64.cfg +++ b/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' diff --git a/mock/oraclelinux+epel-8-x86_64.cfg b/mock/oraclelinux+epel-8-x86_64.cfg index 87b076d..7ec4c9f 100644 --- a/mock/oraclelinux+epel-8-x86_64.cfg +++ b/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' diff --git a/mock/rhel+epel-8-aarch64.cfg b/mock/rhel+epel-8-aarch64.cfg index 33612b1..5e6f898 100644 --- a/mock/rhel+epel-8-aarch64.cfg +++ b/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' diff --git a/mock/rhel+epel-8-ppc64le.cfg b/mock/rhel+epel-8-ppc64le.cfg index fb0df8a..029ddf6 100644 --- a/mock/rhel+epel-8-ppc64le.cfg +++ b/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' diff --git a/mock/rhel+epel-8-s390x.cfg b/mock/rhel+epel-8-s390x.cfg index 73548c2..fc9d8a6 100644 --- a/mock/rhel+epel-8-s390x.cfg +++ b/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' diff --git a/mock/rhel+epel-8-x86_64.cfg b/mock/rhel+epel-8-x86_64.cfg index 4b48596..f24ab3b 100644 --- a/mock/rhel+epel-8-x86_64.cfg +++ b/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' diff --git a/mock/rocky+epel-8-aarch64.cfg b/mock/rocky+epel-8-aarch64.cfg index 5a4e492..4ed0575 100644 --- a/mock/rocky+epel-8-aarch64.cfg +++ b/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',) diff --git a/mock/rocky+epel-8-x86_64.cfg b/mock/rocky+epel-8-x86_64.cfg index 675800a..8d52a06 100644 --- a/mock/rocky+epel-8-x86_64.cfg +++ b/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',) diff --git a/mock/templates/amazonlinux-2.tpl b/mock/templates/amazonlinux-2.tpl index c27d652..e85d370 100644 --- a/mock/templates/amazonlinux-2.tpl +++ b/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' diff --git a/mock/templates/centos-7.tpl b/mock/templates/centos-7.tpl index a6edb5d..a723e58 100644 --- a/mock/templates/centos-7.tpl +++ b/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 %}" diff --git a/mock/templates/centos-stream-9.tpl b/mock/templates/centos-stream-9.tpl index dc0aadb..0aee484 100644 --- a/mock/templates/centos-stream-9.tpl +++ b/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' diff --git a/mock/templates/custom-1.tpl b/mock/templates/custom-1.tpl index d0344dc..11860e1 100644 --- a/mock/templates/custom-1.tpl +++ b/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 diff --git a/mock/templates/eurolinux-8.tpl b/mock/templates/eurolinux-8.tpl index d324503..bd9147d 100644 --- a/mock/templates/eurolinux-8.tpl +++ b/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] diff --git a/mock/templates/fedora-branched.tpl b/mock/templates/fedora-branched.tpl index 35d8d2a..9ca9952 100644 --- a/mock/templates/fedora-branched.tpl +++ b/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' diff --git a/mock/templates/fedora-eln.tpl b/mock/templates/fedora-eln.tpl index b8d82ae..480a191 100644 --- a/mock/templates/fedora-eln.tpl +++ b/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 %} diff --git a/mock/templates/fedora-rawhide.tpl b/mock/templates/fedora-rawhide.tpl index e71996f..64233ae 100644 --- a/mock/templates/fedora-rawhide.tpl +++ b/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] diff --git a/mock/templates/mageia-7.tpl b/mock/templates/mageia-7.tpl index 8a07d1f..e7c1049 100644 --- a/mock/templates/mageia-7.tpl +++ b/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] diff --git a/mock/templates/mageia-branched.tpl b/mock/templates/mageia-branched.tpl index fe0233a..b165162 100644 --- a/mock/templates/mageia-branched.tpl +++ b/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] diff --git a/mock/templates/mageia-cauldron.tpl b/mock/templates/mageia-cauldron.tpl index f8eee96..b969fcd 100644 --- a/mock/templates/mageia-cauldron.tpl +++ b/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] diff --git a/mock/templates/navy-8.tpl b/mock/templates/navy-8.tpl index e3b5de9..f7dc087 100644 --- a/mock/templates/navy-8.tpl +++ b/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] diff --git a/mock/templates/openmandriva-branched.tpl b/mock/templates/openmandriva-branched.tpl index 2583462..13fbc65 100644 --- a/mock/templates/openmandriva-branched.tpl +++ b/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] diff --git a/mock/templates/openmandriva-cooker.tpl b/mock/templates/openmandriva-cooker.tpl index 7a1ea5b..d63ed30 100644 --- a/mock/templates/openmandriva-cooker.tpl +++ b/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] diff --git a/mock/templates/openmandriva-rolling.tpl b/mock/templates/openmandriva-rolling.tpl index 459445c..15f5df3 100644 --- a/mock/templates/openmandriva-rolling.tpl +++ b/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] diff --git a/mock/templates/opensuse-leap-15.3.tpl b/mock/templates/opensuse-leap-15.3.tpl index 9172c39..090c727 100644 --- a/mock/templates/opensuse-leap-15.3.tpl +++ b/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 diff --git a/mock/templates/opensuse-tumbleweed.tpl b/mock/templates/opensuse-tumbleweed.tpl index 7509d10..78f5411 100644 --- a/mock/templates/opensuse-tumbleweed.tpl +++ b/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 diff --git a/mock/templates/oraclelinux-7.tpl b/mock/templates/oraclelinux-7.tpl index eab159b..da7266e 100644 --- a/mock/templates/oraclelinux-7.tpl +++ b/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" diff --git a/mock/templates/oraclelinux-8.tpl b/mock/templates/oraclelinux-8.tpl index cdd9b6b..807ed3a 100644 --- a/mock/templates/oraclelinux-8.tpl +++ b/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] diff --git a/mock/templates/rhel-7.tpl b/mock/templates/rhel-7.tpl index 17f9ba5..8dce7cb 100644 --- a/mock/templates/rhel-7.tpl +++ b/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' diff --git a/mock/templates/rhel-8.tpl b/mock/templates/rhel-8.tpl index 7eb1146..29b1f5b 100644 --- a/mock/templates/rhel-8.tpl +++ b/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' diff --git a/mock/templates/rocky-8.tpl b/mock/templates/rocky-8.tpl index d63038f..25e5dc2 100644 --- a/mock/templates/rocky-8.tpl +++ b/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] diff --git a/prelink.conf.d/grub2.conf b/prelink.conf.d/grub2.conf deleted file mode 100644 index 8d66f0e..0000000 --- a/prelink.conf.d/grub2.conf +++ /dev/null @@ -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 diff --git a/selinux/targeted/.policy.sha512 b/selinux/targeted/.policy.sha512 index b0dfc2c..42fed18 100644 --- a/selinux/targeted/.policy.sha512 +++ b/selinux/targeted/.policy.sha512 @@ -1 +1 @@ -3529f6e114cca0bd7360d6774096502304ff52b0724a6a58a28bfaa1ffd7d9623f12eb993d8cb0cc0c8116eb3e6a460deb1ce019825989a52ba1769324433777 +19436b134dd04ff9a79126cc9b81607af76cea01207a21ff70c52f05f89bc2002be6545c82d1d10fed1eeebc8b5da846424bad9b9723709e47fbfb791a06f405 diff --git a/selinux/targeted/policy/policy.31 b/selinux/targeted/policy/policy.31 index c2bfd7b307eaa989953705b4d2c767731964d372..b7bae91bfc1c3a15e901d91b52d0913304c4703d 100644 GIT binary patch delta 899 zcmYk&OH30{6b9fsLpv=q(3TF53W5beZIxFmh@c`0im0HXRFMjzVpVEUKu{D=3lkP@ zbkQZmxKKh|7|GF%xN!qvQDY!%NQmHr6iu*3HwOPUYFvED&7X7bIrq-a_*6fj*UNc% zZ-iI%Ts^MirfEW_mOGTiJ~b`&33X*sP|Py&jAJUssBA)b8ITq<-&6vUYG$Tiq~TH& zaY{qtly=^N+MpP!=9v;$(NbU~@|8!*GJY3B4RUEZJ@JU6P9*bs4H5?%A?KtxU{;ow zM388CDN376f)s67e1ghaE9D^Egz;QSMwQv&ZzzL_I9va{@G{PA;3+JE- z&Vvgsz(u$O&ESU1;DHvn0#~6G+Mpe-K?iigb+`dta1(ApH}pU++=e@F7raz2^!0rB E4L7bPxBvhE delta 871 zcmX}oNla5w6vpva=xgZ%N@*F3KovxAs4^5096&AL0H`Q+0tFRO3k4An5DQp%Zd|$O z5@Sq^iMTK%mxT*-DZ;`9YC=qi1JMvxMzEORzbst*7Vn&MzkBXm`sCMsM!!$v3-N{e zv}5vHqh>}-8f8nDVmJR*bdpA@)~d5ZvX~vx)j37!q;7oSsWPrlG1$!kMNi+P>Sy#q zKNB{er3O~RL}1nM$|K%*l(AYdIHlaTg$I*@lhx8A)v%}_To@K349Rqs*E-&Uzalz3 zGI37iFGRk}7sfPW-WN7lUfaN1D2jDa4RhkfeAJkSL%)=G;v}hG)VoZhO{#UmglJ)% zFwfS6R7+wx&Qe&#pi>Us>yn;}>_*FvB9Zafk{LohphQrQ3DJs*Czd~EjU>v1J-n6_{FB~7n;0FpzAhI%nxu5M#^N7oPAXBgElF61WT9