rpms/oscap-anaconda-addon
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Port various fixes:

Browse Source 
- Fix handling of content archives
- Fix handling of content fingerprint
- Fix crash when a previously selected hardening has been cancelled
- Pull latest translations

Resolves: rhbz#1996129
Resolves: rhbz#1993065
Resolves: rhbz#2014108
This commit is contained in:
Matej Tyc 2021-11-10 11:01:11 +01:00
parent e1579b9b4c
commit b20d8baf36
5 changed files with 620 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

550
lang.patch
View File

@ -1,6 +1,6 @@
diff -U3 -N -r a/po/cs.po b/po/cs.po
--- a/po/cs.po 2021-07-02 17:17:04.000000000 +0200
+++ b/po/cs.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/cs.po 2021-11-10 10:56:44.207697106 +0100
@@ -13,7 +13,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -84,7 +84,7 @@ diff -U3 -N -r a/po/cs.po b/po/cs.po
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
diff -U3 -N -r a/po/de.po b/po/de.po
--- a/po/de.po 2021-07-02 17:17:04.000000000 +0200
+++ b/po/de.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/de.po 2021-11-10 10:56:44.207697106 +0100
@@ -4,15 +4,16 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -126,7 +126,7 @@ diff -U3 -N -r a/po/de.po b/po/de.po
msgid "_Change content"
diff -U3 -N -r a/po/fi.po b/po/fi.po
--- a/po/fi.po 2021-07-02 17:17:04.000000000 +0200
+++ b/po/fi.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/fi.po 2021-11-10 10:56:44.207697106 +0100
@@ -7,38 +7,41 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -222,7 +222,7 @@ diff -U3 -N -r a/po/fi.po b/po/fi.po
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
diff -U3 -N -r a/po/fr.po b/po/fr.po
--- a/po/fr.po 2021-07-02 17:17:04.000000000 +0200
+++ b/po/fr.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/fr.po 2021-11-10 10:56:44.207697106 +0100
@@ -13,40 +13,41 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -322,9 +322,353 @@ diff -U3 -N -r a/po/fr.po b/po/fr.po
#. 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 2021-11-10 10:56:44.207697106 +0100
@@ -0,0 +1,340 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-02 15:52+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/rhel9-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:358
+#, 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:189
+#, 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:441
+#, 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:452
+#, 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:560
+#, 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:567
+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:573
+#, 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:712
+#: ../org_fedora_oscap/rule_handling.py:727
+#, 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:737
+#, 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:744
+#: ../org_fedora_oscap/rule_handling.py:759
+#, 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:866
+msgid "Kdump will be disabled on startup"
+msgstr "Kdump biti će onemogućen pri pokretanju"
+
+#: ../org_fedora_oscap/rule_handling.py:868
+msgid "Kdump will be enabled on startup"
+msgstr "Kdump biti će omogućen pri pokretanju"
+
+#: ../org_fedora_oscap/rule_handling.py:1026
+msgid "Firewall will be disabled on startup"
+msgstr "Vatrozid će biti onemogućen pri pokretanju"
+
+#: ../org_fedora_oscap/rule_handling.py:1033
+msgid "Firewall will be enabled on startup"
+msgstr "Vatrozid će biti omogućen pri pokretanju"
+
+#: ../org_fedora_oscap/rule_handling.py:1041
+#: ../org_fedora_oscap/rule_handling.py:1080
+#, 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:1048
+#: ../org_fedora_oscap/rule_handling.py:1093
+#, 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:1055
+#: ../org_fedora_oscap/rule_handling.py:1106
+#, 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:1118
+#: ../org_fedora_oscap/rule_handling.py:1133
+#, 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/service/installation.py:41
+msgid "The integrity check of the security content failed."
+msgstr "Neuspjela provjera cjelovitosti sigurnosnog sadržaja."
+
+#: ../org_fedora_oscap/service/installation.py:46
+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/service/installation.py:51
+#: ../org_fedora_oscap/gui/spokes/oscap.py:793
+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/service/installation.py:56
+msgid "The installation should be aborted."
+msgstr "Instalacija bi se trebala prekinuti."
+
+#: ../org_fedora_oscap/service/installation.py:148
+msgid "Wrong configuration detected!"
+msgstr "Pogrešno podešavanje je otkriveno!"
+
+#: ../org_fedora_oscap/service/oscap.py:121
+msgid "You have used more than one oscap addon sections in the kickstart. "
+msgstr "Koristili ste više od jednog odjeljka oscap dodatka u kickstartu. "
+
+#: ../org_fedora_oscap/service/oscap.py:135
+#, python-brace-format
+msgid ""
+"You have configured the oscap addon using '{used_section_header}' section. "
+msgstr "Podesili ste oscap dodatak koristeći '{used_section_header}' odjeljak. "
+
+#. title of the spoke (will be displayed on the hub)
+#: ../org_fedora_oscap/gui/spokes/oscap.py:201
+msgid "_Security Profile"
+msgstr "_Sigurnosni profil"
+
+#. the first status provided
+#: ../org_fedora_oscap/gui/spokes/oscap.py:228
+msgid "Not ready"
+msgstr "Nije spremno"
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:393
+msgid "Fetching content data"
+msgstr "Preuzimanje sadržaja podataka"
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:431
+msgid "Fetch complete, analyzing data."
+msgstr "Preuzimanje je završeno, analiza podataka."
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:643
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072
+msgid "No profile selected"
+msgstr "Nema odabranog profila"
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:648
+msgid "No rules for the pre-installation phase"
+msgstr "Nema pravila za predinstalacijsku fazu"
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:801
+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:809
+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:817
+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:825
+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:834
+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:842
+#, 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:860
+#, 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:879
+msgid "Not applying security profile"
+msgstr "Sigurnosni profil se ne primijenjuje"
+
+#. TRANSLATORS: the other choice if SCAP Security Guide is also
+#. available
+#: ../org_fedora_oscap/gui/spokes/oscap.py:921
+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:925 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:1062
+msgid "Error fetching and loading content"
+msgstr "Greška preuzimanja i učitavanja sadržaja"
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069
+msgid "No content found"
+msgstr "Nema pronađenog sadržaja"
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1080
+msgid "Misconfiguration detected"
+msgstr "Otkriveno je pogrešno podešavanje"
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1086
+msgid "Warnings appeared"
+msgstr "Pojavila su se upozorenja"
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1088
+msgid "Everything okay"
+msgstr "Sve je uredu"
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1170
+msgid "Invalid or unsupported URL"
+msgstr "Nevaljani ili nepodržani URL"
+
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14
+msgid "Fetching content..."
+msgstr "Preuzimanje sadržaja..."
+
+#: tmp/oscap.glade.h:1
+msgid "SECURITY PROFILE"
+msgstr "SIGURNOSNI PROFIL"
+
+#: 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-02 17:17:04.000000000 +0200
+++ b/po/ja.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/ja.po 2021-11-10 10:56:44.208697114 +0100
@@ -8,38 +8,37 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -453,7 +797,7 @@ diff -U3 -N -r a/po/ja.po b/po/ja.po
msgid "Error fetching and loading content"
diff -U3 -N -r a/po/ko.po b/po/ko.po
--- a/po/ko.po 2021-07-02 17:17:04.000000000 +0200
+++ b/po/ko.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/ko.po 2021-11-10 10:56:44.208697114 +0100
@@ -6,38 +6,37 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -543,9 +887,193 @@ diff -U3 -N -r a/po/ko.po b/po/ko.po
#. title of the spoke (will be displayed on the hub)
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
diff -U3 -N -r a/po/oscap-anaconda-addon.pot b/po/oscap-anaconda-addon.pot
--- a/po/oscap-anaconda-addon.pot 2021-07-02 15:52:56.000000000 +0200
+++ b/po/oscap-anaconda-addon.pot 2021-11-10 10:56:44.225697261 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-02 15:52+0200\n"
+"POT-Creation-Date: 2021-08-20 17:44+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,10 +22,11 @@
msgid "Error extracting archive as a zipfile: {exc}"
msgstr ""
-#: ../org_fedora_oscap/content_discovery.py:189
+#: ../org_fedora_oscap/content_discovery.py:190
#, python-brace-format
msgid ""
-"Integrity check of the content failed - {hash_obj.name} hash didn't match"
+"OSCAP Addon: Integrity check of the content failed - {hash_obj.name} hash "
+"didn't match"
msgstr ""
#: ../org_fedora_oscap/data_fetch.py:117
@@ -137,23 +138,32 @@
"firewall"
msgstr ""
+#: ../org_fedora_oscap/ks/oscap.py:375
+#: ../org_fedora_oscap/service/installation.py:56
+msgid "The installation should be aborted."
+msgstr ""
+
+#: ../org_fedora_oscap/ks/oscap.py:376
+msgid "Do you wish to continue anyway?"
+msgstr ""
+
+#: ../org_fedora_oscap/ks/oscap.py:399
#: ../org_fedora_oscap/service/installation.py:41
msgid "The integrity check of the security content failed."
msgstr ""
+#: ../org_fedora_oscap/ks/oscap.py:403
#: ../org_fedora_oscap/service/installation.py:46
msgid "There was an error fetching and loading the security content:\n"
msgstr ""
+#: ../org_fedora_oscap/ks/oscap.py:408
#: ../org_fedora_oscap/service/installation.py:51
-#: ../org_fedora_oscap/gui/spokes/oscap.py:793
+#: ../org_fedora_oscap/gui/spokes/oscap.py:803
msgid "There was an unexpected problem with the supplied content."
msgstr ""
-#: ../org_fedora_oscap/service/installation.py:56
-msgid "The installation should be aborted."
-msgstr ""
-
+#: ../org_fedora_oscap/ks/oscap.py:461
#: ../org_fedora_oscap/service/installation.py:148
msgid "Wrong configuration detected!"
msgstr ""
@@ -178,97 +188,97 @@
msgid "Not ready"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:393
+#: ../org_fedora_oscap/gui/spokes/oscap.py:403
msgid "Fetching content data"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:431
+#: ../org_fedora_oscap/gui/spokes/oscap.py:441
msgid "Fetch complete, analyzing data."
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:643
-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072
+#: ../org_fedora_oscap/gui/spokes/oscap.py:653
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1077
msgid "No profile selected"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:648
+#: ../org_fedora_oscap/gui/spokes/oscap.py:658
msgid "No rules for the pre-installation phase"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:801
+#: ../org_fedora_oscap/gui/spokes/oscap.py:811
msgid "Invalid content provided. Enter a different URL, please."
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:809
+#: ../org_fedora_oscap/gui/spokes/oscap.py:819
msgid "Invalid or unsupported content URL, please enter a different one."
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:817
+#: ../org_fedora_oscap/gui/spokes/oscap.py:827
msgid "Failed to fetch content. Enter a different URL, please."
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:825
+#: ../org_fedora_oscap/gui/spokes/oscap.py:835
msgid ""
"Network error encountered when fetching data. Please check that network is "
"setup and working."
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:834
+#: ../org_fedora_oscap/gui/spokes/oscap.py:844
msgid "The integrity check of the content failed. Cannot use the content."
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:842
+#: ../org_fedora_oscap/gui/spokes/oscap.py:852
#, python-format
msgid "Failed to extract content (%s). Enter a different URL, please."
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:860
+#: ../org_fedora_oscap/gui/spokes/oscap.py:870
#, python-format
msgid ""
"Profile with ID '%s' not defined in the content. Select a different profile, "
"please"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:879
+#: ../org_fedora_oscap/gui/spokes/oscap.py:889
msgid "Not applying security profile"
msgstr ""
#. TRANSLATORS: the other choice if SCAP Security Guide is also
#. available
-#: ../org_fedora_oscap/gui/spokes/oscap.py:921
+#: ../org_fedora_oscap/gui/spokes/oscap.py:926
msgid " or enter data stream content or archive URL below:"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:925 tmp/oscap.glade.h:12
+#: ../org_fedora_oscap/gui/spokes/oscap.py:930 tmp/oscap.glade.h:12
msgid ""
"No content found. Please enter data stream content or archive URL below:"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:1062
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1067
msgid "Error fetching and loading content"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:1069
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1074
msgid "No content found"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:1080
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1085
msgid "Misconfiguration detected"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:1086
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1091
msgid "Warnings appeared"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:1088
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1093
msgid "Everything okay"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:1170
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1177
msgid "Invalid or unsupported URL"
msgstr ""
-#: ../org_fedora_oscap/gui/spokes/oscap.py:1176 tmp/oscap.glade.h:14
+#: ../org_fedora_oscap/gui/spokes/oscap.py:1183 tmp/oscap.glade.h:14
msgid "Fetching content..."
msgstr ""
diff -U3 -N -r a/po/pl.po b/po/pl.po
--- a/po/pl.po 2021-07-02 17:17:04.000000000 +0200
+++ b/po/pl.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/pl.po 2021-11-10 10:56:44.208697114 +0100
@@ -26,40 +26,42 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -642,7 +1170,7 @@ diff -U3 -N -r a/po/pl.po b/po/pl.po
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
diff -U3 -N -r a/po/si.po b/po/si.po
--- a/po/si.po 2021-07-02 17:17:04.000000000 +0200
+++ b/po/si.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/si.po 2021-11-10 10:56:44.208697114 +0100
@@ -7,13 +7,16 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -674,7 +1202,7 @@ diff -U3 -N -r a/po/si.po b/po/si.po
msgid "Fetching content data"
diff -U3 -N -r a/po/sv.po b/po/sv.po
--- a/po/sv.po 2021-07-02 17:17:04.000000000 +0200
+++ b/po/sv.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/sv.po 2021-11-10 10:56:44.208697114 +0100
@@ -4,40 +4,40 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -789,7 +1317,7 @@ diff -U3 -N -r a/po/sv.po b/po/sv.po
msgid "Fetching content data"
diff -U3 -N -r a/po/uk.po b/po/uk.po
--- a/po/uk.po 2021-07-02 17:17:04.000000000 +0200
+++ b/po/uk.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/uk.po 2021-11-10 10:56:44.208697114 +0100
@@ -5,39 +5,42 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
@ -886,7 +1414,7 @@ diff -U3 -N -r a/po/uk.po b/po/uk.po
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po
--- a/po/zh_CN.po 2021-07-02 17:17:04.000000000 +0200
+++ b/po/zh_CN.po 2021-08-20 16:33:06.140497563 +0200
+++ b/po/zh_CN.po 2021-11-10 10:56:44.208697114 +0100
@@ -5,37 +5,37 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"

