rpms
/
setroubleshoot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setroubleshoot-3.3.18-2 

- Update translations
- Improve myplatform detection in get_os_environment()
This commit is contained in:
Petr Lautrbach 2018-09-20 10:49:46 +02:00
parent 390018d909
commit 68fd5e93b2
4 changed files with 42157 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41950
0001-Update-translations.patch Normal file
View File

File diff suppressed because it is too large Load Diff

39
0003-framework-Improve-myplatform-detection-in-get_os_env.patch Normal file
View File

@ -0,0 +1,39 @@
From f47ca051b0c8b7e6e8e84d7efbc69336e18cfee9 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Fri, 31 Aug 2018 12:41:09 +0200
Subject: [PATCH 3/4] framework: Improve myplatform detection in
get_os_environment()
- platform.dist() is deprecated therefore it's replaced by
distro.linux_distribution() in the new code
- distro module could raise an exception and in this case we set myplatform to
"unknown"
---
framework/src/setroubleshoot/util.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/framework/src/setroubleshoot/util.py b/framework/src/setroubleshoot/util.py
index 15ca39f..1e1e496 100755
--- a/framework/src/setroubleshoot/util.py
+++ b/framework/src/setroubleshoot/util.py
@@ -550,10 +550,12 @@ def load_plugins(filter_glob=None):
def get_os_environment():
try:
myplatform = open(redhat_release_path).readlines()[0].strip()
- except IOError:
- # dist returns (distname, version, id)
- import platform
- myplatform = ' '.join(platform.dist())
+ except:
+ try:
+ import distro
+ myplatform = ' '.join(distro.linux_distribution())
+ except:
+ myplatform = "unknown"
# uname returns (sysname, nodename, release, version, machine)
uname = os.uname()
--
2.19.0

159
0004-Update-translations.patch Normal file
View File

