diff --git a/SOURCES/long_delay_1379479.patch b/SOURCES/long_delay_1379479.patch new file mode 100644 index 0000000..d36d1eb --- /dev/null +++ b/SOURCES/long_delay_1379479.patch @@ -0,0 +1,54 @@ +From 0a21382a7e76ce06bd484add725be3c5e41b216a Mon Sep 17 00:00:00 2001 +From: Martin Kolman +Date: Thu, 23 Feb 2017 15:07:57 +0100 +Subject: [PATCH] Use the init_done signal instead of wait_all() (#1380224) + +Using the wait_all() function provided by the Anaconda thread manager +singleton can result in unexpected behavior, as there might still be +threads unrelated to spoke initialization still running when the +function is called. This might result in unnecessary delay before the +OSCAP addon spoke becomes ready and installation can continue. + +So use the init_done signal, which is the proper way to wait for +Anaconda spokes to finish initialization. + +Also bump the Anaconda version to one that provides the init_done +signal. + +Resolves: rhbz#1380224 +--- + org_fedora_oscap/gui/spokes/oscap.py | 14 +++++++++++++- + +diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py +index 35f7a75..b476cf9 100644 +--- a/org_fedora_oscap/gui/spokes/oscap.py ++++ b/org_fedora_oscap/gui/spokes/oscap.py +@@ -214,6 +214,14 @@ def __init__(self, data, storage, payload, instclass): + + self._error = None + ++ # wait for all Anaconda spokes to initialiuze ++ self._anaconda_spokes_initialized = threading.Event() ++ self.initialization_controller.init_done.connect(self._all_anaconda_spokes_initialized) ++ ++ def _all_anaconda_spokes_initialized(self): ++ log.debug("OSCAP addon: Anaconda init_done signal triggered") ++ self._anaconda_spokes_initialized.set() ++ + def initialize(self): + """ + The initialize method that is called after the instance is created. +@@ -431,7 +439,11 @@ def _init_after_data_fetch(self, wait_for): + + # let all initialization and configuration happen before we evaluate the + # setup +- threadMgr.wait_all() ++ if not self._anaconda_spokes_initialized.is_set(): ++ # only wait (and log the messages) if the event is not set yet ++ log.debug("OSCAP addon: waiting for all Anaconda spokes to be initialized") ++ self._anaconda_spokes_initialized.wait() ++ log.debug("OSCAP addon: all Anaconda spokes have been initialized - continuing") + + # try to switch to the chosen profile (if any) + selected = self._switch_profile() + diff --git a/SOURCES/oscap-anaconda-centos-paths.patch b/SOURCES/oscap-anaconda-centos-paths.patch deleted file mode 100644 index 3cd2e70..0000000 --- a/SOURCES/oscap-anaconda-centos-paths.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1bbde30a8220e545011e9df3b96bd3b9220c9cfe Mon Sep 17 00:00:00 2001 -From: Vratislav Podzimek -Date: Tue, 28 Apr 2015 16:29:51 +0200 -Subject: [PATCH] Change paths to use RHEL 7's SSG instead of the Fedora's one - ---- - org_fedora_oscap/common.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/org_fedora_oscap/common.py b/org_fedora_oscap/common.py -index f1aba4c..7873b50 100644 ---- org_fedora_oscap/common.py -+++ org_fedora_oscap/common.py -@@ -48,8 +48,8 @@ __all__ = ["run_oscap_remediate", "get_fix_rules_pre", "wait_and_fetch_net_data" - INSTALLATION_CONTENT_DIR = "/tmp/openscap_data/" - TARGET_CONTENT_DIR = "/root/openscap_data/" - --SSG_DIR = "/usr/share/xml/scap/ssg/fedora/" --SSG_XCCDF = "ssg-fedora-xccdf.xml" -+SSG_DIR = "/usr/share/xml/scap/ssg/content/" -+SSG_XCCDF = "ssg-centos7-xccdf.xml" - - RESULTS_PATH = utils.join_paths(TARGET_CONTENT_DIR, "eval_remediate_results.xml") - --- -2.3.6 - diff --git a/SOURCES/update_translations_1383181.patch b/SOURCES/update_translations_1383181.patch new file mode 100644 index 0000000..aa94e6f --- /dev/null +++ b/SOURCES/update_translations_1383181.patch @@ -0,0 +1,704 @@ +--- oscap-anaconda-addon-0.7/po/ca.po 2015-06-16 20:43:05.000000000 +0200 ++++ ca.po 2017-05-30 18:09:52.151830713 +0200 +@@ -1,7 +1,7 @@ + # SOME DESCRIPTIVE TITLE. + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. +-# ++# + # Translators: + # Robert Antoni Buj i Gelonch , 2015 + # Ding-Yi Chen , 2015. #zanata +@@ -11,7 +11,7 @@ + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2015-03-30 17:36+0200\n" +-"PO-Revision-Date: 2015-04-03 03:01-0400\n" ++"PO-Revision-Date: 2015-09-29 07:31-0400\n" + "Last-Translator: Robert Antoni Buj Gelonch \n" + "Language-Team: Catalan (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/ca/)\n" + "MIME-Version: 1.0\n" +@@ -19,7 +19,7 @@ + "Content-Transfer-Encoding: 8bit\n" + "Language: ca\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Zanata 3.6.2\n" ++"X-Generator: Zanata 3.9.6\n" + + #: ../org_fedora_oscap/rule_handling.py:320 + #, python-format +@@ -41,7 +41,7 @@ + #, python-format + msgid "make sure to create password with minimal length of %d characters" + msgstr "" +-"assegureu-vos de crear un contrasenya amb una mida mínima de %d caràcters" ++"assegureu-vos de crear una contrasenya amb una mida mínima de %d caràcters" + + #: ../org_fedora_oscap/rule_handling.py:428 + msgid "cannot check root password length (password is crypted)" +@@ -63,13 +63,13 @@ + #: ../org_fedora_oscap/rule_handling.py:526 + #, python-format + msgid "package '%s' has been added to the list of to be installed packages" +-msgstr "el paquet '%s' ha estat afegit a la llista dels paquets instal·lats" ++msgstr "el paquet «%s» s'ha afegit a la llista dels paquets instal·lats" + + #: ../org_fedora_oscap/rule_handling.py:534 + #: ../org_fedora_oscap/rule_handling.py:548 + #, python-format + msgid "package '%s' has been added to the list of excluded packages" +-msgstr "el paquet '%s' ha estat afegit a la llista dels paquets exclosos" ++msgstr "el paquet «%s» s'ha afegit a la llista dels paquets exclosos" + + #: ../org_fedora_oscap/categories/security.py:39 + msgid "SECURITY" +@@ -104,19 +104,19 @@ + #: ../org_fedora_oscap/gui/spokes/oscap.py:611 + msgid "Invalid content provided. Enter a different URL, please." + msgstr "" +-"S'ha proporcionat un context no vàlid. Si us plau, introduïu una URL " ++"S'ha proporcionat un context no vàlid. Si us plau, introduïu un URL " + "diferent." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:620 + msgid "Failed to fetch content. Enter a different URL, please." + msgstr "" +-"L'obtenció del contingut ha fallat. Si us plau, introduïu una URL diferent." ++"L'obtenció del contingut ha fallat. Si us plau, introduïu un URL diferent." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:629 + #, python-format + msgid "Failed to extract content (%s). Enter a different URL, please." + msgstr "" +-"L'extracció del contingut ha fallat (%s). Si us plau, introduïu una URL " ++"L'extracció del contingut ha fallat (%s). Si us plau, introduïu un URL " + "diferent." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:655 +@@ -127,14 +127,14 @@ + #: ../org_fedora_oscap/gui/spokes/oscap.py:683 + msgid " or enter data stream content or archive URL below:" + msgstr "" +-"o introduïu el contingut del flux de dades o la URL d'arxiu a continuació:" ++"A continuació introduïu el contingut del flux de dades o l'URL de l'arxiu:" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:687 + msgid "" + "No content found. Please enter data stream content or archive URL below:" + msgstr "" + "No s'ha trobat cap contingut. Si us plau, a continuació introduïu el " +-"contingut del flux de dades o la URL d'arxiu:" ++"contingut del flux de dades o l'URL de l'arxiu:" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:822 + msgid "No content found" +@@ -155,7 +155,7 @@ + #. cannot start fetching + #: ../org_fedora_oscap/gui/spokes/oscap.py:912 + msgid "Invalid or unsupported URL" +-msgstr "La URL no és vàlida o no està suportada" ++msgstr "L'URL no és vàlid o no està admès" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:916 tmp/oscap.glade.h:13 + msgid "Fetching content..." +--- oscap-anaconda-addon-0.7/po/cs.po 2015-06-16 20:43:14.000000000 +0200 ++++ cs.po 2017-05-30 18:10:05.710549120 +0200 +@@ -1,23 +1,24 @@ + # SOME DESCRIPTIVE TITLE. + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. +-# ++# + # Translators: + # vpodzime , 2014-2015 ++# Zdenek , 2016. #zanata + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2015-03-30 17:36+0200\n" +-"PO-Revision-Date: 2015-03-24 03:21-0400\n" +-"Last-Translator: vpodzime \n" ++"PO-Revision-Date: 2016-09-16 06:54-0400\n" ++"Last-Translator: Zdenek \n" + "Language-Team: Czech (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/cs/)\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Language: cs\n" + "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +-"X-Generator: Zanata 3.6.2\n" ++"X-Generator: Zanata 3.9.6\n" + + #: ../org_fedora_oscap/rule_handling.py:320 + #, python-format +@@ -71,7 +72,7 @@ + #. title of the spoke (will be displayed on the hub) + #: ../org_fedora_oscap/gui/spokes/oscap.py:141 + msgid "_SECURITY POLICY" +-msgstr "" ++msgstr "_POLITIKA ZABEZPEČENÍ" + + #. the first status provided + #: ../org_fedora_oscap/gui/spokes/oscap.py:166 +@@ -109,7 +110,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:655 + msgid "Not applying security policy" +-msgstr "" ++msgstr "Neaplikovat bezpečnostní politiku" + + #. TRANSLATORS: the other choice if SCAP Security Guide is also available + #: ../org_fedora_oscap/gui/spokes/oscap.py:683 +@@ -149,7 +150,7 @@ + + #: tmp/oscap.glade.h:1 + msgid "SECURITY POLICY" +-msgstr "" ++msgstr "POLITIKA ZABEZPEČENÍ" + + #: tmp/oscap.glade.h:2 + msgid "_Change content" +--- oscap-anaconda-addon-0.7/po/es.po 2015-06-16 20:44:05.000000000 +0200 ++++ es.po 2017-05-30 18:11:25.969914413 +0200 +@@ -1,23 +1,24 @@ + # SOME DESCRIPTIVE TITLE. + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. +-# ++# + # Translators: + # Gerardo Rosales , 2014 ++# Máximo Castañeda Riloba , 2016. #zanata + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2015-03-30 17:36+0200\n" +-"PO-Revision-Date: 2015-02-27 04:39-0500\n" +-"Last-Translator: Piotr Drąg \n" ++"PO-Revision-Date: 2017-05-17 06:10-0400\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Spanish (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/es/)\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Language: es\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Zanata 3.6.2\n" ++"X-Generator: Zanata 3.9.6\n" + + #: ../org_fedora_oscap/rule_handling.py:320 + #, python-format +@@ -76,7 +77,7 @@ + #. title of the spoke (will be displayed on the hub) + #: ../org_fedora_oscap/gui/spokes/oscap.py:141 + msgid "_SECURITY POLICY" +-msgstr "" ++msgstr "POLÍTICA DE _SEGURIDAD" + + #. the first status provided + #: ../org_fedora_oscap/gui/spokes/oscap.py:166 +@@ -117,7 +118,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:655 + msgid "Not applying security policy" +-msgstr "" ++msgstr "No se aplica política de seguridad" + + #. TRANSLATORS: the other choice if SCAP Security Guide is also available + #: ../org_fedora_oscap/gui/spokes/oscap.py:683 +@@ -159,7 +160,7 @@ + + #: tmp/oscap.glade.h:1 + msgid "SECURITY POLICY" +-msgstr "" ++msgstr "POLÍTICA DE SEGURIDAD" + + #: tmp/oscap.glade.h:2 + msgid "_Change content" +--- oscap-anaconda-addon-0.7/po/ja.po 2015-06-16 20:43:22.000000000 +0200 ++++ ja.po 2017-05-30 18:10:25.130151840 +0200 +@@ -1,45 +1,41 @@ +-# 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 , YEAR. +-# ++# Ludek Janda , 2017. #zanata + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2015-03-30 17:36+0200\n" +-"PO-Revision-Date: \n" +-"Last-Translator: \n" ++"PO-Revision-Date: 2017-05-30 08:56-0400\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Japanese\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Language: ja\n" + "Plural-Forms: nplurals=1; plural=0\n" +-"X-Generator: Zanata 3.6.2\n" ++"X-Generator: Zanata 3.9.6\n" + + #: ../org_fedora_oscap/rule_handling.py:320 + #, python-format + msgid "%s must be on a separate partition or logical volume" +-msgstr "" ++msgstr "%s は別のパーティションもしくは論理ボリューム上にある必要があります" + + #. template for the message + #: ../org_fedora_oscap/rule_handling.py:328 + #, python-format + msgid "" + "mount option '%(mount_option)s' added for the mount point %(mount_point)s" +-msgstr "" ++msgstr "マウントオプション '%(mount_option)s' がマウントポイント %(mount_point)s に追加されました" + + #. root password was not set + #. password length enforcement is not suported in the Anaconda yet + #: ../org_fedora_oscap/rule_handling.py:422 + #, python-format + msgid "make sure to create password with minimal length of %d characters" +-msgstr "" ++msgstr "パスワードを最小の長さである %d 文字で作成してください" + + #: ../org_fedora_oscap/rule_handling.py:428 + msgid "cannot check root password length (password is crypted)" +-msgstr "" ++msgstr "root パスワードの長さを確認できません (パスワードは暗号化済み)" + + #. too short or already removed + #: ../org_fedora_oscap/rule_handling.py:433 +@@ -47,146 +43,146 @@ + msgid "" + "root password was too short, a longer one with at least %d characters will " + "be required" +-msgstr "" ++msgstr "root パスワードが短すぎました。%d 文字以上のパスワードが必要です" + + #: ../org_fedora_oscap/rule_handling.py:512 + #: ../org_fedora_oscap/rule_handling.py:526 + #, python-format + msgid "package '%s' has been added to the list of to be installed packages" +-msgstr "" ++msgstr "パッケージ '%s' がインストール予定パッケージ一覧に追加されました" + + #: ../org_fedora_oscap/rule_handling.py:534 + #: ../org_fedora_oscap/rule_handling.py:548 + #, python-format + msgid "package '%s' has been added to the list of excluded packages" +-msgstr "" ++msgstr "パッケージ '%s' が除外パッケージ一覧に追加されました" + + #: ../org_fedora_oscap/categories/security.py:39 + msgid "SECURITY" +-msgstr "" ++msgstr "セキュリティー" + + #. title of the spoke (will be displayed on the hub) + #: ../org_fedora_oscap/gui/spokes/oscap.py:141 + msgid "_SECURITY POLICY" +-msgstr "" ++msgstr "セキュリティーポリシー(_S)" + + #. the first status provided + #: ../org_fedora_oscap/gui/spokes/oscap.py:166 + msgid "Not ready" +-msgstr "" ++msgstr "準備ができていません" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:287 + msgid "Fetching content data" +-msgstr "" ++msgstr "コンテンツデータの取得中" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:322 + msgid "Integrity check failed" +-msgstr "" ++msgstr "整合性チェックに失敗しました" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:519 + msgid "No profile selected" +-msgstr "" ++msgstr "プロファイルが選択されていません" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:523 + msgid "No rules for the pre-installation phase" +-msgstr "" ++msgstr "プレインストールフェーズのルールがありません" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:611 + msgid "Invalid content provided. Enter a different URL, please." +-msgstr "" ++msgstr "無効なコンテンツが入力されました。別の URL を入力してください。" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:620 + msgid "Failed to fetch content. Enter a different URL, please." +-msgstr "" ++msgstr "コンテンツの取得に失敗しました。別の URL を入力してください。" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:629 + #, python-format + msgid "Failed to extract content (%s). Enter a different URL, please." +-msgstr "" ++msgstr "コンテンツ (%s) の抽出に失敗しました。別の URL を入力してください。" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:655 + msgid "Not applying security policy" +-msgstr "" ++msgstr "セキュリティーポリシーを適用しない" + + #. TRANSLATORS: the other choice if SCAP Security Guide is also available + #: ../org_fedora_oscap/gui/spokes/oscap.py:683 + msgid " or enter data stream content or archive URL below:" +-msgstr "" ++msgstr "またはデータストリームコンテンツを入力するか、以下の URL をアーカイブ化する:" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:687 + msgid "" + "No content found. Please enter data stream content or archive URL below:" +-msgstr "" ++msgstr "コンテンツが見つかりませんでした。データストリームコンテンツを入力するか、以下の URL をアーカイブ化してください:" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:822 + msgid "No content found" +-msgstr "" ++msgstr "コンテンツが見つかりませんでした" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:830 + msgid "Misconfiguration detected" +-msgstr "" ++msgstr "無効な構成を検出しました" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:836 + msgid "Warnings appeared" +-msgstr "" ++msgstr "警告が表示されました" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:838 + msgid "Everything okay" +-msgstr "" ++msgstr "すべて OK です" + + #. cannot start fetching + #: ../org_fedora_oscap/gui/spokes/oscap.py:912 + msgid "Invalid or unsupported URL" +-msgstr "" ++msgstr "無効またはサポートされていない URL" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:916 tmp/oscap.glade.h:13 + msgid "Fetching content..." +-msgstr "" ++msgstr "コンテンツの取得中..." + + #: tmp/oscap.glade.h:1 + msgid "SECURITY POLICY" +-msgstr "" ++msgstr "セキュリティーポリシー" + + #: tmp/oscap.glade.h:2 + msgid "_Change content" +-msgstr "" ++msgstr "コンテンツの変更(_C)" + + #: tmp/oscap.glade.h:3 + msgid "Apply security policy:" +-msgstr "" ++msgstr "セキュリティーポリシーの適用:" + + #: tmp/oscap.glade.h:4 + msgid "Data stream:" +-msgstr "" ++msgstr "データストリーム:" + + #: tmp/oscap.glade.h:5 + msgid "Checklist:" +-msgstr "" ++msgstr "チェックリスト:" + + #: tmp/oscap.glade.h:6 + msgid "Choose profile below:" +-msgstr "" ++msgstr "以下のプロファイルを選択:" + + #: tmp/oscap.glade.h:7 + msgid "Profile" +-msgstr "" ++msgstr "プロファイル" + + #: tmp/oscap.glade.h:8 + msgid "Selected" +-msgstr "" ++msgstr "選択済み" + + #: tmp/oscap.glade.h:9 + msgid "_Select profile" +-msgstr "" ++msgstr "プロファイルを選択(_S)" + + #: tmp/oscap.glade.h:10 + msgid "Changes that were done or need to be done:" +-msgstr "" ++msgstr "完了済みの変更または必要な変更" + + #: tmp/oscap.glade.h:11 + msgid "_Use SCAP Security Guide" +-msgstr "" ++msgstr "SCAP セキュリティーガイドを使用する(_U)" + + #: tmp/oscap.glade.h:12 + msgid "_Fetch" +-msgstr "" ++msgstr "取得(_F)" +--- oscap-anaconda-addon-0.7/po/pl.po 2015-06-16 20:43:30.000000000 +0200 ++++ pl.po 2017-05-30 18:10:39.586857875 +0200 +@@ -1,7 +1,7 @@ + # SOME DESCRIPTIVE TITLE. + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. +-# ++# + # Translators: + # Bartosz Sapijaszko , 2002 + # dcantrel , 2011 +@@ -23,7 +23,7 @@ + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2015-03-30 17:36+0200\n" +-"PO-Revision-Date: 2015-04-03 01:46-0400\n" ++"PO-Revision-Date: 2015-08-25 06:51-0400\n" + "Last-Translator: Piotr Drąg \n" + "Language-Team: Polish (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/pl/)\n" + "MIME-Version: 1.0\n" +@@ -31,7 +31,7 @@ + "Content-Transfer-Encoding: 8bit\n" + "Language: pl\n" + "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +-"X-Generator: Zanata 3.6.2\n" ++"X-Generator: Zanata 3.9.6\n" + + #: ../org_fedora_oscap/rule_handling.py:320 + #, python-format +@@ -96,7 +96,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:287 + msgid "Fetching content data" +-msgstr "Pobieranie danych zawartości" ++msgstr "Pobieranie danych treści" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:322 + msgid "Integrity check failed" +@@ -112,17 +112,16 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:611 + msgid "Invalid content provided. Enter a different URL, please." +-msgstr "Podano nieprawidłową zawartość. Proszę podać inny adres URL." ++msgstr "Podano nieprawidłową treść. Proszę podać inny adres URL." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:620 + msgid "Failed to fetch content. Enter a different URL, please." +-msgstr "Pobranie zawartości się nie powiodło. Proszę podać inny adres URL." ++msgstr "Pobranie treści się nie powiodło. Proszę podać inny adres URL." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:629 + #, python-format + msgid "Failed to extract content (%s). Enter a different URL, please." +-msgstr "" +-"Wydobycie zawartości się nie powiodło (%s). Proszę podać inny adres URL." ++msgstr "Wydobycie treści się nie powiodło (%s). Proszę podać inny adres URL." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:655 + msgid "Not applying security policy" +@@ -132,19 +131,18 @@ + #: ../org_fedora_oscap/gui/spokes/oscap.py:683 + msgid " or enter data stream content or archive URL below:" + msgstr "" +-" albo podać zawartość strumienia danych lub podać adres URL archiwum " +-"poniżej:" ++" albo podać treść strumienia danych lub podać adres URL archiwum poniżej:" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:687 + msgid "" + "No content found. Please enter data stream content or archive URL below:" + msgstr "" +-"Nie odnaleziono zawartości. Proszę podać zawartość strumienia danych lub " +-"adres URL archiwum poniżej:" ++"Nie odnaleziono treści. Proszę podać treść strumienia danych lub adres URL " ++"archiwum poniżej:" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:822 + msgid "No content found" +-msgstr "Nie odnaleziono zawartości" ++msgstr "Nie odnaleziono treści" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:830 + msgid "Misconfiguration detected" +@@ -165,7 +163,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:916 tmp/oscap.glade.h:13 + msgid "Fetching content..." +-msgstr "Pobieranie zawartości..." ++msgstr "Pobieranie treści..." + + #: tmp/oscap.glade.h:1 + msgid "SECURITY POLICY" +@@ -173,7 +171,7 @@ + + #: tmp/oscap.glade.h:2 + msgid "_Change content" +-msgstr "_Zmień zawartość" ++msgstr "_Zmień treść" + + #: tmp/oscap.glade.h:3 + msgid "Apply security policy:" +--- oscap-anaconda-addon-0.7/po/pt.po 2015-06-16 20:43:17.000000000 +0200 ++++ pt.po 2017-05-30 18:11:11.262213623 +0200 +@@ -1,22 +1,18 @@ +-# 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 , YEAR. +-# ++# Manuela Silva , 2015. #zanata + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2015-03-30 17:36+0200\n" +-"PO-Revision-Date: \n" +-"Last-Translator: \n" ++"PO-Revision-Date: 2015-09-12 01:40-0400\n" ++"Last-Translator: Manuela Silva \n" + "Language-Team: Portuguese\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Language: pt\n" + "Plural-Forms: nplurals=2; plural=(n != 1)\n" +-"X-Generator: Zanata 3.6.2\n" ++"X-Generator: Zanata 3.9.6\n" + + #: ../org_fedora_oscap/rule_handling.py:320 + #, python-format +@@ -77,7 +73,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:287 + msgid "Fetching content data" +-msgstr "" ++msgstr "A obter dados de conteúdo" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:322 + msgid "Integrity check failed" +@@ -85,7 +81,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:519 + msgid "No profile selected" +-msgstr "" ++msgstr "Nenhum perfil selecionado" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:523 + msgid "No rules for the pre-installation phase" +@@ -120,11 +116,11 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:822 + msgid "No content found" +-msgstr "" ++msgstr "Nenhum conteúdo encontrado" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:830 + msgid "Misconfiguration detected" +-msgstr "" ++msgstr "Detetada má configuração" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:836 + msgid "Warnings appeared" +@@ -132,7 +128,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:838 + msgid "Everything okay" +-msgstr "" ++msgstr "Está tudo bem" + + #. cannot start fetching + #: ../org_fedora_oscap/gui/spokes/oscap.py:912 +@@ -141,15 +137,15 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:916 tmp/oscap.glade.h:13 + msgid "Fetching content..." +-msgstr "" ++msgstr "O obter o conteúdo..." + + #: tmp/oscap.glade.h:1 + msgid "SECURITY POLICY" +-msgstr "" ++msgstr "POLÍTICA DE SEGURANÇA" + + #: tmp/oscap.glade.h:2 + msgid "_Change content" +-msgstr "" ++msgstr "_Alterar conteúdo" + + #: tmp/oscap.glade.h:3 + msgid "Apply security policy:" +--- oscap-anaconda-addon-0.7/po/pt_BR.po 2015-06-16 20:43:37.000000000 +0200 ++++ pt_BR.po 2017-05-30 18:10:52.564593944 +0200 +@@ -1,23 +1,24 @@ + # SOME DESCRIPTIVE TITLE. + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. +-# ++# + # Translators: + # Marcelo Barbosa , 2014 ++# Marco Aurélio Krause , 2016. #zanata + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2015-03-30 17:36+0200\n" +-"PO-Revision-Date: 2015-02-27 04:39-0500\n" +-"Last-Translator: Piotr Drąg \n" ++"PO-Revision-Date: 2017-05-17 06:10-0400\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/pt_BR/)\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Language: pt-BR\n" + "Plural-Forms: nplurals=2; plural=(n > 1);\n" +-"X-Generator: Zanata 3.6.2\n" ++"X-Generator: Zanata 3.9.6\n" + + #: ../org_fedora_oscap/rule_handling.py:320 + #, python-format +@@ -76,7 +77,7 @@ + #. title of the spoke (will be displayed on the hub) + #: ../org_fedora_oscap/gui/spokes/oscap.py:141 + msgid "_SECURITY POLICY" +-msgstr "" ++msgstr "_POLÍTICA DE SEGURANÇA" + + #. the first status provided + #: ../org_fedora_oscap/gui/spokes/oscap.py:166 +@@ -115,7 +116,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:655 + msgid "Not applying security policy" +-msgstr "" ++msgstr "Não aplicar a política de segurança" + + #. TRANSLATORS: the other choice if SCAP Security Guide is also available + #: ../org_fedora_oscap/gui/spokes/oscap.py:683 +@@ -156,7 +157,7 @@ + + #: tmp/oscap.glade.h:1 + msgid "SECURITY POLICY" +-msgstr "" ++msgstr "POLÍTICA DE SEGURANÇA" + + #: tmp/oscap.glade.h:2 + msgid "_Change content" diff --git a/SOURCES/warning_messages_starting_1437106.patch b/SOURCES/warning_messages_starting_1437106.patch new file mode 100644 index 0000000..736e872 --- /dev/null +++ b/SOURCES/warning_messages_starting_1437106.patch @@ -0,0 +1,84 @@ +From b8e617cce89159b172260896ad2404009e6efa01 Mon Sep 17 00:00:00 2001 +From: Vendula Poncova +Date: Thu, 30 Mar 2017 15:22:35 +0200 +Subject: [PATCH 1/2] Gtk: Fix overriding tab label for notebook (#1437106) + +The gtk warning was caused by an empty page in the notebook. +The page was removed. + +Resolves: rhbz#1437106 +--- + org_fedora_oscap/gui/spokes/oscap.glade | 27 ++++++++++++--------------- + 1 file changed, 12 insertions(+), 15 deletions(-) + +diff --git a/org_fedora_oscap/gui/spokes/oscap.glade b/org_fedora_oscap/gui/spokes/oscap.glade +index 5ce20b0..7cc7a0d 100644 +--- a/org_fedora_oscap/gui/spokes/oscap.glade ++++ b/org_fedora_oscap/gui/spokes/oscap.glade +@@ -406,20 +406,6 @@ + + + +- +- +- +- +- True +- False +- Fetch Content +- +- +- 1 +- False +- +- +- + + True + False +@@ -554,7 +540,18 @@ + + + +- 2 ++ 1 ++ ++ ++ ++ ++ True ++ False ++ Fetch Content ++ ++ ++ 1 ++ False + + + + +From 8d2485856131cda7ccfafc75fddfb2156b48fe21 Mon Sep 17 00:00:00 2001 +From: Vendula Poncova +Date: Thu, 30 Mar 2017 18:19:48 +0200 +Subject: [PATCH 2/2] Gtk: Remove app_paintable from a nav box (#1437106) + +The app_paintable property suppressed drawing of the upper bar's +background. + +Resolves: rhbz#1437106 +--- + org_fedora_oscap/gui/spokes/oscap.glade | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/org_fedora_oscap/gui/spokes/oscap.glade b/org_fedora_oscap/gui/spokes/oscap.glade +index 7cc7a0d..45c8f07 100644 +--- a/org_fedora_oscap/gui/spokes/oscap.glade ++++ b/org_fedora_oscap/gui/spokes/oscap.glade +@@ -46,7 +46,6 @@ + 6 + + +- True + False + + diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec index 1048db1..a1df2aa 100644 --- a/SPECS/oscap-anaconda-addon.spec +++ b/SPECS/oscap-anaconda-addon.spec @@ -1,6 +1,6 @@ Name: oscap-anaconda-addon Version: 0.7 -Release: 12%{?dist} +Release: 15%{?dist} Summary: Anaconda addon integrating OpenSCAP to the installation process License: GPLv2+ @@ -14,7 +14,7 @@ URL: https://git.fedorahosted.org/cgit/oscap-anaconda-addon.git # git clone https://github.com/OpenSCAP/oscap-anaconda-addon.git Source0: %{name}-%{version}.tar.gz -Patch0: oscap-anaconda-centos-paths.patch +Patch0: change_ssg_paths.patch Patch1: word_wrap_profile_desc_1236644.patch Patch2: newline_after_addon_section_1238267.patch Patch3: no_profile_handling_1235750.patch @@ -60,6 +60,9 @@ Patch42: seen_property_fix_1357603.patch Patch43: not_fail_on_invalid_profiles_1365130.patch Patch44: stderr_not_fatal_1360765.patch Patch45: datastream_tailoring_1364929.patch +Patch46: long_delay_1379479.patch +Patch47: warning_messages_starting_1437106.patch +Patch48: update_translations_1383181.patch BuildArch: noarch BuildRequires: gettext @@ -67,8 +70,8 @@ BuildRequires: python2-devel #BuildRequires: python-mock #BuildRequires: python-nose #BuildRequires: python-cpio -#BuildRequires: anaconda >= 21.35 -Requires: anaconda >= 21.35 +BuildRequires: anaconda-core >= 21.48.22.99 +Requires: anaconda-core >= 21.48.22.99 Requires: openscap openscap-utils openscap-python Requires: python-cpio Requires: scap-security-guide @@ -126,6 +129,9 @@ content. %patch43 -p1 %patch44 -p1 %patch45 -p1 +%patch46 -p1 +%patch47 -p1 +%patch48 -p1 %build @@ -143,8 +149,18 @@ make install DESTDIR=%{buildroot} %doc COPYING ChangeLog README %changelog -* Wed Nov 16 2016 Jim Perrin - 0.7-12 -- debranding and path patch modification +* Tue May 30 2017 Watson Sato - 0.7-15 +- Add japanese translation +- Update other translations + Resolves: rhbz#1383181 + +* Thu Apr 20 2017 Raphael Sanchez Prudencio - 0.7-14 +- Fixed gtk warning messages when anaconda is starting. + Resolves: rhbz#1437106 + +* Tue Mar 28 2017 Martin Preisler - 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 - 0.7-12 - Properly handle tailoring files for datastreams