14
oscap-anaconda-addon-2.0.1-fix_archive_handling-PR_170.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py
index bc14ef1..ccfe6c8 100644
--- a/org_fedora_oscap/content_discovery.py
+++ b/org_fedora_oscap/content_discovery.py
@@ -225,7 +225,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

22
oscap-anaconda-addon-2.0.1-fix_fingerprint-PR_177.patch Normal file
View File

@ -0,0 +1,22 @@
From c72b95146650b0debc36b8da546b60a9d5482ab3 Mon Sep 17 00:00:00 2001
From: Matej Tyc <matyc@redhat.com>
Date: Fri, 15 Oct 2021 15:28:24 +0200
Subject: [PATCH] Fix bad destination for the parsed content fingerprint
---
org_fedora_oscap/service/kickstart.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/org_fedora_oscap/service/kickstart.py b/org_fedora_oscap/service/kickstart.py
index d6f22ac..dc1a100 100644
--- a/org_fedora_oscap/service/kickstart.py
+++ b/org_fedora_oscap/service/kickstart.py
@@ -140,7 +140,7 @@ def _parse_fingerprint(self, value):
msg = "Unsupported fingerprint"
raise KickstartValueError(msg)
- self.fingerprint = value
+ self.policy_data.fingerprint = value
def _parse_certificates(self, value):
self.policy_data.certificates = value

