diff --git a/Makefile b/Makefile index 493907fa..820c3983 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NAME = oscap-anaconda-addon -VERSION = 1.2.0 +VERSION = 1.2.1 ADDON = org_fedora_oscap TESTS = tests \ diff --git a/oscap-anaconda-addon.spec b/oscap-anaconda-addon.spec deleted file mode 100644 index 15404044..00000000 --- a/oscap-anaconda-addon.spec +++ /dev/null @@ -1,189 +0,0 @@ -Name: oscap-anaconda-addon -Version: 1.1 -Release: 2%{?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://src.fedoraproject.org/rpms/oscap-anaconda-addon -Source0: %{name}-%{version}.tar.gz - -BuildArch: noarch -BuildRequires: gettext -BuildRequires: python3-devel -BuildRequires: python3-pycurl -BuildRequires: python3-mock -BuildRequires: python3-nose -BuildRequires: python3-cpio -BuildRequires: openscap openscap-utils openscap-python3 -BuildRequires: anaconda >= 32.25 -Requires: anaconda >= 32.25 -Requires: python3-cpio -Requires: openscap openscap-utils openscap-python3 - -%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 - - -%build - -%check -make unittest - - -%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 Jul 13 2018 Fedora Release Engineering - 1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jul 03 2018 Matěj Týč - 1.0-1 -- Rebased to upstream version 1.0 -- Python3 support, anaconda 28 support. - -* Fri Feb 09 2018 Igor Gnatenko - 0.7-7 -- Escape macros in %%changelog - -* Thu Feb 08 2018 Fedora Release Engineering - 0.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 0.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jan 07 2015 Vratislav Podzimek - 0.7-1 -- Adapt to changes in Anaconda -- Define name of the spoke window -- Set fetching flag to False when extraction error happens -- Remove code that was pushed to the anaconda's sources - -* Fri Feb 28 2014 Vratislav Podzimek - 0.6-2 -- Rebuild with building issues fixed - -* Fri Feb 28 2014 Vratislav Podzimek - 0.6-1 -- Getting status needs to run in the main thread -- Grab focus for the URL entry after switching notebook page -- Clear rule data when unselecting profile -- Update message as part of the initialization -- Add BuildRequires: gettext -- Include translations in the tarball and RPM - -* Fri Feb 28 2014 Vratislav Podzimek - 0.5-1 -- Allow users to change content -- Show and hide control buttons properly -- Fix sensitivity of the URL entry and fetch button -- Add the button allowing users to use SSG content if available -- Fix listing python sources when creating potfile and regenerate it -- Omit the %%addon section from kickstart in dry-run mode -- Implement the dry-run mode in the GUI (trac#2) -- Add UI elements for content changing and dry-run mode -- Check content_defined instead of content_url in the GUI code -- First select the profile, then update the message store -- Remove unused import -- Ignore some more temporary/backup files -- If no content is specified and SSG is available, use it -- New special content type -- SCAP Security Guide -- Fix name of the property used when doing fingerprint check -- Get rid of an unused variable -- Fix data fetch locking to work properly with kickstart installations -- Use 'anonymous:' if no username and password is given for FTP -- Initial version of the translations template file -- First steps to dry-run mode -- Fix main notebook tabs -- Make translations work -- Manipulation with the i18n related files -- If no profile is given, default to default -- Ignore updates.img and its auxiliary directory -- Catch only fetching errors from the fetching thread -- Do not allow multiple simultaneous fetches/initializations -- Prevent user from changing the URL while we try to fetch from it -- Add support for the Default profile -- Support FTP as a content source (#1050980) -- React properly on archive extraction failure -- Refactor the code pre-processing the fetched content -- Unify exceptions from archive extraction -- Make pylint check mandatory to pass -- Support for hash based content integrity checking - -* Tue Jan 14 2014 Vratislav Podzimek - 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 - 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 - 0.2-1 -- Initial RPM for the oscap-anaconda-addon diff --git a/po/oscap-anaconda-addon.pot b/po/oscap-anaconda-addon.pot index ef41e782..60f06dae 100644 --- a/po/oscap-anaconda-addon.pot +++ b/po/oscap-anaconda-addon.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-09 17:31+0200\n" +"POT-Creation-Date: 2021-07-30 12:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,28 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../org_fedora_oscap/rule_handling.py:409 +#: ../org_fedora_oscap/common.py:326 +#, python-brace-format +msgid "Error extracting archive as a zipfile: {exc}" +msgstr "" + +#: ../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 "" + +#: ../org_fedora_oscap/data_fetch.py:117 +msgid "Network connection needed to fetch data." +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 "" + +#: ../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 " @@ -26,37 +47,37 @@ msgid "" msgstr "" #. template for the message -#: ../org_fedora_oscap/rule_handling.py:420 +#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" msgstr "" #. root password was not set -#: ../org_fedora_oscap/rule_handling.py:529 +#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" msgstr "" -#: ../org_fedora_oscap/rule_handling.py:536 +#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" msgstr "" #. too short -#: ../org_fedora_oscap/rule_handling.py:542 +#: ../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 "" -#: ../org_fedora_oscap/rule_handling.py:660 -#: ../org_fedora_oscap/rule_handling.py:675 +#: ../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 "" -#: ../org_fedora_oscap/rule_handling.py:685 +#: ../org_fedora_oscap/rule_handling.py:710 #, python-brace-format msgid "" "package '{package}' has been added to the list of excluded packages, but it " @@ -64,169 +85,180 @@ msgid "" "installation." msgstr "" -#: ../org_fedora_oscap/rule_handling.py:692 -#: ../org_fedora_oscap/rule_handling.py:707 +#: ../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 "" -#: ../org_fedora_oscap/rule_handling.py:808 +#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" msgstr "" -#: ../org_fedora_oscap/rule_handling.py:810 +#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" msgstr "" -#: ../org_fedora_oscap/rule_handling.py:963 +#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" msgstr "" -#: ../org_fedora_oscap/rule_handling.py:970 +#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" msgstr "" -#: ../org_fedora_oscap/rule_handling.py:978 -#: ../org_fedora_oscap/rule_handling.py:1017 +#: ../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 "" -#: ../org_fedora_oscap/rule_handling.py:985 -#: ../org_fedora_oscap/rule_handling.py:1030 +#: ../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 "" -#: ../org_fedora_oscap/rule_handling.py:992 -#: ../org_fedora_oscap/rule_handling.py:1043 +#: ../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 "" -#: ../org_fedora_oscap/rule_handling.py:1055 -#: ../org_fedora_oscap/rule_handling.py:1070 +#: ../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 "" -#: ../org_fedora_oscap/ks/oscap.py:418 -#, python-format -msgid "" -"There was an error fetching and loading the security content:\n" -"%s\n" -"The installation should be aborted. Do you wish to continue anyway?" +#: ../org_fedora_oscap/ks/oscap.py:375 +msgid "The installation should be aborted." msgstr "" -#: ../org_fedora_oscap/ks/oscap.py:447 -msgid "" -"The integrity check of the security content failed.\n" -"The installation should be aborted. Do you wish to continue anyway?" +#: ../org_fedora_oscap/ks/oscap.py:376 +msgid "Do you wish to continue anyway?" +msgstr "" + +#: ../org_fedora_oscap/ks/oscap.py:399 +msgid "The integrity check of the security content failed." +msgstr "" + +#: ../org_fedora_oscap/ks/oscap.py:403 +msgid "There was an error fetching and loading the security content:\n" +msgstr "" + +#: ../org_fedora_oscap/ks/oscap.py:408 +#: ../org_fedora_oscap/gui/spokes/oscap.py:774 +msgid "There was an unexpected problem with the supplied content." +msgstr "" + +#: ../org_fedora_oscap/ks/oscap.py:461 +msgid "Wrong configuration detected!" msgstr "" #. title of the spoke (will be displayed on the hub) -#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +#: ../org_fedora_oscap/gui/spokes/oscap.py:201 msgid "_Security Policy" msgstr "" #. the first status provided -#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +#: ../org_fedora_oscap/gui/spokes/oscap.py:626 +#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +#: ../org_fedora_oscap/gui/spokes/oscap.py:815 msgid "The integrity check of the content failed. Cannot use the content." msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +#: ../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 "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" msgstr "" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available -#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +#: ../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 "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" msgstr "" -#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." msgstr ""