diff --git a/SOURCES/sos-RHEL-21176-change-authentication-method.patch b/SOURCES/sos-RHEL-21176-change-authentication-method.patch
new file mode 100644
index 0000000..d3c0020
--- /dev/null
+++ b/SOURCES/sos-RHEL-21176-change-authentication-method.patch
@@ -0,0 +1,602 @@
+diff -rupN a/sos/__init__.py b/sos/__init__.py
+--- a/sos/__init__.py
++++ b/sos/__init__.py
+@@ -201,6 +201,7 @@ class SoSOptions(object):
+ self.upload_directory = ""
+ self.upload_user = ""
+ self.upload_pass = ""
++ self.upload_method = "auto"
+ self.upload_protocol = _arg_defaults["upload_protocol"]
+ self.verbosity = _arg_defaults["verbosity"]
+ self.verify = False
+diff -rupN a/sos/policies/auth/__init__.py b/sos/policies/auth/__init__.py
+--- /dev/null
++++ b/sos/policies/auth/__init__.py
+@@ -0,0 +1,205 @@
++# Copyright (C) 2023 Red Hat, Inc., Jose Castillo <jcastillo@redhat.com>
++
++# This file is part of the sos project: https://github.com/sosreport/sos
++#
++# This copyrighted material is made available to anyone wishing to use,
++# modify, copy, or redistribute it subject to the terms and conditions of
++# version 2 of the GNU General Public License.
++#
++# See the LICENSE file in the source distribution for further information.
++
++import logging
++try:
++ import requests
++ REQUESTS_LOADED = True
++except ImportError:
++ REQUESTS_LOADED = False
++import time
++from datetime import datetime, timedelta
++
++DEVICE_AUTH_CLIENT_ID = "sos-tools"
++GRANT_TYPE_DEVICE_CODE = "urn:ietf:params:oauth:grant-type:device_code"
++
++logger = logging.getLogger("sos")
++
++
++class DeviceAuthorizationClass:
++ """
++ Device Authorization Class
++ """
++
++ def __init__(self, client_identifier_url, token_endpoint):
++
++ self._access_token = None
++ self._access_expires_at = None
++ self.__device_code = None
++
++ self.client_identifier_url = client_identifier_url
++ self.token_endpoint = token_endpoint
++ self._use_device_code_grant()
++
++ def _use_device_code_grant(self):
++ """
++ Start the device auth flow. In the future we will
++ store the tokens in an in-memory keyring.
++ """
++
++ self._request_device_code()
++ print(
++ "Please visit the following URL to authenticate this device: {}"
++ .format(self._verification_uri_complete)
++ )
++ self.poll_for_auth_completion()
++
++ def _request_device_code(self):
++ """
++ Initialize new Device Authorization Grant attempt by
++ requesting a new device code.
++ """
++ data = "client_id={}".format(DEVICE_AUTH_CLIENT_ID)
++ headers = {'content-type': 'application/x-www-form-urlencoded'}
++ if not REQUESTS_LOADED:
++ raise Exception("python3-requests is not installed and is required"
++ " for obtaining device auth token.")
++ try:
++ res = requests.post(
++ self.client_identifier_url,
++ data=data,
++ headers=headers)
++ res.raise_for_status()
++ response = res.json()
++ self._user_code = response.get("user_code")
++ self._verification_uri = response.get("verification_uri")
++ self._interval = response.get("interval")
++ self.__device_code = response.get("device_code")
++ self._verification_uri_complete = response.get(
++ "verification_uri_complete")
++ except requests.HTTPError as e:
++ raise requests.HTTPError(
++ "HTTP request failed while attempting to acquire the tokens."
++ " Error returned was {}".format(res.status_code)
++ )
++
++ def poll_for_auth_completion(self):
++ """
++ Continuously poll OIDC token endpoint until the user is successfully
++ authenticated or an error occurs.
++ """
++ token_data = {'grant_type': GRANT_TYPE_DEVICE_CODE,
++ 'client_id': DEVICE_AUTH_CLIENT_ID,
++ 'device_code': self.__device_code}
++
++ if not REQUESTS_LOADED:
++ raise Exception("python3-requests is not installed and is required"
++ " for obtaining device auth token.")
++ while self._access_token is None:
++ time.sleep(self._interval)
++ try:
++ check_auth_completion = requests.post(self.token_endpoint,
++ data=token_data)
++
++ status_code = check_auth_completion.status_code
++
++ if status_code == 200:
++ logger.info("The SSO authentication is successful")
++ self._set_token_data(check_auth_completion.json())
++ if status_code not in [200, 400]:
++ raise Exception(status_code, check_auth_completion.text)
++ if status_code == 400 and \
++ check_auth_completion.json()['error'] not in \
++ ("authorization_pending", "slow_down"):
++ raise Exception(status_code, check_auth_completion.text)
++ except requests.exceptions.RequestException as e:
++ logger.error("Error was found while posting a request: {}"
++ .format(e))
++
++ def _set_token_data(self, token_data):
++ """
++ Set the class attributes as per the input token_data received.
++ In the future we will persist the token data in a local,
++ in-memory keyring, to avoid visting the browser frequently.
++ :param token_data: Token data containing access_token, refresh_token
++ and their expiry etc.
++ """
++ self._access_token = token_data.get("access_token")
++ self._access_expires_at = datetime.utcnow() + \
++ timedelta(seconds=token_data.get("expires_in"))
++ self._refresh_token = token_data.get("refresh_token")
++ self._refresh_expires_in = token_data.get("refresh_expires_in")
++ if self._refresh_expires_in == 0:
++ self._refresh_expires_at = datetime.max
++ else:
++ self._refresh_expires_at = datetime.utcnow() + \
++ timedelta(seconds=self._refresh_expires_in)
++
++ def get_access_token(self):
++ """
++ Get the valid access_token at any given time.
++ :return: Access_token
++ :rtype: string
++ """
++ if self.is_access_token_valid():
++ return self._access_token
++ else:
++ if self.is_refresh_token_valid():
++ self._use_refresh_token_grant()
++ return self._access_token
++ else:
++ self._use_device_code_grant()
++ return self._access_token
++
++ def is_access_token_valid(self):
++ """
++ Check the validity of access_token. We are considering it invalid 180
++ sec. prior to it's exact expiry time.
++ :return: True/False
++ """
++ return self._access_token and self._access_expires_at and \
++ self._access_expires_at - timedelta(seconds=180) > \
++ datetime.utcnow()
++
++ def is_refresh_token_valid(self):
++ """
++ Check the validity of refresh_token. We are considering it invalid
++ 180 sec. prior to it's exact expiry time.
++ :return: True/False
++ """
++ return self._refresh_token and self._refresh_expires_at and \
++ self._refresh_expires_at - timedelta(seconds=180) > \
++ datetime.utcnow()
++
++ def _use_refresh_token_grant(self, refresh_token=None):
++ """
++ Fetch the new access_token and refresh_token using the existing
++ refresh_token and persist it.
++ :param refresh_token: optional param for refresh_token
++ """
++ if not REQUESTS_LOADED:
++ raise Exception("python3-requests is not installed and is required"
++ " for obtaining device auth token.")
++ refresh_token_data = {'client_id': DEVICE_AUTH_CLIENT_ID,
++ 'grant_type': 'refresh_token',
++ 'refresh_token': self._refresh_token if not
++ refresh_token else refresh_token}
++
++ refresh_token_res = requests.post(self.token_endpoint,
++ data=refresh_token_data)
++
++ if refresh_token_res.status_code == 200:
++ self._set_token_data(refresh_token_res.json())
++
++ elif refresh_token_res.status_code == 400 and 'invalid' in\
++ refresh_token_res.json()['error']:
++ logger.warning("Problem while fetching the new tokens from refresh"
++ " token grant - {} {}."
++ " New Device code will be requested !".format
++ (refresh_token_res.status_code,
++ refresh_token_res.json()['error']))
++ self._use_device_code_grant()
++ else:
++ raise Exception(
++ "Something went wrong while using the "
++ "Refresh token grant for fetching tokens:"
++ "Returned status code {0} and error {1}"
++ .format(refresh_token_res.status_code,
++ refresh_token_res.json()['error']))
+diff -rupN a/sos/policies/__init__.py b/sos/policies/__init__.py
+--- a/sos/policies/__init__.py
++++ b/sos/policies/__init__.py
+@@ -861,7 +861,7 @@ class LinuxPolicy(Policy):
+ _upload_directory = '/'
+ _upload_user = None
+ _upload_password = None
+- _use_https_streaming = False
++ _upload_method = None
+ _preferred_hash_name = None
+ upload_url = None
+ upload_user = None
+@@ -1011,8 +1011,6 @@ class LinuxPolicy(Policy):
+ these MUST include protocol header
+ _upload_user Default username, if any else None
+ _upload_password Default password, if any else None
+- _use_https_streaming Set to True if the HTTPS endpoint
+- supports streaming data
+
+ Optional:
+ Class Attrs:
+@@ -1198,7 +1196,9 @@ class LinuxPolicy(Policy):
+ elif put_success == 2:
+ raise Exception("Unknown error during upload: %s" % ret.before)
+ elif put_success == 3:
+- raise Exception("Unable to write archive to destination")
++ raise Exception(
++ "Unable to write archive to destination %s" % ret.before
++ )
+ else:
+ raise Exception("Unexpected response from server: %s" % ret.before)
+
+@@ -1212,9 +1212,8 @@ class LinuxPolicy(Policy):
+ """
+ return self.upload_archive_name.split('/')[-1]
+
+- def _upload_https_streaming(self, archive):
+- """If upload_https() needs to use requests.put(), this method is used
+- to provide streaming functionality
++ def _upload_https_put(self, archive):
++ """If upload_https() needs to use requests.put(), use this method.
+
+ Policies should override this method instead of the base upload_https()
+
+@@ -1229,9 +1228,8 @@ class LinuxPolicy(Policy):
+ """
+ return {}
+
+- def _upload_https_no_stream(self, archive):
+- """If upload_https() needs to use requests.post(), this method is used
+- to provide non-streaming functionality
++ def _upload_https_post(self, archive):
++ """If upload_https() needs to use requests.post(), use this method.
+
+ Policies should override this method instead of the base upload_https()
+
+@@ -1247,20 +1245,20 @@ class LinuxPolicy(Policy):
+
+ def upload_https(self):
+ """Attempts to upload the archive to an HTTPS location.
+-
+- Policies may define whether this upload attempt should use streaming
+- or non-streaming data by setting the `use_https_streaming` class
+- attr to True
+ """
+ if not REQUESTS_LOADED:
+ raise Exception("Unable to upload due to missing python requests "
+ "library")
+
+ with open(self.upload_archive_name, 'rb') as arc:
+- if not self._use_https_streaming:
+- r = self._upload_https_no_stream(arc)
++ if self.commons['cmdlineopts'].upload_method == 'auto':
++ method = self._upload_method
++ else:
++ method = self.commons['cmdlineopts'].upload_method
++ if method == 'put':
++ r = self._upload_https_put(arc)
+ else:
+- r = self._upload_https_streaming(arc)
++ r = self._upload_https_post(arc)
+ if r.status_code != 200 and r.status_code != 201:
+ if r.status_code == 401:
+ raise Exception(
+@@ -1313,9 +1311,13 @@ class LinuxPolicy(Policy):
+ errno = str(err).split()[0]
+ if errno == '503':
+ raise Exception("could not login as '%s'" % user)
++ if errno == '530':
++ raise Exception("invalid password for user '%s'" % user)
+ if errno == '550':
+ raise Exception("could not set upload directory to %s"
+ % directory)
++ raise Exception("error trying to establish session: %s"
++ % str(err))
+
+ try:
+ with open(self.upload_archive_name, 'rb') as _arcfile:
+diff -rupN a/sos/policies/redhat.py b/sos/policies/redhat.py
+--- a/sos/policies/redhat.py
++++ b/sos/policies/redhat.py
+@@ -14,12 +14,16 @@ import json
+ import os
+ import sys
+ import re
++import logging
++from sos.policies.auth import DeviceAuthorizationClass
+
+-from sos.plugins import RedHatPlugin
++from sos.plugins import Plugin, RedHatPlugin
+ from sos.policies import LinuxPolicy, PackageManager, PresetDefaults
+ from sos import _sos as _
+ from sos import SoSOptions
+
++logger = logging.getLogger("sos")
++
+ try:
+ import requests
+ REQUESTS_LOADED = True
+@@ -53,6 +57,10 @@ class RedHatPolicy(LinuxPolicy):
+ name_pattern = 'friendly'
+ upload_url = None
+ upload_user = None
++ client_identifier_url = "https://sso.redhat.com/auth/"\
++ "realms/redhat-external/protocol/openid-connect/auth/device"
++ token_endpoint = "https://sso.redhat.com/auth/realms/"\
++ "redhat-external/protocol/openid-connect/token"
+
+ def __init__(self, sysroot=None):
+ super(RedHatPolicy, self).__init__(sysroot=sysroot)
+@@ -275,6 +283,8 @@ generated in %(tmpdir)s and may be provi
+ support representative.
+ """ + disclaimer_text + "%(vendor_text)s\n")
+ _upload_url = RH_SFTP_HOST
++ _device_token = None
++ _upload_method = 'post'
+
+ def __init__(self, sysroot=None):
+ super(RHELPolicy, self).__init__(sysroot=sysroot)
+@@ -306,16 +316,23 @@ support representative.
+
+ def prompt_for_upload_user(self):
+ if self.commons['cmdlineopts'].upload_user:
+- return
+- # Not using the default, so don't call this prompt for RHCP
+- if self.commons['cmdlineopts'].upload_url:
+- super(RHELPolicy, self).prompt_for_upload_user()
+- return
+- if self.case_id:
+- self.upload_user = input(_(
+- "Enter your Red Hat Customer Portal username for uploading ["
+- "empty for anonymous SFTP]: ")
++ logger.info(
++ _("The option --upload-user has been deprecated in favour"
++ " of device authorization in RHEL")
++ )
++ if not self.case_id:
++ # no case id provided => failover to SFTP
++ self.upload_url = RH_SFTP_HOST
++ logger.info("No case id provided, uploading to SFTP")
++
++ def prompt_for_upload_password(self):
++ # With OIDC we don't ask for user/pass anymore
++ if self.commons['cmdlineopts'].upload_pass:
++ logger.info(
++ _("The option --upload-pass has been deprecated in favour"
++ " of device authorization in RHEL")
+ )
++ return
+
+ def get_upload_url(self):
+ if self.upload_url:
+@@ -324,10 +341,40 @@ support representative.
+ return self.commons['cmdlineopts'].upload_url
+ elif self.commons['cmdlineopts'].upload_protocol == 'sftp':
+ return RH_SFTP_HOST
++ elif not self.commons['cmdlineopts'].case_id:
++ logger.info("No case id provided, uploading to SFTP")
++ return RH_SFTP_HOST
+ else:
+ rh_case_api = "/support/v1/cases/%s/attachments"
+ return RH_API_HOST + rh_case_api % self.case_id
+
++ def _get_upload_https_auth(self):
++ str_auth = "Bearer {}".format(self._device_token)
++ return {'Authorization': str_auth}
++
++ def _upload_https_post(self, archive, verify=True):
++ """If upload_https() needs to use requests.post(), use this method.
++ Policies should override this method instead of the base upload_https()
++ :param archive: The open archive file object
++ """
++ files = {
++ 'file': (archive.name.split('/')[-1], archive,
++ self._get_upload_headers())
++ }
++ # Get the access token at this point. With this,
++ # we cover the cases where report generation takes
++ # longer than the token timeout
++ RHELAuth = DeviceAuthorizationClass(
++ self.client_identifier_url,
++ self.token_endpoint
++ )
++ self._device_token = RHELAuth.get_access_token()
++ logger.info("Device authorized correctly. Uploading file to {}"
++ .format(self.get_upload_url_string()))
++ return requests.post(self.get_upload_url(), files=files,
++ headers=self._get_upload_https_auth(),
++ verify=verify)
++
+ def _get_upload_headers(self):
+ if self.get_upload_url().startswith(RH_API_HOST):
+ return {'isPrivate': 'false', 'cache-control': 'no-cache'}
+@@ -362,21 +409,43 @@ support representative.
+ " for obtaining SFTP auth token.")
+ _token = None
+ _user = None
++
++ # We may have a device token already if we attempted
++ # to upload via http but the upload failed. So
++ # lets check first if there isn't one.
++ if not self._device_token:
++ try:
++ RHELAuth = DeviceAuthorizationClass(
++ self.client_identifier_url,
++ self.token_endpoint
++ )
++ except Exception as e:
++ # We end up here if the user cancels the device
++ # authentication in the web interface
++ if "end user denied" in str(e):
++ logger.info(
++ "Device token authorization "
++ "has been cancelled by the user."
++ )
++ else:
++ self._device_token = RHELAuth.get_access_token()
++ if self._device_token:
++ logger.info("Device authorized correctly. Uploading file to {}"
++ .format(self.get_upload_url_string()))
++
+ url = RH_API_HOST + '/support/v2/sftp/token'
+- # we have a username and password, but we need to reset the password
+- # to be the token returned from the auth endpoint
+- if self.get_upload_user() and self.get_upload_password():
+- auth = self.get_upload_https_auth()
+- ret = requests.post(url, auth=auth, timeout=10)
++ ret = None
++ if self._device_token:
++ headers = self._get_upload_https_auth()
++ ret = requests.post(url, headers=headers, timeout=10)
+ if ret.status_code == 200:
+ # credentials are valid
+- _user = self.get_upload_user()
++ _user = json.loads(ret.text)['username']
+ _token = json.loads(ret.text)['token']
+ else:
+ print("Unable to retrieve Red Hat auth token using provided "
+ "credentials. Will try anonymous.")
+- # we either do not have a username or password/token, or both
+- if not _token:
++ else:
+ adata = {"isAnonymous": True}
+ anon = requests.post(url, data=json.dumps(adata), timeout=10)
+ if anon.status_code == 200:
+@@ -395,16 +464,17 @@ support representative.
+ from RHCP failures to the public RH dropbox
+ """
+ try:
+- if not self.get_upload_user() or not self.get_upload_password():
++ if self.upload_url and self.upload_url.startswith(RH_API_HOST) and\
++ (not self.get_upload_user() or not self.get_upload_password()):
+ self.upload_url = RH_SFTP_HOST
+ uploaded = super(RHELPolicy, self).upload_archive(archive)
+- except Exception:
++ except Exception as e:
+ uploaded = False
+ if not self.upload_url.startswith(RH_API_HOST):
+ raise
+ else:
+- print("Upload to Red Hat Customer Portal failed. Trying %s"
+- % RH_SFTP_HOST)
++ print("Upload to Red Hat Customer Portal failed due to %s. "
++ "Trying %s" % (e, RH_SFTP_HOST))
+ self.upload_url = RH_SFTP_HOST
+ uploaded = super(RHELPolicy, self).upload_archive(archive)
+ return uploaded
+diff -rupN a/sos/policies/ubuntu.py b/sos/policies/ubuntu.py
+--- a/sos/policies/ubuntu.py
++++ b/sos/policies/ubuntu.py
+@@ -15,7 +15,7 @@ class UbuntuPolicy(DebianPolicy):
+ _upload_url = "https://files.support.canonical.com/uploads/"
+ _upload_user = "ubuntu"
+ _upload_password = "ubuntu"
+- _use_https_streaming = True
++ _upload_method = 'put'
+
+ def __init__(self, sysroot=None):
+ super(UbuntuPolicy, self).__init__(sysroot=sysroot)
+diff -rupN a/sos/sosreport.py b/sos/sosreport.py
+--- a/sos/sosreport.py
++++ b/sos/sosreport.py
+@@ -255,6 +255,9 @@ def _get_parser():
+ help="Username to authenticate to upload server with")
+ parser.add_argument("--upload-pass", default=None,
+ help="Password to authenticate to upload server with")
++ parser.add_argument("--upload-method", default='auto',
++ choices=['auto', 'put', 'post'],
++ help="HTTP method to use for uploading")
+ parser.add_argument("--upload-protocol", default='auto',
+ choices=['auto', 'https', 'ftp', 'sftp'],
+ help="Manually specify the upload protocol")
+diff -rupN a/man/en/sosreport.1 b/man/en/sosreport.1
+--- a/man/en/sosreport.1
++++ b/man/en/sosreport.1
+@@ -315,6 +315,13 @@ when prompted rather than using this opt
+ Specify a directory to upload to, if one is not specified by a vendor default location
+ or if your destination server does not allow writes to '/'.
+ .TP
++.B \--upload-method METHOD
++Specify the HTTP method to use for uploading to the provided --upload-url. Valid
++values are 'auto' (default), 'put', or 'post'. The use of 'auto' will default to
++the method required by the policy-default upload location, if one exists.
++
++This option has no effect on upload methods other than HTTPS.
++.TP
+ .B \--upload-protocol PROTO
+ Manually specify the protocol to use for uploading to the target \fBupload-url\fR.
+
+diff --git a/setup.py b/setup.py
+index affe731..718ded1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -71,7 +71,7 @@ setup(name='sos',
+ ('share/man/man1', ['man/en/sosreport.1']),
+ ('share/man/man5', ['man/en/sos.conf.5']),
+ ],
+- packages=['sos', 'sos.plugins', 'sos.policies'],
++ packages=['sos', 'sos.plugins', 'sos.policies', 'sos.policies.auth'],
+ cmdclass={'build': BuildData, 'install_data': InstallData},
+ requires=['six', 'futures'],
+ )
+diff --git a/Makefile b/Makefile
+index ba99c5c..f02b888 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@ MINOR := $(shell echo $(VERSION) | cut -f 2 -d '.')
+ RELEASE := $(shell echo `awk '/^Release:/ {gsub(/\%.*/,""); print $2}' sos.spec`)
+ REPO = https://github.com/sosreport/sos
+
+-SUBDIRS = po sos sos/plugins sos/policies #docs
++SUBDIRS = po sos sos/plugins sos/policies sos/policies/auth #docs
+ PYFILES = $(wildcard *.py)
+ # OS X via brew
+ # MSGCAT = /usr/local/Cellar/gettext/0.18.1.1/bin/msgcat
+diff --git a/sos/policies/auth/Makefile b/sos/policies/auth/Makefile
+new file mode 100644
+index 0000000000..29a4830406
+--- /dev/null
++++ b/sos/policies/auth/Makefile
+@@ -0,0 +1,20 @@
++PYTHON=python
++PACKAGE = $(shell basename `pwd`)
++PYFILES = $(wildcard *.py)
++PYVER := $(shell $(PYTHON) -c 'import sys; print("%.3s" %(sys.version))')
++PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print(sys.prefix)')
++PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
++PKGDIR = $(PYLIBDIR)/site-packages/sos/policies/$(PACKAGE)
++
++all:
++ echo "nada"
++
++clean:
++ rm -f *.pyc *.pyo *~
++
++install:
++ mkdir -p $(DESTDIR)/$(PKGDIR)
++ for p in $(PYFILES) ; do \
++ install -m 644 $$p $(DESTDIR)/$(PKGDIR)/$$p; \
++ done
++ $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PYDIR)', 1)"
++
diff --git a/SOURCES/sos-RHEL-2357-collect-output--of-rpm-showrc.patch b/SOURCES/sos-RHEL-2357-collect-output--of-rpm-showrc.patch
new file mode 100644
index 0000000..2b6ef5f
--- /dev/null
+++ b/SOURCES/sos-RHEL-2357-collect-output--of-rpm-showrc.patch
@@ -0,0 +1,25 @@
+From 23ace61977810c36774a1ed0239c37a2a3be2072 Mon Sep 17 00:00:00 2001
+From: Barbora Vassova <bvassova@redhat.com>
+Date: Thu, 11 Jan 2024 10:53:47 +0100
+Subject: [PATCH] [rpm] Capture the output of 'rpm --showrc' This request adds
+ the output of --showrc to sos so we can verify the default values of options
+ set via rpmrc and macros config files.
+
+Relevant: #3475
+
+Signed-off-by: Barbora Vassova <bvassova@redhat.com>
+---
+ sos/plugins/rpm.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py
+index c53b7e40be..f9ec450e80 100644
+--- a/sos/plugins/rpm.py
++++ b/sos/plugins/rpm.py
+@@ -61,4 +61,6 @@ def add_rpm_cmd(query_fmt, filter_cmd, symlink, suggest):
+ suggest_filename='lsof_D_var_lib_rpm')
+ self.add_copy_spec("/var/lib/rpm")
+
++ self.add_cmd_output("rpm --showrc")
++
+ # vim: set et ts=4 sw=4 :
diff --git a/SOURCES/sos-RHELPLAN-118856-collect-information-about-sca.patch b/SOURCES/sos-RHELPLAN-118856-collect-information-about-sca.patch
new file mode 100644
index 0000000..7677ae4
--- /dev/null
+++ b/SOURCES/sos-RHELPLAN-118856-collect-information-about-sca.patch
@@ -0,0 +1,31 @@
+From f688abf352eb53ab3ca1498d5428173016b17029 Mon Sep 17 00:00:00 2001
+From: Barbora Vassova <bvassova@redhat.com>
+Date: Thu, 11 Jan 2024 11:12:53 +0100
+Subject: [PATCH] [candlepin] collect information about SCA This change should
+ start to collecting information about SCA enablement per organization.
+
+Relevant: #3475
+
+Signed-off-by: Barbora Vassova <bvassova@redhat.com>
+---
+ sos/plugins/candlepin.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/sos/plugins/candlepin.py b/sos/plugins/candlepin.py
+index e51c6468dd..55c275d76e 100644
+--- a/sos/plugins/candlepin.py
++++ b/sos/plugins/candlepin.py
+@@ -83,6 +83,13 @@ def setup(self):
+ self.add_cmd_output(_cmd, suggest_filename='candlepin_db_tables_sizes',
+ env=self.env)
+
++ _cmd = self.build_query_cmd("\
++ SELECT displayname, content_access_mode \
++ FROM cp_owner;")
++ self.add_cmd_output(_cmd,
++ suggest_filename='simple_content_access',
++ env=self.env)
++
+ def build_query_cmd(self, query, csv=False):
+ """
+ Builds the command needed to invoke the pgsql query as the postgres
diff --git a/SOURCES/sos-RHELPLAN-143027-scrub-admin-init-password-in-installer-logs.patch b/SOURCES/sos-RHELPLAN-143027-scrub-admin-init-password-in-installer-logs.patch
new file mode 100644
index 0000000..85fcce6
--- /dev/null
+++ b/SOURCES/sos-RHELPLAN-143027-scrub-admin-init-password-in-installer-logs.patch
@@ -0,0 +1,38 @@
+From 190a92a1b19a773d20c80739747e74ad215138ad Mon Sep 17 00:00:00 2001
+From: Barbora Vassova <bvassova@redhat.com>
+Date: Thu, 11 Jan 2024 13:18:43 +0100
+Subject: [PATCH] [foreman] scrub admin init password in installer logs
+ Obfuscate several instances of passwords:
+
+"--foreman-initial-admin-password", "mySecret",
++candlepin.amqp.keystore_password=secretHash1
++jpa.config.hibernate.connection.password=secretHash2
+
+by enhancing the scrubbing of:
+
+--password='secretPwd'
+
+Relevant: #3475
+
+Signed-off-by: Barbora Vassova <bvassova@redhat.com>
+---
+ sos/plugins/foreman.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py
+index e0b6eeb159..891540fed6 100644
+--- a/sos/plugins/foreman.py
++++ b/sos/plugins/foreman.py
+@@ -290,7 +290,12 @@ def postproc(self):
+ "/var/log/foreman-installer/sat*",
+ sat_debug_reg,
+ r"\1 \2 ********")
++ # also hide passwords in yet different formats
+ self.do_path_regex_sub(
++ "/var/log/foreman-installer/sat*",
++ r"(\.|_|-)password(=\'|=|\", \")(\w*)",
++ r"\1password\2********")
++ self.do_path_regex_sub(
+ "/var/log/foreman-installer/foreman-proxy*",
+ r"(\s*proxy_password\s=) (.*)",
+ r"\1 ********")
diff --git a/SOURCES/sos-centos-branding.patch b/SOURCES/sos-centos-branding.patch
deleted file mode 100644
index 86ab010..0000000
--- a/SOURCES/sos-centos-branding.patch
+++ /dev/null
@@ -1,1288 +0,0 @@
-diff -uNrp sos-3.0.orig/po/af.po sos-3.0/po/af.po
---- sos-3.0.orig/po/af.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/af.po 2014-06-21 11:15:36.435724571 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/am.po sos-3.0/po/am.po
---- sos-3.0.orig/po/am.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/am.po 2014-06-21 11:15:36.436724563 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/ar.po sos-3.0/po/ar.po
---- sos-3.0.orig/po/ar.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ar.po 2014-06-21 11:16:38.081245080 -0500
-@@ -179,8 +179,8 @@ msgid "Cannot upload to specified URL."
- msgstr "لا يمكن الرفع للعنوان المحدّد"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "صودفت مشكلة برفع تقريرك إلى دعم Red Hat. "
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "صودفت مشكلة برفع تقريرك إلى دعم CentOS. "
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/as.po sos-3.0/po/as.po
---- sos-3.0.orig/po/as.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/as.po 2014-06-21 11:15:36.437724555 -0500
-@@ -85,11 +85,11 @@ msgid ""
- "No changes will be made to your system.\n"
- "\n"
- msgstr ""
--"এই সামগ্ৰীৰ সহায়ত যান্ত্ৰিক সামগ্ৰী আৰু Red Hat Enterprise Linux\n"
-+"এই সামগ্ৰীৰ সহায়ত যান্ত্ৰিক সামগ্ৰী আৰু CentOS Enterprise Linux\n"
- "প্ৰণালীৰ প্ৰতিষ্ঠা সম্পৰ্কে বিশদ তথ্য সংগ্ৰহ কৰা হ'ব ।\n"
- "তথ্য সংগ্ৰহৰ পিছত /tmp পঞ্জিকাৰ অধীন এটা আৰ্কাইভ নিৰ্মিত হয় ।\n"
- "এই আৰ্কাইভ আপুনি সহায়তা প্ৰতিনিধিৰ কাশত পঠায় দিব পাৰে ।\n"
--"Red Hat দ্বাৰা এই তথ্য অকল সমস্যাৰ কাৰণ নিৰ্ণয় কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব\n"
-+"CentOS দ্বাৰা এই তথ্য অকল সমস্যাৰ কাৰণ নিৰ্ণয় কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব\n"
- "আৰু ইয়াৰ গোপনীয়তা বজায় ৰাখা হ'ব ।\n"
- "\n"
- "এই কাম সম্পন্ন হ'বলৈ কিছু সময় ব্যয় হ'ব পাৰে ।\n"
-@@ -184,14 +184,14 @@ msgid "Cannot upload to specified URL."
- msgstr "উল্লিখিত URL-এ আপলোড কৰিবলৈ ব্যৰ্থ ।"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "আপোনাৰ ৰিপোৰ্টটি Red Hat সহায়তা ব্যৱস্থাত আপলোড কৰিবলৈ সমস্যা ।"
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "আপোনাৰ ৰিপোৰ্টটি CentOS সহায়তা ব্যৱস্থাত আপলোড কৰিবলৈ সমস্যা ।"
-
- #: ../sos/policyredhat.py:401
- #, fuzzy, python-format
- msgid "Your report was successfully uploaded to %s with name:"
- msgstr ""
--"আপোনাৰ প্ৰদত্ত ৰিপোৰ্ট সফলতাৰে সৈতে Red Hat-ৰ ftp সেৱকত নিম্নলিখিত নামত আপলোড "
-+"আপোনাৰ প্ৰদত্ত ৰিপোৰ্ট সফলতাৰে সৈতে CentOS-ৰ ftp সেৱকত নিম্নলিখিত নামত আপলোড "
- "কৰা হৈছে:"
-
- #: ../sos/policyredhat.py:404
-diff -uNrp sos-3.0.orig/po/ast.po sos-3.0/po/ast.po
---- sos-3.0.orig/po/ast.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ast.po 2014-06-21 11:17:08.318010034 -0500
-@@ -86,10 +86,10 @@ msgid ""
- "\n"
- msgstr ""
- "Esta utilidá recueyerá dalguna información detallada sobro'l\n"
--"hardware y la configuración del to sistema Red Hat Enterprise Linux.\n"
-+"hardware y la configuración del to sistema CentOS Enterprise Linux.\n"
- "La información recuéyese y críase un ficheru baxo /tmp.\n"
- "Ésti puede mandase al to representante de sofitu.\n"
--"Red Hat usará esta información pa diagnosticar el sistema\n"
-+"CentOS usará esta información pa diagnosticar el sistema\n"
- "únicamente y considerará esta información como confidencial.\n"
- "\n"
- "Esti procesu va llevar un tiempu pa completase.\n"
-@@ -184,14 +184,14 @@ msgid "Cannot upload to specified URL."
- msgstr "Nun se puede cargar a la URL especificada."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
--"Hebo un problema al cargar el to informe al equipu d'asistencia de Red Hat"
-+"Hebo un problema al cargar el to informe al equipu d'asistencia de CentOS"
-
- #: ../sos/policyredhat.py:401
- #, fuzzy, python-format
- msgid "Your report was successfully uploaded to %s with name:"
--msgstr "El to informe cargóse bien a los sirvidores ftp e Red Hat col nome:"
-+msgstr "El to informe cargóse bien a los sirvidores ftp e CentOS col nome:"
-
- #: ../sos/policyredhat.py:404
- msgid "Please communicate this name to your support representative."
-diff -uNrp sos-3.0.orig/po/be.po sos-3.0/po/be.po
---- sos-3.0.orig/po/be.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/be.po 2014-06-21 11:15:36.438724547 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/bg.po sos-3.0/po/bg.po
---- sos-3.0.orig/po/bg.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/bg.po 2014-06-21 11:15:36.439724539 -0500
-@@ -172,9 +172,9 @@ msgid "Cannot upload to specified URL."
- msgstr "Не може да се качи на посочения URL"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
--"Възникна проблем при качването на вашия отчет на проддръжката на Red Hat."
-+"Възникна проблем при качването на вашия отчет на проддръжката на CentOS."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/bn_IN.po sos-3.0/po/bn_IN.po
---- sos-3.0.orig/po/bn_IN.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/bn_IN.po 2014-06-21 11:15:36.440724532 -0500
-@@ -184,8 +184,8 @@ msgid "Cannot upload to specified URL."
- msgstr "উল্লিখিত URL-এ আপলোড করতে ব্যর্থ।"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "আপনার রিপোর্টটি Red Hat সহায়তা ব্যবস্থায় আপলোড করতে সমস্যা।"
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "আপনার রিপোর্টটি CentOS সহায়তা ব্যবস্থায় আপলোড করতে সমস্যা।"
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/bn.po sos-3.0/po/bn.po
---- sos-3.0.orig/po/bn.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/bn.po 2014-06-21 11:15:36.440724532 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/bs.po sos-3.0/po/bs.po
---- sos-3.0.orig/po/bs.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/bs.po 2014-06-21 11:15:36.441724524 -0500
-@@ -189,8 +189,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Nije se mogao postaviti specificirani URL,"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Bilo je problema u postavljanju vaseg izvjestaja na Red Hat podrsku. "
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Bilo je problema u postavljanju vaseg izvjestaja na CentOS podrsku. "
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/ca.po sos-3.0/po/ca.po
---- sos-3.0.orig/po/ca.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ca.po 2014-06-21 11:15:36.442724516 -0500
-@@ -194,8 +194,8 @@ msgid "Cannot upload to specified URL."
- msgstr "No es pot pujar a la URL especificada."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Hi ha hagut un problema en pujar l'informe al manteniment de Red Hat."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Hi ha hagut un problema en pujar l'informe al manteniment de CentOS."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/cs.po sos-3.0/po/cs.po
---- sos-3.0.orig/po/cs.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/cs.po 2014-06-21 11:15:36.443724508 -0500
-@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Nelze uložit na uvedené URL."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Při odesílání zprávy do firmy Red Hat vznikla chyba."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Při odesílání zprávy do firmy CentOS vznikla chyba."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/cy.po sos-3.0/po/cy.po
---- sos-3.0.orig/po/cy.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/cy.po 2014-06-21 11:15:36.443724508 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/da.po sos-3.0/po/da.po
---- sos-3.0.orig/po/da.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/da.po 2014-06-21 11:15:36.444724501 -0500
-@@ -184,9 +184,9 @@ msgid "Cannot upload to specified URL."
- msgstr "Kan ikke overføre til den angivne URL."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
--"Der opstod et problem under overførsel af din rapport til Red Hat-support."
-+"Der opstod et problem under overførsel af din rapport til CentOS-support."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/de_CH.po sos-3.0/po/de_CH.po
---- sos-3.0.orig/po/de_CH.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/de_CH.po 2014-06-21 11:15:36.444724501 -0500
-@@ -87,10 +87,10 @@ msgid ""
- "\n"
- msgstr ""
- "Dieses Dienstprogramm sammelt einige detaillierte Informationen\n"
--"zur Hardware und Einrichtung Ihres Red Hat Enterprise Linux Systems.\n"
-+"zur Hardware und Einrichtung Ihres CentOS Enterprise Linux Systems.\n"
- "Die Informationen werden gesammelt und in einem Archiv unter /tmp\n"
- "zusammengefasst, welches Sie an einen Support-Vertreter schicken\n"
--"können. Red Hat verwendet diese Informationen AUSSCHLIESSLICH zu\n"
-+"können. CentOS verwendet diese Informationen AUSSCHLIESSLICH zu\n"
- "Diagnosezwecken und behandelt sie als vertrauliche Informationen.\n"
- "\n"
- "Die Fertigstellung dieses Prozesses kann eine Weile dauern.\n"
-@@ -188,14 +188,14 @@ msgid "Cannot upload to specified URL."
- msgstr "Hochladen zu speziellem URL scheiterte."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Beim Hochladen Ihres Berichts zum Red Hat Support trat ein Fehler auf."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Beim Hochladen Ihres Berichts zum CentOS Support trat ein Fehler auf."
-
- #: ../sos/policyredhat.py:401
- #, fuzzy, python-format
- msgid "Your report was successfully uploaded to %s with name:"
- msgstr ""
--"Ihr Bericht wurde erfolgreich auf den Red Hat FTP-Server hochgeladen, mit "
-+"Ihr Bericht wurde erfolgreich auf den CentOS FTP-Server hochgeladen, mit "
- "dem Namen:"
-
- #: ../sos/policyredhat.py:404
-diff -uNrp sos-3.0.orig/po/de.po sos-3.0/po/de.po
---- sos-3.0.orig/po/de.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/de.po 2014-06-21 11:15:36.445724493 -0500
-@@ -191,8 +191,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Hochladen zu spezieller URL scheiterte."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Beim Hochladen Ihres Berichts zum Red Hat Support trat ein Fehler auf."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Beim Hochladen Ihres Berichts zum CentOS Support trat ein Fehler auf."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/el.po sos-3.0/po/el.po
---- sos-3.0.orig/po/el.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/el.po 2014-06-21 11:15:36.445724493 -0500
-@@ -84,10 +84,10 @@ msgid ""
- "\n"
- msgstr ""
- "Αυτό το εργαλείο θα συγκετρώσει ορισμένες πληροφορίες για τον υπολογιστή σας "
--"και την εγκατάσταση του Red Hat Enterprise Linux συστήματος.\n"
-+"και την εγκατάσταση του CentOS Enterprise Linux συστήματος.\n"
- "Οι πληροφορίες συγκετρώνονται και το archive δημιουργήται στο\n"
- "/tmp,το οποίο και μπορείτε να στείλετε σε έναν αντιπρόσωπο υποστήριξης.\n"
--"Η Red Hat θα χρησιμοποιήσει αυτα τα δεδομένα ΜΟΝΟ για διαγνωστικούς σκοπούς\n"
-+"Η CentOS θα χρησιμοποιήσει αυτα τα δεδομένα ΜΟΝΟ για διαγνωστικούς σκοπούς\n"
- "και θα παραμείνουν εμπιστευτηκά.\n"
- "\n"
-
-@@ -180,8 +180,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Δεν είναι δυνατό το upload στο καθορισμένο URL."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Υπήρξε ένα πρόβλημα κατα το upload της αναφοράς σας στην Red Hat."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Υπήρξε ένα πρόβλημα κατα το upload της αναφοράς σας στην CentOS."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/en_GB.po sos-3.0/po/en_GB.po
---- sos-3.0.orig/po/en_GB.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/en_GB.po 2014-06-21 11:15:36.446724485 -0500
-@@ -83,10 +83,10 @@ msgid ""
- "\n"
- msgstr ""
- "This utility will collect some detailed information about the\n"
--"hardware and setup of your Red Hat Enterprise Linux system.\n"
-+"hardware and setup of your CentOS Enterprise Linux system.\n"
- "The information is collected and an archive is packaged under\n"
- "/tmp, which you can send to a support representative.\n"
--"Red Hat will use this information for diagnostic purposes ONLY\n"
-+"CentOS will use this information for diagnostic purposes ONLY\n"
- "and it will be considered confidential information.\n"
- "\n"
- "This process may take a while to complete.\n"
-@@ -181,14 +181,14 @@ msgid "Cannot upload to specified URL."
- msgstr "Cannot upload to specified URL."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "There was a problem uploading your report to CentOS support."
-
- #: ../sos/policyredhat.py:401
- #, fuzzy, python-format
- msgid "Your report was successfully uploaded to %s with name:"
- msgstr ""
--"Your report was successfully uploaded to Red Hat's ftp server with name:"
-+"Your report was successfully uploaded to CentOS's ftp server with name:"
-
- #: ../sos/policyredhat.py:404
- msgid "Please communicate this name to your support representative."
-diff -uNrp sos-3.0.orig/po/en.po sos-3.0/po/en.po
---- sos-3.0.orig/po/en.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/en.po 2014-06-21 11:15:36.446724485 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/es.po sos-3.0/po/es.po
---- sos-3.0.orig/po/es.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/es.po 2014-06-21 11:17:24.153886936 -0500
-@@ -189,9 +189,9 @@ msgid "Cannot upload to specified URL."
- msgstr "No se puede cargar a la URL especificada."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
--"Hubo un problema al cargar su reporte al equipo de asistencia de Red Hat"
-+"Hubo un problema al cargar su reporte al equipo de asistencia de CentOS"
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/et.po sos-3.0/po/et.po
---- sos-3.0.orig/po/et.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/et.po 2014-06-21 11:15:36.447724477 -0500
-@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/eu_ES.po sos-3.0/po/eu_ES.po
---- sos-3.0.orig/po/eu_ES.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/eu_ES.po 2014-06-21 11:15:36.448724469 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/fa.po sos-3.0/po/fa.po
---- sos-3.0.orig/po/fa.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/fa.po 2014-06-21 11:15:36.448724469 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/fi.po sos-3.0/po/fi.po
---- sos-3.0.orig/po/fi.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/fi.po 2014-06-21 11:17:38.280777198 -0500
-@@ -179,8 +179,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Annettuun osoitteeseen ei voida lähettää."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Raportin lähettämisessä Red Hatin käyttötukeen oli ongelmia."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Raportin lähettämisessä CentOSin käyttötukeen oli ongelmia."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/fr.po sos-3.0/po/fr.po
---- sos-3.0.orig/po/fr.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/fr.po 2014-06-21 11:15:36.449724462 -0500
-@@ -188,10 +188,10 @@ msgid "Cannot upload to specified URL."
- msgstr "Impossible de le télécharger vers l'URL spécifié."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
- "Une erreur s'est produite lors du téléchargement de votre rapport vers le "
--"support Red Hat."
-+"support CentOS."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/gl.po sos-3.0/po/gl.po
---- sos-3.0.orig/po/gl.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/gl.po 2014-06-21 11:15:36.450724454 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/gu.po sos-3.0/po/gu.po
---- sos-3.0.orig/po/gu.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/gu.po 2014-06-21 11:15:36.450724454 -0500
-@@ -186,8 +186,8 @@ msgid "Cannot upload to specified URL."
- msgstr "સ્પષ્ટ કરેલ URL અપલોડ કરી શકતા નથી."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "તમારા અહેવાલને Red Hat આધારમાં અપલોડ કરવામાં સમસ્યા હતી."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "તમારા અહેવાલને CentOS આધારમાં અપલોડ કરવામાં સમસ્યા હતી."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/he.po sos-3.0/po/he.po
---- sos-3.0.orig/po/he.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/he.po 2014-06-21 11:15:36.450724454 -0500
-@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/hi.po sos-3.0/po/hi.po
---- sos-3.0.orig/po/hi.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/hi.po 2014-06-21 11:15:36.451724446 -0500
-@@ -187,8 +187,8 @@ msgid "Cannot upload to specified URL."
- msgstr "निर्दिष्ट URL अपलोड नहीं कर सकता है."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "आपके रिपोर्ट को Red Hat समर्थन में अपलोड करने में समस्या थी."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "आपके रिपोर्ट को CentOS समर्थन में अपलोड करने में समस्या थी."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/hr.po sos-3.0/po/hr.po
---- sos-3.0.orig/po/hr.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/hr.po 2014-06-21 11:15:36.451724446 -0500
-@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/hu.po sos-3.0/po/hu.po
---- sos-3.0.orig/po/hu.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/hu.po 2014-06-21 11:15:36.452724438 -0500
-@@ -180,8 +180,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Nem lehet az URL-re feltölteni."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "A jelentést a Red Hat támogatáshoz feltöltvén baj történt."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "A jelentést a CentOS támogatáshoz feltöltvén baj történt."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/hy.po sos-3.0/po/hy.po
---- sos-3.0.orig/po/hy.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/hy.po 2014-06-21 11:15:36.452724438 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/id.po sos-3.0/po/id.po
---- sos-3.0.orig/po/id.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/id.po 2014-06-21 11:15:36.453724430 -0500
-@@ -171,7 +171,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/ilo.po sos-3.0/po/ilo.po
---- sos-3.0.orig/po/ilo.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ilo.po 2014-06-21 11:15:36.453724430 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/is.po sos-3.0/po/is.po
---- sos-3.0.orig/po/is.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/is.po 2014-06-21 11:15:36.453724430 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/it.po sos-3.0/po/it.po
---- sos-3.0.orig/po/it.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/it.po 2014-06-21 11:15:36.454724423 -0500
-@@ -181,7 +181,7 @@ msgid "Cannot upload to specified URL."
- msgstr "Impossibile inviare all'URL specificato."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
- "Si è verificato un problema nell'inviare il report al supporto tecnico Red "
- "Hat."
-diff -uNrp sos-3.0.orig/po/ja.po sos-3.0/po/ja.po
---- sos-3.0.orig/po/ja.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ja.po 2014-06-21 11:15:36.454724423 -0500
-@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL."
- msgstr "指定された URL にアップロードできません。"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "レポートを Red Hat サポートにアップロードするのに問題がありました。"
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "レポートを CentOS サポートにアップロードするのに問題がありました。"
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/ka.po sos-3.0/po/ka.po
---- sos-3.0.orig/po/ka.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ka.po 2014-06-21 11:15:36.455724415 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/kn.po sos-3.0/po/kn.po
---- sos-3.0.orig/po/kn.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/kn.po 2014-06-21 11:15:36.455724415 -0500
-@@ -185,9 +185,9 @@ msgid "Cannot upload to specified URL."
- msgstr "ಸೂಚಿಸಲಾದ URL ಅನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
--"ನಿಮ್ಮ ವರದಿಯನ್ನು Red Hat ಬೆಂಬಲದ ಸ್ಥಳಕ್ಕೆ ಅಪ್ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ಒಂದು ತೊಂದರೆ ಉಂಟಾಗಿದೆ."
-+"ನಿಮ್ಮ ವರದಿಯನ್ನು CentOS ಬೆಂಬಲದ ಸ್ಥಳಕ್ಕೆ ಅಪ್ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ಒಂದು ತೊಂದರೆ ಉಂಟಾಗಿದೆ."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/ko.po sos-3.0/po/ko.po
---- sos-3.0.orig/po/ko.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ko.po 2014-06-21 11:17:58.331621414 -0500
-@@ -84,10 +84,10 @@ msgid ""
- "No changes will be made to your system.\n"
- "\n"
- msgstr ""
--"이 유틸리티는 Red Hat Enterprise Linux 시스템의 하드웨어와 \n"
-+"이 유틸리티는 CentOS Enterprise Linux 시스템의 하드웨어와 \n"
- "시스템 설정 사항에 대한 상세 정보를 수집하게 됩니다. 수집된 \n"
- "정보는 지원 담당자에게 보낼 수 있도록 /tmp 디렉토리 안에 \n"
--"아카이브로 저장됩니다. Red Hat은 이 정보를 문제 해결 목적으로만 사용하며 기"
-+"아카이브로 저장됩니다. CentOS은 이 정보를 문제 해결 목적으로만 사용하며 기"
- "밀 정보로 \n"
- "취급할 것입니다. \n"
- "\n"
-@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL."
- msgstr "지정된 URL에서 업로드할 수 없습니다."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "리포트를 Red Hat 지원 센터로 업로드하는 데 문제가 발생했습니다."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "리포트를 CentOS 지원 센터로 업로드하는 데 문제가 발생했습니다."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/ku.po sos-3.0/po/ku.po
---- sos-3.0.orig/po/ku.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ku.po 2014-06-21 11:15:36.456724407 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/lo.po sos-3.0/po/lo.po
---- sos-3.0.orig/po/lo.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/lo.po 2014-06-21 11:15:36.457724399 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/lt.po sos-3.0/po/lt.po
---- sos-3.0.orig/po/lt.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/lt.po 2014-06-21 11:15:36.457724399 -0500
-@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/lv.po sos-3.0/po/lv.po
---- sos-3.0.orig/po/lv.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/lv.po 2014-06-21 11:15:36.458724392 -0500
-@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/mk.po sos-3.0/po/mk.po
---- sos-3.0.orig/po/mk.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/mk.po 2014-06-21 11:15:36.459724384 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/ml.po sos-3.0/po/ml.po
---- sos-3.0.orig/po/ml.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ml.po 2014-06-21 11:15:36.459724384 -0500
-@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL."
- msgstr "നല്കിയിരിക്കുന്ന URL-ലേക്ക് ഫയല് അപ്ലോഡ് ചെയ്യുവാന് സാധ്യമായില്ല "
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Red Hat-ലേക്ക് നിങ്ങളുടെ റിപ്പോറ്ട്ട് അയയ്ക്കുന്നതില് ഏതോ പ്റശ്നം ഉണ്ടായിരിക്കുന്നു."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "CentOS-ലേക്ക് നിങ്ങളുടെ റിപ്പോറ്ട്ട് അയയ്ക്കുന്നതില് ഏതോ പ്റശ്നം ഉണ്ടായിരിക്കുന്നു."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/mr.po sos-3.0/po/mr.po
---- sos-3.0.orig/po/mr.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/mr.po 2014-06-21 11:15:36.460724376 -0500
-@@ -184,8 +184,8 @@ msgid "Cannot upload to specified URL."
- msgstr "निर्देशीत URL अपलोड करण्यास अशक्य."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "तुमचा अहवाल Red Hat सपोर्टकडे पाठवतेवेळी अडचण आढळली."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "तुमचा अहवाल CentOS सपोर्टकडे पाठवतेवेळी अडचण आढळली."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/ms.po sos-3.0/po/ms.po
---- sos-3.0.orig/po/ms.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ms.po 2014-06-21 11:15:36.461724368 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/my.po sos-3.0/po/my.po
---- sos-3.0.orig/po/my.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/my.po 2014-06-21 11:15:36.461724368 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/nb.po sos-3.0/po/nb.po
---- sos-3.0.orig/po/nb.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/nb.po 2014-06-21 11:15:36.462724360 -0500
-@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL."
- msgstr "Kan ikke laste opp til oppgitt URL."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/nds.po sos-3.0/po/nds.po
---- sos-3.0.orig/po/nds.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/nds.po 2014-06-21 11:15:36.462724360 -0500
-@@ -165,7 +165,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/nl.po sos-3.0/po/nl.po
---- sos-3.0.orig/po/nl.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/nl.po 2014-06-21 11:15:36.462724360 -0500
-@@ -183,9 +183,9 @@ msgid "Cannot upload to specified URL."
- msgstr "Kan niet naar de opgegeven URL uploaden."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
--"Er trad een probleem op bij het uploaden van jouw rapport naar Red Hat "
-+"Er trad een probleem op bij het uploaden van jouw rapport naar CentOS "
- "support."
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/nn.po sos-3.0/po/nn.po
---- sos-3.0.orig/po/nn.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/nn.po 2014-06-21 11:15:36.462724360 -0500
-@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/nso.po sos-3.0/po/nso.po
---- sos-3.0.orig/po/nso.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/nso.po 2014-06-21 11:15:36.463724353 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/or.po sos-3.0/po/or.po
---- sos-3.0.orig/po/or.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/or.po 2014-06-21 11:15:36.463724353 -0500
-@@ -188,8 +188,8 @@ msgid "Cannot upload to specified URL."
- msgstr "ଉଲ୍ଲିଖିତ URL କୁ ଧାରଣ କରିପାରିବେ ନାହିଁ।"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Red Hat ସହାୟତାରେ ଆପଣଙ୍କର ବିବରଣୀକୁ ଧାରଣ କରିବାରେ ସମସ୍ୟା ଦୋଇଥିଲା।"
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "CentOS ସହାୟତାରେ ଆପଣଙ୍କର ବିବରଣୀକୁ ଧାରଣ କରିବାରେ ସମସ୍ୟା ଦୋଇଥିଲା।"
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/pa.po sos-3.0/po/pa.po
---- sos-3.0.orig/po/pa.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/pa.po 2014-06-21 11:15:36.463724353 -0500
-@@ -184,8 +184,8 @@ msgid "Cannot upload to specified URL."
- msgstr "ਦਿੱਤੇ URL ਤੇ ਅੱਪਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦਾ।"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "ਤੁਹਾਡੀ ਰਿਪੋਰਟ ਨੂੰ Red Hat ਸਹਿਯੋਗ ਤੇ ਅੱਪਲੋਡ ਕਰਨ ਵੇਲੇ ਗਲਤੀ ਆਈ ਹੈ।"
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "ਤੁਹਾਡੀ ਰਿਪੋਰਟ ਨੂੰ CentOS ਸਹਿਯੋਗ ਤੇ ਅੱਪਲੋਡ ਕਰਨ ਵੇਲੇ ਗਲਤੀ ਆਈ ਹੈ।"
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/pl.po sos-3.0/po/pl.po
---- sos-3.0.orig/po/pl.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/pl.po 2014-06-21 11:15:36.463724353 -0500
-@@ -179,10 +179,10 @@ msgid "Cannot upload to specified URL."
- msgstr "Nie można wysłać na podany adres URL."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
- "Wystąpił problem podczas wysyłania raportu do wsparcia technicznego firmy "
--"Red Hat."
-+"CentOS."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/pt_BR.po sos-3.0/po/pt_BR.po
---- sos-3.0.orig/po/pt_BR.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/pt_BR.po 2014-06-21 11:15:36.463724353 -0500
-@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Não foi possível enviar para a URL especificada."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Houve um problema ao enviar o seu relatório para o suporte da Red Hat."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Houve um problema ao enviar o seu relatório para o suporte da CentOS."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/pt.po sos-3.0/po/pt.po
---- sos-3.0.orig/po/pt.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/pt.po 2014-06-21 11:15:36.463724353 -0500
-@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Não foi possível submeter para o URL especificado."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Ocorreu um erro ao submeter o seu relatório para o suporte Red Hat."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Ocorreu um erro ao submeter o seu relatório para o suporte CentOS."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/ro.po sos-3.0/po/ro.po
---- sos-3.0.orig/po/ro.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ro.po 2014-06-21 11:15:36.464724345 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/ru.po sos-3.0/po/ru.po
---- sos-3.0.orig/po/ru.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ru.po 2014-06-21 11:15:36.464724345 -0500
-@@ -186,9 +186,9 @@ msgid "Cannot upload to specified URL."
- msgstr "Не удалось отправить файл."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
--"Произошла ошибка при попытке отправить отчёт в службу поддержки Red Hat."
-+"Произошла ошибка при попытке отправить отчёт в службу поддержки CentOS."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/si.po sos-3.0/po/si.po
---- sos-3.0.orig/po/si.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/si.po 2014-06-21 11:15:36.464724345 -0500
-@@ -85,11 +85,11 @@ msgid ""
- "No changes will be made to your system.\n"
- "\n"
- msgstr ""
--"මෙම උපයෝගි තාවය දෘඩාංග පිළිබදව සවිස්තරාත්මක තොරතුරු රැස්කරණ අතර ඔබගේ Red Hat "
-+"මෙම උපයෝගි තාවය දෘඩාංග පිළිබදව සවිස්තරාත්මක තොරතුරු රැස්කරණ අතර ඔබගේ CentOS "
- "Enterprise Linux පද්ධතිය පිහිටවනු ලැබේ.\n"
- "රැස් කළ තොරතුරු සහ සංරක්ෂකය /tmp යටතේ ඇසුරුම් ගත කර ඇති අතර ඔබට එය සහායක නියෝජිත වෙත "
- "යැවිය හැක.\n"
--"Red Hat මෙම තොරතුරු භාවිතා කරන්නේ දෝෂ විනිශ්චය පමණක් වන අතර එම තොරතුරු රහසිගත තොරතුරු "
-+"CentOS මෙම තොරතුරු භාවිතා කරන්නේ දෝෂ විනිශ්චය පමණක් වන අතර එම තොරතුරු රහසිගත තොරතුරු "
- "ලෙස සළකණු ලබයි.\n"
- "\n"
- "මෙම ක්රියාව නිම වීමට වේලාවක් ගතවනු ඇත.\n"
-@@ -184,13 +184,13 @@ msgid "Cannot upload to specified URL."
- msgstr "දක්වන ලඳ URL වෙත ලබා දිය නොහැක."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "ඔබගේ වාර්තාව Red Hat සහය වෙතට ලබා දිමේදි දෝෂයල් ඇති විය."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "ඔබගේ වාර්තාව CentOS සහය වෙතට ලබා දිමේදි දෝෂයල් ඇති විය."
-
- #: ../sos/policyredhat.py:401
- #, fuzzy, python-format
- msgid "Your report was successfully uploaded to %s with name:"
--msgstr "ඔබගේ වාර්තාව සාර්තකව Red Hat's ftp සේවාදායකයට ලබාදුන් අතර නම වූයේ:"
-+msgstr "ඔබගේ වාර්තාව සාර්තකව CentOS's ftp සේවාදායකයට ලබාදුන් අතර නම වූයේ:"
-
- #: ../sos/policyredhat.py:404
- msgid "Please communicate this name to your support representative."
-diff -uNrp sos-3.0.orig/po/sk.po sos-3.0/po/sk.po
---- sos-3.0.orig/po/sk.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/sk.po 2014-06-21 11:15:36.464724345 -0500
-@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Nie je možné odoslať na zadanú adresu URL."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Nastal problém pri odosielaní vašej správy na podporu Red Hat."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Nastal problém pri odosielaní vašej správy na podporu CentOS."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/sl.po sos-3.0/po/sl.po
---- sos-3.0.orig/po/sl.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/sl.po 2014-06-21 11:15:36.464724345 -0500
-@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/sos.pot sos-3.0/po/sos.pot
---- sos-3.0.orig/po/sos.pot 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/sos.pot 2014-06-21 11:15:36.464724345 -0500
-@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/sq.po sos-3.0/po/sq.po
---- sos-3.0.orig/po/sq.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/sq.po 2014-06-21 11:15:36.464724345 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/sr@latin.po sos-3.0/po/sr@latin.po
---- sos-3.0.orig/po/sr@latin.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/sr@latin.po 2014-06-21 11:15:36.465724337 -0500
-@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Ne mogu da pošaljem na navedeni URL."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Pojavio se problem pri slanju vašeg izveštaja Red Hat podršci."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Pojavio se problem pri slanju vašeg izveštaja CentOS podršci."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/sr.po sos-3.0/po/sr.po
---- sos-3.0.orig/po/sr.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/sr.po 2014-06-21 11:15:36.465724337 -0500
-@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Не могу да пошаљем на наведени УРЛ."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Појавио се проблем при слању вашег извештаја Red Hat подршци."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Појавио се проблем при слању вашег извештаја CentOS подршци."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/sv.po sos-3.0/po/sv.po
---- sos-3.0.orig/po/sv.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/sv.po 2014-06-21 11:15:36.465724337 -0500
-@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Kan inte skicka till angiven URL."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Ett problem uppstod när din rapport skickades till Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Ett problem uppstod när din rapport skickades till CentOS support."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/ta.po sos-3.0/po/ta.po
---- sos-3.0.orig/po/ta.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ta.po 2014-06-21 11:15:36.465724337 -0500
-@@ -188,8 +188,8 @@ msgid "Cannot upload to specified URL."
- msgstr "குறிப்பிட்ட இணைய முகவரியில் ஏற்ற முடியவில்லை."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "உங்கள் அறிக்கையை Red Hat சேவைக்கு அனுப்புவதில் சிக்கல்."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "உங்கள் அறிக்கையை CentOS சேவைக்கு அனுப்புவதில் சிக்கல்."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/te.po sos-3.0/po/te.po
---- sos-3.0.orig/po/te.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/te.po 2014-06-21 11:15:36.465724337 -0500
-@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL."
- msgstr "తెలుపబడిన URLకు అప్లోడ్ చేయలేదు."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "మీ సమస్యను Red Hat మద్దతునకు అప్లోడు చేయుటలో వొక సమస్యవుంది."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "మీ సమస్యను CentOS మద్దతునకు అప్లోడు చేయుటలో వొక సమస్యవుంది."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/th.po sos-3.0/po/th.po
---- sos-3.0.orig/po/th.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/th.po 2014-06-21 11:18:12.876508348 -0500
-@@ -84,9 +84,9 @@ msgid ""
- "\n"
- msgstr ""
- "เครื่องมือนี้จะเก็บข้อมูลโดยละเอียดเกี่ยวกับฮาร์ดแวร์และการตั้งค่า\n"
--"ระบบ Red Hat Enterprise Linux ของคุณ ข้อมูลจะถูกเก็บและ\n"
-+"ระบบ CentOS Enterprise Linux ของคุณ ข้อมูลจะถูกเก็บและ\n"
- "สร้างเป็นไฟล์ที่ /tmp ซึ่งคุณสามารถส่งไปยังผู้สนับสนุนได้\n"
--"Red Hat จะใช้ข้อมูลนี้ในการแก้ไขปัญหาเท่านั้น และจะถือว่าเป็น\n"
-+"CentOS จะใช้ข้อมูลนี้ในการแก้ไขปัญหาเท่านั้น และจะถือว่าเป็น\n"
- "ความลับ\n"
- "\n"
- "กระบวนการนี้อาจจะใช้เวลาสักครู่ในการทำงาน จะไม่มีการแก้ไข\n"
-@@ -180,13 +180,13 @@ msgid "Cannot upload to specified URL."
- msgstr "ไม่สามารถอัพโหลดไปยัง URL ที่ระบุ"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "มีปัญหาในการอัพโหลดรายงานของคุณไปยังฝ่ายสนับสนุน Red Hat"
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "มีปัญหาในการอัพโหลดรายงานของคุณไปยังฝ่ายสนับสนุน CentOS"
-
- #: ../sos/policyredhat.py:401
- #, fuzzy, python-format
- msgid "Your report was successfully uploaded to %s with name:"
--msgstr "รายงานของคุณได้ถูกส่งไปยังเซิร์ฟเวอร์ ftp ของ Red Hat ในชื่อ:"
-+msgstr "รายงานของคุณได้ถูกส่งไปยังเซิร์ฟเวอร์ ftp ของ CentOS ในชื่อ:"
-
- #: ../sos/policyredhat.py:404
- msgid "Please communicate this name to your support representative."
-diff -uNrp sos-3.0.orig/po/tr.po sos-3.0/po/tr.po
---- sos-3.0.orig/po/tr.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/tr.po 2014-06-21 11:15:36.466724329 -0500
-@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Belirtilen URL 'ye yükleme yapılamadı."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Raporunuz Red Hat desteğe yüklenirken bir sorunla karşılaşıldı."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Raporunuz CentOS desteğe yüklenirken bir sorunla karşılaşıldı."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/uk.po sos-3.0/po/uk.po
---- sos-3.0.orig/po/uk.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/uk.po 2014-06-21 11:15:36.466724329 -0500
-@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL."
- msgstr "Не вдається надіслати файл."
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "Виникла помилка при спробі надіслати звіт до служби підтримки Red Hat."
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "Виникла помилка при спробі надіслати звіт до служби підтримки CentOS."
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/ur.po sos-3.0/po/ur.po
---- sos-3.0.orig/po/ur.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/ur.po 2014-06-21 11:15:36.466724329 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/vi.po sos-3.0/po/vi.po
---- sos-3.0.orig/po/vi.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/vi.po 2014-06-21 11:15:36.466724329 -0500
-@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/zh_CN.po sos-3.0/po/zh_CN.po
---- sos-3.0.orig/po/zh_CN.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/zh_CN.po 2014-06-21 11:15:36.466724329 -0500
-@@ -184,7 +184,7 @@ msgid "Cannot upload to specified URL."
- msgstr "无法上传到指定的网址。"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr "在将您的报告上传到红帽支持时出错。"
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/po/zh_TW.po sos-3.0/po/zh_TW.po
---- sos-3.0.orig/po/zh_TW.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/zh_TW.po 2014-06-21 11:15:36.466724329 -0500
-@@ -180,8 +180,8 @@ msgid "Cannot upload to specified URL."
- msgstr "無法上傳指定的網址。"
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
--msgstr "將報告上傳至 Red Hat 技術支援時，出現問題。"
-+msgid "There was a problem uploading your report to CentOS support."
-+msgstr "將報告上傳至 CentOS 技術支援時，出現問題。"
-
- #: ../sos/policyredhat.py:401
- #, python-format
-diff -uNrp sos-3.0.orig/po/zu.po sos-3.0/po/zu.po
---- sos-3.0.orig/po/zu.po 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/po/zu.po 2014-06-21 11:15:36.467724321 -0500
-@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
- msgstr ""
-
- #: ../sos/policyredhat.py:399
--msgid "There was a problem uploading your report to Red Hat support."
-+msgid "There was a problem uploading your report to CentOS support."
- msgstr ""
-
- #: ../sos/policyredhat.py:401
-diff -uNrp sos-3.2.orig/sos/plugins/cluster.py sos-3.2/sos/plugins/cluster.py
---- sos-3.2.orig/sos/plugins/cluster.py 2014-09-30 12:38:28.000000000 -0500
-+++ sos-3.2/sos/plugins/cluster.py 2015-03-09 14:58:02.982869116 -0500
-@@ -19,7 +19,7 @@ from datetime import datetime, timedelta
-
-
- class Cluster(Plugin, RedHatPlugin):
-- """Red Hat Cluster Suite and GFS
-+ """Cluster Suite and GFS
- """
-
- plugin_name = 'cluster'
-diff -uNrp sos-3.2.orig/sos/plugins/cs.py sos-3.2/sos/plugins/cs.py
---- sos-3.2.orig/sos/plugins/cs.py 2014-09-30 12:38:28.000000000 -0500
-+++ sos-3.2/sos/plugins/cs.py 2015-03-09 14:58:20.085778645 -0500
-@@ -54,7 +54,7 @@ class CertificateSystem(Plugin, RedHatPl
- def setup(self):
- csversion = self.checkversion()
- if not csversion:
-- self.add_alert("Red Hat Certificate System not found.")
-+ self.add_alert("Certificate System not found.")
- return
- if csversion == 71:
- self.add_copy_spec([
-diff -uNrp sos-3.2.orig/sos/plugins/hts.py sos-3.2/sos/plugins/hts.py
---- sos-3.2.orig/sos/plugins/hts.py 2014-09-30 12:38:28.000000000 -0500
-+++ sos-3.2/sos/plugins/hts.py 2015-03-09 14:58:36.973689309 -0500
-@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPl
-
-
- class HardwareTestSuite(Plugin, RedHatPlugin):
-- """Red Hat Hardware Test Suite
-+ """Hardware Test Suite
- """
-
- plugin_name = 'hardwaretestsuite'
-diff -uNrp sos-3.2.orig/sos/plugins/__init__.py sos-3.2/sos/plugins/__init__.py
---- sos-3.2.orig/sos/plugins/__init__.py 2015-03-09 14:50:34.162237962 -0500
-+++ sos-3.2/sos/plugins/__init__.py 2015-03-09 14:58:56.861584108 -0500
-@@ -732,7 +732,7 @@ class Plugin(object):
-
-
- class RedHatPlugin(object):
-- """Tagging class to indicate that this plugin works with Red Hat Linux"""
-+ """Tagging class to indicate that this plugin works with CentOS Linux"""
- pass
-
-
-diff -uNrp sos-3.2.orig/sos/plugins/rhui.py sos-3.2/sos/plugins/rhui.py
---- sos-3.2.orig/sos/plugins/rhui.py 2014-09-30 12:38:28.000000000 -0500
-+++ sos-3.2/sos/plugins/rhui.py 2015-03-09 14:59:16.909478057 -0500
-@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPl
-
-
- class Rhui(Plugin, RedHatPlugin):
-- """Red Hat Update Infrastructure
-+ """Update Infrastructure
- """
-
- plugin_name = 'rhui'
-diff -uNrp sos-3.2.orig/sos/policies/redhat.py sos-3.2/sos/policies/redhat.py
---- sos-3.2.orig/sos/policies/redhat.py 2014-09-30 12:38:28.000000000 -0500
-+++ sos-3.2/sos/policies/redhat.py 2015-03-09 14:56:04.383496495 -0500
-@@ -33,9 +33,9 @@ except:
-
-
- class RedHatPolicy(LinuxPolicy):
-- distro = "Red Hat"
-- vendor = "Red Hat"
-- vendor_url = "http://www.redhat.com/"
-+ distro = "CentOS"
-+ vendor = "CentOS"
-+ vendor_url = "http://www.centos.org/"
- _tmp_dir = "/var/tmp"
-
- def __init__(self):
-@@ -57,9 +57,9 @@ class RedHatPolicy(LinuxPolicy):
-
- @classmethod
- def check(self):
-- """This method checks to see if we are running on Red Hat. It must be
-+ """This method checks to see if we are running on CentOS. It must be
- overriden by concrete subclasses to return True when running on a
-- Fedora, RHEL or other Red Hat distribution or False otherwise."""
-+ CentOS or False otherwise."""
- return False
-
- def runlevel_by_service(self, name):
-@@ -94,9 +94,9 @@ class RedHatPolicy(LinuxPolicy):
-
-
- class RHELPolicy(RedHatPolicy):
-- distro = "Red Hat Enterprise Linux"
-- vendor = "Red Hat"
-- vendor_url = "https://access.redhat.com/support/"
-+ distro = "CentOS Linux"
-+ vendor = "CentOS"
-+ vendor_url = "https://www.centos.org/"
- msg = _("""\
- This command will collect diagnostic and configuration \
- information from this %(distro)s system and installed \
diff --git a/SPECS/sos.spec b/SPECS/sos.spec
index a506573..8a0a355 100644
--- a/SPECS/sos.spec
+++ b/SPECS/sos.spec
@@ -3,7 +3,7 @@
Summary: A set of tools to gather troubleshooting information from a system
Name: sos
Version: 3.9
-Release: 5%{?dist}.11
+Release: 5%{?dist}.12
Group: Applications/System
Source0: https://github.com/sosreport/sos/archive/%{version}.tar.gz
License: GPLv2+
@@ -57,7 +57,10 @@ Patch33: sos-bz1946641-sssd-plugin-when-sssd-common.patch
Patch34: sos-bz1959781-migrationresults-new-plugin.patch
Patch35: sos-bz2011337-dropbox-to-sftp.patch
Patch36: sos-bz2043103-collect_decoded_dynflow_data.patch
-Patch37: sos-centos-branding.patch
+Patch37: sos-RHEL-21176-change-authentication-method.patch
+Patch38: sos-RHEL-2357-collect-output--of-rpm-showrc.patch
+Patch39: sos-RHELPLAN-118856-collect-information-about-sca.patch
+Patch40: sos-RHELPLAN-143027-scrub-admin-init-password-in-installer-logs.patch
%description
Sos is a set of tools that gathers information about system
@@ -105,9 +108,12 @@ support technicians and developers.
%patch35 -p1
%patch36 -p1
%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
%build
-make
+make
%install
rm -rf ${RPM_BUILD_ROOT}
@@ -128,8 +134,15 @@ rm -rf ${RPM_BUILD_ROOT}
%config(noreplace) %{_sysconfdir}/sos.conf
%changelog
-* Tue Jun 28 2022 CentOS Sources <bugs@centos.org> - 3.9-5.el7.centos.11
-- Roll in CentOS Branding
+* Fri Jan 19 2024 Barbora Vassova <bvassova@redhat.com> = 3.9-5.12
+- [redhat] Change authentication method for RHEL
+ Resolves: RHEL-21176
+- [rpm] Capture the output of 'rpm --showrc'
+ Resolves: RHEL-2357
+- [candlepin] collect information about SCA
+ Resolves: RHEL-22263
+- [foreman] scrub admin init password in installer logs
+ Resolves: RHEL-22264
* Wed Apr 06 2022 Barbora Vassova <bvassova@redhat.com> = 3.9-5.11
- [foreman] Use psql-msgpack-decode wrapper for dynflow >= 1.6