32
oscap-anaconda-addon-2.0.1-fix_no_hardening-PR_176.patch Normal file
View File

@ -0,0 +1,32 @@
From 56806b88b139d62276e8522bb3daf7d4fb02df84 Mon Sep 17 00:00:00 2001
From: Matej Tyc <matyc@redhat.com>
Date: Fri, 15 Oct 2021 15:05:55 +0200
Subject: [PATCH] Represent unselected profile by an empty string
None can't be passed via the DBUS interface.
---
org_fedora_oscap/gui/spokes/oscap.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py
index 4425757..36c8d7a 100644
--- a/org_fedora_oscap/gui/spokes/oscap.py
+++ b/org_fedora_oscap/gui/spokes/oscap.py
@@ -244,7 +244,7 @@ def __init__(self, data, storage, payload):
self.__old_root_pw = None
# used to check if the profile was changed or not
- self._active_profile = None
+ self._active_profile = ""
# prevent multiple simultaneous data fetches
self._fetching = False
@@ -719,7 +719,7 @@ def _unselect_profile(self, profile_id):
self._revert_rootpw_changes()
self._rule_data = None
- self._active_profile = None
+ self._active_profile = ""
@async_action_wait
def _select_profile(self, profile_id):

14
oscap-anaconda-addon.spec
View File

