Auto sync2gitlab import of oscap-anaconda-addon-1.2.1-5.el8.src.rpm
This commit is contained in:
parent
0cfdfbf400
commit
2948fb294d
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
/oscap-anaconda-addon-1.2.1.tar.gz
|
808
lang.patch
Normal file
808
lang.patch
Normal file
@ -0,0 +1,808 @@
|
||||
diff -U3 -N -r a/po/de.po b/po/de.po
|
||||
--- a/po/de.po 2021-07-30 15:17:14.000000000 +0200
|
||||
+++ b/po/de.po 2022-01-21 16:53:28.986191551 +0100
|
||||
@@ -1,11 +1,12 @@
|
||||
# Ludek Janda <ljanda@redhat.com>, 2019. #zanata, 2021.
|
||||
+# Ettore Atalan <atalanttore@googlemail.com>, 2021.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2021-07-13 13:04+0000\n"
|
||||
-"Last-Translator: Ludek Janda <ljanda@redhat.com>\n"
|
||||
+"PO-Revision-Date: 2021-12-28 22:16+0000\n"
|
||||
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
|
||||
"Language-Team: German <https://translate.fedoraproject.org/projects/"
|
||||
"oscap-anaconda-addon/rhel8-branch/de/>\n"
|
||||
"Language: de\n"
|
||||
@@ -13,7 +14,7 @@
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
-"X-Generator: Weblate 4.7.1\n"
|
||||
+"X-Generator: Weblate 4.10.1\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
@@ -31,7 +32,7 @@
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "Zum Abrufen der Daten ist eine Netzwerkverbindung erforderlich."
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
diff -U3 -N -r a/po/fr.po b/po/fr.po
|
||||
--- a/po/fr.po 2021-07-30 15:17:14.000000000 +0200
|
||||
+++ b/po/fr.po 2022-01-21 16:53:28.986191551 +0100
|
||||
@@ -8,45 +8,47 @@
|
||||
# Ludek Janda <ljanda@redhat.com>, 2018. #zanata
|
||||
# Ludek Janda <ljanda@redhat.com>, 2019. #zanata
|
||||
# Ludek Janda <ljanda@redhat.com>, 2020. #zanata
|
||||
+# Sundeep Anand <suanand@redhat.com>, 2021.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2020-06-26 04:26-0400\n"
|
||||
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
|
||||
-"Language-Team: French (http://www.transifex.com/projects/p/oscap-anaconda-"
|
||||
-"addon/language/fr/)\n"
|
||||
+"PO-Revision-Date: 2021-08-20 09:04+0000\n"
|
||||
+"Last-Translator: Sundeep Anand <suanand@redhat.com>\n"
|
||||
+"Language-Team: French <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel8-branch/fr/>\n"
|
||||
"Language: fr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
-"X-Generator: Zanata 4.6.2\n"
|
||||
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
|
||||
+"X-Generator: Weblate 4.7.2\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "Erreur d'extraction de l'archive en tant que fichier zip : {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
msgstr ""
|
||||
-"Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le "
|
||||
-"contenu."
|
||||
+"Le contrôle d'intégrité du contenu a échoué - le hachage de {hash_obj.name} "
|
||||
+"ne correspond pas"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "Connexion réseau nécessaire pour récupérer les données."
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
msgstr ""
|
||||
+"Impossible de récupérer les données - la demande a renvoyé un code d'erreur "
|
||||
+"HTTP {return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -165,36 +167,30 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "L'installation doit être interrompue."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "Voulez-vous malgré tout continuer ?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr ""
|
||||
-"Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le "
|
||||
-"contenu."
|
||||
+msgstr "La vérification de l'intégrité du contenu sécurité a échoué."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "Erreur d'extraction et de chargement du contenu"
|
||||
+msgstr ""
|
||||
+"Une erreur s'est produite lors de la récupération et du chargement du "
|
||||
+"contenu sécurité :\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "Il y a eu un problème inattendu avec le contenu fourni."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "Mauvaise configuration détectée"
|
||||
+msgstr "Mauvaise configuration détectée !"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
diff -U3 -N -r a/po/hr.po b/po/hr.po
|
||||
--- a/po/hr.po 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/po/hr.po 2022-01-21 16:53:28.986191551 +0100
|
||||
@@ -0,0 +1,329 @@
|
||||
+# SOME DESCRIPTIVE TITLE.
|
||||
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
+# This file is distributed under the same license as the PACKAGE package.
|
||||
+# Gogo Gogsi <linux.hr@protonmail.com>, 2021.
|
||||
+msgid ""
|
||||
+msgstr ""
|
||||
+"Project-Id-Version: PACKAGE VERSION\n"
|
||||
+"Report-Msgid-Bugs-To: \n"
|
||||
+"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
+"PO-Revision-Date: 2021-10-20 19:05+0000\n"
|
||||
+"Last-Translator: Gogo Gogsi <linux.hr@protonmail.com>\n"
|
||||
+"Language-Team: Croatian <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel8-branch/hr/>\n"
|
||||
+"Language: hr\n"
|
||||
+"MIME-Version: 1.0\n"
|
||||
+"Content-Type: text/plain; charset=UTF-8\n"
|
||||
+"Content-Transfer-Encoding: 8bit\n"
|
||||
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
+"X-Generator: Weblate 4.8\n"
|
||||
+
|
||||
+#: ../org_fedora_oscap/common.py:326
|
||||
+#, python-brace-format
|
||||
+msgid "Error extracting archive as a zipfile: {exc}"
|
||||
+msgstr "Greška raspakiravanja arhive kao zip datoteke: {exc}"
|
||||
+
|
||||
+#: ../org_fedora_oscap/content_discovery.py:167
|
||||
+#, python-brace-format
|
||||
+msgid ""
|
||||
+"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
+msgstr ""
|
||||
+"Neuspjela provjera cjelovitosti sadržaja - {hash_obj.name} vrijednost "
|
||||
+"provjere se ne podudara"
|
||||
+
|
||||
+#: ../org_fedora_oscap/data_fetch.py:117
|
||||
+msgid "Network connection needed to fetch data."
|
||||
+msgstr "Mrežno povezivanje je potrebno za preuzimanje podataka."
|
||||
+
|
||||
+#: ../org_fedora_oscap/data_fetch.py:262
|
||||
+#, python-brace-format
|
||||
+msgid ""
|
||||
+"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
+msgstr ""
|
||||
+"Neuspjelo preuzimanje podataka - Zahtjev je vratio HTTP kôd geške "
|
||||
+"{return_code}"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:434
|
||||
+#, python-brace-format
|
||||
+msgid ""
|
||||
+"{0} must be on a separate partition or logical volume and has to be created "
|
||||
+"in the partitioning layout before installation can occur with a security "
|
||||
+"profile"
|
||||
+msgstr ""
|
||||
+"{0} mora biti na zasebnoj particiji ili logičkom uređaju i mora biti stvoren "
|
||||
+"u particijskom rasporedu prije instalacije sa sigurnosnim profilom"
|
||||
+
|
||||
+#. template for the message
|
||||
+#: ../org_fedora_oscap/rule_handling.py:445
|
||||
+#, python-format
|
||||
+msgid ""
|
||||
+"mount option '%(mount_option)s' added for the mount point %(mount_point)s"
|
||||
+msgstr ""
|
||||
+"mogućnost montiranja '%(mount_option)s' je dodana za točku montiranja "
|
||||
+"%(mount_point)s"
|
||||
+
|
||||
+#. root password was not set
|
||||
+#: ../org_fedora_oscap/rule_handling.py:554
|
||||
+#, python-format
|
||||
+msgid "make sure to create password with minimal length of %d characters"
|
||||
+msgstr "pobrinite se da stvorite lozinku s najmanje %d znakova"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:561
|
||||
+msgid "cannot check root password length (password is crypted)"
|
||||
+msgstr "nemoguća provjera duljine korijenske lozinke (lozinka je šifrirana)"
|
||||
+
|
||||
+#. too short
|
||||
+#: ../org_fedora_oscap/rule_handling.py:567
|
||||
+#, python-format
|
||||
+msgid ""
|
||||
+"root password is too short, a longer one with at least %d characters is "
|
||||
+"required"
|
||||
+msgstr ""
|
||||
+"korijenska lozinka je prekrataka, potrebna je dulja s najmanje %d znakova"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:685
|
||||
+#: ../org_fedora_oscap/rule_handling.py:700
|
||||
+#, python-format
|
||||
+msgid "package '%s' has been added to the list of to be installed packages"
|
||||
+msgstr "paket '%s' je dodan na popis paketa za instaliranje"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:710
|
||||
+#, python-brace-format
|
||||
+msgid ""
|
||||
+"package '{package}' has been added to the list of excluded packages, but it "
|
||||
+"can't be removed from the current software selection without breaking the "
|
||||
+"installation."
|
||||
+msgstr ""
|
||||
+"paket '{package}' je dodan na popis izuzetih paketa, ali se može ukloniti iz "
|
||||
+"trenutnog odabira softvera bez slamanja instalacije."
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:717
|
||||
+#: ../org_fedora_oscap/rule_handling.py:732
|
||||
+#, python-format
|
||||
+msgid "package '%s' has been added to the list of excluded packages"
|
||||
+msgstr "paket '%s' je dodan na popis izuzetih paketa od instalacije"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:833
|
||||
+msgid "Kdump will be disabled on startup"
|
||||
+msgstr "Kdump biti će onemogućen pri pokretanju"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:835
|
||||
+msgid "Kdump will be enabled on startup"
|
||||
+msgstr "Kdump biti će omogućen pri pokretanju"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:988
|
||||
+msgid "Firewall will be disabled on startup"
|
||||
+msgstr "Vatrozid će biti onemogućen pri pokretanju"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:995
|
||||
+msgid "Firewall will be enabled on startup"
|
||||
+msgstr "Vatrozid će biti omogućen pri pokretanju"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:1003
|
||||
+#: ../org_fedora_oscap/rule_handling.py:1042
|
||||
+#, python-format
|
||||
+msgid ""
|
||||
+"service '%s' has been added to the list of services to be added to the "
|
||||
+"firewall"
|
||||
+msgstr "usluga '%s' je dodana na popis usluga koji će biti dodan u vatrozid"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:1010
|
||||
+#: ../org_fedora_oscap/rule_handling.py:1055
|
||||
+#, python-format
|
||||
+msgid ""
|
||||
+"port '%s' has been added to the list of ports to be added to the firewall"
|
||||
+msgstr "ulaz '%s' je dodan na popis ulaza koji će biti dodan u vatrozid"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:1017
|
||||
+#: ../org_fedora_oscap/rule_handling.py:1068
|
||||
+#, python-format
|
||||
+msgid ""
|
||||
+"trust '%s' has been added to the list of trusts to be added to the firewall"
|
||||
+msgstr ""
|
||||
+"povjerenje '%s' je dodano na popis povjerenja koji će biti dodan u vatrozid"
|
||||
+
|
||||
+#: ../org_fedora_oscap/rule_handling.py:1080
|
||||
+#: ../org_fedora_oscap/rule_handling.py:1095
|
||||
+#, python-format
|
||||
+msgid ""
|
||||
+"service '%s' has been added to the list of services to be removed from the "
|
||||
+"firewall"
|
||||
+msgstr ""
|
||||
+"usluga '%s' je dodana na popis usluga koji će biti uklonjen iz vatrozida"
|
||||
+
|
||||
+#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
+msgid "The installation should be aborted."
|
||||
+msgstr "Instalacija bi se trebala prekinuti."
|
||||
+
|
||||
+#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
+msgid "Do you wish to continue anyway?"
|
||||
+msgstr "Želite li ipak nastaviti?"
|
||||
+
|
||||
+#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
+msgid "The integrity check of the security content failed."
|
||||
+msgstr "Neuspjela provjera cjelovitosti sigurnosnog sadržaja."
|
||||
+
|
||||
+#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
+msgid "There was an error fetching and loading the security content:\n"
|
||||
+msgstr "Došlo je do greške preuzimanja i učitavanja sigurnosnog sadržaja:\n"
|
||||
+
|
||||
+#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
+msgid "There was an unexpected problem with the supplied content."
|
||||
+msgstr "Došlo je do neočekivanog problema s isporučenim sadržajem."
|
||||
+
|
||||
+#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
+msgid "Wrong configuration detected!"
|
||||
+msgstr "Pogrešno podešavanje je otkriveno!"
|
||||
+
|
||||
+#. title of the spoke (will be displayed on the hub)
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
+msgid "_Security Policy"
|
||||
+msgstr "_Pravila sigurnosti"
|
||||
+
|
||||
+#. the first status provided
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:229
|
||||
+msgid "Not ready"
|
||||
+msgstr "Nije spremno"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:383
|
||||
+msgid "Fetching content data"
|
||||
+msgstr "Preuzimanje sadržaja podataka"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:626
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1039
|
||||
+msgid "No profile selected"
|
||||
+msgstr "Nema odabranog profila"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:631
|
||||
+msgid "No rules for the pre-installation phase"
|
||||
+msgstr "Nema pravila za predinstalacijsku fazu"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:782
|
||||
+msgid "Invalid content provided. Enter a different URL, please."
|
||||
+msgstr "Nevaljani sadržaj je naveden. Upišite drugi URL."
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:790
|
||||
+msgid "Invalid or unsupported content URL, please enter a different one."
|
||||
+msgstr "Nevaljani ili nepodržani URL sadržaja, upišite drugi."
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:798
|
||||
+msgid "Failed to fetch content. Enter a different URL, please."
|
||||
+msgstr "Neuspjelo preuzimanje sadržaja. Upišite drugi URL."
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:806
|
||||
+msgid ""
|
||||
+"Network error encountered when fetching data. Please check that network is "
|
||||
+"setup and working."
|
||||
+msgstr ""
|
||||
+"Došlo je do mrežne greške pri preuzimanju podataka. Provjerite je li mreža "
|
||||
+"postavljena i radi li."
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:815
|
||||
+msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+msgstr "Neuspjela provjera cjelovitosti sadržaja. Sadržaj se ne može koristiti."
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:823
|
||||
+#, python-format
|
||||
+msgid "Failed to extract content (%s). Enter a different URL, please."
|
||||
+msgstr "Neuspjelo izdvajanje sadržaja (%s). Upišite drugi URL."
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:840
|
||||
+#, python-format
|
||||
+msgid ""
|
||||
+"Profile with ID '%s' not defined in the content. Select a different profile, "
|
||||
+"please"
|
||||
+msgstr "Profil sa '%s' ID-jem nije određen u sadržaju. Odaberite drugi profil"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:856
|
||||
+msgid "Not applying security policy"
|
||||
+msgstr "Sigurnosno pravilo se ne primijenjuje"
|
||||
+
|
||||
+#. TRANSLATORS: the other choice if SCAP Security Guide is also
|
||||
+#. available
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:887
|
||||
+msgid " or enter data stream content or archive URL below:"
|
||||
+msgstr " ili upišite sadržaj toka podataka ili URL arhive ispod:"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12
|
||||
+msgid ""
|
||||
+"No content found. Please enter data stream content or archive URL below:"
|
||||
+msgstr ""
|
||||
+"Nema pronađenog sadržaja. Upišite sadržaj toka podataka ili URL arhive ispod:"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1029
|
||||
+msgid "Error fetching and loading content"
|
||||
+msgstr "Greška preuzimanja i učitavanja sadržaja"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1036
|
||||
+msgid "No content found"
|
||||
+msgstr "Nema pronađenog sadržaja"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1047
|
||||
+msgid "Misconfiguration detected"
|
||||
+msgstr "Otkriveno je pogrešno podešavanje"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053
|
||||
+msgid "Warnings appeared"
|
||||
+msgstr "Pojavila su se upozorenja"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055
|
||||
+msgid "Everything okay"
|
||||
+msgstr "Sve je uredu"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1134
|
||||
+msgid "Invalid or unsupported URL"
|
||||
+msgstr "Nevaljani ili nepodržani URL"
|
||||
+
|
||||
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14
|
||||
+msgid "Fetching content..."
|
||||
+msgstr "Preuzimanje sadržaja..."
|
||||
+
|
||||
+#: tmp/oscap.glade.h:1
|
||||
+msgid "SECURITY POLICY"
|
||||
+msgstr "SIGURNOSNA PRAVILA"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:2
|
||||
+msgid "_Change content"
|
||||
+msgstr "_Promijeni sadržaj"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:3
|
||||
+msgid "Apply security policy:"
|
||||
+msgstr "Primijeni sigurnosna pravila:"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:4
|
||||
+msgid "Data stream:"
|
||||
+msgstr "Tok podataka:"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:5
|
||||
+msgid "Checklist:"
|
||||
+msgstr "Spisak:"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:6
|
||||
+msgid "Choose profile below:"
|
||||
+msgstr "Odaberite profil ispod:"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:7
|
||||
+msgid "Profile"
|
||||
+msgstr "Profil"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:8
|
||||
+msgid "Selected"
|
||||
+msgstr "Odabrano"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:9
|
||||
+msgid "_Select profile"
|
||||
+msgstr "_Odaberi profil"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:10
|
||||
+msgid "Changes that were done or need to be done:"
|
||||
+msgstr "Promjene koje su učinjene ili se trebaju učiniti:"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:11
|
||||
+msgid "_Use SCAP Security Guide"
|
||||
+msgstr "_Koristi SCAP sigurnosni vodič"
|
||||
+
|
||||
+#: tmp/oscap.glade.h:13
|
||||
+msgid "_Fetch"
|
||||
+msgstr "_Preuzmi"
|
||||
diff -U3 -N -r a/po/ja.po b/po/ja.po
|
||||
--- a/po/ja.po 2021-07-30 15:17:14.000000000 +0200
|
||||
+++ b/po/ja.po 2022-01-21 16:53:28.986191551 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
-# Ludek Janda <ljanda@redhat.com>, 2017. #zanata
|
||||
-# Ludek Janda <ljanda@redhat.com>, 2018. #zanata
|
||||
-# Ludek Janda <ljanda@redhat.com>, 2020. #zanata
|
||||
+# Ludek Janda <ljanda@redhat.com>, 2017. #zanata, 2021.
|
||||
+# Ludek Janda <ljanda@redhat.com>, 2018. #zanata, 2021.
|
||||
+# Ludek Janda <ljanda@redhat.com>, 2020. #zanata, 2021.
|
||||
# Sundeep Anand <suanand@redhat.com>, 2021.
|
||||
# simmon <simmon@nplob.com>, 2021.
|
||||
msgid ""
|
||||
@@ -8,38 +8,37 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2021-04-07 16:02+0000\n"
|
||||
-"Last-Translator: simmon <simmon@nplob.com>\n"
|
||||
-"Language-Team: Japanese <https://translate.fedoraproject.org/projects/oscap-"
|
||||
-"anaconda-addon/rhel8-branch/ja/>\n"
|
||||
+"PO-Revision-Date: 2021-08-20 09:04+0000\n"
|
||||
+"Last-Translator: Sundeep Anand <suanand@redhat.com>\n"
|
||||
+"Language-Team: Japanese <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel8-branch/ja/>\n"
|
||||
"Language: ja\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
-"X-Generator: Weblate 4.5.3\n"
|
||||
+"X-Generator: Weblate 4.7.2\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "アーカイブを zip ファイルとして抽出する際にエラーが発生しました: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
-msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。"
|
||||
+msgstr "コンテンツの整合性チェックに失敗しました。{hash_obj.name} ハッシュが一致しませんでした"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "データの取得に必要なネットワーク接続。"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
-msgstr ""
|
||||
+msgstr "データの取得に失敗しました。返された HTTP エラーコード {return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -152,39 +151,33 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "インストールを中止する必要があります。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "それでも続行しますか?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。"
|
||||
+msgstr "セキュリティーコンテンツの整合性チェックに失敗しました。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "コンテンツの取得およびロードのエラー"
|
||||
+msgstr "セキュリティーコンテンツの取得およびロード時にエラーが発生しました:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "指定のコンテンツで予期しない問題が発生しました。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "設定ミスが検出されました"
|
||||
+msgstr "設定が正しく検出されました!"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
msgid "_Security Policy"
|
||||
-msgstr "セキュリティーポリシ"
|
||||
+msgstr "セキュリティーポリシー(_S)"
|
||||
|
||||
#. the first status provided
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:229
|
||||
diff -U3 -N -r a/po/si.po b/po/si.po
|
||||
--- a/po/si.po 2021-07-30 15:17:14.000000000 +0200
|
||||
+++ b/po/si.po 2022-01-21 16:53:28.986191551 +0100
|
||||
@@ -7,13 +7,16 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
-"Last-Translator: Automatically generated\n"
|
||||
-"Language-Team: none\n"
|
||||
+"PO-Revision-Date: 2021-08-19 07:04+0000\n"
|
||||
+"Last-Translator: Hela Basa <r45xveza@pm.me>\n"
|
||||
+"Language-Team: Sinhala <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel8-branch/si/>\n"
|
||||
"Language: si\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
|
||||
+"X-Generator: Weblate 4.7.2\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
@@ -168,7 +171,7 @@
|
||||
#. the first status provided
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:229
|
||||
msgid "Not ready"
|
||||
-msgstr ""
|
||||
+msgstr "සූදානම් නැත"
|
||||
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:383
|
||||
msgid "Fetching content data"
|
||||
diff -U3 -N -r a/po/sv.po b/po/sv.po
|
||||
--- a/po/sv.po 2021-07-30 15:17:14.000000000 +0200
|
||||
+++ b/po/sv.po 2022-01-21 16:53:28.986191551 +0100
|
||||
@@ -1,12 +1,12 @@
|
||||
-# Göran Uddeborg <goeran@uddeborg.se>, 2019. #zanata, 2020.
|
||||
+# Göran Uddeborg <goeran@uddeborg.se>, 2019. #zanata, 2020, 2021.
|
||||
# Luna Jernberg <bittin@reimu.nl>, 2021.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2021-06-26 19:04+0000\n"
|
||||
-"Last-Translator: Luna Jernberg <bittin@reimu.nl>\n"
|
||||
+"PO-Revision-Date: 2021-08-07 20:04+0000\n"
|
||||
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
|
||||
"Language-Team: Swedish <https://translate.fedoraproject.org/projects/"
|
||||
"oscap-anaconda-addon/rhel8-branch/sv/>\n"
|
||||
"Language: sv\n"
|
||||
@@ -14,7 +14,7 @@
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
-"X-Generator: Weblate 4.7\n"
|
||||
+"X-Generator: Weblate 4.7.2\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
@@ -22,13 +22,12 @@
|
||||
msgstr "Fel vid extrahering av arkiv som zipfil: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
msgstr ""
|
||||
-"Integritetskontrollen av innehållet misslyckades. Kan inte använda "
|
||||
-"innehållet."
|
||||
+"Integritetskontrollen av innehållet misslyckades – {hash_obj.name}-hachen "
|
||||
+"stämmer inte"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
@@ -142,7 +141,7 @@
|
||||
msgid ""
|
||||
"trust '%s' has been added to the list of trusts to be added to the firewall"
|
||||
msgstr ""
|
||||
-"förtroendet ”%s” har lagts till till listan över förtoenden att läggas till "
|
||||
+"förtroendet ”%s” har lagts till till listan över förtroenden att läggas till "
|
||||
"i brandväggen"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:1080
|
||||
@@ -157,7 +156,7 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr "Installationen kommer att avbrytas."
|
||||
+msgstr "Installationen bör avbrytas."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
@@ -169,7 +168,7 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "Det var ett fel när säkerhetsinnehållet hämtades och laddades:\n"
|
||||
+msgstr "Det uppstod ett fel när säkerhetsinnehåll hämtades och laddades:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
@@ -188,7 +187,7 @@
|
||||
#. the first status provided
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:229
|
||||
msgid "Not ready"
|
||||
-msgstr "Inte redo"
|
||||
+msgstr "Inte klar"
|
||||
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:383
|
||||
msgid "Fetching content data"
|
||||
diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po
|
||||
--- a/po/zh_CN.po 2021-07-30 15:17:14.000000000 +0200
|
||||
+++ b/po/zh_CN.po 2022-01-21 16:53:28.986191551 +0100
|
||||
@@ -1,41 +1,42 @@
|
||||
-# Ludek Janda <ljanda@redhat.com>, 2018. #zanata
|
||||
-# Ludek Janda <ljanda@redhat.com>, 2020. #zanata
|
||||
+# Ludek Janda <ljanda@redhat.com>, 2018. #zanata, 2021.
|
||||
+# Ludek Janda <ljanda@redhat.com>, 2020. #zanata, 2021.
|
||||
+# Sundeep Anand <suanand@redhat.com>, 2021.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2020-06-26 04:26-0400\n"
|
||||
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
|
||||
-"Language-Team: Chinese (Simplified)\n"
|
||||
+"PO-Revision-Date: 2021-08-20 09:04+0000\n"
|
||||
+"Last-Translator: Sundeep Anand <suanand@redhat.com>\n"
|
||||
+"Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
|
||||
+"projects/oscap-anaconda-addon/rhel8-branch/zh_CN/>\n"
|
||||
"Language: zh_CN\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=1; plural=0\n"
|
||||
-"X-Generator: Zanata 4.6.2\n"
|
||||
+"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
+"X-Generator: Weblate 4.7.2\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "解压 zip 文件时出错: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
-msgstr "内容的完整性检查失败。不能使用这个内容。"
|
||||
+msgstr "内容完整性检查失败 - {hash_obj.name} 哈希值不匹配"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "获取数据所需的网络连接。"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
-msgstr ""
|
||||
+msgstr "获取数据失败 - 请求返回 HTTP 错误代码 {return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -142,34 +143,28 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "安装应终止。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "您是否希望继续?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr "内容的完整性检查失败。不能使用这个内容。"
|
||||
+msgstr "安全内容的完整性检查失败。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "获取并加载内容错误"
|
||||
+msgstr "获取并载入安全内容时出错:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "提供的内容出现意外问题。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "发现错误配置"
|
||||
+msgstr "检测到配置错误!"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
@@ -236,7 +231,7 @@
|
||||
#. available
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:887
|
||||
msgid " or enter data stream content or archive URL below:"
|
||||
-msgstr "或输入数据流内容或归档 URL:"
|
||||
+msgstr " 或输入数据流内容或归档 URL:"
|
||||
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12
|
||||
msgid ""
|
39
oscap-anaconda-addon-1.2.2-content_ident-PR_167.patch
Normal file
39
oscap-anaconda-addon-1.2.2-content_ident-PR_167.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 1abc4e96638e819d3fbee74396b36a6ccaf0ab29 Mon Sep 17 00:00:00 2001
|
||||
From: Matej Tyc <matyc@redhat.com>
|
||||
Date: Tue, 3 Aug 2021 11:01:59 +0200
|
||||
Subject: [PATCH] Refactor content identification
|
||||
|
||||
Don't use the multiprocessing pool - it sometimes creates probems during
|
||||
its initialization:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1989441
|
||||
---
|
||||
org_fedora_oscap/content_handling.py | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/org_fedora_oscap/content_handling.py b/org_fedora_oscap/content_handling.py
|
||||
index f2af22f..65d5a28 100644
|
||||
--- a/org_fedora_oscap/content_handling.py
|
||||
+++ b/org_fedora_oscap/content_handling.py
|
||||
@@ -111,9 +111,8 @@ def parse_HTML_from_content(content):
|
||||
|
||||
|
||||
def identify_files(fpaths):
|
||||
- with multiprocessing.Pool(os.cpu_count()) as p:
|
||||
- labels = p.map(get_doc_type, fpaths)
|
||||
- return {path: label for (path, label) in zip(fpaths, labels)}
|
||||
+ result = {path: get_doc_type(path) for path in fpaths}
|
||||
+ return result
|
||||
|
||||
|
||||
def get_doc_type(file_path):
|
||||
@@ -131,7 +130,9 @@ def get_doc_type(file_path):
|
||||
except UnicodeDecodeError:
|
||||
# 'oscap info' supplied weird output, which happens when it tries
|
||||
# to explain why it can't examine e.g. a JPG.
|
||||
- return None
|
||||
+ pass
|
||||
+ except Exception as e:
|
||||
+ log.warning(f"OSCAP addon: Unexpected error when looking at {file_path}: {str(e)}")
|
||||
log.info("OSCAP addon: Identified {file_path} as {content_type}"
|
||||
.format(file_path=file_path, content_type=content_type))
|
||||
return content_type
|
51
oscap-anaconda-addon-1.2.2-deep_archives-PR_168.patch
Normal file
51
oscap-anaconda-addon-1.2.2-deep_archives-PR_168.patch
Normal file
@ -0,0 +1,51 @@
|
||||
From 3377a914f4668af3d72216468ae192bc300890f9 Mon Sep 17 00:00:00 2001
|
||||
From: Matej Tyc <matyc@redhat.com>
|
||||
Date: Mon, 9 Aug 2021 15:45:58 +0200
|
||||
Subject: [PATCH 1/2] Fix archive handling in GUI installs
|
||||
|
||||
GUI downloads an archive, so the ensuing installation doesn't have to.
|
||||
However, the installation has to be able to discover files recovered
|
||||
from the archive.
|
||||
The fix makes sure that files are discovered also in subdirectories.
|
||||
---
|
||||
org_fedora_oscap/content_discovery.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py
|
||||
index f6b4d27..5fc7343 100644
|
||||
--- a/org_fedora_oscap/content_discovery.py
|
||||
+++ b/org_fedora_oscap/content_discovery.py
|
||||
@@ -196,7 +196,8 @@ def _gather_available_files(self, actually_fetched_content, dest_filename):
|
||||
if not dest_filename: # using scap-security-guide
|
||||
fpaths = [self.DEFAULT_SSG_DATA_STREAM_PATH]
|
||||
else: # Using downloaded XCCDF/OVAL/DS/tailoring
|
||||
- fpaths = glob(str(self.CONTENT_DOWNLOAD_LOCATION / "*.xml"))
|
||||
+ fpaths = pathlib.Path(self.CONTENT_DOWNLOAD_LOCATION).rglob("*")
|
||||
+ fpaths = [str(p) for p in fpaths if p.is_file()]
|
||||
else:
|
||||
dest_filename = pathlib.Path(dest_filename)
|
||||
# RPM is an archive at this phase
|
||||
|
||||
From 191df327e3e51f486fb655e97acac30222c264fa Mon Sep 17 00:00:00 2001
|
||||
From: Matej Tyc <matyc@redhat.com>
|
||||
Date: Mon, 9 Aug 2021 15:48:50 +0200
|
||||
Subject: [PATCH 2/2] Improve logging
|
||||
|
||||
Logs written to log files can contain specific details.
|
||||
---
|
||||
org_fedora_oscap/ks/oscap.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/org_fedora_oscap/ks/oscap.py b/org_fedora_oscap/ks/oscap.py
|
||||
index d1b8c9e..65d74cf 100644
|
||||
--- a/org_fedora_oscap/ks/oscap.py
|
||||
+++ b/org_fedora_oscap/ks/oscap.py
|
||||
@@ -393,7 +393,7 @@ def _terminate(self, message):
|
||||
time.sleep(100000)
|
||||
|
||||
def _handle_error(self, exception):
|
||||
- log.error("Failed to fetch and initialize SCAP content!")
|
||||
+ log.error(f"Failed to fetch and initialize SCAP content: {str(exception)}")
|
||||
|
||||
if isinstance(exception, ContentCheckError):
|
||||
msg = _("The integrity check of the security content failed.")
|
372
oscap-anaconda-addon.spec
Normal file
372
oscap-anaconda-addon.spec
Normal file
@ -0,0 +1,372 @@
|
||||
# Patch0 applies correctly but with mismatch and we dont't want backup file
|
||||
%global _default_patch_flags --no-backup-if-mismatch
|
||||
|
||||
Name: oscap-anaconda-addon
|
||||
Version: 1.2.1
|
||||
Release: 5%{?dist}
|
||||
Summary: Anaconda addon integrating OpenSCAP to the installation process
|
||||
|
||||
License: GPLv2+
|
||||
URL: https://github.com/OpenSCAP/oscap-anaconda-addon
|
||||
|
||||
# This is a Red Hat maintained package which is specific to
|
||||
# our distribution.
|
||||
#
|
||||
# The source is thus available only from within this SRPM
|
||||
# or via direct git checkout:
|
||||
# git clone https://github.com/OpenSCAP/oscap-anaconda-addon.git
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
# Let the Patch1 be reserved for translations patches
|
||||
Patch1: lang.patch
|
||||
Patch2: oscap-anaconda-addon-1.2.2-content_ident-PR_167.patch
|
||||
Patch3: oscap-anaconda-addon-1.2.2-deep_archives-PR_168.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: make
|
||||
BuildRequires: gettext
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pycurl
|
||||
BuildRequires: openscap openscap-utils openscap-python3
|
||||
BuildRequires: anaconda-core >= 33
|
||||
Requires: anaconda-core >= 33
|
||||
Requires: python3-cpio
|
||||
Requires: python3-pycurl
|
||||
Requires: python3-kickstart
|
||||
Requires: openscap openscap-utils openscap-python3
|
||||
Requires: scap-security-guide
|
||||
|
||||
%description
|
||||
This is an addon that integrates OpenSCAP utilities with the Anaconda installer
|
||||
and allows installation of systems following restrictions given by a SCAP
|
||||
content.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
|
||||
# As patches may translates the strings that are updated by later patches,
|
||||
# Patch1 needs to be aplied last.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
# NOTE CONCERNING TRANSLATION PATCHES
|
||||
# When preparing translation patches, don't consider that some languages are unsupported -
|
||||
# we aim to include all applicable translation texts to the appropriate patch.
|
||||
# This has consulted with ljanda@redhat.com, and we basically follow the existing practice of the Anaconda project we integrate into.
|
||||
|
||||
%build
|
||||
|
||||
#%check
|
||||
#make test
|
||||
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
%find_lang %{name}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%{_datadir}/anaconda/addons/org_fedora_oscap
|
||||
|
||||
%doc COPYING ChangeLog README.md
|
||||
|
||||
%changelog
|
||||
* Fri Jan 21 2022 Matej Tyc <matyc@redhat.com> - 1.2.1-5
|
||||
- Updated translations
|
||||
Resolves: rhbz#2017356
|
||||
|
||||
* Fri Aug 20 2021 Matej Tyc <matyc@redhat.com> - 1.2.1-4
|
||||
- Updated translations
|
||||
Resolves: rhbz#1962007
|
||||
|
||||
* Mon Aug 09 2021 Matej Tyc <matyc@redhat.com> - 1.2.1-3
|
||||
- Fix handling of archives with directories in GUI installs
|
||||
- Resolves: rhbz#1691305
|
||||
|
||||
* Tue Aug 03 2021 Matej Tyc <matyc@redhat.com> - 1.2.1-2
|
||||
- Refactor content identification
|
||||
- Resolves: rhbz#1989441
|
||||
|
||||
* Fri Jul 30 2021 Matej Tyc <matyc@redhat.com> - 1.2.1-1
|
||||
- Rebase to the new upstream version.
|
||||
- Resolves: rhbz#1691305
|
||||
|
||||
* Fri Jul 16 2021 Matej Tyc <matyc@redhat.com> - 1.2.0-2
|
||||
- Updated translations
|
||||
- Resolves: rhbz#1938623
|
||||
|
||||
* Fri Jun 25 2021 Matej Tyc <matyc@redhat.com> - 1.2.0-1
|
||||
- Rebase to the new upstream version.
|
||||
- Resolves: rhbz#1691305
|
||||
|
||||
* Mon Feb 15 2021 Matej Tyc <matyc@redhat.com> - 1.1.1-7
|
||||
- Updated translations.
|
||||
|
||||
* Wed Nov 11 11:46:56 CET 2020 Matej Tyc <matyc@redhat.com> - 1.1.1-6
|
||||
- Improved handling of conflicts between packages removed vs software wanted to be installed - rhbz#1892310
|
||||
|
||||
* Tue Aug 18 2020 Matěj Týč <matyc@redhat.com> - 1.1.1-5
|
||||
- Fixed issues with encountering filenames with weird encoding during scans - rhbz#1867960
|
||||
|
||||
* Thu Jul 09 2020 Matěj Týč <matyc@redhat.com> - 1.1.1-4
|
||||
- Fixed spoke window text: RHBZ#1855041
|
||||
|
||||
* Fri Jun 26 2020 Matěj Týč <matyc@redhat.com> - 1.1.1-3
|
||||
- Updated translations: RHBZ#1820557
|
||||
|
||||
* Mon Jun 22 2020 Matěj Týč <matyc@redhat.com> - 1.1.1-2
|
||||
- Fixed issues addressing combination of profiles and GUI-based software selections: RHBZ#1843932, RHBZ#1787156
|
||||
- Improved handling of languages, capitalization: RHBZ#1696278
|
||||
- Updated translations: RHBZ#1820557
|
||||
|
||||
* Tue Jun 02 2020 Matěj Týč <matyc@redhat.com> - 1.1.1-1
|
||||
- Rebase to upstream 1.1.1
|
||||
- This OAA is compatible with the RHEL 8.3 Anaconda: RHBZ#1696278
|
||||
- The UX has been improved: RHBZ#1781790
|
||||
|
||||
* Mon Sep 02 2019 Watson Sato <wsato@redhat.com> - 1.0-10
|
||||
- Do not use capital letters for spoke title: RHBZ#1744185
|
||||
- Updated translations
|
||||
|
||||
* Wed Feb 13 2019 Matěj Týč <matyc@redhat.com> - 1.0-9
|
||||
- Updated translations: RHBZ#1645924
|
||||
|
||||
* Fri Feb 08 2019 Watson Yuuma Sato <wsato@redhat.com> - 1.0-8
|
||||
- Fixed translation of spoke title: RHBZ#1673044
|
||||
|
||||
* Fri Jan 18 2019 Matěj Týč <matyc@redhat.com> - 1.0-7
|
||||
- Fixed bootloader-related Anaconda API usage: RHBZ#1664036
|
||||
- Fixed root password-related Anaconda API usage: RHBZ#1665551
|
||||
- Fixed checksum-related Python2->3 issue: RHBZ#1665147
|
||||
|
||||
* Thu Jan 17 2019 Matěj Týč <matyc@redhat.com> - 1.0-6
|
||||
- Updated translations: RHBZ#1645924
|
||||
|
||||
* Mon Dec 17 2018 Matěj Týč <matyc@redhat.com> - 1.0-5
|
||||
- Applied the HelpFile -> help_id patch
|
||||
|
||||
* Fri Dec 14 2018 Matěj Týč <matyc@redhat.com> - 1.0-4
|
||||
- Updated translations: RHBZ#1608331, RHBZ#1645924
|
||||
|
||||
* Wed Oct 10 2018 Matěj Týč <matyc@redhat.com> - 1.0-3
|
||||
- Updated to the latest Anaconda API: RHBZ#1637635
|
||||
- Added updated translations: RHBZ#1608331
|
||||
|
||||
* Mon Oct 01 2018 Matěj Týč <matyc@redhat.com> - 1.0-2
|
||||
- Added the missing pycurl dependency.
|
||||
|
||||
* Tue Jul 03 2018 Matěj Týč <matyc@redhat.com> - 1.0-1
|
||||
- Rebased to upstream version 1.0
|
||||
- Python3 support, anaconda 28 support.
|
||||
|
||||
* Tue Dec 12 2017 Watson Yuuma Sato <wsato@redhat.com> - 0.8-3
|
||||
- Return empty string when there is no tailoring file
|
||||
Resolves: rhbz#1520276
|
||||
|
||||
* Mon Dec 11 2017 Watson Sato <wsato@redhat.com> - 0.8-2
|
||||
- Add japanese translation
|
||||
- Update other translations
|
||||
Resolves: rhbz#1481190
|
||||
- Fix selection of RHEL datastream
|
||||
Resolves: rhbz#1520358
|
||||
|
||||
* Mon Nov 27 2017 Watson Sato <wsato@redhat.com> - 0.8-1
|
||||
- Rebase to the upstream version 0.8
|
||||
Related: rhbz#1472419
|
||||
|
||||
* Tue May 30 2017 Watson Sato <wsato@redhat.com> - 0.7-15
|
||||
- Add japanese translation
|
||||
- Update other translations
|
||||
Resolves: rhbz#1383181
|
||||
|
||||
* Thu Apr 20 2017 Raphael Sanchez Prudencio <rsprudencio@redhat.com> - 0.7-14
|
||||
- Fixed gtk warning messages when anaconda is starting.
|
||||
Resolves: rhbz#1437106
|
||||
|
||||
* Tue Mar 28 2017 Martin Preisler <mpreisle@redhat.com> - 0.7-13
|
||||
- Avoid long delay before a GeoIP related timeout in case internet is not available
|
||||
Resolves: rhbz#1379479
|
||||
|
||||
* Tue Sep 13 2016 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-12
|
||||
- Properly handle tailoring files for datastreams
|
||||
Resolves: rhbz#1364929
|
||||
|
||||
* Thu Aug 25 2016 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-11
|
||||
- Don't require blank stderr when running the oscap tool
|
||||
Resolves: rhbz#1360765
|
||||
- Beware of the invalid profiles
|
||||
Resolves: rhbz#1365130
|
||||
- Properly set the seen property for root passwords
|
||||
Resolves: rhbz#1357603
|
||||
|
||||
* Thu Jun 30 2016 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-10
|
||||
- Clear spoke's info before setting an error
|
||||
Resolves: rhbz#1349446
|
||||
|
||||
* Wed Jun 1 2016 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-9
|
||||
- Use the System hub category provided by Anaconda
|
||||
Resolves: rhbz#1269211
|
||||
- Wait for Anaconda to settle before evaluation
|
||||
Resolves: rhbz#1265552
|
||||
- Make the changes overview scrollable and smaller
|
||||
Related: rhbz#1263582
|
||||
- Make the list of profiles scrollable
|
||||
Resolves: rhbz#1263582
|
||||
- Do not try to create a single file multiple times
|
||||
Related: rhbz#1263315
|
||||
- Avoid crashes on extraction errors
|
||||
Resolves: rhbz#1263315
|
||||
- Disable GPG checks when installing content to the system
|
||||
Resolves: rhbz#1263216
|
||||
- Allow fixing root password in graphical installations
|
||||
Resolves: rhbz#1265116
|
||||
- Enforce the minimal root password length
|
||||
Resolves: rhbz#1238281
|
||||
- Just report misconfiguration instead of crashing in text mode
|
||||
Resolves: rhbz#1263207
|
||||
- Do not verify SSL if inst.noverifyssl was given
|
||||
Resolves: rhbz#1263257
|
||||
- Also catch data_fetch.DataFetchError when trying to get content
|
||||
Resolves: rhbz#1263239
|
||||
- Use new method signature with payload class
|
||||
Related: rhbz#1288636
|
||||
|
||||
* Wed Sep 16 2015 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-8
|
||||
- Do not remove the root password behind user's back
|
||||
Resolves: rhbz#1263254
|
||||
|
||||
* Mon Sep 7 2015 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-7
|
||||
- Completely skip the execute() part if no profile is selected
|
||||
Resolves: rhbz#1254973
|
||||
|
||||
* Mon Aug 24 2015 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-6
|
||||
- Specify the name of the help content file
|
||||
Resolves: rhbz#1254884
|
||||
- Skip files unrecognized by the 'oscap info' command
|
||||
Resolves: rhbz#1255075
|
||||
- Only allow DS and XCCDF ID selection if it makes sense
|
||||
Resolves: rhbz#1254876
|
||||
|
||||
* Tue Aug 4 2015 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-5
|
||||
- Make sure DS and XCCDF ID lists are correctly refreshed
|
||||
Resolves: rhbz#1240946
|
||||
- Make sure the DS and XCCDF ID combo boxes are visible for DS content
|
||||
Resolves: rhbz#1249951
|
||||
- Try to load the OSCAP session early for DS content
|
||||
Resolves: rhbz#1247654
|
||||
- Test preinst_content_path before raw_preinst_content_path
|
||||
Resolves: rhbz#1249937
|
||||
- Clear any error if switching to the dry-run mode
|
||||
Related: rhbz#1247677
|
||||
- Do not continue with and invalid profile ID
|
||||
Resolves: rhbz#1247677
|
||||
- Cover all potential places with a non-main thread changing Gtk stuff
|
||||
Resolves: rhbz#1240967
|
||||
|
||||
* Thu Jul 23 2015 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-4
|
||||
- Better handle and report erroneous states
|
||||
Resolves: rhbz#1241064
|
||||
- Make sure (some more) GUI actions run in the main thread
|
||||
Resolves: rhbz#1240967
|
||||
- Beware of RPM->cpio entries' paths having absolute paths
|
||||
Related: rhbz#1241064
|
||||
- Only output the kickstart section with content and profile set
|
||||
Resolves: rhbz#1241395
|
||||
- Just report integrity check failure instead of traceback
|
||||
Resolves: rhbz#1240710
|
||||
- Properly react on download/loading issues in text+kickstart mode
|
||||
Related: rhbz#1240710
|
||||
- Fetch and process the content even if GUI doesn't take care of it
|
||||
Resolves: rhbz#1240625
|
||||
|
||||
* Tue Jul 7 2015 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-3
|
||||
- Do not output redundant/invalid fields for the SSG content (vpodzime)
|
||||
Resolves: rhbz#1240285
|
||||
- Better handle unsupported URL types (vpodzime)
|
||||
Resolves: rhbz#1232631
|
||||
- React better on network issues (vpodzime)
|
||||
Resolves: rhbz#1236657
|
||||
- Improve the description of the default profile (vpodzime)
|
||||
Resolves: rhbz#1238080
|
||||
- Use the openscap-scanner package instead of openscap-utils (vpodzime)
|
||||
Resolves: rhbz#1240249
|
||||
- Better handle the case with no profile selected (vpodzime)
|
||||
Resolves: rhbz#1235750
|
||||
- Add newline and one blank line after the %%addon section (vpodzime)
|
||||
Resolves: rhbz#1238267
|
||||
- Word-wrap profile descriptions (vpodzime)
|
||||
Resolves: rhbz#1236644
|
||||
|
||||
* Wed Jun 17 2015 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-2
|
||||
- Add gettext to BuildRequires (vpodzime)
|
||||
Related: rhbz#1204640
|
||||
|
||||
* Tue Jun 16 2015 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-1
|
||||
- Rebase to the upstream version 0.7
|
||||
Related: rhbz#1204640
|
||||
|
||||
* Tue Apr 28 2015 Vratislav Podzimek <vpodzime@redhat.com> - 0.6-1
|
||||
- Rebase to the upstream version 0.6
|
||||
Resolves: rhbz#1204640
|
||||
|
||||
* Mon Aug 04 2014 Vratislav Podzimek <vpodzime@redhat.com> - 0.4-3
|
||||
- Don't distribute backup files
|
||||
Resolves: rhbz#1065906
|
||||
* Wed Jan 15 2014 Vratislav Podizmek <vpodzime@redhat.com> - 0.4-2
|
||||
- Skip running tests on RHEL builds
|
||||
Related: rhbz#1035662
|
||||
* Tue Jan 14 2014 Vratislav Podzimek <vpodzime@redhat.com> - 0.4-1
|
||||
- Beware of running Gtk actions from a non-main thread
|
||||
- Fix path to the tailoring file when getting rules
|
||||
- A git hook for running tests when pushing
|
||||
- Inform user if no profile is selected
|
||||
- Visually mark the selected profile
|
||||
- Better UX with content URL entry and progress label
|
||||
- React on invalid content properly (#1032846)
|
||||
- Stop spinner when data fetching is finished
|
||||
- Make the data fetching thread non-fatal (#1049989)
|
||||
- Exit code 2 from the oscap tool is not an error for us (#1050913)
|
||||
- Be ready to work with archives/RPMs containing data streams
|
||||
- Add unit tests for the keep_type_map function
|
||||
- Add support for namedtuples to keep_type_map
|
||||
- Add target for running pylint check
|
||||
- Add target for running just unittests
|
||||
- On the way to tailoring
|
||||
- Tests for kickstart XCCDF tailoring handling
|
||||
- Kickstart support for XCCDF tailoring
|
||||
- Check session validity also when using XCCDF benchmark
|
||||
|
||||
* Tue Dec 10 2013 Vratislav Podzimek <vpodzime@redhat.com> - 0.3-1
|
||||
- Implement and use our own better function for joining paths
|
||||
- The content entry should have focus if there is no content
|
||||
- RPM is just a weird archive in the pre-installation phase
|
||||
- Ignore RPM files as well
|
||||
- Adapt tests to dir constants now ending with "/"
|
||||
- CpioArchive cannot be created from a piped output
|
||||
- Fix namespace definitions in the testing XCCDF file
|
||||
- Prevent putting None into xccdf_session_is_sds
|
||||
- Fix the __all__ variable in the common module
|
||||
- Strip content dir prefix when setting xccdf/cpe paths
|
||||
- Inform user we now support archive URLs as well
|
||||
- Ignore various file types in the git repository
|
||||
- Try to find content files in the fetched archive or RPM
|
||||
- Run pylint -E as part of the test target
|
||||
- Return list of extracted files/directories when extracting archive
|
||||
- Do not try to search for empty file paths in archives
|
||||
- Properly set the content type based on the URL's suffix
|
||||
- Switch profiles on double-click
|
||||
- Hook urlEntry's activate signal to fetchButton click
|
||||
- Save the spoke's glade file with a new Glade
|
||||
- The addon now requires the python-cpio package
|
||||
- Use really_hide for the UI elements for datastream-id and xccdf-id
|
||||
- Support for RPM content in the GUI spoke
|
||||
- RPM content support for kickstart processing
|
||||
- Add property for the raw post-installation content path
|
||||
- Make content type case insensitive
|
||||
- Rest of the code needed for RPM extraction
|
||||
- Actually look for the file path in entry names
|
||||
- Basic stuff needed for the RPM content support
|
||||
- Run tests in paralel
|
||||
- Specify files in a better way in spec
|
||||
|
||||
* Mon Oct 21 2013 Vratislav Podzimek <vpodzime@redhat.com> - 0.2-1
|
||||
- Initial RPM for the oscap-anaconda-addon
|
Loading…
Reference in New Issue
Block a user