@ -0,0 +1,159 @@
From 06e4ebf603ef936e1422cb887403994abb29c459 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Thu, 20 Sep 2018 10:14:34 +0200
Subject: [PATCH 4/4] Update translations
---
framework/po/da.po | 6 ++++--
framework/po/fr.po | 7 ++++---
framework/po/ja.po | 12 +++++++++---
framework/po/sv.po | 6 ++++--
4 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/framework/po/da.po b/framework/po/da.po
index 43faec8..4706b3e 100644
--- a/framework/po/da.po
+++ b/framework/po/da.po
@@ -17,13 +17,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-01-28 01:43+0000\n"
+"PO-Revision-Date: 2018-08-16 04:21+0000\n"
"Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/fedora/language/"
"da/)\n"
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.5.0\n"
+"X-Generator: Zanata 4.6.2\n"
#: ../setroubleshoot.desktop.in.h:1
msgid "SELinux Troubleshooter"
@@ -642,6 +642,8 @@ msgstr "SELinux AVC afslag, tryk for at se den"
#: ../src/seapplet:160
msgid "SELinux Troubleshooter: Applet requires SELinux be enabled to run"
msgstr ""
+"SELinux fejlsøger: Appletten kræver at SELinux er aktiveret for at kunne "
+"køre"
#: ../src/sealert:120
msgid "SELinux not enabled, sealert will not run on non SELinux systems"
diff --git a/framework/po/fr.po b/framework/po/fr.po
index 840c07c..cd00d47 100644
--- a/framework/po/fr.po
+++ b/framework/po/fr.po
@@ -20,6 +20,7 @@
# Thomas Canniot <thomas.canniot@laposte.net>, 2007
# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017. #zanata
# Vit Mojzis <vmojzis@redhat.com>, 2017. #zanata
+# Ludek Janda <ljanda@redhat.com>, 2018. #zanata
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -28,13 +29,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-11-22 06:32+0000\n"
+"PO-Revision-Date: 2018-09-13 01:08+0000\n"
"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
"Language-Team: French (http://www.transifex.com/projects/p/fedora/language/"
"fr/)\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 4.5.0\n"
+"X-Generator: Zanata 4.6.2\n"
#: ../setroubleshoot.desktop.in.h:1
msgid "SELinux Troubleshooter"
@@ -653,7 +654,7 @@ msgstr "Refus d'accès AVC par SELinux. Cliquez pour voir"
#: ../src/seapplet:160
msgid "SELinux Troubleshooter: Applet requires SELinux be enabled to run"
-msgstr ""
+msgstr "SELinux Troubleshooter: Applet requiert que SELinux soit activé"
#: ../src/sealert:120
msgid "SELinux not enabled, sealert will not run on non SELinux systems"
diff --git a/framework/po/ja.po b/framework/po/ja.po
index d15f690..8c41eee 100644
--- a/framework/po/ja.po
+++ b/framework/po/ja.po
@@ -14,6 +14,7 @@
# 高一人参 @欠陥遺伝子 <www.carrotsoft@gmail.com>, 2011
# Noriko Mizumoto <noriko@redhat.com>, 2016. #zanata
# Vit Mojzis <vmojzis@redhat.com>, 2017. #zanata
+# Ludek Janda <ljanda@redhat.com>, 2018. #zanata
# Vit Mojzis <vmojzis@redhat.com>, 2018. #zanata
msgid ""
msgstr ""
@@ -23,13 +24,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-08-02 02:18+0000\n"
+"PO-Revision-Date: 2018-09-14 01:43+0000\n"
"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/fedora/language/"
"ja/)\n"
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.5.0\n"
+"X-Generator: Zanata 4.6.2\n"
#: ../setroubleshoot.desktop.in.h:1
msgid "SELinux Troubleshooter"
@@ -646,7 +647,7 @@ msgstr "SELinux AVC 拒否、クリックして表示"
#: ../src/seapplet:160
msgid "SELinux Troubleshooter: Applet requires SELinux be enabled to run"
-msgstr ""
+msgstr "SELinux Troubleshooter: アプレットでは、SELinux が実行するように有効化されている必要があります。"
#: ../src/sealert:120
msgid "SELinux not enabled, sealert will not run on non SELinux systems"
@@ -683,6 +684,11 @@ msgid ""
"Daniel Walsh <dwalsh@redhat.com>\n"
"John Dennis <jdennis@redhat.com>\n"
msgstr ""
+"Copyright (c) 2010\n"
+"Thomas Liu <tliu@redhat.com>\n"
+"Máirín Duffy <duffy@redhat.com>\n"
+"Daniel Walsh <dwalsh@redhat.com>\n"
+"John Dennis <jdennis@redhat.com>\n"
#: ../gui/browser.glade.h:9
msgid "Troubleshoot selected alert"
diff --git a/framework/po/sv.po b/framework/po/sv.po
index ae0358e..db2e615 100644
--- a/framework/po/sv.po
+++ b/framework/po/sv.po
@@ -16,13 +16,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-23 02:14+0000\n"
+"PO-Revision-Date: 2018-08-12 01:52+0000\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/fedora/language/"
"sv/)\n"
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 4.5.0\n"
+"X-Generator: Zanata 4.6.2\n"
#: ../setroubleshoot.desktop.in.h:1
msgid "SELinux Troubleshooter"
@@ -641,6 +641,8 @@ msgstr "AVC-nekande från SELinux, klicka för att se"
#: ../src/seapplet:160
msgid "SELinux Troubleshooter: Applet requires SELinux be enabled to run"
msgstr ""
+"SELinux felsökare: panelprogrammet förutsätter att SELinux är aktiverat för "
+"att köra"
#: ../src/sealert:120
msgid "SELinux not enabled, sealert will not run on non SELinux systems"
--
2.19.0

10
setroubleshoot.spec
View File

@ -4,11 +4,15 @@
Summary: Helps troubleshoot SELinux problems
Name: setroubleshoot
Version: 3.3.18
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
URL: https://pagure.io/setroubleshoot
Source0: https://releases.pagure.org/setroubleshoot/%{name}-%{version}.tar.gz
Source1: %{name}.tmpfiles
Patch1: 0001-Update-translations.patch
# Patch2: 0002-framework-Open-3.3.19-development.patch
Patch3: 0003-framework-Improve-myplatform-detection-in-get_os_env.patch
Patch4: 0004-Update-translations.patch
BuildRequires: gcc
BuildRequires: libcap-ng-devel
BuildRequires: intltool gettext python3 python3-devel
@ -201,6 +205,10 @@ SELinux troubleshoot legacy applet
%{_bindir}/seappletlegacy
%changelog
* Thu Sep 20 2018 Petr Lautrbach <plautrba@redhat.com> - 3.3.18-2
- Update translations
- Improve myplatform detection in get_os_environment()
* Wed Jul 18 2018 Petr Lautrbach <plautrba@redhat.com> - 3.3.18-1
- Move sedispatch.conf to /etc/audit/plugins.d/
- Fix summary and "if" text for AVCs with unknown target path