@ -10,7 +10,7 @@
Name: oscap-anaconda-addon
Version: 2.0.0
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Anaconda addon integrating OpenSCAP to the installation process
License: GPLv2+
@ -22,6 +22,9 @@ Source1: addon-dbus-data.zip
Patch1: lang.patch
Patch2: oscap-anaconda-addon-2.0.1-various_bugfixes-PR_166.patch
Patch3: oscap-anaconda-addon-2.0.1-fix_archive_handling-PR_170.patch
Patch4: oscap-anaconda-addon-2.0.1-fix_no_hardening-PR_176.patch
Patch5: oscap-anaconda-addon-2.0.1-fix_fingerprint-PR_177.patch
BuildArch: noarch
BuildRequires: make
@ -61,6 +64,15 @@ make install DESTDIR=%{buildroot}
%doc COPYING ChangeLog README.md
%changelog
* Wed Nov 10 2021 Matej Tyc <matyc@redhat.com> - 2.0.0-5
- Fix handling of content archives
Resolves: rhbz#1996129
- Fix handling of content fingerprint
Resolves: rhbz#1993065
- Fix crash when a previously selected hardening has been cancelled
Resolves: rhbz#2014108
- Pull latest translations
* Fri Aug 20 2021 Matej Tyc <matyc@redhat.com> - 2.0.0-4
- Update translations
Resolves: rhbz#1962112