MSVSphere Packaging Team
2 years ago
parent
9a0c0f2c10
commit
b2bf66b9fa
@ -1,170 +0,0 @@
|
||||
From b180f7679c5e09535416f47d48afd0c0738f5fa9 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Grepl <mgrepl@redhat.com>
|
||||
Date: Thu, 19 Feb 2015 17:45:15 +0100
|
||||
Subject: [PATCH] Simplication of sepolicy-manpage web functionality.
|
||||
system_release is no longer hardcoded and it creates only index.html and html
|
||||
man pages in the directory for the system release.
|
||||
Content-type: text/plain
|
||||
|
||||
---
|
||||
python/sepolicy/sepolicy/__init__.py | 25 +++--------
|
||||
python/sepolicy/sepolicy/manpage.py | 65 +++-------------------------
|
||||
2 files changed, 13 insertions(+), 77 deletions(-)
|
||||
|
||||
diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
|
||||
index 203ca25f4210..9447812b7450 100644
|
||||
--- a/python/sepolicy/sepolicy/__init__.py
|
||||
+++ b/python/sepolicy/sepolicy/__init__.py
|
||||
@@ -1225,27 +1225,14 @@ def boolean_desc(boolean):
|
||||
|
||||
|
||||
def get_os_version():
|
||||
- os_version = ""
|
||||
- pkg_name = "selinux-policy"
|
||||
+ system_release = ""
|
||||
try:
|
||||
- try:
|
||||
- from commands import getstatusoutput
|
||||
- except ImportError:
|
||||
- from subprocess import getstatusoutput
|
||||
- rc, output = getstatusoutput("rpm -q '%s'" % pkg_name)
|
||||
- if rc == 0:
|
||||
- os_version = output.split(".")[-2]
|
||||
- except:
|
||||
- os_version = ""
|
||||
-
|
||||
- if os_version[0:2] == "fc":
|
||||
- os_version = "Fedora" + os_version[2:]
|
||||
- elif os_version[0:2] == "el":
|
||||
- os_version = "RHEL" + os_version[2:]
|
||||
- else:
|
||||
- os_version = ""
|
||||
+ with open('/etc/system-release') as f:
|
||||
+ system_release = f.readline()
|
||||
+ except IOError:
|
||||
+ system_release = "Misc"
|
||||
|
||||
- return os_version
|
||||
+ return system_release
|
||||
|
||||
|
||||
def reinit():
|
||||
diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
|
||||
index ec8aa1cb94a2..c632d05dbb1b 100755
|
||||
--- a/python/sepolicy/sepolicy/manpage.py
|
||||
+++ b/python/sepolicy/sepolicy/manpage.py
|
||||
@@ -151,10 +151,6 @@ def prettyprint(f, trim):
|
||||
manpage_domains = []
|
||||
manpage_roles = []
|
||||
|
||||
-fedora_releases = ["Fedora17", "Fedora18"]
|
||||
-rhel_releases = ["RHEL6", "RHEL7"]
|
||||
-
|
||||
-
|
||||
def get_alphabet_manpages(manpage_list):
|
||||
alphabet_manpages = dict.fromkeys(string.ascii_letters, [])
|
||||
for i in string.ascii_letters:
|
||||
@@ -184,7 +180,7 @@ def convert_manpage_to_html(html_manpage, manpage):
|
||||
class HTMLManPages:
|
||||
|
||||
"""
|
||||
- Generate a HHTML Manpages on an given SELinux domains
|
||||
+ Generate a HTML Manpages on an given SELinux domains
|
||||
"""
|
||||
|
||||
def __init__(self, manpage_roles, manpage_domains, path, os_version):
|
||||
@@ -192,9 +188,9 @@ class HTMLManPages:
|
||||
self.manpage_domains = get_alphabet_manpages(manpage_domains)
|
||||
self.os_version = os_version
|
||||
self.old_path = path + "/"
|
||||
- self.new_path = self.old_path + self.os_version + "/"
|
||||
+ self.new_path = self.old_path
|
||||
|
||||
- if self.os_version in fedora_releases or self.os_version in rhel_releases:
|
||||
+ if self.os_version:
|
||||
self.__gen_html_manpages()
|
||||
else:
|
||||
print("SELinux HTML man pages can not be generated for this %s" % os_version)
|
||||
@@ -203,7 +199,6 @@ class HTMLManPages:
|
||||
def __gen_html_manpages(self):
|
||||
self._write_html_manpage()
|
||||
self._gen_index()
|
||||
- self._gen_body()
|
||||
self._gen_css()
|
||||
|
||||
def _write_html_manpage(self):
|
||||
@@ -221,67 +216,21 @@ class HTMLManPages:
|
||||
convert_manpage_to_html((self.new_path + r.rsplit("_selinux", 1)[0] + ".html"), self.old_path + r)
|
||||
|
||||
def _gen_index(self):
|
||||
- index = self.old_path + "index.html"
|
||||
- fd = open(index, 'w')
|
||||
- fd.write("""
|
||||
-<html>
|
||||
-<head>
|
||||
- <link rel=stylesheet type="text/css" href="style.css" title="style">
|
||||
- <title>SELinux man pages online</title>
|
||||
-</head>
|
||||
-<body>
|
||||
-<h1>SELinux man pages</h1>
|
||||
-<br></br>
|
||||
-Fedora or Red Hat Enterprise Linux Man Pages.</h2>
|
||||
-<br></br>
|
||||
-<hr>
|
||||
-<h3>Fedora</h3>
|
||||
-<table><tr>
|
||||
-<td valign="middle">
|
||||
-</td>
|
||||
-</tr></table>
|
||||
-<pre>
|
||||
-""")
|
||||
- for f in fedora_releases:
|
||||
- fd.write("""
|
||||
-<a href=%s/%s.html>%s</a> - SELinux man pages for %s """ % (f, f, f, f))
|
||||
-
|
||||
- fd.write("""
|
||||
-</pre>
|
||||
-<hr>
|
||||
-<h3>RHEL</h3>
|
||||
-<table><tr>
|
||||
-<td valign="middle">
|
||||
-</td>
|
||||
-</tr></table>
|
||||
-<pre>
|
||||
-""")
|
||||
- for r in rhel_releases:
|
||||
- fd.write("""
|
||||
-<a href=%s/%s.html>%s</a> - SELinux man pages for %s """ % (r, r, r, r))
|
||||
-
|
||||
- fd.write("""
|
||||
-</pre>
|
||||
- """)
|
||||
- fd.close()
|
||||
- print("%s has been created" % index)
|
||||
-
|
||||
- def _gen_body(self):
|
||||
html = self.new_path + self.os_version + ".html"
|
||||
fd = open(html, 'w')
|
||||
fd.write("""
|
||||
<html>
|
||||
<head>
|
||||
- <link rel=stylesheet type="text/css" href="../style.css" title="style">
|
||||
- <title>Linux man-pages online for Fedora18</title>
|
||||
+ <link rel=stylesheet type="text/css" href="style.css" title="style">
|
||||
+ <title>SELinux man pages online</title>
|
||||
</head>
|
||||
<body>
|
||||
-<h1>SELinux man pages for Fedora18</h1>
|
||||
+<h1>SELinux man pages for %s</h1>
|
||||
<hr>
|
||||
<table><tr>
|
||||
<td valign="middle">
|
||||
<h3>SELinux roles</h3>
|
||||
-""")
|
||||
+""" % self.os_version)
|
||||
for letter in self.manpage_roles:
|
||||
if len(self.manpage_roles[letter]):
|
||||
fd.write("""
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 1747f59fece8183772e5591ce5b5feb5f421f602 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Grepl <mgrepl@redhat.com>
|
||||
Date: Fri, 20 Feb 2015 16:42:01 +0100
|
||||
Subject: [PATCH] We want to remove the trailing newline for
|
||||
/etc/system_release.
|
||||
Content-type: text/plain
|
||||
|
||||
---
|
||||
python/sepolicy/sepolicy/__init__.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
|
||||
index 9447812b7450..aa8beda313c8 100644
|
||||
--- a/python/sepolicy/sepolicy/__init__.py
|
||||
+++ b/python/sepolicy/sepolicy/__init__.py
|
||||
@@ -1228,7 +1228,7 @@ def get_os_version():
|
||||
system_release = ""
|
||||
try:
|
||||
with open('/etc/system-release') as f:
|
||||
- system_release = f.readline()
|
||||
+ system_release = f.readline().rstrip()
|
||||
except IOError:
|
||||
system_release = "Misc"
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 0bd28bc715034c644405d3c03f160d69ae710500 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Grepl <mgrepl@redhat.com>
|
||||
Date: Fri, 20 Feb 2015 16:42:53 +0100
|
||||
Subject: [PATCH] Fix title in manpage.py to not contain 'online'.
|
||||
Content-type: text/plain
|
||||
|
||||
---
|
||||
python/sepolicy/sepolicy/manpage.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
|
||||
index c632d05dbb1b..3ae2f42b2fdf 100755
|
||||
--- a/python/sepolicy/sepolicy/manpage.py
|
||||
+++ b/python/sepolicy/sepolicy/manpage.py
|
||||
@@ -222,7 +222,7 @@ class HTMLManPages:
|
||||
<html>
|
||||
<head>
|
||||
<link rel=stylesheet type="text/css" href="style.css" title="style">
|
||||
- <title>SELinux man pages online</title>
|
||||
+ <title>SELinux man pages</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>SELinux man pages for %s</h1>
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -1,349 +0,0 @@
|
||||
From f62227788b28e3afd2016b47af248f8ecefa8155 Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Fri, 24 Jun 2022 16:24:25 +0200
|
||||
Subject: [PATCH] gettext: handle unsupported languages properly
|
||||
Content-type: text/plain
|
||||
|
||||
With "fallback=True" gettext.translation behaves the same as
|
||||
gettext.install and uses NullTranslations in case the
|
||||
translation file for given language was not found (as opposed to
|
||||
throwing an exception).
|
||||
|
||||
Fixes:
|
||||
# LANG is set to any "unsupported" language, e.g. en_US.UTF-8
|
||||
$ chcat --help
|
||||
Traceback (most recent call last):
|
||||
File "/usr/bin/chcat", line 39, in <module>
|
||||
t = gettext.translation(PROGNAME,
|
||||
File "/usr/lib64/python3.9/gettext.py", line 592, in translation
|
||||
raise FileNotFoundError(ENOENT,
|
||||
FileNotFoundError: [Errno 2] No translation file found for domain: 'selinux-python'
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
Reviewed-by: Daniel Burgener <dburgener@linux.microsoft.com>
|
||||
Acked-by: Petr Lautrbach <plautrba@redhat.com>
|
||||
---
|
||||
gui/booleansPage.py | 3 ++-
|
||||
gui/domainsPage.py | 3 ++-
|
||||
gui/fcontextPage.py | 3 ++-
|
||||
gui/loginsPage.py | 3 ++-
|
||||
gui/modulesPage.py | 3 ++-
|
||||
gui/polgengui.py | 3 ++-
|
||||
gui/portsPage.py | 3 ++-
|
||||
gui/semanagePage.py | 3 ++-
|
||||
gui/statusPage.py | 3 ++-
|
||||
gui/system-config-selinux.py | 3 ++-
|
||||
gui/usersPage.py | 3 ++-
|
||||
python/chcat/chcat | 5 +++--
|
||||
python/semanage/semanage | 3 ++-
|
||||
python/semanage/seobject.py | 3 ++-
|
||||
python/sepolgen/src/sepolgen/sepolgeni18n.py | 4 +++-
|
||||
python/sepolicy/sepolicy.py | 3 ++-
|
||||
python/sepolicy/sepolicy/__init__.py | 3 ++-
|
||||
python/sepolicy/sepolicy/generate.py | 3 ++-
|
||||
python/sepolicy/sepolicy/gui.py | 3 ++-
|
||||
python/sepolicy/sepolicy/interface.py | 3 ++-
|
||||
sandbox/sandbox | 3 ++-
|
||||
21 files changed, 44 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/gui/booleansPage.py b/gui/booleansPage.py
|
||||
index 5beec58bc360..ad11a9b24c79 100644
|
||||
--- a/gui/booleansPage.py
|
||||
+++ b/gui/booleansPage.py
|
||||
@@ -46,7 +46,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/gui/domainsPage.py b/gui/domainsPage.py
|
||||
index e08f34b4d3a9..e6eadd61c1bc 100644
|
||||
--- a/gui/domainsPage.py
|
||||
+++ b/gui/domainsPage.py
|
||||
@@ -38,7 +38,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/gui/fcontextPage.py b/gui/fcontextPage.py
|
||||
index bac2bec3ebbd..767664f26ec8 100644
|
||||
--- a/gui/fcontextPage.py
|
||||
+++ b/gui/fcontextPage.py
|
||||
@@ -55,7 +55,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/gui/loginsPage.py b/gui/loginsPage.py
|
||||
index 18b93d8c9756..7e08232a90b5 100644
|
||||
--- a/gui/loginsPage.py
|
||||
+++ b/gui/loginsPage.py
|
||||
@@ -37,7 +37,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/gui/modulesPage.py b/gui/modulesPage.py
|
||||
index c546d455d4cd..02b79f150a13 100644
|
||||
--- a/gui/modulesPage.py
|
||||
+++ b/gui/modulesPage.py
|
||||
@@ -38,7 +38,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/gui/polgengui.py b/gui/polgengui.py
|
||||
index a18f1cba17b9..7a3ecd50c91c 100644
|
||||
--- a/gui/polgengui.py
|
||||
+++ b/gui/polgengui.py
|
||||
@@ -71,7 +71,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/gui/portsPage.py b/gui/portsPage.py
|
||||
index 54aa80ded327..bee2bdf17b99 100644
|
||||
--- a/gui/portsPage.py
|
||||
+++ b/gui/portsPage.py
|
||||
@@ -43,7 +43,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/gui/semanagePage.py b/gui/semanagePage.py
|
||||
index 1371d4e7dabe..efad14d9b375 100644
|
||||
--- a/gui/semanagePage.py
|
||||
+++ b/gui/semanagePage.py
|
||||
@@ -30,7 +30,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/gui/statusPage.py b/gui/statusPage.py
|
||||
index c241ef83dfa0..832849e60d60 100644
|
||||
--- a/gui/statusPage.py
|
||||
+++ b/gui/statusPage.py
|
||||
@@ -43,7 +43,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/gui/system-config-selinux.py b/gui/system-config-selinux.py
|
||||
index 1b460c99363b..9f53b7fe9020 100644
|
||||
--- a/gui/system-config-selinux.py
|
||||
+++ b/gui/system-config-selinux.py
|
||||
@@ -53,7 +53,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/gui/usersPage.py b/gui/usersPage.py
|
||||
index d51bd968b77e..9acd3b844056 100644
|
||||
--- a/gui/usersPage.py
|
||||
+++ b/gui/usersPage.py
|
||||
@@ -37,7 +37,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/python/chcat/chcat b/python/chcat/chcat
|
||||
index e779fcc6ebd7..952cb8187599 100755
|
||||
--- a/python/chcat/chcat
|
||||
+++ b/python/chcat/chcat
|
||||
@@ -38,9 +38,10 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
-except ImportError:
|
||||
+except:
|
||||
try:
|
||||
import builtins
|
||||
builtins.__dict__['_'] = str
|
||||
diff --git a/python/semanage/semanage b/python/semanage/semanage
|
||||
index 8f4e44a7a9cd..f45061a601f9 100644
|
||||
--- a/python/semanage/semanage
|
||||
+++ b/python/semanage/semanage
|
||||
@@ -38,7 +38,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
|
||||
index ff8f4e9c3008..0782c082dc0c 100644
|
||||
--- a/python/semanage/seobject.py
|
||||
+++ b/python/semanage/seobject.py
|
||||
@@ -42,7 +42,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/python/sepolgen/src/sepolgen/sepolgeni18n.py b/python/sepolgen/src/sepolgen/sepolgeni18n.py
|
||||
index 56ebd807c69c..1ff307d9b27d 100644
|
||||
--- a/python/sepolgen/src/sepolgen/sepolgeni18n.py
|
||||
+++ b/python/sepolgen/src/sepolgen/sepolgeni18n.py
|
||||
@@ -19,7 +19,9 @@
|
||||
|
||||
try:
|
||||
import gettext
|
||||
- t = gettext.translation( 'selinux-python' )
|
||||
+ t = gettext.translation("selinux-python",
|
||||
+ localedir="/usr/share/locale",
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
def _(str):
|
||||
diff --git a/python/sepolicy/sepolicy.py b/python/sepolicy/sepolicy.py
|
||||
index 7ebe0efa88a1..c7a70e094b0c 100755
|
||||
--- a/python/sepolicy/sepolicy.py
|
||||
+++ b/python/sepolicy/sepolicy.py
|
||||
@@ -36,7 +36,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
|
||||
index 95520f9bc35d..6bde1971fd7c 100644
|
||||
--- a/python/sepolicy/sepolicy/__init__.py
|
||||
+++ b/python/sepolicy/sepolicy/__init__.py
|
||||
@@ -31,7 +31,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py
|
||||
index 3e8b9f9c291d..eff3a8973917 100644
|
||||
--- a/python/sepolicy/sepolicy/generate.py
|
||||
+++ b/python/sepolicy/sepolicy/generate.py
|
||||
@@ -56,7 +56,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/python/sepolicy/sepolicy/gui.py b/python/sepolicy/sepolicy/gui.py
|
||||
index b0263740a79f..5bdbfebade1d 100644
|
||||
--- a/python/sepolicy/sepolicy/gui.py
|
||||
+++ b/python/sepolicy/sepolicy/gui.py
|
||||
@@ -49,7 +49,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/python/sepolicy/sepolicy/interface.py b/python/sepolicy/sepolicy/interface.py
|
||||
index 599f97fdc6e7..43f86443f2c8 100644
|
||||
--- a/python/sepolicy/sepolicy/interface.py
|
||||
+++ b/python/sepolicy/sepolicy/interface.py
|
||||
@@ -38,7 +38,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
diff --git a/sandbox/sandbox b/sandbox/sandbox
|
||||
index 3ef444a12561..53cc504149c9 100644
|
||||
--- a/sandbox/sandbox
|
||||
+++ b/sandbox/sandbox
|
||||
@@ -45,7 +45,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
From dc99f08e121ee21650a4179e3deaea8c04ae40c9 Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Mosnacek <omosnace@redhat.com>
|
||||
Date: Wed, 8 Jun 2022 19:09:54 +0200
|
||||
Subject: [PATCH] semodule: rename --rebuild-if-modules-changed to --refresh
|
||||
Content-type: text/plain
|
||||
|
||||
After the last commit this option's name and description no longer
|
||||
matches the semantic, so give it a new one and update the descriptions.
|
||||
The old name is still recognized and aliased to the new one for
|
||||
backwards compatibility.
|
||||
|
||||
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
|
||||
Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org>
|
||||
---
|
||||
policycoreutils/semodule/semodule.8 | 12 ++++++------
|
||||
policycoreutils/semodule/semodule.c | 13 ++++++++++---
|
||||
2 files changed, 16 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/policycoreutils/semodule/semodule.8 b/policycoreutils/semodule/semodule.8
|
||||
index d1735d216276..c56e580f27b8 100644
|
||||
--- a/policycoreutils/semodule/semodule.8
|
||||
+++ b/policycoreutils/semodule/semodule.8
|
||||
@@ -23,12 +23,12 @@ force a reload of policy
|
||||
.B \-B, \-\-build
|
||||
force a rebuild of policy (also reloads unless \-n is used)
|
||||
.TP
|
||||
-.B \-\-rebuild-if-modules-changed
|
||||
-Force a rebuild of the policy if any changes to module content are detected
|
||||
-(by comparing with checksum from the last transaction). One can use this
|
||||
-instead of \-B to ensure that any changes to the module store done by an
|
||||
-external tool (e.g. a package manager) are applied, while automatically
|
||||
-skipping the rebuild if there are no new changes.
|
||||
+.B \-\-refresh
|
||||
+Like \-\-build, but reuses existing linked policy if no changes to module
|
||||
+files are detected (by comparing with checksum from the last transaction).
|
||||
+One can use this instead of \-B to ensure that any changes to the module
|
||||
+store done by an external tool (e.g. a package manager) are applied, while
|
||||
+automatically skipping the module re-linking if there are no module changes.
|
||||
.TP
|
||||
.B \-D, \-\-disable_dontaudit
|
||||
Temporarily remove dontaudits from policy. Reverts whenever policy is rebuilt
|
||||
diff --git a/policycoreutils/semodule/semodule.c b/policycoreutils/semodule/semodule.c
|
||||
index 1ed8e69054e0..ec0794866daa 100644
|
||||
--- a/policycoreutils/semodule/semodule.c
|
||||
+++ b/policycoreutils/semodule/semodule.c
|
||||
@@ -150,9 +150,12 @@ static void usage(char *progname)
|
||||
printf(" -c, --cil extract module as cil. This only affects module extraction.\n");
|
||||
printf(" -H, --hll extract module as hll. This only affects module extraction.\n");
|
||||
printf(" -m, --checksum print module checksum (SHA256).\n");
|
||||
- printf(" --rebuild-if-modules-changed\n"
|
||||
- " force policy rebuild if module content changed since\n"
|
||||
- " last rebuild (based on checksum)\n");
|
||||
+ printf(" --refresh like --build, but reuses existing linked policy if no\n"
|
||||
+ " changes to module files are detected (via checksum)\n");
|
||||
+ printf("Deprecated options:\n");
|
||||
+ printf(" -b,--base same as --install\n");
|
||||
+ printf(" --rebuild-if-modules-changed\n"
|
||||
+ " same as --refresh\n");
|
||||
}
|
||||
|
||||
/* Sets the global mode variable to new_mode, but only if no other
|
||||
@@ -185,6 +188,7 @@ static void parse_command_line(int argc, char **argv)
|
||||
{
|
||||
static struct option opts[] = {
|
||||
{"rebuild-if-modules-changed", 0, NULL, '\0'},
|
||||
+ {"refresh", 0, NULL, '\0'},
|
||||
{"store", required_argument, NULL, 's'},
|
||||
{"base", required_argument, NULL, 'b'},
|
||||
{"help", 0, NULL, 'h'},
|
||||
@@ -225,6 +229,9 @@ static void parse_command_line(int argc, char **argv)
|
||||
case '\0':
|
||||
switch(longind) {
|
||||
case 0: /* --rebuild-if-modules-changed */
|
||||
+ fprintf(stderr, "The --rebuild-if-modules-changed option is deprecated. Use --refresh instead.\n");
|
||||
+ /* fallthrough */
|
||||
+ case 1: /* --refresh */
|
||||
check_ext_changes = 1;
|
||||
break;
|
||||
default:
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
From 8abaf61849ce9688dddc3b27ef4df3cc23af0109 Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Mon, 30 May 2022 14:20:21 +0200
|
||||
Subject: [PATCH] python: Split "semanage import" into two transactions
|
||||
Content-type: text/plain
|
||||
|
||||
First transaction applies all deletion operations, so that there are no
|
||||
collisions when applying the rest of the changes.
|
||||
|
||||
Fixes:
|
||||
# semanage port -a -t http_cache_port_t -r s0 -p tcp 3024
|
||||
# semanage export | semanage import
|
||||
ValueError: Port tcp/3024 already defined
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
---
|
||||
python/semanage/semanage | 21 +++++++++++++++++++--
|
||||
1 file changed, 19 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/python/semanage/semanage b/python/semanage/semanage
|
||||
index f45061a601f9..4e8d64d6863a 100644
|
||||
--- a/python/semanage/semanage
|
||||
+++ b/python/semanage/semanage
|
||||
@@ -853,10 +853,29 @@ def handleImport(args):
|
||||
trans = seobject.semanageRecords(args)
|
||||
trans.start()
|
||||
|
||||
+ deleteCommands = []
|
||||
+ commands = []
|
||||
+ # separate commands for deletion from the rest so they can be
|
||||
+ # applied in a separate transaction
|
||||
for l in sys.stdin.readlines():
|
||||
if len(l.strip()) == 0:
|
||||
continue
|
||||
+ if "-d" in l or "-D" in l:
|
||||
+ deleteCommands.append(l)
|
||||
+ else:
|
||||
+ commands.append(l)
|
||||
+
|
||||
+ if deleteCommands:
|
||||
+ importHelper(deleteCommands)
|
||||
+ trans.finish()
|
||||
+ trans.start()
|
||||
+
|
||||
+ importHelper(commands)
|
||||
+ trans.finish()
|
||||
|
||||
+
|
||||
+def importHelper(commands):
|
||||
+ for l in commands:
|
||||
try:
|
||||
commandParser = createCommandParser()
|
||||
args = commandParser.parse_args(mkargv(l))
|
||||
@@ -870,8 +889,6 @@ def handleImport(args):
|
||||
except KeyboardInterrupt:
|
||||
sys.exit(0)
|
||||
|
||||
- trans.finish()
|
||||
-
|
||||
|
||||
def setupImportParser(subparsers):
|
||||
importParser = subparsers.add_parser('import', help=_('Import local customizations'))
|
||||
--
|
||||
2.36.1
|
||||
|
||||
Loading…
Reference in new issue